@zat-design/sisyphus-react 3.13.2-beta.2 → 3.13.2-beta.4

package/dist/index.esm.css

@@ -5710,6 +5710,9 @@ input[type='button'] {
 .ant-table .ant-empty-normal {
   margin: calc(var(--zaui-space-size-lg, 32px) * var(--zaui-size, 1)) 0;
 }
+.ant-table .ant-table-tbody .ant-table-cell-fix-left-last:after {
+  width: 8px;
+}
 .ant-table.pro-table-no-stripe .ant-table-tbody .ant-table-row {
   background: #fff !important;
 }

package/es/ProForm/utils/useWatch.js

@@ -51,23 +51,39 @@ function useWatch(dependencies, form, wait) {
       getInternalHooks = formInstance.getInternalHooks;
     var _getInternalHooks = getInternalHooks(HOOK_MARK),
       registerWatch = _getInternalHooks.registerWatch;
+    // 创建回调函数
     var callback = function callback() {
+      // 只获取一次新值
       var newValue = getFieldsValue(_dependencies);
       var nextValueStr = stringify(newValue);
       // Compare stringify in case it's nest object
       if (valueStrRef.current !== nextValueStr) {
         valueStrRef.current = nextValueStr;
-        setValue(getFieldsValue(_dependencies));
+        // 关键修改：使用已获取的newValue，避免重复调用getFieldsValue
+        setValue(newValue);
       }
     };
     // 增加防抖
+    var cancelDebounce = null;
     if (wait) {
-      callback = debounce(callback, wait);
+      var debouncedCallback = debounce(callback, wait);
+      callback = debouncedCallback;
+      cancelDebounce = function cancelDebounce() {
+        return debouncedCallback.cancel();
+      };
     }
+    // 注册监听
     var cancelRegister = registerWatch(callback);
+    // 设置初始值
     var initialValue = getFieldsValue(_dependencies);
     setValue(initialValue);
-    return cancelRegister;
+    // 清理函数
+    return function () {
+      cancelRegister();
+      if (cancelDebounce) {
+        cancelDebounce();
+      }
+    };
   },
   // We do not need re-register since namePath content is the same
   // eslint-disable-next-line react-hooks/exhaustive-deps

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

@@ -16,7 +16,8 @@ var RenderTabs = function RenderTabs(props) {
     transformResponse = props.transformResponse,
     tabsProps = props.tabsProps,
     name = props.name,
-    formTableProps = props.formTableProps;
+    formTableProps = props.formTableProps,
+    transformParams = props.transformParams;
   var _ref = formTableProps || {},
     form = _ref.form,
     onSearch = _ref.onSearch;
@@ -67,7 +68,11 @@ var RenderTabs = function RenderTabs(props) {
       var fieldsValues = (form === null || form === void 0 ? void 0 : form.getFieldsValue()) || {};
       setActiveKey(key);
       form.setFieldValue(name, key);
-      onSearch === null || onSearch === void 0 ? void 0 : onSearch(_objectSpread(_objectSpread({}, fieldsValues), {}, _defineProperty({}, name, key)));
+      var params = _objectSpread(_objectSpread({}, fieldsValues), {}, _defineProperty({}, name, key));
+      if (transformParams && typeof transformParams === 'function') {
+        params = transformParams(params);
+      }
+      onSearch === null || onSearch === void 0 ? void 0 : onSearch(params);
     },
     type: "card"
   }, tabsProps), {}, {

package/es/ProTable/propsType.d.ts

@@ -337,6 +337,12 @@ export interface ProTableTabsType {
         label: string;
         value: string;
     }[];
+    /**
+     * 转换查询参数
+     * @description 转换查询参数
+     * @default undefined
+     */
+    transformParams?: (params: any) => any;
     /**
      * 枚举数据源转换
      * @description 枚举数据源转换

package/es/style/theme/antd.less

@@ -107,6 +107,11 @@
   .@{ant-prefix}-empty-normal {
     margin: calc(var(--zaui-space-size-lg; 32px) * var(--zaui-size; 1)) 0;
   }
+  .@{ant-prefix}-table-tbody{
+    .@{ant-prefix}-table-cell-fix-left-last:after{
+      width: 8px;
+    }
+  }
   &.pro-table-no-stripe {
     .@{ant-prefix}-table-tbody {
       .@{ant-prefix}-table-row {

package/lib/ProForm/utils/useWatch.js

@@ -61,23 +61,39 @@ function useWatch(dependencies, form, wait) {
       getInternalHooks = formInstance.getInternalHooks;
     var _getInternalHooks = getInternalHooks(_FieldContext.HOOK_MARK),
       registerWatch = _getInternalHooks.registerWatch;
+    // 创建回调函数
     var callback = function callback() {
+      // 只获取一次新值
       var newValue = getFieldsValue(_dependencies);
       var nextValueStr = stringify(newValue);
       // Compare stringify in case it's nest object
       if (valueStrRef.current !== nextValueStr) {
         valueStrRef.current = nextValueStr;
-        setValue(getFieldsValue(_dependencies));
+        // 关键修改：使用已获取的newValue，避免重复调用getFieldsValue
+        setValue(newValue);
       }
     };
     // 增加防抖
+    var cancelDebounce = null;
     if (wait) {
-      callback = (0, _lodash.debounce)(callback, wait);
+      var debouncedCallback = (0, _lodash.debounce)(callback, wait);
+      callback = debouncedCallback;
+      cancelDebounce = function cancelDebounce() {
+        return debouncedCallback.cancel();
+      };
     }
+    // 注册监听
     var cancelRegister = registerWatch(callback);
+    // 设置初始值
     var initialValue = getFieldsValue(_dependencies);
     setValue(initialValue);
-    return cancelRegister;
+    // 清理函数
+    return function () {
+      cancelRegister();
+      if (cancelDebounce) {
+        cancelDebounce();
+      }
+    };
   },
   // We do not need re-register since namePath content is the same
   // eslint-disable-next-line react-hooks/exhaustive-deps

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

@@ -20,7 +20,8 @@ var RenderTabs = function RenderTabs(props) {
     transformResponse = props.transformResponse,
     tabsProps = props.tabsProps,
     name = props.name,
-    formTableProps = props.formTableProps;
+    formTableProps = props.formTableProps,
+    transformParams = props.transformParams;
   var _ref = formTableProps || {},
     form = _ref.form,
     onSearch = _ref.onSearch;
@@ -71,7 +72,11 @@ var RenderTabs = function RenderTabs(props) {
       var fieldsValues = (form === null || form === void 0 ? void 0 : form.getFieldsValue()) || {};
       setActiveKey(key);
       form.setFieldValue(name, key);
-      onSearch === null || onSearch === void 0 ? void 0 : onSearch((0, _objectSpread3.default)((0, _objectSpread3.default)({}, fieldsValues), {}, (0, _defineProperty2.default)({}, name, key)));
+      var params = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, fieldsValues), {}, (0, _defineProperty2.default)({}, name, key));
+      if (transformParams && typeof transformParams === 'function') {
+        params = transformParams(params);
+      }
+      onSearch === null || onSearch === void 0 ? void 0 : onSearch(params);
     },
     type: "card"
   }, tabsProps), {}, {

package/lib/ProTable/propsType.d.ts

@@ -337,6 +337,12 @@ export interface ProTableTabsType {
         label: string;
         value: string;
     }[];
+    /**
+     * 转换查询参数
+     * @description 转换查询参数
+     * @default undefined
+     */
+    transformParams?: (params: any) => any;
     /**
      * 枚举数据源转换
      * @description 枚举数据源转换

package/lib/style/theme/antd.less

@@ -107,6 +107,11 @@
   .@{ant-prefix}-empty-normal {
     margin: calc(var(--zaui-space-size-lg; 32px) * var(--zaui-size; 1)) 0;
   }
+  .@{ant-prefix}-table-tbody{
+    .@{ant-prefix}-table-cell-fix-left-last:after{
+      width: 8px;
+    }
+  }
   &.pro-table-no-stripe {
     .@{ant-prefix}-table-tbody {
       .@{ant-prefix}-table-row {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.13.2-beta.2",
+  "version": "3.13.2-beta.4",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",