@zat-design/sisyphus-react 4.0.0-beta.9 → 4.0.1

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

@@ -1,33 +1,45 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.ProTreeSelect = void 0;
-var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _ahooks = require("ahooks");
 var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _react = _interopRequireWildcard(require("react"));
 var _lodash = require("lodash");
+var _utils = require("@zat-design/utils");
 var _locale = _interopRequireDefault(require("../../../locale"));
 var _ProConfigProvider = require("../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../../ProForm/components/Container"));
 var _AdaptiveTooltip = _interopRequireDefault(require("../AdaptiveTooltip"));
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["disabled", "code", "dataSource", "defaultDisableValue", "onChange", "useRequest", "transformResponse", "fieldNames", "placeholder", "tooltip", "showSearch", "filterTreeNode", "treeNodeFilterProp", "defaultExpandAll", "expandedKeys", "treeCheckable", "onSearch", "otherProps", "width", "dropdownStyle", "popupClassName", "style", "allowClear", "listHeight", "showCodeName", "className", "checkStrictly", "checkable"],
-  _excluded2 = ["children"];
+var _excluded = ["disabled", "code", "dataSource", "defaultDisableValue", "onChange", "useRequest", "transformResponse", "fieldNames", "placeholder", "tooltip", "showSearch", "filterTreeNode", "treeNodeFilterProp", "defaultExpandAll", "expandedKeys", "treeCheckable", "onSearch", "otherProps", "width", "dropdownStyle", "popupClassName", "style", "allowClear", "listHeight", "showCodeName", "className", "checkStrictly", "checkable"];
 /* eslint-disable react/no-danger */
 /* eslint-disable react/jsx-closing-tag-location */
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == typeof h && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(typeof e + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 var SHOW_PARENT = _antd.TreeSelect.SHOW_PARENT;
 var ProTreeSelect = (props, ref) => {
-  var _useRequest$options, _selectProps$classNam, _selectProps$classNam2, _selectProps$styles, _selectProps$styles2;
+  var _useRequest$options, _useRequest$options3, _selectProps$classNam, _selectProps$classNam2, _selectProps$styles, _selectProps$styles2;
   // 全局属性配置在ConfigProvider
   var _ref = (0, _ProConfigProvider.useProConfig)('ProTreeSelect') || {},
     _ref$fieldNames = _ref.fieldNames,
@@ -35,14 +47,7 @@ var ProTreeSelect = (props, ref) => {
   var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProEnum'),
     _useProConfig$dics = _useProConfig.dics,
     dics = _useProConfig$dics === void 0 ? {} : _useProConfig$dics;
-  var label = 'label';
-  var code = 'value';
-  var uuidKey = 'value';
-  if (proSelectFieldNames && Object.keys(proSelectFieldNames).length) {
-    code = proSelectFieldNames.value;
-    label = proSelectFieldNames.label;
-    uuidKey = proSelectFieldNames.key || proSelectFieldNames.value;
-  }
+
   // 配置属性
   var disabled = props.disabled,
     enumCode = props.code,
@@ -77,7 +82,7 @@ var ProTreeSelect = (props, ref) => {
     className = props.className,
     checkStrictly = props.checkStrictly,
     checkable = props.checkable,
-    selectProps = (0, _objectWithoutProperties2.default)(props, _excluded);
+    selectProps = _objectWithoutProperties(props, _excluded);
   var _props$value = props.value,
     value = _props$value === void 0 ? undefined : _props$value;
   var _props$showEllipse = props.showEllipse,
@@ -88,14 +93,35 @@ var ProTreeSelect = (props, ref) => {
   var _ref3 = otherProps || {},
     isView = _ref3.isView,
     viewEmpty = _ref3.viewEmpty;
-  if (fieldNames && Object.keys(fieldNames).length) {
-    code = fieldNames.value || 'value';
-    label = fieldNames.label || 'label';
-    uuidKey = fieldNames.key || code;
-  }
+
+  // 合并全局和组件级别的 fieldNames，优先级：组件级 > 全局
+  var finalFieldNames = _objectSpread(_objectSpread({
+    label: 'label',
+    value: 'value',
+    children: 'children'
+  }, proSelectFieldNames), fieldNames);
+
+  /**
+   * 使用 tools.transformDataName 统一转换字段名
+   * 将原始数据转换为标准格式（label, value, children）
+   * tools.transformDataName 会自动检查数据是否已经是标准格式，如果是则直接返回
+   */
+  var transformFieldNames = (0, _react.useCallback)(data => {
+    if (!data || !Array.isArray(data) || !data.length) {
+      return data || [];
+    }
+
+    // 使用 tools.transformDataName 转换字段名
+    // 它会自动检查数据是否已经是标准格式（label, value, children），如果是则直接返回
+    return _utils.tools.transformDataName(data, {
+      label: finalFieldNames.label,
+      value: finalFieldNames.value,
+      children: finalFieldNames.children
+    });
+  }, [finalFieldNames]);
   // 经过处理后的枚举数据，可能来自用户配置的处理函数后返回的结果
   var _useSetState = (0, _ahooks.useSetState)({}),
-    _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
+    _useSetState2 = _slicedToArray(_useSetState, 2),
     _useSetState2$ = _useSetState2[0],
     _useSetState2$$select = _useSetState2$.selectList,
     selectList = _useSetState2$$select === void 0 ? [] : _useSetState2$$select,
@@ -105,6 +131,7 @@ var ProTreeSelect = (props, ref) => {
 
   /**
    * 如果数据少于10条那么将数据平铺返回
+   * 注意：当 treeCheckable 为 false 时（单选模式），应保持树形结构，不进行平铺
    * @param dictsEnum 原始数据
    * @returns 平铺或者原始数据
    */
@@ -112,50 +139,33 @@ var ProTreeSelect = (props, ref) => {
     if (treeCheckable) {
       return dictsEnum;
     }
-    var count = 0;
-    var result = [];
-    var loopCount = data => {
-      data.map(item => {
-        count += 1;
-        var children = item.children,
-          other = (0, _objectWithoutProperties2.default)(item, _excluded2);
-        result.push((0, _objectSpread2.default)({}, other));
-        if (item.children) {
-          loopCount(item.children);
-        }
-        return item;
-      });
-    };
-    if ((dictsEnum === null || dictsEnum === void 0 ? void 0 : dictsEnum.length) > 10) {
-      return dictsEnum;
-    }
-    loopCount(dictsEnum);
-    if (count <= 10) {
-      return result;
-    }
+    // 单选模式（treeCheckable=false）时，保持树形结构，不进行平铺
+    // 因为 TreeSelect 在单选模式下也需要树形结构来正确展示层级关系
     return dictsEnum;
   };
 
   /**
    * 如果要展示code-name，那么将源数据的label转为code-name
-   * @param dataArr 源数据
+   * 注意：此时数据已经是标准格式（label, value, children）
+   * @param dataArr 源数据（标准格式）
    * @param showCodeAndName 是否展示code-name
    * @returns 转换结果
    */
   var transferDataSource = (dataArr, showCodeAndName) => {
+    if (!showCodeAndName) {
+      return dataArr;
+    }
     var copyData = (0, _lodash.cloneDeep)(dataArr);
     var loop = arr => {
       arr.map(item => {
-        item[label] = `${item[code]}-${item[label]}`;
+        item.label = `${item.value}-${item.label}`;
         if (item.children) {
           loop(item.children);
         }
         return item;
       });
     };
-    if (showCodeAndName) {
-      loop(copyData);
-    }
+    loop(copyData);
     return copyData;
   };
   var defaultOnSuccessFun = res => {
@@ -167,7 +177,9 @@ var ProTreeSelect = (props, ref) => {
       _antd.message.error(msg);
       return;
     }
-    var resultData = transferDataSource(data, showCodeName);
+    // 先转换字段名，再处理 code-name 展示
+    var transformedData = transformFieldNames(data || []);
+    var resultData = transferDataSource(transformedData, showCodeName);
     setState({
       selectList: resultData || [],
       origDataSource: resultData || []
@@ -190,13 +202,15 @@ var ProTreeSelect = (props, ref) => {
   }, []);
 
   // 配置了异步数据源，拉取枚举数据逻辑 如果有code不掉接口从local里根据code取值
-  var fetchFunction = (0, _ahooks.useRequest)(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, (0, _objectSpread2.default)({
+  var fetchFunction = (0, _ahooks.useRequest)(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, _objectSpread({
     manual: true,
     debounceWait: 300,
     onSuccess: data => {
       if (transformResponse && typeof transformResponse === 'function') {
         var responseData = transformResponse(data);
-        var resultData = transferDataSource(responseData, showCodeName);
+        // 先转换字段名，再处理 code-name 展示
+        var transformedData = transformFieldNames(responseData);
+        var resultData = transferDataSource(transformedData, showCodeName);
         setState({
           selectList: countChild(resultData),
           origDataSource: resultData
@@ -217,7 +231,9 @@ var ProTreeSelect = (props, ref) => {
     if (fetchFunction !== null && fetchFunction !== void 0 && fetchFunction.data, useRequest !== null && useRequest !== void 0 && (_useRequest$options2 = useRequest.options) !== null && _useRequest$options2 !== void 0 && _useRequest$options2.cacheKey) {
       if (transformResponse && typeof transformResponse === 'function') {
         var responseData = transformResponse(fetchFunction.data);
-        var resultData = transferDataSource(responseData, showCodeName);
+        // 先转换字段名，再处理 code-name 展示
+        var transformedData = transformFieldNames(responseData);
+        var resultData = transferDataSource(transformedData, showCodeName);
         setState({
           selectList: countChild(resultData),
           origDataSource: resultData
@@ -226,23 +242,31 @@ var ProTreeSelect = (props, ref) => {
         defaultOnSuccessFun(fetchFunction.data);
       }
     }
-  }, [fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data, useRequest === null || useRequest === void 0 || (_useRequest$options3 = useRequest.options) === null || _useRequest$options3 === void 0 ? void 0 : _useRequest$options3.cacheKey]);
   (0, _ahooks.useDeepCompareEffect)(() => {
     if (enumCode) {
       var dictEnum = dics[enumCode] || [];
-      var resultData = transferDataSource(dictEnum, showCodeName);
+      // 先转换字段名，再处理 code-name 展示
+      var transformedData = transformFieldNames(dictEnum);
+      var resultData = transferDataSource(transformedData, showCodeName);
+      var processedList = countChild(resultData);
       setState({
-        selectList: countChild(resultData),
+        selectList: processedList,
         origDataSource: resultData
       });
     } else if (dataSource) {
-      var _resultData = transferDataSource(dataSource, showCodeName);
+      // 先转换字段名，再处理 code-name 展示
+      var _transformedData = transformFieldNames(dataSource);
+      var _resultData = transferDataSource(_transformedData, showCodeName);
+      var _processedList = countChild(_resultData);
       setState({
-        selectList: countChild(_resultData),
+        selectList: _processedList,
         origDataSource: _resultData
       });
     }
-  }, [enumCode, dataSource]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [enumCode, dataSource, showCodeName]);
   (0, _ahooks.useDeepCompareEffect)(() => {
     // code存在huo dataSource存在，不执行接口请求
     if (enumCode || dataSource) {
@@ -278,6 +302,7 @@ var ProTreeSelect = (props, ref) => {
 
   /**
    * 根据值进行回显
+   * 注意：此时数据已经是标准格式（label, value, children）
    * @param value 输入值
    * @returns 对应枚举label
    */
@@ -287,8 +312,8 @@ var ProTreeSelect = (props, ref) => {
     }
     var labelResult = [];
     var queryLabel = dicts => dicts.map(item => {
-      if (value.includes(item[code])) {
-        var labelText = item[label];
+      if (value.includes(item.value)) {
+        var labelText = item.label;
         labelResult.push(labelText);
       }
       if (item.children) {
@@ -333,15 +358,22 @@ var ProTreeSelect = (props, ref) => {
 
   /**
    * 自定义渲染子树
-   * @param node 每个节点数据对象
+   * 注意：此时数据已经是标准格式（label, value, children）
+   * @param node 每个节点数据对象（标准格式）
    * @returns 整个react节点树
    */
   var renderTreeNode = (node, grade) => {
     var children = node.children,
-      icon = node.icon;
-    var labelText = node[label];
-    var value = node[code];
-    var key = node[uuidKey];
+      icon = node.icon,
+      label = node.label,
+      nodeValue = node.value,
+      nodeKey = node.key;
+    var labelText = label;
+    var value = nodeValue;
+    var key = nodeValue; // 使用 value 作为 key，如果有 key 字段则使用 key
+    if (nodeKey !== undefined) {
+      key = nodeKey;
+    }
     // 三无走默认
     if (['undefined-undefined', 'undefined'].includes(labelText) && !value && !key) {
       if (showCodeName) {
@@ -409,7 +441,8 @@ var ProTreeSelect = (props, ref) => {
 
   /**
    * 从树形数据中找出用户搜索得数据，并且将搜索字符串高亮标识
-   * @param data 全量树
+   * 注意：此时数据已经是标准格式（label, value, children）
+   * @param data 全量树（标准格式）
    * @param searchStr 搜索字符串
    * @returns 处理后得树
    */
@@ -426,11 +459,11 @@ var ProTreeSelect = (props, ref) => {
         }
         // 迭代完子节点向上回溯，如果有匹配到得子节点，那么加入当前节点得孩子对象上,否则加入得是空数组
         item.children = currentNodeChild;
-        // 判断节点title是否包含关键字 如果有，那么直接进行下一循环
+        // 判断节点label是否包含关键字 如果有，那么直接进行下一循环
         // @ts-ignore
-        if (item[label].indexOf(keyWord) > -1 && (selectProps === null || selectProps === void 0 ? void 0 : selectProps.mode) !== 'treeSelect') {
+        if (item.label && 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">${keyWord}</span>`);
+          item.label = item.label.replace(regExp, `<span class="highlight-search-text">${keyWord}</span>`);
         }
         currentAllNodeChild.push(item);
       }
@@ -440,9 +473,9 @@ var ProTreeSelect = (props, ref) => {
     return sourceList;
   }
   var searchTreeEvent = (0, _lodash.debounce)( /*#__PURE__*/function () {
-    var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(searchVal) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(searchVal) {
       var result;
-      return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (searchVal) {
@@ -468,16 +501,23 @@ var ProTreeSelect = (props, ref) => {
       return _ref6.apply(this, arguments);
     };
   }(), 500);
+
+  /**
+   * 从树形数据中查找节点
+   * 注意：此时数据已经是标准格式（label, value, children）
+   * @param treeList 树形数据（标准格式）
+   * @param nodeValue 节点值
+   * @returns 找到的节点
+   */
   function findTreeNode(treeList, nodeValue) {
     var result = {};
     var filterData = function filterData(data) {
       for (var i = 0; i < data.length; i++) {
         var item = data[i];
-        if (item[code] === nodeValue || Array.isArray(nodeValue) && nodeValue.includes(item[code])) {
-          result = (0, _objectSpread2.default)({}, item);
-          result.value = item[code];
-          result.label = item[label];
-          delete result[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'];
+        if (item.value === nodeValue || Array.isArray(nodeValue) && nodeValue.includes(item.value)) {
+          result = _objectSpread({}, item);
+          // 删除 children 字段，避免循环引用
+          delete result.children;
           return null;
         }
         // 一直递归到最后一层子节点
@@ -489,6 +529,13 @@ var ProTreeSelect = (props, ref) => {
     filterData(treeList);
     return result;
   }
+  /**
+   * 根据值获取标签
+   * 注意：此时数据已经是标准格式（label, value, children）
+   * @param treeList 树形数据（标准格式）
+   * @param nodeValue 节点值
+   * @returns 标签对象或数组
+   */
   function getLabelByValue(treeList, nodeValue) {
     var result = nodeValue;
     if (nodeValue) {
@@ -500,21 +547,21 @@ var ProTreeSelect = (props, ref) => {
           return item;
         });
       } else {
-        result = findTreeNode(treeList, nodeValue[code]);
+        result = findTreeNode(treeList, nodeValue.value);
       }
     }
     return result;
   }
   var handleChange = (newVal, label, extra) => {
     // newVal回来得一定是label、value
+    // 注意：此时数据已经是标准格式（label, value, children）
     var _selectList = selectList.map(item => {
-      var label = item.label;
-      var _label = label;
-      if (label) {
+      var _label = item.label;
+      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');
+        _label = item.label = _label.replace(regex, '$1');
       }
-      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
+      return _objectSpread(_objectSpread({}, item), {}, {
         label: _label
       });
     });
@@ -537,7 +584,7 @@ var ProTreeSelect = (props, ref) => {
     var classStr = el.className;
     if (classStr && !treeCheckable && typeof classStr === 'string') {
       var _classStr$split = classStr.split(' '),
-        _classStr$split2 = (0, _slicedToArray2.default)(_classStr$split, 1),
+        _classStr$split2 = _slicedToArray(_classStr$split, 1),
         valStr = _classStr$split2[0];
       if (valStr && classStr.startsWith('node-val-')) {
         var choiceVal = valStr.replace('node-val-', '');
@@ -578,7 +625,7 @@ var ProTreeSelect = (props, ref) => {
     [`${innerClass}`]: true,
     [`${popupClassName}`]: popupClassName
   });
-  var treeProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({
+  var treeProps = _objectSpread(_objectSpread({
     disabled,
     showSearch,
     // 默认支持搜索
@@ -592,7 +639,7 @@ var ProTreeSelect = (props, ref) => {
     value,
     onChange: handleChange,
     listHeight: listHeight || 320,
-    style: (0, _objectSpread2.default)({
+    style: _objectSpread({
       width: width || '100%'
     }, style),
     onSearch: searchTreeEvent,
@@ -602,14 +649,14 @@ var ProTreeSelect = (props, ref) => {
     treeCheckStrictly: checkStrictly
   }, selectProps), {}, {
     // 使用新的 API 替代弃用的 popupClassName 和 dropdownStyle
-    classNames: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, selectProps === null || selectProps === void 0 ? void 0 : selectProps.classNames), {}, {
-      popup: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, selectProps === null || selectProps === void 0 || (_selectProps$classNam = selectProps.classNames) === null || _selectProps$classNam === void 0 ? void 0 : _selectProps$classNam.popup), {}, {
+    classNames: _objectSpread(_objectSpread({}, selectProps === null || selectProps === void 0 ? void 0 : selectProps.classNames), {}, {
+      popup: _objectSpread(_objectSpread({}, selectProps === null || selectProps === void 0 || (_selectProps$classNam = selectProps.classNames) === null || _selectProps$classNam === void 0 ? void 0 : _selectProps$classNam.popup), {}, {
         root: [selectProps === null || selectProps === void 0 || (_selectProps$classNam2 = selectProps.classNames) === null || _selectProps$classNam2 === void 0 || (_selectProps$classNam2 = _selectProps$classNam2.popup) === null || _selectProps$classNam2 === void 0 ? void 0 : _selectProps$classNam2.root, dropDownClassName].filter(Boolean).join(' ')
       })
     }),
-    styles: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, selectProps === null || selectProps === void 0 ? void 0 : selectProps.styles), {}, {
-      popup: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, selectProps === null || selectProps === void 0 || (_selectProps$styles = selectProps.styles) === null || _selectProps$styles === void 0 ? void 0 : _selectProps$styles.popup), {}, {
-        root: (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    styles: _objectSpread(_objectSpread({}, selectProps === null || selectProps === void 0 ? void 0 : selectProps.styles), {}, {
+      popup: _objectSpread(_objectSpread({}, selectProps === null || selectProps === void 0 || (_selectProps$styles = selectProps.styles) === null || _selectProps$styles === void 0 ? void 0 : _selectProps$styles.popup), {}, {
+        root: _objectSpread(_objectSpread({
           maxHeight: 320,
           paddingTop: '0px',
           maxWidth: '580px'
@@ -623,7 +670,7 @@ var ProTreeSelect = (props, ref) => {
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     onClick: nodeChangeEvent,
     className: cls,
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.TreeSelect, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.TreeSelect, _objectSpread(_objectSpread({
       placeholder: placeholder || _locale.default.ProForm.treeSelectPlaceholder,
       maxTagPlaceholder: rest => {
         var _rest = rest.map(tag => {

package/lib/ProTree/components/SearchTitle.js

@@ -1,6 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -8,6 +7,7 @@ exports.default = void 0;
 var _react = require("react");
 var _AdaptiveTooltip = _interopRequireDefault(require("./AdaptiveTooltip"));
 var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function SearchTitle(props) {
   var label = props.label,
     _props$searchStr = props.searchStr,