@zat-design/sisyphus-react 3.7.1-beta.4 → 3.7.2-beta.1

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

@@ -79,6 +79,7 @@ var RenderField = function RenderField(_ref) {
   var _fieldProps = fieldProps || formItemProps || {};
   var _rules = rules || [];
   var _required = required;
+  var _valueType = valueType;
   var _disabled = false;
   var isCell = mode === 'cell';
   if (isCell) {
@@ -103,11 +104,18 @@ var RenderField = function RenderField(_ref) {
   };
   // 行参数
   var rowParams = [currentValue, rowData, options];
-  if (typeof isEditable === 'function') {
-    isEditable = isEditable.apply(void 0, rowParams);
-    setTimeout(function () {
-      !isEditable && form.validateFields([cellName]);
-    }, 100);
+  // required & rules & fieldProps & disabled & valueType 函数化处理
+  if (isFunction(required)) {
+    _required = required.apply(void 0, rowParams);
+  }
+  if (isFunction(fieldProps)) {
+    _fieldProps = fieldProps.apply(void 0, rowParams);
+  }
+  if (isFunction(rules)) {
+    _rules = rules.apply(void 0, rowParams);
+  }
+  if (isFunction(valueType)) {
+    _valueType = valueType.apply(void 0, rowParams);
   }
   // 获取最终的disabled
   _disabled = getDisabled({
@@ -118,6 +126,12 @@ var RenderField = function RenderField(_ref) {
     columnFieldProps: _fieldProps,
     params: rowParams
   });
+  if (typeof isEditable === 'function') {
+    isEditable = isEditable.apply(void 0, rowParams);
+    setTimeout(function () {
+      !isEditable && form.validateFields([cellName]);
+    }, 100);
+  }
   // 是否只读文本
   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,
@@ -131,15 +145,6 @@ var RenderField = function RenderField(_ref) {
   // 只读文本时，采用当前formItem的name，单行编辑时，使用生成的虚拟的name
   var baseName = isView ? name : namePath;
   var TargetComponent;
-  if (isFunction(required)) {
-    _required = required.apply(void 0, rowParams);
-  }
-  if (isFunction(fieldProps)) {
-    _fieldProps = fieldProps.apply(void 0, rowParams);
-  }
-  if (isFunction(rules)) {
-    _rules = rules.apply(void 0, rowParams);
-  }
   // 设置校验规则
   var internalRule = useRules({
     names: names,
@@ -165,7 +170,7 @@ var RenderField = function RenderField(_ref) {
   var _formItemProps = _objectSpread(_objectSpread(_objectSpread({}, defaultProps), resetProps), internalRule);
   if (['Switch', 'SwitchCheckbox'].includes(type)) {
     _formItemProps.valuePropName = 'checked';
-    valueType = 'switch';
+    _valueType = 'switch';
   }
   /**
    * 针对一些特殊类型，基于formItem的normalize与getValueProps进行默认值类型转换
@@ -173,7 +178,7 @@ var RenderField = function RenderField(_ref) {
    */
   var defaultTransform = function defaultTransform() {
     var types = ['DatePicker', 'RangePicker'];
-    if (!valueType && types.includes(type)) {
+    if (!_valueType && types.includes(type)) {
       var _transformMap$type;
       return transformMap === null || transformMap === void 0 ? void 0 : (_transformMap$type = transformMap[type]) === null || _transformMap$type === void 0 ? void 0 : _transformMap$type.call(transformMap, _fieldProps || {});
     }
@@ -186,18 +191,18 @@ var RenderField = function RenderField(_ref) {
   var valueTypeTransform = useCallback(function () {
     var _fieldProps3;
     // 不存在valueType返回空
-    if (!valueType) {
+    if (!_valueType) {
       return {};
     }
     // SwitchCheckbox默认YN, 兼容已有组件
     if (type === 'SwitchCheckbox') {
-      valueType = 'switch';
+      _valueType = 'switch';
     }
     var params = _objectSpread(_objectSpread({}, column), {}, {
       mode: (_fieldProps3 = _fieldProps) === null || _fieldProps3 === void 0 ? void 0 : _fieldProps3.mode
     });
-    return isFunction(valueTypeMap[valueType]) ? valueTypeMap[valueType](params) : {};
-  }, [valueType]);
+    return isFunction(valueTypeMap[_valueType]) ? valueTypeMap[_valueType](params) : {};
+  }, [_valueType]);
   if ((_names = names) === null || _names === void 0 ? void 0 : _names.length) {
     // 支持names配置，临时生成对应的formItem，用来存储单个对应的值
     names = names.map(function (key) {
@@ -228,7 +233,7 @@ var RenderField = function RenderField(_ref) {
     }
     var namesStr = [].concat(_toConsumableArray(baseName), [index, dataIndex]);
     var transform = {};
-    if (valueType) {
+    if (_valueType) {
       transform = valueTypeTransform();
     }
     return transformNames(_objectSpread(_objectSpread({}, _formItemProps), transform), form, names, namesStr, type);
@@ -508,7 +513,7 @@ var RenderField = function RenderField(_ref) {
       name: cellName,
       listName: cellName,
       viewEmpty: viewEmpty,
-      valueType: valueType,
+      valueType: _valueType,
       isView: isView
     }
   });

package/es/ProEditTable/propsType.d.ts

@@ -96,7 +96,7 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
     names?: NamePath[];
     cache?: boolean;
     isEditable?: boolean | RequiredFn<T>;
-    valueType?: ProFormValueType;
+    valueType?: ProFormValueType | ((text?: any, record?: any, options?: OptionsProps) => ProFormValueType);
     tooltip?: string | ({
         icon?: string | ReactNode;
     } & TooltipProps);

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

@@ -17,7 +17,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _lodash = require("lodash");
-var _valueType = _interopRequireDefault(require("../../../ProForm/utils/valueType"));
+var _valueType2 = _interopRequireDefault(require("../../../ProForm/utils/valueType"));
 var _transform = _interopRequireDefault(require("../../utils/transform"));
 var _tools = require("../../utils/tools");
 var componentMap = _interopRequireWildcard(require("../../../ProForm/components"));
@@ -86,6 +86,7 @@ var RenderField = function RenderField(_ref) {
   var _fieldProps = fieldProps || formItemProps || {};
   var _rules = rules || [];
   var _required = required;
+  var _valueType = valueType;
   var _disabled = false;
   var isCell = mode === 'cell';
   if (isCell) {
@@ -110,11 +111,18 @@ var RenderField = function RenderField(_ref) {
   };
   // 行参数
   var rowParams = [currentValue, rowData, options];
-  if (typeof isEditable === 'function') {
-    isEditable = isEditable.apply(void 0, rowParams);
-    setTimeout(function () {
-      !isEditable && form.validateFields([cellName]);
-    }, 100);
+  // required & rules & fieldProps & disabled & valueType 函数化处理
+  if ((0, _lodash.isFunction)(required)) {
+    _required = required.apply(void 0, rowParams);
+  }
+  if ((0, _lodash.isFunction)(fieldProps)) {
+    _fieldProps = fieldProps.apply(void 0, rowParams);
+  }
+  if ((0, _lodash.isFunction)(rules)) {
+    _rules = rules.apply(void 0, rowParams);
+  }
+  if ((0, _lodash.isFunction)(valueType)) {
+    _valueType = valueType.apply(void 0, rowParams);
   }
   // 获取最终的disabled
   _disabled = (0, _tools.getDisabled)({
@@ -125,6 +133,12 @@ var RenderField = function RenderField(_ref) {
     columnFieldProps: _fieldProps,
     params: rowParams
   });
+  if (typeof isEditable === 'function') {
+    isEditable = isEditable.apply(void 0, rowParams);
+    setTimeout(function () {
+      !isEditable && form.validateFields([cellName]);
+    }, 100);
+  }
   // 是否只读文本
   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,
@@ -138,15 +152,6 @@ var RenderField = function RenderField(_ref) {
   // 只读文本时，采用当前formItem的name，单行编辑时，使用生成的虚拟的name
   var baseName = isView ? name : namePath;
   var TargetComponent;
-  if ((0, _lodash.isFunction)(required)) {
-    _required = required.apply(void 0, rowParams);
-  }
-  if ((0, _lodash.isFunction)(fieldProps)) {
-    _fieldProps = fieldProps.apply(void 0, rowParams);
-  }
-  if ((0, _lodash.isFunction)(rules)) {
-    _rules = rules.apply(void 0, rowParams);
-  }
   // 设置校验规则
   var internalRule = (0, _useRules.default)({
     names: names,
@@ -172,7 +177,7 @@ var RenderField = function RenderField(_ref) {
   var _formItemProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultProps), resetProps), internalRule);
   if (['Switch', 'SwitchCheckbox'].includes(type)) {
     _formItemProps.valuePropName = 'checked';
-    valueType = 'switch';
+    _valueType = 'switch';
   }
   /**
    * 针对一些特殊类型，基于formItem的normalize与getValueProps进行默认值类型转换
@@ -180,7 +185,7 @@ var RenderField = function RenderField(_ref) {
    */
   var defaultTransform = function defaultTransform() {
     var types = ['DatePicker', 'RangePicker'];
-    if (!valueType && types.includes(type)) {
+    if (!_valueType && types.includes(type)) {
       var _transformMap$type;
       return _transform.default === null || _transform.default === void 0 ? void 0 : (_transformMap$type = _transform.default[type]) === null || _transformMap$type === void 0 ? void 0 : _transformMap$type.call(_transform.default, _fieldProps || {});
     }
@@ -193,18 +198,18 @@ var RenderField = function RenderField(_ref) {
   var valueTypeTransform = (0, _react.useCallback)(function () {
     var _fieldProps3;
     // 不存在valueType返回空
-    if (!valueType) {
+    if (!_valueType) {
       return {};
     }
     // SwitchCheckbox默认YN, 兼容已有组件
     if (type === 'SwitchCheckbox') {
-      valueType = 'switch';
+      _valueType = 'switch';
     }
     var params = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, column), {}, {
       mode: (_fieldProps3 = _fieldProps) === null || _fieldProps3 === void 0 ? void 0 : _fieldProps3.mode
     });
-    return (0, _lodash.isFunction)(_valueType.default[valueType]) ? _valueType.default[valueType](params) : {};
-  }, [valueType]);
+    return (0, _lodash.isFunction)(_valueType2.default[_valueType]) ? _valueType2.default[_valueType](params) : {};
+  }, [_valueType]);
   if ((_names = names) === null || _names === void 0 ? void 0 : _names.length) {
     // 支持names配置，临时生成对应的formItem，用来存储单个对应的值
     names = names.map(function (key) {
@@ -235,7 +240,7 @@ var RenderField = function RenderField(_ref) {
     }
     var namesStr = [].concat((0, _toConsumableArray2.default)(baseName), [index, dataIndex]);
     var transform = {};
-    if (valueType) {
+    if (_valueType) {
       transform = valueTypeTransform();
     }
     return (0, _transformNames.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _formItemProps), transform), form, names, namesStr, type);
@@ -515,7 +520,7 @@ var RenderField = function RenderField(_ref) {
       name: cellName,
       listName: cellName,
       viewEmpty: viewEmpty,
-      valueType: valueType,
+      valueType: _valueType,
       isView: isView
     }
   });

package/lib/ProEditTable/propsType.d.ts

@@ -96,7 +96,7 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
     names?: NamePath[];
     cache?: boolean;
     isEditable?: boolean | RequiredFn<T>;
-    valueType?: ProFormValueType;
+    valueType?: ProFormValueType | ((text?: any, record?: any, options?: OptionsProps) => ProFormValueType);
     tooltip?: string | ({
         icon?: string | ReactNode;
     } & TooltipProps);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.7.1-beta.4",
+  "version": "3.7.2-beta.1",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",