@zat-design/sisyphus-react 4.2.0-beta.2 → 4.2.0-beta.3

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

@@ -1,13 +1,8 @@
-var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "onDiff", "clearNotShow", "required", "confirm", "desensitization", "span"];
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+import _isString from "lodash/isString";
+import _union from "lodash/union";
+import _isFunction from "lodash/isFunction";
+import _isBoolean from "lodash/isBoolean";
 import React from 'react';
-import { isBoolean, isFunction, union, isString } from 'lodash';
 import Render from "./Render";
 import { getDefaultProps } from "../../utils/getDefaultProps";
 import * as componentMap from "../index";
@@ -16,33 +11,34 @@ import { FieldProvider } from "../../utils/useFieldProps";
 import locale from "../../../locale";
 import processDependencies from "../../utils/processDependencies";
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
-var RenderFields = props => {
-  var isView = props.isView,
-    _props$columns = props.columns,
-    columns = _props$columns === void 0 ? [] : _props$columns,
-    formDisabled = props.disabled,
-    form = props.form,
-    expand = props.expand,
-    defaultColProps = props.colProps,
-    _props$viewEmpty = props.viewEmpty,
-    viewEmpty = _props$viewEmpty === void 0 ? '-' : _props$viewEmpty,
-    openState = props.openState,
-    labelWidth = props.labelWidth,
-    outerClearNotShow = props.clearNotShow,
-    requiredOnView = props.requiredOnView,
-    required = props.required,
-    diffConfig = props.diffConfig,
-    globalControl = props.globalControl,
-    shouldUpdateDebounce = props.shouldUpdateDebounce;
+const RenderFields = props => {
+  const {
+    isView,
+    columns = [],
+    disabled: formDisabled,
+    // 全局formDisabled
+    form,
+    expand,
+    colProps: defaultColProps,
+    viewEmpty = '-',
+    openState,
+    labelWidth,
+    clearNotShow: outerClearNotShow,
+    requiredOnView,
+    required,
+    diffConfig,
+    globalControl,
+    shouldUpdateDebounce
+  } = props;
 
   // 是否包含隐藏字段
-  var hiddenData = columns.filter(item => {
+  const hiddenData = columns.filter(item => {
     return Array.isArray(item.hiddenNames);
   }) || [];
 
   // 创建hidden字段供表单收集
   if (hiddenData.length) {
-    var hiddenArray = [];
+    let hiddenArray = [];
     hiddenData.forEach(item => {
       hiddenArray = hiddenArray.concat(item.hiddenNames);
     });
@@ -53,8 +49,7 @@ var RenderFields = props => {
       });
     });
   }
-  var comList = columns.flatMap((column, index) => {
-    var _formItemProps$disabl;
+  const comList = columns.flatMap((column, index) => {
     if (!!expand && !openState) {
       // expand为Number时 过滤掉大于expand 且 非fixed的column
       if (typeof expand === 'number') {
@@ -64,64 +59,66 @@ var RenderFields = props => {
         return [];
       }
     }
-    var show = column.show,
-      type = column.type,
-      viewRender = column.viewRender,
-      viewType = column.viewType,
-      valueType = column.valueType,
-      _column$formItemProps = column.formItemProps,
-      formItemProps = _column$formItemProps === void 0 ? {} : _column$formItemProps,
-      _column$colProps = column.colProps,
-      colProps = _column$colProps === void 0 ? {} : _column$colProps,
-      _column$formItemChild = column.formItemChildProps,
-      formItemChildProps = _column$formItemChild === void 0 ? {} : _column$formItemChild,
-      _column$fieldProps = column.fieldProps,
-      fieldProps = _column$fieldProps === void 0 ? {} : _column$fieldProps,
-      onDiff = column.onDiff,
-      _column$clearNotShow = column.clearNotShow,
-      clearNotShow = _column$clearNotShow === void 0 ? outerClearNotShow : _column$clearNotShow,
-      columnRequired = column.required,
-      confirm = column.confirm,
-      desensitization = column.desensitization,
-      span = column.span,
-      otherFormItemProps = _objectWithoutProperties(column, _excluded);
-    var component = column.component;
-    var _isView = typeof column.isView === 'boolean' ? column.isView : isView;
-    var defaultProps = getDefaultProps(column);
+    const {
+      show,
+      type,
+      viewRender,
+      viewType,
+      valueType,
+      formItemProps = {},
+      colProps = {},
+      // @ts-ignore
+      formItemChildProps = {},
+      fieldProps = {},
+      onDiff,
+      clearNotShow = outerClearNotShow,
+      required: columnRequired,
+      confirm,
+      desensitization,
+      span,
+      ...otherFormItemProps
+    } = column;
+    const {
+      component
+    } = column;
+    const _isView = typeof column.isView === 'boolean' ? column.isView : isView;
+    const defaultProps = getDefaultProps(column);
     // 处理dependencies，支持namesPaths格式
-    var processedDeps = processDependencies(column.dependencies);
+    const processedDeps = processDependencies(column.dependencies);
 
     // 允许formItem的属性放在column最外层 并优先级高于 formItemProps 内部参数
-    var _formItemProps = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, defaultProps), formItemProps), otherFormItemProps), {}, {
-      required: columnRequired !== null && columnRequired !== void 0 ? columnRequired : required,
+    const _formItemProps = {
+      ...defaultProps,
+      ...formItemProps,
+      ...otherFormItemProps,
+      required: columnRequired ?? required,
       clearNotShow,
       dependencies: processedDeps
-    });
+    };
     _formItemProps.labelWidth = _formItemProps.labelWidth || labelWidth; // 接收Form中的labelWidth
 
     if (type && component) {
       console.error('Warning: type and component are mutually exclusive. type will not take effect');
     }
-    var _type = type || 'Input';
-    var TargetComponent;
+    let _type = type || 'Input';
+    let TargetComponent;
 
     // 查看高阶函数
-    var viewRenderHandle = () => {
-      var _column$namePath;
-      var value = form.getFieldValue(column.name);
-      var record = form.getFieldsValue();
-      var index;
+    const viewRenderHandle = () => {
+      let value = form.getFieldValue(column.name);
+      let record = form.getFieldsValue();
+      let index;
       // FormList场景
-      if (Array.isArray(column === null || column === void 0 ? void 0 : column.namePath) && column !== null && column !== void 0 && (_column$namePath = column.namePath) !== null && _column$namePath !== void 0 && _column$namePath.length) {
+      if (Array.isArray(column?.namePath) && column?.namePath?.length) {
         // @ts-ignore
-        value = form.getFieldValue(union(column.namePath, (column === null || column === void 0 ? void 0 : column.name) || []));
+        value = form.getFieldValue(_union(column.namePath, column?.name || []));
         record = form.getFieldValue(column.namePath);
-        index = column === null || column === void 0 ? void 0 : column.index;
+        index = column?.index;
       }
       return viewRender ? viewRender(value, record, {
         form,
         index,
-        namePath: column === null || column === void 0 ? void 0 : column.namePath
+        namePath: column?.namePath
       }) || null : null;
     };
     if (typeof _type === 'string') {
@@ -132,42 +129,48 @@ var RenderFields = props => {
       _type = null;
     }
     if (component && /*#__PURE__*/React.isValidElement(component)) {
-      var _newComponent$props;
-      var newComponent = component;
-      var isProEditTable = (newComponent === null || newComponent === void 0 || (_newComponent$props = newComponent.props) === null || _newComponent$props === void 0 ? void 0 : _newComponent$props.onlyOneLineMsg) === '请先保存数据';
+      const newComponent = component;
+      const isProEditTable = newComponent?.props?.onlyOneLineMsg === '请先保存数据';
       TargetComponent = _isView ? viewRenderHandle || '' : component;
       // 可编辑表格内部支持
       if (isProEditTable) {
         TargetComponent = _isView ? viewRenderHandle || component : component;
       }
     }
-    var label = formItemChildProps.label,
-      placeholder = formItemChildProps.placeholder,
-      dataSource = formItemChildProps.dataSource;
-    var formLabel = _formItemProps.label;
-    var comDisabled = (_formItemProps$disabl = _formItemProps === null || _formItemProps === void 0 ? void 0 : _formItemProps.disabled) !== null && _formItemProps$disabl !== void 0 ? _formItemProps$disabl : fieldProps.disabled; // 组件属性层disabled fieldProps可能为函数
+    const {
+      label,
+      placeholder,
+      dataSource
+    } = formItemChildProps;
+    const {
+      label: formLabel
+    } = _formItemProps;
+    const comDisabled = _formItemProps?.disabled ?? fieldProps.disabled; // 组件属性层disabled fieldProps可能为函数
 
     // 当前组件是不是一个选择组件
-    var _isSelect = isSelect({
+    const _isSelect = isSelect({
       dataSource,
       type: _type
     });
-    var placeholderHandle = () => {
-      var _label = isString(label) ? label : '';
-      var _formLabel = isString(formLabel) ? formLabel : '';
+    const placeholderHandle = () => {
+      const _label = _isString(label) ? label : '';
+      const _formLabel = _isString(formLabel) ? formLabel : '';
       return placeholder || `${_isSelect ? `${locale.ProForm.selectPlaceHolder}` : `${locale.ProForm.inputPlaceholder}`}${_label || _formLabel || ''}`;
     };
 
     // 表单组件Props 兼容2.0版本
-    var _fieldProps = _objectSpread(_objectSpread({}, formItemChildProps), fieldProps);
-    if (isBoolean(formDisabled)) {
+    const _fieldProps = {
+      ...formItemChildProps,
+      ...fieldProps
+    };
+    if (_isBoolean(formDisabled)) {
       _fieldProps.disabled = formDisabled;
     }
-    var componentProps = _objectSpread(_objectSpread({
-      placeholder: placeholderHandle()
-    }, _fieldProps), {}, {
+    const componentProps = {
+      placeholder: placeholderHandle(),
+      ..._fieldProps,
       disabled: comDisabled
-    });
+    };
 
     // 容器组件，额外处理show的问题
     if (['ProCollapse', 'Container'].includes(_type)) {
@@ -182,7 +185,7 @@ var RenderFields = props => {
     }
 
     // 时间范围placeholder处理
-    if (['RangePicker'].includes(_type) && !(fieldProps !== null && fieldProps !== void 0 && fieldProps.placeholder)) {
+    if (['RangePicker'].includes(_type) && !fieldProps?.placeholder) {
       delete componentProps.placeholder;
     }
 
@@ -190,12 +193,15 @@ var RenderFields = props => {
     if (!TargetComponent) {
       return [];
     }
-    var _colProps = span ? {
+    const _colProps = span ? {
       span
-    } : _objectSpread(_objectSpread({}, defaultColProps), colProps);
+    } : {
+      ...defaultColProps,
+      ...colProps
+    };
 
     // 其余参数收进对象里传给子组件 componentProps只包含子组件参数
-    var otherProps = {
+    const otherProps = {
       label: _formItemProps.label,
       name: _formItemProps.name,
       disabled: comDisabled,
@@ -236,7 +242,7 @@ var RenderFields = props => {
         colProps: _colProps,
         componentProps: componentProps,
         otherProps: otherProps,
-        fieldProps: isFunction(fieldProps) ? fieldProps : null // 透传fieldProps函数
+        fieldProps: _isFunction(fieldProps) ? fieldProps : null // 透传fieldProps函数
         ,
         isSelect: _isSelect,
         diffConfig: diffConfig,

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

@@ -8,7 +8,7 @@
 
 // ProForm场景 转换value为可选, onChange参数修改
 
-var a = {};
+const a = {};
 
 /**
  * 值转换