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

package/es/ProForm/utils/useWatch.js

@@ -1,6 +1,7 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import { debounce, get } from 'lodash';
+import { debounce } from 'lodash';
 import { HOOK_MARK } from 'rc-field-form/es/FieldContext';
+import get from 'rc-util/lib/utils/get';
 import warning from 'rc-util/lib/warning';
 import { useState, useEffect, useRef, useMemo } from 'react';
 export function toArray(value) {

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

@@ -419,11 +419,20 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
   }
   var handleChange = function handleChange(newVal, label, extra) {
     // newVal回来得一定是label、value
+    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');
+      return _objectSpread(_objectSpread({}, item), {}, {
+        label: _label
+      });
+    });
     var result = newVal;
     if (props === null || props === void 0 ? void 0 : props.labelInValue) {
-      result = getLabelByValue(selectList, newVal);
+      result = getLabelByValue(_selectList, newVal);
     }
-    var options = findTreeNode(selectList, extra === null || extra === void 0 ? void 0 : extra.triggerValue);
+    var options = findTreeNode(_selectList, extra === null || extra === void 0 ? void 0 : extra.triggerValue);
     onChange && onChange(result, options, extra);
     // 重置搜索
     showSearch && searchTreeEvent('');

package/lib/ProForm/utils/useWatch.js

@@ -11,6 +11,7 @@ exports.toArray = toArray;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _lodash = require("lodash");
 var _FieldContext = require("rc-field-form/es/FieldContext");
+var _get = _interopRequireDefault(require("rc-util/lib/utils/get"));
 var _warning = _interopRequireDefault(require("rc-util/lib/warning"));
 var _react = require("react");
 function toArray(value) {
@@ -62,7 +63,7 @@ function useWatch(dependencies, form, wait) {
       registerWatch = _getInternalHooks.registerWatch;
     var callback = function callback(store) {
       var newValue = namePathsRef.current.map(function (namePath) {
-        return (0, _lodash.get)(store, namePath);
+        return (0, _get.default)(store, namePath);
       });
       var nextValueStr = stringify(newValue);
       // Compare stringify in case it's nest object
@@ -77,7 +78,7 @@ function useWatch(dependencies, form, wait) {
     }
     var cancelRegister = registerWatch(callback);
     var initialValue = namePathsRef.current.map(function (namePath) {
-      return (0, _lodash.get)(getFieldsValue(), namePath);
+      return (0, _get.default)(getFieldsValue(), namePath);
     });
     setValue(initialValue);
     return cancelRegister;

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

@@ -419,11 +419,20 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
   }
   var handleChange = function handleChange(newVal, label, extra) {
     // newVal回来得一定是label、value
+    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');
+      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
+        label: _label
+      });
+    });
     var result = newVal;
     if (props === null || props === void 0 ? void 0 : props.labelInValue) {
-      result = getLabelByValue(selectList, newVal);
+      result = getLabelByValue(_selectList, newVal);
     }
-    var options = findTreeNode(selectList, extra === null || extra === void 0 ? void 0 : extra.triggerValue);
+    var options = findTreeNode(_selectList, extra === null || extra === void 0 ? void 0 : extra.triggerValue);
     onChange && onChange(result, options, extra);
     // 重置搜索
     showSearch && searchTreeEvent('');

package/package.json

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