@zat-design/sisyphus-react 3.13.14-deta.2 → 4.0.0-beta.3

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

@@ -1,244 +1,242 @@
-"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
+// src/ProForm/components/render/RenderFields.tsx
+var RenderFields_exports = {};
+__export(RenderFields_exports, {
+  default: () => RenderFields_default
 });
-exports.default = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _isString2 = _interopRequireDefault(require("lodash/isString"));
-var _union2 = _interopRequireDefault(require("lodash/union"));
-var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
-var _isBoolean2 = _interopRequireDefault(require("lodash/isBoolean"));
-var _jsxRuntime = require("react/jsx-runtime");
-var _react = _interopRequireDefault(require("react"));
-var _Render = _interopRequireDefault(require("./Render"));
-var _getDefaultProps = require("../../utils/getDefaultProps");
-var componentMap = _interopRequireWildcard(require("../index"));
-var _utils = require("../../utils");
-var _useFieldProps = require("../../utils/useFieldProps");
-var _locale = _interopRequireDefault(require("../../../locale"));
-var _processDependencies = _interopRequireDefault(require("../../utils/processDependencies"));
-var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "onDiff", "clearNotShow", "required", "confirm", "desensitization", "span"];
-var RenderFields = function 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,
-    desensitizationKey = props.desensitizationKey;
-  // 是否包含隐藏字段
-  var hiddenData = columns.filter(function (item) {
+module.exports = __toCommonJS(RenderFields_exports);
+var import_react = __toESM(require("react"));
+var import_lodash = require("lodash");
+var import_Render = __toESM(require("./Render"));
+var import_getDefaultProps = require("../../utils/getDefaultProps");
+var componentMap = __toESM(require("../index"));
+var import_utils = require("../../utils");
+var import_useFieldProps = require("../../utils/useFieldProps");
+var import_locale = __toESM(require("../../../locale"));
+var import_processDependencies = __toESM(require("../../utils/processDependencies"));
+var RenderFields = (props) => {
+  const {
+    isView,
+    columns = [],
+    disabled: formDisabled,
+    // 全局formDisabled
+    form,
+    expand,
+    colProps: defaultColProps,
+    viewEmpty = "-",
+    openState,
+    labelWidth,
+    clearNotShow: outerClearNotShow,
+    requiredOnView,
+    required,
+    diffConfig,
+    globalControl,
+    desensitizationKey
+  } = props;
+  const hiddenData = columns.filter((item) => {
     return Array.isArray(item.hiddenNames);
   }) || [];
-  // 创建hidden字段供表单收集
   if (hiddenData.length) {
-    var hiddenArray = [];
-    hiddenData.forEach(function (item) {
+    let hiddenArray = [];
+    hiddenData.forEach((item) => {
       hiddenArray = hiddenArray.concat(item.hiddenNames);
     });
-    hiddenArray.forEach(function (item) {
-      columns.push({
-        name: Array.isArray(item) ? item : "".concat(item),
-        hidden: true
-      });
+    hiddenArray.forEach((item) => {
+      columns.push({ name: Array.isArray(item) ? item : `${item}`, hidden: true });
     });
   }
-  var comList = columns.flatMap(function (column, index) {
-    var _formItemProps$disabl;
+  const comList = columns.flatMap((column, index) => {
+    var _a;
     if (!!expand && !openState) {
-      // expand为Number时 过滤掉大于expand 且 非fixed的column
-      if (typeof expand === 'number') {
-        if (index >= expand && column.fixed !== true) return [];
+      if (typeof expand === "number") {
+        if (index >= expand && column.fixed !== true)
+          return [];
       } else if (column.fixed !== true) {
-        // 否则只过滤非fixed的column
         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 = (0, _objectWithoutProperties2.default)(column, _excluded);
-    var component = column.component;
-    var _isView = typeof column.isView === 'boolean' ? column.isView : isView;
-    var defaultProps = (0, _getDefaultProps.getDefaultProps)(column);
-    // 处理dependencies，支持namesPaths格式
-    var processedDeps = (0, _processDependencies.default)(column.dependencies);
-    // 允许formItem的属性放在column最外层 并优先级高于 formItemProps 内部参数
-    var _formItemProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultProps), formItemProps), otherFormItemProps), {}, {
-      required: columnRequired !== null && columnRequired !== void 0 ? columnRequired : required,
-      clearNotShow: clearNotShow,
+    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 = (0, import_getDefaultProps.getDefaultProps)(column);
+    const processedDeps = (0, import_processDependencies.default)(column.dependencies);
+    const _formItemProps = {
+      ...defaultProps,
+      ...formItemProps,
+      ...otherFormItemProps,
+      required: columnRequired ?? required,
+      clearNotShow,
       dependencies: processedDeps
-    });
-    _formItemProps.labelWidth = _formItemProps.labelWidth || labelWidth; // 接收Form中的labelWidth
+    };
+    _formItemProps.labelWidth = _formItemProps.labelWidth || labelWidth;
     if (type && component) {
-      console.error('Warning: type and component are mutually exclusive. type will not take effect');
+      console.error(
+        "Warning: type and component are mutually exclusive. type will not take effect"
+      );
     }
-    var _type = type || 'Input';
-    var TargetComponent;
-    // 查看高阶函数
-    var viewRenderHandle = function viewRenderHandle() {
-      var _column$namePath;
-      var value = form.getFieldValue(column.name);
-      var record = form.getFieldsValue();
-      var index;
-      // FormList场景
-      if (Array.isArray(column === null || column === void 0 ? void 0 : column.namePath) && (column === null || column === void 0 ? void 0 : (_column$namePath = column.namePath) === null || _column$namePath === void 0 ? void 0 : _column$namePath.length)) {
-        // @ts-ignore
-        value = form.getFieldValue((0, _union2.default)(column.namePath, (column === null || column === void 0 ? void 0 : column.name) || []));
+    let _type = type || "Input";
+    let TargetComponent;
+    const viewRenderHandle = () => {
+      var _a2;
+      let value = form.getFieldValue(column.name);
+      let record = form.getFieldsValue();
+      let index2;
+      if (Array.isArray(column == null ? void 0 : column.namePath) && ((_a2 = column == null ? void 0 : column.namePath) == null ? void 0 : _a2.length)) {
+        value = form.getFieldValue((0, import_lodash.union)(column.namePath, (column == null ? void 0 : column.name) || []));
         record = form.getFieldValue(column.namePath);
-        index = column === null || column === void 0 ? void 0 : column.index;
+        index2 = column == null ? void 0 : column.index;
       }
-      return viewRender ? viewRender(value, record, {
-        form: form,
-        index: index,
-        namePath: column === null || column === void 0 ? void 0 : column.namePath
-      }) || null : null;
+      return viewRender ? viewRender(value, record, { form, index: index2, namePath: column == null ? void 0 : column.namePath }) || null : null;
     };
-    if (typeof _type === 'string') {
+    if (typeof _type === "string") {
       TargetComponent = _isView && viewRender ? viewRenderHandle : componentMap[_type];
     }
-    // 自定义组件时 防止默认值影像后续判断
-    if ('component' in column) {
+    if ("component" in column) {
       _type = null;
     }
-    if (component && /*#__PURE__*/_react.default.isValidElement(component)) {
-      var _newComponent$props;
-      var newComponent = component;
-      var isProEditTable = (newComponent === null || newComponent === void 0 ? void 0 : (_newComponent$props = newComponent.props) === null || _newComponent$props === void 0 ? void 0 : _newComponent$props.onlyOneLineMsg) === '请先保存数据';
-      TargetComponent = _isView ? viewRenderHandle || '' : component;
-      // 可编辑表格内部支持
+    if (component && import_react.default.isValidElement(component)) {
+      const newComponent = component;
+      const isProEditTable = ((_a = newComponent == null ? void 0 : newComponent.props) == null ? void 0 : _a.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可能为函数
-    // 当前组件是不是一个选择组件
-    var _isSelect = (0, _utils.isSelect)({
-      dataSource: dataSource,
-      type: _type
-    });
-    var placeholderHandle = function placeholderHandle() {
-      var _label = (0, _isString2.default)(label) ? label : '';
-      var _formLabel = (0, _isString2.default)(formLabel) ? formLabel : '';
-      return placeholder || "".concat(_isSelect ? "".concat(_locale.default.ProForm.selectPlaceHolder) : "".concat(_locale.default.ProForm.inputPlaceholder)).concat(_label || _formLabel || '');
+    const { label, placeholder, dataSource } = formItemChildProps;
+    const { label: formLabel } = _formItemProps;
+    const comDisabled = (_formItemProps == null ? void 0 : _formItemProps.disabled) ?? fieldProps.disabled;
+    const _isSelect = (0, import_utils.isSelect)({ dataSource, type: _type });
+    const placeholderHandle = () => {
+      const _label = (0, import_lodash.isString)(label) ? label : "";
+      const _formLabel = (0, import_lodash.isString)(formLabel) ? formLabel : "";
+      return placeholder || `${_isSelect ? `${import_locale.default.ProForm.selectPlaceHolder}` : `${import_locale.default.ProForm.inputPlaceholder}`}${_label || _formLabel || ""}`;
+    };
+    const _fieldProps = {
+      ...formItemChildProps,
+      ...fieldProps
     };
-    // 表单组件Props 兼容2.0版本
-    var _fieldProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, formItemChildProps), fieldProps);
-    if ((0, _isBoolean2.default)(formDisabled)) {
+    if ((0, import_lodash.isBoolean)(formDisabled)) {
       _fieldProps.disabled = formDisabled;
     }
-    var componentProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({
-      placeholder: placeholderHandle()
-    }, _fieldProps), {}, {
+    const componentProps = {
+      placeholder: placeholderHandle(),
+      ..._fieldProps,
       disabled: comDisabled
-    });
-    // 容器组件，额外处理show的问题
-    if (['ProCollapse', 'Container'].includes(_type)) {
+    };
+    if (["ProCollapse", "Container"].includes(_type)) {
       componentProps.show = show;
       componentProps.clearNotShow = clearNotShow;
       componentProps.diffConfig = diffConfig;
     }
-    // switch与SwitchCheckbox单独添加valuePropName
-    if (['Switch', 'SwitchCheckbox'].includes(_type)) {
-      _formItemProps.valuePropName = 'checked';
+    if (["Switch", "SwitchCheckbox"].includes(_type)) {
+      _formItemProps.valuePropName = "checked";
     }
-    // 时间范围placeholder处理
-    if (['RangePicker'].includes(_type) && !(fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.placeholder)) {
+    if (["RangePicker"].includes(_type) && !(fieldProps == null ? void 0 : fieldProps.placeholder)) {
       delete componentProps.placeholder;
     }
-    // 没有找到对应组件  不渲染
     if (!TargetComponent) {
       return [];
     }
-    var _colProps = span ? {
-      span: span
-    } : (0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultColProps), colProps);
-    // 其余参数收进对象里传给子组件 componentProps只包含子组件参数
-    var otherProps = {
+    const _colProps = span ? { span } : { ...defaultColProps, ...colProps };
+    const otherProps = {
       label: _formItemProps.label,
       name: _formItemProps.name,
       disabled: comDisabled,
       isView: _isView,
-      viewEmpty: viewEmpty,
-      valueType: valueType,
-      viewType: viewType,
+      viewEmpty,
+      valueType,
+      viewType,
       names: _formItemProps.names,
-      form: form,
+      form,
       type: _type,
       hiddenNames: column.hiddenNames,
       colProps: _colProps,
       mode: componentProps.mode,
       namePath: column.namePath,
       listName: column.listName,
-      globalControl: globalControl,
-      formDisabled: formDisabled,
-      diffConfig: diffConfig,
-      desensitizationKey: desensitizationKey
+      globalControl,
+      formDisabled,
+      diffConfig,
+      desensitizationKey
     };
-    return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
-      value: otherProps,
-      children: (0, _jsxRuntime.jsx)(_Render.default, {
-        show: show,
-        form: form,
-        disabled: column.disabled,
-        formDisabled: formDisabled,
-        type: _type,
-        originComponent: component,
-        component: TargetComponent,
-        // @ts-ignore
-        formItemProps: _formItemProps,
-        confirm: confirm,
-        colProps: _colProps,
-        componentProps: componentProps,
-        otherProps: otherProps,
-        fieldProps: (0, _isFunction2.default)(fieldProps) ? fieldProps : null,
-        isSelect: _isSelect,
-        diffConfig: diffConfig,
-        onDiff: onDiff,
-        requiredOnView: requiredOnView,
-        globalControl: globalControl,
-        viewRender: viewRender,
-        desensitization: desensitization
-      })
-    }, "".concat(_formItemProps.name || _formItemProps.label).concat(index));
-  });
-  return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-    children: comList
+    return /* @__PURE__ */ import_react.default.createElement(
+      import_useFieldProps.FieldProvider,
+      {
+        value: otherProps,
+        key: `${_formItemProps.name || _formItemProps.label}${index}`
+      },
+      /* @__PURE__ */ import_react.default.createElement(
+        import_Render.default,
+        {
+          show,
+          form,
+          disabled: column.disabled,
+          formDisabled,
+          type: _type,
+          originComponent: component,
+          component: TargetComponent,
+          formItemProps: _formItemProps,
+          confirm,
+          colProps: _colProps,
+          componentProps,
+          otherProps,
+          fieldProps: (0, import_lodash.isFunction)(fieldProps) ? fieldProps : null,
+          isSelect: _isSelect,
+          diffConfig,
+          onDiff,
+          requiredOnView,
+          globalControl,
+          viewRender,
+          desensitization
+        }
+      )
+    );
   });
+  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, comList);
 };
-var _default = exports.default = RenderFields;
+var RenderFields_default = RenderFields;

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

@@ -16,11 +16,10 @@ import type { Props as SwitchProps } from '../base/Switch';
 import type { Props as SwitchCheckboxProps } from '../base/SwitchCheckbox';
 import type { Props as TextAreaProps } from '../base/TextArea';
 import type { ProCascaderType } from '../combination/ProCascader/propsType';
-import type { ProCombinationType } from '../combination/ProCombination/propsType';
 import type { ProModalSelectType } from '../combination/ProModalSelect/propsType';
 import type { ProNumberRangeType } from '../combination/ProNumberRange/propsType';
 import type { ProLimitProps } from '../combination/ProTimeLimit';
-import type { Props as ProRangeLimitProps } from '../combination/ProRangeLimit';
+import type { ProRangeLimitType } from '../combination/ProRangeLimit/propsType';
 import type { CheckboxPropsMap, ProEnum, PropProSelectsMap, PropRadioPropsMap } from '../../../ProEnum/propsType';
 import type { PropSelectProps as ProSelectProps } from '../../../ProSelect/propsType';
 import type { ProEditTableType } from '../../../ProEditTable/propsType';
@@ -123,9 +122,6 @@ export type ColumnTypeMap<Values = any, T = 'ProForm'> = {
 } | {
     type?: 'ProCascader';
     fieldProps?: FieldType<ProCascaderType, Values, T>;
-} | {
-    type?: 'ProCombination';
-    fieldProps?: FieldType<ProCombinationType, Values, T>;
 } | {
     type?: 'ProModalSelect';
     fieldProps?: FieldType<ProModalSelectType, Values, T>;
@@ -134,7 +130,7 @@ export type ColumnTypeMap<Values = any, T = 'ProForm'> = {
     fieldProps?: FieldType<ProNumberRangeType, Values, T>;
 } | {
     type?: 'ProRangeLimit';
-    fieldProps?: FieldType<ProRangeLimitProps, Values, T>;
+    fieldProps?: FieldType<ProRangeLimitType, Values, T>;
 } | {
     type?: 'ProTimeLimit';
     fieldProps?: FieldType<ProLimitProps, Values, T>;

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

@@ -1,6 +1,17 @@
-"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-var a = {};
+// src/ProForm/components/render/propsType.ts
+var propsType_exports = {};
+module.exports = __toCommonJS(propsType_exports);