@zat-design/sisyphus-react 3.4.5-beta.11 → 3.4.5-beta.12

package/dist/index.esm.css

@@ -3913,6 +3913,16 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   height: auto !important;
   min-height: auto !important;
 }
+.ant-tree-node-content-wrapper {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-align: baseline;
+  -webkit-align-items: baseline;
+      -ms-flex-align: baseline;
+          align-items: baseline;
+}
 .pro-form.pro-form-view .ant-form-item .pro-tree .ant-tree-checkbox {
   margin-top: var(--zaui-space-size-sm);
 }

package/dist/less.esm.css

@@ -3913,6 +3913,16 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   height: auto !important;
   min-height: auto !important;
 }
+.ant-tree-node-content-wrapper {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-align: baseline;
+  -webkit-align-items: baseline;
+      -ms-flex-align: baseline;
+          align-items: baseline;
+}
 .pro-form.pro-form-view .ant-form-item .pro-tree .ant-tree-checkbox {
   margin-top: var(--zaui-space-size-sm);
 }

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

@@ -17,10 +17,10 @@ import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-run
 /* eslint-disable prefer-const */
 import React, { useCallback, useEffect } from 'react';
 import classNames from 'classnames';
-import { cloneDeep, isEqual, debounce, omit, isFunction, isBoolean } from 'lodash';
+import { cloneDeep, isEqual, debounce, omit, isFunction } from 'lodash';
 import valueTypeMap from '../../../ProForm/utils/valueType';
 import transformMap from '../../utils/transform';
-import { getNamePath, difference } from '../../utils/tools';
+import { getNamePath, difference, getDisabled } from '../../utils/tools';
 import * as componentMap from '../../../ProForm/components';
 import Container from '../../../ProForm/components/Container';
 import transformNames from '../../../ProForm/utils/transformNames';
@@ -29,7 +29,7 @@ import { useListChanged } from '../../../ProForm/utils/useListChanged';
 import useRules from '../../../ProForm/utils/useRules';
 import { isSelect } from '../../../ProForm/utils';
 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,
@@ -75,7 +75,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;
@@ -96,35 +97,41 @@ var RenderField = function RenderField(_ref) {
     form: form,
     namePath: [].concat(_toConsumableArray(namePath), [index])
   };
+  // 行参数
+  var rowParams = [currentValue, rowData, options];
   if (typeof isEditable === 'function') {
-    isEditable = isEditable(currentValue, rowData, options);
+    isEditable = isEditable.apply(void 0, rowParams);
   }
+  // 获取最终的disabled
+  _disabled = 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 || 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
+  });
   // 只读文本时，采用当前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 (isBoolean((_fieldProps3 = _fieldProps) === null || _fieldProps3 === void 0 ? void 0 : _fieldProps3.disabled)) {
-    _disabled = _fieldProps.disabled;
-  }
-  if ((config === null || config === void 0 ? void 0 : config.disabled) === true) {
-    _disabled = column.disabled || (config === null || config === void 0 ? void 0 : config.disabled);
+  if (isFunction(required)) {
+    _required = required.apply(void 0, rowParams);
   }
-  if (typeof column.disabled === 'function') {
-    _disabled = column.disabled(currentValue, rowData, options);
-  } else if (isBoolean(column.disabled)) {
-    _disabled = column.disabled;
+  if (isFunction(fieldProps)) {
+    _fieldProps = fieldProps.apply(void 0, rowParams);
   }
-  if (typeof rules === 'function') {
-    _rules = rules(currentValue, rowData, options);
+  if (isFunction(rules)) {
+    _rules = rules.apply(void 0, rowParams);
   }
   // 设置校验规则
   var internalRule = useRules({
@@ -134,7 +141,7 @@ var RenderField = function RenderField(_ref) {
     required: !isView && _required,
     rules: isEditing ? _rules : [],
     isSelect: 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
@@ -169,7 +176,7 @@ var RenderField = function RenderField(_ref) {
    * @returns {}
    */
   var valueTypeTransform = useCallback(function () {
-    var _fieldProps5;
+    var _fieldProps3;
     // 不存在valueType返回空
     if (!valueType) {
       return {};
@@ -179,7 +186,7 @@ var RenderField = function RenderField(_ref) {
       valueType = 'switch';
     }
     var params = _objectSpread(_objectSpread({}, column), {}, {
-      mode: (_fieldProps5 = _fieldProps) === null || _fieldProps5 === void 0 ? void 0 : _fieldProps5.mode
+      mode: (_fieldProps3 = _fieldProps) === null || _fieldProps3 === void 0 ? void 0 : _fieldProps3.mode
     });
     return isFunction(valueTypeMap[valueType]) ? valueTypeMap[valueType](params) : {};
   }, [valueType]);
@@ -224,7 +231,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.isValidElement(_editRender)) {
       TargetComponent = _editRender;

package/es/ProEditTable/index.js

@@ -129,7 +129,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
       return getRowKey(item) === getRowKey(record);
     }));
   };
-  var config = {
+  var config = _objectSpread({
     form: form,
     mode: mode,
     isView: isView,
@@ -162,7 +162,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/es/ProEditTable/utils/tools.d.ts

@@ -14,3 +14,15 @@ export declare const onDelete: ({ name, form, virtualKey, selectedRowKeys }: {
     virtualKey: any;
     selectedRowKeys: any;
 }) => void;
+/** 获取最终的disabled, 两张模式【子级优先，全局优先】
+ * 全局优先：globalControl为true时，全局控制
+ * 子级优先：globalControl为false时，子级控制
+ * @param globalControl 全局控制
+ * @param formDisabled 表单的disabled
+ * @param column 当前列
+ * @param tabledDisabled 表格的disabled
+ * @param columnFieldProps 当前列的fieldProps
+ * @param params 当前列的参数
+ * @param rowDisabled 行禁用参数
+ */
+export declare const getDisabled: ({ globalControl, formDisabled, column, tabledDisabled, columnFieldProps, params, rowDisabled }: any) => any;

package/es/ProEditTable/utils/tools.js

@@ -1,4 +1,5 @@
-import { cloneDeep, isString, isObject, isEqual, transform } from 'lodash';
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import { cloneDeep, isString, isObject, isEqual, transform, isFunction, isBoolean } from 'lodash';
 export var getRandom = function getRandom() {
   return Math.random().toString(36).slice(-6);
 };
@@ -74,4 +75,51 @@ export var onDelete = function onDelete(_ref) {
       form.setFieldValue(namePath, virtualList);
     }
   }
+};
+/** 获取最终的disabled, 两张模式【子级优先，全局优先】
+ * 全局优先：globalControl为true时，全局控制
+ * 子级优先：globalControl为false时，子级控制
+ * @param globalControl 全局控制
+ * @param formDisabled 表单的disabled
+ * @param column 当前列
+ * @param tabledDisabled 表格的disabled
+ * @param columnFieldProps 当前列的fieldProps
+ * @param params 当前列的参数
+ * @param rowDisabled 行禁用参数
+ */
+export var getDisabled = function getDisabled(_ref2) {
+  var globalControl = _ref2.globalControl,
+    formDisabled = _ref2.formDisabled,
+    column = _ref2.column,
+    tabledDisabled = _ref2.tabledDisabled,
+    columnFieldProps = _ref2.columnFieldProps,
+    params = _ref2.params,
+    rowDisabled = _ref2.rowDisabled;
+  var convertToBoolean = function convertToBoolean(value) {
+    if (value === null || value === undefined || value === '') {
+      return false;
+    }
+    if (value === 0) {
+      return true;
+    }
+    return Boolean(value);
+  };
+  // 判断是否有column的disabled属性
+  var noColumnDisabled = function noColumnDisabled() {
+    if (isFunction(column === null || column === void 0 ? void 0 : column.disabled) || isFunction(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled) || isBoolean(column === null || column === void 0 ? void 0 : column.disabled) || isBoolean(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled)) {
+      return false;
+    }
+    return true;
+  };
+  if (globalControl) {
+    return convertToBoolean(formDisabled) || convertToBoolean(tabledDisabled);
+  }
+  // 当表单含有diabled属性时，优先使用表单的disabled
+  if (isFunction(rowDisabled) && noColumnDisabled()) {
+    return rowDisabled(params[1]);
+  }
+  if (isFunction(column === null || column === void 0 ? void 0 : column.disabled) || isFunction(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled)) {
+    return convertToBoolean(column === null || column === void 0 ? void 0 : column.disabled.apply(column, _toConsumableArray(params))) || convertToBoolean(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled.apply(columnFieldProps, _toConsumableArray(params)));
+  }
+  return convertToBoolean(column === null || column === void 0 ? void 0 : column.disabled) || convertToBoolean(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled);
 };

package/es/ProForm/components/render/RenderFields.js

@@ -178,7 +178,9 @@ var RenderFields = function RenderFields(props) {
       hiddenNames: column.hiddenNames,
       colProps: _colProps,
       mode: componentProps.mode,
-      namePath: column.namePath
+      namePath: column.namePath,
+      globalControl: globalControl,
+      formDisabled: formDisabled
     };
     if (outerClearNotShow !== false && show === false && (column === null || column === void 0 ? void 0 : column.name) && form.getFieldValue(column === null || column === void 0 ? void 0 : column.name)) {
       setTimeout(function () {

package/es/ProForm/propsType.d.ts

@@ -41,6 +41,8 @@ export interface ProFormOtherProps {
     required?: boolean | boolean[] | (() => boolean | boolean[]);
     mode?: string;
     namePath?: any[] | string | number;
+    globalControl?: boolean;
+    formDisabled?: boolean;
 }
 export interface ProFormProps<Values = any> extends FormProps<Values> {
     disabled?: boolean;

package/es/ProTree/components/ProTree.js

@@ -5,6 +5,8 @@ import _Input from "antd/es/input";
 import "antd/es/spin/style";
 import _Spin from "antd/es/spin";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import "antd/es/message/style";
@@ -336,32 +338,52 @@ var ProTree = function ProTree(props) {
     handleFinish(allValue, checked, checkedValues);
   };
   /** 点击了树节点开始loading,改变自身state并将值通过onchange上传到form */
-  var onSelectTreeNode = function onSelectTreeNode(props, info) {
-    if (disabled || isView) {
-      return null;
-    }
-    setState({
-      clickShowLoading: loading
-    });
-    if (onSelect) {
-      var _onSelect;
-      (_onSelect = onSelect(props, info)) === null || _onSelect === void 0 ? void 0 : _onSelect.then(function () {
-        setState({
-          clickShowLoading: false
-        });
-      });
-    }
-    if (!(other === null || other === void 0 ? void 0 : other.checkable)) {
-      // 单选将选中节点值冒泡到form
-      var values = props;
-      if (labelInValue) {
-        values = state.flatTreeData.filter(function (item) {
-          return values === item[fieldNameValue];
-        });
-      }
-      onChange && onChange(values);
-    }
-  };
+  var onSelectTreeNode = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(props, info) {
+      var values;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!(disabled || isView)) {
+              _context.next = 2;
+              break;
+            }
+            return _context.abrupt("return", null);
+          case 2:
+            setState({
+              clickShowLoading: loading
+            });
+            if (!onSelect) {
+              _context.next = 7;
+              break;
+            }
+            _context.next = 6;
+            return onSelect(props, info);
+          case 6:
+            setState({
+              clickShowLoading: false
+            });
+          case 7:
+            if (!(other === null || other === void 0 ? void 0 : other.checkable)) {
+              // 单选将选中节点值冒泡到form
+              values = props;
+              if (labelInValue) {
+                values = state.flatTreeData.filter(function (item) {
+                  return values === item[fieldNameValue];
+                });
+              }
+              onChange && onChange(values);
+            }
+          case 8:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function onSelectTreeNode(_x, _x2) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
   var boxClass = classNames(_defineProperty({
     'pro-tree': true,
     'footer-shadow': footer

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,6 +52,7 @@ 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;
@@ -102,18 +105,37 @@ 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 (window.handing) {
+            //   return null;
+            // }
+            // window.handing = true;
+            val = value;
+            if (!isRadioSelect && value === currentClickTreeNode) {
+              // 如果当前点击了已经选中节点，那么取消选择
+              val = '';
+            }
+            setState({
+              currentClickTreeNode: val
+            });
+            _context.next = 5;
+            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 5:
+          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,
@@ -275,31 +297,25 @@ 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);
     };

package/es/ProTree/style/index.less

@@ -324,6 +324,10 @@
   height     : auto !important;
   min-height : auto !important;
 }
+.ant-tree-node-content-wrapper{
+  display: flex;
+    align-items: baseline;
+}
 
 .pro-form.pro-form-view .@{ant-prefix}-form-item .pro-tree .@{ant-prefix}-tree-checkbox {
   margin-top: var(--zaui-space-size-sm);

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

@@ -32,7 +32,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, _TargetComponent4, _componentProps;
+  var _type, _type$replace, _fieldProps2, _names, _TargetComponent4, _componentProps;
   var value = _ref.text,
     record = _ref.record,
     index = _ref.index,
@@ -78,7 +78,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 +100,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
+  });
   // 只读文本时，采用当前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 ((0, _lodash.isBoolean)((_fieldProps3 = _fieldProps) === null || _fieldProps3 === void 0 ? void 0 : _fieldProps3.disabled)) {
-    _disabled = _fieldProps.disabled;
-  }
-  if ((config === null || config === void 0 ? void 0 : config.disabled) === true) {
-    _disabled = column.disabled || (config === null || config === void 0 ? void 0 : config.disabled);
+  if ((0, _lodash.isFunction)(required)) {
+    _required = required.apply(void 0, rowParams);
   }
-  if (typeof column.disabled === 'function') {
-    _disabled = column.disabled(currentValue, rowData, options);
-  } else if ((0, _lodash.isBoolean)(column.disabled)) {
-    _disabled = column.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 +144,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 +179,7 @@ var RenderField = function RenderField(_ref) {
    * @returns {}
    */
   var valueTypeTransform = (0, _react.useCallback)(function () {
-    var _fieldProps5;
+    var _fieldProps3;
     // 不存在valueType返回空
     if (!valueType) {
       return {};
@@ -182,7 +189,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 +234,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;

package/lib/ProEditTable/index.js

@@ -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);