@zat-design/sisyphus-react 3.0.16-beta.4 → 3.1.4

package/lib/ProEditLabel/index.js

@@ -12,6 +12,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _jsxRuntime = require("react/jsx-runtime");
 var _icons = require("@ant-design/icons");
 var _antd = require("antd");
 var _ahooks = require("ahooks");
@@ -215,18 +216,20 @@ var ProEditLabel = function ProEditLabel(_ref) {
    * @returns
    */
   var renderProEditLabel = function renderProEditLabel() {
-    var TextNode = /*#__PURE__*/_react.default.createElement("div", {
+    var TextNode = (0, _jsxRuntime.jsx)("div", {
       className: cls,
-      style: style
-    }, /*#__PURE__*/_react.default.createElement(_antd.Space, {
-      align: "start"
-    }, mode === 'current' ? props.value : /*#__PURE__*/_react.default.createElement(_RenderProForm.default, (0, _objectSpread2.default)({
-      value: confirmValue,
-      isView: true,
-      form: viewForm
-    }, popupProps)), !disabled && /*#__PURE__*/_react.default.createElement(_icons.EditOutlined, {
-      onClick: editHandle
-    })));
+      style: style,
+      children: (0, _jsxRuntime.jsxs)(_antd.Space, {
+        align: "start",
+        children: [mode === 'current' ? props.value : (0, _jsxRuntime.jsx)(_RenderProForm.default, (0, _objectSpread2.default)({
+          value: confirmValue,
+          isView: true,
+          form: viewForm
+        }, popupProps)), !disabled && (0, _jsxRuntime.jsx)(_icons.EditOutlined, {
+          onClick: editHandle
+        })]
+      })
+    });
     if (disabled) {
       if ( /*#__PURE__*/_react.default.isValidElement(children)) {
         return children;
@@ -239,7 +242,7 @@ var ProEditLabel = function ProEditLabel(_ref) {
     // 当前页编辑模式
     if (mode === 'current') {
       if (status) {
-        return /*#__PURE__*/_react.default.createElement(_antd.Input, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        return (0, _jsxRuntime.jsx)(_antd.Input, (0, _objectSpread2.default)((0, _objectSpread2.default)({
           ref: inputRef,
           size: size,
           onBlur: function onBlur(e) {
@@ -265,11 +268,11 @@ var ProEditLabel = function ProEditLabel(_ref) {
         }
         return TextNode;
       };
-      return /*#__PURE__*/_react.default.createElement(_antd.Popconfirm, (0, _objectSpread2.default)({
+      return (0, _jsxRuntime.jsx)(_antd.Popconfirm, (0, _objectSpread2.default)((0, _objectSpread2.default)({
         overlayClassName: "pro-edit-label-popconfirm",
         icon: null,
         destroyTooltipOnHide: true,
-        title: /*#__PURE__*/_react.default.createElement(_RenderProForm.default, (0, _objectSpread2.default)({
+        title: (0, _jsxRuntime.jsx)(_RenderProForm.default, (0, _objectSpread2.default)({
           form: form,
           value: confirmValue,
           onChange: props.onChange,
@@ -280,10 +283,13 @@ var ProEditLabel = function ProEditLabel(_ref) {
         onOpenChange: function onOpenChange(open) {
           _onOpenChange && _onOpenChange(open);
         }
-      }, (0, _lodash.omit)(popupProps, ['type', 'label', 'title', 'tip', 'trim', 'labelWidth', 'fieldProps', 'columns'])), labelRender());
+      }, (0, _lodash.omit)(popupProps, ['type', 'label', 'title', 'tip', 'trim', 'labelWidth', 'fieldProps', 'columns'])), {}, {
+        children: labelRender()
+      }));
     }
   };
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, renderProEditLabel());
+  return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+    children: renderProEditLabel()
+  });
 };
-var _default = ProEditLabel;
-exports.default = _default;
+var _default = exports.default = ProEditLabel;

package/lib/ProEditLabel/propsType.d.ts

@@ -1,6 +1,6 @@
-import { InputProps } from 'antd/lib/input';
-import { PopconfirmProps } from 'antd/lib/popconfirm';
-import { FormInstance } from 'antd/lib/form';
+import { InputProps } from 'antd/es/input';
+import { PopconfirmProps } from 'antd/es/popconfirm';
+import { FormInstance } from 'antd/es/form';
 import React from 'react';
 import { ProColumnProps } from '../index';
 export interface ContainerProps {

package/lib/ProEditLabel/style/index.less

@@ -26,10 +26,9 @@
   }
 
   .anticon-edit {
-    color      : #D8D8D8;
-    margin-left: var(--zaui-space-size-sm, 8px);
-    cursor     : pointer;
-    padding    : 4px;
+    color  : #D8D8D8;
+    cursor : pointer;
+    padding: var(--zaui-space-size-xs, 4px);
 
     &:hover {
       color: var(--zaui-brand, #006AFF);
@@ -57,7 +56,7 @@
 
 .ant-popover {
   .ant-btn-sm {
-    font-size  : 12px;
+    font-size  : var(--zaui-font-size-sm, 12px);
     min-width  : 56px;
     line-height: 1;
 
@@ -69,7 +68,7 @@
 }
 
 .pro-edit-label-popconfirm {
-  z-index: 1029 !important;
+  z-index: 1001 !important;
 
   .ant-popover-message {
     display: block;
@@ -85,9 +84,9 @@
   }
 
   .pro-edit-label-title {
-    font-size    : 16px;
+    font-size    : var(--zaui-font-size-lg, 16px);
     font-weight  : 500;
-    color        : #343434;
+    color        : var(--zaui-text, #343434);
     margin-bottom: var(--zaui-space-size-sm, 8px);
   }
 
@@ -99,7 +98,7 @@
       font-size   : var(--zaui-font-size-lg, 16px);
       margin-right: var(--zaui-space-size-sm, 8px);
       color       : var(--zaui-warning, #EC9131);
-      margin-top  : 4px;
+      margin-top  : var(--zaui-space-size-xs, 4px);
     }
   }
 
@@ -117,8 +116,7 @@
     }
 
     .ant-col-10 {
-      width        : var(--zaui-form-label-width, 128px);
-      max-width    : var(--zaui-form-label-width, 128px);
+      flex         : 0 0 var(--zaui-form-label-width, 130px);
       text-align   : var(--zaui-form-align, left);
       white-space  : pre-wrap;
       line-height  : 1;
@@ -133,4 +131,4 @@
     width: 100%;
   }
 
-}
+}

package/lib/ProEditLabel/utils/index.js

@@ -12,7 +12,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
  * @param columns 表单配置项
  * @returns value
  */
-var matchFormValue = function matchFormValue(value, columns) {
+var matchFormValue = exports.matchFormValue = function matchFormValue(value, columns) {
   if (!Array.isArray(columns)) {
     return value;
   }
@@ -20,5 +20,4 @@ var matchFormValue = function matchFormValue(value, columns) {
     return (0, _defineProperty2.default)({}, columns[0].name || columns[0].type, value);
   }
   return value;
-};
-exports.matchFormValue = matchFormValue;
+};

package/lib/ProEditTable/components/ActionButton/index.d.ts

@@ -1,3 +1,2 @@
-import React from 'react';
-declare const ActionButton: ({ record, index, config, btnConfig }: any) => React.JSX.Element;
+declare const ActionButton: ({ record, index, config, btnConfig }: any) => JSX.Element;
 export default ActionButton;

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

@@ -6,28 +6,50 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _jsxRuntime = require("react/jsx-runtime");
 var _react = _interopRequireDefault(require("react"));
 var _antd = require("antd");
 var _lodash = require("lodash");
+var _config = require("../../utils/config");
 // 渲染操作按钮
 var ActionButton = function ActionButton(_ref) {
-  var _editingKeys$includes;
+  var _editingKeys$includes, _btnConfig$buttonProp, _btnConfig$buttonProp2, _btnConfig$buttonProp3, _btnConfig$icon;
   var record = _ref.record,
     index = _ref.index,
     config = _ref.config,
     btnConfig = _ref.btnConfig;
-  var virtualKey = config.virtualKey,
+  var form = config.form,
+    virtualKey = config.virtualKey,
     editingKeys = config.editingKeys,
     selectedRowKeys = config.selectedRowKeys,
     deletePoConfirmMsg = config.deletePoConfirmMsg,
-    mulDeletePoConfirmMsg = config.mulDeletePoConfirmMsg;
+    mulDeletePoConfirmMsg = config.mulDeletePoConfirmMsg,
+    max = config.max,
+    tableLength = config.tableLength;
   // 操作按钮权限控制
   var getShow = function getShow(show) {
     if (typeof show === 'function') {
-      return show(record, index);
+      return show(record, {
+        index: index,
+        form: form
+      });
     }
     return show;
   };
+  // 操作按钮权限控制
+  var getDisabled = function getDisabled(disabled) {
+    if (typeof disabled === 'function') {
+      return disabled(record, {
+        index: index,
+        form: form
+      });
+    }
+    // 新增超过最大行，禁止操作按钮
+    if (btnConfig.type === 'add' && max && tableLength >= max) {
+      return true;
+    }
+    return disabled;
+  };
   var deleteMsgMap = {
     delete: deletePoConfirmMsg,
     mulDelete: mulDeletePoConfirmMsg
@@ -36,56 +58,71 @@ var ActionButton = function ActionButton(_ref) {
   var isEditing = !virtualKey || btnConfig.isEditable === (editingKeys === null || editingKeys === void 0 ? void 0 : (_editingKeys$includes = editingKeys.includes) === null || _editingKeys$includes === void 0 ? void 0 : _editingKeys$includes.call(editingKeys, record === null || record === void 0 ? void 0 : record.rowKey));
   // 单行删除、多行删除按钮Props
   var delBtnProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, btnConfig.buttonProps), {}, {
-    disabled: !selectedRowKeys.length && btnConfig.type === 'mulDelete'
+    disabled: getDisabled((_btnConfig$buttonProp = (_btnConfig$buttonProp2 = btnConfig.buttonProps) === null || _btnConfig$buttonProp2 === void 0 ? void 0 : _btnConfig$buttonProp2.disabled) !== null && _btnConfig$buttonProp !== void 0 ? _btnConfig$buttonProp : !selectedRowKeys.length && btnConfig.type === 'mulDelete')
   });
   // 其他操作按钮Props
   var actionBtnProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, btnConfig.buttonProps), {}, {
     onClick: function onClick() {
-      btnConfig.onClick(record, index);
-    }
+      btnConfig.onEvent(record, index);
+    },
+    disabled: getDisabled((_btnConfig$buttonProp3 = btnConfig.buttonProps) === null || _btnConfig$buttonProp3 === void 0 ? void 0 : _btnConfig$buttonProp3.disabled)
   });
   // 当传入函数时，先转成reactNode
   if ((0, _lodash.isFunction)(btnConfig.label)) {
-    btnConfig.label = /*#__PURE__*/_react.default.createElement(btnConfig.label, null);
+    btnConfig.label = (0, _jsxRuntime.jsx)(btnConfig.label, {
+      form: form
+    });
   }
   var isDisabled = !selectedRowKeys.length && btnConfig.type === 'mulDelete' || editingKeys.length || (delBtnProps === null || delBtnProps === void 0 ? void 0 : delBtnProps.disabled);
-  return isEditing && getShow(btnConfig.show) ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, ['delete', 'mulDelete'].includes(btnConfig.type) ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.needConfirm) ? /*#__PURE__*/_react.default.createElement(_antd.Popconfirm, {
-    placement: "topRight",
-    title: deleteMsgMap[btnConfig.type],
-    onConfirm: function onConfirm() {
-      btnConfig.onClick(record, index);
-    },
-    disabled: isDisabled,
-    okText: "\u786E\u8BA4",
-    cancelText: "\u53D6\u6D88"
-  }, /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
-    record: record,
-    index: index,
-    disabled: isDisabled
-  })) : /*#__PURE__*/_react.default.createElement(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
-    disabled: isDisabled,
-    type: "link"
-  }), btnConfig.label)) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
-    record: record,
-    index: index,
-    disabled: isDisabled,
-    onClick: function onClick() {
-      btnConfig.onClick(record, index);
-    }
-  })) : /*#__PURE__*/_react.default.createElement(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
-    disabled: isDisabled,
-    type: "link",
-    onClick: function onClick() {
-      btnConfig.onClick(record, index);
-    }
-  }), btnConfig.label))) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(actionBtnProps, ['buttonProps', 'isEditable'])), {}, {
-    record: record,
-    index: index
-  })) : /*#__PURE__*/_react.default.createElement(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-    className: "action-button"
-  }, (0, _lodash.omit)(actionBtnProps, ['buttonProps', 'isEditable'])), {}, {
-    type: "link"
-  }), btnConfig.label))) : null;
+  return isEditing && getShow(btnConfig.show) ? (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+    children: ['delete', 'mulDelete'].includes(btnConfig.type) ? (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+      children: (btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.needConfirm) ? (0, _jsxRuntime.jsx)(_antd.Popconfirm, {
+        placement: "topRight",
+        title: deleteMsgMap[btnConfig.type],
+        onConfirm: function onConfirm() {
+          btnConfig.onEvent(record, index);
+        },
+        disabled: isDisabled,
+        okText: "\u786E\u8BA4",
+        cancelText: "\u53D6\u6D88",
+        children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
+          record: record,
+          index: index,
+          disabled: isDisabled
+        })) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
+          disabled: isDisabled,
+          type: "link",
+          children: btnConfig.label
+        }))
+      }) : (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+        children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
+          record: record,
+          index: index,
+          disabled: isDisabled,
+          onClick: function onClick() {
+            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);
+          },
+          children: btnConfig.label
+        }))
+      })
+    }) : (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+      children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(actionBtnProps, ['buttonProps', 'isEditable'])), {}, {
+        record: record,
+        index: index
+      })) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        className: "action-button"
+      }, (0, _lodash.omit)(actionBtnProps, ['buttonProps', 'isEditable'])), {}, {
+        type: "link",
+        icon: (_btnConfig$icon = btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.icon) !== null && _btnConfig$icon !== void 0 ? _btnConfig$icon : _config.iconMap[btnConfig.type],
+        children: btnConfig.label
+      }))
+    })
+  }) : null;
 };
-var _default = ActionButton;
-exports.default = _default;
+var _default = exports.default = ActionButton;

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

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = exports.Row = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _jsxRuntime = require("react/jsx-runtime");
 var _react = _interopRequireDefault(require("react"));
 var _core = require("@dnd-kit/core");
 var _sortable = require("@dnd-kit/sortable");
@@ -14,7 +15,7 @@ var _utilities = require("@dnd-kit/utilities");
 var _reactSvg = require("react-svg");
 var _drag = _interopRequireDefault(require("../../../assets/drag.svg"));
 var _excluded = ["disabled", "children"];
-var Row = function Row(props) {
+var Row = exports.Row = function Row(props) {
   var disabled = props.disabled,
     children = props.children,
     restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
@@ -37,36 +38,44 @@ var Row = function Row(props) {
     position: 'relative',
     zIndex: 9999
   } : {});
-  return /*#__PURE__*/_react.default.createElement("tr", (0, _objectSpread2.default)((0, _objectSpread2.default)({}, restProps), {}, {
+  return (0, _jsxRuntime.jsx)("tr", (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, restProps), {}, {
     ref: setNodeRef,
     style: style
-  }, attributes), _react.default.Children.map(children, function (child) {
-    if (child.key === 'SORT') {
-      return /*#__PURE__*/_react.default.cloneElement(child, {
-        children: /*#__PURE__*/_react.default.createElement(_reactSvg.ReactSVG, (0, _objectSpread2.default)({
-          style: {
-            touchAction: 'none',
-            cursor: disabled ? 'no-drop' : 'move'
-          },
-          className: "drag-handle",
-          src: _drag.default
-        }, listeners))
-      });
-    }
-    return child;
+  }, attributes), {}, {
+    children: _react.default.Children.map(children, function (child) {
+      if (child.key === 'RC_TABLE_KEY') {
+        var _ref = (child === null || child === void 0 ? void 0 : child.props) || {},
+          render = _ref.render,
+          record = _ref.record,
+          renderIndex = _ref.renderIndex;
+        return /*#__PURE__*/_react.default.cloneElement(child, {
+          children: (0, _jsxRuntime.jsxs)("span", {
+            className: "drag-wrapper",
+            children: [(0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, (0, _objectSpread2.default)({
+              style: {
+                touchAction: 'none',
+                cursor: disabled ? 'no-drop' : 'move'
+              },
+              className: "drag-handle",
+              src: _drag.default
+            }, listeners)), render === null || render === void 0 ? void 0 : render(null, record, renderIndex)]
+          })
+        });
+      }
+      return child;
+    })
   }));
 };
-exports.Row = Row;
-var DndWrapper = function DndWrapper(_ref) {
+var DndWrapper = function DndWrapper(_ref2) {
   var _value$;
-  var draggable = _ref.draggable,
-    value = _ref.value,
-    onChange = _ref.onChange,
-    disabled = _ref.disabled,
-    children = _ref.children;
-  var onDragEnd = function onDragEnd(_ref2) {
-    var active = _ref2.active,
-      over = _ref2.over;
+  var draggable = _ref2.draggable,
+    value = _ref2.value,
+    onChange = _ref2.onChange,
+    disabled = _ref2.disabled,
+    children = _ref2.children;
+  var onDragEnd = function onDragEnd(_ref3) {
+    var active = _ref3.active,
+      over = _ref3.over;
     if (active.id !== (over === null || over === void 0 ? void 0 : over.id)) {
       var activeIndex = value.findIndex(function (i) {
         return i.rowKey === active.id;
@@ -78,14 +87,15 @@ var DndWrapper = function DndWrapper(_ref) {
       onChange(nextValue);
     }
   };
-  return draggable && !disabled ? /*#__PURE__*/_react.default.createElement(_core.DndContext, {
-    onDragEnd: onDragEnd
-  }, /*#__PURE__*/_react.default.createElement(_sortable.SortableContext, {
-    items: (value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey) ? value.map(function (i) {
-      return i.rowKey;
-    }) : [],
-    strategy: _sortable.verticalListSortingStrategy
-  }, children)) : children;
+  return draggable && !disabled ? (0, _jsxRuntime.jsx)(_core.DndContext, {
+    onDragEnd: onDragEnd,
+    children: (0, _jsxRuntime.jsx)(_sortable.SortableContext, {
+      items: (value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey) ? value.map(function (i) {
+        return i.rowKey;
+      }) : [],
+      strategy: _sortable.verticalListSortingStrategy,
+      children: children
+    })
+  }) : children;
 };
-var _default = DndWrapper;
-exports.default = _default;
+var _default = exports.default = DndWrapper;

package/lib/ProEditTable/components/RenderField/index.d.ts

@@ -1,3 +1,2 @@
-import React from 'react';
-declare const RenderField: ({ text: value, record, index, column, config }: any) => React.JSX.Element;
+declare const RenderField: ({ text: value, record, index, column, config }: any) => JSX.Element;
 export default RenderField;