update

jiang

src/demoData/sheetCell.js

@@ -1165,16 +1165,11 @@ const sheetCell = {
 	},
 	"index": "0",
 	"chart": [{
-		"sheetIndex": "0",
+		"chart_id": "chart_5erpeWc1eWal_1596092336315",
-		"dataSheetIndex": "0",
+		"width": 400,
-		"chartType": "column",
+		"height": 250,
-		"row": "[1,3]",
+		"top": 30,
-		"column": "[3,3]",
+		"left": 50
-		"chartStyle": "default",
-		"width": "480",
-		"height": "288",
-		"left": "67",
-		"top": "11"
 	}],
 	"status": "1",
 	"order": "0",

src/expendPlugins/chart/plugin.js

@@ -69,8 +69,8 @@ function chart(data) {
         chartInfo.chartparam.renderChart = chartmix.default.renderChart
 
         // 初始化渲染图表
-        for(let i = 0; i < data.length; i++){
+        for (let i = 0; i < data.length; i++) {
-            if(data[i].status == '1'){
+            if (data[i].status == '1') {
                 renderCharts(data[i].chart)
             }
         }
@@ -78,13 +78,48 @@ function chart(data) {
 }
 
 // rendercharts
-function renderCharts(chartLists){
+function renderCharts(chartLists) {
+    for (let i = 0; i < chartLists.length; i++) {
+        let chart = chartLists[i]
+        let chart_id_c = chart.chart_id + '_c'
+        let modelChartShowHTML =
+            '<div id="${id}"class="luckysheet-modal-dialog luckysheet-modal-dialog-chart ${addclass}"tabindex="0"role="dialog"aria-labelledby=":41e"dir="ltr"><div class="luckysheet-modal-dialog-resize"><div class="luckysheet-modal-dialog-resize-item luckysheet-modal-dialog-resize-item-lt"data-type="lt"></div><div class="luckysheet-modal-dialog-resize-item luckysheet-modal-dialog-resize-item-mt"data-type="mt"></div><div class="luckysheet-modal-dialog-resize-item luckysheet-modal-dialog-resize-item-lm"data-type="lm"></div><div class="luckysheet-modal-dialog-resize-item luckysheet-modal-dialog-resize-item-rm"data-type="rm"></div><div class="luckysheet-modal-dialog-resize-item luckysheet-modal-dialog-resize-item-rt"data-type="rt"></div><div class="luckysheet-modal-dialog-resize-item luckysheet-modal-dialog-resize-item-lb"data-type="lb"></div><div class="luckysheet-modal-dialog-resize-item luckysheet-modal-dialog-resize-item-mb"data-type="mb"></div><div class="luckysheet-modal-dialog-resize-item luckysheet-modal-dialog-resize-item-rb"data-type="rb"></div></div><div class="luckysheet-modal-dialog-controll"><span class="luckysheet-modal-controll-btn luckysheet-modal-controll-update"role="button"tabindex="0"aria-label="修改图表"title="修改图表"><i class="fa fa-pencil"aria-hidden="true"></i></span><span class="luckysheet-modal-controll-btn luckysheet-modal-controll-max"role="butluckysheet_chartIns_indexton"tabindex="0"aria-label="最大化"title="最大化"><i class="fa fa-window-maximize"aria-hidden="true"></i></span><span class="luckysheet-modal-controll-btn luckysheet-modal-controll-del"role="button"tabindex="0"aria-label="删除"title="删除"><i class="fa fa-trash"aria-hidden="true"></i></span></div><div class="luckysheet-modal-dialog-content">${content}</div></div>'
+
+        let $t = $(
+            replaceHtml(modelChartShowHTML, {
+                id: chart_id_c,
+                addclass: 'luckysheet-data-visualization-chart',
+                title: '图表生成',
+                content: ''
+            })
+        ).appendTo($('.luckysheet-cell-main'))
+
+        let container = document.getElementById(chart_id_c)
+
+        let { render, chart_json } = chartInfo.createChart($(`#${chart_id_c}`).children('.luckysheet-modal-dialog-content')[0], chartData, chart_id, rangeArray, rangeTxt)
+        chartInfo.currentChart = chart_json.chartOptions
+        console.dir(JSON.stringify(chart_json))
 
+        width = chart.width
+        height = chart.height
+        left = chart.left
+        top = chart.top
+        container.style.width = width + 'px'
+        container.style.height = height + 'px'
+        container.style.position = 'absolute'
+        container.style.background = '#fff'
+        container.style.left = left + 'px'
+        container.style.top = top + 'px'
+        render.style.width = '100%'
+        render.style.height = '100%'
+        container.style.zIndex = chartInfo.zIndex ? chartInfo.zIndex : 15
+        chartInfo.zIndex++
+    }
 }
 
 function jfrefreshchartall(flowdata1, r_st, r_ed, c_st, c_ed) {
     let chart = chartInfo.currentChart
-    if(!chart){
+    if (!chart) {
         return
     }
     if (chart.rangeArray.length == 1) {
@@ -999,7 +1034,7 @@ function createLuckyChart(width, height, left, top) {
     // insert chartinfo
     let sheetFile = chartInfo.luckysheetfile[getSheetIndex(chartInfo.currentSheetIndex)];
 
-    if(!sheetFile.chart){
+    if (!sheetFile.chart) {
         sheetFile.chart = [];
     }
     sheetFile.chart.push({
@@ -1301,11 +1336,11 @@ function renderChartShow(index) {
     const luckysheetfile = chartInfo.luckysheetfile;
     luckysheetfile.forEach((file) => {
         //切换当前页的所有图表都显示出来
-        if(file.index == index){
+        if (file.index == index) {
 
             const chartLists = file.chart || [];
 
-             chartLists.forEach((chart)=>{
+            chartLists.forEach((chart) => {
                 chart.isShow = true;
                 $('#' + chart.chart_id + '_c').show();
 
@@ -1320,10 +1355,10 @@ function renderChartShow(index) {
         }
 
         // 隐藏其他页的图表
-        else{
+        else {
             const chartLists = file.chart || [];
 
-             chartLists.forEach((chart)=>{
+            chartLists.forEach((chart) => {
                 chart.isShow = false;
                 $('#' + chart.chart_id + '_c').hide();
             })
@@ -1332,4 +1367,4 @@ function renderChartShow(index) {
 
 }
 
-export { chart, createLuckyChart, hideAllNeedRangeShow,renderChartShow }
+export { chart, createLuckyChart, hideAllNeedRangeShow, renderChartShow }