From 4dd527b6cf649a62e460f4664666db4d3081e293 Mon Sep 17 00:00:00 2001
From: cdswyda <cdswyda@hotmail.com>
Date: Wed, 21 Apr 2021 19:00:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=A0=8F=E9=85=8D=E7=BD=AE=E5=90=8E=E4=B8=8D?=
 =?UTF-8?q?=E4=BC=A0=20showtoolbar=20showtoolbarConfig=20=E6=97=B6?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/resize.js  | 36 ++++++++++++++++-------------
 src/controllers/toolbar.js | 46 ++++++++++++++------------------------
 src/utils/util.js          | 13 ++++++++++-
 3 files changed, 50 insertions(+), 45 deletions(-)

diff --git a/src/controllers/resize.js b/src/controllers/resize.js
index 8f61f2120..6ee6aaf7c 100644
--- a/src/controllers/resize.js
+++ b/src/controllers/resize.js
@@ -5,7 +5,7 @@ import Store from '../store';
 import locale from '../locale/locale';
 import sheetmanage from './sheetmanage';
 import tooltip from '../global/tooltip'
-import { $$, getObjType } from "../utils/util";
+import { $$, getObjType, camel2split } from "../utils/util";
 import { defaultToolbar, toolbarIdMap } from './toolbar';
 
 let gridW = 0, 
@@ -344,18 +344,14 @@ export function menuToolBarWidth() {
      * }
      */
     function buildBoolBarConfig() {
-        const obj = {};
-        // 数组形式直接生成
-        if (getObjType(showtoolbarConfig) === 'array') {
-            // show 为 false
-            if (!showtoolbar) {
-                return obj;
-            }
+        let obj = {};
+        function array2Config(arr) {
+            const obj = {};
             let current,next;
             let index = 0;
-            for (let i = 0; i<showtoolbarConfig.length; i++) {
-                current = showtoolbarConfig[i];
-                next = showtoolbarConfig[i + 1];
+            for (let i = 0; i<arr.length; i++) {
+                current = arr[i];
+                next = arr[i + 1];
                 if (current !== '|') {
                     obj[current] = {
                         ele: toolbarIdMap[current],
@@ -364,14 +360,22 @@ export function menuToolBarWidth() {
                 }
                 if (next === '|') {
                     if (getObjType(obj[current].ele) === 'array') {
-                        obj[current].ele.push(`#toolbar-separator-${current.toLowerCase()}`);
+                        obj[current].ele.push(`#toolbar-separator-${camel2split(current)}`);
                     } else {
-                        obj[current].ele = [obj[current].ele, `#toolbar-separator-${current.toLowerCase()}`];
+                        obj[current].ele = [obj[current].ele, `#toolbar-separator-${camel2split(current)}`];
                     }
                 }
             }
             return obj;
         }
+        // 数组形式直接生成
+        if (getObjType(showtoolbarConfig) === 'array') {
+            // show 为 false
+            if (!showtoolbar) {
+                return obj;
+            }
+            return array2Config(showtoolbarConfig);
+        }
         // 否则为全部中从记录中挑选显示或隐藏
         const config = defaultToolbar.reduce(function(total, curr) {
             if (curr !== '|') {
@@ -405,12 +409,14 @@ export function menuToolBarWidth() {
                 }
                 if (next === '|') {
                     if (getObjType(obj[current].ele) === 'array') {
-                        obj[current].ele.push(`#toolbar-separator-${current.toLowerCase()}`);
+                        obj[current].ele.push(`#toolbar-separator-${camel2split(current)}`);
                     } else {
-                        obj[current].ele = [obj[current].ele, `#toolbar-separator-${current.toLowerCase()}`];
+                        obj[current].ele = [obj[current].ele, `#toolbar-separator-${camel2split(current)}`];
                     }
                 }
             }
+        } else {
+            obj = array2Config(defaultToolbar);
         }
 
         return obj;
diff --git a/src/controllers/toolbar.js b/src/controllers/toolbar.js
index d2107d4b7..d36cbc195 100644
--- a/src/controllers/toolbar.js
+++ b/src/controllers/toolbar.js
@@ -1,7 +1,7 @@
 import locale from '../locale/locale';
 import luckysheetConfigsetting from './luckysheetConfigsetting';
 
-import { getObjType } from '../utils/util';
+import { getObjType, camel2split } from '../utils/util';
 
 // 默认的工具栏按钮
 export const defaultToolbar = [
@@ -876,36 +876,24 @@ export function createToolbarHtml() {
             delete showtoolbarConfig.undoRedo;
         }
         Object.assign(config, showtoolbarConfig);
-
-        for (let i = 0; i < defaultToolbar.length; i++) {
-            let key = defaultToolbar[i];
-            if (!config[key]) {
-                // 如果当前元素隐藏 按照之前的规则 后面紧跟的 | 分割也不需要显示了
-                if (defaultToolbar[i + 1] === '|') {
-                    i++;
-                }
-                return;
-            }
-            if (key === '|') {
-                buttonHTML.push(
-                    `<div id="toolbar-separator-${camel2split(key)}" class="luckysheet-toolbar-separator luckysheet-inline-block" style="user-select: none;"></div>`
-                );
-            } else {
-                buttonHTML.push(htmlMap[key]);
+    }
+    for (let i = 0; i < defaultToolbar.length; i++) {
+        let key = defaultToolbar[i];
+        if (!config[key] && key !== '|') {
+            // 如果当前元素隐藏 按照之前的规则 后面紧跟的 | 分割也不需要显示了
+            if (defaultToolbar[i + 1] === '|') {
+                i++;
             }
+            continue;
+        }
+        if (key === '|') {
+            buttonHTML.push(
+                `<div id="toolbar-separator-${camel2split(key)}" class="luckysheet-toolbar-separator luckysheet-inline-block" style="user-select: none;"></div>`
+            );
+        } else {
+            buttonHTML.push(htmlMap[key]);
         }
     }
-
+    console.log(buttonHTML);
     return buttonHTML.join('');
 }
-
-/**
- * camel 形式的单词转换为 - 形式 如 fillColor -> fill-color
- * @param {string} camel camel 形式
- * @returns
- */
-function camel2split(camel) {
-    return camel.replace(/([A-Z])/g, function(all, group) {
-        return '-' + group.toLowerCase();
-    });
-}
diff --git a/src/utils/util.js b/src/utils/util.js
index b088d5d8d..0a6974382 100644
--- a/src/utils/util.js
+++ b/src/utils/util.js
@@ -871,6 +871,16 @@ function arrayRemoveItem(array, item) {
     })
 }
 
+/**
+ * camel 形式的单词转换为 - 形式 如 fillColor -> fill-color
+ * @param {string} camel camel 形式
+ * @returns
+ */
+ function camel2split(camel) {
+    return camel.replace(/([A-Z])/g, function(all, group) {
+        return '-' + group.toLowerCase();
+    });
+}
   
 export {
     isJsonString,
@@ -900,5 +910,6 @@ export {
     transformRangeToAbsolute,
     openSelfModel,
     createProxy,
-    arrayRemoveItem
+    arrayRemoveItem,
+    camel2split
 }
\ No newline at end of file