linkmore-design 1.0.18 → 1.0.19

package/es/Button/style/style.css

@@ -44,8 +44,8 @@
   max-width: 120px;
 }
 .ant-btn.lm-button-default {
-  border: 1px solid rgba(0, 0, 0, 0.25);
-  color: rgba(0, 0, 0, 0.85);
+  border: 1px solid var(--stroke-color);
+  color: var(--font-color);
 }
 .ant-btn.lm-button-default-hover,
 .ant-btn.lm-button-default:hover {

package/es/CkFilter/components/Controls.js

@@ -34,7 +34,9 @@ var Controls = function Controls(props) {
     'cascader': /*#__PURE__*/_react.default.createElement(_CascaderFilter.default, (0, _extends2.default)({
       options: options
     }, resetProps)),
-    'input': /*#__PURE__*/_react.default.createElement(_input.default, resetProps)
+    'input': /*#__PURE__*/_react.default.createElement(_input.default, (0, _extends2.default)({
+      placeholder: "\u8BF7\u8F93\u5165"
+    }, resetProps))
   };
   return obj[type] || null;
 };

package/es/CkFilter/components/filterTypes.js

@@ -337,7 +337,7 @@ var CheckboxFilter = function CheckboxFilter(_ref8) {
 
   var handleSure = function handleSure() {
     setFilterValue(checkedValues);
-  }; // 清空
+  }; // 取消
 
 
   var handleReset = function handleReset() {
@@ -405,12 +405,12 @@ var CheckboxFilter = function CheckboxFilter(_ref8) {
     }, item.label));
   }), !options.length && /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_empty"
-  }, "\u6682\u65E0\u6570\u636E")), isSearch && /*#__PURE__*/_react.default.createElement("div", {
+  }, "\u6682\u65E0\u6570\u636E")), /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_footer"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "footer_clear",
     onClick: handleReset
-  }, "\u6E05\u7A7A"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
+  }, "\u53D6\u6D88"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
     type: "primary",
     disabled: !checkedValues.length,
     size: "small",
@@ -636,29 +636,34 @@ var CascaderFilter = function CascaderFilter(props) {
   var _useState15 = (0, _react.useState)(getFilterValue || itemProps.multiple ? [] : ''),
       _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
       checkedValues = _useState16[0],
-      setCheckedValues = _useState16[1];
+      setCheckedValues = _useState16[1]; // const isSearch = useMemo(() => filters.length > 8, [filters.length]);
 
-  var isSearch = (0, _react.useMemo)(function () {
-    return filters.length > 8;
-  }, [filters.length]);
 
   var handleFilter = function handleFilter(val) {
     setOptions(filters.filter(function (v) {
       return v.label.indexOf(val) > -1;
     }));
-  };
+  }; // 重置级联弹框
+
 
   var dropdownRender = function dropdownRender(menus) {
     var inputRef = (0, _react.useRef)(null); // 确定
 
     var handleSure = function handleSure() {
-      setFilterValue(checkedValues);
-    }; // 清空
+      setFilterValue(itemProps.multiple ? checkedValues.map(function (v) {
+        return v[v.length - 1];
+      }) : checkedValues);
+      setVisible(false);
+    }; // 取消
 
 
     var handleReset = function handleReset() {
-      inputRef.current.input.value = '';
+      if (inputRef.current) {
+        inputRef.current.input.value = '';
+      }
+
       setFilterValue(undefined);
+      setCheckedValues(itemProps.multiple ? [] : '');
     };
 
     return /*#__PURE__*/_react.default.createElement("div", {
@@ -674,15 +679,16 @@ var CascaderFilter = function CascaderFilter(props) {
       onChange: (0, _lodash.debounce)(function (e) {
         return handleFilter(e.target.value);
       }, 500)
-    })), menus, isSearch && /*#__PURE__*/_react.default.createElement("div", {
+    })), menus, itemProps.multiple && /*#__PURE__*/_react.default.createElement("div", {
       className: "filter_footer"
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: "footer_clear",
       onClick: handleReset
-    }, "\u6E05\u7A7A"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
+    }, "\u53D6\u6D88"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
       type: "primary",
       size: "small",
-      onClick: handleSure
+      onClick: handleSure,
+      disabled: !(checkedValues === null || checkedValues === void 0 ? void 0 : checkedValues.length)
     }, "\u786E\u5B9A")));
   };
 
@@ -705,9 +711,6 @@ var CascaderFilter = function CascaderFilter(props) {
       });
       var showLabel = arr.length < 3 ? arr.join('、') : "".concat(arr[0], "\u3001+").concat(arr.length);
       setText(showLabel);
-      setFilterValue(item.map(function (v) {
-        return v[v.length - 1];
-      }));
       setCheckedValues(item);
     } else {
       setText(selectedOptions.map(function (v) {
@@ -731,7 +734,8 @@ var CascaderFilter = function CascaderFilter(props) {
     options: options,
     value: checkedValues,
     onChange: onChange,
-    showCheckedStrategy: "Cascader.SHOW_CHILD",
+    open: visible // showCheckedStrategy="Cascader.SHOW_CHILD"
+    ,
     dropdownRender: dropdownRender,
     onDropdownVisibleChange: function onDropdownVisibleChange(v) {
       return setVisible(v);
@@ -747,7 +751,7 @@ var CascaderFilter = function CascaderFilter(props) {
     className: "filter_item_value"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "checked"
-  }, text), /*#__PURE__*/_react.default.createElement(_IconFont.default, {
+  }, isFiltering ? text : '全部'), /*#__PURE__*/_react.default.createElement(_IconFont.default, {
     type: isFiltering ? 'lmweb-close-circle-fill' : 'lmweb-down',
     className: "addonAfter",
     onClick: handleClear

package/es/CkFilter/style/style.css

@@ -627,6 +627,9 @@ html {
   box-shadow: 0 2px 6px var(--box-shadow-color);
   background-color: #fff;
 }
+.filter_dropdown.filter_cascader_container {
+  box-shadow: none;
+}
 .filter_dropdown .filter_header {
   min-height: 40px;
   border-bottom: 1px solid #eee;
@@ -792,7 +795,7 @@ html {
 }
 .ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item .item_box {
   line-height: 1;
-  border: 1px dashed transparent;
+  border: 1px solid transparent;
   background: var(--background-color);
   padding: calc(var(--gap) * 2);
   cursor: pointer;
@@ -929,7 +932,7 @@ html {
   margin-bottom: 16px;
 }
 .ant-drawer.lm_det_drawer .ant-form-item .ant-form-item-label > label {
-  font-size: 12px;
+  font-weight: 500;
 }
 .ant-drawer.lm_det_drawer .auto_height {
   max-height: 418px;
@@ -1021,3 +1024,6 @@ html {
 .lm_filter_dropdown_picker .filter_picker_box .filter_picker_main .filter_picker_header .ant-radio-button-wrapper.ant-radio-button-wrapper-checked {
   color: var(--primary-color);
 }
+.ant-select-dropdown.ant-cascader-dropdown {
+  padding: 0;
+}

package/es/ProTable/style/style.css

@@ -568,9 +568,6 @@ html {
   padding-top: 0;
   padding-bottom: 0;
 }
-.lm_operate .ant-btn > .anticon:not(.anticon-down) {
-  font-size: 14px;
-}
 .lm_operate .anticon + span,
 .lm_operate span + .anticon {
   margin-left: calc(var(--gap) / 2);

package/lib/Button/style/style.css

@@ -44,8 +44,8 @@
   max-width: 120px;
 }
 .ant-btn.lm-button-default {
-  border: 1px solid rgba(0, 0, 0, 0.25);
-  color: rgba(0, 0, 0, 0.85);
+  border: 1px solid var(--stroke-color);
+  color: var(--font-color);
 }
 .ant-btn.lm-button-default-hover,
 .ant-btn.lm-button-default:hover {

package/lib/CkFilter/components/Controls.js

@@ -34,7 +34,9 @@ var Controls = function Controls(props) {
     'cascader': /*#__PURE__*/_react.default.createElement(_CascaderFilter.default, (0, _extends2.default)({
       options: options
     }, resetProps)),
-    'input': /*#__PURE__*/_react.default.createElement(_input.default, resetProps)
+    'input': /*#__PURE__*/_react.default.createElement(_input.default, (0, _extends2.default)({
+      placeholder: "\u8BF7\u8F93\u5165"
+    }, resetProps))
   };
   return obj[type] || null;
 };

package/lib/CkFilter/components/filterTypes.js

@@ -337,7 +337,7 @@ var CheckboxFilter = function CheckboxFilter(_ref8) {
 
   var handleSure = function handleSure() {
     setFilterValue(checkedValues);
-  }; // 清空
+  }; // 取消
 
 
   var handleReset = function handleReset() {
@@ -405,12 +405,12 @@ var CheckboxFilter = function CheckboxFilter(_ref8) {
     }, item.label));
   }), !options.length && /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_empty"
-  }, "\u6682\u65E0\u6570\u636E")), isSearch && /*#__PURE__*/_react.default.createElement("div", {
+  }, "\u6682\u65E0\u6570\u636E")), /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_footer"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "footer_clear",
     onClick: handleReset
-  }, "\u6E05\u7A7A"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
+  }, "\u53D6\u6D88"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
     type: "primary",
     disabled: !checkedValues.length,
     size: "small",
@@ -636,29 +636,34 @@ var CascaderFilter = function CascaderFilter(props) {
   var _useState15 = (0, _react.useState)(getFilterValue || itemProps.multiple ? [] : ''),
       _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
       checkedValues = _useState16[0],
-      setCheckedValues = _useState16[1];
+      setCheckedValues = _useState16[1]; // const isSearch = useMemo(() => filters.length > 8, [filters.length]);
 
-  var isSearch = (0, _react.useMemo)(function () {
-    return filters.length > 8;
-  }, [filters.length]);
 
   var handleFilter = function handleFilter(val) {
     setOptions(filters.filter(function (v) {
       return v.label.indexOf(val) > -1;
     }));
-  };
+  }; // 重置级联弹框
+
 
   var dropdownRender = function dropdownRender(menus) {
     var inputRef = (0, _react.useRef)(null); // 确定
 
     var handleSure = function handleSure() {
-      setFilterValue(checkedValues);
-    }; // 清空
+      setFilterValue(itemProps.multiple ? checkedValues.map(function (v) {
+        return v[v.length - 1];
+      }) : checkedValues);
+      setVisible(false);
+    }; // 取消
 
 
     var handleReset = function handleReset() {
-      inputRef.current.input.value = '';
+      if (inputRef.current) {
+        inputRef.current.input.value = '';
+      }
+
       setFilterValue(undefined);
+      setCheckedValues(itemProps.multiple ? [] : '');
     };
 
     return /*#__PURE__*/_react.default.createElement("div", {
@@ -674,15 +679,16 @@ var CascaderFilter = function CascaderFilter(props) {
       onChange: (0, _lodash.debounce)(function (e) {
         return handleFilter(e.target.value);
       }, 500)
-    })), menus, isSearch && /*#__PURE__*/_react.default.createElement("div", {
+    })), menus, itemProps.multiple && /*#__PURE__*/_react.default.createElement("div", {
       className: "filter_footer"
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: "footer_clear",
       onClick: handleReset
-    }, "\u6E05\u7A7A"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
+    }, "\u53D6\u6D88"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
       type: "primary",
       size: "small",
-      onClick: handleSure
+      onClick: handleSure,
+      disabled: !(checkedValues === null || checkedValues === void 0 ? void 0 : checkedValues.length)
     }, "\u786E\u5B9A")));
   };
 
@@ -705,9 +711,6 @@ var CascaderFilter = function CascaderFilter(props) {
       });
       var showLabel = arr.length < 3 ? arr.join('、') : "".concat(arr[0], "\u3001+").concat(arr.length);
       setText(showLabel);
-      setFilterValue(item.map(function (v) {
-        return v[v.length - 1];
-      }));
       setCheckedValues(item);
     } else {
       setText(selectedOptions.map(function (v) {
@@ -731,7 +734,8 @@ var CascaderFilter = function CascaderFilter(props) {
     options: options,
     value: checkedValues,
     onChange: onChange,
-    showCheckedStrategy: "Cascader.SHOW_CHILD",
+    open: visible // showCheckedStrategy="Cascader.SHOW_CHILD"
+    ,
     dropdownRender: dropdownRender,
     onDropdownVisibleChange: function onDropdownVisibleChange(v) {
       return setVisible(v);
@@ -747,7 +751,7 @@ var CascaderFilter = function CascaderFilter(props) {
     className: "filter_item_value"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "checked"
-  }, text), /*#__PURE__*/_react.default.createElement(_IconFont.default, {
+  }, isFiltering ? text : '全部'), /*#__PURE__*/_react.default.createElement(_IconFont.default, {
     type: isFiltering ? 'lmweb-close-circle-fill' : 'lmweb-down',
     className: "addonAfter",
     onClick: handleClear

package/lib/CkFilter/style/style.css

@@ -627,6 +627,9 @@ html {
   box-shadow: 0 2px 6px var(--box-shadow-color);
   background-color: #fff;
 }
+.filter_dropdown.filter_cascader_container {
+  box-shadow: none;
+}
 .filter_dropdown .filter_header {
   min-height: 40px;
   border-bottom: 1px solid #eee;
@@ -792,7 +795,7 @@ html {
 }
 .ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item .item_box {
   line-height: 1;
-  border: 1px dashed transparent;
+  border: 1px solid transparent;
   background: var(--background-color);
   padding: calc(var(--gap) * 2);
   cursor: pointer;
@@ -929,7 +932,7 @@ html {
   margin-bottom: 16px;
 }
 .ant-drawer.lm_det_drawer .ant-form-item .ant-form-item-label > label {
-  font-size: 12px;
+  font-weight: 500;
 }
 .ant-drawer.lm_det_drawer .auto_height {
   max-height: 418px;
@@ -1021,3 +1024,6 @@ html {
 .lm_filter_dropdown_picker .filter_picker_box .filter_picker_main .filter_picker_header .ant-radio-button-wrapper.ant-radio-button-wrapper-checked {
   color: var(--primary-color);
 }
+.ant-select-dropdown.ant-cascader-dropdown {
+  padding: 0;
+}

package/lib/ProTable/style/style.css

@@ -568,9 +568,6 @@ html {
   padding-top: 0;
   padding-bottom: 0;
 }
-.lm_operate .ant-btn > .anticon:not(.anticon-down) {
-  font-size: 14px;
-}
 .lm_operate .anticon + span,
 .lm_operate span + .anticon {
   margin-left: calc(var(--gap) / 2);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkmore-design",
-  "version": "1.0.18",
+  "version": "1.0.19",
   "author": {
     "name": "nowthen",
     "email": "rnlvwyx@gmail.com"