@zat-design/sisyphus-react 3.6.2-beta.9 → 3.6.3

package/dist/index.esm.css

@@ -2316,20 +2316,20 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   width: 100%;
 }
 .pro-address .ant-cascader {
-  width: 50% !important;
+  width: 45% !important;
 }
 .pro-address .ant-cascader.no-detail {
   width: 100% !important;
 }
 .pro-address .pro-address-detail {
-  width: 50%;
+  width: 55%;
   margin-left: 2px;
 }
 .pro-address .pro-address-detail .ant-input-affix-wrapper {
   width: 100%;
 }
 .pro-address .ant-input-affix-wrapper {
-  width: 50%;
+  width: 55%;
   margin-left: 2px;
 }
 .pro-number-range .range-split {

package/dist/less.esm.css

@@ -2316,20 +2316,20 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   width: 100%;
 }
 .pro-address .ant-cascader {
-  width: 50% !important;
+  width: 45% !important;
 }
 .pro-address .ant-cascader.no-detail {
   width: 100% !important;
 }
 .pro-address .pro-address-detail {
-  width: 50%;
+  width: 55%;
   margin-left: 2px;
 }
 .pro-address .pro-address-detail .ant-input-affix-wrapper {
   width: 100%;
 }
 .pro-address .ant-input-affix-wrapper {
-  width: 50%;
+  width: 55%;
   margin-left: 2px;
 }
 .pro-number-range .range-split {

package/es/ProEditTable/components/ActionButton/index.js

@@ -60,7 +60,7 @@ var ActionButton = function ActionButton(_ref) {
   // 其他操作按钮Props
   var actionBtnProps = _objectSpread(_objectSpread({}, btnConfig.buttonProps), {}, {
     onClick: function onClick() {
-      btnConfig.onEvent(record, index);
+      btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.onEvent(record, index);
     },
     disabled: getDisabled((_btnConfig$buttonProp3 = btnConfig.buttonProps) === null || _btnConfig$buttonProp3 === void 0 ? void 0 : _btnConfig$buttonProp3.disabled)
   });
@@ -77,7 +77,7 @@ var ActionButton = function ActionButton(_ref) {
         placement: "topRight",
         title: deleteMsgMap[btnConfig.type],
         onConfirm: function onConfirm() {
-          btnConfig.onEvent(record, index);
+          btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.onEvent(record, index);
         },
         disabled: isDisabled,
         okText: locale.ProEditTable.confirm,
@@ -97,13 +97,13 @@ var ActionButton = function ActionButton(_ref) {
           index: index,
           disabled: isDisabled,
           onClick: function onClick() {
-            btnConfig.onEvent(record, index);
+            btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.onEvent(record, index);
           }
         }))) : _jsx(_Button, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
           disabled: isDisabled,
           type: "link",
           onClick: function onClick() {
-            btnConfig.onEvent(record, index);
+            btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.onEvent(record, index);
           },
           children: btnConfig.label
         }))

package/es/ProEditTable/components/RenderToolbar/index.js

@@ -73,37 +73,27 @@ var RenderToolbar = function RenderToolbar(config) {
     toolbar.needConfirm = needConfirm !== null && needConfirm !== void 0 ? needConfirm : true;
     toolbar.onEvent = /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, index) {
-        var _yield$onEvent;
         var onEvent, result;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               onEvent = onClick || onHandle;
-              _context.next = 3;
+              if (onEvent) {
+                _context.next = 5;
+                break;
+              }
+              result = true;
+              _context.next = 8;
+              break;
+            case 5:
+              _context.next = 7;
               return onEvent === null || onEvent === void 0 ? void 0 : onEvent(selectedRows, dataSource, {
                 form: form,
                 namePath: virtualName
               });
-            case 3:
-              _context.t1 = _yield$onEvent = _context.sent;
-              _context.t0 = _context.t1 !== null;
-              if (!_context.t0) {
-                _context.next = 7;
-                break;
-              }
-              _context.t0 = _yield$onEvent !== void 0;
             case 7:
-              if (!_context.t0) {
-                _context.next = 11;
-                break;
-              }
-              _context.t2 = _yield$onEvent;
-              _context.next = 12;
-              break;
-            case 11:
-              _context.t2 = true;
-            case 12:
-              result = _context.t2;
+              result = _context.sent;
+            case 8:
               if (result && type !== 'custom') {
                 actions[type](_objectSpread(_objectSpread({}, config), {}, {
                   index: index,
@@ -113,7 +103,7 @@ var RenderToolbar = function RenderToolbar(config) {
                   virtualName: virtualName
                 }));
               }
-            case 14:
+            case 9:
             case "end":
               return _context.stop();
           }

package/es/ProEditTable/utils/index.js

@@ -79,7 +79,7 @@ var getActionColumn = function getActionColumn(config) {
     action.needConfirm = needConfirm !== null && needConfirm !== void 0 ? needConfirm : true;
     action.onEvent = /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, index) {
-        var _form$getFieldValue, _yield$onEvent;
+        var _form$getFieldValue;
         var rowName, _record, onEvent, result;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -105,31 +105,22 @@ var getActionColumn = function getActionColumn(config) {
               // 编辑状态使用自定义form值，非编辑状态直接使用行数据
               _record = (_form$getFieldValue = form.getFieldValue(rowName)) !== null && _form$getFieldValue !== void 0 ? _form$getFieldValue : record; // 新增事件可以设置初始默认值，当做函数的出参导出
               onEvent = onClick || onHandle;
-              _context.next = 16;
+              if (onEvent) {
+                _context.next = 18;
+                break;
+              }
+              result = true;
+              _context.next = 21;
+              break;
+            case 18:
+              _context.next = 20;
               return onEvent === null || onEvent === void 0 ? void 0 : onEvent(_record, index, {
                 form: form,
                 namePath: virtualRowName
               });
-            case 16:
-              _context.t2 = _yield$onEvent = _context.sent;
-              _context.t1 = _context.t2 !== null;
-              if (!_context.t1) {
-                _context.next = 20;
-                break;
-              }
-              _context.t1 = _yield$onEvent !== void 0;
             case 20:
-              if (!_context.t1) {
-                _context.next = 24;
-                break;
-              }
-              _context.t3 = _yield$onEvent;
-              _context.next = 25;
-              break;
-            case 24:
-              _context.t3 = true;
-            case 25:
-              result = _context.t3;
+              result = _context.sent;
+            case 21:
               if (result && type !== 'custom') {
                 actions[type](_objectSpread(_objectSpread({}, config), {}, {
                   rowName: [].concat(_toConsumableArray(name), [index]),
@@ -139,7 +130,7 @@ var getActionColumn = function getActionColumn(config) {
                   validateKeys: validateKeys
                 }));
               }
-            case 27:
+            case 22:
             case "end":
               return _context.stop();
           }
@@ -204,7 +195,7 @@ export var transformColumns = function transformColumns() {
     setState = config.setState,
     page = config.page;
   var isCell = mode === 'cell';
-  var _columns = _toConsumableArray(columns);
+  var _columns = cloneDeep(columns);
   var _cacheMap = _objectSpread({}, cacheMap.current);
   var pageNum = tools.calc(page.pageNum, '-', 1);
   var firstIndex = tools.calc(pageNum, '*', page.pageSize);

package/es/ProForm/components/combination/FormList/components/ToolbarButton.js

@@ -17,10 +17,8 @@ import locale from '../../../../../locale';
 var actions = {
   add: {
     onClick: function onClick(value, _ref) {
-      var operation = _ref.operation,
-        form = _ref.form,
-        namePath = _ref.namePath;
-      operation.add();
+      var operation = _ref.operation;
+      operation.add({});
     },
     label: "".concat(locale.ProForm.formListActions[5]),
     icon: _jsx(PlusOutlined, {})

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

@@ -5,6 +5,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { forwardRef, useCallback, useImperativeHandle } from 'react';
 import { DndContext } from '@dnd-kit/core';
+import { cloneDeep, isFunction } from 'lodash';
 import { SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
 import { toArray } from '../../../utils';
 import { namesPathTransform } from './utils';
@@ -55,6 +56,10 @@ var FormList = function FormList(props, ref) {
         listName: [].concat(_toConsumableArray(namePath), [item.name]),
         label: mode === 'less' ? undefined : item.label
       });
+      // 可编辑表格的columns需要消除引用关系，防止串数据
+      if (column.type === 'ProEditTable' && !isFunction(column.fieldProps)) {
+        column.fieldProps.columns = cloneDeep(column.fieldProps.columns);
+      }
       return column;
     });
   }, [columns]);

package/es/ProForm/components/combination/ProCascader/style/index.less

@@ -6,7 +6,7 @@
   width: 100%;
 
   .@{ant-prefix}-cascader {
-    width: 50% !important;
+    width: 45% !important;
 
     &.no-detail {
       width: 100% !important;
@@ -14,7 +14,7 @@
   }
 
   .pro-address-detail {
-    width: 50%;
+    width: 55%;
     margin-left: 2px;
 
     .@{ant-prefix}-input-affix-wrapper {
@@ -23,7 +23,7 @@
   }
 
   .@{ant-prefix}-input-affix-wrapper {
-    width: 50%;
+    width: 55%;
     margin-left: 2px;
   }
 }

package/es/ProForm/components/render/Render.js

@@ -416,7 +416,7 @@ var Render = function Render(props) {
       };
     }
     // 需要过滤掉的form_item的key
-    var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after', 'globalControl'];
+    var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after', 'globalControl', 'listName'];
     if (type === 'FormList') {
       lastComponentProps.disabled = lastDisabled;
       var lessMode = lastComponentProps.mode === 'less';

package/lib/ProEditTable/components/ActionButton/index.js

@@ -64,7 +64,7 @@ var ActionButton = function ActionButton(_ref) {
   // 其他操作按钮Props
   var actionBtnProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, btnConfig.buttonProps), {}, {
     onClick: function onClick() {
-      btnConfig.onEvent(record, index);
+      btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.onEvent(record, index);
     },
     disabled: getDisabled((_btnConfig$buttonProp3 = btnConfig.buttonProps) === null || _btnConfig$buttonProp3 === void 0 ? void 0 : _btnConfig$buttonProp3.disabled)
   });
@@ -81,7 +81,7 @@ var ActionButton = function ActionButton(_ref) {
         placement: "topRight",
         title: deleteMsgMap[btnConfig.type],
         onConfirm: function onConfirm() {
-          btnConfig.onEvent(record, index);
+          btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.onEvent(record, index);
         },
         disabled: isDisabled,
         okText: _locale.default.ProEditTable.confirm,
@@ -101,13 +101,13 @@ var ActionButton = function ActionButton(_ref) {
           index: index,
           disabled: isDisabled,
           onClick: function onClick() {
-            btnConfig.onEvent(record, index);
+            btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.onEvent(record, index);
           }
         }))) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
           disabled: isDisabled,
           type: "link",
           onClick: function onClick() {
-            btnConfig.onEvent(record, index);
+            btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.onEvent(record, index);
           },
           children: btnConfig.label
         }))

package/lib/ProEditTable/components/RenderToolbar/index.js

@@ -79,37 +79,27 @@ var RenderToolbar = function RenderToolbar(config) {
     toolbar.needConfirm = needConfirm !== null && needConfirm !== void 0 ? needConfirm : true;
     toolbar.onEvent = /*#__PURE__*/function () {
       var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(record, index) {
-        var _yield$onEvent;
         var onEvent, result;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               onEvent = onClick || onHandle;
-              _context.next = 3;
+              if (onEvent) {
+                _context.next = 5;
+                break;
+              }
+              result = true;
+              _context.next = 8;
+              break;
+            case 5:
+              _context.next = 7;
               return onEvent === null || onEvent === void 0 ? void 0 : onEvent(selectedRows, dataSource, {
                 form: form,
                 namePath: virtualName
               });
-            case 3:
-              _context.t1 = _yield$onEvent = _context.sent;
-              _context.t0 = _context.t1 !== null;
-              if (!_context.t0) {
-                _context.next = 7;
-                break;
-              }
-              _context.t0 = _yield$onEvent !== void 0;
             case 7:
-              if (!_context.t0) {
-                _context.next = 11;
-                break;
-              }
-              _context.t2 = _yield$onEvent;
-              _context.next = 12;
-              break;
-            case 11:
-              _context.t2 = true;
-            case 12:
-              result = _context.t2;
+              result = _context.sent;
+            case 8:
               if (result && type !== 'custom') {
                 _config.actions[type]((0, _objectSpread2.default)((0, _objectSpread2.default)({}, config), {}, {
                   index: index,
@@ -119,7 +109,7 @@ var RenderToolbar = function RenderToolbar(config) {
                   virtualName: virtualName
                 }));
               }
-            case 14:
+            case 9:
             case "end":
               return _context.stop();
           }

package/lib/ProEditTable/utils/index.js

@@ -83,7 +83,7 @@ var getActionColumn = function getActionColumn(config) {
     action.needConfirm = needConfirm !== null && needConfirm !== void 0 ? needConfirm : true;
     action.onEvent = /*#__PURE__*/function () {
       var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(record, index) {
-        var _form$getFieldValue, _yield$onEvent;
+        var _form$getFieldValue;
         var rowName, _record, onEvent, result;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -109,31 +109,22 @@ var getActionColumn = function getActionColumn(config) {
               // 编辑状态使用自定义form值，非编辑状态直接使用行数据
               _record = (_form$getFieldValue = form.getFieldValue(rowName)) !== null && _form$getFieldValue !== void 0 ? _form$getFieldValue : record; // 新增事件可以设置初始默认值，当做函数的出参导出
               onEvent = onClick || onHandle;
-              _context.next = 16;
+              if (onEvent) {
+                _context.next = 18;
+                break;
+              }
+              result = true;
+              _context.next = 21;
+              break;
+            case 18:
+              _context.next = 20;
               return onEvent === null || onEvent === void 0 ? void 0 : onEvent(_record, index, {
                 form: form,
                 namePath: virtualRowName
               });
-            case 16:
-              _context.t2 = _yield$onEvent = _context.sent;
-              _context.t1 = _context.t2 !== null;
-              if (!_context.t1) {
-                _context.next = 20;
-                break;
-              }
-              _context.t1 = _yield$onEvent !== void 0;
             case 20:
-              if (!_context.t1) {
-                _context.next = 24;
-                break;
-              }
-              _context.t3 = _yield$onEvent;
-              _context.next = 25;
-              break;
-            case 24:
-              _context.t3 = true;
-            case 25:
-              result = _context.t3;
+              result = _context.sent;
+            case 21:
               if (result && type !== 'custom') {
                 _config.actions[type]((0, _objectSpread2.default)((0, _objectSpread2.default)({}, config), {}, {
                   rowName: [].concat((0, _toConsumableArray2.default)(name), [index]),
@@ -143,7 +134,7 @@ var getActionColumn = function getActionColumn(config) {
                   validateKeys: validateKeys
                 }));
               }
-            case 27:
+            case 22:
             case "end":
               return _context.stop();
           }
@@ -208,7 +199,7 @@ var transformColumns = exports.transformColumns = function transformColumns() {
     setState = config.setState,
     page = config.page;
   var isCell = mode === 'cell';
-  var _columns = (0, _toConsumableArray2.default)(columns);
+  var _columns = (0, _lodash.cloneDeep)(columns);
   var _cacheMap = (0, _objectSpread2.default)({}, cacheMap.current);
   var pageNum = _utils.tools.calc(page.pageNum, '-', 1);
   var firstIndex = _utils.tools.calc(pageNum, '*', page.pageSize);

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

@@ -21,10 +21,8 @@ var _excluded = ["label", "onClick", "onHandle", "type"],
 var actions = {
   add: {
     onClick: function onClick(value, _ref) {
-      var operation = _ref.operation,
-        form = _ref.form,
-        namePath = _ref.namePath;
-      operation.add();
+      var operation = _ref.operation;
+      operation.add({});
     },
     label: "".concat(_locale.default.ProForm.formListActions[5]),
     icon: (0, _jsxRuntime.jsx)(_icons.PlusOutlined, {})

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

@@ -11,6 +11,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
 var _antd = require("antd");
 var _core = require("@dnd-kit/core");
+var _lodash = require("lodash");
 var _sortable = require("@dnd-kit/sortable");
 var _utils = require("../../../utils");
 var _utils2 = require("./utils");
@@ -61,6 +62,10 @@ var FormList = function FormList(props, ref) {
         listName: [].concat((0, _toConsumableArray2.default)(namePath), [item.name]),
         label: mode === 'less' ? undefined : item.label
       });
+      // 可编辑表格的columns需要消除引用关系，防止串数据
+      if (column.type === 'ProEditTable' && !(0, _lodash.isFunction)(column.fieldProps)) {
+        column.fieldProps.columns = (0, _lodash.cloneDeep)(column.fieldProps.columns);
+      }
       return column;
     });
   }, [columns]);

package/lib/ProForm/components/combination/ProCascader/style/index.less

@@ -6,7 +6,7 @@
   width: 100%;
 
   .@{ant-prefix}-cascader {
-    width: 50% !important;
+    width: 45% !important;
 
     &.no-detail {
       width: 100% !important;
@@ -14,7 +14,7 @@
   }
 
   .pro-address-detail {
-    width: 50%;
+    width: 55%;
     margin-left: 2px;
 
     .@{ant-prefix}-input-affix-wrapper {
@@ -23,7 +23,7 @@
   }
 
   .@{ant-prefix}-input-affix-wrapper {
-    width: 50%;
+    width: 55%;
     margin-left: 2px;
   }
 }

package/lib/ProForm/components/render/Render.js

@@ -414,7 +414,7 @@ var Render = function Render(props) {
       };
     }
     // 需要过滤掉的form_item的key
-    var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after', 'globalControl'];
+    var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after', 'globalControl', 'listName'];
     if (type === 'FormList') {
       lastComponentProps.disabled = lastDisabled;
       var lessMode = lastComponentProps.mode === 'less';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.6.2-beta.9",
+  "version": "3.6.3",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",