@zat-design/sisyphus-react 3.13.4-beta.5 → 3.13.5-beta.1

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/ProEnum/hooks/useEnum.js

@@ -1,16 +1,8 @@
+var _ref;
 /* eslint-disable no-redeclare */
 import { useProConfig } from '../../ProConfigProvider';
 import { getEnumData } from '../utils';
-var baseEnumStorage = null;
-try {
-  var storedData = window.localStorage.getItem('zat-design-pro-component-cacheKey');
-  if (storedData) {
-    baseEnumStorage = JSON.parse(storedData);
-  }
-} catch (error) {
-  console.error('解析枚举缓存数据失败', error);
-  baseEnumStorage = null;
-}
+var baseEnumStorage = (_ref = window.localStorage.getItem('zat-design-pro-component-cacheKey') && JSON.parse(window.localStorage.getItem('zat-design-pro-component-cacheKey'))) !== null && _ref !== void 0 ? _ref : null;
 /**
  * 根据 code 从枚举缓存取出对应的 options 、以及回显
  * @param codes
@@ -19,16 +11,16 @@ try {
  * @returns
  */
 function useEnum(codes, value, compose) {
-  var _ref = useProConfig('globalConfig') || {},
-    _ref$storage = _ref.storage,
-    storage = _ref$storage === void 0 ? 'localStorage' : _ref$storage;
-  var _ref2 = useProConfig('ProEnum') || {},
-    _ref2$cacheKey = _ref2.cacheKey,
-    cacheKey = _ref2$cacheKey === void 0 ? 'zat-design-pro-component-cacheKey' : _ref2$cacheKey,
-    _ref2$fieldNames = _ref2.fieldNames,
-    fieldNames = _ref2$fieldNames === void 0 ? {} : _ref2$fieldNames,
-    _ref2$clear = _ref2.clear,
-    clear = _ref2$clear === void 0 ? true : _ref2$clear;
+  var _ref2 = useProConfig('globalConfig') || {},
+    _ref2$storage = _ref2.storage,
+    storage = _ref2$storage === void 0 ? 'localStorage' : _ref2$storage;
+  var _ref3 = useProConfig('ProEnum') || {},
+    _ref3$cacheKey = _ref3.cacheKey,
+    cacheKey = _ref3$cacheKey === void 0 ? 'zat-design-pro-component-cacheKey' : _ref3$cacheKey,
+    _ref3$fieldNames = _ref3.fieldNames,
+    fieldNames = _ref3$fieldNames === void 0 ? {} : _ref3$fieldNames,
+    _ref3$clear = _ref3.clear,
+    clear = _ref3$clear === void 0 ? true : _ref3$clear;
   var catchData = getEnumData(storage, cacheKey, baseEnumStorage);
   // 默认枚举缓存数据
   baseEnumStorage = catchData;

package/es/ProEnum/utils/index.d.ts

@@ -11,10 +11,35 @@ interface EnumRes {
  * @param baseEnumStorage
  * @returns
  */
-export declare function getEnumData(storage: StorageType, cacheKey: string, baseEnumStorage?: any, dataSource?: any[]): EnumRes;
+export declare function getEnumData(storage: StorageType, cacheKey: string, baseEnumStorage?: any): EnumRes;
+/**
+ * 设置枚举数据
+ * @param storage
+ * @param cacheKey
+ * @param data
+ */
 export declare function setEnumData(storage: StorageType, cacheKey: string, data: any): boolean;
+/**
+ * 判断枚举列表是否存在
+ * @param storage
+ * @param cacheKey
+ * @param code
+ * @returns
+ */
 export declare function hasEnumList(storage: StorageType, cacheKey: any, code: string): import("../propsType").DataOptionType[];
+/**
+ * 判断是否是对象
+ * @param obj
+ * @returns
+ */
 export declare function isObject(obj: any): boolean;
+/**
+ * 合并枚举数据
+ * @param storage
+ * @param code
+ * @param cacheKey
+ * @param responseData
+ */
 export declare function mergeCacheData(storage: string, code: string, cacheKey: string, responseData: any): void;
 /**
  * diff code 差异

package/es/ProEnum/utils/index.js

@@ -8,8 +8,8 @@ import { isNull, isUndefined } from 'lodash';
  * @param baseEnumStorage
  * @returns
  */
-export function getEnumData(storage, cacheKey, baseEnumStorage, dataSource) {
-  if (baseEnumStorage && cacheKey === 'zat-design-pro-component-cacheKey') {
+export function getEnumData(storage, cacheKey, baseEnumStorage) {
+  if (baseEnumStorage) {
     return baseEnumStorage;
   }
   if (storage === 'localStorage') {
@@ -19,6 +19,12 @@ export function getEnumData(storage, cacheKey, baseEnumStorage, dataSource) {
     return JSON.parse(window.sessionStorage.getItem(cacheKey) || '{}');
   }
 }
+/**
+ * 设置枚举数据
+ * @param storage
+ * @param cacheKey
+ * @param data
+ */
 export function setEnumData(storage, cacheKey, data) {
   var _Object$keys;
   if (!((_Object$keys = Object.keys(data === null || data === void 0 ? void 0 : data.data)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length)) {
@@ -30,14 +36,33 @@ export function setEnumData(storage, cacheKey, data) {
     window.sessionStorage.setItem(cacheKey, JSON.stringify(data));
   }
 }
+/**
+ * 判断枚举列表是否存在
+ * @param storage
+ * @param cacheKey
+ * @param code
+ * @returns
+ */
 export function hasEnumList(storage, cacheKey, code) {
   var res = getEnumData(storage, cacheKey);
   var enumList = (res === null || res === void 0 ? void 0 : res.data) || {};
   return enumList === null || enumList === void 0 ? void 0 : enumList[code];
 }
+/**
+ * 判断是否是对象
+ * @param obj
+ * @returns
+ */
 export function isObject(obj) {
   return Object.prototype.toString.call(obj) === '[object Object]';
 }
+/**
+ * 合并枚举数据
+ * @param storage
+ * @param code
+ * @param cacheKey
+ * @param responseData
+ */
 export function mergeCacheData(storage, code, cacheKey, responseData) {
   var _window, _window2;
   var cacheStorage = storage === 'localStorage' ? 'localStorage' : 'sessionStorage';

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/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]
           })