@zat-design/sisyphus-react 3.13.19-beta.6 → 3.13.19-beta.8

package/lib/ProEditTable/utils/config.js

@@ -6,18 +6,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 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 _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 require("antd/es/message/style");
 var _message2 = _interopRequireDefault(require("antd/es/message"));
-var _set2 = _interopRequireDefault(require("lodash/set"));
-var _jsxRuntime = require("react/jsx-runtime");
 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,
@@ -28,10 +26,12 @@ var defaultBtnNameMap = exports.defaultBtnNameMap = {
   cancel: _locale.default.ProEditTable.cancel,
   custom: _locale.default.ProEditTable.custom
 };
+
 // 默认按钮配置
 var iconMap = exports.iconMap = {
-  add: (0, _jsxRuntime.jsx)(_icons.PlusOutlined, {})
+  add: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.PlusOutlined, {})
 };
+
 // 单行编辑 操作栏默认配置按钮
 var defaultSingleActionKeys = exports.defaultSingleActionKeys = ['edit', 'delete', 'save', 'cancel'];
 // 多行编辑 操作栏默认配置按钮
@@ -40,9 +40,10 @@ var defaultMultipleActionKeys = exports.defaultMultipleActionKeys = ['delete'];
 var defaultEditingActionKeys = exports.defaultEditingActionKeys = ['save', 'cancel'];
 // 工具栏默认配置按钮
 var defaultToolbarKeys = exports.defaultToolbarKeys = ['add', 'mulDelete'];
+
 // 操作枚举
 var actions = exports.actions = {
-  edit: function edit(_ref) {
+  edit: _ref => {
     var record = _ref.record,
       editingKeys = _ref.editingKeys,
       setState = _ref.setState,
@@ -55,11 +56,11 @@ var actions = exports.actions = {
       _message2.default.warning(onlyOneLineMsg);
       return false;
     }
-    var nextEditingKeys = (0, _toConsumableArray2.default)(editingKeys);
+    var nextEditingKeys = [...editingKeys];
     // 开启编辑状态
     nextEditingKeys.push(record.rowKey);
     // 编辑时赋值编辑状态，供validator做保存校验
-    if (nextEditingKeys === null || nextEditingKeys === void 0 ? void 0 : nextEditingKeys.length) {
+    if (nextEditingKeys !== null && nextEditingKeys !== void 0 && nextEditingKeys.length) {
       record._isEditing = true;
     } else {
       delete record._isEditing;
@@ -71,28 +72,26 @@ var actions = exports.actions = {
     });
   },
   save: function () {
-    var _save = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(_ref2) {
+    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 = (0, _typeof2.default)(result) === 'object' ? 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(function (key) {
-              return key !== record.rowKey;
-            }); // 保存后取消编辑状态，供validator做保存校验
-            if (nextEditingKeys === null || nextEditingKeys === void 0 ? void 0 : nextEditingKeys.length) {
+            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, _set2.default)(values, rowName, record);
+            (0, _lodash.set)(values, rowName, record);
             form.setFieldsValue(values);
             setState({
               editingKeys: nextEditingKeys
@@ -108,7 +107,7 @@ var actions = exports.actions = {
     }
     return save;
   }(),
-  cancel: function cancel(_ref3) {
+  cancel: _ref3 => {
     var name = _ref3.name,
       record = _ref3.record,
       editingKeys = _ref3.editingKeys,
@@ -116,11 +115,9 @@ var actions = exports.actions = {
       form = _ref3.form,
       virtualRowName = _ref3.virtualRowName,
       virtualKey = _ref3.virtualKey;
-    var nextEditingKeys = editingKeys.filter(function (key) {
-      return key !== record.rowKey;
-    });
+    var nextEditingKeys = editingKeys.filter(key => key !== record.rowKey);
     // 保存后取消编辑状态，供validator做保存校验
-    if (nextEditingKeys === null || nextEditingKeys === void 0 ? void 0 : nextEditingKeys.length) {
+    if (nextEditingKeys !== null && nextEditingKeys !== void 0 && nextEditingKeys.length) {
       record._isEditing = true;
     } else {
       delete record._isEditing;
@@ -131,19 +128,19 @@ var actions = exports.actions = {
     // 取消分两种，一编辑取消，二添加取消
     if (record._addFlag) {
       (0, _tools.onDelete)({
-        name: name,
-        form: form,
-        virtualKey: virtualKey,
+        name,
+        form,
+        virtualKey,
         selectedRowKeys: [record.rowKey]
       });
     } else {
       // 防止value引用不变, 值不更新 - (自定义组件)
       var values = form.getFieldsValue();
-      (0, _set2.default)(values, virtualRowName, record);
+      (0, _lodash.set)(values, virtualRowName, record);
       form.setFieldsValue(values);
     }
   },
-  delete: function _delete(_ref4) {
+  delete: _ref4 => {
     var name = _ref4.name,
       record = _ref4.record,
       editingKeys = _ref4.editingKeys,
@@ -158,30 +155,28 @@ var actions = exports.actions = {
     }
     // 删除当前行数据
     (0, _tools.onDelete)({
-      name: name,
-      form: form,
-      virtualKey: virtualKey,
+      name,
+      form,
+      virtualKey,
       selectedRowKeys: [record.rowKey]
     });
     if (virtualKey) {
       // 关闭编辑状态
-      var nextEditingKeys = editingKeys.filter(function (key) {
-        return key === record.rowKey;
-      });
+      var nextEditingKeys = editingKeys.filter(key => key === record.rowKey);
       setState({
         editingKeys: nextEditingKeys
       });
     }
   },
   add: function () {
-    var _add = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4(_ref5) {
+    var _add = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4(_ref5) {
       var _tableRef$current$que, _tableRef$current$que2;
       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 = (0, _toConsumableArray2.default)(form.getFieldValue(name) || []); // 单行编辑时，需要先保存，才能进行下面的编辑
+            nextData = [...(form.getFieldValue(name) || [])]; // 单行编辑时，需要先保存，才能进行下面的编辑
             if (!(virtualKey && editingKeys.length >= 1)) {
               _context4.next = 5;
               break;
@@ -190,8 +185,8 @@ var actions = exports.actions = {
             return _context4.abrupt("return", false);
           case 5:
             rowKey = (0, _tools.getRandom)(); // 添加新增对象数据
-            addData = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _typeof2.default)(result) === 'object' ? result : {}), {}, {
-              rowKey: rowKey
+            addData = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, typeof result === 'object' ? result : {}), {}, {
+              rowKey
             }); // 单行编辑时，需要操作一下数据结构，判断是否第一次新增，以及是否是编辑状态
             if (virtualKey) {
               addData._addFlag = true;
@@ -199,7 +194,7 @@ var actions = exports.actions = {
             }
             if (insertType === 'before') {
               nextData.unshift(addData);
-              setTimeout(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
+              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:
@@ -213,7 +208,7 @@ var actions = exports.actions = {
             } 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() {
+              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:
@@ -225,9 +220,10 @@ var actions = exports.actions = {
                 }, _callee3);
               })), 0);
             }
+
             // 当单选情况下，存储正在编辑值
             if (virtualKey) {
-              nextEditingKeys = (0, _toConsumableArray2.default)(editingKeys); // 开启编辑状态
+              nextEditingKeys = [...editingKeys]; // 开启编辑状态
               nextEditingKeys.push(rowKey);
               form.setFieldValue(virtualName, nextData);
               setState({
@@ -235,7 +231,7 @@ var actions = exports.actions = {
               });
             }
             form.setFieldValue(name, nextData);
-            (_tableRef$current$que = tableRef.current.querySelector(".".concat(prefixCls, "-table-body"))) === null || _tableRef$current$que === void 0 ? void 0 : (_tableRef$current$que2 = _tableRef$current$que.scrollTo) === null || _tableRef$current$que2 === void 0 ? void 0 : _tableRef$current$que2.call(_tableRef$current$que, {
+            (_tableRef$current$que = tableRef.current.querySelector(`.${prefixCls}-table-body`)) === null || _tableRef$current$que === void 0 || (_tableRef$current$que2 = _tableRef$current$que.scrollTo) === null || _tableRef$current$que2 === void 0 || _tableRef$current$que2.call(_tableRef$current$que, {
               top: insertType === 'before' ? -10000 : 10000,
               behavior: 'smooth'
             });
@@ -256,7 +252,7 @@ var actions = exports.actions = {
     }
     return add;
   }(),
-  mulDelete: function mulDelete(_ref8) {
+  mulDelete: _ref8 => {
     var form = _ref8.form,
       name = _ref8.name,
       virtualKey = _ref8.virtualKey,
@@ -266,10 +262,10 @@ var actions = exports.actions = {
       editingKeys = _ref8$editingKeys === void 0 ? [] : _ref8$editingKeys;
     // 删除选中数据
     (0, _tools.onDelete)({
-      name: name,
-      form: form,
-      virtualKey: virtualKey,
-      selectedRowKeys: selectedRowKeys
+      name,
+      form,
+      virtualKey,
+      selectedRowKeys
     });
     var nextData = {
       selectedRowKeys: [],

package/lib/ProEditTable/utils/diffOriginal.js

@@ -1,52 +1,58 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.diffOriginal = void 0;
-var _isObject2 = _interopRequireDefault(require("lodash/isObject"));
-var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
-var _isEqual2 = _interopRequireDefault(require("lodash/isEqual"));
+var _lodash = require("lodash");
 var _utils = require("@zat-design/utils");
 var isEmpty = _utils.validate.isEmpty;
+
+// 比较策略接口
+
 // 数字类型标准化函数
-var normalizeNumberValue = function normalizeNumberValue(value) {
+var normalizeNumberValue = value => {
   if (value === null || value === undefined || value === '') return null;
   var num = Number(value);
   return Number.isNaN(num) ? null : num;
 };
+
 // InputNumber 比较策略
 var inputNumberStrategy = {
-  compare: function compare(val1, val2) {
+  compare: (val1, val2) => {
     var num1 = normalizeNumberValue(val1);
     var num2 = normalizeNumberValue(val2);
     return num1 === num2;
   }
 };
+
 // ProNumberRange 比较策略
 var proNumberRangeStrategy = {
-  compare: function compare(val1, val2) {
+  compare: (val1, val2) => {
     if (!Array.isArray(val1) || !Array.isArray(val2)) return false;
     if (val1.length !== val2.length) return false;
-    return val1.every(function (item, index) {
+    return val1.every((item, index) => {
       var num1 = normalizeNumberValue(item);
       var num2 = normalizeNumberValue(val2[index]);
       return num1 === num2;
     });
   }
 };
+
 // 数字类型处理函数
-var handleNumberTypeDiff = function handleNumberTypeDiff(params) {
+var handleNumberTypeDiff = params => {
   var originalValue = params.originalValue,
     value = params.value,
     type = params.type;
   var isEmptyVal = isEmpty(value);
   var isEmptyOrg = isEmpty(originalValue);
+
   // 都为空视为相等
   if (isEmptyOrg && isEmptyVal) return 'same';
+
   // 如果原始值为空 且当前有值的话 视为新增
   if (isEmptyOrg && !isEmptyVal) return 'add';
+
   // 根据类型选择对应的比较策略
   var compareStrategy;
   if (type === 'InputNumber') {
@@ -58,15 +64,17 @@ var handleNumberTypeDiff = function handleNumberTypeDiff(params) {
   }
   return compareStrategy.compare(value, originalValue) ? 'same' : 'changed';
 };
+
 // 过滤对象中undefined字段
 // 防止{a: '1'} {a: '1', b: undefined | null}被认为不相等
-var filterObject = function filterObject(data) {
-  if (!(0, _isObject2.default)(data) || data === null) return data;
+var filterObject = data => {
+  if (!(0, _lodash.isObject)(data) || data === null) return data;
+
   // ['1', undefined] ['1', ''] 视为相等
   if (Array.isArray(data)) {
     // 数组中全是empty值的话 视为null
     var isFillNull = true;
-    var arr = data.map(function (item) {
+    var arr = data.map(item => {
       if (isEmpty(item)) {
         return null;
       }
@@ -76,16 +84,17 @@ var filterObject = function filterObject(data) {
     return isFillNull ? null : arr;
   }
   var resData = {};
-  Object.keys(data).forEach(function (key) {
+  Object.keys(data).forEach(key => {
     if (!isEmpty(data[key])) {
       resData[key] = data[key];
     }
   });
+
   // 空对象视为null 比较时 null undefined {} [] '' 视为相等
   if (!Object.keys(resData).length) return null;
   return resData;
 };
-var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
+var diffOriginal = params => {
   var originalValue = params.originalValue,
     value = params.value,
     onDiff = params.onDiff,
@@ -93,14 +102,15 @@ var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
     record = params.record,
     index = params.index,
     type = params.type;
+
   // 支持传入自定义比较事件
-  if ((0, _isFunction2.default)(onDiff)) {
+  if ((0, _lodash.isFunction)(onDiff)) {
     var diffRes = onDiff({
       originValue: originalValue,
-      originRecord: originRecord,
-      value: value,
-      record: record,
-      index: index
+      originRecord,
+      value,
+      record,
+      index
     });
     // 如果返回undefined走内置比较逻辑
     if (diffRes !== undefined) {
@@ -110,18 +120,23 @@ var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
       return diffRes;
     }
   }
+
   // 数字类型特殊处理
   if (['InputNumber', 'ProNumberRange'].includes(type)) {
     return handleNumberTypeDiff(params);
   }
+
   // 其他类型使用原有逻辑
   var _value = filterObject(value);
   var _originalValue = filterObject(originalValue);
   var isEmptyVal = isEmpty(_value);
   var isEmptyOrg = isEmpty(_originalValue);
+
   // 都为空视为相等
   if (isEmptyOrg && isEmptyVal) return 'same';
+
   // 如果原始值为空 且当前有值的话 视为新增
   if (isEmptyOrg && !isEmptyVal) return 'add';
-  return (0, _isEqual2.default)(_value, _originalValue) ? 'same' : 'changed';
-};
+  return (0, _lodash.isEqual)(_value, _originalValue) ? 'same' : 'changed';
+};
+exports.diffOriginal = diffOriginal;

package/lib/ProEditTable/utils/getDefaultProps.js

@@ -1,40 +1,39 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getDefaultProps = void 0;
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _isEqual2 = _interopRequireDefault(require("lodash/isEqual"));
-var _get4 = _interopRequireDefault(require("lodash/get"));
+var _lodash = require("lodash");
 var defaultPropsMap = {
-  ProSelect: function ProSelect(props) {
+  ProSelect: props => {
     var fieldProps = props.fieldProps,
       name = props.name,
       namePath = props.namePath;
     var _ref = fieldProps || {},
       filterInList = _ref.filterInList;
     var defaultProps = {};
+
     // formList场景传入列表过滤时
     if (filterInList && namePath && name) {
-      var _namePath = (0, _toConsumableArray2.default)(namePath).splice(2, namePath.length - 1);
-      defaultProps.shouldUpdate = function (preValues, curValues) {
-        var _get2, _get2$map, _get3, _get3$map;
-        var preListValue = (_get2 = (0, _get4.default)(preValues, name)) === null || _get2 === void 0 ? void 0 : (_get2$map = _get2.map) === null || _get2$map === void 0 ? void 0 : _get2$map.call(_get2, function (item) {
-          return (0, _get4.default)(item, _namePath);
+      var _namePath = [...namePath].splice(2, namePath.length - 1);
+      defaultProps.shouldUpdate = (preValues, curValues) => {
+        var _get, _get$map, _get2, _get2$map;
+        var preListValue = (_get = (0, _lodash.get)(preValues, name)) === null || _get === void 0 || (_get$map = _get.map) === null || _get$map === void 0 ? void 0 : _get$map.call(_get, item => {
+          return (0, _lodash.get)(item, _namePath);
         });
-        var curListValue = (_get3 = (0, _get4.default)(curValues, name)) === null || _get3 === void 0 ? void 0 : (_get3$map = _get3.map) === null || _get3$map === void 0 ? void 0 : _get3$map.call(_get3, function (item) {
-          return (0, _get4.default)(item, _namePath);
+        var curListValue = (_get2 = (0, _lodash.get)(curValues, name)) === null || _get2 === void 0 || (_get2$map = _get2.map) === null || _get2$map === void 0 ? void 0 : _get2$map.call(_get2, item => {
+          return (0, _lodash.get)(item, _namePath);
         });
-        return !(0, _isEqual2.default)(preListValue, curListValue);
+        return !(0, _lodash.isEqual)(preListValue, curListValue);
       };
     }
     return defaultProps;
   }
 };
-var getDefaultProps = exports.getDefaultProps = function getDefaultProps(props) {
+var getDefaultProps = props => {
   var _defaultPropsMap$type;
   var type = props.type;
   return (_defaultPropsMap$type = defaultPropsMap[type]) === null || _defaultPropsMap$type === void 0 ? void 0 : _defaultPropsMap$type.call(defaultPropsMap, props);
-};
+};
+exports.getDefaultProps = getDefaultProps;