@zat-design/sisyphus-react 3.3.3 → 3.3.4

package/es/ProForm/utils/useForm.js

@@ -3,86 +3,59 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import { useMemo } from 'react';
-import { merge } from 'lodash';
-import { HOOK_MARK } from 'rc-field-form/es/FieldContext';
-import { deleteForPath } from '.';
+import { filterInternalFields } from './index';
 export var useForm = function useForm(originForm) {
   var _Form$useForm = _Form.useForm(originForm),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
   var getFieldsValue = form.getFieldsValue,
-    validateFields = form.validateFields,
-    getFieldValue = form.getFieldValue;
-  useMemo(function () {
-    var _getFieldsValue = function _getFieldsValue() {
-      var firstProps = !(arguments.length <= 0 ? undefined : arguments[0]) ? true : arguments.length <= 0 ? undefined : arguments[0];
-      var values = getFieldsValue(firstProps, arguments.length <= 1 ? undefined : arguments[1]);
-      if ((arguments.length <= 0 ? undefined : arguments[0]) === undefined) {
-        var result = merge({}, values);
-        // @ts-ignore
-        var internalHooks = form.getInternalHooks(HOOK_MARK);
-        var fields = internalHooks.getFields();
-        var deletePath = [];
-        // 找到带'-'的name
-        fields.forEach(function (field) {
-          var name = field.name;
-          if (Array.isArray(name)) {
-            var index = name.findIndex(function (item) {
-              return typeof item === 'string' && item.includes('-');
-            });
-            if (index !== -1) deletePath.push(name);
-          }
-          if (typeof name === 'string' && name.includes('-')) {
-            deletePath.push(name);
-          }
-        });
-        // 执行删除操作
-        deletePath.forEach(function (item) {
-          deleteForPath(result, item);
-        });
-        return result;
-      }
-      return values;
+    validateFields = form.validateFields;
+  // @ts-ignore
+  var _getFieldsValue = function _getFieldsValue(nameList, filterFunc) {
+    // 全部查询
+    if (nameList !== true) {
+      var values = getFieldsValue(true, filterFunc);
+      return filterInternalFields(values);
+    }
+    return getFieldsValue(nameList, filterFunc);
+  };
+  var _validateFields = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(nameList) {
+      var _len,
+        rest,
+        _key,
+        values,
+        _values,
+        _args = arguments;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            for (_len = _args.length, rest = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+              rest[_key - 1] = _args[_key];
+            }
+            _context.next = 3;
+            return validateFields.apply(void 0, [nameList].concat(rest));
+          case 3:
+            values = _context.sent;
+            if (!nameList) {
+              _context.next = 6;
+              break;
+            }
+            return _context.abrupt("return", values);
+          case 6:
+            _values = _getFieldsValue();
+            return _context.abrupt("return", _values);
+          case 8:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function _validateFields(_x) {
+      return _ref.apply(this, arguments);
     };
-    var _validateFields = /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(nameList) {
-        var _len,
-          rest,
-          _key,
-          values,
-          _values,
-          _args = arguments;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              for (_len = _args.length, rest = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-                rest[_key - 1] = _args[_key];
-              }
-              _context.next = 3;
-              return validateFields.apply(void 0, [nameList].concat(rest));
-            case 3:
-              values = _context.sent;
-              if (!nameList) {
-                _context.next = 6;
-                break;
-              }
-              return _context.abrupt("return", values);
-            case 6:
-              _values = _getFieldsValue();
-              return _context.abrupt("return", _values);
-            case 8:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee);
-      }));
-      return function _validateFields(_x) {
-        return _ref.apply(this, arguments);
-      };
-    }();
-    form.getFieldsValue = _getFieldsValue;
-    form.validateFields = _validateFields;
-  }, [form]);
+  }();
+  form.getFieldsValue = _getFieldsValue;
+  form.validateFields = _validateFields;
   return [form];
 };

package/es/ProForm/utils/useRules.js

@@ -46,7 +46,7 @@ var useRules = function useRules(props) {
   internalRule.rules = internalRule.rules && rulesCreator(internalRule.rules, _label, isSelect);
   useEffect(function () {
     // 添加完整性校验
-    if (names && !isBoolean(labelRequired) || type === 'Group' && Array.isArray(names) && required) {
+    if (names && !isBoolean(labelRequired)) {
       var customRequired = {
         validator: function validator(rules, value) {
           // 完整性校验, 空数组不校验, 数组有值且值不完整则校验不通过
@@ -56,7 +56,9 @@ var useRules = function useRules(props) {
           return Promise.resolve();
         }
       };
-      internalRule.rules.push(customRequired);
+      if (!(type === 'Group' && Array.isArray(names) && !required)) {
+        internalRule.rules.push(customRequired);
+      }
     }
   }, [internalRule]);
   return internalRule;

package/es/ProForm/utils/useShouldUpdate.js

@@ -2,7 +2,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { useRef, useState } from 'react';
 import { isFunction, isEqualWith } from 'lodash';
-import { customEqualForFun } from './index';
+import { customEqualForFun, equalDependencies } from './index';
 // 代理shouldUpdate事件, 执行函数值的[show, disabled], 当[show, disabled]与上一次值不相同时更新状态
 var useShouldUpdate = function useShouldUpdate(props) {
   var show = props.show,
@@ -20,7 +20,8 @@ var useShouldUpdate = function useShouldUpdate(props) {
     clearNotShow = formItemProps.clearNotShow,
     index = formItemProps.index,
     namePath = formItemProps.namePath,
-    names = formItemProps.names;
+    names = formItemProps.names,
+    dependencies = formItemProps.dependencies;
   var timerRef = useRef();
   var showRef = useRef();
   var disabledRef = useRef();
@@ -167,11 +168,14 @@ var useShouldUpdate = function useShouldUpdate(props) {
           clearInterval(timerRef.current);
         }
       }
-      // 当校验规则改变的时候  重新执行校验
-      if (_required !== requiredRef.current || !isEqualWith(rulesRef.current, _rules, customEqualForFun)) {
-        form.validateFields([name]);
-      }
-      if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !isEqualWith(rulesRef.current, _rules, customEqualForFun) || !isEqualWith(fieldPropsRef.current, _fieldProps, customEqualForFun) || !isEqualWith(originComponentRef.current, _component, customEqualForFun)) {
+      // // 当校验规则改变的时候  重新执行校验 导致: 第一次进页面直接触发校验
+      // if (
+      //   _required !== requiredRef.current ||
+      //   !isEqualWith(rulesRef.current, _rules, customEqualForFun)
+      // ) {
+      //   form.validateFields([name]);
+      // }
+      if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !isEqualWith(rulesRef.current, _rules, customEqualForFun) || !isEqualWith(fieldPropsRef.current, _fieldProps, customEqualForFun) || !isEqualWith(originComponentRef.current, _component, customEqualForFun) || equalDependencies(dependencies, prevValues, _currentValues)) {
         showRef.current = _show;
         disabledRef.current = _disabled;
         requiredRef.current = _required;

package/es/ProStep/index.js

@@ -160,7 +160,6 @@ var ProStep = function ProStep(_ref) {
       subtree: true,
       childList: true // 是否观察子元素的添加或删除
     };
-
     observer.observe(targetElement, config);
   };
   useDeepCompareEffect(function () {

package/es/ProThemeTools/index.js

@@ -115,7 +115,6 @@ var ProThemeTools = function ProThemeTools(_ref) {
         return ["".concat(getKebabCase(item === null || item === void 0 ? void 0 : item[0])), ['zauiSize'].includes(item === null || item === void 0 ? void 0 : item[0]) || typeof (item === null || item === void 0 ? void 0 : item[1]) !== 'number' ? item === null || item === void 0 ? void 0 : item[1] : "".concat(item === null || item === void 0 ? void 0 : item[1], "px") // zauiSize取数字
         ];
       }));
-
       setState(_objectSpread(_objectSpread({}, state), localThemeConfig));
       setThemes(cssVariables);
       _ConfigProvider.config({

package/es/ProThemeTools/utils/index.js

@@ -49,7 +49,6 @@ export var getKebabCase = function getKebabCase(str) {
   if (temp.slice(0, 1) === '-') {
     temp = temp.slice(1); // 如果首字母是大写，执行replace时会多一个-，需要去掉
   }
-
   return temp;
 };
 /** JS实现对象驼峰命名与横线命名的转换  */

package/es/ProTree/components/Tree.js

@@ -303,7 +303,6 @@ function List(props) {
       });
       return treeRow; // .filter((item) => item);
     };
-
     if ((other === null || other === void 0 ? void 0 : other.mode) === 'view') {
       return;
     }

package/es/ProTreeSelect/index.js

@@ -19,7 +19,6 @@ import { useProConfig } from '../ProConfigProvider';
 import Container from '../ProForm/components/Container';
 var SHOW_PARENT = _TreeSelect.SHOW_PARENT;
 export var ProTreeSelect = function ProTreeSelect(props, ref) {
-  var _classnames2;
   // 全局属性配置在ConfigProvider
   var _ref = useProConfig('ProTreeSelect') || {},
     _ref$fieldNames = _ref.fieldNames,
@@ -363,7 +362,6 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
         //   currentAllNodeChild.push(item);
         // }
       }
-
       return currentAllNodeChild;
     };
     sourceList = filterData(sourceList);
@@ -469,9 +467,9 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     'pro-tree-select': true
   }, "".concat(className), className));
   var innerClass = treeCheckable ? 'checkable-tree pro' : "".concat(tenCountClass, " signal-tree");
-  var dropDownClassName = classnames((_classnames2 = {
+  var dropDownClassName = classnames(_defineProperty(_defineProperty({
     'pro-tree-select-drop-down-container': true
-  }, _defineProperty(_classnames2, "".concat(innerClass), true), _defineProperty(_classnames2, "".concat(popupClassName), popupClassName), _classnames2));
+  }, "".concat(innerClass), true), "".concat(popupClassName), popupClassName));
   var treeProps = _objectSpread({
     disabled: disabled,
     showSearch: showSearch,

package/es/ProUpload/index.js

@@ -91,7 +91,6 @@ var ProUpload = /*#__PURE__*/React.forwardRef(function (props, ref) {
           response: file === null || file === void 0 ? void 0 : file.response
           // url: file?.response?.data?.url,
         };
-
         if (transformResponse) {
           var data = transformResponse(file.response) || {};
           return _objectSpread(_objectSpread({}, nfile), data);

package/es/old/ProEditableTable/index.js

@@ -404,7 +404,7 @@ var ProEditableTable = /*#__PURE__*/forwardRef(function (props, ref) {
           }, antButtonProps), {}, {
             children: buttonText
           }))]
-        }) : /*#__PURE__*/cloneElement(buttonText, antButtonProps)
+        }) : ( /*#__PURE__*/cloneElement(buttonText, antButtonProps))
       }) : null
     });
   };

package/es/style/theme/antd.less

@@ -93,7 +93,8 @@
 
 .@{ant-prefix}-input[disabled],
 .@{ant-prefix}-select-disabled,
-.@{ant-prefix}-select-disabled.@{ant-prefix}-select:not(.@{ant-prefix}-select-customize-input) .@{ant-prefix}-select-selector,
+.@{ant-prefix}-select-disabled.@{ant-prefix}-select:not(.@{ant-prefix}-select-customize-input)
+  .@{ant-prefix}-select-selector,
 .@{ant-prefix}-input-number-disabled,
 .@{ant-prefix}-picker-input > input[disabled],
 .@{ant-prefix}-select-disabled.@{ant-prefix}-select-multiple .@{ant-prefix}-select-selection-item {
@@ -218,7 +219,11 @@
     .@{ant-prefix}-table tfoot > tr > td {
       padding: calc(4px + var(--zaui-size) * 8px);
     }
-    .@{ant-prefix}-table-tbody > tr > td > .@{ant-prefix}-table-wrapper:only-child .@{ant-prefix}-table,
+    .@{ant-prefix}-table-tbody
+      > tr
+      > td
+      > .@{ant-prefix}-table-wrapper:only-child
+      .@{ant-prefix}-table,
     .@{ant-prefix}-table-tbody
       > tr
       > td
@@ -508,7 +513,8 @@
     border-radius: @zaui-border-radius;
   }
 
-  .@{ant-prefix}-select-single:not(.@{ant-prefix}-select-customize-input) .@{ant-prefix}-select-selector {
+  .@{ant-prefix}-select-single:not(.@{ant-prefix}-select-customize-input)
+    .@{ant-prefix}-select-selector {
     .set-text-color();
     .set-text-size();
     width: 100%;
@@ -523,8 +529,12 @@
     border-radius: @zaui-border-radius;
   }
 
-  .@{ant-prefix}-pagination-jump-prev .@{ant-prefix}-pagination-item-container .@{ant-prefix}-pagination-item-link-icon,
-  .@{ant-prefix}-pagination-jump-next .@{ant-prefix}-pagination-item-container .@{ant-prefix}-pagination-item-link-icon {
+  .@{ant-prefix}-pagination-jump-prev
+    .@{ant-prefix}-pagination-item-container
+    .@{ant-prefix}-pagination-item-link-icon,
+  .@{ant-prefix}-pagination-jump-next
+    .@{ant-prefix}-pagination-item-container
+    .@{ant-prefix}-pagination-item-link-icon {
     color: @zaui-brand;
   }
 }
@@ -705,3 +715,34 @@
 .@{ant-prefix}-popover {
   width: max-content;
 }
+
+// tooltip样式重载
+.@{ant-prefix}-tooltip {
+  > .ant-tooltip-content {
+    > .ant-tooltip-inner {
+      color: rgb(29, 33, 41);
+      background-color: #fff;
+      box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08),
+        0 9px 28px 8px rgba(0, 0, 0, 0.05);
+      &::selection {
+        color: inherit !important;
+        background: rgba(@primary-color, 0.3) !important;
+      }
+      > div {
+        &::selection {
+          color: inherit !important;
+          background: rgba(@primary-color, 0.3) !important;
+        }
+      }
+    }
+    > .ant-tooltip-arrow {
+      > .ant-tooltip-arrow-content {
+        --antd-arrow-background-color: linear-gradient(
+          to right bottom,
+          rgba(255, 255, 255, 0.95),
+          rgba(255, 255, 255, 1)
+        );
+      }
+    }
+  }
+}

package/lib/ProConfigProvider/index.d.ts

@@ -1,4 +1,5 @@
 import React, { FC } from 'react';
+import { FormInstance } from 'antd';
 import { PropSelectProps } from '../ProSelect/propsType';
 import { ProModalSelectPropsType } from '../ProForm/components/combination/ProModalSelect/propsType';
 import { AddressProps } from '../ProForm/components/combination/ProAddressBar/propsType';
@@ -9,17 +10,24 @@ export interface ProConfigState {
     ProSelect?: Partial<PropSelectProps> & Record<string, any>;
     ProModalSelect?: Partial<ProModalSelectPropsType> & Record<string, any>;
     ProAddressBar?: Partial<AddressProps> & Record<string, any>;
+    forms: Record<string, FormInstance | undefined>;
     [key: string]: any;
 }
 interface ConfigContext {
     state: ProConfigState;
-    dispatch: React.Dispatch<ProConfigState>;
+    dispatch: React.Dispatch<Actions>;
 }
 export declare const ProConfigContext: React.Context<ConfigContext>;
 export declare function useProConfig(): ConfigContext;
 export declare function useProConfig(name: keyof ConfigContext['state']): ConfigContext['state'][keyof ConfigContext['state']];
+export declare function useContextForms(): Record<string, FormInstance<any>>;
+type ActionsType = 'set' | 'setProEnum' | 'setProEnumDic';
+interface Actions {
+    type: ActionsType;
+    payload: any;
+}
 export declare const ProConfigProvider: FC<{
-    value: ProConfigState;
+    value?: ProConfigState;
     locale?: string;
 }>;
 export default ProConfigProvider;

package/lib/ProConfigProvider/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.ProConfigProvider = exports.ProConfigContext = void 0;
+exports.useContextForms = useContextForms;
 exports.useProConfig = useProConfig;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
@@ -17,12 +18,14 @@ var _en_US = _interopRequireDefault(require("antd/es/locale/en_US"));
 var _merge = _interopRequireDefault(require("lodash/merge"));
 var _useEnumRequest = _interopRequireDefault(require("../ProEnum/hooks/useEnumRequest"));
 var _locale = require("../locale");
-var ProConfigContext = exports.ProConfigContext = /*#__PURE__*/_react.default.createContext({
-  state: {
-    ProEnum: {
-      dics: {}
-    }
+var initialState = {
+  ProEnum: {
+    dics: {}
   },
+  forms: {}
+};
+var ProConfigContext = exports.ProConfigContext = /*#__PURE__*/_react.default.createContext({
+  state: initialState,
   dispatch: function dispatch() {}
 });
 // eslint-disable-next-line no-redeclare
@@ -30,11 +33,15 @@ function useProConfig(name) {
   var config = (0, _react.useContext)(ProConfigContext);
   return name ? config.state[name] : config;
 }
+function useContextForms() {
+  var _config$state;
+  var config = (0, _react.useContext)(ProConfigContext);
+  return (_config$state = config.state) === null || _config$state === void 0 ? void 0 : _config$state.forms;
+}
 var antdLangMap = {
   'zh-CN': _zh_CN.default,
   'en-US': _en_US.default // en-US
 };
-
 var reducer = function reducer(state, action) {
   var _state$ProEnum;
   switch (action.type) {
@@ -56,7 +63,7 @@ var reducer = function reducer(state, action) {
 };
 var ProConfigProvider = exports.ProConfigProvider = function ProConfigProvider(props) {
   var _props$value, _props$value2;
-  var _useReducer = (0, _react.useReducer)(reducer, {}),
+  var _useReducer = (0, _react.useReducer)(reducer, initialState),
     _useReducer2 = (0, _slicedToArray2.default)(_useReducer, 2),
     state = _useReducer2[0],
     dispatch = _useReducer2[1];

package/lib/ProEditLabel/index.js

@@ -23,7 +23,6 @@ var _RenderProForm = _interopRequireDefault(require("./components/RenderProForm"
 var _utils = require("./utils");
 var _excluded = ["open", "disabled", "onOpenChange", "onFinish", "onConfirm", "trigger", "mode", "className", "size", "popupProps", "style", "viewEmpty", "children", "form"];
 var ProEditLabel = function ProEditLabel(_ref) {
-  var _classnames;
   var _ref$open = _ref.open,
     open = _ref$open === void 0 ? false : _ref$open,
     _ref$disabled = _ref.disabled,
@@ -129,9 +128,9 @@ var ProEditLabel = function ProEditLabel(_ref) {
       }
     }
   }, [confirmValue, mode]);
-  var cls = (0, _classnames2.default)((_classnames = {
+  var cls = (0, _classnames2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({
     'pro-edit-label': true
-  }, (0, _defineProperty2.default)(_classnames, "trigger-".concat(trigger), trigger), (0, _defineProperty2.default)(_classnames, 'pro-edit-label-small', size === 'small'), (0, _defineProperty2.default)(_classnames, 'pro-edit-label-middle', size === 'middle'), (0, _defineProperty2.default)(_classnames, 'pro-edit-label-large', size === 'large'), (0, _defineProperty2.default)(_classnames, "".concat(className), className), _classnames));
+  }, "trigger-".concat(trigger), trigger), 'pro-edit-label-small', size === 'small'), 'pro-edit-label-middle', size === 'middle'), 'pro-edit-label-large', size === 'large'), "".concat(className), className));
   /**
    * pop确认回调
    */

package/lib/ProEditTable/components/ActionButton/index.js

@@ -86,24 +86,24 @@ var ActionButton = function ActionButton(_ref) {
         disabled: isDisabled,
         okText: _locale.default.ProEditTable.confirm,
         cancelText: _locale.default.ProEditTable.cancel,
-        children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
+        children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? ( /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
           record: record,
           index: index,
           disabled: isDisabled
-        })) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
+        }))) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
           disabled: isDisabled,
           type: "link",
           children: btnConfig.label
         }))
       }) : (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-        children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
+        children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? ( /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
           record: record,
           index: index,
           disabled: isDisabled,
           onClick: function onClick() {
             btnConfig.onEvent(record, index);
           }
-        })) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
+        }))) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
           disabled: isDisabled,
           type: "link",
           onClick: function onClick() {
@@ -113,10 +113,10 @@ var ActionButton = function ActionButton(_ref) {
         }))
       })
     }) : (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-      children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(actionBtnProps, ['buttonProps', 'isEditable'])), {}, {
+      children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? ( /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(actionBtnProps, ['buttonProps', 'isEditable'])), {}, {
         record: record,
         index: index
-      })) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      }))) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({
         className: "action-button"
       }, (0, _lodash.omit)(actionBtnProps, ['buttonProps', 'isEditable'])), {}, {
         type: "link",

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

@@ -33,7 +33,7 @@ var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "e
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
 var RenderField = function RenderField(_ref) {
-  var _type, _type$replace, _fieldProps2, _fieldProps3, _fieldProps4, _names, _formItemChildProps$p, _TargetComponent4, _classNames;
+  var _type, _type$replace, _fieldProps2, _fieldProps3, _fieldProps4, _names, _formItemChildProps$p, _TargetComponent4;
   var value = _ref.text,
     record = _ref.record,
     index = _ref.index,
@@ -509,13 +509,13 @@ var RenderField = function RenderField(_ref) {
   if (!isEditing) {
     delete _formItemProps.rules;
   }
-  var _className = (0, _classnames.default)((_classNames = {}, (0, _defineProperty2.default)(_classNames, className, className), (0, _defineProperty2.default)(_classNames, 'pro-form-item-changed', changed), _classNames));
+  var _className = (0, _classnames.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, className, className), 'pro-form-item-changed', changed));
   var originalTitle = originalTip ? (0, _jsxRuntime.jsxs)(_antd.Space, {
-    children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? /*#__PURE__*/_react.default.cloneElement(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange'])), {}, {
+    children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange'])), {}, {
       isView: true,
       value: originalValue,
       checked: type === 'Switch' ? originalValue : undefined
-    })) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange'])), {}, {
+    }))) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange'])), {}, {
       isView: true,
       value: originalValue,
       checked: type === 'Switch' ? originalValue : undefined
@@ -526,7 +526,7 @@ var RenderField = function RenderField(_ref) {
   }, (0, _lodash.omit)(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
     className: _className,
     name: cellName,
-    children: /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? /*#__PURE__*/_react.default.cloneElement(TargetComponent, (0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange']))) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange'])))
+    children: /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, (0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange'])))) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange'])))
   })) : (0, _jsxRuntime.jsx)(_Container.default, {
     viewEmpty: viewEmpty
   });

package/lib/ProEditTable/style/index.less

@@ -313,7 +313,6 @@
 }
 
 .pro-edit-table-toolbar {
-  margin-top: var(--zaui-space-size-md, 16px);
   .@{ant-prefix}-space {
     gap: var(--zaui-space-size-sm, 8px);
 

package/lib/ProEditTable/utils/index.js

@@ -221,9 +221,9 @@ var transformColumns = exports.transformColumns = function transformColumns() {
           children: [columnTitle, (0, _jsxRuntime.jsx)(_antd.Tooltip, (0, _objectSpread2.default)((0, _objectSpread2.default)({
             title: tooltipTitle !== null && tooltipTitle !== void 0 ? tooltipTitle : tooltip
           }, resetProps), {}, {
-            children: icon ? /*#__PURE__*/_react.default.cloneElement(icon, {
+            children: icon ? ( /*#__PURE__*/_react.default.cloneElement(icon, {
               className: 'icon-tip'
-            }) : (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
+            })) : (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
               className: "icon-tip",
               src: _tip.default
             })
@@ -340,7 +340,6 @@ var transformColumns = exports.transformColumns = function transformColumns() {
         })
       });
     };
-
     item.render = _render;
   });
   if (disabled || isView) {
@@ -363,7 +362,6 @@ var transformColumns = exports.transformColumns = function transformColumns() {
     var actionColumn = getActionColumn((0, _objectSpread2.default)((0, _objectSpread2.default)({}, config), {}, {
       validateKeys: validateKeys // 需要校验的单元格的formItem的name
     }));
-
     actionColumn && _columns.push(actionColumn);
   }
   // cacheMap 用来存储缓存值，若有值后不再请求

package/lib/ProForm/components/base/TextArea/index.js

@@ -46,9 +46,7 @@ var TextAreaDef = function TextAreaDef(props) {
     showCount: true,
     autoComplete: "off",
     placeholder: placeholder || "".concat(_locale.default.ProForm.inputPlaceholder).concat(label || ''),
-    autoSize: {
-      minRows: 4
-    }
+    autoSize: true
   }, (0, _lodash.omit)(initialConfig, ['trim'])), rest), {}, {
     className: _className
   }));

package/lib/ProForm/components/base/TextArea/index.less

@@ -10,3 +10,10 @@ div.pro-textarea-view {
     padding-bottom: 12px;
   }
 }
+
+// input-textarea级联选择
+.pro-textarea {
+  .@{ant-prefix}-input {
+    resize: auto !important;
+  }
+}

package/lib/ProForm/components/combination/FormList/components/ActionButton.js

@@ -226,13 +226,13 @@ var ActionButton = function ActionButton(props) {
           },
           children: label
         }))
-      }), "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index)) : /*#__PURE__*/(0, _react.createElement)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
+      }), "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index)) : ( /*#__PURE__*/(0, _react.createElement)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
         key: "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index),
         onClick: function onClick(e) {
           e.stopPropagation();
           handleClick(_onClick, index);
         }
-      }), label);
+      }), label));
     })
   });
 };