@zat-design/sisyphus-react 3.4.6 → 3.4.8-beta.1

package/es/ProForm/components/render/propsType.d.ts

@@ -28,7 +28,7 @@ import { ProEditTableProps } from '../../../ProEditTable/propsType';
 import { ProTreeModalProps } from '../../../ProTreeModal/propsType';
 import { ProUploadProps } from '../../../ProUpload/propsType';
 import { ProTreeProps } from '../../../ProTree/propsType';
-import { GroupProps } from '../combination/Group/propsType';
+import { GroupProps as GroupCopyProps } from '../combination/Group/propsType';
 import { ProCollapseProps } from '../../../ProLayout/components/ProCollapse/PropTypes';
 import { DistributiveOmit } from '../../propsType';
 export type ComponentMap = keyof typeof componentMap;
@@ -159,7 +159,7 @@ export type ColumnPropsMap<Values = any, T = 'ProForm'> = {
     fieldProps?: FieldProps<ProTreeProps, Values, T>;
 } | {
     type?: 'Group';
-    fieldProps?: GroupProps | ReactiveFunction<Values, GroupProps>;
+    fieldProps?: GroupCopyProps | ReactiveFunction<Values, GroupCopyProps>;
 } | {
     type?: 'ProCollapse';
     fieldProps?: ProCollapseProps | ReactiveFunction<Values, ProCollapseProps>;
@@ -208,6 +208,7 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     clearNotShow?: boolean;
     index?: number;
     namePath?: NamePath;
+    listName?: NamePath;
     /** 表单前缀信息 */
     before?: string | React.ReactNode;
     /** 表单后缀信息 */
@@ -216,7 +217,7 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     extra?: string | React.ReactNode;
     /** 是否固定字段, 不隐藏 */
     fixed?: boolean;
-    confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps>;
+    confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps | void>;
 }
 export type ProColumnProps<T = any> = ProFormColumnProps<T> & ColumnPropsMap<T, 'ProForm'>;
 /**

package/es/ProForm/propsType.d.ts

@@ -41,6 +41,7 @@ export interface ProFormOtherProps {
     required?: boolean | boolean[] | (() => boolean | boolean[]);
     mode?: string;
     namePath?: any[] | string | number;
+    listName?: any[] | string | number;
     globalControl?: boolean;
     formDisabled?: boolean;
 }

package/es/ProForm/style/index.less

@@ -140,6 +140,13 @@
 
       // 地址组件
       .@{ant-prefix}-form-item-control-input-content {
+        // 查看模式
+        & > span {
+          border-radius: 4px;
+          padding: 5px 8px;
+          background: @zaui-contract-bg;
+        }
+
         & > .pro-address {
           .@{ant-prefix}-select-selector,
           .@{ant-prefix}-input-affix-wrapper,

package/es/ProForm/utils/diffOriginal.js

@@ -40,7 +40,8 @@ export var diffOriginal = function diffOriginal(params) {
     });
   }
   if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
-    return !isEqual(value, originalValue);
+    var res = !isEqual(value, originalValue);
+    return res;
   }
   return false;
 };

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

@@ -83,7 +83,12 @@ export declare const deleteForPath: (values: any, namePath: string | number | (s
  * @param value 选中值
  * @returns {}
  */
-export declare const findOptionByValue: (treeData: any[], value: string | number) => any;
+export declare const findOptionByValue: (treeData: any[], value: string | number, fieldNames: {
+    [key: string]: any;
+    label?: string;
+    value?: string;
+    children?: string;
+}) => any;
 /**
  * 对比依赖列表中的 值是否变更
  */

package/es/ProForm/utils/index.js

@@ -392,19 +392,19 @@ export var deleteForPath = function deleteForPath(values, namePath) {
  * @param value 选中值
  * @returns {}
  */
-export var findOptionByValue = function findOptionByValue(treeData, value) {
+export var findOptionByValue = function findOptionByValue(treeData, value, fieldNames) {
   if (isObject(value)) {
     return value;
   }
   for (var i = 0; i < (treeData === null || treeData === void 0 ? void 0 : treeData.length); i++) {
     var node = treeData[i];
-    if (node.value === value) {
-      return omit(node, ['children']);
+    if (node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value) || 'value'] === value) {
+      return omit(node, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
     }
     if (node.children) {
-      var foundNode = findOptionByValue(node.children, value);
+      var foundNode = findOptionByValue(node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], value, fieldNames);
       if (foundNode) {
-        return omit(foundNode, ['children']);
+        return omit(foundNode, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
       }
     }
   }

package/es/ProForm/utils/transformNames.js

@@ -1,23 +1,16 @@
-import { union, isNumber } from 'lodash';
+import { union } from 'lodash';
 import { transformValue } from './transformValue';
 var transformNames = function transformNames(formItem, form, names, fieldName, type) {
-  var _names2, _names3, _names3$;
   var _ref = formItem || {},
     normalize = _ref.normalize,
     getValueProps = _ref.getValueProps,
     _shouldUpdate2 = _ref.shouldUpdate;
-  var _names = names;
-  if (!((_names2 = _names) === null || _names2 === void 0 ? void 0 : _names2.length)) {
+  if (!(names === null || names === void 0 ? void 0 : names.length)) {
     return {};
   }
   // 当在formList场景下，给transformValue函数的setFiledProps的name, 需要全namePath
   var _fieldName = Array.isArray(formItem === null || formItem === void 0 ? void 0 : formItem.name) ? union(formItem === null || formItem === void 0 ? void 0 : formItem.namePath, formItem === null || formItem === void 0 ? void 0 : formItem.name) : fieldName;
-  if (type === 'Group' && isNumber((_names3 = _names) === null || _names3 === void 0 ? void 0 : (_names3$ = _names3[0]) === null || _names3$ === void 0 ? void 0 : _names3$[0])) {
-    _names = _names.map(function (item) {
-      return union(formItem === null || formItem === void 0 ? void 0 : formItem.namePath, item);
-    });
-  }
-  var _transformValue = transformValue(_names, form, _fieldName, normalize, getValueProps),
+  var _transformValue = transformValue(names, form, _fieldName, normalize, getValueProps),
     _normalize = _transformValue.normalize,
     _getValueProps = _transformValue.getValueProps,
     _shouldUpdate = _transformValue.shouldUpdate;

package/es/ProForm/utils/useDeepCompareMemo.d.ts

@@ -0,0 +1,2 @@
+/** 深度比较依赖变化memo */
+export declare const useDeepCompareMemo: (fun: () => any, depList: any[]) => any;

package/es/ProForm/utils/useDeepCompareMemo.js

@@ -0,0 +1,14 @@
+import { useRef } from 'react';
+import { isEqualWith } from 'lodash';
+import { customEqualForFun } from '.';
+/** 深度比较依赖变化memo */
+export var useDeepCompareMemo = function useDeepCompareMemo(fun, depList) {
+  var lastDependency = useRef(); // 上一次的依赖
+  var lastRes = useRef(); // 上一次的结果
+  if (!isEqualWith(depList, lastDependency.current, customEqualForFun)) {
+    var res = fun();
+    lastRes.current = res;
+  }
+  lastDependency.current = depList;
+  return lastRes.current;
+};

package/es/ProForm/utils/useForm.js

@@ -57,7 +57,8 @@ export var useForm = function useForm(originForm) {
                 behavior: 'smooth'
               });
             }
-          case 14:
+            throw _context.t0;
+          case 15:
           case "end":
             return _context.stop();
         }

package/es/ProForm/utils/useListChanged.js

@@ -1,6 +1,6 @@
 import "antd/es/form/style";
 import _Form from "antd/es/form";
-import { get } from 'lodash';
+import { get, isString } from 'lodash';
 import { diffOriginal } from './diffOriginal';
 var toNamePath = function toNamePath(name) {
   if (Array.isArray(name)) {
@@ -87,7 +87,7 @@ export var useListChanged = function useListChanged(params) {
     originalValue: originalValue,
     form: form,
     equalWith: equalWith,
-    name: namesStr || name
+    name: isString(namesStr) ? namesStr : originalName || name
   });
   return [changed, originalValue];
 };

package/es/ProForm/utils/useRules.js

@@ -24,10 +24,6 @@ var useRules = function useRules(props) {
     var result = {
       rules: rules || []
     };
-    // Group required: true时，直接走完整校验
-    if (allRequired && type === 'Group') {
-      return result;
-    }
     if (allRequired) {
       if (!requiredRule) {
         var message = isSelect ? "".concat(locale.ProForm.selectPlaceHolder).concat(_label) : "".concat(locale.ProForm.inputPlaceholder).concat(_label);
@@ -58,23 +54,9 @@ var useRules = function useRules(props) {
     required: required
   });
   useEffect(function () {
-    if (type === 'Group' && (allRequired || requiredRule)) {
-      var customRequired = {
-        validator: function validator(rules, value) {
-          // 完整性校验, 数组有值且值不完整则校验不通过
-          if (Array.isArray(value) && isNotFullArray(value, names.length, required)) {
-            return Promise.reject(new Error("".concat(locale.ProForm.completeText).concat(_label)));
-          }
-          return Promise.resolve();
-        }
-      };
-      // 插入rules第一条，完整性校验大于自定义
-      internalRule.rules.unshift(customRequired);
-      return;
-    }
     // 添加完整性校验
     if (names && !isBoolean(labelRequired)) {
-      var _customRequired = {
+      var customRequired = {
         validator: function validator(rules, value) {
           // 完整性校验, 空数组不校验, 数组有值且值不完整则校验不通过
           if (Array.isArray(value) && !isNullArray(value) && isNotFullArray(value, names.length, required)) {
@@ -83,7 +65,7 @@ var useRules = function useRules(props) {
           return Promise.resolve();
         }
       };
-      internalRule.rules.unshift(_customRequired);
+      internalRule.rules.unshift(customRequired);
     }
   }, [internalRule]);
   return internalRule;

package/es/ProSelect/index.js

@@ -9,7 +9,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import "antd/es/select/style";
 import _Select from "antd/es/select";
-var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "isView"];
+var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "isView"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
 import React, { useImperativeHandle, useState, forwardRef } from 'react';
@@ -19,6 +19,7 @@ import Container from '../ProForm/components/Container';
 import AdaptiveTooltip from './components/AdaptiveTooltip';
 import { ProForm } from '..';
 import locale from '../locale';
+import { getSelectList } from './utils';
 import './index.less';
 var Option = _Select.Option;
 export var ProSelect = function ProSelect(props, ref) {
@@ -41,6 +42,8 @@ export var ProSelect = function ProSelect(props, ref) {
     tooltip = _props$tooltip === void 0 ? false : _props$tooltip,
     otherProps = props.otherProps,
     labelInValue = props.labelInValue,
+    _props$filterInList = props.filterInList,
+    filterInList = _props$filterInList === void 0 ? false : _props$filterInList,
     _props$scrollFollowPa = props.scrollFollowParent,
     scrollFollowParent = _props$scrollFollowPa === void 0 ? true : _props$scrollFollowPa,
     defaultOne = props.defaultOne,
@@ -265,6 +268,15 @@ export var ProSelect = function ProSelect(props, ref) {
     }
     return value;
   };
+  var newSelectList = selectList;
+  if ((otherProps === null || otherProps === void 0 ? void 0 : otherProps.listName) && filterInList) {
+    newSelectList = getSelectList({
+      otherProps: otherProps,
+      value: props.value,
+      dataSource: selectList,
+      labelInValue: labelInValue
+    });
+  }
   return _jsx(_Select, _objectSpread(_objectSpread({
     placeholder: locale === null || locale === void 0 ? void 0 : (_locale$ProSelect = locale.ProSelect) === null || _locale$ProSelect === void 0 ? void 0 : _locale$ProSelect.select,
     allowClear: true,
@@ -287,7 +299,7 @@ export var ProSelect = function ProSelect(props, ref) {
     }
   }, omit(cloneDeep(selectProps), ['isView', 'showCodeName', 'form', 'name'])), {}, {
     value: transformValue(),
-    children: Array.isArray(selectList) && selectList.map(function (item) {
+    children: Array.isArray(newSelectList) && newSelectList.map(function (item) {
       return _jsx(Option, {
         value: item[code],
         record: item,

package/es/ProSelect/propsType.d.ts

@@ -14,6 +14,8 @@ export interface PropSelectProps extends Omit<SelectProps, 'onSearch'> {
     defaultOne?: boolean;
     /** 数据源 */
     dataSource?: DataOption[];
+    /** list场景中过滤掉已选择的值 */
+    filterInList?: boolean;
     /** @deprecated  兼容 2.0 版本、3.0 使用view 模式 */
     defaultDisableValue?: string;
     /** 是否展示 tooltip、当 label 特别长的时候使用 */

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

@@ -0,0 +1,9 @@
+/**
+ * 返回当前组件可以显示的数据源
+ */
+export declare const getSelectList: ({ otherProps, value, dataSource, labelInValue, }: {
+    otherProps: any;
+    value: any;
+    dataSource: any;
+    labelInValue: any;
+}) => any;

package/es/ProSelect/utils/index.js

@@ -0,0 +1,60 @@
+import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
+/* eslint-disable no-restricted-syntax */
+import _ from 'lodash';
+var findSelectNameValues = function findSelectNameValues(_ref) {
+  var list = _ref.list,
+    selectName = _ref.selectName,
+    value = _ref.value,
+    dataSource = _ref.dataSource,
+    labelInValue = _ref.labelInValue;
+  var selectValues = [];
+  list.forEach(function (item) {
+    var result = item;
+    if (!item || !Object.keys(item).length || Object.keys(item).length === 1 && 'rowKey' in item) {
+      return false;
+    }
+    var _iterator = _createForOfIteratorHelper(selectName),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var key = _step.value;
+        result = result[key];
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+    selectValues.push(result);
+  });
+  var diffList = _.difference(selectValues, [value]);
+  return dataSource.filter(function (item) {
+    return !diffList.includes(labelInValue ? item : item.value);
+  });
+};
+/**
+ * 返回当前组件可以显示的数据源
+ */
+export var getSelectList = function getSelectList(_ref2) {
+  var otherProps = _ref2.otherProps,
+    value = _ref2.value,
+    dataSource = _ref2.dataSource,
+    labelInValue = _ref2.labelInValue;
+  if (!otherProps) {
+    return null;
+  }
+  var listName = otherProps.listName,
+    form = otherProps.form;
+  var firstNumberIndex = listName.findIndex(function (item) {
+    return typeof item === 'number';
+  });
+  var fatherName = listName.slice(0, firstNumberIndex);
+  var selectName = listName.slice(firstNumberIndex + 1);
+  return findSelectNameValues({
+    list: form.getFieldValue(fatherName),
+    selectName: selectName,
+    value: value,
+    dataSource: dataSource,
+    labelInValue: labelInValue
+  });
+};

package/es/ProTree/components/ProTreeSelect/index.js

@@ -407,13 +407,13 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     }
     return result;
   }
-  var handleChange = function handleChange(newVal) {
+  var handleChange = function handleChange(newVal, label, extra) {
     // newVal回来得一定是label、value
     var result = newVal;
     if (props === null || props === void 0 ? void 0 : props.labelInValue) {
       result = getLabelByValue(selectList, newVal);
     }
-    onChange && onChange(result, selectList, null);
+    onChange && onChange(result, label, extra);
     // 重置搜索
     showSearch && searchTreeEvent('');
   };
@@ -486,7 +486,7 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     allowClear: allowClear || true,
     showArrow: true,
     treeNodeFilterProp: treeNodeFilterProp,
-    virtual: false
+    virtual: true
   }, selectProps);
   if (value === null) {
     delete treeProps.value;

package/es/ProTree/components/ProTreeSelect/style/index.less

@@ -40,6 +40,12 @@
                 color: red;
             }
         }
+        // 隐藏单选下拉树后面勾号
+        .@{ant-prefix}-select-tree-node-content-wrapper{
+            .check-mark-icon{
+                display: none;
+            }
+        }
         // 单选
         &.signal-tree{
             .@{ant-prefix}-select-tree{
@@ -63,14 +69,6 @@
                         display: block;
                     }
                 }
-                .@{ant-prefix}-select-tree-node-content-wrapper{
-                    background-color: transparent;
-                    &.@{ant-prefix}-select-tree-node-selected{
-                        .check-mark-icon{
-                            display: block;
-                        }
-                    }
-                }
                 .@{ant-prefix}-select-tree-treenode:hover{
                     background-color: #f5f5f5;
                 }

package/es/ProTree/style/index.less

@@ -348,3 +348,18 @@
   height: 16px !important;
 }
 
+.pro-tree-select, .pro-tree-select-drop-down-container{
+  .@{ant-prefix}-select-selector{
+    .check-mark-icon{
+      display: none;
+  }
+  }
+  &.@{ant-prefix}-select-dropdown{
+  // 隐藏单选下拉树后面勾号
+    .@{ant-prefix}-select-tree-node-content-wrapper{
+        .check-mark-icon{
+            display: none;
+        }
+    }
+  }
+}

package/es/ProUpload/index.js

@@ -175,10 +175,6 @@ var ProUpload = /*#__PURE__*/React.forwardRef(function (props, ref) {
    * @return {*}
    */
   var handleBeforeUpload = function handleBeforeUpload(file, fileList) {
-    if (!isFunction(beforeUpload)) {
-      return false;
-    }
-    // TODO
     if (!validateFileExt(extExt, file)) {
       var _locale$ProUpload2;
       _message.error("".concat(locale === null || locale === void 0 ? void 0 : (_locale$ProUpload2 = locale.ProUpload) === null || _locale$ProUpload2 === void 0 ? void 0 : _locale$ProUpload2.errorInfoExt, "\u3010").concat(extExt.join('、'), "\u3011"));
@@ -189,7 +185,9 @@ var ProUpload = /*#__PURE__*/React.forwardRef(function (props, ref) {
       _message.error("".concat(locale === null || locale === void 0 ? void 0 : (_locale$ProUpload3 = locale.ProUpload) === null || _locale$ProUpload3 === void 0 ? void 0 : _locale$ProUpload3.errorInfoSize).concat(size, "M"));
       return false;
     }
-    return beforeUpload(file, fileList);
+    if (beforeUpload) {
+      return beforeUpload(file, fileList);
+    }
   };
   var handleRemove = function handleRemove(file) {
     var nextList = _fileList.slice();
@@ -244,7 +242,8 @@ var ProUpload = /*#__PURE__*/React.forwardRef(function (props, ref) {
     showUploadList: showUploadList,
     method: method,
     accept: accept,
-    data: _objectSpread({}, dataParams)
+    data: _objectSpread({}, dataParams),
+    name: name
   }, residueProps);
   var baseProps = {
     isView: isView,

package/es/ProUpload/propsType.d.ts

@@ -18,7 +18,7 @@ export interface fieldNamesProps {
 }
 export interface ProUploadProps {
     /**
-   * @description       拖拽框顶部的内容
+   * @description       顶部的内容(button类型的上传不适用)
    * @default           -
    */
     headerRender?: React.ReactNode | (() => React.ReactNode);

package/es/global.less

@@ -5,37 +5,52 @@ pre {
 }
 
 * {
-  // 火狐浏览器
-  scrollbar-width: thin;
-  scrollbar-color: #d2d3d7 transparent;
   // ie浏览器
   scrollbar-face-color: #d2d3d7;
   scrollbar-highlight-color: #979797;
   scrollbar-3dlight-color: #979797;
-}
 
-::-webkit-scrollbar  {
-  width: 16px;
-}
+  ::-webkit-scrollbar  {
+    width: 16px;
+    background: transparent;
+  }
 
-// // 滑块
-::-webkit-scrollbar-thumb {
-  background-color: #d2d3d7;
-  background-clip: padding-box;
-  border-color: transparent;
-  border-style: dashed;
-  border-width: 4px;
-  border-radius: 10px;
-  -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
-}
+  // 轨道
+  ::-webkit-scrollbar-track {
+    background-color: #fff;
+    border-radius: 10px;
+  }
 
-// 轨道
-::-webkit-scrollbar-track {
-  background-color: transparent;
-  border-radius: 10px;
-}
+  // 悬浮轨道
+  ::-webkit-scrollbar-thumb:hover {
+    background-color: #979797;
+    background-clip: padding-box;
+    border-color: transparent;
+    border-style: dashed;
+    border-width: 4px;
+    border-radius: 10px;
+    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
+  }
+
+  :hover::-webkit-scrollbar-track {
+    background: transparent;
+  }
+
+  :hover::-webkit-scrollbar-thumb {
+    background-color: #d2d3d7;
+    background-clip: padding-box;
+    border-color: transparent;
+    border-style: dashed;
+    border-width: 4px;
+    border-radius: 10px;
+    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
+  }
+
+  :hover::-webkit-scrollbar-thumb:hover {
+    background-color: #979797;
+  }
 
-// 悬浮轨道
-::-webkit-scrollbar-thumb:hover {
-  background-color: #979797;
+  :hover::-webkit-scrollbar-track {
+    background-color: #fff;
+  }
 }

package/es/locale/zh_CN.js

@@ -89,7 +89,7 @@ export default {
     edit: '编辑',
     copy: '复制',
     delete: '删除',
-    mulDelete: '删除',
+    mulDelete: '批量删除',
     save: '保存',
     custom: '自定义',
     operation: '操作',

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

@@ -318,7 +318,7 @@ var RenderField = function RenderField(_ref) {
           }
           _args = [].concat(args);
           rowPath = [].concat((0, _toConsumableArray2.default)(namePath), [index]);
-          row = type === 'Group' ? _args[1] : form.getFieldValue(rowPath, true);
+          row = form.getFieldValue(rowPath, true);
           orgRow = (0, _lodash.cloneDeep)(row);
           if (!onFieldChange) {
             _context.next = 18;
@@ -363,7 +363,7 @@ var RenderField = function RenderField(_ref) {
           return onChange.apply(void 0, (0, _toConsumableArray2.default)(_args));
         case 27:
           // 判断属性是否变动
-          type !== 'Group' && form.setFieldValue(rowPath, row);
+          form.setFieldValue(rowPath, row);
           if (!(0, _lodash.isEqual)(orgRow, row)) {
             diff = (0, _tools.difference)(row, orgRow) || {};
             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) {
@@ -409,7 +409,7 @@ var RenderField = function RenderField(_ref) {
             }
             _args = formatArgs([].concat(args));
             rowPath = [].concat((0, _toConsumableArray2.default)(namePath), [index]);
-            row = type === 'Group' ? _args[1] : form.getFieldValue(rowPath, true);
+            row = form.getFieldValue(rowPath, true);
             orgRow = (0, _lodash.cloneDeep)(row);
             _args[1] = row;
             _context2.t0 = (_TargetComponent3 = TargetComponent) === null || _TargetComponent3 === void 0 ? void 0 : (_TargetComponent3$pro = _TargetComponent3.props) === null || _TargetComponent3$pro === void 0 ? void 0 : _TargetComponent3$pro.onBlur;
@@ -494,16 +494,13 @@ var RenderField = function RenderField(_ref) {
       form: form,
       names: names,
       name: cellName,
+      listName: cellName,
       viewEmpty: viewEmpty,
       valueType: valueType,
       isView: isView
     }
   });
-  if (type === 'Group') {
-    componentProps.onFieldChange = _onchange;
-  } else {
-    componentProps = (0, _lodash.omit)(componentProps, ['onFieldChange', 'namePath', 'index']);
-  }
+  componentProps = (0, _lodash.omit)(componentProps, ['onFieldChange', 'namePath', 'index']);
   // 单元格编辑时，设置各个单元格disabled属性
   if (isCell) {
     record["".concat(dataIndex, "-Disabled")] = _disabled;

package/lib/ProEditTable/style/index.less

@@ -2,6 +2,9 @@
 @import (reference) '~antd/es/style/themes/index.less';
 
 .pro-edit-table {
+  td[rowspan]{
+    vertical-align: middle !important;
+  }
   .pro-edit-table-tooltip {
     display    : inline-flex;
     align-items: center;
@@ -62,7 +65,7 @@
 
   .drag-wrapper {
     display: flex;
-    .drag-icon {
+    .anticon {
       margin-right: var(--zaui-space-size-md, 16px);
       margin-left: var(--zaui-space-size-xs, 4px);
       cursor: pointer;
@@ -137,7 +140,7 @@
         .@{ant-prefix}-table-cell-fix-left,
         .@{ant-prefix}-table-cell-fix-right {
           background-color: var(--zaui-table-header-bg, #f2f3f5);
-          
+
         }
       }
 

package/lib/ProForm/components/base/TextArea/index.d.ts

@@ -5,6 +5,7 @@ import './index.less';
 export interface Props extends TextAreaProps {
     otherProps?: ProFormOtherProps;
     isView?: boolean;
+    tooltip?: boolean;
 }
 declare const TextAreaDef: React.FC<Props>;
 export default TextAreaDef;