Merge branch 'gitlab_master' into master

dream-num · Jul 31, 2020 · 829dcaa · 829dcaa
2 parents c1e044d + 9fd1dcf
commit 829dcaa
Show file tree

Hide file tree

Showing 32 changed files with 93,764 additions and 914 deletions.
diff --git a/.vs/luckysheet/config/applicationhost.config b/.vs/luckysheet/config/applicationhost.config
diff --git a/.vs/luckysheet/v16/.suo b/.vs/luckysheet/v16/.suo
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
diff --git a/src/controllers/expendPlugins.js b/src/controllers/expendPlugins.js
@@ -3,13 +3,16 @@ import { chart } from '../expendPlugins/chart/plugin'
 const pluginsObj = {
     'chart':chart
 }
+
+const isDemo = true
+
 /**
  * Register plugins
  */
-function initPlugins(plugins){
+function initPlugins(plugins , data){
     if(plugins.length){
         plugins.forEach(plugin => {
-            pluginsObj[plugin]();
+            pluginsObj[plugin](data , isDemo)
         });
     }
 }

diff --git a/src/controllers/handler.js b/src/controllers/handler.js
diff --git 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/controllers/sheetMove.js b/src/controllers/sheetMove.js
@@ -38,8 +38,9 @@ function luckysheetMoveEndCell(postion, type, isScroll, terminal, onlyvalue) {
     formula.fucntionboxshow(curR, curC);
 
     if (type == "range") {
-        let p_startR = Store.luckysheet_shiftpositon["row"][0];
-        let p_startC = Store.luckysheet_shiftpositon["column"][0];
+        // need var
+        var p_startR = Store.luckysheet_shiftpositon["row"][0];
+        var p_startC = Store.luckysheet_shiftpositon["column"][0];
 
         let p_endR = Store.luckysheet_shiftpositon["row"][1];
         let p_endC = Store.luckysheet_shiftpositon["column"][1];

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

diff --git a/src/core.js b/src/core.js
@@ -49,8 +49,6 @@ luckysheet.create = function (setting) {
     Store.fullscreenmode = extendsetting.fullscreenmode;
     Store.lang = extendsetting.lang; //language
     Store.allowEdit = extendsetting.allowEdit;
-    Store.editMode = extendsetting.editMode;
-
     server.gridKey = extendsetting.gridKey;
     server.loadUrl = extendsetting.loadUrl;
     server.updateUrl = extendsetting.updateUrl;
@@ -83,15 +81,15 @@ luckysheet.create = function (setting) {
     luckysheetConfigsetting.enablePage = extendsetting.enablePage;
     luckysheetConfigsetting.pageInfo = extendsetting.pageInfo;
 
-
+    luckysheetConfigsetting.editMode = extendsetting.editMode;
     luckysheetConfigsetting.chartConfigChange = extendsetting.chartConfigChange;
     luckysheetConfigsetting.beforeCreateDom = extendsetting.beforeCreateDom;
 
     luckysheetConfigsetting.fireMousedown = extendsetting.fireMousedown;
     luckysheetConfigsetting.plugins = extendsetting.plugins;
 
     // Register plugins
-    initPlugins(extendsetting.plugins);
+    initPlugins(extendsetting.plugins , extendsetting.data);
 
     // Store formula information, including internationalization
     functionlist();