@leankylin-sheet/react 3.1.41 → 3.1.43

package/dist/index.esm.css

@@ -2017,7 +2017,7 @@ html::-webkit-scrollbar-button {
 .leankylin-toolbar {
   display: flex;
   flex-direction: row;
-  background: #fafafc;
+  background: #fff;
   position: relative;
   padding: 5px 0px 3px 15px;
   border-bottom: 1px solid #d4d4d4;
@@ -2071,6 +2071,7 @@ html::-webkit-scrollbar-button {
 .leankylin-toolbar-combo-arrow {
   display: flex;
   align-items: center;
+  padding: 0 6px;
 }
 
 .leankylin-toolbar-button:hover,
@@ -2103,7 +2104,7 @@ html::-webkit-scrollbar-button {
 }
 
 .leankylin-toolbar-select::-webkit-scrollbar {
-  display: none ;
+  display: none;
 }
 
 .leankylin-toolbar-select,
@@ -2203,7 +2204,7 @@ html::-webkit-scrollbar-button {
   padding-top: 1px;
   padding-left: 24px;
   text-align: right;
-  opacity: .5;
+  opacity: 0.5;
   filter: alpha(opacity=50);
   color: #000;
   -webkit-user-select: none;
@@ -2217,7 +2218,7 @@ html::-webkit-scrollbar-button {
   position: absolute;
   box-shadow: 0 2px 4px rgb(0 0 0 / 20%);
   background: #fff;
-  border: 1px solid rgba(0, 0, 0, .2);
+  border: 1px solid rgba(0, 0, 0, 0.2);
   cursor: default;
   font-size: 12px;
   z-index: 1004;
@@ -2234,7 +2235,7 @@ html::-webkit-scrollbar-button {
   background: rgb(240, 240, 240);
   border-radius: 6px;
   box-shadow: 0 2px 4px rgb(0 0 0 / 20%);
-  border: 1px solid rgba(0, 0, 0, .2);
+  border: 1px solid rgba(0, 0, 0, 0.2);
   font-size: 12px;
 }
 
@@ -2297,9 +2298,9 @@ html::-webkit-scrollbar-button {
   margin-right: -4px;
 }
 
-.leankylin-border-select-menu{
-    position: absolute;
-    bottom: 0px;
+.leankylin-border-select-menu {
+  position: absolute;
+  bottom: 0px;
 }
 
 .leankylin-border-color-preview {
@@ -2319,16 +2320,16 @@ html::-webkit-scrollbar-button {
   cursor: pointer;
 }
 
-.leankylin-border-style-preview{
+.leankylin-border-style-preview {
   height: 3px;
   overflow: hidden;
 }
 
-.leankylin-border-style-picker-menu{
+.leankylin-border-style-picker-menu {
   padding: 0px 10px;
 }
 
-.leankylin-border-style-picker-menu:hover{
+.leankylin-border-style-picker-menu:hover {
   background: #efefef;
   cursor: pointer;
 }
@@ -2662,10 +2663,10 @@ label {
 .luckysheet-sheet-area {
   width: 100%;
   box-sizing: border-box;
-  background-color: #fafafc;
+  background-color: #fff;
   color: #444;
-  height: 31px;
-  padding: 0 30px 0 44px;
+  height: 36px;
+  padding: 4px 30px 4px 44px;
   margin: 0;
   -webkit-touch-callout: none;
   cursor: default;
@@ -2674,6 +2675,7 @@ label {
   align-items: center;
   justify-content: space-between;
   position: relative;
+  border-top: 1px solid rgb(227, 229, 234);
 }
 
 #luckysheet-sheet-content {
@@ -2692,7 +2694,7 @@ label {
   white-space: nowrap;
 }
 
-.luckysheet-sheet-area>div,
+.luckysheet-sheet-area > div,
 .luckysheet-sheet-area .luckysheet-sheets-item {
   display: inline-block;
   /* margin-right: 6px;
@@ -2753,23 +2755,21 @@ label {
 }
 
 .luckysheet-sheet-area div.luckysheet-sheets-item {
-  padding: 2px 6px;
-  height: 29px;
-  line-height: 29px;
-  background-color: #fafafc;
+  height: 28px;
+  line-height: 28px;
+  background-color: #fff;
   color: #676464;
   min-width: 30px;
   top: 0px;
   position: relative;
-  margin-right: -1px;
   cursor: pointer;
   transition: all 0.1s;
   font-size: 13px;
-  padding: 2px 19px 0px 5px;
   box-sizing: border-box;
-  border-left: 1px solid #e0e0e0;
-  border-right: 1px solid #e0e0e0;
   vertical-align: middle;
+  margin: 0 6px;
+  border-radius: 4px;
+  padding: 0 6px;
 }
 
 .luckysheet-sheet-area div.luckysheet-sheets-item:last-child {
@@ -2795,7 +2795,9 @@ label {
   text-align: center;
 }
 
-.luckysheet-sheet-area div.luckysheet-sheets-item .luckysheet-sheets-item-menu:hover {
+.luckysheet-sheet-area
+  div.luckysheet-sheets-item
+  .luckysheet-sheets-item-menu:hover {
   color: #2a2a2a;
   cursor: pointer;
 }
@@ -2812,7 +2814,9 @@ label {
   left: 0;
 }
 
-.luckysheet-sheet-area div.luckysheet-sheets-item .luckysheet-sheets-item-name[contenteditable="true"] {
+.luckysheet-sheet-area
+  div.luckysheet-sheets-item
+  .luckysheet-sheets-item-name[contenteditable="true"] {
   border: 1px solid #d9d9d9;
   display: inline-block;
   height: 18px;
@@ -2826,7 +2830,9 @@ label {
   -webkit-user-select: text !important;
 }
 
-.luckysheet-sheet-area div.luckysheet-sheets-item .luckysheet-sheets-item-name[contenteditable="true"]:focus {
+.luckysheet-sheet-area
+  div.luckysheet-sheets-item
+  .luckysheet-sheets-item-name[contenteditable="true"]:focus {
   -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.3);
   -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.3);
   box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.3);
@@ -2836,8 +2842,8 @@ label {
 
 .luckysheet-sheet-area div.luckysheet-sheets-item-active {
   /* padding: 2px 8px; */
-  height: 29px;
-  line-height: 29px;
+  height: 28px;
+  line-height: 28px;
   background-color: #efefef;
   /* border-color: #aaa; */
   border-top-color: #fff;
@@ -2859,16 +2865,19 @@ label {
   display: flex;
   align-items: center;
   justify-content: center;
-  height: 29px;
-  width: 29px;
+  height: 28px;
+  width: 28px;
+  cursor: pointer;
+  border-radius: 4px;
+  margin: 0 6px;
 }
 
 .leankylin-sheettab-button:hover {
   display: flex;
   align-items: center;
   justify-content: center;
-  height: 29px;
-  width: 29px;
+  height: 28px;
+  width: 28px;
   background-color: #efefef;
 }
 
@@ -2884,7 +2893,7 @@ label {
   display: flex;
   align-items: center;
   padding: 0 5px;
-  height: 29px;
+  height: 28px;
   cursor: pointer;
 }
 
@@ -2895,8 +2904,8 @@ label {
 .leankylin-sheettab-placeholder {
   display: inline-block;
   width: 30px;
-  height: 29px;
-  line-height: 29px;
+  height: 28px;
+  line-height: 28px;
   vertical-align: middle;
 }
 
@@ -2923,16 +2932,23 @@ label {
 }
 
 .luckysheet-sheets-item-function {
-  width: 12px;
-  height: 24px;
+  display: none;
+  width: 28px;
+  height: 28px;
   position: absolute;
+  text-align: center;
   top: 4px;
   right: 2px;
+  cursor: pointer;
+}
+.luckysheet-sheets-item-function:hover {
+  background-color: #f1f1f1;
 }
 
 .leankylin-sheet-area-right {
   display: flex !important;
 }
+
 .leankylin-zoom-container {
   white-space: nowrap;
   overflow: visible;
@@ -2950,6 +2966,8 @@ label {
   justify-content: center;
   width: 24px;
   height: 24px;
+  border-radius: 4px;
+  margin: 0 6px;
 }
 
 .leankylin-zoom-button:hover {
@@ -2960,14 +2978,14 @@ label {
   position: relative;
   display: flex;
   justify-content: center;
-  width: 48px;
   color: #1e1e1f;
   font-size: 12px;
   cursor: pointer;
 }
 
 .leankylin-zoom-ratio-current {
-  width: 100%;
+  padding: 0 12px;
+  margin: 0;
 }
 
 .leankylin-zoom-ratio-item:hover {
@@ -2994,7 +3012,6 @@ label {
   max-height: 100%;
   overflow-y: auto;
   border-radius: 4px;
-  box-shadow: 2px 2px 20px rgba(0, 0, 0, 0.15);
   transition: opacity 0.218s;
   background: #fff;
   cursor: default;
@@ -3009,8 +3026,13 @@ label {
      -moz-user-select: none;
           user-select: none;
   border: none;
+  width: 248px;
   border-radius: 8px;
   line-height: 22px;
+  padding: 4px 8px;
+  border: 1px solid #e3e5ea;
+  box-shadow: rgba(0, 0, 0, 0) 0px 0px 0px 0px, rgba(0, 0, 0, 0) 0px 0px 0px 0px,
+    rgba(0, 0, 0, 0) 0px 0px 0px 0px;
 }
 
 .leankylin-context-menu input.luckysheet-mousedown-cancel {
@@ -3043,12 +3065,13 @@ label {
   -webkit-user-select: none;
      -moz-user-select: none;
           user-select: none;
+  border-radius: 4px;
 }
 
 /* 右击菜单项目 hover背景色 */
 .luckysheet-cols-menu .luckysheet-cols-menuitem:hover,
 .luckysheet-cols-menu .luckysheet-cols-menuitem-hover {
-  background: #efefef;
+  background: #f9fafb;
 }
 
 .luckysheet-cols-menu
@@ -3282,6 +3305,12 @@ label {
   right: -18px;
 }
 
+.leankylin-sheet-color-change {
+  position: absolute;
+  left: 200px;
+  bottom: -100px;
+}
+
 .leankylin-sort-title {
   background-color: #fff;
   color: #000;
@@ -3306,76 +3335,6 @@ label {
   margin-bottom: 25px;
 }
 
-#leankylin-change-color {
-  min-width: 164px;
-  height: 252px;
-  background: rgb(240, 240, 240);
-  position: absolute;
-  bottom: -110px;
-  left: 197px;
-  border-radius: 6px;
-  box-shadow: 0 2px 4px rgb(0 0 0 / 20%);
-  border: 1px solid rgba(0, 0, 0, .2);
-}
-
-#leankylin-change-color .color-reset {
-  position: relative;
-  color: #333;
-  cursor: pointer;
-  list-style: none;
-  padding: 10px;
-  white-space: nowrap;
-  padding-left: 8px;
-  vertical-align: middle;
-  padding-right: 24px;
-  -webkit-user-select: none;
-     -moz-user-select: none;
-          user-select: none;
-  border-radius: 6px;
-  background: white;
-}
-
-#leankylin-change-color .color-reset:hover {
-  background: rgb(230, 230, 230);
-}
-
-#leankylin-change-color .custom-color {
-  position: relative;
-  margin: auto;
-  padding: 10px;
-  border-radius: 6px;
-  background: white;
-  display: flex;
-  align-items: center;
-  margin: 1px 0px;
-  display: flex;
-  justify-content: space-around;
-}
-
-.button-basic {
-  display: inline-block;
-  margin-bottom: 0;
-  font-weight: 400;
-  text-align: center;
-  vertical-align: middle;
-  touch-action: manipulation;
-  cursor: pointer;
-  white-space: nowrap;
-  padding: 4px 8px;
-  font-size: 12px;
-  line-height: 1.42857143;
-  border-radius: 2px;
-  -webkit-user-select: none;
-     -moz-user-select: none;
-          user-select: none;
-}
-
-.button-primary {
-  background: #0188fb;
-  border: 1px solid #0188fb;
-  color: #fff;
-  margin-right: -4px;
-}
 .leankylin-sheet-list {
   overflow-y: auto;
   overflow-x: hidden;

package/dist/index.esm.js

@@ -5564,7 +5564,7 @@ var Toolbar = function Toolbar(_ref) {
         key: name
       }, /*#__PURE__*/React.createElement("div", {
         style: {
-          width: 17,
+          width: 30,
           height: 2,
           backgroundColor: name === "font-color" ? refs.globalCache.recentTextColor : refs.globalCache.recentBackgroundColor,
           position: "absolute",
@@ -9453,67 +9453,6 @@ var SVGDefines = function SVGDefines() {
   }))));
 };
 
-var ChangeColor = function ChangeColor(_ref) {
-  var triggerParentUpdate = _ref.triggerParentUpdate;
-  var _useContext = useContext(WorkbookContext),
-    context = _useContext.context,
-    setContext = _useContext.setContext;
-  var _locale = locale(context),
-    toolbar = _locale.toolbar,
-    sheetconfig = _locale.sheetconfig,
-    button = _locale.button;
-  var _useState = useState("#000000"),
-    _useState2 = _slicedToArray(_useState, 2),
-    inputColor = _useState2[0],
-    setInputColor = _useState2[1];
-  var _useState3 = useState(context.luckysheetfile[getSheetIndex(context, context.currentSheetId)].color),
-    _useState4 = _slicedToArray(_useState3, 2),
-    selectColor = _useState4[0],
-    setSelectColor = _useState4[1];
-  var certainBtn = useCallback(function () {
-    setSelectColor(inputColor);
-  }, [inputColor]);
-  useEffect(function () {
-    setContext(function (ctx) {
-      if (ctx.allowEdit === false) return;
-      var index = getSheetIndex(ctx, ctx.currentSheetId);
-      ctx.luckysheetfile[index].color = selectColor;
-    });
-  }, [selectColor, setContext]);
-  return /*#__PURE__*/React.createElement("div", {
-    id: "leankylin-change-color"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "color-reset",
-    onClick: function onClick() {
-      return setSelectColor(undefined);
-    }
-  }, sheetconfig.resetColor), /*#__PURE__*/React.createElement("div", {
-    className: "custom-color"
-  }, /*#__PURE__*/React.createElement("div", null, toolbar.customColor, ":"), /*#__PURE__*/React.createElement("input", {
-    type: "color",
-    value: inputColor,
-    onChange: function onChange(e) {
-      return setInputColor(e.target.value);
-    },
-    onFocus: function onFocus() {
-      triggerParentUpdate(true);
-    },
-    onBlur: function onBlur() {
-      triggerParentUpdate(false);
-    }
-  }), /*#__PURE__*/React.createElement("div", {
-    className: "button-basic button-primary",
-    onClick: function onClick() {
-      certainBtn();
-    }
-  }, button.confirm)), /*#__PURE__*/React.createElement(ColorPicker, {
-    onPick: function onPick(color) {
-      setInputColor(color);
-      setSelectColor(color);
-    }
-  }));
-};
-
 var SheetTabContextMenu = function SheetTabContextMenu() {
   var _settings$sheetTabCon;
   var _useContext = useContext(WorkbookContext),
@@ -9611,6 +9550,13 @@ var SheetTabContextMenu = function SheetTabContextMenu() {
       });
     });
   }, [context.allowEdit, setContext, sheet === null || sheet === void 0 ? void 0 : sheet.id]);
+  var changeColor = function changeColor(selectColor) {
+    setContext(function (ctx) {
+      if (ctx.allowEdit === false) return;
+      var index = getSheetIndex(ctx, ctx.currentSheetId);
+      ctx.luckysheetfile[index].color = selectColor;
+    });
+  };
   if (!sheet || x == null || y == null) return null;
   return /*#__PURE__*/React.createElement("div", {
     className: "leankylin-context-menu luckysheet-cols-menu",
@@ -9707,9 +9653,15 @@ var SheetTabContextMenu = function SheetTabContextMenu() {
       }, /*#__PURE__*/React.createElement(SVGIcon, {
         name: "rightArrow",
         width: 18
-      })), isShowChangeColor && context.allowEdit && ( /*#__PURE__*/React.createElement(ChangeColor, {
-        triggerParentUpdate: updateShowInputColor
-      })));
+      })), isShowChangeColor && context.allowEdit && ( /*#__PURE__*/React.createElement("div", {
+        className: "leankylin-sheet-color-change"
+      }, /*#__PURE__*/React.createElement(CustomColor, {
+        onCustomPick: function onCustomPick(color) {
+          changeColor(color);
+          setIsShowChangeColor(false);
+        },
+        onColorPick: changeColor
+      }))));
     }
     if (name === "focus") {
       return /*#__PURE__*/React.createElement(Menu, {

package/dist/index.js

@@ -5574,7 +5574,7 @@ var Toolbar = function Toolbar(_ref) {
         key: name
       }, /*#__PURE__*/React__default['default'].createElement("div", {
         style: {
-          width: 17,
+          width: 30,
           height: 2,
           backgroundColor: name === "font-color" ? refs.globalCache.recentTextColor : refs.globalCache.recentBackgroundColor,
           position: "absolute",
@@ -9463,67 +9463,6 @@ var SVGDefines = function SVGDefines() {
   }))));
 };
 
-var ChangeColor = function ChangeColor(_ref) {
-  var triggerParentUpdate = _ref.triggerParentUpdate;
-  var _useContext = React.useContext(WorkbookContext),
-    context = _useContext.context,
-    setContext = _useContext.setContext;
-  var _locale = core.locale(context),
-    toolbar = _locale.toolbar,
-    sheetconfig = _locale.sheetconfig,
-    button = _locale.button;
-  var _useState = React.useState("#000000"),
-    _useState2 = _slicedToArray(_useState, 2),
-    inputColor = _useState2[0],
-    setInputColor = _useState2[1];
-  var _useState3 = React.useState(context.luckysheetfile[core.getSheetIndex(context, context.currentSheetId)].color),
-    _useState4 = _slicedToArray(_useState3, 2),
-    selectColor = _useState4[0],
-    setSelectColor = _useState4[1];
-  var certainBtn = React.useCallback(function () {
-    setSelectColor(inputColor);
-  }, [inputColor]);
-  React.useEffect(function () {
-    setContext(function (ctx) {
-      if (ctx.allowEdit === false) return;
-      var index = core.getSheetIndex(ctx, ctx.currentSheetId);
-      ctx.luckysheetfile[index].color = selectColor;
-    });
-  }, [selectColor, setContext]);
-  return /*#__PURE__*/React__default['default'].createElement("div", {
-    id: "leankylin-change-color"
-  }, /*#__PURE__*/React__default['default'].createElement("div", {
-    className: "color-reset",
-    onClick: function onClick() {
-      return setSelectColor(undefined);
-    }
-  }, sheetconfig.resetColor), /*#__PURE__*/React__default['default'].createElement("div", {
-    className: "custom-color"
-  }, /*#__PURE__*/React__default['default'].createElement("div", null, toolbar.customColor, ":"), /*#__PURE__*/React__default['default'].createElement("input", {
-    type: "color",
-    value: inputColor,
-    onChange: function onChange(e) {
-      return setInputColor(e.target.value);
-    },
-    onFocus: function onFocus() {
-      triggerParentUpdate(true);
-    },
-    onBlur: function onBlur() {
-      triggerParentUpdate(false);
-    }
-  }), /*#__PURE__*/React__default['default'].createElement("div", {
-    className: "button-basic button-primary",
-    onClick: function onClick() {
-      certainBtn();
-    }
-  }, button.confirm)), /*#__PURE__*/React__default['default'].createElement(ColorPicker, {
-    onPick: function onPick(color) {
-      setInputColor(color);
-      setSelectColor(color);
-    }
-  }));
-};
-
 var SheetTabContextMenu = function SheetTabContextMenu() {
   var _settings$sheetTabCon;
   var _useContext = React.useContext(WorkbookContext),
@@ -9621,6 +9560,13 @@ var SheetTabContextMenu = function SheetTabContextMenu() {
       });
     });
   }, [context.allowEdit, setContext, sheet === null || sheet === void 0 ? void 0 : sheet.id]);
+  var changeColor = function changeColor(selectColor) {
+    setContext(function (ctx) {
+      if (ctx.allowEdit === false) return;
+      var index = core.getSheetIndex(ctx, ctx.currentSheetId);
+      ctx.luckysheetfile[index].color = selectColor;
+    });
+  };
   if (!sheet || x == null || y == null) return null;
   return /*#__PURE__*/React__default['default'].createElement("div", {
     className: "leankylin-context-menu luckysheet-cols-menu",
@@ -9717,9 +9663,15 @@ var SheetTabContextMenu = function SheetTabContextMenu() {
       }, /*#__PURE__*/React__default['default'].createElement(SVGIcon, {
         name: "rightArrow",
         width: 18
-      })), isShowChangeColor && context.allowEdit && ( /*#__PURE__*/React__default['default'].createElement(ChangeColor, {
-        triggerParentUpdate: updateShowInputColor
-      })));
+      })), isShowChangeColor && context.allowEdit && ( /*#__PURE__*/React__default['default'].createElement("div", {
+        className: "leankylin-sheet-color-change"
+      }, /*#__PURE__*/React__default['default'].createElement(CustomColor, {
+        onCustomPick: function onCustomPick(color) {
+          changeColor(color);
+          setIsShowChangeColor(false);
+        },
+        onColorPick: changeColor
+      }))));
     }
     if (name === "focus") {
       return /*#__PURE__*/React__default['default'].createElement(Menu, {