@zat-design/sisyphus-react 3.13.19-beta.5 → 3.13.19-beta.7

package/lib/ProEditTable/utils/index.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.transformColumns = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 require("antd/es/tooltip/style");
 var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
 require("antd/es/space/style");
@@ -14,14 +13,9 @@ var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helper
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _isEqual2 = _interopRequireDefault(require("lodash/isEqual"));
-var _isBoolean2 = _interopRequireDefault(require("lodash/isBoolean"));
-var _isArray2 = _interopRequireDefault(require("lodash/isArray"));
-var _cloneDeepWith3 = _interopRequireDefault(require("lodash/cloneDeepWith"));
-var _jsxRuntime = require("react/jsx-runtime");
 var _react = _interopRequireDefault(require("react"));
-var _classnames2 = _interopRequireDefault(require("classnames"));
+var _lodash = require("lodash");
+var _classnames = _interopRequireDefault(require("classnames"));
 var _reactSvg = require("react-svg");
 var _utils = require("@zat-design/utils");
 var _config = require("./config");
@@ -30,25 +24,25 @@ var _ProTooltip = _interopRequireDefault(require("../../ProTooltip"));
 var _components = require("../components");
 var _tip = _interopRequireDefault(require("../../assets/tip.svg"));
 var _locale = _interopRequireDefault(require("../../locale"));
+var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["type", "label", "show", "needConfirm", "onHandle", "onClick"],
-  _excluded2 = ["title", "icon"];
-// 渲染操作栏
-var getActionColumn = function getActionColumn(config) {
-  var _cloneDeepWith2 = (0, _cloneDeepWith3.default)(config, function (value) {
-      if (/*#__PURE__*/_react.default.isValidElement(value)) {
+  _excluded2 = ["title", "icon"]; // 渲染操作栏
+var getActionColumn = config => {
+  var _cloneDeepWith = (0, _lodash.cloneDeepWith)(config, value => {
+      if ( /*#__PURE__*/_react.default.isValidElement(value)) {
         return value;
       }
     }),
-    disabled = _cloneDeepWith2.disabled,
-    name = _cloneDeepWith2.name,
-    form = _cloneDeepWith2.form,
-    virtualKey = _cloneDeepWith2.virtualKey,
-    validateKeys = _cloneDeepWith2.validateKeys,
-    actionWidth = _cloneDeepWith2.actionWidth,
-    actionProps = _cloneDeepWith2.actionProps,
-    page = _cloneDeepWith2.page,
-    rowDisabled = _cloneDeepWith2.rowDisabled,
-    actionDirection = _cloneDeepWith2.actionDirection;
+    disabled = _cloneDeepWith.disabled,
+    name = _cloneDeepWith.name,
+    form = _cloneDeepWith.form,
+    virtualKey = _cloneDeepWith.virtualKey,
+    validateKeys = _cloneDeepWith.validateKeys,
+    actionWidth = _cloneDeepWith.actionWidth,
+    actionProps = _cloneDeepWith.actionProps,
+    page = _cloneDeepWith.page,
+    rowDisabled = _cloneDeepWith.rowDisabled,
+    actionDirection = _cloneDeepWith.actionDirection;
   var pageNum = _utils.tools.calc(page.pageNum, '-', 1);
   var firstIndex = _utils.tools.calc(pageNum, '*', page.pageSize);
   // actionProps配置为false 默认不插入
@@ -56,30 +50,31 @@ var getActionColumn = function getActionColumn(config) {
     return false;
   }
   var virtualRowName = (0, _tools.getNamePath)(name, virtualKey);
+
   // 设置默认操作栏按钮（区分单行与多行编辑场景）
   var defaultActionKeys = virtualKey ? _config.defaultSingleActionKeys : _config.defaultMultipleActionKeys;
-  var nextActionsProps = (0, _toConsumableArray2.default)(actionProps);
+  var nextActionsProps = [...actionProps];
+
   // 不设置actionProps
-  if ((0, _isArray2.default)(actionProps) && !(actionProps === null || actionProps === void 0 ? void 0 : actionProps.length)) {
-    nextActionsProps = defaultActionKeys.map(function (key) {
+  if ((0, _lodash.isArray)(actionProps) && !(actionProps !== null && actionProps !== void 0 && actionProps.length)) {
+    nextActionsProps = defaultActionKeys.map(key => {
       return {
         type: key
       };
     });
   } else {
     // 设置部分actionProps 内置的必选按钮会集成进去，可以手动开启show: false来隐藏对应类型的按钮
-    defaultActionKeys.forEach(function (key) {
-      if ((0, _isArray2.default)(actionProps) && !actionProps.find(function (action) {
-        return action.type === key;
-      })) {
+    defaultActionKeys.forEach(key => {
+      if ((0, _lodash.isArray)(actionProps) && !actionProps.find(action => action.type === key)) {
         nextActionsProps.push({
           type: key
         });
       }
     });
   }
+
   // 渲染操作按钮前处理下默认数据
-  var actionBtns = nextActionsProps.map(function (action) {
+  var actionBtns = nextActionsProps.map(action => {
     var type = action.type,
       label = action.label,
       show = action.show,
@@ -92,7 +87,7 @@ var getActionColumn = function getActionColumn(config) {
     action.show = show !== null && show !== void 0 ? show : true;
     action.needConfirm = needConfirm !== null && needConfirm !== void 0 ? needConfirm : true;
     action.onEvent = /*#__PURE__*/function () {
-      var _ref2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(record, _ref) {
+      var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(record, _ref) {
         var _form$getFieldValue;
         var index, form, name, namePath, tableLength, selectedRows, rowName, _record, onEvent, result;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
@@ -100,7 +95,7 @@ var getActionColumn = function getActionColumn(config) {
             case 0:
               index = _ref.index, form = _ref.form, name = _ref.name, namePath = _ref.namePath, tableLength = _ref.tableLength, selectedRows = _ref.selectedRows;
               index = _utils.tools.calc(firstIndex, '+', index);
-              rowName = [].concat((0, _toConsumableArray2.default)(virtualRowName), [index]);
+              rowName = [...virtualRowName, index];
               if (!(type === 'save')) {
                 _context.next = 13;
                 break;
@@ -130,23 +125,23 @@ var getActionColumn = function getActionColumn(config) {
             case 19:
               _context.next = 21;
               return onEvent === null || onEvent === void 0 ? void 0 : onEvent(_record, {
-                form: form,
-                index: index,
-                tableLength: tableLength,
-                name: name,
-                namePath: namePath,
-                selectedRows: selectedRows
+                form,
+                index,
+                tableLength,
+                name,
+                namePath,
+                selectedRows
               });
             case 21:
               result = _context.sent;
             case 22:
               if (result !== false && type !== 'custom') {
                 _config.actions[type]((0, _objectSpread2.default)((0, _objectSpread2.default)({}, config), {}, {
-                  rowName: [].concat((0, _toConsumableArray2.default)(name), [index]),
+                  rowName: [...name, index],
                   virtualRowName: rowName,
-                  record: record,
-                  result: result,
-                  validateKeys: validateKeys
+                  record,
+                  result,
+                  validateKeys
                 }));
               }
             case 23:
@@ -167,29 +162,30 @@ var getActionColumn = function getActionColumn(config) {
     key: 'action',
     fixed: 'right',
     width: actionWidth || (actionDirection === 'vertical' ? '60px' : virtualKey ? '120px' : '60px'),
-    render: function render(text, record, index) {
+    render: (text, record, index) => {
       var _rowDisabled;
       var _disabled = (_rowDisabled = rowDisabled === null || rowDisabled === void 0 ? void 0 : rowDisabled(record)) !== null && _rowDisabled !== void 0 ? _rowDisabled : false;
       if (_disabled) {
         return '';
       }
-      return (0, _jsxRuntime.jsx)(_space.default, {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_space.default, {
         size: "small",
         direction: actionDirection,
-        children: actionBtns.map(function (btnConfig) {
-          return (0, _jsxRuntime.jsx)(_react.default.Fragment, {
-            children: (0, _jsxRuntime.jsx)(_components.ActionButton, (0, _objectSpread2.default)({}, {
-              record: record,
-              index: index,
-              config: config,
-              btnConfig: btnConfig
-            }))
-          }, "".concat(record.rowKey, "-").concat(btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.type));
+        children: actionBtns.map(btnConfig => {
+          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.default.Fragment, {
+            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.ActionButton, {
+              record,
+              index,
+              config,
+              btnConfig
+            })
+          }, `${record.rowKey}-${btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.type}`);
         })
       });
     }
   };
 };
+
 /**
  * 编辑模式分为 多行和单行两种
  * 单行模式下，render 分为component和viewRender两种，对应编辑和非编辑状态下，edit状态不对外
@@ -216,7 +212,7 @@ var transformColumns = exports.transformColumns = function transformColumns() {
   var _columns = (0, _tools.cloneDeepFilterNode)(columns);
   var pageNum = _utils.tools.calc(page.pageNum, '-', 1);
   var firstIndex = _utils.tools.calc(pageNum, '*', page.pageSize);
-  _columns.forEach(function (item, index) {
+  _columns.forEach((item, index) => {
     var label = item.label,
       names = item.names,
       labelRequired = item.labelRequired,
@@ -230,6 +226,7 @@ var transformColumns = exports.transformColumns = function transformColumns() {
       suffix = item.suffix,
       before = item.before,
       after = item.after;
+
     // column设置label时，权重最高
     var columnTitle = label || title;
     item.title = columnTitle;
@@ -240,116 +237,122 @@ var transformColumns = exports.transformColumns = function transformColumns() {
           tooltipTitle = _ref3.title,
           icon = _ref3.icon,
           resetProps = (0, _objectWithoutProperties2.default)(_ref3, _excluded2);
-        item.title = (0, _jsxRuntime.jsxs)("span", {
+        item.title = /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
           className: "pro-edit-table-title pro-edit-table-tooltip",
-          children: [before, columnTitle, (0, _jsxRuntime.jsx)(_tooltip.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+          children: [before, columnTitle, /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
             title: tooltipTitle !== null && tooltipTitle !== void 0 ? tooltipTitle : tooltip
           }, resetProps), {}, {
-            children: icon ? (/*#__PURE__*/_react.default.cloneElement(icon, {
+            children: icon ? ( /*#__PURE__*/_react.default.cloneElement(icon, {
               className: 'icon-tip'
-            })) : (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
+            })) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
               className: "icon-tip",
               src: _tip.default
             })
           })), suffix || after]
         });
       } else {
-        item.title = (0, _jsxRuntime.jsxs)("span", {
+        item.title = /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
           className: "pro-edit-table-title",
           children: [before, columnTitle, suffix || after]
         });
       }
     }
+
     // column设置name时，权重最高
     var columnName = (item === null || item === void 0 ? void 0 : item.name) || dataIndex || key;
     item.dataIndex = columnName;
     item.key = columnName;
     // item.shouldCellUpdate = item.shouldCellUpdate || ((record, perRecord) => !isEqual(record, perRecord));
-    var required = (0, _isBoolean2.default)(item.required) ? item.required : false;
+
+    var required = (0, _lodash.isBoolean)(item.required) ? item.required : false;
     if (typeof item.required === 'function') {
       var namePath = (0, _tools.getNamePath)(name, virtualKey);
       var namePathArray = Array.isArray(namePath) ? namePath : [namePath];
-      var rowData = form.getFieldValue([].concat((0, _toConsumableArray2.default)(namePathArray), [index])) || {};
+      var rowData = form.getFieldValue([...namePathArray, index]) || {};
       required = item.required(rowData[columnName], rowData, {
-        form: form,
-        index: index,
-        namePath: [].concat((0, _toConsumableArray2.default)(namePathArray), [index])
+        form,
+        index,
+        namePath: [...namePathArray, index]
       });
     }
+
     // 样式处理
-    item.className = (0, _classnames2.default)((0, _defineProperty2.default)({
+    item.className = (0, _classnames.default)({
       'is-hidden': hidden,
       'is-required': required || labelRequired,
       'is-required-left': requiredAlign === 'left',
-      'is-required-right': requiredAlign === 'right'
-    }, className, className));
+      'is-required-right': requiredAlign === 'right',
+      [className]: className
+    });
+
     // 防止重复渲染导致className重复添加
     if (item.className) {
-      item.className = (0, _toConsumableArray2.default)(new Set(item.className.split(' '))).join(' ');
+      item.className = [...new Set(item.className.split(' '))].join(' ');
     }
-    var _render = function _render(text, record, index) {
+    var _render = (text, record, index) => {
       var _isEditing = !virtualKey || editingKeys.includes(record.rowKey) || record._addFlag;
-      var namePath = (0, _isArray2.default)(name) ? name : [name];
+      var namePath = (0, _lodash.isArray)(name) ? name : [name];
       if (virtualKey && editingKeys.includes(record.rowKey)) {
         namePath = (0, _tools.getNamePath)(name, virtualKey);
       }
       var namePathArray = Array.isArray(namePath) ? namePath : [namePath];
-      var columnNamePath = (0, _isArray2.default)(columnName) ? columnName : [columnName];
+      var columnNamePath = (0, _lodash.isArray)(columnName) ? columnName : [columnName];
       index = _utils.tools.calc(firstIndex, '+', index);
       // 设置单元格formItem的namePath
-      var cellName = columnName ? [].concat((0, _toConsumableArray2.default)(namePathArray), [index], (0, _toConsumableArray2.default)(columnNamePath)) : [].concat((0, _toConsumableArray2.default)(namePathArray), [index]);
+      var cellName = columnName ? [...namePathArray, index, ...columnNamePath] : [...namePathArray, index];
       var _text = text;
+
       // 当传入组合组件时，name需要重新组合一下，以防names中key与dataIndex重叠
-      if (names === null || names === void 0 ? void 0 : names.length) {
+      if (names !== null && names !== void 0 && names.length) {
         var nextDataIndex = (0, _tools.splitNames)(names);
         item.dataIndex = nextDataIndex;
         item.key = nextDataIndex;
-        cellName = [].concat((0, _toConsumableArray2.default)(namePathArray), [index, nextDataIndex]);
+        cellName = [...namePathArray, index, nextDataIndex];
         // 给names返回数组值
-        _text = names.map(function (item) {
-          return record === null || record === void 0 ? void 0 : record[item];
-        });
+        _text = names.map(item => record === null || record === void 0 ? void 0 : record[item]);
       }
       if (!_isEditing && ellipsis) {
-        return (0, _jsxRuntime.jsx)(_ProTooltip.default, {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_ProTooltip.default, {
           text: _text,
           line: 1,
           isResponsiveWidth: true
         });
       }
       var cellClassName;
-      var isCanEdit = isCell && !record["".concat(columnName, "-Disabled")] && item.isEditable !== false;
+      var isCanEdit = isCell && !record[`${columnName}-Disabled`] && item.isEditable !== false;
       // 单元格编辑场景下，需要将所有单元格设置为不可编辑状态，当鼠标hover时，展示输出框。点击可修改
       if (isCanEdit) {
         record['is-view'] = true;
         // 样式处理
-        cellClassName = (0, _classnames2.default)({
-          'is-cell': !(0, _isEqual2.default)(cellNamePath, cellName)
+        cellClassName = (0, _classnames.default)({
+          'is-cell': !(0, _lodash.isEqual)(cellNamePath, cellName)
         });
       }
+
       // 单行多行交互有较大差异
-      return (0, _jsxRuntime.jsxs)("div", {
+      return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         className: cellClassName,
-        onClick: function onClick() {
+        onClick: () => {
           isCanEdit && setState({
             cellNamePath: cellName
           });
         },
-        children: [index === 0 && !item.width ? (0, _jsxRuntime.jsx)("div", {
+        children: [index === 0 && !item.width ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
           style: {
             visibility: 'hidden',
             height: 0,
-            paddingLeft: (item === null || item === void 0 ? void 0 : item.required) ? 16 : 0
+            paddingLeft: item !== null && item !== void 0 && item.required ? 16 : 0
           },
           children: columnTitle
-        }) : null, (0, _jsxRuntime.jsx)(_components.RenderField, {
+        }) : null, /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.RenderField, {
           text: _text,
           record: record,
           index: index,
           column: item,
           config: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, config), {}, {
-            cellName: cellName,
-            _isEditing: _isEditing // 是否正在编辑
+            cellName,
+            // 单元格formItem的namePath
+            _isEditing // 是否正在编辑
           })
         })]
       });
@@ -358,15 +361,11 @@ var transformColumns = exports.transformColumns = function transformColumns() {
   });
   if (disabled || isView) {
     // 查看模式下过滤操作栏
-    _columns = _columns.filter(function (item) {
-      return item.title !== _locale.default.ProEditTable.operation;
-    });
+    _columns = _columns.filter(item => item.title !== _locale.default.ProEditTable.operation);
   } else {
-    var validateKeys = _columns.filter(function (i) {
-      return i.rules || i.required;
-    }).map(function (item) {
+    var validateKeys = _columns.filter(i => i.rules || i.required).map(item => {
       var _item$names;
-      if ((_item$names = item.names) === null || _item$names === void 0 ? void 0 : _item$names.length) {
+      if ((_item$names = item.names) !== null && _item$names !== void 0 && _item$names.length) {
         var nextDataIndex = (0, _tools.splitNames)(item.names);
         item.dataIndex = nextDataIndex;
         item.key = nextDataIndex;
@@ -374,10 +373,11 @@ var transformColumns = exports.transformColumns = function transformColumns() {
       return item.dataIndex || item.key;
     });
     var actionColumn = getActionColumn((0, _objectSpread2.default)((0, _objectSpread2.default)({}, config), {}, {
-      validateKeys: validateKeys // 需要校验的单元格的formItem的name
+      validateKeys // 需要校验的单元格的formItem的name
     }));
     actionColumn && _columns.push(actionColumn);
   }
+
   // 渲染操作列
   return _columns;
 };