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

package/lib/ProForm/components/combination/FormList/index.js

@@ -1,186 +1,153 @@
-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);
+"use strict";
 
-// src/ProForm/components/combination/FormList/index.tsx
-var FormList_exports = {};
-__export(FormList_exports, {
-  default: () => FormList_default
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(FormList_exports);
-var import_react = __toESM(require("react"));
-var import_antd = require("antd");
-var import_core = require("@dnd-kit/core");
-var import_lodash = require("lodash");
-var import_sortable = require("@dnd-kit/sortable");
-var import_utils = require("../../../utils");
-var import_utils2 = require("./utils");
-var import_ToolbarButton = __toESM(require("./components/ToolbarButton"));
-var import_BlockFields = __toESM(require("./components/BlockFields"));
-var import_LineFields = __toESM(require("./components/LineFields"));
-var import_Empty = __toESM(require("./components/Empty"));
-var import_ProForm = __toESM(require("../../../../ProForm"));
-var import_ProConfigProvider = require("../../../../ProConfigProvider");
+exports.default = void 0;
+require("antd/es/form/style");
+var _form = _interopRequireDefault(require("antd/es/form"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _react = _interopRequireWildcard(require("react"));
+var _core = require("@dnd-kit/core");
+var _lodash = require("lodash");
+var _sortable = require("@dnd-kit/sortable");
+var _utils = require("../../../utils");
+var _utils2 = require("./utils");
+var _ToolbarButton = _interopRequireDefault(require("./components/ToolbarButton"));
+var _BlockFields = _interopRequireDefault(require("./components/BlockFields"));
+var _LineFields = _interopRequireDefault(require("./components/LineFields"));
+var _Empty = _interopRequireDefault(require("./components/Empty"));
+var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
+var _ProConfigProvider = require("../../../../ProConfigProvider");
+var _jsxRuntime = require("react/jsx-runtime");
 var FormList = (props, ref) => {
-  const {
-    columns,
-    min,
-    max,
-    toolbarProps,
-    fields,
-    operation,
-    mode = "line",
-    meta,
-    span = 8,
-    disabled,
-    emptyBtnText
-  } = props;
-  const _fields = fields.map((item) => ({ ...item, key: String(item.key) }));
-  const { form, name, isView, diffConfig } = import_ProForm.default.useFieldProps() || {};
-  const { isDiffAll } = (0, import_ProConfigProvider.useProConfig)("ProForm");
-  const { errors } = meta;
-  const _namePath = (0, import_utils.toArray)(name);
-  const orgValues = (0, import_lodash.get)(diffConfig == null ? void 0 : diffConfig.originalValues, name);
-  const _diffConfig = {
-    ...diffConfig,
-    originalValues: (diffConfig == null ? void 0 : diffConfig.originalValues) && isDiffAll ? orgValues || [] : orgValues
-  };
-  const processColumns = (0, import_react.useCallback)(
-    (fieldName, namePath) => {
-      return columns.map((item) => {
-        const _name = Array.isArray(item == null ? void 0 : item.names) ? [
-          fieldName,
-          (0, import_utils2.namesPathTransform)({
-            names: item == null ? void 0 : item.names,
-            prefixNamePath: namePath,
-            type: item.type
-          })
-        ] : [fieldName, ...(0, import_utils.toArray)(item.name)];
-        const column = {
-          ...item,
-          name: _name,
-          names: (item == null ? void 0 : item.names) ? item.names.map((nameItem) => {
-            return [...namePath, ...(0, import_utils.toArray)(nameItem)];
-          }) : item.names,
-          index: fieldName,
-          namePath,
-          listName: [...namePath, item.name],
-          label: mode === "less" ? void 0 : item.label
-        };
-        return column;
+  var columns = props.columns,
+    min = props.min,
+    max = props.max,
+    toolbarProps = props.toolbarProps,
+    fields = props.fields,
+    operation = props.operation,
+    _props$mode = props.mode,
+    mode = _props$mode === void 0 ? 'line' : _props$mode,
+    meta = props.meta,
+    _props$span = props.span,
+    span = _props$span === void 0 ? 8 : _props$span,
+    disabled = props.disabled,
+    emptyBtnText = props.emptyBtnText;
+  var _fields = fields.map(item => (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
+    key: String(item.key)
+  }));
+  var _ref = _ProForm.default.useFieldProps() || {},
+    form = _ref.form,
+    name = _ref.name,
+    isView = _ref.isView,
+    diffConfig = _ref.diffConfig;
+  var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProForm'),
+    isDiffAll = _useProConfig.isDiffAll;
+  var errors = meta.errors;
+  var _namePath = (0, _utils.toArray)(name);
+  var orgValues = (0, _lodash.get)(diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalValues, name);
+  var _diffConfig = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, diffConfig), {}, {
+    originalValues: diffConfig !== null && diffConfig !== void 0 && diffConfig.originalValues && isDiffAll ? orgValues || [] : orgValues
+  });
+  var processColumns = (0, _react.useCallback)((fieldName, namePath) => {
+    return columns.map(item => {
+      // names的name处理
+      var _name = Array.isArray(item === null || item === void 0 ? void 0 : item.names) ? [fieldName, (0, _utils2.namesPathTransform)({
+        names: item === null || item === void 0 ? void 0 : item.names,
+        prefixNamePath: namePath,
+        type: item.type
+      })] : [fieldName, ...(0, _utils.toArray)(item.name)];
+      var column = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
+        name: _name,
+        names: item !== null && item !== void 0 && item.names ? item.names.map(nameItem => {
+          // 传给Group的names会被渲染成真实FormItem 不能传完整name
+          return [...namePath, ...(0, _utils.toArray)(nameItem)];
+        }) : item.names,
+        index: fieldName,
+        namePath,
+        listName: [...namePath, item.name],
+        label: mode === 'less' ? undefined : item.label
       });
-    },
-    [columns]
-  );
-  (0, import_react.useImperativeHandle)(ref, () => {
+      return column;
+    });
+  }, [columns]);
+  (0, _react.useImperativeHandle)(ref, () => {
     return {
       operation
     };
   });
-  const handleDragEnd = (drag) => {
-    const { active, over } = drag;
+  var handleDragEnd = drag => {
+    var active = drag.active,
+      over = drag.over;
     if (_fields.length > 1 && active.id !== over.id) {
-      const activeIndex = _fields.findIndex((item) => item.key === active.id);
-      const overIndex = _fields.findIndex((item) => item.key === over.id);
+      var activeIndex = _fields.findIndex(item => item.key === active.id);
+      var overIndex = _fields.findIndex(item => item.key === over.id);
       props.operation.move(activeIndex, overIndex);
     }
   };
-  return /* @__PURE__ */ import_react.default.createElement(import_core.DndContext, { onDragEnd: handleDragEnd }, /* @__PURE__ */ import_react.default.createElement(
-    import_sortable.SortableContext,
-    {
-      items: _fields.map((item) => ({
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_core.DndContext, {
+    onDragEnd: handleDragEnd,
+    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_sortable.SortableContext, {
+      items: _fields.map(item => ({
         id: item.key
       })),
-      strategy: import_sortable.verticalListSortingStrategy
-    },
-    _fields.map((field, index) => {
-      const namePath = [..._namePath, field.name];
-      const _columns = processColumns(index, namePath);
-      return mode === "block" ? /* @__PURE__ */ import_react.default.createElement(
-        import_BlockFields.default,
-        {
-          key: field.key,
-          ...props,
+      strategy: _sortable.verticalListSortingStrategy,
+      children: [_fields.map((field, index) => {
+        var namePath = [..._namePath, field.name];
+        var _columns = processColumns(index, namePath);
+        return mode === 'block' ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_BlockFields.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
           columns: _columns,
-          disabled,
-          isView,
-          namePath,
-          index,
-          field,
-          colProps: { span },
-          form,
+          disabled: disabled,
+          isView: isView,
+          namePath: namePath,
+          index: index,
+          field: field,
+          colProps: {
+            span
+          },
+          form: form,
           diffConfig: _diffConfig
-        }
-      ) : /* @__PURE__ */ import_react.default.createElement(
-        import_LineFields.default,
-        {
-          className: _fields.length === index + 1 ? "pro-form-list-last" : "",
-          key: field.key,
-          ...props,
-          mode,
+        }), field.key) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_LineFields.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+          className: _fields.length === index + 1 ? 'pro-form-list-last' : ''
+        }, props), {}, {
+          mode: mode,
           columns: _columns,
-          disabled,
-          isView,
-          namePath,
-          index,
-          field,
-          colProps: { span: mode === "less" ? 24 : span },
-          form,
+          disabled: disabled,
+          isView: isView,
+          namePath: namePath,
+          index: index,
+          field: field,
+          colProps: {
+            span: mode === 'less' ? 24 : span
+          },
+          form: form,
           diffConfig: _diffConfig
-        }
-      );
-    }),
-    _fields.length === 0 && /* @__PURE__ */ import_react.default.createElement(
-      import_Empty.default,
-      {
-        disabled,
-        toolbarProps,
-        operation,
-        form,
+        }), field.key);
+      }), _fields.length === 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Empty.default, {
+        disabled: disabled,
+        toolbarProps: toolbarProps,
+        operation: operation,
+        form: form,
         namePath: _namePath,
-        emptyBtnText
-      }
-    ),
-    /* @__PURE__ */ import_react.default.createElement(import_antd.Form.ErrorList, { errors }),
-    toolbarProps !== false && _fields.length > 0 && /* @__PURE__ */ import_react.default.createElement(
-      import_ToolbarButton.default,
-      {
-        disabled,
-        isView,
-        min,
-        max,
+        emptyBtnText: emptyBtnText
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_form.default.ErrorList, {
+        errors: errors
+      }), toolbarProps !== false && _fields.length > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_ToolbarButton.default, {
+        disabled: disabled,
+        isView: isView,
+        min: min,
+        max: max,
         length: fields.length,
-        operation,
+        operation: operation,
         namePath: _namePath,
-        form,
-        fields,
-        toolbarProps
-      }
-    )
-  ));
+        form: form,
+        fields: fields,
+        toolbarProps: toolbarProps
+      })]
+    })
+  });
 };
-var FormList_default = (0, import_react.forwardRef)(FormList);
+var _default = exports.default = /*#__PURE__*/(0, _react.forwardRef)(FormList);

package/lib/ProForm/components/combination/FormList/propsType.js

@@ -1,17 +1,5 @@
-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);
+"use strict";
 
-// src/ProForm/components/combination/FormList/propsType.ts
-var propsType_exports = {};
-module.exports = __toCommonJS(propsType_exports);
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/lib/ProForm/components/combination/FormList/utils.js

@@ -1,62 +1,42 @@
-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);
+"use strict";
 
-// src/ProForm/components/combination/FormList/utils.ts
-var utils_exports = {};
-__export(utils_exports, {
-  memoWith: () => memoWith,
-  namesPathTransform: () => namesPathTransform
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(utils_exports);
-var import_lodash = require("lodash");
-var import_react = __toESM(require("react"));
-var namesPathTransform = ({
-  names,
-  prefixNamePath,
-  type
-}) => {
+exports.namesPathTransform = exports.memoWith = void 0;
+var _lodash = require("lodash");
+var _react = _interopRequireDefault(require("react"));
+/**
+ * namesPath生产 [['list', 0, 'min'], ['list', 0, 'max']] => list_0_min-list_0_max
+ * @param names  name的集合
+ * @param prefixNamePath formList的name前缀
+ * @returns list_0_min-list_0_max
+ */
+var namesPathTransform = _ref => {
+  var names = _ref.names,
+    prefixNamePath = _ref.prefixNamePath,
+    type = _ref.type;
   if (!Array.isArray(names) || !Array.isArray(prefixNamePath)) {
-    return "";
+    return '';
   }
-  const newNamePath = names.map((val) => prefixNamePath.concat(val));
-  return newNamePath == null ? void 0 : newNamePath.map((name) => {
-    return Array.isArray(name) ? name.join("_") : name;
-  }).join("-");
+  var newNamePath = names.map(val => prefixNamePath.concat(val));
+  return newNamePath === null || newNamePath === void 0 ? void 0 : newNamePath.map(name => {
+    return Array.isArray(name) ? name.join('_') : name;
+  }).join('-');
 };
+
+// 比较memo
+exports.namesPathTransform = namesPathTransform;
 var memoWith = (pre, next) => {
-  return (0, import_lodash.isEqualWith)(pre, next, (objValue, othValue) => {
-    if (import_react.default.isValidElement(objValue) && import_react.default.isValidElement(othValue)) {
+  return (0, _lodash.isEqualWith)(pre, next, (objValue, othValue) => {
+    if ( /*#__PURE__*/_react.default.isValidElement(objValue) && /*#__PURE__*/_react.default.isValidElement(othValue)) {
       return true;
     }
+    // 移除解决formlist函数里不更新问题
+    // if (isFunction(objValue) && isFunction(othValue)) {
+    //   return true;
+    // }
   });
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  memoWith,
-  namesPathTransform
-});
+exports.memoWith = memoWith;

package/lib/ProForm/components/combination/Group/component/AddonWrapper/index.js

@@ -1,41 +1,26 @@
-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);
+"use strict";
 
-// src/ProForm/components/combination/Group/component/AddonWrapper/index.tsx
-var AddonWrapper_exports = {};
-__export(AddonWrapper_exports, {
-  default: () => AddonWrapper_default
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(AddonWrapper_exports);
-var import_react = __toESM(require("react"));
-var import_index = require("./index.less");
-var AddonWrapper = (props) => {
-  const { before, after, children } = props;
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "addon-wrapper" }, before && /* @__PURE__ */ import_react.default.createElement("div", { className: "before" }, before), children, after && /* @__PURE__ */ import_react.default.createElement("div", { className: "after" }, after));
+exports.default = void 0;
+var _react = _interopRequireDefault(require("react"));
+require("./index.less");
+var _jsxRuntime = require("react/jsx-runtime");
+var AddonWrapper = props => {
+  var before = props.before,
+    after = props.after,
+    children = props.children;
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+    className: "addon-wrapper",
+    children: [before && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      className: "before",
+      children: before
+    }), children, after && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      className: "after",
+      children: after
+    })]
+  });
 };
-var AddonWrapper_default = AddonWrapper;
+var _default = exports.default = AddonWrapper;