@zat-design/sisyphus-react 3.14.0-beta.2 → 3.14.2

package/es/ProEnum/hooks/useEnum.d.ts

@@ -18,4 +18,12 @@ declare function useEnum(codes: string[]): Record<string, DataOption[]>;
  * @param compose 展示 value-label
  */
 declare function useEnum(code: string, value?: string, compose?: boolean): [string, DataOption];
+/**
+ * input code、values array output [labels array, options array]
+ * @param code
+ * @param values 值数组
+ * @param compose 展示 value-label
+ * @returns [标签数组, 选项数组]
+ */
+declare function useEnum(code: string, values: (string | number)[], compose?: boolean): [string[], DataOption[]];
 export default useEnum;

package/es/ProEnum/hooks/useEnum.js

@@ -1,3 +1,5 @@
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+import _toPropertyKey from "@babel/runtime/helpers/esm/toPropertyKey";
 var _ref;
 /* eslint-disable no-redeclare */
 import { useProConfig } from "../../ProConfigProvider";
@@ -23,6 +25,14 @@ var baseEnumStorage = (_ref = window.localStorage.getItem('zat-design-pro-compon
  * @param compose 展示 value-label
  */
 
+/**
+ * input code、values array output [labels array, options array]
+ * @param code
+ * @param values 值数组
+ * @param compose 展示 value-label
+ * @returns [标签数组, 选项数组]
+ */
+
 /**
  * 根据 code 从枚举缓存取出对应的 options 、以及回显
  * @param codes
@@ -62,16 +72,76 @@ function useEnum(codes, value, compose) {
   if (typeof codes === 'string') {
     var _catchData$data;
     var options = (catchData === null || catchData === void 0 || (_catchData$data = catchData.data) === null || _catchData$data === void 0 ? void 0 : _catchData$data[codes]) || [];
+
+    // 获取 children 字段名
+    var fieldChildren = 'children';
+    if (fieldNames && Object.keys(fieldNames).length && fieldNames.children) {
+      fieldChildren = fieldNames.children;
+    }
+    if (clear) {
+      fieldChildren = 'children';
+    }
+
+    // 递归查找函数：在嵌套结构中查找选项
+    var findOptionInNested = (opts, targetValue, fValue, fChildren) => {
+      // 当前层级查找
+      var foundInCurrentLevel = opts.find(option => String(option[fValue]) === String(targetValue));
+      if (foundInCurrentLevel) {
+        return foundInCurrentLevel;
+      }
+      // 递归查找子级
+      var foundInChildren = opts.reduce((found, option) => {
+        if (found) return found;
+        if (option[fChildren] && Array.isArray(option[fChildren])) {
+          return findOptionInNested(option[fChildren], targetValue, fValue, fChildren);
+        }
+        return undefined;
+      }, undefined);
+      return foundInChildren;
+    };
+
+    // 清理选项：移除 children，保留数据源中的其他所有字段（包括 parentCode 等业务字段）
+    var cleanOption = option => {
+      var _ = option[fieldChildren],
+        restOption = _objectWithoutProperties(option, [fieldChildren].map(_toPropertyKey));
+      return restOption;
+    };
     var getEnumLabel = (v, composezTow) => {
-      var option = options.find(item => item[fieldValue] === v);
+      var option = findOptionInNested(options, v, fieldValue, fieldChildren);
       if (option) {
         return composezTow ? `${v}-${option[fieldLabel]}` : option[fieldLabel];
       }
+      return undefined;
     };
-    if (value && Array.isArray(options)) {
-      var option = options.find(item => item[fieldValue] === value);
+
+    // 处理数组值的情况
+    if (value && Array.isArray(value)) {
+      var labels = [];
+      var foundOptions = [];
+      value.forEach(v => {
+        var option = findOptionInNested(options, v, fieldValue, fieldChildren);
+        if (option) {
+          var cleanedOption = cleanOption(option);
+          foundOptions.push(cleanedOption);
+          labels.push(compose ? `${v}-${option[fieldLabel]}` : option[fieldLabel]);
+        } else {
+          var emptyOption = {
+            label: '',
+            value: ''
+          };
+          foundOptions.push(emptyOption);
+          labels.push('');
+        }
+      });
+      return [labels, foundOptions];
+    }
+
+    // 处理单个值的情况（保持向后兼容）
+    if (value && !Array.isArray(value) && Array.isArray(options)) {
+      var option = findOptionInNested(options, value, fieldValue, fieldChildren);
       if (option) {
-        return [compose ? `${value}-${option[fieldLabel]}` : option[fieldLabel], option];
+        var cleanedOption = cleanOption(option);
+        return [compose ? `${value}-${option[fieldLabel]}` : option[fieldLabel], cleanedOption];
       }
       return [options];
     }

package/es/ProForm/propsType.d.ts

@@ -100,6 +100,8 @@ export interface ProFormType<Values = any> extends FormProps<Values> {
     optimize?: boolean;
     /** 是否在遇到第一个错误时停止验证 */
     stopOnFirstError?: boolean;
+    /** label 对齐方式 */
+    labelAlign?: 'left' | 'right';
 }
 export interface TransformType<T = any> {
     normalize?: (value: StoreValue, prevValue: StoreValue, allValues: Store) => StoreValue;

package/es/ProTable/hooks/useAntdTable.js

@@ -448,7 +448,7 @@ function useAntdTable(service, options, useRequestOptions) {
       });
     }
     return false;
-  }, [rowSelections]);
+  }, [rowSelections, data.length, total]);
   var _rowSelection = {
     fixed: true,
     type: rowSelectType,
@@ -464,7 +464,7 @@ function useAntdTable(service, options, useRequestOptions) {
           return acc;
         }, {});
         setState({
-          selectedRecords: newSelectedKeys === null || newSelectedKeys === void 0 ? void 0 : newSelectedKeys.map(item => selectedRecordObj === null || selectedRecordObj === void 0 ? void 0 : selectedRecordObj[item]),
+          selectedRecords: newSelectedKeys === null || newSelectedKeys === void 0 ? void 0 : newSelectedKeys.map(item => selectedRecordObj === null || selectedRecordObj === void 0 ? void 0 : selectedRecordObj[String(item)]),
           selectedRowKeys: newSelectedKeys
         });
       } else {

package/lib/ProEnum/hooks/useEnum.d.ts

@@ -18,4 +18,12 @@ declare function useEnum(codes: string[]): Record<string, DataOption[]>;
  * @param compose 展示 value-label
  */
 declare function useEnum(code: string, value?: string, compose?: boolean): [string, DataOption];
+/**
+ * input code、values array output [labels array, options array]
+ * @param code
+ * @param values 值数组
+ * @param compose 展示 value-label
+ * @returns [标签数组, 选项数组]
+ */
+declare function useEnum(code: string, values: (string | number)[], compose?: boolean): [string[], DataOption[]];
 export default useEnum;

package/lib/ProEnum/hooks/useEnum.js

@@ -1,9 +1,12 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _toPropertyKey2 = _interopRequireDefault(require("@babel/runtime/helpers/toPropertyKey"));
 var _ProConfigProvider = require("../../ProConfigProvider");
 var _utils = require("../utils");
 var _ref;
@@ -29,6 +32,14 @@ var baseEnumStorage = (_ref = window.localStorage.getItem('zat-design-pro-compon
  * @param compose 展示 value-label
  */
 
+/**
+ * input code、values array output [labels array, options array]
+ * @param code
+ * @param values 值数组
+ * @param compose 展示 value-label
+ * @returns [标签数组, 选项数组]
+ */
+
 /**
  * 根据 code 从枚举缓存取出对应的 options 、以及回显
  * @param codes
@@ -68,16 +79,76 @@ function useEnum(codes, value, compose) {
   if (typeof codes === 'string') {
     var _catchData$data;
     var options = (catchData === null || catchData === void 0 || (_catchData$data = catchData.data) === null || _catchData$data === void 0 ? void 0 : _catchData$data[codes]) || [];
+
+    // 获取 children 字段名
+    var fieldChildren = 'children';
+    if (fieldNames && Object.keys(fieldNames).length && fieldNames.children) {
+      fieldChildren = fieldNames.children;
+    }
+    if (clear) {
+      fieldChildren = 'children';
+    }
+
+    // 递归查找函数：在嵌套结构中查找选项
+    var findOptionInNested = (opts, targetValue, fValue, fChildren) => {
+      // 当前层级查找
+      var foundInCurrentLevel = opts.find(option => String(option[fValue]) === String(targetValue));
+      if (foundInCurrentLevel) {
+        return foundInCurrentLevel;
+      }
+      // 递归查找子级
+      var foundInChildren = opts.reduce((found, option) => {
+        if (found) return found;
+        if (option[fChildren] && Array.isArray(option[fChildren])) {
+          return findOptionInNested(option[fChildren], targetValue, fValue, fChildren);
+        }
+        return undefined;
+      }, undefined);
+      return foundInChildren;
+    };
+
+    // 清理选项：移除 children，保留数据源中的其他所有字段（包括 parentCode 等业务字段）
+    var cleanOption = option => {
+      var _ = option[fieldChildren],
+        restOption = (0, _objectWithoutProperties2.default)(option, [fieldChildren].map(_toPropertyKey2.default));
+      return restOption;
+    };
     var getEnumLabel = (v, composezTow) => {
-      var option = options.find(item => item[fieldValue] === v);
+      var option = findOptionInNested(options, v, fieldValue, fieldChildren);
       if (option) {
         return composezTow ? `${v}-${option[fieldLabel]}` : option[fieldLabel];
       }
+      return undefined;
     };
-    if (value && Array.isArray(options)) {
-      var option = options.find(item => item[fieldValue] === value);
+
+    // 处理数组值的情况
+    if (value && Array.isArray(value)) {
+      var labels = [];
+      var foundOptions = [];
+      value.forEach(v => {
+        var option = findOptionInNested(options, v, fieldValue, fieldChildren);
+        if (option) {
+          var cleanedOption = cleanOption(option);
+          foundOptions.push(cleanedOption);
+          labels.push(compose ? `${v}-${option[fieldLabel]}` : option[fieldLabel]);
+        } else {
+          var emptyOption = {
+            label: '',
+            value: ''
+          };
+          foundOptions.push(emptyOption);
+          labels.push('');
+        }
+      });
+      return [labels, foundOptions];
+    }
+
+    // 处理单个值的情况（保持向后兼容）
+    if (value && !Array.isArray(value) && Array.isArray(options)) {
+      var option = findOptionInNested(options, value, fieldValue, fieldChildren);
       if (option) {
-        return [compose ? `${value}-${option[fieldLabel]}` : option[fieldLabel], option];
+        var cleanedOption = cleanOption(option);
+        return [compose ? `${value}-${option[fieldLabel]}` : option[fieldLabel], cleanedOption];
       }
       return [options];
     }

package/lib/ProForm/propsType.d.ts

@@ -100,6 +100,8 @@ export interface ProFormType<Values = any> extends FormProps<Values> {
     optimize?: boolean;
     /** 是否在遇到第一个错误时停止验证 */
     stopOnFirstError?: boolean;
+    /** label 对齐方式 */
+    labelAlign?: 'left' | 'right';
 }
 export interface TransformType<T = any> {
     normalize?: (value: StoreValue, prevValue: StoreValue, allValues: Store) => StoreValue;

package/lib/ProTable/hooks/useAntdTable.js

@@ -456,7 +456,7 @@ function useAntdTable(service, options, useRequestOptions) {
       });
     }
     return false;
-  }, [rowSelections]);
+  }, [rowSelections, data.length, total]);
   var _rowSelection = {
     fixed: true,
     type: rowSelectType,
@@ -472,7 +472,7 @@ function useAntdTable(service, options, useRequestOptions) {
           return acc;
         }, {});
         setState({
-          selectedRecords: newSelectedKeys === null || newSelectedKeys === void 0 ? void 0 : newSelectedKeys.map(item => selectedRecordObj === null || selectedRecordObj === void 0 ? void 0 : selectedRecordObj[item]),
+          selectedRecords: newSelectedKeys === null || newSelectedKeys === void 0 ? void 0 : newSelectedKeys.map(item => selectedRecordObj === null || selectedRecordObj === void 0 ? void 0 : selectedRecordObj[String(item)]),
           selectedRowKeys: newSelectedKeys
         });
       } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.14.0-beta.2",
+  "version": "3.14.2",
   "license": "MIT",
   "engines": {
     "node": ">=18.19.0"