@zat-design/sisyphus-react 4.0.0-beta.2 → 4.0.0-beta.4

package/lib/ProForm/components/combination/Group/component/ComRender.js

@@ -1,90 +1,89 @@
-"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/combination/Group/component/ComRender.tsx
+var ComRender_exports = {};
+__export(ComRender_exports, {
+  default: () => ComRender_default
 });
-exports.default = void 0;
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _jsxRuntime = require("react/jsx-runtime");
-var _react = _interopRequireDefault(require("react"));
-var _ConfirmWrapper = _interopRequireDefault(require("../../../../components/render/ConfirmWrapper"));
-var _useFieldProps = require("../../../../utils/useFieldProps");
-var componentMap = _interopRequireWildcard(require("../../../../../index"));
-var _AddonWrapper = _interopRequireDefault(require("./AddonWrapper"));
-var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after", "getValueProps", "valuePropName", "valueType", "isView", "viewRender"];
-// 这里的key与组件内参数一致, 决定使用哪个包裹组件
+module.exports = __toCommonJS(ComRender_exports);
+var import_react = __toESM(require("react"));
+var import_lodash = require("lodash");
+var import_ConfirmWrapper = __toESM(require("../../../../components/render/ConfirmWrapper"));
+var import_useFieldProps = require("../../../../utils/useFieldProps");
+var componentMap = __toESM(require("../../../../../index"));
+var import_AddonWrapper = __toESM(require("./AddonWrapper"));
 var wrapperMap = {
-  confirm: _ConfirmWrapper.default,
-  before: _AddonWrapper.default,
-  after: _AddonWrapper.default
+  confirm: import_ConfirmWrapper.default,
+  before: import_AddonWrapper.default,
+  after: import_AddonWrapper.default
 };
-// 增加middleware根据配置增加多层包裹
-var getComRender = function getComRender(component, props, componentProps) {
-  var wrappers = Object.keys(wrapperMap);
-  var Com = component;
-  wrappers.forEach(function (item) {
+var getComRender = (component, props, componentProps) => {
+  const wrappers = Object.keys(wrapperMap);
+  let renderComponent = component;
+  wrappers.forEach((item) => {
     if (item in props) {
-      var Wrapper = wrapperMap[item];
-      Com = (0, _jsxRuntime.jsx)(Wrapper, (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, componentProps), (0, _defineProperty2.default)({}, item, props[item])), {}, {
-        children: Com
-      }));
+      const Wrapper = wrapperMap[item];
+      renderComponent = /* @__PURE__ */ import_react.default.createElement(Wrapper, { ...componentProps, ...{ [item]: props[item] } }, renderComponent);
     }
   });
-  return Com;
+  return renderComponent;
 };
-/** 渲染组件 */
-var ComRender = function ComRender(props) {
-  var _props$component, _props$component$prop;
-  var type = props.type,
-    confirm = props.confirm,
-    component = props.component,
-    fieldProps = props.fieldProps,
-    contextProps = props.contextProps,
-    before = props.before,
-    after = props.after,
-    getValueProps = props.getValueProps,
-    _props$valuePropName = props.valuePropName,
-    valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
-    valueType = props.valueType,
-    isView = props.isView,
-    viewRender = props.viewRender,
-    rest = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var TypeComponent = componentMap[type];
-  var mergedGetValueProps = getValueProps || function (val) {
-    return (0, _defineProperty2.default)({}, valuePropName, val);
-  };
-  var _props = mergedGetValueProps(fieldProps.value);
-  var componentProps = (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, fieldProps), rest), _props);
-  var isSeparator = (props === null || props === void 0 ? void 0 : (_props$component = props.component) === null || _props$component === void 0 ? void 0 : (_props$component$prop = _props$component.props) === null || _props$component$prop === void 0 ? void 0 : _props$component$prop.className) === 'group-separator';
+var ComRender = (props) => {
+  var _a, _b, _c, _d;
+  const {
+    type,
+    confirm,
+    component,
+    fieldProps,
+    contextProps,
+    before,
+    after,
+    getValueProps,
+    valuePropName = "value",
+    valueType,
+    isView,
+    viewRender,
+    ...rest
+  } = props;
+  const TypeComponent = componentMap[type];
+  const mergedGetValueProps = getValueProps || ((val) => ({ [valuePropName]: val }));
+  const nextProps = mergedGetValueProps(fieldProps.value);
+  const componentProps = (0, import_lodash.omit)({ ...fieldProps, ...rest, ...nextProps }, ["onFieldChange"]);
+  const isSeparator = ((_b = (_a = props == null ? void 0 : props.component) == null ? void 0 : _a.props) == null ? void 0 : _b.className) === "group-separator";
   if (isSeparator && isView) {
-    var _props$component2, _props$component2$pro;
-    return (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-      children: [" ", props === null || props === void 0 ? void 0 : (_props$component2 = props.component) === null || _props$component2 === void 0 ? void 0 : (_props$component2$pro = _props$component2.props) === null || _props$component2$pro === void 0 ? void 0 : _props$component2$pro.children, " "]
-    });
+    return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, " ", (_d = (_c = props == null ? void 0 : props.component) == null ? void 0 : _c.props) == null ? void 0 : _d.children, " ");
   }
   if (viewRender && isView) {
-    return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
-      value: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, contextProps), {}, {
-        valueType: valueType,
-        type: type,
-        isView: isView
-      }),
-      children: viewRender(componentProps)
-    });
+    return /* @__PURE__ */ import_react.default.createElement(import_useFieldProps.FieldProvider, { value: { ...contextProps, valueType, type, isView } }, viewRender(componentProps));
   }
-  var Component = component ? (/*#__PURE__*/_react.default.cloneElement(component, (0, _objectSpread3.default)({}, componentProps))) : (0, _jsxRuntime.jsx)(TypeComponent, (0, _objectSpread3.default)({}, componentProps));
-  var Com = getComRender(Component, props, componentProps);
-  return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
-    value: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, contextProps), {}, {
-      valueType: valueType,
-      type: type,
-      isView: isView
-    }),
-    children: Com
-  });
+  const Component = component ? import_react.default.cloneElement(component, { ...componentProps }) : /* @__PURE__ */ import_react.default.createElement(TypeComponent, { ...componentProps });
+  const renderComponent = getComRender(Component, props, componentProps);
+  return /* @__PURE__ */ import_react.default.createElement(import_useFieldProps.FieldProvider, { value: { ...contextProps, valueType, type, isView } }, renderComponent);
 };
-var _default = exports.default = ComRender;
+var ComRender_default = ComRender;

package/lib/ProForm/components/combination/Group/hooks/index.js

@@ -1,68 +1,76 @@
-"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
+// src/ProForm/components/combination/Group/hooks/index.ts
+var hooks_exports = {};
+__export(hooks_exports, {
+  useTransformColumns: () => useTransformColumns
 });
-exports.useTransformColumns = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _isEqual2 = _interopRequireDefault(require("lodash/isEqual"));
-var _cloneDeep2 = _interopRequireDefault(require("lodash/cloneDeep"));
-var _react = require("react");
-var _useDeepCompareMemo = require("../../../../utils/useDeepCompareMemo");
-var _tools = require("../../../../../ProEditTable/utils/tools");
-var _utils = require("../utils");
-/* eslint-disable no-lonely-if */
-
-/** 转换columns */
-var useTransformColumns = exports.useTransformColumns = function useTransformColumns(params) {
-  var form = params.form,
-    columns = params.columns,
-    name = params.name,
-    names = params.names,
-    outerIndex = params.index,
-    namePath = params.namePath,
-    value = params.value,
-    internalChange = params.onChange,
-    groupProps = params.groupProps,
-    formDisabled = params.formDisabled,
-    desensitizationKey = params.desensitizationKey;
-  var timerRef = (0, _react.useRef)([]);
-  return columns === null || columns === void 0 ? void 0 : columns.flatMap(function (column, index) {
-    var type = column.type,
-      valueType = column.valueType,
-      switchValue = column.switchValue,
-      toISOString = column.toISOString,
-      toCSTString = column.toCSTString,
-      fieldProps = column.fieldProps,
-      normalize = column.normalize,
-      disabled = column.disabled,
-      show = column.show,
-      component = column.component,
-      clearNotShow = column.clearNotShow,
-      desensitization = column.desensitization;
-    var _ref = fieldProps || {},
-      mode = _ref.mode,
-      onChange = _ref.onChange,
-      onFieldChange = _ref.onFieldChange,
-      comDisabled = _ref.disabled,
-      onBlur = _ref.onBlur;
-    var _disabled = disabled || comDisabled;
-    var columnName = names ? names[index] : [].concat(name, index);
-    // 响应式字段改变后的回调
-    var changedCallback = function changedCallback(lastDependency, current) {
-      // 清值防抖  多次刷新时以最后一次为准
+module.exports = __toCommonJS(hooks_exports);
+var import_react = require("react");
+var import_lodash = require("lodash");
+var import_useDeepCompareMemo = require("../../../../utils/useDeepCompareMemo");
+var import_tools = require("../../../../../ProEditTable/utils/tools");
+var import_utils = require("../utils");
+var useTransformColumns = (params) => {
+  const {
+    form,
+    columns,
+    name,
+    names,
+    index: outerIndex,
+    namePath,
+    value,
+    onChange: internalChange,
+    groupProps,
+    formDisabled,
+    desensitizationKey
+  } = params;
+  const timerRef = (0, import_react.useRef)([]);
+  return columns == null ? void 0 : columns.flatMap((column, index) => {
+    const {
+      type,
+      valueType,
+      switchValue,
+      toISOString,
+      toCSTString,
+      fieldProps,
+      normalize,
+      disabled,
+      show,
+      component,
+      clearNotShow,
+      desensitization
+    } = column;
+    const { mode, onChange, disabled: comDisabled } = fieldProps || {};
+    const _disabled = disabled || comDisabled;
+    const columnName = names ? names[index] : [].concat(name, index);
+    const changedCallback = (lastDependency, current) => {
       if (clearNotShow !== false && names) {
-        if ((current === null || current === void 0 ? void 0 : current.show) === false) {
+        if ((current == null ? void 0 : current.show) === false) {
           clearInterval(timerRef.current[index]);
-          timerRef.current[index] = setTimeout(function () {
+          timerRef.current[index] = setTimeout(() => {
             if (names) {
               form.resetFields([columnName]);
             }
-            if (!names && (value === null || value === void 0 ? void 0 : value.length)) {
+            if (!names && (value == null ? void 0 : value.length)) {
               value[index] = null;
-              form.setFieldValue(columnName, (0, _toConsumableArray2.default)(value));
+              form.setFieldValue(columnName, [...value]);
             }
           }, 200);
         } else {
@@ -70,101 +78,105 @@ var useTransformColumns = exports.useTransformColumns = function useTransformCol
         }
       }
     };
-    // 响应式字段
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    var reactiveProps = (0, _useDeepCompareMemo.useDeepCompareMemo)(function () {
-      return (0, _utils.getReactiveProps)({
-        form: form,
-        index: index,
-        type: type,
-        namePath: namePath,
-        disabled: _disabled,
-        show: show,
-        component: component,
-        fieldProps: fieldProps,
-        name: columnName,
-        desensitization: desensitization
-      });
-    }, changedCallback, [value, show, fieldProps, _disabled, columnName, type]);
+    const reactiveProps = (0, import_useDeepCompareMemo.useDeepCompareMemo)(
+      () => {
+        return (0, import_utils.getReactiveProps)({
+          form,
+          index,
+          type,
+          namePath,
+          disabled: _disabled,
+          show,
+          component,
+          fieldProps,
+          name: columnName,
+          desensitization
+        });
+      },
+      changedCallback,
+      [value, show, fieldProps, _disabled, columnName, type]
+    );
+    const { onFieldChange, onBlur } = reactiveProps.fieldProps || {};
     if (reactiveProps.show === false) {
       return [];
     }
-    var transform = (0, _utils.getValueTypeTrans)({
-      type: type,
-      valueType: valueType,
-      switchValue: switchValue,
-      toISOString: toISOString,
-      toCSTString: toCSTString,
-      mode: mode
+    const transform = (0, import_utils.getValueTypeTrans)({
+      type,
+      valueType,
+      switchValue,
+      toISOString,
+      toCSTString,
+      mode
     });
-    var newValue;
-    var handleChange = function handleChange() {
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
-      }
-      newValue = (0, _utils.valueFromEventWrapper)(column, args);
-      if (transform === null || transform === void 0 ? void 0 : transform.normalize) {
-        var _transform$normalize;
-        newValue = transform === null || transform === void 0 ? void 0 : (_transform$normalize = transform.normalize) === null || _transform$normalize === void 0 ? void 0 : _transform$normalize.call(transform, newValue);
+    let newValue;
+    const handleChange = (...args) => {
+      var _a, _b, _c;
+      newValue = (0, import_utils.valueFromEventWrapper)(column, args);
+      if (transform == null ? void 0 : transform.normalize) {
+        newValue = (_a = transform == null ? void 0 : transform.normalize) == null ? void 0 : _a.call(transform, newValue);
       } else if (normalize) {
-        // @ts-ignore
-        newValue = normalize === null || normalize === void 0 ? void 0 : normalize(newValue);
+        newValue = normalize == null ? void 0 : normalize(newValue);
+      }
+      if (names) {
+        form.setFieldValue(columnName, newValue);
+        internalChange == null ? void 0 : internalChange(newValue, args[1], index);
+      } else {
+        internalChange == null ? void 0 : internalChange(newValue, args[1], index);
       }
-      internalChange === null || internalChange === void 0 ? void 0 : internalChange(newValue, args[1], index);
-      var values = form.getFieldValue(namePath);
-      var originRow = (namePath === null || namePath === void 0 ? void 0 : namePath.length) ? (0, _cloneDeep2.default)(values) : undefined;
-      onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, args);
-      onFieldChange === null || onFieldChange === void 0 ? void 0 : onFieldChange(newValue, values, {
+      const values = form.getFieldValue(namePath);
+      const originRow = (namePath == null ? void 0 : namePath.length) ? (0, import_lodash.cloneDeep)(values) : void 0;
+      onChange == null ? void 0 : onChange(...args);
+      onFieldChange == null ? void 0 : onFieldChange(newValue, values, {
         index: outerIndex,
-        namePath: namePath,
-        form: form,
-        option: args === null || args === void 0 ? void 0 : args[1]
+        namePath,
+        form,
+        option: args == null ? void 0 : args[1]
       });
-      // 如果是在可编辑表格或formList内部, 储存当前行的值, 并在变更后更新到表单里
-      if ((namePath === null || namePath === void 0 ? void 0 : namePath.length) && !(0, _isEqual2.default)(originRow, values)) {
-        var _Object$keys, _Object$keys$map;
+      if ((namePath == null ? void 0 : namePath.length) && !(0, import_lodash.isEqual)(originRow, values)) {
         form.setFieldValue(namePath, values);
-        var diff = (0, _tools.difference)(originRow, values) || {};
-        var validateFieldKeys = (_Object$keys = Object.keys(diff)) === null || _Object$keys === void 0 ? void 0 : (_Object$keys$map = _Object$keys.map) === null || _Object$keys$map === void 0 ? void 0 : _Object$keys$map.call(_Object$keys, function (key) {
-          return [].concat((0, _toConsumableArray2.default)(namePath), [key]);
-        });
-        if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
-          setTimeout(function () {
-            form.validateFields([name].concat((0, _toConsumableArray2.default)(validateFieldKeys)));
+        const diff = (0, import_tools.difference)(originRow, values) || {};
+        const validateFieldKeys = (_c = (_b = Object.keys(diff)) == null ? void 0 : _b.map) == null ? void 0 : _c.call(_b, (key) => [...namePath, key]);
+        if (validateFieldKeys == null ? void 0 : validateFieldKeys.length) {
+          setTimeout(() => {
+            form.validateFields([name, ...validateFieldKeys]);
           }, 100);
         }
       }
     };
-    var handleBlur = function handleBlur() {
-      if (!onBlur) return;
-      var values = form.getFieldValue(namePath);
-      for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-        args[_key2] = arguments[_key2];
-      }
-      onBlur === null || onBlur === void 0 ? void 0 : onBlur(args[0], values, {
+    const handleBlur = (...args) => {
+      if (!onBlur)
+        return;
+      const values = form.getFieldValue(namePath);
+      onBlur == null ? void 0 : onBlur(args[0], values, {
         index: outerIndex,
-        namePath: namePath,
-        form: form,
-        option: args === null || args === void 0 ? void 0 : args[1]
+        namePath,
+        form,
+        option: args == null ? void 0 : args[1]
       });
     };
-    // 内外一个为true则为true
-    var getLastDisabled = function getLastDisabled() {
+    const getLastDisabled = () => {
       if (Array.isArray(groupProps.disabled)) {
         return reactiveProps.disabled || groupProps.disabled[index];
       }
       return reactiveProps.disabled || groupProps.disabled;
     };
-    return (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, column), {}, {
-      name: columnName
-    }, reactiveProps), {}, {
+    return {
+      ...column,
+      name: columnName,
+      ...reactiveProps,
       disabled: getLastDisabled(),
-      getValueProps: transform === null || transform === void 0 ? void 0 : transform.getValueProps,
-      fieldProps: (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, column === null || column === void 0 ? void 0 : column.fieldProps), reactiveProps === null || reactiveProps === void 0 ? void 0 : reactiveProps.fieldProps), {}, {
+      getValueProps: transform == null ? void 0 : transform.getValueProps,
+      fieldProps: {
+        ...column == null ? void 0 : column.fieldProps,
+        ...reactiveProps == null ? void 0 : reactiveProps.fieldProps,
         onChange: handleChange,
         onBlur: handleBlur,
-        value: value === null || value === void 0 ? void 0 : value[index]
-      })
-    });
+        value: value == null ? void 0 : value[index]
+      }
+    };
   });
-};
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  useTransformColumns
+});

package/lib/ProForm/components/combination/Group/index.d.ts

@@ -1,4 +1,10 @@
 import React from 'react';
 import type { GroupType } from './propsType';
-declare const _default: React.NamedExoticComponent<GroupType>;
-export default _default;
+/**
+ * 1. 外层过滤FormItem相关属性, 但是子元素上的 required [disabled] [show] rules [fieldProps] [component] 需要取到并
+ * 2.
+ *
+ * render内部能力 show, component, value, onChange, disabled, clearNotShow, fieldProps
+ */
+declare const Group: React.FC<GroupType>;
+export default Group;