@zat-design/sisyphus-react 3.6.5-beta.7 → 3.6.5-beta.9

package/es/ProForm/utils/useWatch.js

@@ -1,3 +1,5 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { debounce } from 'lodash';
 import { HOOK_MARK } from 'rc-field-form/es/FieldContext';
@@ -59,7 +61,9 @@ function useWatch(dependencies, form, wait) {
       // Compare stringify in case it's nest object
       if (valueStrRef.current !== nextValueStr) {
         valueStrRef.current = nextValueStr;
-        setValue(newValue);
+        setValue(_dependencies.reduce(function (acc, key, index) {
+          return _objectSpread(_objectSpread({}, acc), {}, _defineProperty({}, key, newValue[index]));
+        }, {}));
       }
     };
     // 增加防抖
@@ -70,7 +74,9 @@ function useWatch(dependencies, form, wait) {
     var initialValue = namePathsRef.current.map(function (namePath) {
       return get(getFieldsValue(), namePath);
     });
-    setValue(initialValue);
+    setValue(_dependencies.reduce(function (acc, key, index) {
+      return _objectSpread(_objectSpread({}, acc), {}, _defineProperty({}, key, initialValue[index]));
+    }, {}));
     return cancelRegister;
   },
   // We do not need re-register since namePath content is the same

package/es/ProTree/components/ProTreeSelect/index.js

@@ -355,9 +355,9 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
         }
         // 迭代完子节点向上回溯，如果有匹配到得子节点，那么加入当前节点得孩子对象上,否则加入得是空数组
         item.children = currentNodeChild;
-        // let tag = false;
         // 判断节点title是否包含关键字 如果有，那么直接进行下一循环
-        if (item[label].indexOf(keyWord) > -1) {
+        // @ts-ignore
+        if (item[label].indexOf(keyWord) > -1 && (selectProps === null || selectProps === void 0 ? void 0 : selectProps.mode) !== 'treeSelect') {
           var regExp = new RegExp(keyWord);
           item[label] = item[label].replace(regExp, "<span class=\"highlight-search-text\">".concat(keyWord, "</span>"));
         }
@@ -422,8 +422,10 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     var _selectList = selectList.map(function (item) {
       var label = item.label;
       var _label = label;
-      var regex = /<span class="highlight-search-text">(.*?)<\/span>/g;
-      _label = item[label] = label === null || label === void 0 ? void 0 : label.replace(regex, '$1');
+      if (label) {
+        var regex = /<span class="highlight-search-text">(.*?)<\/span>/g;
+        _label = item[label] = label === null || label === void 0 ? void 0 : label.replace(regex, '$1');
+      }
       return _objectSpread(_objectSpread({}, item), {}, {
         label: _label
       });

package/lib/ProForm/utils/useWatch.js

@@ -8,6 +8,8 @@ exports.default = void 0;
 exports.getNamePath = getNamePath;
 exports.stringify = stringify;
 exports.toArray = toArray;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectSpread4 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _lodash = require("lodash");
 var _FieldContext = require("rc-field-form/es/FieldContext");
@@ -69,7 +71,9 @@ function useWatch(dependencies, form, wait) {
       // Compare stringify in case it's nest object
       if (valueStrRef.current !== nextValueStr) {
         valueStrRef.current = nextValueStr;
-        setValue(newValue);
+        setValue(_dependencies.reduce(function (acc, key, index) {
+          return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, acc), {}, (0, _defineProperty2.default)({}, key, newValue[index]));
+        }, {}));
       }
     };
     // 增加防抖
@@ -80,7 +84,9 @@ function useWatch(dependencies, form, wait) {
     var initialValue = namePathsRef.current.map(function (namePath) {
       return (0, _get.default)(getFieldsValue(), namePath);
     });
-    setValue(initialValue);
+    setValue(_dependencies.reduce(function (acc, key, index) {
+      return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, acc), {}, (0, _defineProperty2.default)({}, key, initialValue[index]));
+    }, {}));
     return cancelRegister;
   },
   // We do not need re-register since namePath content is the same

package/lib/ProTree/components/ProTreeSelect/index.js

@@ -355,9 +355,9 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
         }
         // 迭代完子节点向上回溯，如果有匹配到得子节点，那么加入当前节点得孩子对象上,否则加入得是空数组
         item.children = currentNodeChild;
-        // let tag = false;
         // 判断节点title是否包含关键字 如果有，那么直接进行下一循环
-        if (item[label].indexOf(keyWord) > -1) {
+        // @ts-ignore
+        if (item[label].indexOf(keyWord) > -1 && (selectProps === null || selectProps === void 0 ? void 0 : selectProps.mode) !== 'treeSelect') {
           var regExp = new RegExp(keyWord);
           item[label] = item[label].replace(regExp, "<span class=\"highlight-search-text\">".concat(keyWord, "</span>"));
         }
@@ -422,8 +422,10 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     var _selectList = selectList.map(function (item) {
       var label = item.label;
       var _label = label;
-      var regex = /<span class="highlight-search-text">(.*?)<\/span>/g;
-      _label = item[label] = label === null || label === void 0 ? void 0 : label.replace(regex, '$1');
+      if (label) {
+        var regex = /<span class="highlight-search-text">(.*?)<\/span>/g;
+        _label = item[label] = label === null || label === void 0 ? void 0 : label.replace(regex, '$1');
+      }
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
         label: _label
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.6.5-beta.7",
+  "version": "3.6.5-beta.9",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",