From 4e1b41f00f856cf83c6720a903ffdade43030973 Mon Sep 17 00:00:00 2001
From: liurunze <1414556676@qq.com>
Date: Fri, 31 Jul 2020 19:38:34 +0800
Subject: [PATCH] 'chart'

---
 src/controllers/resize.js         |  4 ++--
 src/expendPlugins/chart/plugin.js | 11 ++---------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/controllers/resize.js b/src/controllers/resize.js
index 5fe25c9..b5fff7d 100644
--- a/src/controllers/resize.js
+++ b/src/controllers/resize.js
@@ -52,8 +52,8 @@ export default function luckysheetsizeauto() {
         if($("#luckysheet-modal-dialog-slider-pivot").is(":visible")){
             gridW -= $("#luckysheet-modal-dialog-slider-pivot").outerWidth();
         } 
-        else if($("#luckysheet-data-visualization").is(":visible")){
-            gridW -= $("#luckysheet-data-visualization").outerWidth();
+        else if($(".chartSetting").is(":visible")){
+            gridW -= $(".chartSetting").outerWidth();
         }
         else if($("#luckysheet-modal-dialog-slider-alternateformat").is(":visible")){
             gridW -= $("#luckysheet-modal-dialog-slider-alternateformat").outerWidth();
diff --git a/src/expendPlugins/chart/plugin.js b/src/expendPlugins/chart/plugin.js
index 99f1e94..c220e40 100644
--- a/src/expendPlugins/chart/plugin.js
+++ b/src/expendPlugins/chart/plugin.js
@@ -137,7 +137,7 @@ function renderCharts(chartLists, isDemo) {
 
         // edit current chart
         $(`#${chart_id}_c .luckysheet-modal-controll-update`).click(function (e) {
-            showChartSettingComponent(chart_id)
+            showChartSettingComponent()
         })
 
         $t.children('.luckysheet-modal-dialog-content').mousedown(function (e) {
@@ -1202,7 +1202,7 @@ function createLuckyChart(width, height, left, top) {
 
     // edit current chart
     $(`#${chart_id}_c .luckysheet-modal-controll-update`).click(function (e) {
-        showChartSettingComponent(chart_id)
+        showChartSettingComponent()
     })
 
     $t.children('.luckysheet-modal-dialog-content').mousedown(function (e) {
@@ -1423,13 +1423,6 @@ function showChartSettingComponent(refresh, chart_id) {
 
         //隐藏设置界面
         $('.chartSetting').show();
-        //.luckysheet-modal-dialog-resize为图表显示框的缩放框，.luckysheet-modal-dialog-controll为显示框右边的控制按钮
-        $("#luckysheet-cell-main .luckysheet-modal-dialog-resize, #luckysheet-cell-main .luckysheet-modal-dialog-controll").show();
-
-        // 切换图表后再打开设置界面时候执行更新DOM
-        if (!!chart_id) {
-            chartInfo.currentChart = chartInfo.highlightChart(chart_id)
-        }
 
         $('#luckysheet-cell-main').find('.luckysheet-datavisual-selection-set div').show()
         chartInfo.chartparam.luckysheetCurrentChartActive = true