update

jiang

src/controllers/handler.js

@@ -2014,6 +2014,11 @@ export default function luckysheetHandler() {
                 }
                 else if (!!formula.rangeMove) {
                     formula.rangeMoveDraging(event, formula.rangeMovexy, formula.rangeMoveObj.data("range"), formula.rangeMoveObj, Store.sheetBarHeight, Store.statisticBarHeight);
+                } else if (!!Store.chart_selection.rangeResize) {
+                    Store.chart_selection.rangeResizeDraging(event, Store.sheetBarHeight, Store.statisticBarHeight);
+                }
+                else if (!!Store.chart_selection.rangeMove) {
+                    Store.chart_selection.rangeMoveDraging(event, Store.sheetBarHeight, Store.statisticBarHeight);
                 }
             }, 1);
         }
@@ -2626,6 +2631,16 @@ export default function luckysheetHandler() {
             Store.countfuncTimeout = setTimeout(function () { countfunc() }, 500);
         }
 
+        //图表选区拖拽移动
+        if (Store.chart_selection.rangeMove) {
+            Store.chart_selection.rangeMoveDragged();
+        }
+
+        //图表选区拖拽拉伸
+        if (!!Store.chart_selection.rangeResize) {
+            Store.chart_selection.rangeResizeDragged();
+        }
+
         //选区下拉
         if (Store.luckysheet_cell_selected_extend) {
             Store.luckysheet_cell_selected_extend = false;

src/expendPlugins/chart/chartmix.common.js

@@ -35382,7 +35382,7 @@ function initPie(series, chartDataCache, seriesData, legendData, product, type,
 
 
 function editPie(series, chartDataCache, seriesData, legendData, chartPro, chartType, chartStyle) {
-  seires.name = legendData; // 如果原来的数据长度小于所选的数据长度
+  series.name = legendData; // 如果原来的数据长度小于所选的数据长度
 
   if (series.data.length < seriesData.length) {
     for (var k = series.data.length; k < seriesData.length; k++) {
@@ -38966,7 +38966,7 @@ function changeChartRange(chart_id, chartData, rangeArray, rangeTxt) {
   chart_json.chartData = chartData;
   chart_json.rangeTxt = rangeTxt; //根据数据集得到按钮状态，rangeColCheck表示首列是否标题，rangeRowCheck表示首行是否标题，rangeConfigCheck表示是否转置。
 
-  var rowColCheck = getRowColCheck(chartData);
+  var rowColCheck = Object(util["g" /* getRowColCheck */])(chartData);
   var rangeRowCheck = rowColCheck[0],
       rangeColCheck = rowColCheck[1],
       rangeConfigCheck = false; // 如果列转置标识,再转为列转置
@@ -38990,7 +38990,7 @@ function changeChartRange(chart_id, chartData, rangeArray, rangeTxt) {
   chart_json.defaultOption = defaultOption;
   src_store.dispatch('chartSetting/updateChartItemChartlist', chart_json);
   chartUtil_renderChart({
-    chartOptions: updateJson,
+    chartOptions: chart_json,
     chart_id: chart_id
   });
 }
@@ -40369,20 +40369,15 @@ function createChart(render, chartData, chart_id, rangeArray, rangeTxt) {
   var chartOption = insertNewChart(data_chartJson["c" /* chartOptions */], chart_Id, data_chartJson["c" /* chartOptions */].chartAllType, chartData, rangeArray, rangeTxt);
   var renderDom = document.createElement('div');
   renderDom.id = 'render' + chart_Id;
-  render.appendChild(renderDom); // 插入store和export出去的配置
-
+  render.appendChild(renderDom);
   var chart_json = {
     'chart_id': chart_Id,
     'active': true,
     'chartOptions': Object(util["b" /* deepCopy */])(chartOption)
   };
-  src_store.commit('UPDATE_CHART_ITEM_ONE', {
-    key: 'currentChartIndex',
-    value: exportUtil_ChartSetting.chartLists.length
-  }); // ChartSetting.currentChartIndex = ChartSetting.chartLists.length
-
+  exportUtil_ChartSetting.currentChartIndex = exportUtil_ChartSetting.chartLists.length;
   exportUtil_ChartSetting.chartLists.push(chart_json);
-  console.dir(chartOption);
+  console.dir(chart_json);
   new external_Vue_default.a({
     el: '#render' + chart_Id,
     store: src_store,

src/expendPlugins/chart/chartmix.umd.js

@@ -35391,7 +35391,7 @@ function initPie(series, chartDataCache, seriesData, legendData, product, type,
 
 
 function editPie(series, chartDataCache, seriesData, legendData, chartPro, chartType, chartStyle) {
-  seires.name = legendData; // 如果原来的数据长度小于所选的数据长度
+  series.name = legendData; // 如果原来的数据长度小于所选的数据长度
 
   if (series.data.length < seriesData.length) {
     for (var k = series.data.length; k < seriesData.length; k++) {
@@ -38975,7 +38975,7 @@ function changeChartRange(chart_id, chartData, rangeArray, rangeTxt) {
   chart_json.chartData = chartData;
   chart_json.rangeTxt = rangeTxt; //根据数据集得到按钮状态，rangeColCheck表示首列是否标题，rangeRowCheck表示首行是否标题，rangeConfigCheck表示是否转置。
 
-  var rowColCheck = getRowColCheck(chartData);
+  var rowColCheck = Object(util["g" /* getRowColCheck */])(chartData);
   var rangeRowCheck = rowColCheck[0],
       rangeColCheck = rowColCheck[1],
       rangeConfigCheck = false; // 如果列转置标识,再转为列转置
@@ -38999,7 +38999,7 @@ function changeChartRange(chart_id, chartData, rangeArray, rangeTxt) {
   chart_json.defaultOption = defaultOption;
   src_store.dispatch('chartSetting/updateChartItemChartlist', chart_json);
   chartUtil_renderChart({
-    chartOptions: updateJson,
+    chartOptions: chart_json,
     chart_id: chart_id
   });
 }
@@ -40378,20 +40378,15 @@ function createChart(render, chartData, chart_id, rangeArray, rangeTxt) {
   var chartOption = insertNewChart(data_chartJson["c" /* chartOptions */], chart_Id, data_chartJson["c" /* chartOptions */].chartAllType, chartData, rangeArray, rangeTxt);
   var renderDom = document.createElement('div');
   renderDom.id = 'render' + chart_Id;
-  render.appendChild(renderDom); // 插入store和export出去的配置
-
+  render.appendChild(renderDom);
   var chart_json = {
     'chart_id': chart_Id,
     'active': true,
     'chartOptions': Object(util["b" /* deepCopy */])(chartOption)
   };
-  src_store.commit('UPDATE_CHART_ITEM_ONE', {
-    key: 'currentChartIndex',
-    value: exportUtil_ChartSetting.chartLists.length
-  }); // ChartSetting.currentChartIndex = ChartSetting.chartLists.length
-
+  exportUtil_ChartSetting.currentChartIndex = exportUtil_ChartSetting.chartLists.length;
   exportUtil_ChartSetting.chartLists.push(chart_json);
-  console.dir(chartOption);
+  console.dir(chart_json);
   new external_Vue_default.a({
     el: '#render' + chart_Id,
     store: src_store,

src/expendPlugins/chart/plugin.js

@@ -14,6 +14,8 @@ import {
 import { isEditMode } from '../../global/validate';
 import luckysheetsizeauto from '../../controllers/resize';
 import { getvisibledatarow, getvisibledatacolumn} from '../../methods/get'
+let _rowLocation = rowLocation
+let _colLocation = colLocation
 
 // Dynamically load dependent scripts and styles
 const dependScripts = [
@@ -218,9 +220,9 @@ function chart_selection(){
             $(window).height() + scrollTop - sheetBarHeight - statisticBarHeight,
             winW = $(window).width() + scrollLeft
   
-        var rowLocation = rowLocation(y),
+        var rowLocation = _rowLocation(y),
             row_index = rowLocation[2]
-        var colLocation = colLocation(x),
+        var colLocation = _colLocation(x),
             col_index = colLocation[2]
   
         var visibledatarow = getvisibledatarow()
@@ -464,13 +466,13 @@ function chart_selection(){
         var updateJson = chartInfo.currentChart
   
         updateJson.rangeTxt = getRangetxt(
-            luckysheet.currentSheetIndex,
+            chartInfo.currentSheetIndex,
             updateJson.rangeArray[0],
-            luckysheet.currentSheetIndex
+            chartInfo.currentSheetIndex
         )
         updateJson.chartData = getdatabyselection(
             updateJson.rangeArray[0],
-            luckysheet.currentSheetIndex
+            chartInfo.currentSheetIndex
         )
         // 渲染
         chartInfo.changeChartRange(updateJson.chart_id, updateJson.chartData, updateJson.rangeArray, updateJson.rangeTxt)
@@ -499,9 +501,9 @@ function chart_selection(){
             $(window).height() + scrollTop - sheetBarHeight - statisticBarHeight,
             winW = $(window).width() + scrollLeft
   
-        var rowLocation = rowLocation(y),
+        var rowLocation = _rowLocation(y),
             row_index = rowLocation[2]
-        var colLocation = colLocation(x),
+        var colLocation = _colLocation(x),
             col_index = colLocation[2]
   
         var visibledatarow = getvisibledatarow()
@@ -784,13 +786,13 @@ function chart_selection(){
         chartInfo.chart_selection.rangeResize = null
   
         updateJson.rangeTxt = getRangetxt(
-            luckysheet.currentSheetIndex,
+            chartInfo.currentSheetIndex,
             updateJson.rangeArray[0],
-            luckysheet.currentSheetIndex
+            chartInfo.currentSheetIndex
         )
         updateJson.chartData = getdatabyselection(
             updateJson.rangeArray[0],
-            luckysheet.currentSheetIndex
+            chartInfo.currentSheetIndex
         )
         // 渲染
         chartInfo.changeChartRange(updateJson.chart_id, updateJson.chartData, updateJson.rangeArray, updateJson.rangeTxt)
@@ -799,7 +801,6 @@ function chart_selection(){
   }
 } 
 
-
 // create chart
 function createLuckyChart(width, height, left, top) {
     //如果只选中一个单元格，则自动填充选取
@@ -951,30 +952,12 @@ function createLuckyChart(width, height, left, top) {
 
     //处理区域高亮框参数，当前页中，只有当前的图表的needRangShow为true,其他为false
     showNeedRangeShow(chart_id);
-    // highline current chart
-    // $('.luckysheet-cell-main').click(function (e) {
-    //     if (e.target.tagName == 'CANVAS' && e.target.offsetParent && e.target.offsetParent.offsetParent && e.target.offsetParent.offsetParent.id && e.target.offsetParent.offsetParent.id.slice(0, 6) == 'chart_') {
-    //         chartInfo.highlightChart(e.target.offsetParent.offsetParent.id)
-    //         chartInfo.chartparam.luckysheetCurrentChartMoveObj = $(e.target.offsetParent.offsetParent.id + '_c')
-    //         chartInfo.chartparam.luckysheetCurrentChartResizeObj = $(e.target.offsetParent.offsetParent.id + '_c')
-    //         chartInfo.chartparam.luckysheetCurrentChartActive = true
-    //         document.getElementById(e.target.offsetParent.offsetParent.id + '_c').style.zIndex = ++chartInfo.zIndex
-    //         $('.chartSetting').css('display', 'block')
-    //         return
-    //     }
-    //     $('.chartSetting').css('display', 'none')
-    //     chartInfo.chartparam.luckysheetCurrentChartActive = false
-    // })
 
     // delete current chart
     $(`#${chart_id}_c .luckysheet-modal-controll-del`).click(function (e) {
         delChart(chart_id)
     })
 
-    // chartInfo.chartparam.luckysheetCurrentChartMoveObj = $(`#${chart_id}_c `)
-    // chartInfo.chartparam.luckysheetCurrentChartResizeObj = $(`#${chart_id}_c `)
-    // chartInfo.chartparam.luckysheetCurrentChartActive = true
-
     // move chart
     $t.mousedown(function (e) {
         //允许拖动渲染框
@@ -1073,7 +1056,7 @@ function delChart(chart_id) {
     $(`.luckysheet-cell-main #${chart_id}_c`).remove()
     // delete storage
     let sheetFile = chartInfo.luckysheetfile[getSheetIndex(chartInfo.currentSheetIndex)]
-    sheetFile.chart.findIndex(item => item.chart_id == chart_id)
+    let index = sheetFile.chart.findIndex(item => item.chart_id == chart_id)
     sheetFile.chart.splice(index, 1)
     // api call
     chartInfo.deleteChart(chart_id)