@zat-design/sisyphus-react 3.14.2 → 3.14.3

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

@@ -14,8 +14,8 @@ require("antd/es/input/style");
 var _input = _interopRequireDefault(require("antd/es/input"));
 require("antd/es/message/style");
 var _message2 = _interopRequireDefault(require("antd/es/message"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 require("antd/es/tree-select/style");
 var _treeSelect = _interopRequireDefault(require("antd/es/tree-select"));
@@ -23,18 +23,18 @@ var _ahooks = require("ahooks");
 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 */
 var SHOW_PARENT = _treeSelect.default.SHOW_PARENT;
 var ProTreeSelect = (props, ref) => {
-  var _useRequest$options;
+  var _useRequest$options, _useRequest$options3;
   // 全局属性配置在ConfigProvider
   var _ref = (0, _ProConfigProvider.useProConfig)('ProTreeSelect') || {},
     _ref$fieldNames = _ref.fieldNames,
@@ -42,14 +42,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,
@@ -95,11 +88,32 @@ 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 = (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    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),
@@ -112,6 +126,7 @@ var ProTreeSelect = (props, ref) => {
 
   /**
    * 如果数据少于10条那么将数据平铺返回
+   * 注意：当 treeCheckable 为 false 时（单选模式），应保持树形结构，不进行平铺
    * @param dictsEnum 原始数据
    * @returns 平铺或者原始数据
    */
@@ -119,50 +134,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 => {
@@ -174,7 +172,9 @@ var ProTreeSelect = (props, ref) => {
       _message2.default.error(msg);
       return;
     }
-    var resultData = transferDataSource(data, showCodeName);
+    // 先转换字段名，再处理 code-name 展示
+    var transformedData = transformFieldNames(data || []);
+    var resultData = transferDataSource(transformedData, showCodeName);
     setState({
       selectList: resultData || [],
       origDataSource: resultData || []
@@ -203,7 +203,9 @@ var ProTreeSelect = (props, ref) => {
     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
@@ -224,7 +226,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
@@ -233,23 +237,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) {
@@ -285,6 +297,7 @@ var ProTreeSelect = (props, ref) => {
 
   /**
    * 根据值进行回显
+   * 注意：此时数据已经是标准格式（label, value, children）
    * @param value 输入值
    * @returns 对应枚举label
    */
@@ -294,8 +307,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) {
@@ -340,15 +353,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) {
@@ -416,7 +436,8 @@ var ProTreeSelect = (props, ref) => {
 
   /**
    * 从树形数据中找出用户搜索得数据，并且将搜索字符串高亮标识
-   * @param data 全量树
+   * 注意：此时数据已经是标准格式（label, value, children）
+   * @param data 全量树（标准格式）
    * @param searchStr 搜索字符串
    * @returns 处理后得树
    */
@@ -433,11 +454,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);
       }
@@ -475,16 +496,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])) {
+        if (item.value === nodeValue || Array.isArray(nodeValue) && nodeValue.includes(item.value)) {
           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'];
+          // 删除 children 字段，避免循环引用
+          delete result.children;
           return null;
         }
         // 一直递归到最后一层子节点
@@ -496,6 +524,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) {
@@ -507,19 +542,19 @@ 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), {}, {
         label: _label

package/lib/ProTreeModal/style/index.less

@@ -1,6 +1,12 @@
 @root-entry-name: 'default';
 @import (reference) '~antd/es/style/themes/index.less';
 
+.pro-tree-select-drop-down-container{
+  .@{ant-prefix}-select-tree-checkbox{
+    margin-top: 0;
+  }
+}
+
 .pro-tree-modal-container .@{ant-prefix}-modal-content .@{ant-prefix}-modal-body {
   max-height: 498px;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.14.2",
+  "version": "3.14.3",
   "license": "MIT",
   "engines": {
     "node": ">=18.19.0"
@@ -91,6 +91,7 @@
     "@commitlint/config-conventional": "^12.1.1",
     "@testing-library/jest-dom": "6.2.0",
     "@testing-library/react": "12.1.5",
+    "@testing-library/react-hooks": "^8.0.1",
     "@types/classnames": "^2.3.1",
     "@types/jest": "^29.5.11",
     "@types/lodash": "^4.14.171",