@zat-design/sisyphus-react 4.0.0-beta.3 → 4.0.0-beta.5

package/lib/ProEditTable/propsType.d.ts

@@ -7,7 +7,7 @@ import type { NamePath } from 'antd/es/form/interface';
 import type { ColumnType, TableProps } from 'antd/es/table';
 import type { FormInstance, FormItemProps } from 'antd/es/form';
 import type { ProFormValueType, FunctionArgs, ProRule } from '../ProForm/components/render/propsType';
-import type { DiffOriginalParams } from '../ProForm/utils/diffOriginal';
+import type { DiffOriginalParams } from './utils/diffOriginal';
 /**
  * 操作类型定义
  */

package/lib/ProEditTable/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/ProEditTable/propsType.ts
-var propsType_exports = {};
-module.exports = __toCommonJS(propsType_exports);
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/lib/ProEditTable/style/index.less

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-edit-table {
   td[rowspan]{
@@ -81,7 +79,7 @@
     }
   }
 
-  .drag-wrapper {
+  .pro-edit-table-drag-wrapper {
     display: flex;
     justify-content: flex-end;
     .anticon {
@@ -90,7 +88,7 @@
       cursor: pointer;
     }
   }
-  .drag-wrapper.no-check {
+  .pro-edit-table-drag-wrapper.no-check {
     .anticon {
       margin-right: 0;
     }

package/lib/ProEditTable/utils/config.js

@@ -1,225 +1,280 @@
-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/ProEditTable/utils/config.tsx
-var config_exports = {};
-__export(config_exports, {
-  actions: () => actions,
-  defaultBtnNameMap: () => defaultBtnNameMap,
-  defaultEditingActionKeys: () => defaultEditingActionKeys,
-  defaultMultipleActionKeys: () => defaultMultipleActionKeys,
-  defaultSingleActionKeys: () => defaultSingleActionKeys,
-  defaultToolbarKeys: () => defaultToolbarKeys,
-  iconMap: () => iconMap
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(config_exports);
-var import_icons = require("@ant-design/icons");
-var import_utils = require("@zat-design/utils");
-var import_antd = require("antd");
-var import_lodash = require("lodash");
-var import_tools = require("./tools");
-var import_locale = __toESM(require("../../locale"));
-var defaultBtnNameMap = {
-  add: import_locale.default.ProEditTable.add,
-  edit: import_locale.default.ProEditTable.edit,
-  copy: import_locale.default.ProEditTable.copy,
-  delete: import_locale.default.ProEditTable.delete,
-  mulDelete: import_locale.default.ProEditTable.mulDelete,
-  save: import_locale.default.ProEditTable.save,
-  cancel: import_locale.default.ProEditTable.cancel,
-  custom: import_locale.default.ProEditTable.custom
+exports.iconMap = exports.defaultToolbarKeys = exports.defaultSingleActionKeys = exports.defaultMultipleActionKeys = exports.defaultEditingActionKeys = exports.defaultBtnNameMap = exports.actions = void 0;
+var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+require("antd/es/message/style");
+var _message2 = _interopRequireDefault(require("antd/es/message"));
+var _icons = require("@ant-design/icons");
+var _utils = require("@zat-design/utils");
+var _lodash = require("lodash");
+var _tools = require("./tools");
+var _locale = _interopRequireDefault(require("../../locale"));
+var _jsxRuntime = require("react/jsx-runtime");
+var defaultBtnNameMap = exports.defaultBtnNameMap = {
+  add: _locale.default.ProEditTable.add,
+  edit: _locale.default.ProEditTable.edit,
+  copy: _locale.default.ProEditTable.copy,
+  delete: _locale.default.ProEditTable.delete,
+  mulDelete: _locale.default.ProEditTable.mulDelete,
+  save: _locale.default.ProEditTable.save,
+  cancel: _locale.default.ProEditTable.cancel,
+  custom: _locale.default.ProEditTable.custom
 };
-var iconMap = {
-  add: /* @__PURE__ */ React.createElement(import_icons.PlusOutlined, null)
+
+// 默认按钮配置
+var iconMap = exports.iconMap = {
+  add: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.PlusOutlined, {})
 };
-var defaultSingleActionKeys = ["edit", "delete", "save", "cancel"];
-var defaultMultipleActionKeys = ["delete"];
-var defaultEditingActionKeys = ["save", "cancel"];
-var defaultToolbarKeys = ["add", "mulDelete"];
-var actions = {
-  edit: ({
-    record,
-    editingKeys,
-    setState,
-    form,
-    virtualRowName,
-    virtualKey,
-    onlyOneLineMsg
-  }) => {
+
+// 单行编辑 操作栏默认配置按钮
+var defaultSingleActionKeys = exports.defaultSingleActionKeys = ['edit', 'delete', 'save', 'cancel'];
+// 多行编辑 操作栏默认配置按钮
+var defaultMultipleActionKeys = exports.defaultMultipleActionKeys = ['delete'];
+// 编辑状态下只显示保存、取消按钮
+var defaultEditingActionKeys = exports.defaultEditingActionKeys = ['save', 'cancel'];
+// 工具栏默认配置按钮
+var defaultToolbarKeys = exports.defaultToolbarKeys = ['add', 'mulDelete'];
+
+// 操作枚举
+var actions = exports.actions = {
+  edit: _ref => {
+    var record = _ref.record,
+      editingKeys = _ref.editingKeys,
+      setState = _ref.setState,
+      form = _ref.form,
+      virtualRowName = _ref.virtualRowName,
+      virtualKey = _ref.virtualKey,
+      onlyOneLineMsg = _ref.onlyOneLineMsg;
+    // 单行编辑时，需要先保存，才能进行下面的编辑
     if (virtualKey && editingKeys.length >= 1) {
-      import_antd.message.warning(onlyOneLineMsg);
+      _message2.default.warning(onlyOneLineMsg);
       return false;
     }
-    const nextEditingKeys = [...editingKeys];
+    var nextEditingKeys = [...editingKeys];
+    // 开启编辑状态
     nextEditingKeys.push(record.rowKey);
-    if (nextEditingKeys == null ? void 0 : nextEditingKeys.length) {
+    // 编辑时赋值编辑状态，供validator做保存校验
+    if (nextEditingKeys !== null && nextEditingKeys !== void 0 && nextEditingKeys.length) {
       record._isEditing = true;
     } else {
       delete record._isEditing;
     }
-    form.setFieldValue(virtualRowName, { ...record });
+    // 复制当前行数据
+    form.setFieldValue(virtualRowName, (0, _objectSpread2.default)({}, record));
     setState({
       editingKeys: nextEditingKeys
     });
   },
-  save: async ({ record, editingKeys, setState, form, rowName, virtualRowName, result }) => {
-    const updateData = typeof result === "object" ? result : {};
-    record = { ...record, ...form.getFieldValue(virtualRowName), ...updateData };
-    delete record._addFlag;
-    const nextEditingKeys = editingKeys.filter((key) => key !== record.rowKey);
-    if (nextEditingKeys == null ? void 0 : nextEditingKeys.length) {
-      record._isEditing = true;
-    } else {
-      delete record._isEditing;
+  save: function () {
+    var _save = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(_ref2) {
+      var record, editingKeys, setState, form, rowName, virtualRowName, result, updateData, nextEditingKeys, values;
+      return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            record = _ref2.record, editingKeys = _ref2.editingKeys, setState = _ref2.setState, form = _ref2.form, rowName = _ref2.rowName, virtualRowName = _ref2.virtualRowName, result = _ref2.result;
+            // 保存返回数据与当前行内数据做合并
+            updateData = typeof result === 'object' ? result : {};
+            record = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, record), form.getFieldValue(virtualRowName)), updateData);
+            delete record._addFlag; // 删除第一次新增的标记
+            // 关闭当前保存行的编辑状态
+            nextEditingKeys = editingKeys.filter(key => key !== record.rowKey); // 保存后取消编辑状态，供validator做保存校验
+            if (nextEditingKeys !== null && nextEditingKeys !== void 0 && nextEditingKeys.length) {
+              record._isEditing = true;
+            } else {
+              delete record._isEditing;
+            }
+            // 防止value引用不变, 值不更新 - (自定义组件)
+            values = form.getFieldsValue();
+            (0, _lodash.set)(values, rowName, record);
+            form.setFieldsValue(values);
+            setState({
+              editingKeys: nextEditingKeys
+            });
+          case 10:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    function save(_x) {
+      return _save.apply(this, arguments);
     }
-    const values = form.getFieldsValue();
-    (0, import_lodash.set)(values, rowName, record);
-    form.setFieldsValue(values);
-    setState({ editingKeys: nextEditingKeys });
-  },
-  cancel: ({ name, record, editingKeys, setState, form, virtualRowName, virtualKey }) => {
-    const nextEditingKeys = editingKeys.filter((key) => key !== record.rowKey);
-    if (nextEditingKeys == null ? void 0 : nextEditingKeys.length) {
+    return save;
+  }(),
+  cancel: _ref3 => {
+    var name = _ref3.name,
+      record = _ref3.record,
+      editingKeys = _ref3.editingKeys,
+      setState = _ref3.setState,
+      form = _ref3.form,
+      virtualRowName = _ref3.virtualRowName,
+      virtualKey = _ref3.virtualKey;
+    var nextEditingKeys = editingKeys.filter(key => key !== record.rowKey);
+    // 保存后取消编辑状态，供validator做保存校验
+    if (nextEditingKeys !== null && nextEditingKeys !== void 0 && nextEditingKeys.length) {
       record._isEditing = true;
     } else {
       delete record._isEditing;
     }
-    setState({ editingKeys: nextEditingKeys });
+    setState({
+      editingKeys: nextEditingKeys
+    }); // 关闭编辑状态
+    // 取消分两种，一编辑取消，二添加取消
     if (record._addFlag) {
-      (0, import_tools.onDelete)({
+      (0, _tools.onDelete)({
         name,
         form,
         virtualKey,
         selectedRowKeys: [record.rowKey]
       });
     } else {
-      const values = form.getFieldsValue();
-      (0, import_lodash.set)(values, virtualRowName, record);
+      // 防止value引用不变, 值不更新 - (自定义组件)
+      var values = form.getFieldsValue();
+      (0, _lodash.set)(values, virtualRowName, record);
       form.setFieldsValue(values);
     }
   },
-  delete: ({ name, record, editingKeys, setState, form, virtualKey, onlyOneLineMsg }) => {
+  delete: _ref4 => {
+    var name = _ref4.name,
+      record = _ref4.record,
+      editingKeys = _ref4.editingKeys,
+      setState = _ref4.setState,
+      form = _ref4.form,
+      virtualKey = _ref4.virtualKey,
+      onlyOneLineMsg = _ref4.onlyOneLineMsg;
+    // 单行编辑时，需要先保存，才能进行下面的编辑
     if (virtualKey && editingKeys.length >= 1) {
-      import_antd.message.warning(onlyOneLineMsg);
+      _message2.default.warning(onlyOneLineMsg);
       return false;
     }
-    (0, import_tools.onDelete)({
+    // 删除当前行数据
+    (0, _tools.onDelete)({
       name,
       form,
       virtualKey,
       selectedRowKeys: [record.rowKey]
     });
     if (virtualKey) {
-      const nextEditingKeys = editingKeys.filter((key) => key === record.rowKey);
-      setState({ editingKeys: nextEditingKeys });
+      // 关闭编辑状态
+      var nextEditingKeys = editingKeys.filter(key => key === record.rowKey);
+      setState({
+        editingKeys: nextEditingKeys
+      });
     }
   },
-  add: async ({
-    result,
-    insertType,
-    editingKeys,
-    setState,
-    form,
-    name,
-    virtualName,
-    virtualKey,
-    onlyOneLineMsg,
-    tableRef,
-    prefixCls = "ant",
-    page,
-    handlePageChange
-  }) => {
-    var _a, _b, _c, _d;
-    const nextData = [...form.getFieldValue(name) || []];
-    if (virtualKey && editingKeys.length >= 1) {
-      import_antd.message.warning(onlyOneLineMsg);
-      return false;
-    }
-    const rowKey = (0, import_tools.getRandom)();
-    const addData = {
-      ...typeof result === "object" ? result : {},
-      rowKey
-    };
-    if (virtualKey) {
-      addData._addFlag = true;
-      addData._isEditing = true;
-    }
-    if (insertType === "before") {
-      nextData.unshift(addData);
-      setTimeout(async () => {
-        handlePageChange(1, page.pageSize);
-      }, 0);
-    } else {
-      nextData.push(addData);
-      const nextPageNum = Math.ceil(import_utils.tools.calc(nextData.length, "/", page.pageSize));
-      setTimeout(async () => {
-        handlePageChange(nextPageNum, page.pageSize);
-      }, 0);
-    }
-    if (virtualKey) {
-      const nextEditingKeys = [...editingKeys];
-      nextEditingKeys.push(rowKey);
-      form.setFieldValue(virtualName, nextData);
-      setState({ editingKeys: nextEditingKeys });
-    }
-    form.setFieldValue(name, nextData);
-    (_d = (_c = (_b = (_a = tableRef.current) == null ? void 0 : _a.children[0]) == null ? void 0 : _b.querySelector(`.${prefixCls}-table-body`)) == null ? void 0 : _c.scrollTo) == null ? void 0 : _d.call(_c, {
-      top: insertType === "before" ? -1e4 : 1e4,
-      behavior: "smooth"
-    });
-    if (virtualKey) {
-      await form.validateFields([name]);
+  add: function () {
+    var _add = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4(_ref5) {
+      var _tableRef$current, _tableRef$current$scr;
+      var result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, _ref5$prefixCls, prefixCls, page, handlePageChange, nextData, rowKey, addData, nextPageNum, nextEditingKeys;
+      return (0, _regeneratorRuntime2.default)().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            result = _ref5.result, insertType = _ref5.insertType, editingKeys = _ref5.editingKeys, setState = _ref5.setState, form = _ref5.form, name = _ref5.name, virtualName = _ref5.virtualName, virtualKey = _ref5.virtualKey, onlyOneLineMsg = _ref5.onlyOneLineMsg, tableRef = _ref5.tableRef, _ref5$prefixCls = _ref5.prefixCls, prefixCls = _ref5$prefixCls === void 0 ? 'ant' : _ref5$prefixCls, page = _ref5.page, handlePageChange = _ref5.handlePageChange;
+            nextData = [...(form.getFieldValue(name) || [])]; // 单行编辑时，需要先保存，才能进行下面的编辑
+            if (!(virtualKey && editingKeys.length >= 1)) {
+              _context4.next = 5;
+              break;
+            }
+            _message2.default.warning(onlyOneLineMsg);
+            return _context4.abrupt("return", false);
+          case 5:
+            rowKey = (0, _tools.getRandom)(); // 添加新增对象数据
+            addData = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, typeof result === 'object' ? result : {}), {}, {
+              rowKey
+            }); // 单行编辑时，需要操作一下数据结构，判断是否第一次新增，以及是否是编辑状态
+            if (virtualKey) {
+              addData._addFlag = true;
+              addData._isEditing = true;
+            }
+            if (insertType === 'before') {
+              nextData.unshift(addData);
+              setTimeout( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
+                return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
+                  while (1) switch (_context2.prev = _context2.next) {
+                    case 0:
+                      handlePageChange(1, page.pageSize);
+                    case 1:
+                    case "end":
+                      return _context2.stop();
+                  }
+                }, _callee2);
+              })), 0);
+            } else {
+              nextData.push(addData);
+              nextPageNum = Math.ceil(_utils.tools.calc(nextData.length, '/', page.pageSize));
+              setTimeout( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
+                return (0, _regeneratorRuntime2.default)().wrap(function _callee3$(_context3) {
+                  while (1) switch (_context3.prev = _context3.next) {
+                    case 0:
+                      handlePageChange(nextPageNum, page.pageSize);
+                    case 1:
+                    case "end":
+                      return _context3.stop();
+                  }
+                }, _callee3);
+              })), 0);
+            }
+
+            // 当单选情况下，存储正在编辑值
+            if (virtualKey) {
+              nextEditingKeys = [...editingKeys]; // 开启编辑状态
+              nextEditingKeys.push(rowKey);
+              form.setFieldValue(virtualName, nextData);
+              setState({
+                editingKeys: nextEditingKeys
+              });
+            }
+            form.setFieldValue(name, nextData);
+            (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 || (_tableRef$current = _tableRef$current.children[0]) === null || _tableRef$current === void 0 || (_tableRef$current = _tableRef$current.querySelector(`.${prefixCls}-table-body`)) === null || _tableRef$current === void 0 || (_tableRef$current$scr = _tableRef$current.scrollTo) === null || _tableRef$current$scr === void 0 || _tableRef$current$scr.call(_tableRef$current, {
+              top: insertType === 'before' ? -10000 : 10000,
+              behavior: 'smooth'
+            });
+            if (!virtualKey) {
+              _context4.next = 15;
+              break;
+            }
+            _context4.next = 15;
+            return form.validateFields([name]);
+          case 15:
+          case "end":
+            return _context4.stop();
+        }
+      }, _callee4);
+    }));
+    function add(_x2) {
+      return _add.apply(this, arguments);
     }
-  },
-  mulDelete: ({ form, name, virtualKey, setState, selectedRowKeys, editingKeys = [] }) => {
-    (0, import_tools.onDelete)({
+    return add;
+  }(),
+  mulDelete: _ref8 => {
+    var form = _ref8.form,
+      name = _ref8.name,
+      virtualKey = _ref8.virtualKey,
+      setState = _ref8.setState,
+      selectedRowKeys = _ref8.selectedRowKeys,
+      _ref8$editingKeys = _ref8.editingKeys,
+      editingKeys = _ref8$editingKeys === void 0 ? [] : _ref8$editingKeys;
+    // 删除选中数据
+    (0, _tools.onDelete)({
       name,
       form,
       virtualKey,
       selectedRowKeys
     });
-    const nextData = {
+    var nextData = {
       selectedRowKeys: [],
       selectedRows: []
     };
-    if (virtualKey && selectedRowKeys.includes(editingKeys == null ? void 0 : editingKeys[0])) {
+    // 删除的选择数据包含单行编辑行时，清空可编辑key
+    if (virtualKey && selectedRowKeys.includes(editingKeys === null || editingKeys === void 0 ? void 0 : editingKeys[0])) {
       nextData.editingKeys = [];
     }
     setState(nextData);
   }
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  actions,
-  defaultBtnNameMap,
-  defaultEditingActionKeys,
-  defaultMultipleActionKeys,
-  defaultSingleActionKeys,
-  defaultToolbarKeys,
-  iconMap
-});
+};

package/lib/ProEditTable/utils/diffOriginal.d.ts

@@ -4,6 +4,7 @@ export interface DiffOriginalParams {
     originalValue: any;
     value: any;
     form: FormInstance;
+    type?: string;
     onDiff?: ({ originValue, originRecord, value, record, index, }: {
         originValue: any;
         originRecord: any;