@zat-design/sisyphus-react 3.4.0-beta.3 → 3.4.0-beta.4

package/dist/index.esm.css

@@ -4062,7 +4062,8 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   display: flex;
 }
 .pro-edit-table .drag-wrapper .drag-icon {
-  margin-right: var(--zaui-space-size-xs, 4px);
+  margin-right: var(--zaui-space-size-md, 16px);
+  margin-left: var(--zaui-space-size-xs, 4px);
   cursor: pointer;
 }
 .pro-edit-table.pro-table-no-stripe .ant-table-tbody tr:nth-child(n) > td {
@@ -4081,33 +4082,24 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   padding-left: var(--zaui-space-size-md, 16px);
   padding-right: var(--zaui-space-size-md, 16px);
 }
-.pro-edit-table .ant-table-header > table .ant-table-thead > tr > th:not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan]).is-required::after {
-  content: "";
-}
-.pro-edit-table .ant-table-header > table .ant-table-thead > tr > th:not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan]).is-required.is-required-left::before {
-  content: "";
-}
-.pro-edit-table .ant-table-header > table .ant-table-thead > tr > th:not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan]).is-required .pro-edit-table-title::after {
-  width: auto;
+.pro-edit-table .ant-table-header > table .ant-table-thead > tr > th:not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan]).is-required.is-required-right .pro-edit-table-title::before {
   position: static;
   top: 0;
   display: inline-block;
-  margin-left: var(--zaui-space-size-xs, 4px);
+  text-indent: -8px;
   color: #ff5050;
-  font-size: 14px;
+  font-size: var(--zaui-font-size-md, 14px);
   line-height: 1;
   content: "*";
 }
-.pro-edit-table .ant-table-header > table .ant-table-thead > tr > th:not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan]).is-required .pro-edit-table-title.is-required-left::after {
-  display: none;
-}
-.pro-edit-table .ant-table-header > table .ant-table-thead > tr > th:not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan]).is-required .pro-edit-table-title.is-required-left::before {
+.pro-edit-table .ant-table-header > table .ant-table-thead > tr > th:not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan]).is-required.is-required-left .pro-edit-table-title::after {
+  width: auto;
   position: static;
   top: 0;
   display: inline-block;
-  text-indent: -8px;
+  margin-left: var(--zaui-space-size-xs, 4px);
   color: #ff5050;
-  font-size: var(--zaui-font-size-md, 14px);
+  font-size: 14px;
   line-height: 1;
   content: "*";
 }
@@ -4130,33 +4122,24 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-edit-table .ant-table-content > table td .pro-form-view-container_nowrap {
   white-space: normal;
 }
-.pro-edit-table .ant-table-content > table .ant-table-thead > tr > th:not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan]).is-required::after {
-  content: "";
-}
-.pro-edit-table .ant-table-content > table .ant-table-thead > tr > th:not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan]).is-required.is-required-left::before {
-  content: "";
-}
-.pro-edit-table .ant-table-content > table .ant-table-thead > tr > th:not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan]).is-required .pro-edit-table-title::after {
-  width: auto;
+.pro-edit-table .ant-table-content > table .ant-table-thead > tr > th:not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan]).is-required.is-required-right .pro-edit-table-title::before {
   position: static;
   top: 0;
   display: inline-block;
-  margin-left: var(--zaui-space-size-xs, 4px);
+  text-indent: -8px;
   color: #ff5050;
   font-size: var(--zaui-font-size-md, 14px);
   line-height: 1;
   content: "*";
 }
-.pro-edit-table .ant-table-content > table .ant-table-thead > tr > th:not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan]).is-required .pro-edit-table-title.is-required-left::after {
-  display: none;
-}
-.pro-edit-table .ant-table-content > table .ant-table-thead > tr > th:not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan]).is-required .pro-edit-table-title.is-required-left::before {
+.pro-edit-table .ant-table-content > table .ant-table-thead > tr > th:not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan]).is-required.is-required-left .pro-edit-table-title::after {
+  width: auto;
   position: static;
   top: 0;
   display: inline-block;
-  text-indent: -8px;
+  margin-left: var(--zaui-space-size-xs, 4px);
   color: #ff5050;
-  font-size: var(--zaui-font-size-md, 14px);
+  font-size: 14px;
   line-height: 1;
   content: "*";
 }

package/es/ProEditTable/index.js

@@ -12,9 +12,9 @@ import _Form from "antd/es/form";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["value", "onChange", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "otherProps", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalTip", "rowKey"];
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useRef } from 'react';
+import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
 import { get, isArray } from 'lodash';
-import { useDebounceEffect, useSetState } from 'ahooks';
+import { useDebounceEffect, useLocalStorageState, useSetState } from 'ahooks';
 import classnames from 'classnames';
 import { transformColumns } from './utils';
 import { getRandom, getNamePath } from './utils/tools';
@@ -22,7 +22,7 @@ import { DndWrapper, Row, Validator, Summary, RenderToolbar } from './components
 import Empty from '../assets/empty.png';
 import locale, { formatMessage } from '../locale';
 var ProEditTable = function ProEditTable(_ref, ref) {
-  var _resetProps$id, _resetProps$id$split, _value$2;
+  var _resetProps$id, _resetProps$id$split, _themeConfig$data2, _value$2;
   var value = _ref.value,
     onChange = _ref.onChange,
     className = _ref.className,
@@ -43,7 +43,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     mulDeletePoConfirmMsg = _ref.mulDeletePoConfirmMsg,
     _ref$otherProps = _ref.otherProps,
     otherProps = _ref$otherProps === void 0 ? {} : _ref$otherProps,
-    requiredAlign = _ref.requiredAlign,
+    configRequiredAlign = _ref.requiredAlign,
     summary = _ref.summary,
     max = _ref.max,
     headerRender = _ref.headerRender,
@@ -65,6 +65,13 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     getPrefixCls = _React$useContext.getPrefixCls;
   var prefixCls = getPrefixCls();
   disabled = (otherProps === null || otherProps === void 0 ? void 0 : otherProps.disabled) || disabled;
+  var _useLocalStorageState = useLocalStorageState('themeConfig'),
+    _useLocalStorageState2 = _slicedToArray(_useLocalStorageState, 1),
+    themeConfig = _useLocalStorageState2[0];
+  var requiredAlign = useMemo(function () {
+    var _ref2, _themeConfig$data$zau, _themeConfig$data;
+    return (_ref2 = (_themeConfig$data$zau = themeConfig === null || themeConfig === void 0 ? void 0 : (_themeConfig$data = themeConfig.data) === null || _themeConfig$data === void 0 ? void 0 : _themeConfig$data.zauiFormAlign) !== null && _themeConfig$data$zau !== void 0 ? _themeConfig$data$zau : configRequiredAlign) !== null && _ref2 !== void 0 ? _ref2 : 'left';
+  }, [themeConfig === null || themeConfig === void 0 ? void 0 : (_themeConfig$data2 = themeConfig.data) === null || _themeConfig$data2 === void 0 ? void 0 : _themeConfig$data2.zauiFormAlign]);
   var _useSetState = useSetState({
       _columns: columns,
       cellNamePath: [],
@@ -101,8 +108,8 @@ var ProEditTable = function ProEditTable(_ref, ref) {
   var getRowKey = function getRowKey(record) {
     var key = record.rowKey || getRandom();
     if (rowKey) {
-      var _ref2;
-      key = (_ref2 = typeof rowKey === 'function' ? rowKey(record) : record[rowKey]) !== null && _ref2 !== void 0 ? _ref2 : key;
+      var _ref3;
+      key = (_ref3 = typeof rowKey === 'function' ? rowKey(record) : record[rowKey]) !== null && _ref3 !== void 0 ? _ref3 : key;
     }
     return key;
   };
@@ -226,7 +233,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     return isForbiddenBtn('mulDelete') ? rowSelection : _rowSelection;
   };
   var setColumns = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var nextColumns;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -245,7 +252,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
       }, _callee);
     }));
     return function setColumns() {
-      return _ref3.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
   useDebounceEffect(function () {
@@ -355,7 +362,6 @@ ForwardProEditTable.defaultProps = {
   type: 'multiple',
   mode: 'multiple',
   insertType: 'after',
-  requiredAlign: 'right',
   value: [],
   actionProps: [],
   toolbarProps: [],

package/es/ProEditTable/style/index.less

@@ -63,7 +63,8 @@
   .drag-wrapper {
     display: flex;
     .drag-icon {
-      margin-right: var(--zaui-space-size-xs, 4px);
+      margin-right: var(--zaui-space-size-md, 16px);
+      margin-left: var(--zaui-space-size-xs, 4px);
       cursor: pointer;
     }
   }
@@ -92,33 +93,8 @@
   }
 
   .@{ant-prefix}-table-header>table .@{ant-prefix}-table-thead>tr>th:not(.@{ant-prefix}-table-selection-column):not(.@{ant-prefix}-table-row-expand-icon-cell):not([colspan]).is-required {
-    &::after {
-      content: "";
-    }
-
-    &.is-required-left {
-      &::before {
-        content: "";
-      }
-    }
-    .pro-edit-table-title {
-      &::after {
-        width: auto;
-        position   : static;
-        top        : 0;
-        display    : inline-block;
-        margin-left: var(--zaui-space-size-xs, 4px);
-        color      : #ff5050;
-        font-size  : 14px;
-        line-height: 1;
-        content    : "*";
-      }
-
-      &.is-required-left {
-        &::after {
-          display: none;
-        }
-
+    &.is-required-right {
+      .pro-edit-table-title {
         &::before {
           position   : static;
           top        : 0;
@@ -131,6 +107,21 @@
         }
       }
     }
+    &.is-required-left {
+      .pro-edit-table-title {
+        &::after {
+          width: auto;
+          position   : static;
+          top        : 0;
+          display    : inline-block;
+          margin-left: var(--zaui-space-size-xs, 4px);
+          color      : #ff5050;
+          font-size  : 14px;
+          line-height: 1;
+          content    : "*";
+        }
+      }
+    }
   }
 
   .@{ant-prefix}-table-scroll-horizontal {
@@ -166,33 +157,8 @@
       }
 
       .@{ant-prefix}-table-thead>tr>th:not(.@{ant-prefix}-table-selection-column):not(.@{ant-prefix}-table-row-expand-icon-cell):not([colspan]).is-required {
-        &::after {
-          content: "";
-        }
-
-        &.is-required-left {
-          &::before {
-            content: "";
-          }
-        }
-        .pro-edit-table-title {
-          &::after {
-            width: auto;
-            position   : static;
-            top        : 0;
-            display    : inline-block;
-            margin-left: var(--zaui-space-size-xs, 4px);
-            color      : #ff5050;
-            font-size  : var(--zaui-font-size-md, 14px);
-            line-height: 1;
-            content    : "*";
-          }
-
-          &.is-required-left {
-            &::after {
-              display: none;
-            }
-
+        &.is-required-right {
+          .pro-edit-table-title {
             &::before {
               position   : static;
               top        : 0;
@@ -205,6 +171,21 @@
             }
           }
         }
+        &.is-required-left {
+          .pro-edit-table-title {
+            &::after {
+              width: auto;
+              position   : static;
+              top        : 0;
+              display    : inline-block;
+              margin-left: var(--zaui-space-size-xs, 4px);
+              color      : #ff5050;
+              font-size  : 14px;
+              line-height: 1;
+              content    : "*";
+            }
+          }
+        }
       }
     }
   }

package/es/ProEditTable/utils/index.js

@@ -250,8 +250,8 @@ export var transformColumns = function transformColumns() {
     item.className = classnames(_defineProperty({
       'is-hidden': hidden,
       'is-required': required || labelRequired,
-      'is-required-right': requiredAlign === 'right',
-      'is-required-left': requiredAlign === 'left'
+      'is-required-left': requiredAlign === 'left',
+      'is-required-right': requiredAlign === 'right'
     }, className, className));
     // 防止重复渲染导致className重复添加
     if (item.className) {

package/es/ProEnum/components/Group.d.ts

@@ -0,0 +1,7 @@
+import { ProEnum } from '../propsType';
+interface Props extends Pick<ProEnum, 'value' | 'onChange' | 'dataSource'> {
+    fieldValue: string;
+    fieldLabel: string;
+}
+declare const Group: (props: Props) => JSX.Element;
+export default Group;

package/es/ProEnum/components/Group.js

@@ -0,0 +1,42 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import classNames from 'classnames';
+import { useEffect, useState } from 'react';
+var Group = function Group(props) {
+  var value = props.value,
+    onChange = props.onChange,
+    dataSource = props.dataSource,
+    fieldValue = props.fieldValue,
+    fieldLabel = props.fieldLabel;
+  var _useState = useState(),
+    _useState2 = _slicedToArray(_useState, 2),
+    checked = _useState2[0],
+    setValue = _useState2[1];
+  useEffect(function () {
+    setValue(value);
+  }, [value]);
+  var handleClick = function handleClick(val) {
+    setValue(val);
+    onChange === null || onChange === void 0 ? void 0 : onChange(val);
+  };
+  if (dataSource.length === 0) {
+    return _jsx("span", {
+      children: "-"
+    });
+  }
+  return _jsx("div", {
+    className: "pro-enum-group-root",
+    children: dataSource.map(function (item) {
+      return _jsxs("div", {
+        onClick: function onClick() {
+          return handleClick(item[fieldValue]);
+        },
+        className: classNames('pro-enum-group-item', checked === item[fieldValue] ? 'pro-enum-group-item-selected' : ''),
+        children: [_jsx("div", {
+          className: "pro-enum-group-item-after"
+        }), item[fieldLabel]]
+      }, item[fieldValue]);
+    })
+  });
+};
+export default Group;

package/es/ProEnum/index.js

@@ -20,6 +20,7 @@ import { cloneDeep, isFunction, isString, isArray, omit } from 'lodash';
 import ProSelect from '../ProSelect';
 import { useProConfig } from '../ProConfigProvider';
 import ProEnumTag from './components/Tag';
+import ProEnumGroup from './components/Group';
 import Container from '../ProForm/components/Container';
 import { isObject } from './utils';
 import getEnumLabel from './utils/getEnumLabel';
@@ -205,6 +206,14 @@ var ProEnum = function ProEnum(props) {
           fieldValue: fieldValue,
           dataSource: list
         });
+      case 'Group':
+        return _jsx(ProEnumGroup, {
+          value: value,
+          onChange: onChange,
+          fieldLabel: label,
+          fieldValue: fieldValue,
+          dataSource: list
+        });
       default:
         return null;
     }

package/es/ProEnum/propsType.d.ts

@@ -42,7 +42,7 @@ export interface ProEnumConfig {
     };
     dics: Record<string, DataOption[]>;
 }
-type ProEnumType = 'ProSelect' | 'Radio' | 'Checkbox' | 'Tag';
+type ProEnumType = 'ProSelect' | 'Radio' | 'Checkbox' | 'Tag' | 'Group';
 export interface ProEnum {
     /** 组件展示类型、默认 ProSelect */
     type?: ProEnumType;
@@ -86,7 +86,7 @@ export type CheckboxPropsMap = {
     type?: 'Checkbox';
 } & CheckboxProps;
 export interface TagPropsMap {
-    type?: 'Tag';
+    type?: 'Tag' | 'Group';
 }
 export type ProEnumProps = Omit<ProEnum, 'type'> & (PropProSelectsMap | PropRadioPropsMap | CheckboxPropsMap | TagPropsMap);
 export {};

package/es/ProEnum/style/index.less

@@ -27,4 +27,53 @@
     background-color: #f5f5f5;
     pointer-events: none;
   }
+
+  &-group-root {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+
+    .pro-enum-group-item {
+      position: relative;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      // margin-right: var(--zaui-space-size-sm);
+      margin-bottom: calc(var(--zaui-space-size-sm; 8px) * var(--zaui-size; 1));
+      padding: var(--zaui-space-size-xs) 10px;
+      background-color: #f5f5f5;
+      cursor: pointer;
+
+      .pro-enum-group-item-after {
+        position: absolute;
+        top: var(--zaui-space-size-xs);
+        right: 0;
+        bottom: var(--zaui-space-size-xs);
+        width: 1px;
+        // height: ;
+        background: var(--zaui-brand);
+        opacity: 0.7;
+      }
+
+      &:first-child {
+        border-top-left-radius: var(--zaui-space-size-xs);
+        border-bottom-left-radius: var(--zaui-space-size-xs);
+      }
+      &:last-child {
+        border-top-right-radius: var(--zaui-space-size-xs);
+        border-bottom-right-radius: var(--zaui-space-size-xs);
+        .pro-enum-group-item-after {
+          width: 0;
+        }
+      }
+    }
+
+    .pro-enum-group-item-selected {
+      color: var(--zaui-brand);
+      border: 1px solid var(--zaui-brand);
+      .pro-enum-group-item-after {
+        width: 0;
+      }
+    }
+  }
 }

package/es/ProForm/components/render/ConfirmWrapper.d.ts

@@ -0,0 +1,10 @@
+import React from 'react';
+import { ProFormColumnProps } from '@/ProForm/propsType';
+interface Props<T = any> {
+    value?: T;
+    onChange?: (value: T, ...rest: any[]) => void;
+    confirmProps: ProFormColumnProps['confirmProps'];
+    [K: string]: any;
+}
+declare const ConfirmWrapper: React.FC<Props>;
+export default ConfirmWrapper;

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

@@ -0,0 +1,53 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import "antd/es/modal/style";
+import _Modal from "antd/es/modal";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["onChange", "children", "confirmProps"];
+import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
+import { isFunction } from 'lodash';
+import React from 'react';
+import ProForm from '@/ProForm';
+var defaultConfirmProps = {
+  title: '点击确定完成修改'
+};
+var ConfirmWrapper = function ConfirmWrapper(props) {
+  var onChange = props.onChange,
+    children = props.children,
+    confirmProps = props.confirmProps,
+    rest = _objectWithoutProperties(props, _excluded);
+  var needConfirm = confirmProps.needConfirm;
+  var _ProForm$useFieldProp = ProForm.useFieldProps(),
+    form = _ProForm$useFieldProp.form;
+  var handleOk = function handleOk(changeProps, okProps) {
+    var _confirmProps$onOk;
+    confirmProps === null || confirmProps === void 0 ? void 0 : (_confirmProps$onOk = confirmProps.onOk) === null || _confirmProps$onOk === void 0 ? void 0 : _confirmProps$onOk.call.apply(_confirmProps$onOk, [confirmProps].concat(_toConsumableArray(okProps)));
+    // @ts-ignore
+    onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, _toConsumableArray(changeProps));
+  };
+  var handleChange = function handleChange(value) {
+    for (var _len = arguments.length, other = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+      other[_key - 1] = arguments[_key];
+    }
+    if (needConfirm === true || isFunction(needConfirm) && needConfirm(form.getFieldsValue())) {
+      _Modal.confirm(_objectSpread(_objectSpread(_objectSpread({}, defaultConfirmProps), confirmProps), {}, {
+        onOk: function onOk() {
+          for (var _len2 = arguments.length, arg = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+            arg[_key2] = arguments[_key2];
+          }
+          return handleOk([value].concat(other), arg);
+        }
+      }));
+    } else {
+      onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [value].concat(other));
+    }
+  };
+  return _jsx(_Fragment, {
+    children: /*#__PURE__*/React.isValidElement(children) && /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, rest), {}, {
+      // @ts-ignore
+      value: rest.value === undefined ? null : rest.value,
+      onChange: handleChange
+    }))
+  });
+};
+export default ConfirmWrapper;

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

@@ -31,6 +31,7 @@ import valueTypeMap from '../../utils/valueType';
 import { useChanged } from '../../utils/useChanged';
 import tipSvg from '../../../assets/tip.svg';
 import useRules from '../../utils/useRules';
+import ConfirmWrapper from './ConfirmWrapper';
 // 这个组件只管渲染, 参数的整理在外部处理
 var Render = function Render(props) {
   var _ref2, _otherProps$names2;
@@ -51,7 +52,8 @@ var Render = function Render(props) {
     originalValues = props.originalValues,
     equalWith = props.equalWith,
     requiredOnView = props.requiredOnView,
-    originalTip = props.originalTip;
+    originalTip = props.originalTip,
+    confirmProps = props.confirmProps;
   var colProps = props.colProps;
   // 剔除一些不是FormItem的属性, 防止控制台报warning
   var labelWidth = formItemProps.labelWidth,
@@ -354,6 +356,13 @@ var Render = function Render(props) {
       onChange: handleChange,
       onBlur: handleBlur
     }));
+    if (confirmProps === null || confirmProps === void 0 ? void 0 : confirmProps.needConfirm) {
+      child = _jsx(ConfirmWrapper, _objectSpread(_objectSpread({
+        confirmProps: confirmProps
+      }, childProps), {}, {
+        children: child
+      }));
+    }
     // 表单提示
     if (tooltip) {
       _otherFormItemProps.tooltip = {

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

@@ -1,6 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "equalWith", "clearNotShow", "required"];
+var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "equalWith", "clearNotShow", "required", "confirmProps"];
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import React from 'react';
 import { isBoolean, isFunction, union, isString } from 'lodash';
@@ -71,6 +71,7 @@ var RenderFields = function RenderFields(props) {
       _column$clearNotShow = column.clearNotShow,
       clearNotShow = _column$clearNotShow === void 0 ? outerClearNotShow : _column$clearNotShow,
       columnRequired = column.required,
+      confirmProps = column.confirmProps,
       otherFormItemProps = _objectWithoutProperties(column, _excluded);
     var component = column.component;
     var _isView = typeof column.isView === 'boolean' ? column.isView : isView;
@@ -194,6 +195,7 @@ var RenderFields = function RenderFields(props) {
         component: TargetComponent,
         // @ts-ignore
         formItemProps: _formItemProps,
+        confirmProps: confirmProps,
         colProps: _colProps,
         componentProps: componentProps,
         otherProps: otherProps,

package/es/ProForm/components/render/propsType.d.ts

@@ -1,4 +1,4 @@
-import { ColProps, FormInstance, FormItemProps } from 'antd';
+import { ColProps, FormInstance, FormItemProps, ModalFuncProps } from 'antd';
 import { NamePath } from 'antd/es/form/interface';
 import React from 'react';
 import { validate, regExp } from '@zat-design/utils';
@@ -175,7 +175,7 @@ export type ColumnPropsMap<Values = any, T = 'ProForm'> = {
     type?: 'Container';
     fieldProps?: any;
 };
-interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Values>, 'rules' | 'required'> {
+export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Values>, 'rules' | 'required'> {
     component?: React.ReactNode | ReactiveFunction<Values, React.ReactNode>;
     names?: NamePath[];
     show?: boolean | ReactiveFunction<Values, boolean>;
@@ -224,6 +224,9 @@ interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Values>, '
     extra?: string | React.ReactNode;
     /** 是否固定字段, 不隐藏 */
     fixed?: boolean;
+    confirmProps?: ModalFuncProps & {
+        needConfirm?: boolean | ((values: any) => boolean);
+    };
 }
 export type ProColumnProps<T = any> = ProFormColumnProps<T> & ColumnPropsMap<T, 'ProForm'>;
 /**
@@ -268,6 +271,7 @@ export interface RenderProps<Values = any> {
     isSelect: boolean;
     originalValues?: Values;
     requiredOnView?: boolean;
+    confirmProps?: ProFormColumnProps['confirmProps'];
     [name: string]: any;
 }
 export {};

package/es/ProTable/components/RenderColumn/index.js

@@ -80,8 +80,7 @@ var RenderColumn = function RenderColumn(props) {
         width: width
       },
       ellipsis: {
-        tooltip: true,
-        onEllipsis: function onEllipsis() {}
+        tooltip: true
       },
       children: node
     }) : '-';

package/es/ProTable/propsType.d.ts

@@ -24,7 +24,7 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
     valueType?: ProTableValueType;
     format?: string;
     precision?: number;
-    code?: string | string[] | (() => string);
+    code?: string | string[] | ((text: any, record: any) => string);
     copyable?: boolean;
     originalTip?: boolean;
     prefix?: string | ReactNode | ((value: any, record?: any, index?: number) => any);

package/es/ProTable/utils.js

@@ -208,7 +208,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
     };
   } else if (['enumName', 'enumCodeName'].includes(valueType)) {
     column.render = function (value, record, index) {
-      var realCode = typeof code === 'function' ? code() : code;
+      var realCode = typeof code === 'function' ? code(value, record) : code;
       var renderValue = getEnumLabel(realCode, value, valueType === 'enumCodeName');
       var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
       var originalRenderValue = getEnumLabel(realCode, originalValue, valueType === 'enumCodeName');

package/lib/ProEditTable/index.js

@@ -25,7 +25,7 @@ var _empty = _interopRequireDefault(require("../assets/empty.png"));
 var _locale = _interopRequireWildcard(require("../locale"));
 var _excluded = ["value", "onChange", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "otherProps", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalTip", "rowKey"];
 var ProEditTable = function ProEditTable(_ref, ref) {
-  var _resetProps$id, _resetProps$id$split, _value$2;
+  var _resetProps$id, _resetProps$id$split, _themeConfig$data2, _value$2;
   var value = _ref.value,
     onChange = _ref.onChange,
     className = _ref.className,
@@ -46,7 +46,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     mulDeletePoConfirmMsg = _ref.mulDeletePoConfirmMsg,
     _ref$otherProps = _ref.otherProps,
     otherProps = _ref$otherProps === void 0 ? {} : _ref$otherProps,
-    requiredAlign = _ref.requiredAlign,
+    configRequiredAlign = _ref.requiredAlign,
     summary = _ref.summary,
     max = _ref.max,
     headerRender = _ref.headerRender,
@@ -68,6 +68,13 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     getPrefixCls = _React$useContext.getPrefixCls;
   var prefixCls = getPrefixCls();
   disabled = (otherProps === null || otherProps === void 0 ? void 0 : otherProps.disabled) || disabled;
+  var _useLocalStorageState = (0, _ahooks.useLocalStorageState)('themeConfig'),
+    _useLocalStorageState2 = (0, _slicedToArray2.default)(_useLocalStorageState, 1),
+    themeConfig = _useLocalStorageState2[0];
+  var requiredAlign = (0, _react.useMemo)(function () {
+    var _ref2, _themeConfig$data$zau, _themeConfig$data;
+    return (_ref2 = (_themeConfig$data$zau = themeConfig === null || themeConfig === void 0 ? void 0 : (_themeConfig$data = themeConfig.data) === null || _themeConfig$data === void 0 ? void 0 : _themeConfig$data.zauiFormAlign) !== null && _themeConfig$data$zau !== void 0 ? _themeConfig$data$zau : configRequiredAlign) !== null && _ref2 !== void 0 ? _ref2 : 'left';
+  }, [themeConfig === null || themeConfig === void 0 ? void 0 : (_themeConfig$data2 = themeConfig.data) === null || _themeConfig$data2 === void 0 ? void 0 : _themeConfig$data2.zauiFormAlign]);
   var _useSetState = (0, _ahooks.useSetState)({
       _columns: columns,
       cellNamePath: [],
@@ -104,8 +111,8 @@ var ProEditTable = function ProEditTable(_ref, ref) {
   var getRowKey = function getRowKey(record) {
     var key = record.rowKey || (0, _tools.getRandom)();
     if (rowKey) {
-      var _ref2;
-      key = (_ref2 = typeof rowKey === 'function' ? rowKey(record) : record[rowKey]) !== null && _ref2 !== void 0 ? _ref2 : key;
+      var _ref3;
+      key = (_ref3 = typeof rowKey === 'function' ? rowKey(record) : record[rowKey]) !== null && _ref3 !== void 0 ? _ref3 : key;
     }
     return key;
   };
@@ -229,7 +236,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     return isForbiddenBtn('mulDelete') ? rowSelection : _rowSelection;
   };
   var setColumns = /*#__PURE__*/function () {
-    var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
       var nextColumns;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -248,7 +255,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
       }, _callee);
     }));
     return function setColumns() {
-      return _ref3.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
   (0, _ahooks.useDebounceEffect)(function () {
@@ -358,7 +365,6 @@ ForwardProEditTable.defaultProps = {
   type: 'multiple',
   mode: 'multiple',
   insertType: 'after',
-  requiredAlign: 'right',
   value: [],
   actionProps: [],
   toolbarProps: [],

package/lib/ProEditTable/style/index.less

@@ -63,7 +63,8 @@
   .drag-wrapper {
     display: flex;
     .drag-icon {
-      margin-right: var(--zaui-space-size-xs, 4px);
+      margin-right: var(--zaui-space-size-md, 16px);
+      margin-left: var(--zaui-space-size-xs, 4px);
       cursor: pointer;
     }
   }
@@ -92,33 +93,8 @@
   }
 
   .@{ant-prefix}-table-header>table .@{ant-prefix}-table-thead>tr>th:not(.@{ant-prefix}-table-selection-column):not(.@{ant-prefix}-table-row-expand-icon-cell):not([colspan]).is-required {
-    &::after {
-      content: "";
-    }
-
-    &.is-required-left {
-      &::before {
-        content: "";
-      }
-    }
-    .pro-edit-table-title {
-      &::after {
-        width: auto;
-        position   : static;
-        top        : 0;
-        display    : inline-block;
-        margin-left: var(--zaui-space-size-xs, 4px);
-        color      : #ff5050;
-        font-size  : 14px;
-        line-height: 1;
-        content    : "*";
-      }
-
-      &.is-required-left {
-        &::after {
-          display: none;
-        }
-
+    &.is-required-right {
+      .pro-edit-table-title {
         &::before {
           position   : static;
           top        : 0;
@@ -131,6 +107,21 @@
         }
       }
     }
+    &.is-required-left {
+      .pro-edit-table-title {
+        &::after {
+          width: auto;
+          position   : static;
+          top        : 0;
+          display    : inline-block;
+          margin-left: var(--zaui-space-size-xs, 4px);
+          color      : #ff5050;
+          font-size  : 14px;
+          line-height: 1;
+          content    : "*";
+        }
+      }
+    }
   }
 
   .@{ant-prefix}-table-scroll-horizontal {
@@ -166,33 +157,8 @@
       }
 
       .@{ant-prefix}-table-thead>tr>th:not(.@{ant-prefix}-table-selection-column):not(.@{ant-prefix}-table-row-expand-icon-cell):not([colspan]).is-required {
-        &::after {
-          content: "";
-        }
-
-        &.is-required-left {
-          &::before {
-            content: "";
-          }
-        }
-        .pro-edit-table-title {
-          &::after {
-            width: auto;
-            position   : static;
-            top        : 0;
-            display    : inline-block;
-            margin-left: var(--zaui-space-size-xs, 4px);
-            color      : #ff5050;
-            font-size  : var(--zaui-font-size-md, 14px);
-            line-height: 1;
-            content    : "*";
-          }
-
-          &.is-required-left {
-            &::after {
-              display: none;
-            }
-
+        &.is-required-right {
+          .pro-edit-table-title {
             &::before {
               position   : static;
               top        : 0;
@@ -205,6 +171,21 @@
             }
           }
         }
+        &.is-required-left {
+          .pro-edit-table-title {
+            &::after {
+              width: auto;
+              position   : static;
+              top        : 0;
+              display    : inline-block;
+              margin-left: var(--zaui-space-size-xs, 4px);
+              color      : #ff5050;
+              font-size  : 14px;
+              line-height: 1;
+              content    : "*";
+            }
+          }
+        }
       }
     }
   }

package/lib/ProEditTable/utils/index.js

@@ -254,8 +254,8 @@ var transformColumns = exports.transformColumns = function transformColumns() {
     item.className = (0, _classnames2.default)((0, _defineProperty2.default)({
       'is-hidden': hidden,
       'is-required': required || labelRequired,
-      'is-required-right': requiredAlign === 'right',
-      'is-required-left': requiredAlign === 'left'
+      'is-required-left': requiredAlign === 'left',
+      'is-required-right': requiredAlign === 'right'
     }, className, className));
     // 防止重复渲染导致className重复添加
     if (item.className) {

package/lib/ProEnum/components/Group.d.ts

@@ -0,0 +1,7 @@
+import { ProEnum } from '../propsType';
+interface Props extends Pick<ProEnum, 'value' | 'onChange' | 'dataSource'> {
+    fieldValue: string;
+    fieldLabel: string;
+}
+declare const Group: (props: Props) => JSX.Element;
+export default Group;

package/lib/ProEnum/components/Group.js

@@ -0,0 +1,49 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _jsxRuntime = require("react/jsx-runtime");
+var _classnames = _interopRequireDefault(require("classnames"));
+var _react = require("react");
+var Group = function Group(props) {
+  var value = props.value,
+    onChange = props.onChange,
+    dataSource = props.dataSource,
+    fieldValue = props.fieldValue,
+    fieldLabel = props.fieldLabel;
+  var _useState = (0, _react.useState)(),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    checked = _useState2[0],
+    setValue = _useState2[1];
+  (0, _react.useEffect)(function () {
+    setValue(value);
+  }, [value]);
+  var handleClick = function handleClick(val) {
+    setValue(val);
+    onChange === null || onChange === void 0 ? void 0 : onChange(val);
+  };
+  if (dataSource.length === 0) {
+    return (0, _jsxRuntime.jsx)("span", {
+      children: "-"
+    });
+  }
+  return (0, _jsxRuntime.jsx)("div", {
+    className: "pro-enum-group-root",
+    children: dataSource.map(function (item) {
+      return (0, _jsxRuntime.jsxs)("div", {
+        onClick: function onClick() {
+          return handleClick(item[fieldValue]);
+        },
+        className: (0, _classnames.default)('pro-enum-group-item', checked === item[fieldValue] ? 'pro-enum-group-item-selected' : ''),
+        children: [(0, _jsxRuntime.jsx)("div", {
+          className: "pro-enum-group-item-after"
+        }), item[fieldLabel]]
+      }, item[fieldValue]);
+    })
+  });
+};
+var _default = exports.default = Group;

package/lib/ProEnum/index.js

@@ -19,6 +19,7 @@ var _lodash = require("lodash");
 var _ProSelect = _interopRequireDefault(require("../ProSelect"));
 var _ProConfigProvider = require("../ProConfigProvider");
 var _Tag = _interopRequireDefault(require("./components/Tag"));
+var _Group = _interopRequireDefault(require("./components/Group"));
 var _Container = _interopRequireDefault(require("../ProForm/components/Container"));
 var _utils = require("./utils");
 var _getEnumLabel = _interopRequireDefault(require("./utils/getEnumLabel"));
@@ -206,6 +207,14 @@ var ProEnum = function ProEnum(props) {
           fieldValue: fieldValue,
           dataSource: list
         });
+      case 'Group':
+        return (0, _jsxRuntime.jsx)(_Group.default, {
+          value: value,
+          onChange: onChange,
+          fieldLabel: label,
+          fieldValue: fieldValue,
+          dataSource: list
+        });
       default:
         return null;
     }

package/lib/ProEnum/propsType.d.ts

@@ -42,7 +42,7 @@ export interface ProEnumConfig {
     };
     dics: Record<string, DataOption[]>;
 }
-type ProEnumType = 'ProSelect' | 'Radio' | 'Checkbox' | 'Tag';
+type ProEnumType = 'ProSelect' | 'Radio' | 'Checkbox' | 'Tag' | 'Group';
 export interface ProEnum {
     /** 组件展示类型、默认 ProSelect */
     type?: ProEnumType;
@@ -86,7 +86,7 @@ export type CheckboxPropsMap = {
     type?: 'Checkbox';
 } & CheckboxProps;
 export interface TagPropsMap {
-    type?: 'Tag';
+    type?: 'Tag' | 'Group';
 }
 export type ProEnumProps = Omit<ProEnum, 'type'> & (PropProSelectsMap | PropRadioPropsMap | CheckboxPropsMap | TagPropsMap);
 export {};

package/lib/ProEnum/style/index.less

@@ -27,4 +27,53 @@
     background-color: #f5f5f5;
     pointer-events: none;
   }
+
+  &-group-root {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+
+    .pro-enum-group-item {
+      position: relative;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      // margin-right: var(--zaui-space-size-sm);
+      margin-bottom: calc(var(--zaui-space-size-sm; 8px) * var(--zaui-size; 1));
+      padding: var(--zaui-space-size-xs) 10px;
+      background-color: #f5f5f5;
+      cursor: pointer;
+
+      .pro-enum-group-item-after {
+        position: absolute;
+        top: var(--zaui-space-size-xs);
+        right: 0;
+        bottom: var(--zaui-space-size-xs);
+        width: 1px;
+        // height: ;
+        background: var(--zaui-brand);
+        opacity: 0.7;
+      }
+
+      &:first-child {
+        border-top-left-radius: var(--zaui-space-size-xs);
+        border-bottom-left-radius: var(--zaui-space-size-xs);
+      }
+      &:last-child {
+        border-top-right-radius: var(--zaui-space-size-xs);
+        border-bottom-right-radius: var(--zaui-space-size-xs);
+        .pro-enum-group-item-after {
+          width: 0;
+        }
+      }
+    }
+
+    .pro-enum-group-item-selected {
+      color: var(--zaui-brand);
+      border: 1px solid var(--zaui-brand);
+      .pro-enum-group-item-after {
+        width: 0;
+      }
+    }
+  }
 }

package/lib/ProForm/components/render/ConfirmWrapper.d.ts

@@ -0,0 +1,10 @@
+import React from 'react';
+import { ProFormColumnProps } from '@/ProForm/propsType';
+interface Props<T = any> {
+    value?: T;
+    onChange?: (value: T, ...rest: any[]) => void;
+    confirmProps: ProFormColumnProps['confirmProps'];
+    [K: string]: any;
+}
+declare const ConfirmWrapper: React.FC<Props>;
+export default ConfirmWrapper;

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

@@ -0,0 +1,59 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _jsxRuntime = require("react/jsx-runtime");
+var _lodash = require("lodash");
+var _react = _interopRequireDefault(require("react"));
+var _antd = require("antd");
+var _ProForm = _interopRequireDefault(require("@/ProForm"));
+var _excluded = ["onChange", "children", "confirmProps"];
+var defaultConfirmProps = {
+  title: '点击确定完成修改'
+};
+var ConfirmWrapper = function ConfirmWrapper(props) {
+  var onChange = props.onChange,
+    children = props.children,
+    confirmProps = props.confirmProps,
+    rest = (0, _objectWithoutProperties2.default)(props, _excluded);
+  var needConfirm = confirmProps.needConfirm;
+  var _ProForm$useFieldProp = _ProForm.default.useFieldProps(),
+    form = _ProForm$useFieldProp.form;
+  var handleOk = function handleOk(changeProps, okProps) {
+    var _confirmProps$onOk;
+    confirmProps === null || confirmProps === void 0 ? void 0 : (_confirmProps$onOk = confirmProps.onOk) === null || _confirmProps$onOk === void 0 ? void 0 : _confirmProps$onOk.call.apply(_confirmProps$onOk, [confirmProps].concat((0, _toConsumableArray2.default)(okProps)));
+    // @ts-ignore
+    onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, (0, _toConsumableArray2.default)(changeProps));
+  };
+  var handleChange = function handleChange(value) {
+    for (var _len = arguments.length, other = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+      other[_key - 1] = arguments[_key];
+    }
+    if (needConfirm === true || (0, _lodash.isFunction)(needConfirm) && needConfirm(form.getFieldsValue())) {
+      _antd.Modal.confirm((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultConfirmProps), confirmProps), {}, {
+        onOk: function onOk() {
+          for (var _len2 = arguments.length, arg = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+            arg[_key2] = arguments[_key2];
+          }
+          return handleOk([value].concat(other), arg);
+        }
+      }));
+    } else {
+      onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [value].concat(other));
+    }
+  };
+  return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+    children: /*#__PURE__*/_react.default.isValidElement(children) && /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
+      // @ts-ignore
+      value: rest.value === undefined ? null : rest.value,
+      onChange: handleChange
+    }))
+  });
+};
+var _default = exports.default = ConfirmWrapper;

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

@@ -27,6 +27,7 @@ var _valueType = _interopRequireDefault(require("../../utils/valueType"));
 var _useChanged3 = require("../../utils/useChanged");
 var _tip = _interopRequireDefault(require("../../../assets/tip.svg"));
 var _useRules = _interopRequireDefault(require("../../utils/useRules"));
+var _ConfirmWrapper = _interopRequireDefault(require("./ConfirmWrapper"));
 var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className", "rules", "required", "labelRequired", "tooltip"];
 /* eslint-disable prefer-destructuring */
 // 这个组件只管渲染, 参数的整理在外部处理
@@ -49,7 +50,8 @@ var Render = function Render(props) {
     originalValues = props.originalValues,
     equalWith = props.equalWith,
     requiredOnView = props.requiredOnView,
-    originalTip = props.originalTip;
+    originalTip = props.originalTip,
+    confirmProps = props.confirmProps;
   var colProps = props.colProps;
   // 剔除一些不是FormItem的属性, 防止控制台报warning
   var labelWidth = formItemProps.labelWidth,
@@ -352,6 +354,13 @@ var Render = function Render(props) {
       onChange: handleChange,
       onBlur: handleBlur
     }));
+    if (confirmProps === null || confirmProps === void 0 ? void 0 : confirmProps.needConfirm) {
+      child = (0, _jsxRuntime.jsx)(_ConfirmWrapper.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        confirmProps: confirmProps
+      }, childProps), {}, {
+        children: child
+      }));
+    }
     // 表单提示
     if (tooltip) {
       _otherFormItemProps.tooltip = {

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

@@ -16,7 +16,7 @@ var componentMap = _interopRequireWildcard(require("../index"));
 var _utils = require("../../utils");
 var _useFieldProps = require("../../utils/useFieldProps");
 var _locale = _interopRequireDefault(require("../../../locale"));
-var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "equalWith", "clearNotShow", "required"];
+var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "equalWith", "clearNotShow", "required", "confirmProps"];
 var RenderFields = function RenderFields(props) {
   var isView = props.isView,
     _props$columns = props.columns,
@@ -79,6 +79,7 @@ var RenderFields = function RenderFields(props) {
       _column$clearNotShow = column.clearNotShow,
       clearNotShow = _column$clearNotShow === void 0 ? outerClearNotShow : _column$clearNotShow,
       columnRequired = column.required,
+      confirmProps = column.confirmProps,
       otherFormItemProps = (0, _objectWithoutProperties2.default)(column, _excluded);
     var component = column.component;
     var _isView = typeof column.isView === 'boolean' ? column.isView : isView;
@@ -202,6 +203,7 @@ var RenderFields = function RenderFields(props) {
         component: TargetComponent,
         // @ts-ignore
         formItemProps: _formItemProps,
+        confirmProps: confirmProps,
         colProps: _colProps,
         componentProps: componentProps,
         otherProps: otherProps,

package/lib/ProForm/components/render/propsType.d.ts

@@ -1,4 +1,4 @@
-import { ColProps, FormInstance, FormItemProps } from 'antd';
+import { ColProps, FormInstance, FormItemProps, ModalFuncProps } from 'antd';
 import { NamePath } from 'antd/es/form/interface';
 import React from 'react';
 import { validate, regExp } from '@zat-design/utils';
@@ -175,7 +175,7 @@ export type ColumnPropsMap<Values = any, T = 'ProForm'> = {
     type?: 'Container';
     fieldProps?: any;
 };
-interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Values>, 'rules' | 'required'> {
+export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Values>, 'rules' | 'required'> {
     component?: React.ReactNode | ReactiveFunction<Values, React.ReactNode>;
     names?: NamePath[];
     show?: boolean | ReactiveFunction<Values, boolean>;
@@ -224,6 +224,9 @@ interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Values>, '
     extra?: string | React.ReactNode;
     /** 是否固定字段, 不隐藏 */
     fixed?: boolean;
+    confirmProps?: ModalFuncProps & {
+        needConfirm?: boolean | ((values: any) => boolean);
+    };
 }
 export type ProColumnProps<T = any> = ProFormColumnProps<T> & ColumnPropsMap<T, 'ProForm'>;
 /**
@@ -268,6 +271,7 @@ export interface RenderProps<Values = any> {
     isSelect: boolean;
     originalValues?: Values;
     requiredOnView?: boolean;
+    confirmProps?: ProFormColumnProps['confirmProps'];
     [name: string]: any;
 }
 export {};

package/lib/ProTable/components/RenderColumn/index.js

@@ -84,8 +84,7 @@ var RenderColumn = function RenderColumn(props) {
         width: width
       },
       ellipsis: {
-        tooltip: true,
-        onEllipsis: function onEllipsis() {}
+        tooltip: true
       },
       children: node
     }) : '-';

package/lib/ProTable/propsType.d.ts

@@ -24,7 +24,7 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
     valueType?: ProTableValueType;
     format?: string;
     precision?: number;
-    code?: string | string[] | (() => string);
+    code?: string | string[] | ((text: any, record: any) => string);
     copyable?: boolean;
     originalTip?: boolean;
     prefix?: string | ReactNode | ((value: any, record?: any, index?: number) => any);

package/lib/ProTable/utils.js

@@ -215,7 +215,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
     };
   } else if (['enumName', 'enumCodeName'].includes(valueType)) {
     column.render = function (value, record, index) {
-      var realCode = typeof code === 'function' ? code() : code;
+      var realCode = typeof code === 'function' ? code(value, record) : code;
       var renderValue = (0, _getEnumLabel.default)(realCode, value, valueType === 'enumCodeName');
       var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
       var originalRenderValue = (0, _getEnumLabel.default)(realCode, originalValue, valueType === 'enumCodeName');

package/package.json

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