diff --git a/demoData/sheetCell.js b/demoData/sheetCell.js index 14b89a4..05b81ed 100644 --- a/demoData/sheetCell.js +++ b/demoData/sheetCell.js @@ -1174,7 +1174,7 @@ const sheetCell = { }], "status": "1", "order": "0", - "column": 12, + "column": 18, "row": 36, "celldata": [{ "r": 0, diff --git a/demoData/sheetComment.js b/demoData/sheetComment.js index 1d6fa16..f641700 100644 --- a/demoData/sheetComment.js +++ b/demoData/sheetComment.js @@ -21,7 +21,7 @@ const sheetComment = { }], "status": "0", "order": "4", - "column": 15, + "column": 18, "row": 36, "celldata": [{ "r": 2, diff --git a/demoData/sheetConditionFormat.js b/demoData/sheetConditionFormat.js index 3daed3f..4280df3 100644 --- a/demoData/sheetConditionFormat.js +++ b/demoData/sheetConditionFormat.js @@ -168,7 +168,7 @@ const sheetConditionFormat = { }], "status": "0", "order": "2", - "column": 15, + "column": 18, "row": 36, "celldata": [{ "r": 0, diff --git a/demoData/sheetFormula.js b/demoData/sheetFormula.js index c175cb3..b896b7e 100644 --- a/demoData/sheetFormula.js +++ b/demoData/sheetFormula.js @@ -99,7 +99,7 @@ const sheetFormula = { }], "status": "0", "order": "1", - "column": 15, + "column": 18, "row": 45, "celldata": [{ "r": 0, diff --git a/demoData/sheetPivotTable.js b/demoData/sheetPivotTable.js new file mode 100644 index 0000000..ca25551 --- /dev/null +++ b/demoData/sheetPivotTable.js @@ -0,0 +1,203 @@ +const sheetPivotTable = { + "name": "PivotTable", + "color": "", + "config": {}, + "index": "6", + "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": "6", + "column": 18, + "row": 36, + "celldata": [{ + "r": 0, + "c": 0, + "v": "计数:分数" + }, { + "r": 0, + "c": 1, + "v": "理综" + }, { + "r": 0, + "c": 2, + "v": "数学" + }, { + "r": 0, + "c": 3, + "v": "英语" + }, { + "r": 0, + "c": 4, + "v": "语文" + }, { + "r": 0, + "c": 5, + "v": "总计" + }, { + "r": 1, + "c": 0, + "v": "Alex" + }, { + "r": 1, + "c": 1, + "v": 1 + }, { + "r": 1, + "c": 2, + "v": 1 + }, { + "r": 1, + "c": 3, + "v": 1 + }, { + "r": 1, + "c": 4, + "v": 1 + }, { + "r": 1, + "c": 5, + "v": 4 + }, { + "r": 2, + "c": 0, + "v": "Joy" + }, { + "r": 2, + "c": 1, + "v": 1 + }, { + "r": 2, + "c": 2, + "v": 1 + }, { + "r": 2, + "c": 3, + "v": 1 + }, { + "r": 2, + "c": 4, + "v": 1 + }, { + "r": 2, + "c": 5, + "v": 4 + }, { + "r": 3, + "c": 0, + "v": "Tim" + }, { + "r": 3, + "c": 1, + "v": 1 + }, { + "r": 3, + "c": 2, + "v": 1 + }, { + "r": 3, + "c": 3, + "v": 1 + }, { + "r": 3, + "c": 4, + "v": 1 + }, { + "r": 3, + "c": 5, + "v": 4 + }, { + "r": 4, + "c": 0, + "v": "总计" + }, { + "r": 4, + "c": 1, + "v": 3 + }, { + "r": 4, + "c": 2, + "v": 3 + }, { + "r": 4, + "c": 3, + "v": 3 + }, { + "r": 4, + "c": 4, + "v": 3 + }, { + "r": 4, + "c": 5, + "v": 12 + }], + "visibledatarow": [], + "visibledatacolumn": [], + "rowsplit": [], + "ch_width": 4748, + "rh_height": 1790, + "luckysheet_select_save": [{ + "row": [0, 0], + "column": [0, 0] + }], + "luckysheet_selection_range": [], + "scrollLeft": 0, + "scrollTop": 0, + "isPivotTable": true, + "pivotTable": { + "pivot_select_save": { + "left": 0, + "width": 73, + "top": 0, + "height": 19, + "left_move": 0, + "width_move": 369, + "top_move": 0, + "height_move": 259, + "row": [0, 12], + "column": [0, 4], + "row_focus": 0, + "column_focus": 0 + }, + "pivotDataSheetIndex": 5, //The sheet index where the source data is located + "column": [{ + "index": 3, + "name": "科目", + "fullname": "科目" + }], + "row": [{ + "index": 1, + "name": "学生", + "fullname": "学生" + }], + "filter": [], + "values": [{ + "index": 4, + "name": "分数", + "fullname": "计数:分数", + "sumtype": "COUNTA", + "nameindex": 0 + }], + "showType": "column", + "pivotDatas": [ + ["计数:分数", "理综", "数学", "英语", "语文", "总计"], + ["Alex", 1, 1, 1, 1, 4], + ["Joy", 1, 1, 1, 1, 4], + ["Tim", 1, 1, 1, 1, 4], + ["总计", 3, 3, 3, 3, 12] + ], + "drawPivotTable": false, + "pivotTableBoundary": [5, 6] + } +} + +export default sheetPivotTable; \ No newline at end of file diff --git a/demoData/sheetPivotTableData.js b/demoData/sheetPivotTableData.js new file mode 100644 index 0000000..f6adef7 --- /dev/null +++ b/demoData/sheetPivotTableData.js @@ -0,0 +1,755 @@ +const sheetPivotTableData = { + "name": "PivotTableData", + "color": "", + "config": { + "merge": {} + }, + "index": "5", + "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": "5", + "hide": 1, + "column": 18, + "row": 36, + "celldata": [{ + "r": 0, + "c": 0, + "v": { + "m": "模考", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "模考" + } + }, { + "r": 0, + "c": 1, + "v": { + "m": "学生", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "学生" + } + }, { + "r": 0, + "c": 2, + "v": { + "m": "班级", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "班级" + } + }, { + "r": 0, + "c": 3, + "v": { + "m": "科目", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "科目" + } + }, { + "r": 0, + "c": 4, + "v": { + "m": "分数", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "分数" + } + }, { + "r": 1, + "c": 0, + "v": { + "m": "第一轮", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "第一轮" + } + }, { + "r": 1, + "c": 1, + "v": { + "ct": { + "fa": "General", + "t": "g" + }, + "v": "Joy", + "m": "Joy" + } + }, { + "r": 1, + "c": 2, + "v": { + "m": "一班", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "一班" + } + }, { + "r": 1, + "c": 3, + "v": { + "m": "语文", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "语文" + } + }, { + "r": 1, + "c": 4, + "v": { + "v": 96, + "ct": { + "fa": "General", + "t": "n" + }, + "m": "96" + } + }, { + "r": 2, + "c": 0, + "v": { + "m": "第一轮", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "第一轮" + } + }, { + "r": 2, + "c": 1, + "v": { + "ct": { + "fa": "General", + "t": "g" + }, + "v": "Joy", + "m": "Joy" + } + }, { + "r": 2, + "c": 2, + "v": { + "m": "一班", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "一班" + } + }, { + "r": 2, + "c": 3, + "v": { + "m": "数学", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "数学" + } + }, { + "r": 2, + "c": 4, + "v": { + "v": 110, + "ct": { + "fa": "General", + "t": "n" + }, + "m": "110" + } + }, { + "r": 3, + "c": 0, + "v": { + "m": "第一轮", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "第一轮" + } + }, { + "r": 3, + "c": 1, + "v": { + "ct": { + "fa": "General", + "t": "g" + }, + "v": "Joy", + "m": "Joy" + } + }, { + "r": 3, + "c": 2, + "v": { + "m": "一班", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "一班" + } + }, { + "r": 3, + "c": 3, + "v": { + "m": "英语", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "英语" + } + }, { + "r": 3, + "c": 4, + "v": { + "v": 87, + "ct": { + "fa": "General", + "t": "n" + }, + "m": "87" + } + }, { + "r": 4, + "c": 0, + "v": { + "m": "第一轮", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "第一轮" + } + }, { + "r": 4, + "c": 1, + "v": { + "ct": { + "fa": "General", + "t": "g" + }, + "v": "Joy", + "m": "Joy" + } + }, { + "r": 4, + "c": 2, + "v": { + "m": "一班", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "一班" + } + }, { + "r": 4, + "c": 3, + "v": { + "m": "理综", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "理综" + } + }, { + "r": 4, + "c": 4, + "v": { + "v": 266, + "ct": { + "fa": "General", + "t": "n" + }, + "m": "266" + } + }, { + "r": 5, + "c": 0, + "v": { + "m": "第一轮", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "第一轮" + } + }, { + "r": 5, + "c": 1, + "v": { + "ct": { + "fa": "General", + "t": "g" + }, + "v": "Tim", + "m": "Tim" + } + }, { + "r": 5, + "c": 2, + "v": { + "m": "一班", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "一班" + } + }, { + "r": 5, + "c": 3, + "v": { + "m": "语文", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "语文" + } + }, { + "r": 5, + "c": 4, + "v": { + "v": 92, + "ct": { + "fa": "General", + "t": "n" + }, + "m": "92" + } + }, { + "r": 6, + "c": 0, + "v": { + "m": "第一轮", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "第一轮" + } + }, { + "r": 6, + "c": 1, + "v": { + "ct": { + "fa": "General", + "t": "g" + }, + "v": "Tim", + "m": "Tim" + } + }, { + "r": 6, + "c": 2, + "v": { + "m": "一班", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "一班" + } + }, { + "r": 6, + "c": 3, + "v": { + "m": "数学", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "数学" + } + }, { + "r": 6, + "c": 4, + "v": { + "v": 100, + "ct": { + "fa": "General", + "t": "n" + }, + "m": "100" + } + }, { + "r": 7, + "c": 0, + "v": { + "m": "第一轮", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "第一轮" + } + }, { + "r": 7, + "c": 1, + "v": { + "ct": { + "fa": "General", + "t": "g" + }, + "v": "Tim", + "m": "Tim" + } + }, { + "r": 7, + "c": 2, + "v": { + "m": "一班", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "一班" + } + }, { + "r": 7, + "c": 3, + "v": { + "m": "英语", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "英语" + } + }, { + "r": 7, + "c": 4, + "v": { + "v": 90, + "ct": { + "fa": "General", + "t": "n" + }, + "m": "90" + } + }, { + "r": 8, + "c": 0, + "v": { + "m": "第一轮", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "第一轮" + } + }, { + "r": 8, + "c": 1, + "v": { + "ct": { + "fa": "General", + "t": "g" + }, + "v": "Tim", + "m": "Tim" + } + }, { + "r": 8, + "c": 2, + "v": { + "m": "一班", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "一班" + } + }, { + "r": 8, + "c": 3, + "v": { + "m": "理综", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "理综" + } + }, { + "r": 8, + "c": 4, + "v": { + "v": 255, + "ct": { + "fa": "General", + "t": "n" + }, + "m": "255" + } + }, { + "r": 9, + "c": 0, + "v": { + "m": "第一轮", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "第一轮" + } + }, { + "r": 9, + "c": 1, + "v": { + "m": "Alex", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "Alex" + } + }, { + "r": 9, + "c": 2, + "v": { + "m": "一班", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "一班" + } + }, { + "r": 9, + "c": 3, + "v": { + "m": "语文", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "语文" + } + }, { + "r": 9, + "c": 4, + "v": { + "v": 108, + "ct": { + "fa": "General", + "t": "n" + }, + "m": "108" + } + }, { + "r": 10, + "c": 0, + "v": { + "m": "第一轮", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "第一轮" + } + }, { + "r": 10, + "c": 1, + "v": { + "m": "Alex", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "Alex" + } + }, { + "r": 10, + "c": 2, + "v": { + "m": "一班", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "一班" + } + }, { + "r": 10, + "c": 3, + "v": { + "m": "数学", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "数学" + } + }, { + "r": 10, + "c": 4, + "v": { + "v": 117, + "ct": { + "fa": "General", + "t": "n" + }, + "m": "117" + } + }, { + "r": 11, + "c": 0, + "v": { + "m": "第一轮", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "第一轮" + } + }, { + "r": 11, + "c": 1, + "v": { + "m": "Alex", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "Alex" + } + }, { + "r": 11, + "c": 2, + "v": { + "m": "一班", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "一班" + } + }, { + "r": 11, + "c": 3, + "v": { + "m": "英语", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "英语" + } + }, { + "r": 11, + "c": 4, + "v": { + "v": 88, + "ct": { + "fa": "General", + "t": "n" + }, + "m": "88" + } + }, { + "r": 12, + "c": 0, + "v": { + "m": "第一轮", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "第一轮" + } + }, { + "r": 12, + "c": 1, + "v": { + "m": "Alex", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "Alex" + } + }, { + "r": 12, + "c": 2, + "v": { + "m": "一班", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "一班" + } + }, { + "r": 12, + "c": 3, + "v": { + "m": "理综", + "ct": { + "fa": "General", + "t": "g" + }, + "v": "理综" + } + }, { + "r": 12, + "c": 4, + "v": { + "v": 278, + "ct": { + "fa": "General", + "t": "n" + }, + "m": "278" + } + }], + "visibledatarow": [], + "visibledatacolumn": [], + "rowsplit": [], + "ch_width": 4748, + "rh_height": 1790, + "luckysheet_select_save": [{ + "row": [0, 0], + "column": [0, 0] + }], + "luckysheet_selection_range": [], + "scrollLeft": 0, + "scrollTop": 0 +} + +export default sheetPivotTableData; \ No newline at end of file diff --git a/demoData/sheetTable.js b/demoData/sheetTable.js index 66c0ebb..3373a6d 100644 --- a/demoData/sheetTable.js +++ b/demoData/sheetTable.js @@ -56,7 +56,7 @@ const sheetTable = { }], "status": "0", "order": "3", - "column": 15, + "column": 18, "row": 36, "celldata": [{ "r": 0, diff --git a/docs/guide/config.md b/docs/guide/config.md index 9e709c7..6fd5bb5 100644 --- a/docs/guide/config.md +++ b/docs/guide/config.md @@ -79,12 +79,6 @@ - Default: true - Usage: Whether to display the bottom count bar ------------- -## editMode -- Type: Boolean -- Default: false -- Usage: Whether it is edit mode - ------------ ## allowEdit - Type: Boolean diff --git a/docs/zh/guide/config.md b/docs/zh/guide/config.md index e4de4ee..daa2778 100644 --- a/docs/zh/guide/config.md +++ b/docs/zh/guide/config.md @@ -79,12 +79,6 @@ - 默认值:true - 作用:是否显示底部计数栏 ------------- -## editMode -- 类型:Boolean -- 默认值:false -- 作用:是否为编辑模式 - ------------ ## allowEdit - 类型:Boolean diff --git a/gulpfile.js b/gulpfile.js index 6c625ba..1ee6470 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -63,6 +63,7 @@ function watchReload() { if (reloadTimer !== null) { + clearTimeout(reloadTimer); return; } reloadTimer = setTimeout(() => { diff --git a/index.html b/index.html index ebd31b1..9ae3368 100644 --- a/index.html +++ b/index.html @@ -53,11 +53,14 @@ import sheetConditionFormat from './demoData/sheetConditionFormat.js' import sheetTable from './demoData/sheetTable.js' import sheetComment from './demoData/sheetComment.js' + import sheetPivotTableData from './demoData/sheetPivotTableData.js' + import sheetPivotTable from './demoData/sheetPivotTable.js' $(function () { luckysheet.create({ container: 'luckysheet', - data: [sheetCell,sheetFormula,sheetConditionFormat,sheetTable,sheetComment] + lang: 'zh', + data: [sheetCell,sheetFormula,sheetConditionFormat,sheetTable,sheetComment,sheetPivotTableData,sheetPivotTable] }) }) diff --git a/src/config.js b/src/config.js index 10f9013..fbeecfc 100644 --- a/src/config.js +++ b/src/config.js @@ -49,5 +49,6 @@ export default { editMode: false, //是否为编辑模式 chartConfigChange: null,//图表插件中图表更新触发的自定义方法 beforeCreateDom: null,//表格创建之前的方法 - fireMousedown: null //单元格数据下钻 + fireMousedown: null, //单元格数据下钻 + lang: 'en', //language } \ No newline at end of file diff --git a/src/controllers/constant.js b/src/controllers/constant.js index bac28fb..9737bdc 100644 --- a/src/controllers/constant.js +++ b/src/controllers/constant.js @@ -1,3 +1,5 @@ +import locale from '../locale/locale' + //dom variable const gridHTML = '