'+
+
+
+function luckysheetAlternateformatHtml(){
+ const _locale = locale()
+ const alternatingColors =_locale.alternatingColors;
+ const toolbar = _locale.toolbar;
+
+
+ return '
';
}
else if(type == "moredigit"){ //数字
- title = "数字格式";
+ title = locale_format.titleNumber;
let listHtml = '';
@@ -869,7 +1132,7 @@ const luckysheetMoreFormat = {
"addclass": "luckysheet-moreFormat-dialog",
"title": title,
"content": content,
- "botton": '
',
+ "botton": '
',
"style": "z-index:100003"
}));
let $t = $("#luckysheet-moreFormat-dialog").find(".luckysheet-modal-dialog-content").css("min-width", 400).end(),
diff --git a/src/controllers/selection.js b/src/controllers/selection.js
index c9b76b2..ecef695 100644
--- a/src/controllers/selection.js
+++ b/src/controllers/selection.js
@@ -590,7 +590,7 @@ const selection = {
}
}
- if (getObjType(data) == "object") {
+ if (typeof data == "object") {
if (data.length == 0) { return; };
let cfg = $.extend(true, {}, Store.config);
@@ -1679,7 +1679,7 @@ const selection = {
},
matchcopy: function (data1, data2) {
let data1cache = [], data2cache = [], data1len, data2len;
- if (getObjType(data1) == "object") {
+ if (typeof data1 == "object") {
data1cache = data1;
}
else {
@@ -1691,7 +1691,7 @@ const selection = {
data1len = data1cache.length;
- if (getObjType(data2) == "object") {
+ if (typeof data2 == "object") {
data2cache = data2;
}
else {
diff --git a/src/controllers/sheetmanage.js b/src/controllers/sheetmanage.js
index be96af3..f928cc3 100644
--- a/src/controllers/sheetmanage.js
+++ b/src/controllers/sheetmanage.js
@@ -228,7 +228,7 @@ const sheetmanage = {
indicator = indicator.eq(0).data("index");
}
else {
- indicator = luckysheetcurrentSheetitem.prevAll(":visible").eq(0).data("index");
+ indicator = luckysheetcurrentSheetitem.preval(":visible").eq(0).data("index");
}
$("#luckysheet-sheets-item" + indicator).addClass("luckysheet-sheets-item-active");
diff --git a/src/core.js b/src/core.js
index db3bacd..2f4613a 100644
--- a/src/core.js
+++ b/src/core.js
@@ -8,9 +8,17 @@ import sheetmanage from './controllers/sheetmanage';
import luckysheetsizeauto from './controllers/resize';
import luckysheetHandler from './controllers/handler';
import {initPlugins} from './controllers/expendPlugins';
+import {
+ getluckysheetfile,
+ getluckysheet_select_save,
+ getconfig,
+ getvisibledatarow,
+ getvisibledatacolumn
+} from './methods/get';
let luckysheet = {};
+//创建luckysheet表格
luckysheet.create = function (setting) {
let extendsetting = common_extend(defaultSetting, setting);
@@ -101,6 +109,21 @@ luckysheet.create = function (setting) {
}
}
+//获取所有表格数据
+luckysheet.getluckysheetfile = getluckysheetfile;
+
+//获取当前表格 选区
+luckysheet.getluckysheet_select_save = getluckysheet_select_save;
+
+//获取当前表格 config配置
+luckysheet.getconfig = getconfig;
+
+//获取当前表格 行高数据
+luckysheet.getvisibledatarow = getvisibledatarow;
+
+//获取当前表格 列宽数据
+luckysheet.getvisibledatacolumn = getvisibledatacolumn;
+
export {
luckysheet
}
\ No newline at end of file
diff --git a/src/demoData/sheetComment.js b/src/demoData/sheetComment.js
index f641700..f17c584 100644
--- a/src/demoData/sheetComment.js
+++ b/src/demoData/sheetComment.js
@@ -6,7 +6,7 @@ const sheetComment = {
"2": 102
}
},
- "index": "4",
+ "index": "5",
"chart": [{
"sheetIndex": "0",
"dataSheetIndex": "0",
@@ -20,7 +20,7 @@ const sheetComment = {
"myTop": "11"
}],
"status": "0",
- "order": "4",
+ "order": "5",
"column": 18,
"row": 36,
"celldata": [{
diff --git a/src/demoData/sheetFormula.js b/src/demoData/sheetFormula.js
index b896b7e..804e48c 100644
--- a/src/demoData/sheetFormula.js
+++ b/src/demoData/sheetFormula.js
@@ -6928,6 +6928,288 @@ const sheetFormula = {
"c": 10,
"v": {}
}],
+ "calcChain":[
+ {
+ "r": 6,
+ "c": 3,
+ "index": 1,
+ "func": [
+ true,
+ 23.75,
+ "=AVERAGE(D3:D6)"
+ ],
+ "color": "w",
+ "parent": null,
+ "chidren": {},
+ "times": 0
+ },
+ {
+ "r": 7,
+ "c": 3,
+ "index": 1,
+ "func": [
+ true,
+ 30,
+ "=MAX(D3:D6)"
+ ],
+ "color": "w",
+ "parent": null,
+ "chidren": {},
+ "times": 0
+ },
+ {
+ "r": 8,
+ "c": 3,
+ "index": 1,
+ "func": [
+ true,
+ 17,
+ "=MIN(D3:D6)"
+ ],
+ "color": "w",
+ "parent": null,
+ "chidren": {},
+ "times": 0
+ },
+ {
+ "r": 5,
+ "c": 9,
+ "index": 1,
+ "func": [
+ true,
+ "J2",
+ "=INDIRECT(\"I2\")"
+ ],
+ "color": "w",
+ "parent": null,
+ "chidren": {},
+ "times": 0
+ },
+ {
+ "r": 6,
+ "c": 9,
+ "index": 1,
+ "func": [
+ true,
+ 1,
+ "=INDIRECT(I2)"
+ ],
+ "color": "w",
+ "parent": null,
+ "chidren": {},
+ "times": 0
+ },
+ {
+ "r": 7,
+ "c": 9,
+ "index": 1,
+ "func": [
+ true,
+ "I",
+ "=INDIRECT(\"I\"&(1+2))"
+ ],
+ "color": "w",
+ "parent": null,
+ "chidren": {},
+ "times": 0
+ },
+ {
+ "r": 8,
+ "c": 9,
+ "index": 1,
+ "func": [
+ true,
+ 1,
+ "=INDIRECT(I4&J3)"
+ ],
+ "color": "w",
+ "parent": null,
+ "chidren": {},
+ "times": 0
+ },
+ {
+ "r": 9,
+ "c": 9,
+ "index": 1,
+ "func": [
+ true,
+ "#REF!",
+ "=INDIRECT(\"Formula!\"&I2)"
+ ],
+ "color": "w",
+ "parent": null,
+ "chidren": {},
+ "times": 0
+ },
+ {
+ "r": 10,
+ "c": 9,
+ "index": 1,
+ "func": [
+ true,
+ "#REF!",
+ "=INDIRECT(\"Formula!I2\")"
+ ],
+ "color": "w",
+ "parent": null,
+ "chidren": {},
+ "times": 0
+ },
+ {
+ "r": 14,
+ "c": 7,
+ "index": 1,
+ "func": [
+ true,
+ 207,
+ "=SUBTOTAL(9,OFFSET($D$15,ROW($D$15:$D$18)-ROW($D$15),1,3))"
+ ],
+ "color": "w",
+ "parent": null,
+ "chidren": {},
+ "times": 0
+ },
+ {
+ "r": 15,
+ "c": 7,
+ "index": 1,
+ "func": [
+ true,
+ 182,
+ "=SUBTOTAL(9,OFFSET(E15,ROW(E15:E18)-ROW(E15),1,3))"
+ ],
+ "color": "w",
+ "parent": null,
+ "chidren": {},
+ "times": 0
+ },
+ {
+ "r": 16,
+ "c": 7,
+ "index": 1,
+ "func": [
+ true,
+ 152,
+ "=SUBTOTAL(9,OFFSET(F15,ROW(F15:F18)-ROW(F15),1,3))"
+ ],
+ "color": "w",
+ "parent": null,
+ "chidren": {},
+ "times": 0
+ },
+ {
+ "r": 17,
+ "c": 7,
+ "index": 1,
+ "func": [
+ true,
+ 541,
+ "=SUBTOTAL(9,OFFSET(G15,ROW(G15:G18)-ROW(G15),1,3))"
+ ],
+ "color": "w",
+ "parent": null,
+ "chidren": {},
+ "times": 0
+ },
+ {
+ "r": 22,
+ "c": 8,
+ "index": 1,
+ "func": [
+ true,
+ "#NAME?",
+ "=INDEX(D21:D25,MATCH(TRUE,ISNA(MATCH(D21:D25,C21:C27,0)),0))"
+ ],
+ "color": "w",
+ "parent": null,
+ "chidren": {},
+ "times": 0
+ },
+ {
+ "r": 23,
+ "c": 8,
+ "index": 1,
+ "func": [
+ true,
+ "#NAME?",
+ "=INDEX(D21:D25,MATCH(TRUE,ISNA(MATCH(D21:D25,C21:C27,0)),0))"
+ ],
+ "color": "w",
+ "parent": null,
+ "chidren": {},
+ "times": 0
+ },
+ {
+ "r": 38,
+ "c": 6,
+ "index": 1,
+ "func": [
+ true,
+ 1,
+ "=SUM(IF((C31:C39=\"Fax\")+(D31:D39=\"Jones\")<>2,1,0))"
+ ],
+ "color": "w",
+ "parent": null,
+ "chidren": {},
+ "times": 0
+ },
+ {
+ "r": 30,
+ "c": 6,
+ "index": 1,
+ "func": [
+ true,
+ "#NAME?",
+ "=SUM((C31:C39=\"Fax\")*(D31:D39=\"Brown\")*(E31:E39))"
+ ],
+ "color": "w",
+ "parent": null,
+ "chidren": {},
+ "times": 0
+ },
+ {
+ "r": 32,
+ "c": 6,
+ "index": 1,
+ "func": [
+ true,
+ "#NAME?",
+ "=SUM((C31:C39=\"Fax\")*(D31:D39=\"Brown\"))"
+ ],
+ "color": "w",
+ "parent": null,
+ "chidren": {},
+ "times": 0
+ },
+ {
+ "r": 34,
+ "c": 6,
+ "index": 1,
+ "func": [
+ true,
+ 1,
+ "=SUM(IF((C31:C39=\"Fax\")+(D31:D39=\"Jones\"),1,0))"
+ ],
+ "color": "w",
+ "parent": null,
+ "chidren": {},
+ "times": 0
+ },
+ {
+ "r": 36,
+ "c": 6,
+ "index": 1,
+ "func": [
+ true,
+ 1,
+ "=SUM(IF(MOD((C31:C39=\"Fax\")+(D31:D39=\"Jones\"),2),1,0))"
+ ],
+ "color": "w",
+ "parent": null,
+ "chidren": {},
+ "times": 0
+ }
+ ],
"visibledatarow": [],
"visibledatacolumn": [],
"rowsplit": [],
diff --git a/src/demoData/sheetPivotTable.js b/src/demoData/sheetPivotTable.js
index ca25551..ef0946d 100644
--- a/src/demoData/sheetPivotTable.js
+++ b/src/demoData/sheetPivotTable.js
@@ -2,7 +2,7 @@ const sheetPivotTable = {
"name": "PivotTable",
"color": "",
"config": {},
- "index": "6",
+ "index": "7",
"chart": [{
"sheetIndex": "0",
"dataSheetIndex": "0",
@@ -16,7 +16,7 @@ const sheetPivotTable = {
"myTop": "11"
}],
"status": "0",
- "order": "6",
+ "order": "7",
"column": 18,
"row": 36,
"celldata": [{
diff --git a/src/demoData/sheetPivotTableData.js b/src/demoData/sheetPivotTableData.js
index f6adef7..d3fb2ba 100644
--- a/src/demoData/sheetPivotTableData.js
+++ b/src/demoData/sheetPivotTableData.js
@@ -4,7 +4,7 @@ const sheetPivotTableData = {
"config": {
"merge": {}
},
- "index": "5",
+ "index": "6",
"chart": [{
"sheetIndex": "0",
"dataSheetIndex": "0",
@@ -18,7 +18,7 @@ const sheetPivotTableData = {
"myTop": "11"
}],
"status": "0",
- "order": "5",
+ "order": "6",
"hide": 1,
"column": 18,
"row": 36,
diff --git a/src/demoData/sheetSparkline.js b/src/demoData/sheetSparkline.js
new file mode 100644
index 0000000..48afea6
--- /dev/null
+++ b/src/demoData/sheetSparkline.js
@@ -0,0 +1,790 @@
+const sheetSparkline = {
+ "name": "Sparkline",
+ "color": "",
+ "config": {
+ "merge": {
+ "1_2": {
+ "r": 1,
+ "c": 2,
+ "rs": 1,
+ "cs": 2
+ },
+ "1_4": {
+ "r": 1,
+ "c": 4,
+ "rs": 1,
+ "cs": 2
+ },
+ "0_0": {
+ "r": 0,
+ "c": 0,
+ "rs": 1,
+ "cs": 6
+ },
+ "2_2": {
+ "r": 2,
+ "c": 2,
+ "rs": 3,
+ "cs": 2
+ },
+ "2_4": {
+ "r": 2,
+ "c": 4,
+ "rs": 3,
+ "cs": 2
+ }
+ },
+ "rowlen": {
+ "0": 25
+ },
+ "columlen": {
+ "0": 101
+ }
+ },
+ "index": "4",
+ "chart": [
+ {
+ "sheetIndex": "0",
+ "dataSheetIndex": "0",
+ "chartType": "column",
+ "row": "[1,3]",
+ "column": "[3,3]",
+ "chartStyle": "default",
+ "myWidth": "480",
+ "myHeight": "288",
+ "myLeft": "67",
+ "myTop": "11"
+ }
+ ],
+ "status": "0",
+ "order": "4",
+ "column": 18,
+ "row": 36,
+ "celldata": [
+ {
+ "r": 0,
+ "c": 0,
+ "v": {
+ "v": "The company revenue in 2014",
+ "ct": {
+ "fa": "General",
+ "t": "g"
+ },
+ "m": "The company revenue in 2014",
+ "mc": {
+ "r": 0,
+ "c": 0,
+ "rs": 1,
+ "cs": 6
+ },
+ "fs": "14",
+ "ht": "0",
+ "vt": "0"
+ }
+ },
+ {
+ "r": 0,
+ "c": 1,
+ "v": {
+ "mc": {
+ "r": 0,
+ "c": 0
+ },
+ "fs": "14",
+ "ht": "0",
+ "vt": "0"
+ }
+ },
+ {
+ "r": 0,
+ "c": 2,
+ "v": {
+ "mc": {
+ "r": 0,
+ "c": 0
+ },
+ "fs": "14",
+ "ht": "0",
+ "vt": "0"
+ }
+ },
+ {
+ "r": 0,
+ "c": 3,
+ "v": {
+ "mc": {
+ "r": 0,
+ "c": 0
+ },
+ "fs": "14",
+ "ht": "0",
+ "vt": "0"
+ }
+ },
+ {
+ "r": 0,
+ "c": 4,
+ "v": {
+ "mc": {
+ "r": 0,
+ "c": 0
+ },
+ "fs": "14",
+ "ht": "0",
+ "vt": "0"
+ }
+ },
+ {
+ "r": 0,
+ "c": 5,
+ "v": {
+ "mc": {
+ "r": 0,
+ "c": 0
+ },
+ "fs": "14",
+ "ht": "0",
+ "vt": "0"
+ }
+ },
+ {
+ "r": 1,
+ "c": 0,
+ "v": {
+ "m": "Month",
+ "ct": {
+ "fa": "General",
+ "t": "g"
+ },
+ "v": "Month",
+ "bg": "#f1c232",
+ "fc": "#ffffff",
+ "ht": "0",
+ "vt": "0"
+ }
+ },
+ {
+ "r": 1,
+ "c": 1,
+ "v": {
+ "m": "Revenue",
+ "ct": {
+ "fa": "General",
+ "t": "g"
+ },
+ "v": "Revenue",
+ "bg": "#f1c232",
+ "fc": "#ffffff",
+ "ht": "0",
+ "vt": "0"
+ }
+ },
+ {
+ "r": 1,
+ "c": 2,
+ "v": {
+ "m": "Diagram 1",
+ "ct": {
+ "fa": "General",
+ "t": "g"
+ },
+ "v": "Diagram 1",
+ "mc": {
+ "r": 1,
+ "c": 2,
+ "rs": 1,
+ "cs": 2
+ },
+ "bg": "#f1c232",
+ "fc": "#ffffff",
+ "ht": "0",
+ "vt": "0"
+ }
+ },
+ {
+ "r": 1,
+ "c": 3,
+ "v": {
+ "mc": {
+ "r": 1,
+ "c": 2
+ },
+ "bg": "#f1c232",
+ "fc": "#ffffff",
+ "ht": "0",
+ "vt": "0"
+ }
+ },
+ {
+ "r": 1,
+ "c": 4,
+ "v": {
+ "m": "Diagram 2",
+ "ct": {
+ "fa": "General",
+ "t": "g"
+ },
+ "v": "Diagram 2",
+ "mc": {
+ "r": 1,
+ "c": 4,
+ "rs": 1,
+ "cs": 2
+ },
+ "bg": "#f1c232",
+ "fc": "#ffffff",
+ "ht": "0",
+ "vt": "0"
+ }
+ },
+ {
+ "r": 1,
+ "c": 5,
+ "v": {
+ "mc": {
+ "r": 1,
+ "c": 4
+ },
+ "bg": "#f1c232",
+ "fc": "#ffffff",
+ "ht": "0",
+ "vt": "0"
+ }
+ },
+ {
+ "r": 2,
+ "c": 0,
+ "v": {
+ "m": "2014-02-01",
+ "ct": {
+ "fa": "yyyy-MM-dd",
+ "t": "d"
+ },
+ "v": 41671
+ }
+ },
+ {
+ "r": 2,
+ "c": 1,
+ "v": {
+ "v": 30,
+ "ct": {
+ "fa": "General",
+ "t": "n"
+ },
+ "m": "30",
+ "ht": "0",
+ "vt": "0"
+ }
+ },
+ {
+ "r": 2,
+ "c": 2,
+ "v": {
+ "mc": {
+ "r": 2,
+ "c": 2,
+ "rs": 3,
+ "cs": 2
+ },
+ "f": "=LINESPLINES(B3:B5,'pink',4,'avg','yellow','red','green',3)",
+ "spl": {
+ "shapes": {
+ "0": {
+ "id": 0,
+ "type": "Shape",
+ "args": [
+ 0,
+ [
+ [
+ 0,
+ 20
+ ],
+ [
+ 0,
+ 20
+ ],
+ [
+ 72,
+ 51
+ ],
+ [
+ 144,
+ 3
+ ]
+ ],
+ "pink",
+ null,
+ 4
+ ]
+ },
+ "1": {
+ "id": 1,
+ "type": "Rect",
+ "args": [
+ 1,
+ 0,
+ null,
+ 144,
+ null,
+ null,
+ "yellow"
+ ]
+ },
+ "2": {
+ "id": 2,
+ "type": "Circle",
+ "args": [
+ 2,
+ 72,
+ 51,
+ 3,
+ null,
+ "green",
+ null
+ ]
+ },
+ "3": {
+ "id": 3,
+ "type": "Circle",
+ "args": [
+ 3,
+ 144,
+ 3,
+ 3,
+ null,
+ "red",
+ null
+ ]
+ }
+ },
+ "shapeseq": [
+ 0,
+ 1,
+ 2,
+ 3
+ ],
+ "offsetX": 0,
+ "offsetY": 5,
+ "pixelWidth": 147,
+ "pixelHeight": 55
+ }
+ }
+ },
+ {
+ "r": 2,
+ "c": 3,
+ "v": {
+ "mc": {
+ "r": 2,
+ "c": 2
+ }
+ }
+ },
+ {
+ "r": 2,
+ "c": 4,
+ "v": {
+ "mc": {
+ "r": 2,
+ "c": 4,
+ "rs": 3,
+ "cs": 2
+ },
+ "f": "=COLUMNSPLINES(B3:B5,35,'red','green','auto','brown')",
+ "spl": {
+ "shapes": {
+ "0": {
+ "id": 0,
+ "type": "Rect",
+ "args": [
+ 0,
+ 98,
+ 1,
+ 13,
+ 28,
+ "red",
+ "red"
+ ]
+ },
+ "1": {
+ "id": 1,
+ "type": "Rect",
+ "args": [
+ 1,
+ 49,
+ 30,
+ 13,
+ 20,
+ "green",
+ "green"
+ ]
+ },
+ "2": {
+ "id": 2,
+ "type": "Rect",
+ "args": [
+ 2,
+ 0,
+ 20,
+ 13,
+ 9,
+ "brown",
+ "brown"
+ ]
+ }
+ },
+ "shapeseq": [
+ 0,
+ 1,
+ 2
+ ],
+ "offsetX": 0,
+ "offsetY": 0,
+ "pixelWidth": 147,
+ "pixelHeight": 60
+ }
+ }
+ },
+ {
+ "r": 2,
+ "c": 5,
+ "v": {
+ "mc": {
+ "r": 2,
+ "c": 4
+ }
+ }
+ },
+ {
+ "r": 3,
+ "c": 0,
+ "v": {
+ "m": "2014-03-01",
+ "ct": {
+ "fa": "yyyy-MM-dd",
+ "t": "d"
+ },
+ "v": 41699
+ }
+ },
+ {
+ "r": 3,
+ "c": 1,
+ "v": {
+ "v": -60,
+ "ct": {
+ "fa": "General",
+ "t": "n"
+ },
+ "m": "-60",
+ "ht": "0",
+ "vt": "0"
+ }
+ },
+ {
+ "r": 3,
+ "c": 2,
+ "v": {
+ "mc": {
+ "r": 2,
+ "c": 2
+ }
+ }
+ },
+ {
+ "r": 3,
+ "c": 3,
+ "v": {
+ "mc": {
+ "r": 2,
+ "c": 2
+ }
+ }
+ },
+ {
+ "r": 3,
+ "c": 4,
+ "v": {
+ "mc": {
+ "r": 2,
+ "c": 4
+ }
+ }
+ },
+ {
+ "r": 3,
+ "c": 5,
+ "v": {
+ "mc": {
+ "r": 2,
+ "c": 4
+ }
+ }
+ },
+ {
+ "r": 4,
+ "c": 0,
+ "v": {
+ "m": "2014-04-01",
+ "ct": {
+ "fa": "yyyy-MM-dd",
+ "t": "d"
+ },
+ "v": 41730
+ }
+ },
+ {
+ "r": 4,
+ "c": 1,
+ "v": {
+ "v": 80,
+ "ct": {
+ "fa": "General",
+ "t": "n"
+ },
+ "m": "80",
+ "ht": "0",
+ "vt": "0"
+ }
+ },
+ {
+ "r": 4,
+ "c": 2,
+ "v": {
+ "mc": {
+ "r": 2,
+ "c": 2
+ }
+ }
+ },
+ {
+ "r": 4,
+ "c": 3,
+ "v": {
+ "mc": {
+ "r": 2,
+ "c": 2
+ }
+ }
+ },
+ {
+ "r": 4,
+ "c": 4,
+ "v": {
+ "mc": {
+ "r": 2,
+ "c": 4
+ }
+ }
+ },
+ {
+ "r": 4,
+ "c": 5,
+ "v": {
+ "mc": {
+ "r": 2,
+ "c": 4
+ }
+ }
+ }
+ ],
+ "visibledatarow": [
+ 26,
+ 46,
+ 66,
+ 86,
+ 106,
+ 126,
+ 146,
+ 166,
+ 186,
+ 206,
+ 226,
+ 246,
+ 266,
+ 286,
+ 306,
+ 326,
+ 346,
+ 366,
+ 386,
+ 406,
+ 426,
+ 446,
+ 466,
+ 486,
+ 506,
+ 526,
+ 546,
+ 566,
+ 586,
+ 606,
+ 626,
+ 646,
+ 666,
+ 686,
+ 706,
+ 726,
+ 746,
+ 766,
+ 786,
+ 806,
+ 826,
+ 846,
+ 866,
+ 886,
+ 906,
+ 926,
+ 946,
+ 966,
+ 986,
+ 1006,
+ 1026,
+ 1046,
+ 1066,
+ 1086,
+ 1106,
+ 1126,
+ 1146,
+ 1166,
+ 1186,
+ 1206,
+ 1226,
+ 1246,
+ 1266,
+ 1286,
+ 1306,
+ 1326,
+ 1346,
+ 1366,
+ 1386,
+ 1406,
+ 1426,
+ 1446,
+ 1466,
+ 1486,
+ 1506,
+ 1526,
+ 1546,
+ 1566,
+ 1586,
+ 1606,
+ 1626,
+ 1646,
+ 1666,
+ 1686
+ ],
+ "visibledatacolumn": [
+ 102,
+ 176,
+ 250,
+ 324,
+ 398,
+ 472,
+ 546,
+ 620,
+ 694,
+ 768,
+ 842,
+ 916,
+ 990,
+ 1064,
+ 1138,
+ 1212,
+ 1286,
+ 1360,
+ 1434,
+ 1508,
+ 1582,
+ 1656,
+ 1730,
+ 1804,
+ 1878,
+ 1952,
+ 2026,
+ 2100,
+ 2174,
+ 2248,
+ 2322,
+ 2396,
+ 2470,
+ 2544,
+ 2618,
+ 2692,
+ 2766,
+ 2840,
+ 2914,
+ 2988,
+ 3062,
+ 3136,
+ 3210,
+ 3284,
+ 3358,
+ 3432,
+ 3506,
+ 3580,
+ 3654,
+ 3728,
+ 3802,
+ 3876,
+ 3950,
+ 4024,
+ 4098,
+ 4172,
+ 4246,
+ 4320,
+ 4394,
+ 4468
+ ],
+ "rowsplit": [],
+ "ch_width": 4748,
+ "rh_height": 1790,
+ "luckysheet_select_save": [
+ {
+ "row": [
+ 0,
+ 0
+ ],
+ "column": [
+ 0,
+ 0
+ ]
+ }
+ ],
+ "luckysheet_selection_range": [],
+ "scrollLeft": 0,
+ "scrollTop": 0,
+ "calcChain": [
+ {
+ "r": 2,
+ "c": 2,
+ "index": "4",
+ "func": [
+ true,
+ "",
+ "=LINESPLINES(B3:B5,'pink',4,'avg','yellow','red','green',3)"
+ ],
+ "color": "w",
+ "parent": null,
+ "chidren": {},
+ "times": 0
+ },
+ {
+ "r": 2,
+ "c": 4,
+ "index": "4",
+ "func": [
+ true,
+ "",
+ "=COLUMNSPLINES(B3:B5,35,'red','green','auto','brown')"
+ ],
+ "color": "w",
+ "parent": null,
+ "chidren": {},
+ "times": 0
+ }
+ ]
+}
+
+export default sheetSparkline;
\ No newline at end of file
diff --git a/src/function/functionImplementation.js b/src/function/functionImplementation.js
index a5fb3a2..f9e540a 100644
--- a/src/function/functionImplementation.js
+++ b/src/function/functionImplementation.js
@@ -10301,11 +10301,9 @@ const functionImplementation = {
//计算
if(A1){
- var reg = /^(([a-zA-Z]+)|([$][a-zA-Z]+))(([0-9]+)|([$][0-9]+))$/g;
-
- if(reg.test(ref_text)){
- var row = parseInt(ref_text.replace(/[^0-9]/g, "")) - 1;
- var col = ABCatNum(ref_text.replace(/[^A-Za-z]/g, ""));
+ if(formula.iscelldata(ref_text)){
+ let cellrange = formula.getcellrange(ref_text);
+ let row = cellrange.row[0], col = cellrange.column[0];
if(row < 0 || row >= Store.flowdata.length || col < 0 || col >= Store.flowdata[0].length){
return formula.error.r;
@@ -10322,11 +10320,9 @@ const functionImplementation = {
}
}
else{
- var reg = /^[R][0-9]+[C][0-9]+$/g;
-
- if(reg.test(ref_text)){
- var row = parseInt(ref_text.split("R")[1].split("C")[0]);
- var col = parseInt(ref_text.split("R")[1].split("C")[1]);
+ if(formula.iscelldata(ref_text)){
+ let cellrange = formula.getcellrange(ref_text);
+ let row = cellrange.row[0], col = cellrange.column[0];
if(row < 0 || row >= Store.flowdata.length || col < 0 || col >= Store.flowdata[0].length){
return formula.error.r;
diff --git a/src/global/draw.js b/src/global/draw.js
index 50e3bcd..feb0bdc 100644
--- a/src/global/draw.js
+++ b/src/global/draw.js
@@ -833,7 +833,7 @@ function luckysheetDrawMain(scrollWidth, scrollHeight, drawWidth, drawHeight, of
//水平对齐方式是 居中或居右对齐 且单元格宽度小于文字宽度 （用离屏canvas渲染）
let canvasName, cellsize;
- if(browser.BrowserType() != "Safari" && (canvasType == "offline" || ((horizonAlign == "0" || horizonAlign == "2") && (end_c - start_c) < textW) || ((verticalAlign == "0" || verticalAlign == "2") && (end_r - start_r) < textH))){
+ if(browser.BrowserType() != "Safari" && (canvasType == "offline" || ((horizonAlign == "0" || horizonAlign == "2") && (end_c - start_c) < textW) || ((end_r - start_r) < textH))){
canvasName = offlinecanvas;
canvasName.font = fontset;
diff --git a/src/index.html b/src/index.html
index dfa074d..6836581 100644
--- a/src/index.html
+++ b/src/index.html
@@ -27,13 +27,14 @@
import sheetComment from './demoData/sheetComment.js'
import sheetPivotTableData from './demoData/sheetPivotTableData.js'
import sheetPivotTable from './demoData/sheetPivotTable.js'
+ import sheetSparkline from './demoData/sheetSparkline.js'
$(function () {
luckysheet.create({
container: 'luckysheet',
- lang: 'zh',
+ lang: 'en',
plugins: ['chart'],
- data: [sheetCell,sheetFormula,sheetConditionFormat,sheetTable,sheetComment,sheetPivotTableData,sheetPivotTable]
+ data: [sheetCell,sheetFormula,sheetConditionFormat,sheetTable,sheetSparkline,sheetComment,sheetPivotTableData,sheetPivotTable]
})
})
diff --git a/src/index.js b/src/index.js
index 252759c..4da8f11 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,7 +1,8 @@
import './utils/math'
import { luckysheet } from './core'
import __firefox from './utils/polyfill'
-
+// Prevent gulp warning: 'Use of eval is strongly discouraged, as it poses security risks and may cause issues with minification'
+// window.evall = window.eval;
// polyfill event in firefox
if(window.addEventListener && (navigator.userAgent.indexOf("Firefox") > 0)){
__firefox();
diff --git a/src/locale/en.js b/src/locale/en.js
index 402a8dd..66ea980 100644
--- a/src/locale/en.js
+++ b/src/locale/en.js
@@ -45,12 +45,24 @@ export default {
chart: 'Chart',
screenshot: 'Screenshot',
splitColumn: 'Split column',
+
+ clearText:"Clear color",
+ noColorSelectedText:"No color is selected",
},
alternatingColors:{
applyRange: 'Apply to range',
selectRange: 'Select a data range',
header: 'Header',
footer: 'Footer',
+
+ errorInfo:"Cannot perform this operation on multiple selection areas, please select a single area and try again",
+ textTitle:"Format style",
+ custom:"CUSTOM",
+ close:"close",
+ selectionTextColor:"Click to select text color",
+ selectionCellColor:"Click to select cell color",
+ removeColor:"Remove alternating colors",
+ colorShow:"color",
},
button: {
confirm: 'OK',
@@ -61,30 +73,245 @@ export default {
paintFormatEnd: 'ESC key to exit',
},
format:{
- auto: 'Automatic',
- text: 'Plain text',
- number: 'Number',
- percent: 'Percent',
- scientific: 'Scientific',
- accounting: 'Accounting',
- tenThousand: 'Ten thousand',
- currency: 'Currency',
- tenThousandDecimal: 'Ten thousand (2 decimal places)',
- date: 'Date',
- time: 'Time',
- time24H: 'Time 24H',
- dateTime: 'Date time',
- dateTime24H: 'Date time 24 H',
- customFormats: 'Custom formats',
moreCurrency: 'More currency formats',
moreDateTime: 'More date and time formats',
moreNumber: 'More number formats',
+
+ titleCurrency: 'Currency formats',
+ decimalPlaces: 'Decimal places',
+ titleDateTime: 'Date and time formats',
+ titleNumber: 'Number formats'
},
info:{
detailUpdate: 'New opened',
detailSave: 'Local cache restored',
row: 'row',
column: 'column'
- }
+ },
+ currencyDetail:{
+ RMB:'RMB',
+ USdollar:'US dollar',
+ EUR:'EUR',
+ GBP:'GBP',
+ HK:'HK',
+ JPY:'JPY',
+ AlbanianLek:'Albanian Lek',
+ AlgerianDinar:'Algerian Dinar',
+ Afghani:'Afghani',
+ ArgentinePeso:'Argentine Peso',
+ UnitedArabEmiratesDirham:'United Arab Emirates Dirham',
+ ArubanFlorin:'Aruban Florin',
+ OmaniRial:'Omani Rial',
+ Azerbaijanimanat:'Azerbaijani manat',
+ EgyptianPound:'Egyptian Pound',
+ EthiopianBirr:'Ethiopian Birr',
+ AngolaKwanza:'Angola Kwanza',
+ AustralianDollar:'Australian Dollar',
+ Patacas:'Patacas',
+ BarbadosDollar:'Barbados Dollar',
+ PapuaNewGuineaKina:'Papua New Guinea Kina',
+ BahamianDollar:'Bahamian Dollar',
+ PakistanRupee:'Pakistan Rupee',
+ ParaguayanGuarani:'Paraguayan Guarani',
+ BahrainiDinar:'Bahraini Dinar',
+ PanamanianBalboa:'Panamanian Balboa',
+ Brazilianreal:'Brazilian real',
+ Belarusianruble:'Belarusian ruble',
+ BermudianDollar:'Bermudian Dollar',
+ BulgarianLev:'Bulgarian Lev',
+ IcelandKrona:'Iceland Krona',
+ BosniaHerzegovinaConvertibleMark:'Bosnia-Herzegovina Convertible Mark',
+ PolishZloty:'Polish Zloty',
+ Boliviano:'Boliviano',
+ BelizeDollar:'Belize Dollar',
+ BotswanaPula:'Botswana Pula',
+ NotDannuzhamu:'Not Dannuzhamu',
+ BurundiFranc:'Burundi Franc',
+ NorthKoreanWon:'North Korean Won',
+ DanishKrone:'Danish Krone',
+ EastCaribbeanDollar:'East Caribbean Dollar',
+ DominicaPeso:'Dominica Peso',
+ RussianRuble:'Russian Ruble',
+ EritreanNakfa:'Eritrean Nakfa',
+ CFAfranc:'CFA franc',
+ PhilippinePeso:'Philippine Peso',
+ FijiDollar:'Fiji Dollar',
+ CapeVerdeEscudo:'Cape Verde Escudo',
+ FalklandIslandsPound:'Falkland Islands Pound',
+ GambianDalasi:'Gambian Dalasi',
+ Congolesefranc:'Congolese franc',
+ ColombianPeso:'Colombian Peso',
+ CostaRicanColon:'Costa Rican Colon',
+ CubanPeso:'Cuban Peso',
+ Cubanconvertiblepeso:'Cuban convertible peso',
+ GuyanaDollar:'Guyana Dollar',
+ KazakhstanTenge:'Kazakhstan Tenge',
+ Haitiangourde:'Haitian gourde',
+ won:'won',
+ NetherlandsAntillesGuilder:'Netherlands Antilles Guilder',
+ Honduraslempiras:'Honduras lempiras',
+ DjiboutiFranc:'Djibouti Franc',
+ KyrgyzstanSom:'Kyrgyzstan Som',
+ GuineaFranc:'Guinea Franc',
+ CanadianDollar:'Canadian Dollar',
+ GhanaianCedi:'Ghanaian Cedi',
+ Cambodianriel:'Cambodian riel',
+ CzechKoruna:'Czech Koruna',
+ ZimbabweDollar:'Zimbabwe Dollar',
+ QatariRiyal:'Qatari Riyal',
+ CaymanIslandsDollar:'Cayman Islands Dollar',
+ Comorianfranc:'Comorian franc',
+ KuwaitiDinar:'Kuwaiti Dinar',
+ CroatianKuna:'Croatian Kuna',
+ KenyanShilling:'Kenyan Shilling',
+ LesothoLoti:'Lesotho Loti',
+ LaoKip:'Lao Kip',
+ LebanesePound:'Lebanese Pound',
+ Lithuanianlitas:'Lithuanian litas',
+ LibyanDinar:'Libyan Dinar',
+ LiberianDollar:'Liberian Dollar',
+ RwandaFranc:'Rwanda Franc',
+ RomanianLeu:'Romanian Leu',
+ MalagasyAriary:'Malagasy Ariary',
+ MaldivianRufiyaa:'Maldivian Rufiyaa',
+ MalawiKwacha:'Malawi Kwacha',
+ MalaysianRinggit:'Malaysian Ringgit',
+ MacedoniawearingDinar:'Macedonia wearing Dinar',
+ MauritiusRupee:'Mauritius Rupee',
+ MauritanianOuguiya:'Mauritanian Ouguiya',
+ MongolianTugrik:'Mongolian Tugrik',
+ BangladeshiTaka:'Bangladeshi Taka',
+ PeruvianNuevoSol:'Peruvian Nuevo Sol',
+ MyanmarKyat:'Myanmar Kyat',
+ MoldovanLeu:'Moldovan Leu',
+ MoroccanDirham:'Moroccan Dirham',
+ MozambiqueMetical:'Mozambique Metical',
+ MexicanPeso:'Mexican Peso',
+ NamibianDollar:'Namibian Dollar',
+ SouthAfricanRand:'South African Rand',
+ SouthSudanesePound:'South Sudanese Pound',
+ NicaraguaCordoba:'Nicaragua Cordoba',
+ NepaleseRupee:'Nepalese Rupee',
+ NigerianNaira:'Nigerian Naira',
+ NorwegianKrone:'Norwegian Krone',
+ GeorgianLari:'Georgian Lari',
+ RMBOffshore:'RMB (Offshore)',
+ SwedishKrona:'Swedish Krona',
+ SwissFranc:'Swiss Franc',
+ SerbianDinar:'Serbian Dinar',
+ SierraLeone:'Sierra Leone',
+ SeychellesRupee:'Seychelles Rupee',
+ SaudiRiyal:'Saudi Riyal',
+ SaoTomeDobra:'Sao Tome Dobra',
+ SaintHelenapound:'Saint Helena pound',
+ SriLankaRupee:'Sri Lanka Rupee',
+ SwazilandLilangeni:'Swaziland Lilangeni',
+ SudanesePound:'Sudanese Pound',
+ Surinamesedollar:'Surinamese dollar',
+ SolomonIslandsDollar:'Solomon Islands Dollar',
+ SomaliShilling:'Somali Shilling',
+ TajikistanSomoni:'Tajikistan Somoni',
+ PacificFranc:'Pacific Franc',
+ ThaiBaht:'Thai Baht',
+ TanzanianShilling:'Tanzanian Shilling',
+ TonganPaanga:"Tongan Pa'anga",
+ TrinidadandTobagoDollar:'Trinidad and Tobago Dollar',
+ TunisianDinar:'Tunisian Dinar',
+ TurkishLira:'Turkish Lira',
+ VanuatuVatu:'Vanuatu Vatu',
+ GuatemalanQuetzal:'Guatemalan Quetzal',
+ CommissionBolivar:'Commission Bolivar',
+ BruneiDollar:'Brunei Dollar',
+ UgandanShilling:'Ugandan Shilling',
+ UkrainianHryvnia:'Ukrainian Hryvnia',
+ UruguayanPeso:'Uruguayan Peso',
+ Uzbekistansom:'Uzbekistan som',
+ WesternSamoaTala:'Western Samoa Tala',
+ SingaporeDollar:'Singapore Dollar',
+ NT:'NT',
+ NewZealandDollar:'New Zealand Dollar',
+ HungarianForint:'Hungarian Forint',
+ SyrianPound:'Syrian Pound',
+ JamaicanDollar:'Jamaican Dollar',
+ ArmenianDram:'Armenian Dram',
+ YemeniRial:'Yemeni Rial',
+ IraqiDinar:'Iraqi Dinar',
+ IranianRial:'Iranian Rial',
+ NewIsraeliShekel:'New Israeli Shekel',
+ IndianRupee:'Indian Rupee',
+ IndonesianRupiah:'Indonesian Rupiah',
+ JordanianDinar:'Jordanian Dinar',
+ VND:'VND',
+ ZambianKwacha:'Zambian Kwacha',
+ GibraltarPound:'Gibraltar Pound',
+ ChileanPeso:'Chilean Peso',
+ CFAFrancBEAC:'CFA Franc BEAC'
+ },
+ defaultFmt:[
+ { "text": 'Automatic', "value": "General", "example": "" },
+ { "text": 'Plain text', "value": "@", "example": "" },
+ { "text": "", "value": "split", "example": "" },
+ { "text": 'Number', "value": "##0.00", "example": "1000.12" },
+ { "text": 'Percent', "value": "#0.00%", "example": "12.21%" },
+ { "text": 'Scientific', "value": "0.00E+00", "example": "1.01E+5" },
+ { "text": "", "value": "split", "example": "" },
+ { "text": 'Accounting', "value": "¥(0.00)", "example": "¥(1200.09)" },
+ { "text": 'Currency', "value": "¥0.00", "example": "¥1200.09" },
+ { "text": "", "value": "split", "example": "" },
+ { "text": 'Date', "value": "yyyy-MM-dd", "example": "2017-11-29" },
+ { "text": 'Time', "value": "hh:mm AM/PM", "example": "3:00 PM" },
+ { "text": 'Time 24H', "value": "hh:mm", "example": "15:00" },
+ { "text": 'Date time', "value": "yyyy-MM-dd hh:mm AM/PM", "example": "2017-11-29 3:00 PM" },
+ { "text": 'Date time 24 H', "value": "yyyy-MM-dd hh:mm", "example": "2017-11-29 15:00" },
+ { "text": "", "value": "split", "example": "" },
+ { "text": 'Custom formats', "value": "fmtOtherSelf", "example": "more" }
+ ],
+ dateFmtList:[
+ {
+ "name": "1930-08-05",
+ "value": "yyyy-MM-dd"
+ },
+ {
+ "name": "1930/8/5",
+ "value": "yyyy/MM/dd"
+ },
+ {
+ "name": "08-05",
+ "value": "MM-dd"
+ },
+ {
+ "name": "8-5",
+ "value": "M-d"
+ },
+ {
+ "name": "13:30:30",
+ "value": "h:mm:ss"
+ },
+ {
+ "name": "13:30",
+ "value": "h:mm"
+ },
+ {
+ "name": "PM 01:30",
+ "value": 'AM/PM hh:mm'
+ },
+ {
+ "name": "PM 1:30",
+ "value": 'AM/PM h:mm'
+ },
+ {
+ "name": "PM 1:30:30",
+ "value": 'AM/PM h:mm:ss'
+ },
+ {
+ "name": "08-05 PM 01:30",
+ "value": "MM-dd AM/PM hh:mm"
+ }
+ ],
+ fontFamily:{
+ MicrosoftYaHei:"YaHei",
+ },
+ fontarray: ["Times New Roman","Arial","Tahoma","Verdana"],
+ fontjson: {"arial":1,"times new roman":0,"tahoma":2,"verdana":3}
};
\ No newline at end of file
diff --git a/src/locale/zh.js b/src/locale/zh.js
index 392e524..da3e9aa 100644
--- a/src/locale/zh.js
+++ b/src/locale/zh.js
@@ -44,12 +44,26 @@ export default {
chart: '图表',
screenshot: '截图',
splitColumn: '分列',
+
+ clearText:"清除颜色选择",
+ noColorSelectedText:"没有颜色被选择",
+
+
},
alternatingColors:{
applyRange: '应用范围',
selectRange: '选择应用范围',
header: '页眉',
footer: '页脚',
+
+ errorInfo:"不能对多重选择区域执行此操作，请选择单个区域，然后再试",
+ textTitle:"格式样式",
+ custom:"自定义",
+ close:"关闭",
+ selectionTextColor:"点击选择文本颜色",
+ selectionCellColor:"点击选择单元格颜色",
+ removeColor:"移除交替颜色",
+ colorShow:"颜色",
},
button: {
confirm: '确定',
@@ -60,29 +74,265 @@ export default {
paintFormatEnd: 'ESC键退出',
},
format: {
- auto: '自动',
- text: '纯文本',
- number: '数字',
- percent: '百分比',
- scientific: '科学计数',
- accounting: '会计',
- tenThousand: '万元',
- currency: '货币',
- tenThousandDecimal: '万元2位小数',
- date: '日期',
- time: '时间',
- time24H: '时间24H',
- dateTime: '日期时间',
- dateTime24H: '日期时间24H',
- customFormats: '自定义格式',
moreCurrency: '更多货币格式',
moreDateTime: '更多日期与时间格式',
- moreNumber: '更多数字格式'
+ moreNumber: '更多数字格式',
+
+ titleCurrency: '货币格式',
+ decimalPlaces: '小数位数',
+ titleDateTime: '日期与时间格式',
+ titleNumber: '数字格式'
},
info: {
detailUpdate: '新打开',
detailSave: '已恢复本地缓存',
row: '行',
column: '列'
- }
+ },
+ currencyDetail:{
+ RMB:'人民币',
+ USdollar:'美元',
+ EUR:'欧元',
+ GBP:'英镑',
+ HK:'港元',
+ JPY:'日元',
+ AlbanianLek:'阿尔巴尼亚列克',
+ AlgerianDinar:'阿尔及利亚第纳尔',
+ Afghani:'阿富汗尼',
+ ArgentinePeso:'阿根廷比索',
+ UnitedArabEmiratesDirham:'阿拉伯联合酋长国迪拉姆',
+ ArubanFlorin:'阿鲁巴弗罗林',
+ OmaniRial:'阿曼里亚尔',
+ Azerbaijanimanat:'阿塞拜疆马纳特',
+ EgyptianPound:'埃及镑',
+ EthiopianBirr:'埃塞俄比亚比尔',
+ AngolaKwanza:'安哥拉宽扎',
+ AustralianDollar:'澳大利亚元',
+ Patacas:'澳门元',
+ BarbadosDollar:'巴巴多斯元',
+ PapuaNewGuineaKina:'巴布亚新几内亚基那',
+ BahamianDollar:'巴哈马元',
+ PakistanRupee:'巴基斯坦卢比',
+ ParaguayanGuarani:'巴拉圭瓜拉尼',
+ BahrainiDinar:'巴林第纳尔',
+ PanamanianBalboa:'巴拿马巴波亚',
+ Brazilianreal:'巴西里亚伊',
+ Belarusianruble:'白俄罗斯卢布',
+ BermudianDollar:'百慕大元',
+ BulgarianLev:'保加利亚列弗',
+ IcelandKrona:'冰岛克朗',
+ BosniaHerzegovinaConvertibleMark:'波黑可兑换马克',
+ PolishZloty:'波兰兹罗提',
+ Boliviano:'玻利维亚诺',
+ BelizeDollar:'伯利兹元',
+ BotswanaPula:'博茨瓦纳普拉',
+ NotDannuzhamu:'不丹努扎姆',
+ BurundiFranc:'布隆迪法郎',
+ NorthKoreanWon:'朝鲜圆',
+ DanishKrone:'丹麦克朗',
+ EastCaribbeanDollar:'东加勒比元',
+ DominicaPeso:'多米尼加比索',
+ RussianRuble:'俄国卢布',
+ EritreanNakfa:'厄立特里亚纳克法',
+ CFAfranc:'非洲金融共同体法郎',
+ PhilippinePeso:'菲律宾比索',
+ FijiDollar:'斐济元',
+ CapeVerdeEscudo:'佛得角埃斯库多',
+ FalklandIslandsPound:'福克兰群岛镑',
+ GambianDalasi:'冈比亚达拉西',
+ Congolesefranc:'刚果法郎',
+ ColombianPeso:'哥伦比亚比索',
+ CostaRicanColon:'哥斯达黎加科朗',
+ CubanPeso:'古巴比索',
+ Cubanconvertiblepeso:'古巴可兑换比索',
+ GuyanaDollar:'圭亚那元',
+ KazakhstanTenge:'哈萨克斯坦坚戈',
+ Haitiangourde:'海地古德',
+ won:'韩元',
+ NetherlandsAntillesGuilder:'荷属安的列斯盾',
+ Honduraslempiras:'洪都拉斯拉伦皮拉',
+ DjiboutiFranc:'吉布提法郎',
+ KyrgyzstanSom:'吉尔吉斯斯坦索姆',
+ GuineaFranc:'几内亚法郎',
+ CanadianDollar:'加拿大元',
+ GhanaianCedi:'加纳塞地',
+ Cambodianriel:'柬埔寨瑞尔',
+ CzechKoruna:'捷克克朗',
+ ZimbabweDollar:'津巴布韦元',
+ QatariRiyal:'卡塔尔里亚尔',
+ CaymanIslandsDollar:'开曼群岛元',
+ Comorianfranc:'科摩罗法郎',
+ KuwaitiDinar:'科威特第纳尔',
+ CroatianKuna:'克罗地亚库纳',
+ KenyanShilling:'肯尼亚先令',
+ LesothoLoti:'莱索托洛蒂',
+ LaoKip:'老挝基普',
+ LebanesePound:'黎巴嫩镑',
+ Lithuanianlitas:'立陶宛立特',
+ LibyanDinar:'利比亚第纳尔',
+ LiberianDollar:'利比亚元',
+ RwandaFranc:'卢旺达法郎',
+ RomanianLeu:'罗马尼亚列伊',
+ MalagasyAriary:'马达加斯加阿里亚里',
+ MaldivianRufiyaa:'马尔代夫拉菲亚',
+ MalawiKwacha:'马拉维克瓦查',
+ MalaysianRinggit:'马来西亚林吉特',
+ MacedoniawearingDinar:'马其顿戴第纳尔',
+ MauritiusRupee:'毛里求斯卢比',
+ MauritanianOuguiya:'毛里塔尼亚乌吉亚',
+ MongolianTugrik:'蒙古图格里克',
+ BangladeshiTaka:'孟加拉塔卡',
+ PeruvianNuevoSol:'秘鲁新索尔',
+ MyanmarKyat:'缅甸开亚特',
+ MoldovanLeu:'摩尔多瓦列伊',
+ MoroccanDirham:'摩洛哥迪拉姆',
+ MozambiqueMetical:'莫桑比克梅蒂卡尔',
+ MexicanPeso:'墨西哥比索',
+ NamibianDollar:'纳米比亚元',
+ SouthAfricanRand:'南非兰特',
+ SouthSudanesePound:'南苏丹镑',
+ NicaraguaCordoba:'尼加拉瓜科多巴',
+ NepaleseRupee:'尼泊尔卢比',
+ NigerianNaira:'尼日利亚奈拉',
+ NorwegianKrone:'挪威克朗',
+ GeorgianLari:'乔治亚拉瑞',
+ RMBOffshore:'人民币（离岸）',
+ SwedishKrona:'瑞典克朗',
+ SwissFranc:'瑞士法郎',
+ SerbianDinar:'塞尔维亚第纳尔',
+ SierraLeone:'塞拉利昂利昂',
+ SeychellesRupee:'塞舌尔卢比',
+ SaudiRiyal:'沙特里亚尔',
+ SaoTomeDobra:'圣多美多布拉',
+ SaintHelenapound:'圣赫勒拿群岛磅',
+ SriLankaRupee:'斯里兰卡卢比',
+ SwazilandLilangeni:'斯威士兰里兰吉尼',
+ SudanesePound:'苏丹镑',
+ Surinamesedollar:'苏里南元',
+ SolomonIslandsDollar:'所罗门群岛元',
+ SomaliShilling:'索马里先令',
+ TajikistanSomoni:'塔吉克斯坦索莫尼',
+ PacificFranc:'太平洋法郎',
+ ThaiBaht:'泰国铢',
+ TanzanianShilling:'坦桑尼亚先令',
+ TonganPaanga:'汤加潘加',
+ TrinidadandTobagoDollar:'特立尼达和多巴哥元',
+ TunisianDinar:'突尼斯第纳尔',
+ TurkishLira:'土耳其里拉',
+ VanuatuVatu:'瓦努阿图瓦图',
+ GuatemalanQuetzal:'危地马拉格查尔',
+ CommissionBolivar:'委内瑞拉博利瓦',
+ BruneiDollar:'文莱元',
+ UgandanShilling:'乌干达先令',
+ UkrainianHryvnia:'乌克兰格里夫尼亚',
+ UruguayanPeso:'乌拉圭比索',
+ Uzbekistansom:'乌兹别克斯坦苏姆',
+ WesternSamoaTala:'西萨摩亚塔拉',
+ SingaporeDollar:'新加坡元',
+ NT:'新台币',
+ NewZealandDollar:'新西兰元',
+ HungarianForint:'匈牙利福林',
+ SyrianPound:'叙利亚镑',
+ JamaicanDollar:'牙买加元',
+ ArmenianDram:'亚美尼亚德拉姆',
+ YemeniRial:'也门里亚尔',
+ IraqiDinar:'伊拉克第纳尔',
+ IranianRial:'伊朗里亚尔',
+ NewIsraeliShekel:'以色列新谢克尔',
+ IndianRupee:'印度卢比',
+ IndonesianRupiah:'印度尼西亚卢比',
+ JordanianDinar:'约旦第纳尔',
+ VND:'越南盾',
+ ZambianKwacha:'赞比亚克瓦查',
+ GibraltarPound:'直布罗陀镑',
+ ChileanPeso:'智利比索',
+ CFAFrancBEAC:'中非金融合作法郎',
+ },
+ defaultFmt:[
+ { "text": '自动', "value": "General", "example": "" },
+ { "text": '纯文本', "value": "@", "example": "" },
+ { "text": "", "value": "split", "example": "" },
+ { "text": '数字', "value": "##0.00", "example": "1000.12" },
+ { "text": '百分比', "value": "#0.00%", "example": "12.21%" },
+ { "text": '科学计数', "value": "0.00E+00", "example": "1.01E+5" },
+ { "text": "", "value": "split", "example": "" },
+ { "text": '会计', "value": "¥(0.00)", "example": "¥(1200.09)" },
+ //{ "text": "财务", "value": "(#.####)", "example": "(1200.09)" },
+ { "text": '万元', "value": "w", "example": "1亿2000万2500" },
+ { "text": '货币', "value": "¥0.00", "example": "¥1200.09" },
+ //{ "text": "货币整数", "value": "¥####", "example": "¥1200" },
+ { "text": '万元2位小数', "value": "w0.00", "example": "2万2500.55" },
+ { "text": "", "value": "split", "example": "" },
+ { "text": '日期', "value": "yyyy-MM-dd", "example": "2017-11-29" },
+ { "text": '时间', "value": "hh:mm AM/PM", "example": "3:00 PM" },
+ { "text": '时间24H', "value": "hh:mm", "example": "15:00" },
+ { "text": '日期时间', "value": "yyyy-MM-dd hh:mm AM/PM", "example": "2017-11-29 3:00 PM" },
+ { "text": '日期时间24H', "value": "yyyy-MM-dd hh:mm", "example": "2017-11-29 15:00" },
+ { "text": "", "value": "split", "example": "" },
+ { "text": '自定义格式', "value": "fmtOtherSelf", "example": "more" }
+ ],
+ dateFmtList:[
+ {
+ "name": "1930-08-05",
+ "value": "yyyy-MM-dd"
+ },
+ {
+ "name": "1930/8/5",
+ "value": "yyyy/MM/dd"
+ },
+ {
+ "name": "1930年8月5日",
+ "value": 'yyyy"年"M"月"d"日"'
+ },
+ {
+ "name": "08-05",
+ "value": "MM-dd"
+ },
+ {
+ "name": "8-5",
+ "value": "M-d"
+ },
+ {
+ "name": "8月5日",
+ "value": 'M"月"d"日"'
+ },
+ {
+ "name": "13:30:30",
+ "value": "h:mm:ss"
+ },
+ {
+ "name": "13:30",
+ "value": "h:mm"
+ },
+ {
+ "name": "下午01:30",
+ "value": 'AM/PM hh:mm'
+ },
+ {
+ "name": "下午1:30",
+ "value": 'AM/PM h:mm'
+ },
+ {
+ "name": "下午1:30:30",
+ "value": 'AM/PM h:mm:ss'
+ },
+ {
+ "name": "08-05 下午01:30",
+ "value": "MM-dd AM/PM hh:mm"
+ },
+ // {
+ // "name": "1930年8月5日星期二",
+ // "value": ''
+ // },
+ // {
+ // "name": "1930年8月5日星期二 下午1:30:30",
+ // "value": ''
+ // },
+ ],
+ fontFamily:{
+ MicrosoftYaHei:"Microsoft YaHei",
+ },
+ fontarray: ["微软雅黑","宋体","黑体","楷体","仿宋","新宋体","华文新魏","华文行楷","华文隶书","Arial","Times New Roman","Tahoma","Verdana"],
+ fontjson: {"微软雅黑":0,"microsoft yahei":0,"宋体":1,"simsun":1,"黑体":2,"simhei":2,"楷体":3,"kaiti":3,"仿宋":4,"fangsong":4,"新宋体":5,"nsimsun":5,"华文新魏":6,"stxinwei":6,"华文行楷":7,"stxingkai":7,"华文隶书":8,"stliti":8,"arial":9,"times new roman":10,"tahoma":11,"verdana":12}
+
};
diff --git a/src/plugins/js/jquery-ui.min.js b/src/plugins/js/jquery-ui.min.js
index 8c459fd..2b81c5b 100644
--- a/src/plugins/js/jquery-ui.min.js
+++ b/src/plugins/js/jquery-ui.min.js
@@ -1 +1 @@
-!function(){var t;t=function(M){M.ui=M.ui||{};M.ui.version="1.12.1";var n,i=0,l=Array.prototype.slice;M.cleanData=(n=M.cleanData,function(t){var e,i,s;for(s=0;null!=(i=t[s]);s++)try{(e=M._data(i,"events"))&&e.remove&&M(i).triggerHandler("remove")}catch(t){}n(t)}),M.widget=function(t,i,e){var s,n,o,a={},l=t.split(".")[0],h=l+"-"+(t=t.split(".")[1]);return e||(e=i,i=M.Widget),M.isArray(e)&&(e=M.extend.apply(null,[{}].concat(e))),M.expr[":"][h.toLowerCase()]=function(t){return!!M.data(t,h)},M[l]=M[l]||{},s=M[l][t],n=M[l][t]=function(t,e){if(!this._createWidget)return new n(t,e);arguments.length&&this._createWidget(t,e)},M.extend(n,s,{version:e.version,_proto:M.extend({},e),_childConstructors:[]}),(o=new i).options=M.widget.extend({},o.options),M.each(e,function(e,o){M.isFunction(o)?a[e]=function(){function s(){return i.prototype[e].apply(this,arguments)}function n(t){return i.prototype[e].apply(this,t)}return function(){var t,e=this._super,i=this._superApply;return this._super=s,this._superApply=n,t=o.apply(this,arguments),this._super=e,this._superApply=i,t}}():a[e]=o}),n.prototype=M.widget.extend(o,{widgetEventPrefix:s&&o.widgetEventPrefix||t},a,{constructor:n,namespace:l,widgetName:t,widgetFullName:h}),s?(M.each(s._childConstructors,function(t,e){var i=e.prototype;M.widget(i.namespace+"."+i.widgetName,n,e._proto)}),delete s._childConstructors):i._childConstructors.push(n),M.widget.bridge(t,n),n},M.widget.extend=function(t){for(var e,i,s=l.call(arguments,1),n=0,o=s.length;n
",options:{classes:{},disabled:!1,create:null},_createWidget:function(t,e){e=M(e||this.defaultElement||this)[0],this.element=M(e),this.uuid=i++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=M(),this.hoverable=M(),this.focusable=M(),this.classesElementLookup={},e!==this&&(M.data(e,this.widgetFullName,this),this._on(!0,this.element,{remove:function(t){t.target===e&&this.destroy()}}),this.document=M(e.style?e.ownerDocument:e.document||e),this.window=M(this.document[0].defaultView||this.document[0].parentWindow)),this.options=M.widget.extend({},this.options,this._getCreateOptions(),t),this._create(),this.options.disabled&&this._setOptionDisabled(this.options.disabled),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:function(){return{}},_getCreateEventData:M.noop,_create:M.noop,_init:M.noop,destroy:function(){var i=this;this._destroy(),M.each(this.classesElementLookup,function(t,e){i._removeClass(e,t)}),this.element.off(this.eventNamespace).removeData(this.widgetFullName),this.widget().off(this.eventNamespace).removeAttr("aria-disabled"),this.bindings.off(this.eventNamespace)},_destroy:M.noop,widget:function(){return this.element},option:function(t,e){var i,s,n,o=t;if(0===arguments.length)return M.widget.extend({},this.options);if("string"==typeof t)if(o={},t=(i=t.split(".")).shift(),i.length){for(s=o[t]=M.widget.extend({},this.options[t]),n=0;n"),s=i.children()[0];return M("body").append(i),t=s.offsetWidth,i.css("overflow","scroll"),t===(e=s.offsetWidth)&&(e=i[0].clientWidth),i.remove(),n=t-e},getScrollInfo:function(t){var e=t.isWindow||t.isDocument?"":t.element.css("overflow-x"),i=t.isWindow||t.isDocument?"":t.element.css("overflow-y"),s="scroll"===e||"auto"===e&&t.width
-## Authors and acknowledgment - 贡献者和感谢
-- Bug Pan ([@wpxp123456](https://github.com/wpxp123456))
-- Dushusir ([@Dushusir](https://github.com/Dushusir))
+## 贡献者和感谢
+- [@wpxp123456](https://github.com/wpxp123456)
+- [@Dushusir](https://github.com/Dushusir)
-## License - 版权信息
+## 版权信息
[MIT](http://opensource.org/licenses/MIT)
Copyright (c) 2020-present, mengshukeji
diff --git a/README.md b/README.md
index 0745dd9..383c666 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
# Luckysheet
+[](https://gitter.im/mengshukeji/Luckysheet?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
English| [简体中文](./README-zh.md)
## Introduction
@@ -17,10 +19,14 @@ Luckysheet is an online spreadsheet like excel that is powerful, simple to confi
## Plan
-- modularization (in progress)
-- Excel import/export
-- Form
+- Improve chart plugin
- Insert picture
+- Data validation (checkbox, drop-down list)
+- Print
+- Cell segmentation style
+- Tree menu
+- Table function: filter, slice
+- Excel import/export
- More...
## Documentation
@@ -88,11 +94,11 @@ mengshu@office2.cn
## communication
-coming soon!
+- [Gitter](https://gitter.im/mengshukeji/Luckysheet)
## Authors and acknowledgment
-- Bug Pan ([@wpxp123456](https://github.com/wpxp123456))
-- Dushusir ([@Dushusir](https://github.com/Dushusir))
+- [@wpxp123456](https://github.com/wpxp123456)
+- [@Dushusir](https://github.com/Dushusir)
## License
[MIT](http://opensource.org/licenses/MIT)
diff --git a/src/config.js b/src/config.js
index 4847416..045b137 100644
--- a/src/config.js
+++ b/src/config.js
@@ -22,7 +22,7 @@ export default {
config: {}, //表格行高、列宽、合并单元格、公式等设置
fullscreenmode: true, //是否全屏模式，非全屏模式下，标记框不会强制选中。
devicePixelRatio: window.devicePixelRatio, //设备比例，比例越大表格分标率越高
- allowEdit: false, //是否允许前台编辑
+ allowEdit: true, //是否允许前台编辑
loadUrl: "", // 配置loadUrl的地址，luckysheet会通过ajax请求表格数据，默认载入status为1的sheet数据中的所有data，其余的sheet载入除data字段外的所有字段
loadSheetUrl: "", //配置loadSheetUrl的地址，参数为gridKey（表格主键） 和 index（sheet主键合集，格式为[1,2,3]），返回的数据为sheet的data字段数据集合
gridKey: "", // 表格唯一标识符
diff --git a/src/controllers/alternateformat.js b/src/controllers/alternateformat.js
index 86514aa..25a6adf 100644
--- a/src/controllers/alternateformat.js
+++ b/src/controllers/alternateformat.js
@@ -264,7 +264,7 @@ const alternateformat = {
let _this = this;
$("#luckysheet-modal-dialog-slider-alternateformat").remove();
- $("body").append(luckysheetAlternateformatHtml);
+ $("body").append(luckysheetAlternateformatHtml());
luckysheetsizeauto();
//关闭
diff --git a/src/controllers/conditionformat.js b/src/controllers/conditionformat.js
index 772cad5..29ae399 100644
--- a/src/controllers/conditionformat.js
+++ b/src/controllers/conditionformat.js
@@ -2064,6 +2064,9 @@ const conditionformat = {
$("#luckysheet-editorConditionRule-dialog #isPercent").attr("checked", "checked");
}
}
+
+ $("#luckysheet-editorConditionRule-dialog #textcolorshow").spectrum("set", ruleFormat.textColor);
+ $("#luckysheet-editorConditionRule-dialog #cellcolorshow").spectrum("set", ruleFormat.cellColor);
}
},
infoDialog: function(title, content){
@@ -3333,8 +3336,9 @@ const conditionformat = {
dSmall = genarate(conditionValue0)[2];
}
else{
- dBig = genarate(conditionValue0.toString().split("-")[1])[2];
- dSmall = genarate(conditionValue0.toString().split("-")[0])[2];
+ let str = conditionValue0.toString().split("-");
+ dBig = genarate(str[1].trim())[2];
+ dSmall = genarate(str[0].trim())[2];
}
//循环应用范围计算
for(let r = cellrange[s].row[0]; r <= cellrange[s].row[1]; r++){
diff --git a/src/controllers/constant.js b/src/controllers/constant.js
index eeceea6..34ce534 100644
--- a/src/controllers/constant.js
+++ b/src/controllers/constant.js
@@ -1,4 +1,4 @@
-import locale from '../locale/locale'
+import locale from '../locale/locale';
//dom variable
const gridHTML = '