@zat-design/sisyphus-react 3.13.4-beta.6 → 3.13.5-beta.2

package/es/ProEditTable/components/RcTable/DraggableTable.js

@@ -72,17 +72,13 @@ var DndWrapper = function DndWrapper(_ref2) {
     value = _ref2.value,
     onChange = _ref2.onChange,
     onDrag = _ref2.onDrag,
+    onDragEnd = _ref2.onDragEnd,
     disabled = _ref2.disabled,
     children = _ref2.children;
-  var onDragEnd = function onDragEnd(event) {
+  var onDragEndtInside = function onDragEndtInside(event) {
     var active = event.active,
       over = event.over;
     if (active.id !== (over === null || over === void 0 ? void 0 : over.id)) {
-      if (onDrag) {
-        var nextList = onDrag(event, value);
-        onChange(nextList);
-        return;
-      }
       var activeIndex = value.findIndex(function (i) {
         return i.rowKey === active.id;
       });
@@ -90,11 +86,16 @@ var DndWrapper = function DndWrapper(_ref2) {
         return i.rowKey === (over === null || over === void 0 ? void 0 : over.id);
       });
       var nextValue = arrayMove(value, activeIndex, overIndex);
+      if (onDrag || onDragEnd) {
+        var nextList = onDragEnd ? onDragEnd(event, value, nextValue) : onDrag(event, value, nextValue);
+        onChange(nextList);
+        return;
+      }
       onChange(nextValue);
     }
   };
   return draggable && !disabled ? _jsx(DndContext, {
-    onDragEnd: onDragEnd,
+    onDragEnd: onDragEndtInside,
     children: _jsx(SortableContext, {
       items: (value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey) ? value.map(function (i) {
         return i.rowKey;
@@ -130,11 +131,13 @@ var DraggableTable = function DraggableTable(_ref3) {
     handlePageChange = tableProps.handlePageChange;
   var onChange = draggableProps.onChange,
     onDrag = draggableProps.onDrag,
-    draggable = draggableProps.draggable;
+    draggable = draggableProps.draggable,
+    onDragEnd = draggableProps.onDragEnd;
   return _jsxs(DndWrapper, {
     value: value,
     onChange: onChange,
     onDrag: onDrag,
+    onDragEnd: onDragEnd,
     disabled: disabled,
     draggable: draggable,
     children: [headerRender ? _jsx("div", {

package/es/ProEditTable/index.js

@@ -11,7 +11,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["value", "onChange", "onDrag", "className", "columns", "type", "mode", "stripe", "draggable", "virtual", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "toolbarSticky", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll", "actionDirection", "diffConfig"];
+var _excluded = ["value", "onChange", "onDrag", "onDragEnd", "className", "columns", "type", "mode", "stripe", "draggable", "virtual", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "toolbarSticky", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll", "actionDirection", "diffConfig"];
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
 import { get, isArray, isBoolean, set } from 'lodash';
@@ -29,6 +29,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
   var value = _ref.value,
     onChange = _ref.onChange,
     onDrag = _ref.onDrag,
+    onDragEnd = _ref.onDragEnd,
     className = _ref.className,
     columns = _ref.columns,
     type = _ref.type,
@@ -405,6 +406,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
         draggableProps: {
           onChange: onChange,
           onDrag: onDrag,
+          onDragEnd: onDragEnd,
           draggable: draggable
         },
         tableProps: {

package/es/ProEditTable/propsType.d.ts

@@ -377,8 +377,18 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
     rowDraggable?: (record?: T) => string | boolean;
     /**
      * 拖拽事件处理
+     * @param event 拖拽事件
+     * @param dataSource 当前数据源
+     * @param nextDataSource 拖拽后的数据源
      */
-    onDrag?: (event: DragEndEvent, dataSource: T[]) => T[];
+    onDrag?: (event: DragEndEvent, dataSource: T[], nextDataSource: T[]) => T[];
+    /**
+     * 拖拽结束事件处理
+     * @param event 拖拽事件
+     * @param dataSource 当前数据源
+     * @param nextDataSource 拖拽后的数据源
+     */
+    onDragEnd?: (event: DragEndEvent, dataSource: T[], nextDataSource: T[]) => T[];
     /**
      * 引用对象
      */

package/es/ProForm/components/combination/Group/hooks/index.d.ts

@@ -0,0 +1,20 @@
+import { InternalNamePath, NamePath } from 'antd/lib/form/interface';
+import { FormInstance } from 'antd';
+import type { GroupColumnType, GroupType } from '../propsType';
+export type EventArgs = any[];
+interface ColumnsTransformerParams {
+    columns: GroupColumnType[];
+    name?: NamePath;
+    names?: NamePath[];
+    value?: any[];
+    onChange: any;
+    namePath?: InternalNamePath;
+    form: FormInstance;
+    index?: number;
+    formDisabled?: boolean;
+    desensitizationKey?: string;
+    groupProps: GroupType;
+}
+/** 转换columns */
+export declare const useTransformColumns: (params: ColumnsTransformerParams) => any[];
+export {};

package/es/ProForm/components/combination/Group/hooks/index.js

@@ -0,0 +1,161 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+/* eslint-disable no-lonely-if */
+import { useRef } from 'react';
+import { cloneDeep, isEqual } from 'lodash';
+import { useDeepCompareMemo } from '../../../../utils/useDeepCompareMemo';
+import { difference } from '../../../../../ProEditTable/utils/tools';
+import { getReactiveProps, getValueTypeTrans, valueFromEventWrapper } from '../utils';
+/** 转换columns */
+export var useTransformColumns = function useTransformColumns(params) {
+  var form = params.form,
+    columns = params.columns,
+    name = params.name,
+    names = params.names,
+    outerIndex = params.index,
+    namePath = params.namePath,
+    value = params.value,
+    internalChange = params.onChange,
+    groupProps = params.groupProps,
+    formDisabled = params.formDisabled,
+    desensitizationKey = params.desensitizationKey;
+  var timerRef = useRef([]);
+  return columns === null || columns === void 0 ? void 0 : columns.flatMap(function (column, index) {
+    var type = column.type,
+      valueType = column.valueType,
+      switchValue = column.switchValue,
+      toISOString = column.toISOString,
+      toCSTString = column.toCSTString,
+      fieldProps = column.fieldProps,
+      normalize = column.normalize,
+      disabled = column.disabled,
+      show = column.show,
+      component = column.component,
+      clearNotShow = column.clearNotShow,
+      desensitization = column.desensitization;
+    var _ref = fieldProps || {},
+      mode = _ref.mode,
+      onChange = _ref.onChange,
+      onFieldChange = _ref.onFieldChange,
+      comDisabled = _ref.disabled,
+      onBlur = _ref.onBlur;
+    var _disabled = disabled || comDisabled;
+    var columnName = names ? names[index] : [].concat(name, index);
+    // 响应式字段改变后的回调
+    var changedCallback = function changedCallback(lastDependency, current) {
+      // 清值防抖  多次刷新时以最后一次为准
+      if (clearNotShow !== false && names) {
+        if ((current === null || current === void 0 ? void 0 : current.show) === false) {
+          clearInterval(timerRef.current[index]);
+          timerRef.current[index] = setTimeout(function () {
+            if (names) {
+              form.resetFields([columnName]);
+            }
+            if (!names && (value === null || value === void 0 ? void 0 : value.length)) {
+              value[index] = null;
+              form.setFieldValue(columnName, _toConsumableArray(value));
+            }
+          }, 200);
+        } else {
+          clearInterval(timerRef.current[index]);
+        }
+      }
+    };
+    // 响应式字段
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    var reactiveProps = useDeepCompareMemo(function () {
+      return getReactiveProps({
+        form: form,
+        index: index,
+        type: type,
+        namePath: namePath,
+        disabled: _disabled,
+        show: show,
+        component: component,
+        fieldProps: fieldProps,
+        name: columnName,
+        desensitization: desensitization
+      });
+    }, changedCallback, [value, show, fieldProps, _disabled, columnName, type]);
+    if (reactiveProps.show === false) {
+      return [];
+    }
+    var transform = getValueTypeTrans({
+      type: type,
+      valueType: valueType,
+      switchValue: switchValue,
+      toISOString: toISOString,
+      toCSTString: toCSTString,
+      mode: mode
+    });
+    var newValue;
+    var handleChange = function handleChange() {
+      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+        args[_key] = arguments[_key];
+      }
+      newValue = valueFromEventWrapper(column, args);
+      if (transform === null || transform === void 0 ? void 0 : transform.normalize) {
+        var _transform$normalize;
+        newValue = transform === null || transform === void 0 ? void 0 : (_transform$normalize = transform.normalize) === null || _transform$normalize === void 0 ? void 0 : _transform$normalize.call(transform, newValue);
+      } else if (normalize) {
+        // @ts-ignore
+        newValue = normalize === null || normalize === void 0 ? void 0 : normalize(newValue);
+      }
+      internalChange === null || internalChange === void 0 ? void 0 : internalChange(newValue, args[1], index);
+      var values = form.getFieldValue(namePath);
+      var originRow = (namePath === null || namePath === void 0 ? void 0 : namePath.length) ? cloneDeep(values) : undefined;
+      onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, args);
+      onFieldChange === null || onFieldChange === void 0 ? void 0 : onFieldChange(newValue, values, {
+        index: outerIndex,
+        namePath: namePath,
+        form: form,
+        option: args === null || args === void 0 ? void 0 : args[1]
+      });
+      // 如果是在可编辑表格或formList内部, 储存当前行的值, 并在变更后更新到表单里
+      if ((namePath === null || namePath === void 0 ? void 0 : namePath.length) && !isEqual(originRow, values)) {
+        var _Object$keys, _Object$keys$map;
+        form.setFieldValue(namePath, values);
+        var diff = difference(originRow, values) || {};
+        var validateFieldKeys = (_Object$keys = Object.keys(diff)) === null || _Object$keys === void 0 ? void 0 : (_Object$keys$map = _Object$keys.map) === null || _Object$keys$map === void 0 ? void 0 : _Object$keys$map.call(_Object$keys, function (key) {
+          return [].concat(_toConsumableArray(namePath), [key]);
+        });
+        if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
+          setTimeout(function () {
+            form.validateFields([name].concat(_toConsumableArray(validateFieldKeys)));
+          }, 100);
+        }
+      }
+    };
+    var handleBlur = function handleBlur() {
+      if (!onBlur) return;
+      var values = form.getFieldValue(namePath);
+      for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+        args[_key2] = arguments[_key2];
+      }
+      onBlur === null || onBlur === void 0 ? void 0 : onBlur(args[0], values, {
+        index: outerIndex,
+        namePath: namePath,
+        form: form,
+        option: args === null || args === void 0 ? void 0 : args[1]
+      });
+    };
+    // 内外一个为true则为true
+    var getLastDisabled = function getLastDisabled() {
+      if (Array.isArray(groupProps.disabled)) {
+        return reactiveProps.disabled || groupProps.disabled[index];
+      }
+      return reactiveProps.disabled || groupProps.disabled;
+    };
+    return _objectSpread(_objectSpread(_objectSpread({}, column), {}, {
+      name: columnName
+    }, reactiveProps), {}, {
+      disabled: getLastDisabled(),
+      getValueProps: transform === null || transform === void 0 ? void 0 : transform.getValueProps,
+      fieldProps: _objectSpread(_objectSpread(_objectSpread({}, column === null || column === void 0 ? void 0 : column.fieldProps), reactiveProps === null || reactiveProps === void 0 ? void 0 : reactiveProps.fieldProps), {}, {
+        onChange: handleChange,
+        onBlur: handleBlur,
+        value: value === null || value === void 0 ? void 0 : value[index]
+      })
+    });
+  });
+};

package/es/ProForm/components/combination/Group/index.js

@@ -7,7 +7,8 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import React from 'react';
 import { omit } from 'lodash';
 import classnames from 'classnames';
-import { insertSeparator, useTransformColumns } from './utils';
+import { insertSeparator } from './utils';
+import { useTransformColumns } from './hooks';
 import ProForm from '../../../../ProForm';
 import ComRender from './component/ComRender';
 /**

package/es/ProForm/components/combination/Group/utils.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import { InternalNamePath, NamePath } from 'antd/lib/form/interface';
 import { FormInstance } from 'antd';
-import type { GroupColumnType, GroupType, SpaceType } from './propsType';
+import type { GroupColumnType, SpaceType } from './propsType';
 import type { ProFormColumnType, ReactiveFunction } from '../../render/propsType';
 export type EventArgs = any[];
 /**
@@ -50,19 +50,6 @@ type ValueTypeGetterParams = Pick<ProFormColumnType, 'valueType' | 'switchValue'
 export declare const getValueTypeTrans: (params: ValueTypeGetterParams) => any;
 /** 执行所有中间件 返回处理后的值 */
 export declare const getValueMiddleware: (value: any, callbacks?: any[]) => any;
-interface ColumnsTransformerParams {
-    columns: GroupColumnType[];
-    name?: NamePath;
-    names?: NamePath[];
-    value?: any[];
-    onChange: any;
-    namePath?: InternalNamePath;
-    form: FormInstance;
-    index?: number;
-    formDisabled?: boolean;
-    desensitizationKey?: string;
-    groupProps: GroupType;
-}
-/** 转换columns */
-export declare const useTransformColumns: (params: ColumnsTransformerParams) => any[];
+/** 获取中间件处理后的value */
+export declare const valueFromEventWrapper: (column: any, args: any) => any;
 export {};

package/es/ProForm/components/combination/Group/utils.js

@@ -1,16 +1,11 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import "antd/es/button/style";
 import _Button from "antd/es/button";
 import { jsx as _jsx } from "react/jsx-runtime";
-/* eslint-disable no-lonely-if */
-import { useRef } from 'react';
-import { cloneDeep, isEqual, isFunction } from 'lodash';
+import { isFunction } from 'lodash';
 import { validate } from '@zat-design/utils';
 import valueTypeMap from '../../../utils/valueType';
-import { useDeepCompareMemo } from '../../../utils/useDeepCompareMemo';
-import { difference } from '../../../../ProEditTable/utils/tools';
 /**
  * 插入间隔符
  * @param columns 表单配置数组
@@ -177,7 +172,7 @@ export var getValueMiddleware = function getValueMiddleware(value) {
   }, value);
 };
 /** 获取中间件处理后的value */
-var valueFromEventWrapper = function valueFromEventWrapper(column, args) {
+export var valueFromEventWrapper = function valueFromEventWrapper(column, args) {
   var getValueFromEvent = column.getValueFromEvent,
     _column$valuePropName = column.valuePropName,
     valuePropName = _column$valuePropName === void 0 ? 'value' : _column$valuePropName,
@@ -193,157 +188,4 @@ var valueFromEventWrapper = function valueFromEventWrapper(column, args) {
   if (trim) list.push(getTrim);
   if (upperCase) list.push(getUpperCase);
   return getValueMiddleware(newValue, list);
-};
-/** 转换columns */
-export var useTransformColumns = function useTransformColumns(params) {
-  var form = params.form,
-    columns = params.columns,
-    name = params.name,
-    names = params.names,
-    outerIndex = params.index,
-    namePath = params.namePath,
-    value = params.value,
-    internalChange = params.onChange,
-    groupProps = params.groupProps,
-    formDisabled = params.formDisabled,
-    desensitizationKey = params.desensitizationKey;
-  var timerRef = useRef([]);
-  return columns === null || columns === void 0 ? void 0 : columns.flatMap(function (column, index) {
-    var type = column.type,
-      valueType = column.valueType,
-      switchValue = column.switchValue,
-      toISOString = column.toISOString,
-      toCSTString = column.toCSTString,
-      fieldProps = column.fieldProps,
-      normalize = column.normalize,
-      disabled = column.disabled,
-      show = column.show,
-      component = column.component,
-      clearNotShow = column.clearNotShow,
-      desensitization = column.desensitization;
-    var _ref = fieldProps || {},
-      mode = _ref.mode,
-      onChange = _ref.onChange,
-      onFieldChange = _ref.onFieldChange,
-      comDisabled = _ref.disabled,
-      onBlur = _ref.onBlur;
-    var _disabled = disabled || comDisabled;
-    var columnName = names ? names[index] : [].concat(name, index);
-    // 响应式字段改变后的回调
-    var changedCallback = function changedCallback(lastDependency, current) {
-      // 清值防抖  多次刷新时以最后一次为准
-      if (clearNotShow !== false && names) {
-        if ((current === null || current === void 0 ? void 0 : current.show) === false) {
-          clearInterval(timerRef.current[index]);
-          timerRef.current[index] = setTimeout(function () {
-            if (names) {
-              form.resetFields([columnName]);
-            }
-            if (!names && (value === null || value === void 0 ? void 0 : value.length)) {
-              value[index] = null;
-              form.setFieldValue(columnName, _toConsumableArray(value));
-            }
-          }, 200);
-        } else {
-          clearInterval(timerRef.current[index]);
-        }
-      }
-    };
-    // 响应式字段
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    var reactiveProps = useDeepCompareMemo(function () {
-      return getReactiveProps({
-        form: form,
-        index: index,
-        type: type,
-        namePath: namePath,
-        disabled: _disabled,
-        show: show,
-        component: component,
-        fieldProps: fieldProps,
-        name: columnName,
-        desensitization: desensitization
-      });
-    }, changedCallback, [value, show, fieldProps, _disabled, columnName, type]);
-    if (reactiveProps.show === false) {
-      return [];
-    }
-    var transform = getValueTypeTrans({
-      type: type,
-      valueType: valueType,
-      switchValue: switchValue,
-      toISOString: toISOString,
-      toCSTString: toCSTString,
-      mode: mode
-    });
-    var newValue;
-    var handleChange = function handleChange() {
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
-      }
-      newValue = valueFromEventWrapper(column, args);
-      if (transform === null || transform === void 0 ? void 0 : transform.normalize) {
-        var _transform$normalize;
-        newValue = transform === null || transform === void 0 ? void 0 : (_transform$normalize = transform.normalize) === null || _transform$normalize === void 0 ? void 0 : _transform$normalize.call(transform, newValue);
-      } else if (normalize) {
-        // @ts-ignore
-        newValue = normalize === null || normalize === void 0 ? void 0 : normalize(newValue);
-      }
-      internalChange === null || internalChange === void 0 ? void 0 : internalChange(newValue, args[1], index);
-      var values = form.getFieldValue(namePath);
-      var originRow = (namePath === null || namePath === void 0 ? void 0 : namePath.length) ? cloneDeep(values) : undefined;
-      onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, args);
-      onFieldChange === null || onFieldChange === void 0 ? void 0 : onFieldChange(newValue, values, {
-        index: outerIndex,
-        namePath: namePath,
-        form: form,
-        option: args === null || args === void 0 ? void 0 : args[1]
-      });
-      // 如果是在可编辑表格或formList内部, 储存当前行的值, 并在变更后更新到表单里
-      if ((namePath === null || namePath === void 0 ? void 0 : namePath.length) && !isEqual(originRow, values)) {
-        var _Object$keys, _Object$keys$map;
-        form.setFieldValue(namePath, values);
-        var diff = difference(originRow, values) || {};
-        var validateFieldKeys = (_Object$keys = Object.keys(diff)) === null || _Object$keys === void 0 ? void 0 : (_Object$keys$map = _Object$keys.map) === null || _Object$keys$map === void 0 ? void 0 : _Object$keys$map.call(_Object$keys, function (key) {
-          return [].concat(_toConsumableArray(namePath), [key]);
-        });
-        if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
-          setTimeout(function () {
-            form.validateFields([name].concat(_toConsumableArray(validateFieldKeys)));
-          }, 100);
-        }
-      }
-    };
-    var handleBlur = function handleBlur() {
-      if (!onBlur) return;
-      var values = form.getFieldValue(namePath);
-      for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-        args[_key2] = arguments[_key2];
-      }
-      onBlur === null || onBlur === void 0 ? void 0 : onBlur(args[0], values, {
-        index: outerIndex,
-        namePath: namePath,
-        form: form,
-        option: args === null || args === void 0 ? void 0 : args[1]
-      });
-    };
-    // 内外一个为true则为true
-    var getLastDisabled = function getLastDisabled() {
-      if (Array.isArray(groupProps.disabled)) {
-        return reactiveProps.disabled || groupProps.disabled[index];
-      }
-      return reactiveProps.disabled || groupProps.disabled;
-    };
-    return _objectSpread(_objectSpread(_objectSpread({}, column), {}, {
-      name: columnName
-    }, reactiveProps), {}, {
-      disabled: getLastDisabled(),
-      getValueProps: transform === null || transform === void 0 ? void 0 : transform.getValueProps,
-      fieldProps: _objectSpread(_objectSpread(_objectSpread({}, column === null || column === void 0 ? void 0 : column.fieldProps), reactiveProps === null || reactiveProps === void 0 ? void 0 : reactiveProps.fieldProps), {}, {
-        onChange: handleChange,
-        onBlur: handleBlur,
-        value: value === null || value === void 0 ? void 0 : value[index]
-      })
-    });
-  });
 };

package/es/ProTable/hooks/useAntdTable.js

@@ -4,8 +4,6 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import "antd/es/message/style";
 import _message from "antd/es/message";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import "antd/es/form/style";
-import _Form from "antd/es/form";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _excluded = ["page", "filters", "sorter"];
@@ -34,6 +32,7 @@ function useAntdTable(service, options, useRequestOptions) {
       total: 0,
       selectedRecords: [],
       selectedRowKeys: [],
+      searchValues: undefined,
       extraFilter: {
         filters: undefined,
         sorter: undefined
@@ -46,6 +45,7 @@ function useAntdTable(service, options, useRequestOptions) {
     total = _useSetState2$.total,
     selectedRecords = _useSetState2$.selectedRecords,
     selectedRowKeys = _useSetState2$.selectedRowKeys,
+    searchValues = _useSetState2$.searchValues,
     extraFilter = _useSetState2$.extraFilter,
     allSelected = _useSetState2$.allSelected,
     setState = _useSetState2[1];
@@ -66,9 +66,6 @@ function useAntdTable(service, options, useRequestOptions) {
     transformParams = _useDefaultOptions.transformParams,
     transformResponse = _useDefaultOptions.transformResponse,
     disabled = _useDefaultOptions.disabled;
-  // 搜索表单里的值
-  var _searchValues = _Form.useWatch([], form);
-  var searchValues = removeEmptyKeys(_searchValues);
   var _ref = useRequestOptions || {},
     defaultParams = _ref.defaultParams;
   var defaultParam = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
@@ -193,6 +190,7 @@ function useAntdTable(service, options, useRequestOptions) {
   }, []);
   // 分页变更
   var handlePageChange = useCallback(function (current, pageSize) {
+    var _form$getFieldsValue;
     var page = {
       pageNum: current,
       pageSize: pageSize
@@ -204,9 +202,10 @@ function useAntdTable(service, options, useRequestOptions) {
         selectedRowKeys: []
       });
     }
-    run(getTransformParams(_objectSpread(_objectSpread({
+    var newValues = (_form$getFieldsValue = form.getFieldsValue()) !== null && _form$getFieldsValue !== void 0 ? _form$getFieldsValue : {};
+    run(getTransformParams(_objectSpread(_objectSpread(_objectSpread({
       page: page
-    }, searchValues), extraFilter)));
+    }, searchValues), newValues), extraFilter)));
   }, [allSelected, searchValues, extraFilter, data, getTransformParams]);
   var handleTableChange = useCallback(function (pagination, filters, sorter, extra) {
     // 跳过分页改变，使用pagination的onChange
@@ -247,6 +246,7 @@ function useAntdTable(service, options, useRequestOptions) {
     if ((selectedRecords === null || selectedRecords === void 0 ? void 0 : selectedRecords.length) || isNonEmptyObject(_values) || !isEqual(previousSearchValues, _values)) {
       previousSearchValues = _values;
       setState({
+        searchValues: _values,
         allSelected: false,
         selectedRecords: [],
         selectedRowKeys: []
@@ -258,6 +258,7 @@ function useAntdTable(service, options, useRequestOptions) {
   }, [extraFilter, page.pageSize, previousPage, getTransformParams]);
   var resetParams = useCallback(function (page) {
     setState({
+      searchValues: undefined,
       allSelected: false,
       selectedRecords: [],
       selectedRowKeys: [],

package/es/ProTable/propsType.d.ts

@@ -735,6 +735,12 @@ export interface ProTableUseAntdTableType<I, R> {
      * @default []
      */
     selectedRowKeys: Key[];
+    /**
+    * 搜索值
+    * @description 当前表单的搜索条件
+    * @default undefined
+    */
+    searchValues: I;
     /**
      * 额外过滤条件
      * @description 表单之外的额外过滤条件

package/es/ProUpload/components/ButtonRender.js

@@ -92,6 +92,9 @@ var ButtonRender = function ButtonRender(props) {
               children: [_jsx(CloudUploadOutlined, {}), buttonText]
             })), afterRender ? _jsx("div", {
               className: "pro-upload-button-inner-right",
+              onClick: function onClick(e) {
+                return e.stopPropagation();
+              },
               children: afterRender
             }) : null]
           })

package/lib/ProEditTable/components/RcTable/DraggableTable.js

@@ -79,17 +79,13 @@ var DndWrapper = function DndWrapper(_ref2) {
     value = _ref2.value,
     onChange = _ref2.onChange,
     onDrag = _ref2.onDrag,
+    onDragEnd = _ref2.onDragEnd,
     disabled = _ref2.disabled,
     children = _ref2.children;
-  var onDragEnd = function onDragEnd(event) {
+  var onDragEndtInside = function onDragEndtInside(event) {
     var active = event.active,
       over = event.over;
     if (active.id !== (over === null || over === void 0 ? void 0 : over.id)) {
-      if (onDrag) {
-        var nextList = onDrag(event, value);
-        onChange(nextList);
-        return;
-      }
       var activeIndex = value.findIndex(function (i) {
         return i.rowKey === active.id;
       });
@@ -97,11 +93,16 @@ var DndWrapper = function DndWrapper(_ref2) {
         return i.rowKey === (over === null || over === void 0 ? void 0 : over.id);
       });
       var nextValue = (0, _sortable.arrayMove)(value, activeIndex, overIndex);
+      if (onDrag || onDragEnd) {
+        var nextList = onDragEnd ? onDragEnd(event, value, nextValue) : onDrag(event, value, nextValue);
+        onChange(nextList);
+        return;
+      }
       onChange(nextValue);
     }
   };
   return draggable && !disabled ? (0, _jsxRuntime.jsx)(_core.DndContext, {
-    onDragEnd: onDragEnd,
+    onDragEnd: onDragEndtInside,
     children: (0, _jsxRuntime.jsx)(_sortable.SortableContext, {
       items: (value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey) ? value.map(function (i) {
         return i.rowKey;
@@ -137,11 +138,13 @@ var DraggableTable = function DraggableTable(_ref3) {
     handlePageChange = tableProps.handlePageChange;
   var onChange = draggableProps.onChange,
     onDrag = draggableProps.onDrag,
-    draggable = draggableProps.draggable;
+    draggable = draggableProps.draggable,
+    onDragEnd = draggableProps.onDragEnd;
   return (0, _jsxRuntime.jsxs)(DndWrapper, {
     value: value,
     onChange: onChange,
     onDrag: onDrag,
+    onDragEnd: onDragEnd,
     disabled: disabled,
     draggable: draggable,
     children: [headerRender ? (0, _jsxRuntime.jsx)("div", {

package/lib/ProEditTable/index.js

@@ -26,12 +26,13 @@ var _ProForm = _interopRequireDefault(require("../ProForm"));
 var _empty = _interopRequireDefault(require("../assets/empty.png"));
 var _locale = _interopRequireWildcard(require("../locale"));
 var _RcTable = require("./components/RcTable");
-var _excluded = ["value", "onChange", "onDrag", "className", "columns", "type", "mode", "stripe", "draggable", "virtual", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "toolbarSticky", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll", "actionDirection", "diffConfig"];
+var _excluded = ["value", "onChange", "onDrag", "onDragEnd", "className", "columns", "type", "mode", "stripe", "draggable", "virtual", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "toolbarSticky", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll", "actionDirection", "diffConfig"];
 var ProEditTable = function ProEditTable(_ref, ref) {
   var _resetProps$id, _resetProps$id$split, _themeConfig$data2, _resetProps$otherProp;
   var value = _ref.value,
     onChange = _ref.onChange,
     onDrag = _ref.onDrag,
+    onDragEnd = _ref.onDragEnd,
     className = _ref.className,
     columns = _ref.columns,
     type = _ref.type,
@@ -408,6 +409,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
         draggableProps: {
           onChange: onChange,
           onDrag: onDrag,
+          onDragEnd: onDragEnd,
           draggable: draggable
         },
         tableProps: {

package/lib/ProEditTable/propsType.d.ts

@@ -377,8 +377,18 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
     rowDraggable?: (record?: T) => string | boolean;
     /**
      * 拖拽事件处理
+     * @param event 拖拽事件
+     * @param dataSource 当前数据源
+     * @param nextDataSource 拖拽后的数据源
      */
-    onDrag?: (event: DragEndEvent, dataSource: T[]) => T[];
+    onDrag?: (event: DragEndEvent, dataSource: T[], nextDataSource: T[]) => T[];
+    /**
+     * 拖拽结束事件处理
+     * @param event 拖拽事件
+     * @param dataSource 当前数据源
+     * @param nextDataSource 拖拽后的数据源
+     */
+    onDragEnd?: (event: DragEndEvent, dataSource: T[], nextDataSource: T[]) => T[];
     /**
      * 引用对象
      */

package/lib/ProForm/components/combination/Group/hooks/index.d.ts

@@ -0,0 +1,20 @@
+import { InternalNamePath, NamePath } from 'antd/lib/form/interface';
+import { FormInstance } from 'antd';
+import type { GroupColumnType, GroupType } from '../propsType';
+export type EventArgs = any[];
+interface ColumnsTransformerParams {
+    columns: GroupColumnType[];
+    name?: NamePath;
+    names?: NamePath[];
+    value?: any[];
+    onChange: any;
+    namePath?: InternalNamePath;
+    form: FormInstance;
+    index?: number;
+    formDisabled?: boolean;
+    desensitizationKey?: string;
+    groupProps: GroupType;
+}
+/** 转换columns */
+export declare const useTransformColumns: (params: ColumnsTransformerParams) => any[];
+export {};

package/lib/ProForm/components/combination/Group/hooks/index.js

@@ -0,0 +1,169 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useTransformColumns = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _react = require("react");
+var _lodash = require("lodash");
+var _useDeepCompareMemo = require("../../../../utils/useDeepCompareMemo");
+var _tools = require("../../../../../ProEditTable/utils/tools");
+var _utils = require("../utils");
+/* eslint-disable no-lonely-if */
+
+/** 转换columns */
+var useTransformColumns = exports.useTransformColumns = function useTransformColumns(params) {
+  var form = params.form,
+    columns = params.columns,
+    name = params.name,
+    names = params.names,
+    outerIndex = params.index,
+    namePath = params.namePath,
+    value = params.value,
+    internalChange = params.onChange,
+    groupProps = params.groupProps,
+    formDisabled = params.formDisabled,
+    desensitizationKey = params.desensitizationKey;
+  var timerRef = (0, _react.useRef)([]);
+  return columns === null || columns === void 0 ? void 0 : columns.flatMap(function (column, index) {
+    var type = column.type,
+      valueType = column.valueType,
+      switchValue = column.switchValue,
+      toISOString = column.toISOString,
+      toCSTString = column.toCSTString,
+      fieldProps = column.fieldProps,
+      normalize = column.normalize,
+      disabled = column.disabled,
+      show = column.show,
+      component = column.component,
+      clearNotShow = column.clearNotShow,
+      desensitization = column.desensitization;
+    var _ref = fieldProps || {},
+      mode = _ref.mode,
+      onChange = _ref.onChange,
+      onFieldChange = _ref.onFieldChange,
+      comDisabled = _ref.disabled,
+      onBlur = _ref.onBlur;
+    var _disabled = disabled || comDisabled;
+    var columnName = names ? names[index] : [].concat(name, index);
+    // 响应式字段改变后的回调
+    var changedCallback = function changedCallback(lastDependency, current) {
+      // 清值防抖  多次刷新时以最后一次为准
+      if (clearNotShow !== false && names) {
+        if ((current === null || current === void 0 ? void 0 : current.show) === false) {
+          clearInterval(timerRef.current[index]);
+          timerRef.current[index] = setTimeout(function () {
+            if (names) {
+              form.resetFields([columnName]);
+            }
+            if (!names && (value === null || value === void 0 ? void 0 : value.length)) {
+              value[index] = null;
+              form.setFieldValue(columnName, (0, _toConsumableArray2.default)(value));
+            }
+          }, 200);
+        } else {
+          clearInterval(timerRef.current[index]);
+        }
+      }
+    };
+    // 响应式字段
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    var reactiveProps = (0, _useDeepCompareMemo.useDeepCompareMemo)(function () {
+      return (0, _utils.getReactiveProps)({
+        form: form,
+        index: index,
+        type: type,
+        namePath: namePath,
+        disabled: _disabled,
+        show: show,
+        component: component,
+        fieldProps: fieldProps,
+        name: columnName,
+        desensitization: desensitization
+      });
+    }, changedCallback, [value, show, fieldProps, _disabled, columnName, type]);
+    if (reactiveProps.show === false) {
+      return [];
+    }
+    var transform = (0, _utils.getValueTypeTrans)({
+      type: type,
+      valueType: valueType,
+      switchValue: switchValue,
+      toISOString: toISOString,
+      toCSTString: toCSTString,
+      mode: mode
+    });
+    var newValue;
+    var handleChange = function handleChange() {
+      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+        args[_key] = arguments[_key];
+      }
+      newValue = (0, _utils.valueFromEventWrapper)(column, args);
+      if (transform === null || transform === void 0 ? void 0 : transform.normalize) {
+        var _transform$normalize;
+        newValue = transform === null || transform === void 0 ? void 0 : (_transform$normalize = transform.normalize) === null || _transform$normalize === void 0 ? void 0 : _transform$normalize.call(transform, newValue);
+      } else if (normalize) {
+        // @ts-ignore
+        newValue = normalize === null || normalize === void 0 ? void 0 : normalize(newValue);
+      }
+      internalChange === null || internalChange === void 0 ? void 0 : internalChange(newValue, args[1], index);
+      var values = form.getFieldValue(namePath);
+      var originRow = (namePath === null || namePath === void 0 ? void 0 : namePath.length) ? (0, _lodash.cloneDeep)(values) : undefined;
+      onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, args);
+      onFieldChange === null || onFieldChange === void 0 ? void 0 : onFieldChange(newValue, values, {
+        index: outerIndex,
+        namePath: namePath,
+        form: form,
+        option: args === null || args === void 0 ? void 0 : args[1]
+      });
+      // 如果是在可编辑表格或formList内部, 储存当前行的值, 并在变更后更新到表单里
+      if ((namePath === null || namePath === void 0 ? void 0 : namePath.length) && !(0, _lodash.isEqual)(originRow, values)) {
+        var _Object$keys, _Object$keys$map;
+        form.setFieldValue(namePath, values);
+        var diff = (0, _tools.difference)(originRow, values) || {};
+        var validateFieldKeys = (_Object$keys = Object.keys(diff)) === null || _Object$keys === void 0 ? void 0 : (_Object$keys$map = _Object$keys.map) === null || _Object$keys$map === void 0 ? void 0 : _Object$keys$map.call(_Object$keys, function (key) {
+          return [].concat((0, _toConsumableArray2.default)(namePath), [key]);
+        });
+        if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
+          setTimeout(function () {
+            form.validateFields([name].concat((0, _toConsumableArray2.default)(validateFieldKeys)));
+          }, 100);
+        }
+      }
+    };
+    var handleBlur = function handleBlur() {
+      if (!onBlur) return;
+      var values = form.getFieldValue(namePath);
+      for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+        args[_key2] = arguments[_key2];
+      }
+      onBlur === null || onBlur === void 0 ? void 0 : onBlur(args[0], values, {
+        index: outerIndex,
+        namePath: namePath,
+        form: form,
+        option: args === null || args === void 0 ? void 0 : args[1]
+      });
+    };
+    // 内外一个为true则为true
+    var getLastDisabled = function getLastDisabled() {
+      if (Array.isArray(groupProps.disabled)) {
+        return reactiveProps.disabled || groupProps.disabled[index];
+      }
+      return reactiveProps.disabled || groupProps.disabled;
+    };
+    return (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, column), {}, {
+      name: columnName
+    }, reactiveProps), {}, {
+      disabled: getLastDisabled(),
+      getValueProps: transform === null || transform === void 0 ? void 0 : transform.getValueProps,
+      fieldProps: (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, column === null || column === void 0 ? void 0 : column.fieldProps), reactiveProps === null || reactiveProps === void 0 ? void 0 : reactiveProps.fieldProps), {}, {
+        onChange: handleChange,
+        onBlur: handleBlur,
+        value: value === null || value === void 0 ? void 0 : value[index]
+      })
+    });
+  });
+};

package/lib/ProForm/components/combination/Group/index.js

@@ -14,6 +14,7 @@ var _react = _interopRequireDefault(require("react"));
 var _lodash = require("lodash");
 var _classnames2 = _interopRequireDefault(require("classnames"));
 var _utils = require("./utils");
+var _hooks = require("./hooks");
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var _ComRender = _interopRequireDefault(require("./component/ComRender"));
 /**
@@ -52,7 +53,7 @@ var Group = function Group(props) {
     _option.current[index] = option;
     onChange(_value, _option.current);
   };
-  var columnsProps = (0, _utils.useTransformColumns)({
+  var columnsProps = (0, _hooks.useTransformColumns)({
     columns: children,
     name: name,
     names: names,

package/lib/ProForm/components/combination/Group/utils.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import { InternalNamePath, NamePath } from 'antd/lib/form/interface';
 import { FormInstance } from 'antd';
-import type { GroupColumnType, GroupType, SpaceType } from './propsType';
+import type { GroupColumnType, SpaceType } from './propsType';
 import type { ProFormColumnType, ReactiveFunction } from '../../render/propsType';
 export type EventArgs = any[];
 /**
@@ -50,19 +50,6 @@ type ValueTypeGetterParams = Pick<ProFormColumnType, 'valueType' | 'switchValue'
 export declare const getValueTypeTrans: (params: ValueTypeGetterParams) => any;
 /** 执行所有中间件 返回处理后的值 */
 export declare const getValueMiddleware: (value: any, callbacks?: any[]) => any;
-interface ColumnsTransformerParams {
-    columns: GroupColumnType[];
-    name?: NamePath;
-    names?: NamePath[];
-    value?: any[];
-    onChange: any;
-    namePath?: InternalNamePath;
-    form: FormInstance;
-    index?: number;
-    formDisabled?: boolean;
-    desensitizationKey?: string;
-    groupProps: GroupType;
-}
-/** 转换columns */
-export declare const useTransformColumns: (params: ColumnsTransformerParams) => any[];
+/** 获取中间件处理后的value */
+export declare const valueFromEventWrapper: (column: any, args: any) => any;
 export {};

package/lib/ProForm/components/combination/Group/utils.js

@@ -5,20 +5,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.defaultGetValueFromEvent = defaultGetValueFromEvent;
-exports.useTransformColumns = exports.transformNamesString = exports.isUpperCase = exports.insertSeparator = exports.getValueTypeTrans = exports.getValueMiddleware = exports.getReactiveProps = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+exports.valueFromEventWrapper = exports.transformNamesString = exports.isUpperCase = exports.insertSeparator = exports.getValueTypeTrans = exports.getValueMiddleware = exports.getReactiveProps = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _jsxRuntime = require("react/jsx-runtime");
-var _react = require("react");
 var _lodash = require("lodash");
 var _utils = require("@zat-design/utils");
 var _antd = require("antd");
 var _valueType = _interopRequireDefault(require("../../../utils/valueType"));
-var _useDeepCompareMemo = require("../../../utils/useDeepCompareMemo");
-var _tools = require("../../../../ProEditTable/utils/tools");
-/* eslint-disable no-lonely-if */
-
 /**
  * 插入间隔符
  * @param columns 表单配置数组
@@ -185,7 +179,7 @@ var getValueMiddleware = exports.getValueMiddleware = function getValueMiddlewar
   }, value);
 };
 /** 获取中间件处理后的value */
-var valueFromEventWrapper = function valueFromEventWrapper(column, args) {
+var valueFromEventWrapper = exports.valueFromEventWrapper = function valueFromEventWrapper(column, args) {
   var getValueFromEvent = column.getValueFromEvent,
     _column$valuePropName = column.valuePropName,
     valuePropName = _column$valuePropName === void 0 ? 'value' : _column$valuePropName,
@@ -201,157 +195,4 @@ var valueFromEventWrapper = function valueFromEventWrapper(column, args) {
   if (trim) list.push(getTrim);
   if (upperCase) list.push(getUpperCase);
   return getValueMiddleware(newValue, list);
-};
-/** 转换columns */
-var useTransformColumns = exports.useTransformColumns = function useTransformColumns(params) {
-  var form = params.form,
-    columns = params.columns,
-    name = params.name,
-    names = params.names,
-    outerIndex = params.index,
-    namePath = params.namePath,
-    value = params.value,
-    internalChange = params.onChange,
-    groupProps = params.groupProps,
-    formDisabled = params.formDisabled,
-    desensitizationKey = params.desensitizationKey;
-  var timerRef = (0, _react.useRef)([]);
-  return columns === null || columns === void 0 ? void 0 : columns.flatMap(function (column, index) {
-    var type = column.type,
-      valueType = column.valueType,
-      switchValue = column.switchValue,
-      toISOString = column.toISOString,
-      toCSTString = column.toCSTString,
-      fieldProps = column.fieldProps,
-      normalize = column.normalize,
-      disabled = column.disabled,
-      show = column.show,
-      component = column.component,
-      clearNotShow = column.clearNotShow,
-      desensitization = column.desensitization;
-    var _ref = fieldProps || {},
-      mode = _ref.mode,
-      onChange = _ref.onChange,
-      onFieldChange = _ref.onFieldChange,
-      comDisabled = _ref.disabled,
-      onBlur = _ref.onBlur;
-    var _disabled = disabled || comDisabled;
-    var columnName = names ? names[index] : [].concat(name, index);
-    // 响应式字段改变后的回调
-    var changedCallback = function changedCallback(lastDependency, current) {
-      // 清值防抖  多次刷新时以最后一次为准
-      if (clearNotShow !== false && names) {
-        if ((current === null || current === void 0 ? void 0 : current.show) === false) {
-          clearInterval(timerRef.current[index]);
-          timerRef.current[index] = setTimeout(function () {
-            if (names) {
-              form.resetFields([columnName]);
-            }
-            if (!names && (value === null || value === void 0 ? void 0 : value.length)) {
-              value[index] = null;
-              form.setFieldValue(columnName, (0, _toConsumableArray2.default)(value));
-            }
-          }, 200);
-        } else {
-          clearInterval(timerRef.current[index]);
-        }
-      }
-    };
-    // 响应式字段
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    var reactiveProps = (0, _useDeepCompareMemo.useDeepCompareMemo)(function () {
-      return getReactiveProps({
-        form: form,
-        index: index,
-        type: type,
-        namePath: namePath,
-        disabled: _disabled,
-        show: show,
-        component: component,
-        fieldProps: fieldProps,
-        name: columnName,
-        desensitization: desensitization
-      });
-    }, changedCallback, [value, show, fieldProps, _disabled, columnName, type]);
-    if (reactiveProps.show === false) {
-      return [];
-    }
-    var transform = getValueTypeTrans({
-      type: type,
-      valueType: valueType,
-      switchValue: switchValue,
-      toISOString: toISOString,
-      toCSTString: toCSTString,
-      mode: mode
-    });
-    var newValue;
-    var handleChange = function handleChange() {
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
-      }
-      newValue = valueFromEventWrapper(column, args);
-      if (transform === null || transform === void 0 ? void 0 : transform.normalize) {
-        var _transform$normalize;
-        newValue = transform === null || transform === void 0 ? void 0 : (_transform$normalize = transform.normalize) === null || _transform$normalize === void 0 ? void 0 : _transform$normalize.call(transform, newValue);
-      } else if (normalize) {
-        // @ts-ignore
-        newValue = normalize === null || normalize === void 0 ? void 0 : normalize(newValue);
-      }
-      internalChange === null || internalChange === void 0 ? void 0 : internalChange(newValue, args[1], index);
-      var values = form.getFieldValue(namePath);
-      var originRow = (namePath === null || namePath === void 0 ? void 0 : namePath.length) ? (0, _lodash.cloneDeep)(values) : undefined;
-      onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, args);
-      onFieldChange === null || onFieldChange === void 0 ? void 0 : onFieldChange(newValue, values, {
-        index: outerIndex,
-        namePath: namePath,
-        form: form,
-        option: args === null || args === void 0 ? void 0 : args[1]
-      });
-      // 如果是在可编辑表格或formList内部, 储存当前行的值, 并在变更后更新到表单里
-      if ((namePath === null || namePath === void 0 ? void 0 : namePath.length) && !(0, _lodash.isEqual)(originRow, values)) {
-        var _Object$keys, _Object$keys$map;
-        form.setFieldValue(namePath, values);
-        var diff = (0, _tools.difference)(originRow, values) || {};
-        var validateFieldKeys = (_Object$keys = Object.keys(diff)) === null || _Object$keys === void 0 ? void 0 : (_Object$keys$map = _Object$keys.map) === null || _Object$keys$map === void 0 ? void 0 : _Object$keys$map.call(_Object$keys, function (key) {
-          return [].concat((0, _toConsumableArray2.default)(namePath), [key]);
-        });
-        if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
-          setTimeout(function () {
-            form.validateFields([name].concat((0, _toConsumableArray2.default)(validateFieldKeys)));
-          }, 100);
-        }
-      }
-    };
-    var handleBlur = function handleBlur() {
-      if (!onBlur) return;
-      var values = form.getFieldValue(namePath);
-      for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-        args[_key2] = arguments[_key2];
-      }
-      onBlur === null || onBlur === void 0 ? void 0 : onBlur(args[0], values, {
-        index: outerIndex,
-        namePath: namePath,
-        form: form,
-        option: args === null || args === void 0 ? void 0 : args[1]
-      });
-    };
-    // 内外一个为true则为true
-    var getLastDisabled = function getLastDisabled() {
-      if (Array.isArray(groupProps.disabled)) {
-        return reactiveProps.disabled || groupProps.disabled[index];
-      }
-      return reactiveProps.disabled || groupProps.disabled;
-    };
-    return (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, column), {}, {
-      name: columnName
-    }, reactiveProps), {}, {
-      disabled: getLastDisabled(),
-      getValueProps: transform === null || transform === void 0 ? void 0 : transform.getValueProps,
-      fieldProps: (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, column === null || column === void 0 ? void 0 : column.fieldProps), reactiveProps === null || reactiveProps === void 0 ? void 0 : reactiveProps.fieldProps), {}, {
-        onChange: handleChange,
-        onBlur: handleBlur,
-        value: value === null || value === void 0 ? void 0 : value[index]
-      })
-    });
-  });
 };

package/lib/ProTable/hooks/useAntdTable.js

@@ -39,6 +39,7 @@ function useAntdTable(service, options, useRequestOptions) {
       total: 0,
       selectedRecords: [],
       selectedRowKeys: [],
+      searchValues: undefined,
       extraFilter: {
         filters: undefined,
         sorter: undefined
@@ -51,6 +52,7 @@ function useAntdTable(service, options, useRequestOptions) {
     total = _useSetState2$.total,
     selectedRecords = _useSetState2$.selectedRecords,
     selectedRowKeys = _useSetState2$.selectedRowKeys,
+    searchValues = _useSetState2$.searchValues,
     extraFilter = _useSetState2$.extraFilter,
     allSelected = _useSetState2$.allSelected,
     setState = _useSetState2[1];
@@ -71,9 +73,6 @@ function useAntdTable(service, options, useRequestOptions) {
     transformParams = _useDefaultOptions.transformParams,
     transformResponse = _useDefaultOptions.transformResponse,
     disabled = _useDefaultOptions.disabled;
-  // 搜索表单里的值
-  var _searchValues = _antd.Form.useWatch([], form);
-  var searchValues = (0, _utils.removeEmptyKeys)(_searchValues);
   var _ref = useRequestOptions || {},
     defaultParams = _ref.defaultParams;
   var defaultParam = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
@@ -198,6 +197,7 @@ function useAntdTable(service, options, useRequestOptions) {
   }, []);
   // 分页变更
   var handlePageChange = (0, _react.useCallback)(function (current, pageSize) {
+    var _form$getFieldsValue;
     var page = {
       pageNum: current,
       pageSize: pageSize
@@ -209,9 +209,10 @@ function useAntdTable(service, options, useRequestOptions) {
         selectedRowKeys: []
       });
     }
-    run(getTransformParams((0, _objectSpread2.default)((0, _objectSpread2.default)({
+    var newValues = (_form$getFieldsValue = form.getFieldsValue()) !== null && _form$getFieldsValue !== void 0 ? _form$getFieldsValue : {};
+    run(getTransformParams((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
       page: page
-    }, searchValues), extraFilter)));
+    }, searchValues), newValues), extraFilter)));
   }, [allSelected, searchValues, extraFilter, data, getTransformParams]);
   var handleTableChange = (0, _react.useCallback)(function (pagination, filters, sorter, extra) {
     // 跳过分页改变，使用pagination的onChange
@@ -252,6 +253,7 @@ function useAntdTable(service, options, useRequestOptions) {
     if ((selectedRecords === null || selectedRecords === void 0 ? void 0 : selectedRecords.length) || (0, _utils.isNonEmptyObject)(_values) || !(0, _lodash.isEqual)(previousSearchValues, _values)) {
       previousSearchValues = _values;
       setState({
+        searchValues: _values,
         allSelected: false,
         selectedRecords: [],
         selectedRowKeys: []
@@ -263,6 +265,7 @@ function useAntdTable(service, options, useRequestOptions) {
   }, [extraFilter, page.pageSize, previousPage, getTransformParams]);
   var resetParams = (0, _react.useCallback)(function (page) {
     setState({
+      searchValues: undefined,
       allSelected: false,
       selectedRecords: [],
       selectedRowKeys: [],

package/lib/ProTable/propsType.d.ts

@@ -735,6 +735,12 @@ export interface ProTableUseAntdTableType<I, R> {
      * @default []
      */
     selectedRowKeys: Key[];
+    /**
+    * 搜索值
+    * @description 当前表单的搜索条件
+    * @default undefined
+    */
+    searchValues: I;
     /**
      * 额外过滤条件
      * @description 表单之外的额外过滤条件

package/lib/ProUpload/components/ButtonRender.js

@@ -96,6 +96,9 @@ var ButtonRender = function ButtonRender(props) {
               children: [(0, _jsxRuntime.jsx)(_icons.CloudUploadOutlined, {}), buttonText]
             })), afterRender ? (0, _jsxRuntime.jsx)("div", {
               className: "pro-upload-button-inner-right",
+              onClick: function onClick(e) {
+                return e.stopPropagation();
+              },
               children: afterRender
             }) : null]
           })

package/package.json

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