Browse Source

'chart'

master
liurunze 5 years ago
parent
commit
ce2c8ee091
  1. 4
      src/controllers/handler.js
  2. 3
      src/controllers/sheetmanage.js
  3. 13
      src/demoData/sheetCell.js
  4. 13
      src/demoData/sheetComment.js
  5. 13
      src/demoData/sheetConditionFormat.js
  6. 13
      src/demoData/sheetFormula.js
  7. 13
      src/demoData/sheetPivotTable.js
  8. 13
      src/demoData/sheetPivotTableData.js
  9. 13
      src/demoData/sheetSparkline.js
  10. 13
      src/demoData/sheetTable.js
  11. 1575
      src/expendPlugins/chart/plugin.js

4
src/controllers/handler.js

@ -56,7 +56,7 @@ import { getBorderInfoCompute } from '../global/border';
import { luckysheetDrawMain } from '../global/draw'; import { luckysheetDrawMain } from '../global/draw';
import locale from '../locale/locale'; import locale from '../locale/locale';
import Store from '../store'; import Store from '../store';
import { createLuckyChart } from '../expendPlugins/chart/plugin' import { createLuckyChart, hideAllNeedRangeShow } from '../expendPlugins/chart/plugin'
//, columeflowset, rowflowset //, columeflowset, rowflowset
export default function luckysheetHandler() { export default function luckysheetHandler() {
@ -828,7 +828,7 @@ export default function luckysheetHandler() {
if (!isEditMode()) { if (!isEditMode()) {
//chartMix 隐藏当前页的数据选择区域高亮 //chartMix 隐藏当前页的数据选择区域高亮
!!window.store && store.commit("hideAllNeedRangeShow"); hideAllNeedRangeShow();
} }
$("#luckysheet-helpbox-cell").text(getRangetxt(Store.currentSheetIndex, Store.luckysheet_select_save[Store.luckysheet_select_save.length - 1])); $("#luckysheet-helpbox-cell").text(getRangetxt(Store.currentSheetIndex, Store.luckysheet_select_save[Store.luckysheet_select_save.length - 1]));

3
src/controllers/sheetmanage.js

@ -21,6 +21,7 @@ import { createFilterOptions, labelFilterOptionState } from './filter';
import { selectHightlightShow, selectionCopyShow } from './select'; import { selectHightlightShow, selectionCopyShow } from './select';
import Store from '../store'; import Store from '../store';
import locale from '../locale/locale'; import locale from '../locale/locale';
import { renderChartShow } from '../expendPlugins/chart/plugin'
const sheetmanage = { const sheetmanage = {
generateRandomSheetIndex: function(prefix) { generateRandomSheetIndex: function(prefix) {
@ -928,7 +929,7 @@ const sheetmanage = {
$("#luckysheet-datavisual-selection-set-" + index).show(); $("#luckysheet-datavisual-selection-set-" + index).show();
//隐藏其他sheet的图表,显示当前sheet的图表 chartMix //隐藏其他sheet的图表,显示当前sheet的图表 chartMix
!!window.generator && generator.renderChartShow(index); renderChartShow(index);
luckysheetFreezen.initialFreezen(index); luckysheetFreezen.initialFreezen(index);
_this.restoreselect(); _this.restoreselect();

13
src/demoData/sheetCell.js

@ -1164,18 +1164,7 @@ const sheetCell = {
} }
}, },
"index": "0", "index": "0",
"chart": [{ "chart": [],
"sheetIndex": "0",
"dataSheetIndex": "0",
"chartType": "column",
"row": "[1,3]",
"column": "[3,3]",
"chartStyle": "default",
"myWidth": "480",
"myHeight": "288",
"myLeft": "67",
"myTop": "11"
}],
"status": "1", "status": "1",
"order": "0", "order": "0",
"column": 18, "column": 18,

13
src/demoData/sheetComment.js

@ -7,18 +7,7 @@ const sheetComment = {
} }
}, },
"index": "5", "index": "5",
"chart": [{ "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", "status": "0",
"order": "5", "order": "5",
"column": 18, "column": 18,

13
src/demoData/sheetConditionFormat.js

@ -154,18 +154,7 @@ const sheetConditionFormat = {
} }
}, },
"index": "2", "index": "2",
"chart": [{ "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", "status": "0",
"order": "2", "order": "2",
"column": 18, "column": 18,

13
src/demoData/sheetFormula.js

@ -85,18 +85,7 @@ const sheetFormula = {
} }
}, },
"index": "1", "index": "1",
"chart": [{ "chart": [],
"sheetIndex": "0",
"dataSheetIndex": "0",
"chartType": "column",
"row": "[1,3]",
"column": "[3,3]",
"chartStyle": "default",
"myWidth": "480",
"myHeight": "288",
"myLeft": "67",
"myTop": "11"
}],
"status": 1, "status": 1,
"order": "1", "order": "1",
"column": 18, "column": 18,

13
src/demoData/sheetPivotTable.js

@ -3,18 +3,7 @@ const sheetPivotTable = {
"color": "", "color": "",
"config": {}, "config": {},
"index": "7", "index": "7",
"chart": [{ "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", "status": "0",
"order": "7", "order": "7",
"column": 18, "column": 18,

13
src/demoData/sheetPivotTableData.js

@ -5,18 +5,7 @@ const sheetPivotTableData = {
"merge": {} "merge": {}
}, },
"index": "6", "index": "6",
"chart": [{ "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", "status": "0",
"order": "6", "order": "6",
"hide": 0, "hide": 0,

13
src/demoData/sheetSparkline.js

@ -444,18 +444,7 @@ const sheetSparkline = {
}] }]
}, },
"index": "4", "index": "4",
"chart": [{ "chart": [],
"sheetIndex": "0",
"dataSheetIndex": "0",
"chartType": "column",
"row": "[1,3]",
"column": "[3,3]",
"chartStyle": "default",
"myWidth": "480",
"myHeight": "288",
"myLeft": "67",
"myTop": "11"
}],
"status": 1, "status": 1,
"order": "4", "order": "4",
"column": 18, "column": 18,

13
src/demoData/sheetTable.js

@ -42,18 +42,7 @@ const sheetTable = {
} }
}, },
"index": "3", "index": "3",
"chart": [{ "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", "status": "0",
"order": "3", "order": "3",
"column": 18, "column": 18,

1575
src/expendPlugins/chart/plugin.js

File diff suppressed because it is too large
Loading…
Cancel
Save