pengjunjie/sdkjs
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/sdkjs.git synced 2026-04-07 14:09:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #458 from ONLYOFFICE/feature/new-function

Browse Source 
Add new fuctions:
This commit is contained in:
Alexander Trofimov
2019-02-06 16:58:23 +03:00
committed by GitHub
parent a12d92e9df 84bdb8744e
commit cb2adf4425
2 changed files with 86 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -24,10 +24,10 @@ Selection
* Fix change active cell in selection across merge. Previously, passing through the first cell of the merge range, we fell into the merge range, even if it was not selected (through the selection of a row / column)
* Fix selection when selecting row/col/all
* Add new class in apiBuilder: ApiName.
* Add new functions in ApiName: GetName, SetName, Delete, Add, GetRefersTo, SetRefersTo and properties: Name, RefersTo.
* Add new functions in ApiName: GetName, SetName, Delete, GetRefersTo, SetRefersTo and properties: Name, RefersTo.
* Add new functions in ApiRange: GetDefName, GetRows, Clear, GetWorksheet and propoerties: DefName, Rows, Worksheet.
* Add new functions in ApiWorksheet: GetDefNames, SetActive and propoerties: DefNames, Active.
* Add new function in Api: Intersect.
* Add new functions in ApiWorksheet: GetDefNames, GetDefName, AddDefName SetActive and propoerties: DefNames, Active.
* Add new functions in Api: Intersect, GetSelection, GetDefName, AddDefName and propoerty: Selection.
* Add new functions in WorkBook: addDefName, getDefinedNamesWS.
* Add new function in DependencyGraph: getDefinedNamesWS.

111
cell/apiBuilder.js
View File

@ -160,9 +160,8 @@
* Class representing a names
* @constructor
*/
function ApiName(DefName, wb) {
function ApiName(DefName) {
this.DefName = DefName;
this.wb = wb;
}
/**
@ -335,6 +334,42 @@
}
};
/**
* Returns an object that represents the selection range
* @memberof Api
* @returns {ApiRange}
*/
Api.prototype.GetSelection = function () {
return this.GetActiveSheet().GetSelection();
};
Object.defineProperty(Api.prototype, "Selection", {
get: function () {
return this.GetSelection();
}
});
/**
* Defines a new name for a range of cells.
* @typeofeditors ["CSE"]
* @memberof Api
*/
Api.prototype.AddDefName = function (name, ref, hidden) {
private_AddDefName(this.wbModel, name, ref, null, hidden);
};
/**
* Returns a ApiName.
* @typeofeditors ["CSE"]
* @memberof Api
* @returns {ApiName}
*/
Api.prototype.GetDefName = function (defName) {
if (defName && typeof defName === "string") {
defName = this.wbModel.getDefinesNames(defName);
}
return new ApiName(defName);
};
/**
* Returns Visible of sheet
* @memberof ApiWorksheet
@ -763,13 +798,37 @@
var res = this.worksheet.workbook.getDefinedNamesWS(this.worksheet.getId());
var name = [];
if (!res.length) {
return [new ApiName(undefined, this.worksheet.workbook)]
return [new ApiName(undefined)]
}
for (var i = 0; i < res.length; i++) {
name.push(new ApiName(res[i]));
}
return name;
};
/**
* Returns a ApiName.
* @typeofeditors ["CSE"]
* @memberof ApiWorksheet
* @returns {ApiName}
*/
ApiWorksheet.prototype.GetDefName = function (defName) {
if (defName && typeof defName === "string") {
defName = this.worksheet.workbook.getDefinesNames(defName, this.worksheet.getId());
}
return new ApiName(defName);
};
/**
* Defines a new name for a range of cells.
* @typeofeditors ["CSE"]
* @memberof ApiWorksheet
* @returns {ApiName}
*/
ApiWorksheet.prototype.AddDefName = function (name, ref, hidden) {
private_AddDefName(this.worksheet.workbook, name, ref, this.worksheet.getId(), hidden);
};
Object.defineProperty(ApiWorksheet.prototype, "DefNames", {
get: function () {
return this.GetDefNames();
@ -1803,10 +1862,9 @@
var SheetId = this.range.worksheet.getId();
defName = this.range.worksheet.workbook.findDefinesNames(defName, SheetId);
if (defName) {
// defName = this.range.worksheet.workbook.getDefinedName({Name : defName});
defName = this.range.worksheet.workbook.getDefinesNames(defName, SheetId);
}
return new ApiName(defName, this.range.worksheet.workbook);
return new ApiName(defName);
};
Object.defineProperty(ApiRange.prototype, "DefName", {
get: function () {
@ -2268,28 +2326,6 @@
this.DefName.wb.delDefinesNames(this.DefName.getAscCDefName(false));
};
/**
* Defines a new name for a range of cells.
* @typeofeditors ["CSE"]
* @memberof ApiName
* @returns {Error}
*/
ApiName.prototype.Add = function (name, ref, sheetId, hidden) {
var wb = (this.DefName) ? this.DefName.wb : this.wb;
var res = wb.checkDefName(name);
if (!res.status) {
return new Error('Invalid name.');
}
res = wb.oApi.asc_checkDataRange(Asc.c_oAscSelectionDialogType.Chart, ref, false);
if (res === Asc.c_oAscError.ID.DataRangeError) {
return new Error('Invalid range.');
}
if (sheetId) {
sheetId = (wb.getWorksheetById(sheetId)) ? sheetId : undefined;
}
wb.addDefName(name, ref, sheetId, hidden, false)
};
/**
* Sets the formula that the name is defined to refer to.
* @typeofeditors ["CSE"]
@ -2332,6 +2368,9 @@
Api.prototype["CreateColorFromRGB"] = Api.prototype.CreateColorFromRGB;
Api.prototype["CreateColorByName"] = Api.prototype.CreateColorByName;
Api.prototype["Intersect"] = Api.prototype.Intersect;
Api.prototype["GetSelection"] = Api.prototype.GetSelection;
Api.prototype["AddDefName"] = Api.prototype.AddDefName;
Api.prototype["GetDefName"] = Api.prototype.GetDefName;
ApiWorksheet.prototype["GetVisible"] = ApiWorksheet.prototype.GetVisible;
ApiWorksheet.prototype["SetVisible"] = ApiWorksheet.prototype.SetVisible;
@ -2363,6 +2402,8 @@
ApiWorksheet.prototype["SetPageOrientation"] = ApiWorksheet.prototype.SetPageOrientation;
ApiWorksheet.prototype["GetPageOrientation"] = ApiWorksheet.prototype.GetPageOrientation;
ApiWorksheet.prototype["GetDefNames"] = ApiWorksheet.prototype.GetDefNames;
ApiWorksheet.prototype["GetDefName"] = ApiWorksheet.prototype.GetDefName;
ApiWorksheet.prototype["AddDefName"] = ApiWorksheet.prototype.AddDefName;
ApiWorksheet.prototype["SetHyperlink"] = ApiWorksheet.prototype.SetHyperlink;
ApiWorksheet.prototype["AddChart"] = ApiWorksheet.prototype.AddChart;
ApiWorksheet.prototype["AddShape"] = ApiWorksheet.prototype.AddShape;
@ -2452,7 +2493,6 @@
ApiName.prototype["GetName"] = ApiName.prototype.GetName;
ApiName.prototype["SetName"] = ApiName.prototype.SetName;
ApiName.prototype["Delete"] = ApiName.prototype.Delete;
ApiName.prototype["Add"] = ApiName.prototype.Add;
ApiName.prototype["GetRefersTo"] = ApiName.prototype.GetRefersTo;
ApiName.prototype["SetRefersTo"] = ApiName.prototype.SetRefersTo;
@ -2527,4 +2567,19 @@
return border;
}
function private_AddDefName(wb, name, ref, sheetId, hidden) {
var res = wb.checkDefName(name);
if (!res.status) {
return new Error('Invalid name.');
}
res = wb.oApi.asc_checkDataRange(Asc.c_oAscSelectionDialogType.Chart, ref, false);
if (res === Asc.c_oAscError.ID.DataRangeError) {
return new Error('Invalid range.');
}
if (sheetId) {
sheetId = (wb.getWorksheetById(sheetId)) ? sheetId : undefined;
}
wb.addDefName(name, ref, sheetId, hidden, false)
}
}(window, null));