@zat-design/sisyphus-react 3.4.5 → 3.4.6-beta.2

package/es/ProTree/components/Tree.js

@@ -3,16 +3,18 @@ import _Tree from "antd/es/tree";
 import "antd/es/popover/style";
 import _Popover from "antd/es/popover";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["checkedValues", "disabled", "searchStr", "originalTreeData", "showCodeName", "checkStrictly", "flatTreeData", "mode", "fieldNames", "tags", "onCheck", "optionRender", "treeData", "showLine", "switcherIcon", "checkable", "menu", "innerExpandKeys", "selectedKey", "disabledMode"];
+var _excluded = ["checkedValues", "disabled", "searchStr", "originalTreeData", "showCodeName", "checkStrictly", "flatTreeData", "mode", "fieldNames", "tags", "onCheck", "optionRender", "treeData", "showLine", "switcherIcon", "checkable", "menu", "innerExpandKeys", "selectedKey", "disabledMode", "isRadioSelect"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /*
  *@Date: 2023-07-25 13:49:35
  *@LastEditTime: 2023-07-25 13:49:35
  *@Author: liudongliang
  *@Description: 树每行节点渲染组件，复选时阻止点击事件冒泡，只有点击树节点文本会向上触发onSelect事件
-*/
+ */
 /* eslint-disable no-plusplus */
 import React, { useEffect, useState } from 'react';
 import { useSetState } from 'ahooks';
@@ -50,19 +52,22 @@ function List(props) {
     innerExpandKeys = props.innerExpandKeys,
     selectedKey = props.selectedKey,
     disabledMode = props.disabledMode,
+    isRadioSelect = props.isRadioSelect,
     other = _objectWithoutProperties(props, _excluded);
   var fieldNameLabel = fieldNames.label;
   var fieldNameValue = fieldNames.value;
   var _useSetState = useSetState({
       expandedKeys: [],
       autoExpandParent: true,
-      currentClickTreeNode: null
+      currentClickTreeNode: null,
+      handing: false
     }),
     _useSetState2 = _slicedToArray(_useSetState, 2),
     _useSetState2$ = _useSetState2[0],
     expandedKeys = _useSetState2$.expandedKeys,
     autoExpandParent = _useSetState2$.autoExpandParent,
     currentClickTreeNode = _useSetState2$.currentClickTreeNode,
+    handing = _useSetState2$.handing,
     setState = _useSetState2[1];
   useEffect(function () {
     if (searchStr) {
@@ -102,18 +107,44 @@ function List(props) {
       });
     }
   }, [selectedKey]);
-  var onSelect = function onSelect(value, item) {
-    var _props$onSelect;
-    var val = value;
-    if (value === currentClickTreeNode) {
-      // 如果当前点击了已经选中节点，那么取消选择
-      val = '';
-    }
-    setState({
-      currentClickTreeNode: val
-    });
-    props === null || props === void 0 ? void 0 : (_props$onSelect = props.onSelect) === null || _props$onSelect === void 0 ? void 0 : _props$onSelect.call(props, val, item);
-  };
+  var onSelect = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(value, item) {
+      var _props$onSelect;
+      var val;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!handing) {
+              _context.next = 2;
+              break;
+            }
+            return _context.abrupt("return", null);
+          case 2:
+            val = value;
+            if (!isRadioSelect && value === currentClickTreeNode) {
+              // 如果当前点击了已经选中节点，那么取消选择
+              val = '';
+            }
+            setState({
+              currentClickTreeNode: val,
+              handing: true
+            });
+            _context.next = 7;
+            return props === null || props === void 0 ? void 0 : (_props$onSelect = props.onSelect) === null || _props$onSelect === void 0 ? void 0 : _props$onSelect.call(props, val, item);
+          case 7:
+            setState({
+              handing: false
+            });
+          case 8:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function onSelect(_x, _x2) {
+      return _ref.apply(this, arguments);
+    };
+  }();
   var TreeNodeRow = function TreeNodeRow(props) {
     var nodeClass = props.nodeClass,
       item = props.item,
@@ -263,7 +294,6 @@ function List(props) {
       })]
     }, onlyKey);
   };
-  // const _treeData = useMemo(() => {
   function fn() {
     var loop = function loop(data, index) {
       index++;
@@ -275,33 +305,27 @@ function List(props) {
           isChecked = true;
         }
         var title = showCodeName ? "".concat(item[fieldNameValue], "-").concat(item[fieldNameLabel]) : item[fieldNameLabel];
+        var nodeTitle = _jsx(TreeNodeRow, {
+          nodeClass: nodeClass,
+          item: item,
+          index: index,
+          title: (item === null || item === void 0 ? void 0 : item.title) || title,
+          isChecked: isChecked,
+          onlyKey: item[fieldNameValue]
+        });
         if (item[fieldNames.children]) {
-          return {
-            title: _jsx(TreeNodeRow, {
-              nodeClass: nodeClass,
-              item: item,
-              index: index,
-              title: title,
-              isChecked: isChecked,
-              onlyKey: item[fieldNameValue]
-            }),
-            key: item[fieldNameValue],
+          return _objectSpread(_objectSpread({}, item), {}, {
+            title: nodeTitle,
+            key: (item === null || item === void 0 ? void 0 : item.key) || item[fieldNameValue],
             children: loop(item[fieldNames.children], index)
-          };
+          });
         }
-        return {
-          title: _jsx(TreeNodeRow, {
-            nodeClass: nodeClass,
-            item: item,
-            index: index,
-            title: title,
-            isChecked: isChecked,
-            onlyKey: item[fieldNameValue]
-          }),
-          key: item[fieldNameValue]
-        };
+        return _objectSpread(_objectSpread({}, item), {}, {
+          title: nodeTitle,
+          key: (item === null || item === void 0 ? void 0 : item.key) || item[fieldNameValue]
+        });
       });
-      return treeRow; // .filter((item) => item);
+      return treeRow;
     };
     if ((other === null || other === void 0 ? void 0 : other.mode) === 'view') {
       return;
@@ -312,8 +336,6 @@ function List(props) {
     }
     return loop(newTreeData, -1);
   }
-  // return fn();
-  // }, [searchStr, expandedKeys, showCodeName, originalTreeData, currentClickTreeNode]);
   var _treeData = fn();
   var onExpand = function onExpand(newExpandedKeys) {
     setState({

package/es/ProTree/style/index.less

@@ -4,6 +4,30 @@
 .pro-tree {
   height: 100%; // tree auto css
 
+  .@{ant-prefix}-tree-node-content-wrapper{
+    display: flex;
+      align-items: baseline;
+  }
+
+  .@{ant-prefix}-tree .@{ant-prefix}-tree-treenode-disabled {
+    .@{ant-prefix}-tree-node-content-wrapper {
+      color: var(--zaui-text);
+    }
+  
+    .pro-tree-tree-node.checked {
+      color: var(--zaui-text);
+    }
+  
+    .pro-tree-tree-node.checked .brand-bg-opa-ten {
+      background-color: inherit;
+    }
+  }
+
+  // 解决双滚动条
+  .@{ant-prefix}-select-dropdown.pro-tree-select-drop-down-container.checkable-tree{
+    overflow: hidden!important;
+  }
+
   .@{ant-prefix}-spin-nested-loading {
     height: 100%; // tree auto css
 
@@ -304,19 +328,6 @@
   }
 }
 
-.@{ant-prefix}-tree .@{ant-prefix}-tree-treenode-disabled {
-  .@{ant-prefix}-tree-node-content-wrapper {
-    color: var(--zaui-text);
-  }
-
-  .pro-tree-tree-node.checked {
-    color: var(--zaui-text);
-  }
-
-  .pro-tree-tree-node.checked .brand-bg-opa-ten {
-    background-color: inherit;
-  }
-}
 
 // 重置ant-form view模式样式ant-tree样式
 .pro-form.pro-form-view .@{ant-prefix}-form-item .pro-tree * {
@@ -337,7 +348,18 @@
   height: 16px !important;
 }
 
-// 解决双滚动条
-.@{ant-prefix}-select-dropdown.pro-tree-select-drop-down-container.checkable-tree{
-  overflow: hidden!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

@@ -3,7 +3,7 @@ import _message from "antd/es/message";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-var _excluded = ["value", "size", "action", "maxCount", "headerRender", "footerRender", "disabled", "uploadType", "buttonProps", "accept", "extraTipText", "beforeUpload", "onChange", "onDownload", "onPreview", "onRemove", "method", "className", "dataParams", "name", "showExampleContent", "showUploadList", "otherProps", "transformResponse", "exampleTitle", "exampleContent", "exampleModalProps", "buttonText", "afterRender", "fieldNames"];
+var _excluded = ["value", "size", "action", "maxCount", "headerRender", "footerRender", "disabled", "uploadType", "buttonProps", "accept", "extraTipText", "beforeUpload", "onChange", "onDownload", "onPreview", "onRemove", "filterOriginFileObj", "method", "className", "dataParams", "name", "showExampleContent", "showUploadList", "otherProps", "transformResponse", "exampleTitle", "exampleContent", "exampleModalProps", "buttonText", "afterRender", "fieldNames"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /*
  * @Author: wangshengqiang
@@ -13,7 +13,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  * @Description: 上传控件
  */
 import React, { useEffect, useState, useImperativeHandle } from 'react';
-import { isFunction } from 'lodash';
+import { isFunction, omit } from 'lodash';
 import { PointerSensor, useSensor } from '@dnd-kit/core';
 import { arrayMove } from '@dnd-kit/sortable';
 import { useProConfig } from '../ProConfigProvider';
@@ -47,6 +47,8 @@ var ProUpload = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onDownload = props.onDownload,
     onPreview = props.onPreview,
     onRemove = props.onRemove,
+    _props$filterOriginFi = props.filterOriginFileObj,
+    filterOriginFileObj = _props$filterOriginFi === void 0 ? false : _props$filterOriginFi,
     _props$method = props.method,
     method = _props$method === void 0 ? 'post' : _props$method,
     className = props.className,
@@ -82,15 +84,11 @@ var ProUpload = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var uploadResTransform = function uploadResTransform(fileList) {
     var _list = fileList.map(function (file) {
       if (file.status === 'done' && file.response) {
-        var nfile = {
-          name: file.name,
-          size: file.size,
-          status: file.status,
-          type: file.type,
-          uid: file.uid,
-          response: file === null || file === void 0 ? void 0 : file.response
-          // url: file?.response?.data?.url,
-        };
+        var nfile = _objectSpread({}, file);
+        // 过滤掉originFileObj
+        if (filterOriginFileObj) {
+          return omit(nfile, 'originFileObj');
+        }
         if (transformResponse) {
           var data = transformResponse(file.response) || {};
           return _objectSpread(_objectSpread({}, nfile), data);
@@ -177,7 +175,6 @@ var ProUpload = /*#__PURE__*/React.forwardRef(function (props, ref) {
    * @return {*}
    */
   var handleBeforeUpload = function handleBeforeUpload(file, fileList) {
-    // 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"));
@@ -245,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,10 +18,15 @@ export interface fieldNamesProps {
 }
 export interface ProUploadProps {
     /**
-     * @description       拖拽框顶部的内容
-     * @default           -
-     */
+   * @description       拖拽框顶部的内容
+   * @default           -
+   */
     headerRender?: React.ReactNode | (() => React.ReactNode);
+    /**
+     * @description       是否过滤掉file对象中的originFileObj
+     * @default           false
+     */
+    filterOriginFileObj?: boolean;
     /**
      * @description       拖拽框底部内容
      * @default           -

package/es/assets/view.svg

@@ -2,7 +2,7 @@
 <svg width="19px" height="15px" viewBox="0 0 19 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <title>icon-dropdown-searchlist</title>
     <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="询报价录入交互说明" transform="translate(-531, -308)" fill="#999999" fill-rule="nonzero">
+        <g id="询报价录入交互说明" transform="translate(-531, -308)" fill="currentColor" fill-rule="nonzero">
             <g id="Dropdown/下拉弹窗切换/default备份-2" transform="translate(215, 299)">
                 <g id="编组-2" transform="translate(288, 1)">
                     <g id="编组" transform="translate(22, 0)">
@@ -17,4 +17,4 @@
             </g>
         </g>
     </g>
-</svg>
+</svg>

package/es/global.less

@@ -7,11 +7,11 @@ pre {
 * {
   // 火狐浏览器
   scrollbar-width: thin;
-  scrollbar-color: #8b8b8b transparent;
+  scrollbar-color: #d2d3d7 transparent;
   // ie浏览器
-  scrollbar-face-color: #8b8b8b;
-  scrollbar-highlight-color: #606060;
-  scrollbar-3dlight-color: #606060;
+  scrollbar-face-color: #d2d3d7;
+  scrollbar-highlight-color: #979797;
+  scrollbar-3dlight-color: #979797;
 }
 
 ::-webkit-scrollbar  {
@@ -20,7 +20,7 @@ pre {
 
 // // 滑块
 ::-webkit-scrollbar-thumb {
-  background-color: #8b8b8b;
+  background-color: #d2d3d7;
   background-clip: padding-box;
   border-color: transparent;
   border-style: dashed;
@@ -37,5 +37,5 @@ pre {
 
 // 悬浮轨道
 ::-webkit-scrollbar-thumb:hover {
-  background-color: #606060;
+  background-color: #979797;
 }

package/lib/ProConfigProvider/index.d.ts

@@ -2,14 +2,14 @@ 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';
+import { ProCascaderProps } from '../ProForm/components/combination/ProCascader/propsType';
 import { ProEnumConfig } from '../ProEnum/propsType';
 export interface ProConfigState {
     locale?: string;
     ProEnum?: Partial<ProEnumConfig>;
     ProSelect?: Partial<PropSelectProps> & Record<string, any>;
     ProModalSelect?: Partial<ProModalSelectPropsType> & Record<string, any>;
-    ProAddressBar?: Partial<AddressProps> & Record<string, any>;
+    ProAddressBar?: Partial<ProCascaderProps> & Record<string, any>;
     forms: Record<string, FormInstance | undefined>;
     [key: string]: any;
 }

package/lib/ProConfigProvider/index.js

@@ -62,9 +62,6 @@ var reducer = function reducer(state, action) {
     case 'setWithLocal':
       {
         var _state = (0, _merge.default)({}, state, action.payload);
-        var localConfigStr = localStorage.getItem('localConfig');
-        var localConfig = JSON.parse(localConfigStr || '{}');
-        localStorage.setItem('localConfig', JSON.stringify((0, _merge.default)(localConfig, action.payload)));
         return _state;
       }
     case 'setProEnum':

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

@@ -22,17 +22,18 @@ var _valueType = _interopRequireDefault(require("../../../ProForm/utils/valueTyp
 var _transform = _interopRequireDefault(require("../../utils/transform"));
 var _tools = require("../../utils/tools");
 var componentMap = _interopRequireWildcard(require("../../../ProForm/components"));
+var _ProConfigProvider = require("../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../../ProForm/components/Container"));
 var _transformNames = _interopRequireDefault(require("../../../ProForm/utils/transformNames"));
 var _useFieldProps = require("../../../ProForm/utils/useFieldProps");
 var _useListChanged3 = require("../../../ProForm/utils/useListChanged");
 var _useRules = _interopRequireDefault(require("../../../ProForm/utils/useRules"));
 var _utils = require("../../../ProForm/utils");
-var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className"];
+var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim"];
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
 var RenderField = function RenderField(_ref) {
-  var _type, _type$replace, _fieldProps2, _fieldProps3, _fieldProps4, _names, _TargetComponent4, _componentProps;
+  var _type, _type$replace, _fieldProps2, _names, _TargetComponent4, _componentProps;
   var value = _ref.text,
     record = _ref.record,
     index = _ref.index,
@@ -59,6 +60,7 @@ var RenderField = function RenderField(_ref) {
     rules = _column$rules === void 0 ? [] : _column$rules,
     equalWith = column.equalWith,
     className = column.className,
+    trim = column.trim,
     resetProps = (0, _objectWithoutProperties2.default)(column, _excluded);
   // editRender弃用使用component同ProForm
   var _editRender = component || editRender;
@@ -78,7 +80,8 @@ var RenderField = function RenderField(_ref) {
     formNamePath = config.namePath,
     _config$originalDiffT = config.originalDiffTip,
     originalDiffTip = _config$originalDiffT === void 0 ? true : _config$originalDiffT,
-    rowDisabled = config.rowDisabled;
+    rowDisabled = config.rowDisabled,
+    otherProps = config.otherProps;
   var _fieldProps = fieldProps || formItemProps || {};
   var _rules = rules || [];
   var _required = required;
@@ -99,35 +102,41 @@ var RenderField = function RenderField(_ref) {
     form: form,
     namePath: [].concat((0, _toConsumableArray2.default)(namePath), [index])
   };
+  // 行参数
+  var rowParams = [currentValue, rowData, options];
   if (typeof isEditable === 'function') {
-    isEditable = isEditable(currentValue, rowData, options);
+    isEditable = isEditable.apply(void 0, rowParams);
   }
+  // 获取最终的disabled
+  _disabled = (0, _tools.getDisabled)({
+    globalControl: otherProps === null || otherProps === void 0 ? void 0 : otherProps.globalControl,
+    formDisabled: otherProps === null || otherProps === void 0 ? void 0 : otherProps.formDisabled,
+    column: column,
+    tabledDisabled: config === null || config === void 0 ? void 0 : config.disabled,
+    columnFieldProps: _fieldProps,
+    params: rowParams
+  });
   // 是否只读文本
-  var isView = !isEditable || (record === null || record === void 0 ? void 0 : record['is-view']) || config.isView || virtualKey && !isEditing || (rowDisabled === null || rowDisabled === void 0 ? void 0 : rowDisabled(record));
+  var isView = !isEditable || (record === null || record === void 0 ? void 0 : record['is-view']) || config.isView || virtualKey && !isEditing || (0, _tools.getDisabled)({
+    globalControl: otherProps === null || otherProps === void 0 ? void 0 : otherProps.globalControl,
+    formDisabled: otherProps === null || otherProps === void 0 ? void 0 : otherProps.formDisabled,
+    column: column,
+    tabledDisabled: config === null || config === void 0 ? void 0 : config.disabled,
+    columnFieldProps: _fieldProps,
+    params: rowParams,
+    rowDisabled: rowDisabled || 'empty'
+  });
   // 只读文本时，采用当前formItem的name，单行编辑时，使用生成的虚拟的name
   var baseName = isView ? name : namePath;
   var TargetComponent;
-  if (typeof required === 'function') {
-    _required = required(currentValue, rowData, options);
-  }
-  if (typeof fieldProps === 'function') {
-    _fieldProps = fieldProps(currentValue, rowData, options);
-  }
-  if (typeof ((_fieldProps2 = _fieldProps) === null || _fieldProps2 === void 0 ? void 0 : _fieldProps2.disabled) === 'function') {
-    _disabled = _fieldProps.disabled(currentValue, rowData, options);
-  } else if (((_fieldProps3 = _fieldProps) === null || _fieldProps3 === void 0 ? void 0 : _fieldProps3.disabled) === true) {
-    _disabled = _fieldProps.disabled;
-  }
-  if (typeof column.disabled === 'function') {
-    _disabled = column.disabled(currentValue, rowData, options);
-  } else if (column.disabled === true) {
-    _disabled = column.disabled;
+  if ((0, _lodash.isFunction)(required)) {
+    _required = required.apply(void 0, rowParams);
   }
-  if ((config === null || config === void 0 ? void 0 : config.disabled) === true) {
-    _disabled = config === null || config === void 0 ? void 0 : config.disabled;
+  if ((0, _lodash.isFunction)(fieldProps)) {
+    _fieldProps = fieldProps.apply(void 0, rowParams);
   }
-  if (typeof rules === 'function') {
-    _rules = rules(currentValue, rowData, options);
+  if ((0, _lodash.isFunction)(rules)) {
+    _rules = rules.apply(void 0, rowParams);
   }
   // 设置校验规则
   var internalRule = (0, _useRules.default)({
@@ -137,7 +146,7 @@ var RenderField = function RenderField(_ref) {
     required: !isView && _required,
     rules: isEditing ? _rules : [],
     isSelect: (0, _utils.isSelect)({
-      dataSource: (_fieldProps4 = _fieldProps) === null || _fieldProps4 === void 0 ? void 0 : _fieldProps4.dataSource,
+      dataSource: (_fieldProps2 = _fieldProps) === null || _fieldProps2 === void 0 ? void 0 : _fieldProps2.dataSource,
       type: type
     }),
     type: type
@@ -172,7 +181,7 @@ var RenderField = function RenderField(_ref) {
    * @returns {}
    */
   var valueTypeTransform = (0, _react.useCallback)(function () {
-    var _fieldProps5;
+    var _fieldProps3;
     // 不存在valueType返回空
     if (!valueType) {
       return {};
@@ -182,7 +191,7 @@ var RenderField = function RenderField(_ref) {
       valueType = 'switch';
     }
     var params = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, column), {}, {
-      mode: (_fieldProps5 = _fieldProps) === null || _fieldProps5 === void 0 ? void 0 : _fieldProps5.mode
+      mode: (_fieldProps3 = _fieldProps) === null || _fieldProps3 === void 0 ? void 0 : _fieldProps3.mode
     });
     return (0, _lodash.isFunction)(_valueType.default[valueType]) ? _valueType.default[valueType](params) : {};
   }, [valueType]);
@@ -227,7 +236,7 @@ var RenderField = function RenderField(_ref) {
   }
   if (isEditable && isEditing) {
     if (typeof _editRender === 'function') {
-      TargetComponent = _editRender(currentValue, rowData, options);
+      TargetComponent = _editRender.apply(void 0, rowParams);
     }
     if ( /*#__PURE__*/_react.default.isValidElement(_editRender)) {
       TargetComponent = _editRender;
@@ -269,7 +278,7 @@ var RenderField = function RenderField(_ref) {
       case 'ProEnum':
         nextArgs[2].option = _args[1];
         break;
-      case 'ProAddressBar':
+      case 'ProCascader':
         nextArgs[2].selectedOptions = _args[1];
         break;
       case 'DatePicker':
@@ -380,13 +389,13 @@ var RenderField = function RenderField(_ref) {
   var _onblur = /*#__PURE__*/function () {
     var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
       var _TargetComponent3, _TargetComponent3$pro, _TargetComponent$prop4;
-      var rowPath,
-        row,
-        orgRow,
-        _len3,
+      var _len3,
         args,
         _key3,
         _args,
+        rowPath,
+        row,
+        orgRow,
         _Object$keys2,
         _Object$keys2$map,
         diff,
@@ -395,13 +404,13 @@ var RenderField = function RenderField(_ref) {
       return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            rowPath = [].concat((0, _toConsumableArray2.default)(namePath), [index]);
-            row = form.getFieldValue(rowPath);
-            orgRow = (0, _lodash.cloneDeep)(row);
             for (_len3 = _args3.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
               args[_key3] = _args3[_key3];
             }
-            _args = formatArgs(args);
+            _args = formatArgs([].concat(args));
+            rowPath = [].concat((0, _toConsumableArray2.default)(namePath), [index]);
+            row = type === 'Group' ? _args[1] : 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;
             if (!_context2.t0) {
@@ -441,14 +450,12 @@ var RenderField = function RenderField(_ref) {
               cellNamePath: []
             });
           case 20:
-            if (virtualKey) {
-              // 单行编辑时需要 强制更新视图
-              setState({
-                forceUpdate: {
-                  d: Date.now()
-                }
-              });
-            }
+            // 单行编辑时需要 强制更新视图
+            setState({
+              forceUpdate: {
+                d: Date.now()
+              }
+            });
           case 21:
           case "end":
             return _context2.stop();
@@ -515,7 +522,7 @@ var RenderField = function RenderField(_ref) {
   if (['Select', 'ProSelect', 'ProEnum'].includes(type)) {
     componentProps.scrollFollowParent = false;
   }
-  Object.assign(_formItemProps, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultTransform()), valueTypeTransform()), namesTransform()));
+  Object.assign(_formItemProps, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultTransform()), valueTypeTransform()), namesTransform()), (0, _utils.isTrim)(type, trim, (0, _ProConfigProvider.useProConfig)())));
   // 编辑&保存模式，在查看状态下移除表单的rules不做校验
   if (!isEditing) {
     delete _formItemProps.rules;

package/lib/ProEditTable/index.js

@@ -69,12 +69,12 @@ var ProEditTable = function ProEditTable(_ref, ref) {
   // 判断是否在formList内
   if (namePath === null || namePath === void 0 ? void 0 : namePath.length) {
     name = [].concat((0, _toConsumableArray2.default)(namePath), (0, _toConsumableArray2.default)(name.slice(1)));
+    disabled = (formFieldProps === null || formFieldProps === void 0 ? void 0 : formFieldProps.disabled) || disabled; // formFieldProps?.disabled可能是函数？？
   }
   var tableRef = (0, _react.useRef)(null);
   var _React$useContext = _react.default.useContext(_antd.ConfigProvider.ConfigContext),
     getPrefixCls = _React$useContext.getPrefixCls;
   var prefixCls = getPrefixCls();
-  disabled = (formFieldProps === null || formFieldProps === void 0 ? void 0 : formFieldProps.disabled) || disabled;
   var _useLocalStorageState = (0, _ahooks.useLocalStorageState)('themeConfig'),
     _useLocalStorageState2 = (0, _slicedToArray2.default)(_useLocalStorageState, 1),
     themeConfig = _useLocalStorageState2[0];
@@ -132,7 +132,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
       return getRowKey(item) === getRowKey(record);
     }));
   };
-  var config = {
+  var config = (0, _objectSpread2.default)({
     form: form,
     mode: mode,
     isView: isView,
@@ -165,7 +165,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     originalDiffTip: originalDiffTip,
     prefixCls: prefixCls,
     rowDisabled: rowDisabled
-  };
+  }, resetProps);
   // 编辑行设置下样式
   var _rowClassName = function _rowClassName(record) {
     var isEdit = !virtualKey || editingKeys.includes(record.rowKey);

package/lib/ProEditTable/style/index.less

@@ -87,11 +87,6 @@
     }
   }
 
-  .@{ant-prefix}-table-header>table .@{ant-prefix}-table-thead>tr>th.@{ant-prefix}-table-selection-column {
-    padding-left: var(--zaui-space-size-md, 16px);
-    padding-right: var(--zaui-space-size-md, 16px);
-  }
-
   .@{ant-prefix}-table-header>table .@{ant-prefix}-table-thead>tr>th:not(.@{ant-prefix}-table-selection-column):not(.@{ant-prefix}-table-row-expand-icon-cell):not([colspan]).is-required {
     &.is-required-right {
       .pro-edit-table-title {