@zat-design/sisyphus-react 3.13.3-beta.1 → 3.13.4-beta.1

package/dist/index.esm.css

@@ -3654,6 +3654,15 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-tree-modal-placeholder {
   color: #939499;
 }
+.pro-tree-modal .ant-input-group-wrapper:hover .pro-tree-modal-view-svg {
+  color: var(--zaui-brand);
+}
+.pro-tree-modal .pro-tree-modal-view-svg div {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+}
 .pro-tree-modal-content {
   display: -webkit-box;
   display: -webkit-flex;
@@ -3711,7 +3720,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-tree-modal-box:first-child {
   margin-right: var(--zaui-space-size-md, 16px);
 }
-.pro-tree-modal-box .viewSvg > div {
+.pro-tree-modal-box .pro-tree-modal-search-svg > div {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -3849,7 +3858,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
       -ms-flex-align: center;
           align-items: center;
 }
-.pro-tree-modal-isView .viewSvg {
+.pro-tree-modal-isView .pro-tree-modal-view-svg {
   margin-left: var(--zaui-space-size-sm, 8px);
 }
 .pro-tree-modal-tree-content {

package/dist/less.esm.css

@@ -3654,6 +3654,15 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-tree-modal-placeholder {
   color: #939499;
 }
+.pro-tree-modal .ant-input-group-wrapper:hover .pro-tree-modal-view-svg {
+  color: var(--zaui-brand);
+}
+.pro-tree-modal .pro-tree-modal-view-svg div {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+}
 .pro-tree-modal-content {
   display: -webkit-box;
   display: -webkit-flex;
@@ -3711,7 +3720,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-tree-modal-box:first-child {
   margin-right: var(--zaui-space-size-md, 16px);
 }
-.pro-tree-modal-box .viewSvg > div {
+.pro-tree-modal-box .pro-tree-modal-search-svg > div {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -3849,7 +3858,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
       -ms-flex-align: center;
           align-items: center;
 }
-.pro-tree-modal-isView .viewSvg {
+.pro-tree-modal-isView .pro-tree-modal-view-svg {
   margin-left: var(--zaui-space-size-sm, 8px);
 }
 .pro-tree-modal-tree-content {

package/es/ProTreeModal/components/List.js

@@ -15,6 +15,7 @@ import SearchTitle from './SearchTitle';
 import CloseIcon from './CloseIcon';
 import SortableItem from './SortableItem';
 import { CASCADER } from '..';
+import { isEmpty } from '../../utils';
 function List(props, ref) {
   var checkedValues = props.checkedValues,
     disabled = props.disabled,
@@ -108,6 +109,9 @@ function List(props, ref) {
     }
   };
   function getLineHeight(string, width) {
+    if (isEmpty(string)) {
+      return 0;
+    }
     // 创建临时元素
     var temp = document.createElement('div');
     temp.style.position = 'absolute';

package/es/ProTreeModal/components/Trigger.js

@@ -77,7 +77,7 @@ function Trigger(props) {
       }), _jsx("div", {
         className: "pro-enum-input-addonAfter",
         children: _jsx(ReactSVG, {
-          className: "viewSvg",
+          className: "pro-tree-modal-view-svg",
           src: viewSvg,
           onClick: onIconClick
         })
@@ -139,7 +139,7 @@ function Trigger(props) {
             onClick: handleClearAll
           })
         }), _jsx(ReactSVG, {
-          className: "viewSvg",
+          className: "pro-tree-modal-view-svg",
           src: viewSvg,
           onClick: onIconClick
         })]

package/es/ProTreeModal/index.js

@@ -291,14 +291,13 @@ var ProTreeModal = function ProTreeModal(props) {
     })) === null || _state$flatTreeData$f === void 0 ? void 0 : _state$flatTreeData$f.map(function (item) {
       return item[fieldNameValue];
     }) : [];
+    onChange === null || onChange === void 0 ? void 0 : onChange([]);
     setState({
       checkedValues: _checkedValues,
       beforeClearAllValues: state.checkedValues,
       treeViewData: [],
       checkAll: false
     });
-    /* ******** fix:3.4.4-beta.4 点击清空全部不应该回调、所有的都是应该走统一的确定 *********  */
-    // onChange?.(_checkedValues);
   };
   /**
    * Drawer close
@@ -535,7 +534,7 @@ var ProTreeModal = function ProTreeModal(props) {
         });
       }
     }, {
-      wait: 300
+      wait: 0
     }),
     onSearch = _useDebounceFn.run;
   var handleSetSearchStr = function handleSetSearchStr(str) {
@@ -593,7 +592,7 @@ var ProTreeModal = function ProTreeModal(props) {
       appointChange: appointChange,
       appointProps: appointProps
     });
-  }, [state.checkedValues, state.checkAll, style, disabled, isView]);
+  }, [state.checkedValues, state.checkAll, style, disabled, isView, value]);
   /**
    * 全选操作
    */
@@ -771,7 +770,7 @@ var ProTreeModal = function ProTreeModal(props) {
   return _jsx(_Fragment, {
     children: _jsxs("div", {
       className: "pro-tree-modal",
-      children: [open === undefined ? TriggerComponent : null, _jsx(ProDrawerForm, {
+      children: [open === undefined && TriggerComponent, _jsx(ProDrawerForm, {
         onOk: handleFinish,
         onCancel: handleClose,
         okDisabled: disabled,
@@ -799,7 +798,7 @@ var ProTreeModal = function ProTreeModal(props) {
                 return handleSetSearchStr(e.target.value);
               },
               prefix: _jsx(ReactSVG, {
-                className: "viewSvg",
+                className: "pro-tree-modal-search-svg",
                 src: searchSVG
               })
             }), _jsx("div", {

package/es/ProTreeModal/style/index.less

@@ -10,6 +10,17 @@
     color: #939499;
   }
 
+  .@{ant-prefix}-input-group-wrapper:hover {
+    .pro-tree-modal-view-svg {
+      color: var(--zaui-brand);
+    }
+  }
+  .pro-tree-modal-view-svg {
+    div {
+      display: flex;
+    }
+  }
+
   &-content {
     display: flex;
     flex-direction: row;
@@ -59,7 +70,7 @@
       margin-right: var(--zaui-space-size-md, 16px);
     }
 
-    .viewSvg > div {
+    .pro-tree-modal-search-svg > div {
       display: flex;
     }
 
@@ -167,7 +178,7 @@
     display: flex;
     align-items: center;
 
-    .viewSvg {
+    .pro-tree-modal-view-svg {
       margin-left: var(--zaui-space-size-sm, 8px);
     }
   }

package/lib/ProTreeModal/components/List.js

@@ -16,6 +16,7 @@ var _SearchTitle = _interopRequireDefault(require("./SearchTitle"));
 var _CloseIcon = _interopRequireDefault(require("./CloseIcon"));
 var _SortableItem = _interopRequireDefault(require("./SortableItem"));
 var _ = require("..");
+var _utils = require("../../utils");
 /* eslint-disable brace-style */
 
 function List(props, ref) {
@@ -111,6 +112,9 @@ function List(props, ref) {
     }
   };
   function getLineHeight(string, width) {
+    if ((0, _utils.isEmpty)(string)) {
+      return 0;
+    }
     // 创建临时元素
     var temp = document.createElement('div');
     temp.style.position = 'absolute';

package/lib/ProTreeModal/components/Trigger.js

@@ -80,7 +80,7 @@ function Trigger(props) {
       }), (0, _jsxRuntime.jsx)("div", {
         className: "pro-enum-input-addonAfter",
         children: (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
-          className: "viewSvg",
+          className: "pro-tree-modal-view-svg",
           src: _view.default,
           onClick: onIconClick
         })
@@ -142,7 +142,7 @@ function Trigger(props) {
             onClick: handleClearAll
           })
         }), (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
-          className: "viewSvg",
+          className: "pro-tree-modal-view-svg",
           src: _view.default,
           onClick: onIconClick
         })]

package/lib/ProTreeModal/index.js

@@ -292,14 +292,13 @@ var ProTreeModal = function ProTreeModal(props) {
     })) === null || _state$flatTreeData$f === void 0 ? void 0 : _state$flatTreeData$f.map(function (item) {
       return item[fieldNameValue];
     }) : [];
+    onChange === null || onChange === void 0 ? void 0 : onChange([]);
     setState({
       checkedValues: _checkedValues,
       beforeClearAllValues: state.checkedValues,
       treeViewData: [],
       checkAll: false
     });
-    /* ******** fix:3.4.4-beta.4 点击清空全部不应该回调、所有的都是应该走统一的确定 *********  */
-    // onChange?.(_checkedValues);
   };
   /**
    * Drawer close
@@ -536,7 +535,7 @@ var ProTreeModal = function ProTreeModal(props) {
         });
       }
     }, {
-      wait: 300
+      wait: 0
     }),
     onSearch = _useDebounceFn.run;
   var handleSetSearchStr = function handleSetSearchStr(str) {
@@ -594,7 +593,7 @@ var ProTreeModal = function ProTreeModal(props) {
       appointChange: appointChange,
       appointProps: appointProps
     });
-  }, [state.checkedValues, state.checkAll, style, disabled, isView]);
+  }, [state.checkedValues, state.checkAll, style, disabled, isView, value]);
   /**
    * 全选操作
    */
@@ -772,7 +771,7 @@ var ProTreeModal = function ProTreeModal(props) {
   return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
     children: (0, _jsxRuntime.jsxs)("div", {
       className: "pro-tree-modal",
-      children: [open === undefined ? TriggerComponent : null, (0, _jsxRuntime.jsx)(_index.ProDrawerForm, {
+      children: [open === undefined && TriggerComponent, (0, _jsxRuntime.jsx)(_index.ProDrawerForm, {
         onOk: handleFinish,
         onCancel: handleClose,
         okDisabled: disabled,
@@ -800,7 +799,7 @@ var ProTreeModal = function ProTreeModal(props) {
                 return handleSetSearchStr(e.target.value);
               },
               prefix: (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
-                className: "viewSvg",
+                className: "pro-tree-modal-search-svg",
                 src: _inputSearch.default
               })
             }), (0, _jsxRuntime.jsx)("div", {

package/lib/ProTreeModal/style/index.less

@@ -10,6 +10,17 @@
     color: #939499;
   }
 
+  .@{ant-prefix}-input-group-wrapper:hover {
+    .pro-tree-modal-view-svg {
+      color: var(--zaui-brand);
+    }
+  }
+  .pro-tree-modal-view-svg {
+    div {
+      display: flex;
+    }
+  }
+
   &-content {
     display: flex;
     flex-direction: row;
@@ -59,7 +70,7 @@
       margin-right: var(--zaui-space-size-md, 16px);
     }
 
-    .viewSvg > div {
+    .pro-tree-modal-search-svg > div {
       display: flex;
     }
 
@@ -167,7 +178,7 @@
     display: flex;
     align-items: center;
 
-    .viewSvg {
+    .pro-tree-modal-view-svg {
       margin-left: var(--zaui-space-size-sm, 8px);
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.13.3-beta.1",
+  "version": "3.13.4-beta.1",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -63,7 +63,7 @@
     "@pansy/react-watermark": "^3.1.13",
     "@zat-design/utils": "1.1.37",
     "ahooks": "3.8.4",
-    "antd": "4.24.12",
+    "antd": "4.24.16",
     "big.js": "^6.2.1",
     "classnames": "^2.3.1",
     "lodash": "^4.17.21",