@zat-design/sisyphus-react 4.5.4 → 4.5.5

package/es/ProConfigProvider/index.js

@@ -98,14 +98,17 @@ function reducer(state, action) {
 }
 const ThemeAwareConfigProvider = ({
   locale,
+  theme,
   children
 }) => {
   const {
     state: themeState
   } = useTheme();
+  // 外部传入的 theme 与 ThemeContext 的 antdConfig 深度合并，外部 theme 优先覆盖默认值
+  const mergedTheme = merge({}, themeState.antdConfig, theme);
   return /*#__PURE__*/_jsx(ConfigProvider, {
     locale: locale,
-    theme: themeState.antdConfig,
+    theme: mergedTheme,
     children: /*#__PURE__*/_jsx("div", {
       children: children
     })
@@ -149,6 +152,7 @@ export const ProConfigProvider = props => {
       },
       children: /*#__PURE__*/_jsx(ThemeAwareConfigProvider, {
         locale: antdLangMap[lang] ?? zhCN,
+        theme: props.theme,
         children: props.children
       })
     })

package/es/ProEditTable/components/RenderField/index.js

@@ -396,8 +396,11 @@ const RenderField = ({
   // 使用useCallback优化debounceValidate函数
   const debounceValidate = useCallback((validateFieldKeys = []) => {
     setTimeout(() => {
+      // 行内联动被动触发的重校验：只校验、不滚动到报错位置（全局/主动保存校验仍会滚动）
+      // @ts-ignore 内部选项
       form.validateFields(validateFieldKeys, {
-        recursive: true
+        recursive: true,
+        __skipScrollOnError: true
       });
     }, 100);
   }, [form]);
@@ -418,7 +421,11 @@ const RenderField = ({
         if (dependencies?.length) {
           const validateFieldKeys = dependencies?.map?.(key => [...rowPath, key]);
           setTimeout(() => {
-            form.validateFields(validateFieldKeys);
+            // 依赖字段联动重校验：只校验、不滚动
+            // @ts-ignore 内部选项
+            form.validateFields(validateFieldKeys, {
+              __skipScrollOnError: true
+            });
           }, 100);
         }
         return;

package/es/ProEnum/hooks/useEnumRequest.js

@@ -1,6 +1,6 @@
 import { useEffect, useMemo, useRef } from 'react';
 import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
-import { diffCode, getEnumData, setEnumData, removeEnumData, cacheFieldNames, baseCacheKey, baseStorage } from "../utils";
+import { diffCode, getEnumData, setEnumData, removeEnumData, cacheFieldNames, cleanEnumResponse, baseCacheKey, baseStorage } from "../utils";
 import locale from "../../locale";
 import "../utils/eventCenter";
 const useEnumRequest = (props, dispatch) => {
@@ -209,19 +209,12 @@ const useEnumRequest = (props, dispatch) => {
           } else if (res.status === 200) {
             response = res.data;
           }
-          // 只返回fieldNames对象的key
-          if (clear) {
-            Object.keys(response).forEach(key => {
-              const options = [...response[key]];
-              if (ignoreCodes.includes(key)) {
-                response[key] = options;
-              } else {
-                response[key] = options.map(item => {
-                  return cacheFieldNames(fieldNames, item);
-                });
-              }
-            });
-          }
+          // 只返回fieldNames对象的key（非数组值会被安全跳过，避免展开报错）
+          response = cleanEnumResponse(response, {
+            clear,
+            ignoreCodes,
+            fieldNames
+          });
           cacheData.data = {
             ...cacheData.data,
             ...response

package/es/ProEnum/index.js

@@ -4,7 +4,7 @@ import _isString from "lodash/isString";
 import _isFunction from "lodash/isFunction";
 import _cloneDeep from "lodash/cloneDeep";
 import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
-import { message, Radio, Checkbox, Space } from 'antd';
+import { message, Radio, Checkbox, Space, Segmented } from 'antd';
 import React, { useState, useEffect, useMemo } from 'react';
 import ProSelect from "../ProSelect";
 import { useProConfig } from "../ProConfigProvider";
@@ -217,6 +217,17 @@ const ProEnum = props => {
           fieldValue: fieldValue,
           dataSource: list
         });
+      case 'Segmented':
+        return /*#__PURE__*/_jsx(Segmented, {
+          ..._omit(enumProps, ['fieldNames', 'showCodeName']),
+          options: list.map(item => ({
+            label: item[label],
+            value: item[fieldValue],
+            disabled: !!item.disabled
+          })),
+          value: value,
+          onChange: onChange
+        });
       default:
         return null;
     }

package/es/ProEnum/utils/index.js

@@ -313,4 +313,38 @@ export function cacheFieldNames(fieldNames, dataSource) {
     });
   }
   return result;
+}
+
+/**
+ * 对枚举请求返回的数据按 clear/fieldNames 进行清洗
+ * @param response 枚举数据 { code: DataOption[] }
+ * @param options clear 是否清洗、ignoreCodes 忽略清洗的 code、fieldNames 字段映射
+ * @returns 清洗后的新对象（不修改入参）
+ * @remark 某个 code 的值非数组时（脏缓存/异常返回）跳过清洗并原样透传，避免展开非可迭代值报错
+ */
+export function cleanEnumResponse(response, options) {
+  const {
+    clear = true,
+    ignoreCodes = [],
+    fieldNames
+  } = options;
+  if (!clear || typeof response !== 'object' || response === null) {
+    return response;
+  }
+  const result = {};
+  Object.keys(response).forEach(key => {
+    const value = response[key];
+    // 非数组值（脏缓存、异常返回等）无法展开清洗，原样透传，避免 not iterable 报错
+    if (!Array.isArray(value)) {
+      result[key] = value;
+      return;
+    }
+    const list = [...value];
+    if (ignoreCodes.includes(key)) {
+      result[key] = list;
+    } else {
+      result[key] = list.map(item => cacheFieldNames(fieldNames, item));
+    }
+  });
+  return result;
 }

package/es/ProForm/hooks/useForm.js

@@ -50,6 +50,15 @@ export const useForm = function (originForm, options) {
     return getFieldsValue(nameList, filterFunc);
   };
   const nextValidateFields = async (nameList, ...rest) => {
+    // 内部选项：行内联动等被动校验只想触发校验、不想滚动到报错位置；
+    // 全局/主动提交校验不传，保持滚动。提取后从传给 antd 底层的选项中剔除，避免污染原生 options。
+    // @ts-ignore
+    const skipScrollOnError = !!rest?.[0]?.__skipScrollOnError;
+    // @ts-ignore
+    const restForNative = rest?.[0] ? [(({
+      __skipScrollOnError,
+      ...opts
+    }) => opts)(rest[0]), ...rest.slice(1)] : rest;
     try {
       const isRecursive = rest?.[0]?.recursive;
       const stopOnFirstError = form?.__INTERNAL_CONFIG__?.stopOnFirstError;
@@ -62,18 +71,19 @@ export const useForm = function (originForm, options) {
         // eslint-disable-next-line no-restricted-syntax
         for (const field of allFields) {
           try {
-            // 创建不包含 stopOnFirstError 的选项
+            // 创建不包含 stopOnFirstError / 内部选项的选项
             // @ts-ignore
             const options = rest?.[0] ? {
               ...rest[0]
             } : {};
             delete options.stopOnFirstError;
+            delete options.__skipScrollOnError;
             // 验证单个字段
             // eslint-disable-next-line no-await-in-loop
             await validateFields([field], options);
           } catch (error) {
-            // 遇到错误，滚动到错误位置
-            if (scrollToError && error?.errorFields?.length) {
+            // 遇到错误，滚动到错误位置（skipScrollOnError 时跳过）
+            if (!skipScrollOnError && scrollToError && error?.errorFields?.length) {
               form.scrollToField(error.errorFields[0]?.name, {
                 block: 'center',
                 behavior: 'smooth'
@@ -112,7 +122,7 @@ export const useForm = function (originForm, options) {
         }
 
         // @ts-ignore
-        return await validateFields(validateNames, ...rest).then(values => {
+        return await validateFields(validateNames, ...restForNative).then(values => {
           return filterInternalFields(values, optimize);
         });
       }
@@ -124,17 +134,20 @@ export const useForm = function (originForm, options) {
           tablePagination?.click?.();
         }
       }
-      return await validateFields(nameList, ...rest).then(values => {
+      return await validateFields(nameList, ...restForNative).then(values => {
         return nameList ? values : nextGetFieldsValue();
       });
     } catch (error) {
-      if (scrollToError && error?.errorFields?.length && source === 'ProForm') {
-        form.scrollToField(error.errorFields[0]?.name, {
-          block: 'center',
-          behavior: 'smooth'
-        });
+      // skipScrollOnError（行内联动等被动校验）时不滚动，仅抛出错误
+      if (!skipScrollOnError) {
+        if (scrollToError && error?.errorFields?.length && source === 'ProForm') {
+          form.scrollToField(error.errorFields[0]?.name, {
+            block: 'center',
+            behavior: 'smooth'
+          });
+        }
+        handleScrollToErrorProEditTable();
       }
-      handleScrollToErrorProEditTable();
       throw error;
     }
   };

package/es/ProTable/components/RenderTabs/index.js

@@ -1,4 +1,4 @@
-import { Tabs, Form } from 'antd';
+import { Tabs, Form, Segmented } from 'antd';
 import { useMemo, useState, useEffect, memo } from 'react';
 import useEnum from "../../../ProEnum/hooks/useEnum";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -8,6 +8,8 @@ const RenderTabs = props => {
     dataSource = [],
     transformResponse,
     tabsProps,
+    segmentedProps,
+    mode = 'Segmented',
     name,
     formTableProps,
     transformParams
@@ -52,25 +54,38 @@ const RenderTabs = props => {
   if (!tabItems?.length) {
     return null;
   }
-  return /*#__PURE__*/_jsx(Tabs, {
-    className: "pro-table-tabs",
-    onChange: key => {
-      const fieldsValues = form?.getFieldsValue() || {};
-      setActiveKey(key);
-      form.setFieldValue(name, key);
-      let params = {
-        ...fieldsValues,
-        [name]: key
-      };
-      if (transformParams && typeof transformParams === 'function') {
-        params = transformParams(params);
-      }
-      onSearch?.(params);
-    },
-    type: "card",
-    ...tabsProps,
-    items: tabItems,
-    activeKey: activeKey
+  const handleChange = key => {
+    const fieldsValues = form?.getFieldsValue() || {};
+    setActiveKey(key);
+    form.setFieldValue(name, key);
+    let params = {
+      ...fieldsValues,
+      [name]: key
+    };
+    if (transformParams && typeof transformParams === 'function') {
+      params = transformParams(params);
+    }
+    onSearch?.(params);
+  };
+  if (mode === 'Tab') {
+    return /*#__PURE__*/_jsx(Tabs, {
+      className: "pro-table-tabs",
+      onChange: handleChange,
+      type: "card",
+      ...tabsProps,
+      items: tabItems,
+      activeKey: activeKey
+    });
+  }
+  return /*#__PURE__*/_jsx(Segmented, {
+    className: "pro-table-segmented",
+    options: tabItems.map(item => ({
+      label: item.label,
+      value: item.key
+    })),
+    ...segmentedProps,
+    onChange: value => handleChange(value),
+    value: activeKey
   });
 };
 export default /*#__PURE__*/memo(RenderTabs);

package/es/ProTable/style/index.less

@@ -644,3 +644,8 @@
     }
   }
 }
+
+// tabs mode 为 Segmented 时：宽度按内容自适应（靠左），与表格保持 8px 间距
+.pro-table-segmented {
+  margin-bottom: 8px;
+}

package/es/ProThemeTools/component/ProTools/index.js

@@ -1,6 +1,6 @@
 // 导入语句
-import { CheckOutlined, CloseOutlined } from '@ant-design/icons';
-import { Button, Drawer, Radio, Switch } from 'antd';
+import { CloseOutlined } from '@ant-design/icons';
+import { Button, ColorPicker, Drawer, Radio, Switch } from 'antd';
 import React, { useState, useEffect } from 'react';
 import { setThemes } from "../../utils/index";
 import { useProConfig } from "../../../ProConfigProvider";
@@ -31,46 +31,24 @@ const ProTools = ({
   } = useProConfig();
 
   // 状态和 Refs
-  const [active, setActive] = useState([{
-    color: '#006AFF',
-    active: true
-  }, {
-    color: '#00BC70',
-    active: false
-  }, {
-    color: '#FF8C16',
-    active: false
-  }, {
-    color: '#A00F20',
-    active: false
-  }, {
-    color: '#31AF96',
-    active: false
-  }]);
+  const [color, setColor] = useState('#006AFF');
 
   // 事件处理函数
-  const handleThemeColorClick = item => {
-    const array = active.map(activeItem => {
-      activeItem.active = false;
-      return {
-        color: activeItem.color,
-        active: item.color === activeItem.color
-      };
-    });
-    setActive(array);
+  const handleColorChange = hex => {
+    setColor(hex);
     setState({
       ...state,
-      zauiBrand: item.color
+      zauiBrand: hex
     });
     setThemes({
-      'zaui-brand': item.color
+      'zaui-brand': hex
     });
     dispatch({
       type: 'set',
       payload: {
         theme: {
-          primaryColor: item.color,
-          qiankunPrimaryColor: item.color
+          primaryColor: hex,
+          qiankunPrimaryColor: hex
         },
         forms: {}
       }
@@ -123,22 +101,7 @@ const ProTools = ({
     });
   };
   const handleResetClick = () => {
-    setActive([{
-      color: '#006AFF',
-      active: true
-    }, {
-      color: '#00BC70',
-      active: false
-    }, {
-      color: '#FF8C16',
-      active: false
-    }, {
-      color: '#A00F20',
-      active: false
-    }, {
-      color: '#31AF96',
-      active: false
-    }]);
+    setColor('#006AFF');
     onReset();
   };
 
@@ -155,14 +118,7 @@ const ProTools = ({
     // 优先使用 CSS 变量的值
     const finalZauiBrand = existingZauiBrand || zauiBrand;
     if (finalZauiBrand) {
-      const newArray = active.map(activeItem => {
-        activeItem.active = false;
-        return {
-          color: activeItem.color,
-          active: activeItem.color === finalZauiBrand.toLocaleUpperCase()
-        };
-      });
-      setActive(newArray);
+      setColor(finalZauiBrand);
       dispatch({
         type: 'set',
         payload: {
@@ -193,15 +149,10 @@ const ProTools = ({
       className: "pro-theme-tools-space",
       children: [/*#__PURE__*/_jsx("p", {
         children: `${locale.ProThemeTools.themeColor}`
-      }), /*#__PURE__*/_jsx("ul", {
-        className: "pro-theme-color",
-        children: active.map((item, index) => {
-          return /*#__PURE__*/_jsx("li", {
-            className: item.active ? 'active' : '',
-            onClick: () => handleThemeColorClick(item),
-            children: item.active ? /*#__PURE__*/_jsx(CheckOutlined, {}) : null
-          }, item.color);
-        })
+      }), /*#__PURE__*/_jsx(ColorPicker, {
+        value: color,
+        showText: true,
+        onChangeComplete: value => handleColorChange(value.toHexString())
       })]
     }), /*#__PURE__*/_jsxs("div", {
       className: "pro-theme-tools-space",

package/es/ProThemeTools/component/ProTools/style/index.less

@@ -35,73 +35,6 @@
     }
   }
 
-  .pro-theme-color {
-    display: flex;
-
-    li {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      width: 38px;
-      height: 38px;
-      margin-right: 34px;
-      color: #fff;
-      background: #fff;
-      border: 6px solid #fff;
-      border-radius: 50%;
-
-      span {
-        font-size: var(--zaui-font-size, 14px);
-        vertical-align: -7px;
-      }
-
-      &:nth-child(1) {
-        background: #006aff;
-
-        &.active,
-        &:hover {
-          border-color: #d6e7ff;
-        }
-      }
-
-      &:nth-child(2) {
-        background: #00bc70;
-
-        &.active,
-        &:hover {
-          border-color: #e0f5e8;
-        }
-      }
-
-      &:nth-child(3) {
-        background: #ff8c16;
-
-        &.active,
-        &:hover {
-          border-color: #ffecdd;
-        }
-      }
-
-      &:nth-child(4) {
-        background: #a00f20;
-
-        &.active,
-        &:hover {
-          border-color: #f2dbdb;
-        }
-      }
-      &:nth-child(5) {
-        margin-right: 0;
-        background: #31af96;
-
-        &.active,
-        &:hover {
-          border-color: #f2dbdb;
-        }
-      }
-    }
-  }
-
   .anticon-question-circle {
     color: var(--zaui-brand, #006aff);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "4.5.4",
+  "version": "4.5.5",
   "license": "MIT",
   "files": [
     "es",