@zat-design/sisyphus-react 3.3.1-beta.6 → 3.3.1-beta.7

package/dist/index.esm.css

@@ -2569,9 +2569,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form .ant-form-item.pro-form-item-changed .ant-picker .ant-select-selection-placeholder {
   z-index: 9;
 }
-.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control-input-content > span {
-  background: var(--zaui-contract-bg, #fffaa1);
+.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control-input-content > .pro-form-view-container {
   padding: 4px 8px;
+  background: var(--zaui-contract-bg, #fffaa1);
   border-radius: 4px;
 }
 .pro-form .ant-form-item .ant-row {
@@ -4191,6 +4191,12 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-edit-table .ant-table-pagination .ant-pagination-options .ant-select.ant-select-in-form-item {
   width: auto;
 }
+.pro-edit-table .is-new-row td,
+.pro-edit-table .is-new-row.ant-table-row:hover td,
+.pro-edit-table .is-new-row .ant-table-cell-row-hover,
+.pro-edit-table .is-new-row.ant-table-row:hover .ant-table-cell-row-hover {
+  background: var(--ant-primary-2) !important;
+}
 .pro-edit-table-header {
   margin-bottom: calc(var(--zaui-space-size-md, 16px) * var(--zaui-size, 1));
 }

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

@@ -17,7 +17,7 @@ import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-run
 /* eslint-disable prefer-const */
 import React, { useCallback, useEffect } from 'react';
 import classNames from 'classnames';
-import { cloneDeep, isEqual, debounce, omit, isFunction, isString } from 'lodash';
+import { cloneDeep, isEqual, debounce, omit, isFunction, isString, get } from 'lodash';
 import valueTypeMap from '../../../ProForm/utils/valueType';
 import transformMap from '../../utils/transform';
 import { getNamePath, difference } from '../../utils/tools';
@@ -25,7 +25,7 @@ import * as componentMap from '../../../ProForm/components';
 import Container from '../../../ProForm/components/Container';
 import transformNames from '../../../ProForm/utils/transformNames';
 import { FieldProvider } from '../../../ProForm/utils/useFieldProps';
-import { useChanged } from '../../../ProForm/utils/useChanged';
+import { useListChanged } from '../../../ProForm/utils/useListChanged';
 import useRules from '../../../ProForm/utils/useRules';
 import { isSelect } from '../../../ProForm/utils';
 import locale from '../../../locale';
@@ -73,7 +73,8 @@ var RenderField = function RenderField(_ref) {
     virtualKey = config.virtualKey,
     viewEmpty = config.viewEmpty,
     originalValues = config.originalValues,
-    originalTip = config.originalTip;
+    originalTip = config.originalTip,
+    IsNew = config.IsNew;
   var _fieldProps = fieldProps || formItemProps || {};
   var _rules = rules || [];
   var _required = required;
@@ -87,6 +88,8 @@ var RenderField = function RenderField(_ref) {
   // 单行正在编辑时，临时生成一套formItem用来存储中间值，点击取消时候重置回上一次状态
   var namePath = getNamePath(name, virtualKey);
   var rowData = form.getFieldValue([].concat(_toConsumableArray(namePath), [index])) || record || {};
+  var originalArr = get(originalValues, name);
+  var isAdd = IsNew(originalArr, rowData);
   var currentValue = dataIndex ? rowData === null || rowData === void 0 ? void 0 : rowData[dataIndex] : null;
   // 第三个参数
   var options = {
@@ -452,19 +455,24 @@ var RenderField = function RenderField(_ref) {
     };
   }();
   // 判断当前字段是否变更
-  var _useChanged = useChanged({
+  var _useListChanged = useListChanged({
       name: cellName,
       names: names,
       namesStr: [].concat(_toConsumableArray(baseName), [index, dataIndex]),
+      rowKeyPath: [].concat(_toConsumableArray(baseName), [index, 'rowKey']),
       originalName: originalName,
       originalNames: originalNames,
       originalValues: originalValues,
-      form: form,
-      equalWith: equalWith
+      form: form
+      // equalWith: (originalValue, values) => {
+      //   console.log('originalValue', originalValue);
+      //   console.log('values', values);
+      //   return false;
+      // },
     }),
-    _useChanged2 = _slicedToArray(_useChanged, 2),
-    changed = _useChanged2[0],
-    originalValue = _useChanged2[1];
+    _useListChanged2 = _slicedToArray(_useListChanged, 2),
+    changed = _useListChanged2[0],
+    originalValue = _useListChanged2[1];
   var componentProps = _objectSpread(_objectSpread(_objectSpread({
     form: form,
     name: cellName,

package/es/ProEditTable/index.js

@@ -13,7 +13,7 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 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 { isArray } from 'lodash';
+import { get, isArray } from 'lodash';
 import { useDebounceEffect, useSetState } from 'ahooks';
 import classnames from 'classnames';
 import { transformColumns } from './utils';
@@ -106,6 +106,15 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     }
     return key;
   };
+  var IsNew = function IsNew(preArr, record) {
+    var _preArr$find;
+    if (!(preArr === null || preArr === void 0 ? void 0 : preArr.length)) {
+      return false;
+    }
+    return !(preArr === null || preArr === void 0 ? void 0 : (_preArr$find = preArr.find) === null || _preArr$find === void 0 ? void 0 : _preArr$find.call(preArr, function (item) {
+      return getRowKey(item) === getRowKey(record);
+    }));
+  };
   var config = {
     form: form,
     mode: mode,
@@ -136,12 +145,17 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     page: page,
     originalValues: originalValues,
     originalTip: originalTip,
-    prefixCls: prefixCls
+    prefixCls: prefixCls,
+    IsNew: IsNew
   };
   // 编辑行设置下样式
   var _rowClassName = function _rowClassName(record) {
     var isEdit = !virtualKey || editingKeys.includes(record.rowKey);
     var className = isEdit ? 'is-editing' : '';
+    var originalArr = get(originalValues, name);
+    if (!isEdit && IsNew(originalArr, record)) {
+      return "is-new-row ".concat(className);
+    }
     return className;
   };
   // 复选框
@@ -246,11 +260,16 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     var _value$;
     // 初始化默认生成row-key
     if ((value === null || value === void 0 ? void 0 : value.length) && !(value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey)) {
+      var _originalArr$forEach;
       var nextValues = value === null || value === void 0 ? void 0 : value.map(function (item) {
         return _objectSpread(_objectSpread({}, item), {}, {
           rowKey: getRowKey(item)
         });
       });
+      var originalArr = get(originalValues, name);
+      originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$forEach = originalArr.forEach) === null || _originalArr$forEach === void 0 ? void 0 : _originalArr$forEach.call(originalArr, function (item) {
+        item.rowKey = getRowKey(item);
+      });
       onChange(nextValues);
       if (virtualKey) {
         form.setFieldValue(virtualRowName, nextValues);

package/es/ProEditTable/style/index.less

@@ -296,6 +296,11 @@
     }
   }
 
+  .is-new-row, .is-new-row.@{ant-prefix}-table-row:hover {
+    td, .@{ant-prefix}-table-cell-row-hover {
+      background: var(--ant-primary-2) !important;
+    }
+  }
 }
 
 .pro-edit-table-header {

package/es/ProForm/style/index.less

@@ -56,7 +56,8 @@
     visibility: unset;
   }
 
-  .@{ant-prefix}-input-affix-wrapper:hover span.@{ant-prefix}-input-clear-icon[class~='ant-input-clear-icon-hidden'] {
+  .@{ant-prefix}-input-affix-wrapper:hover
+    span.@{ant-prefix}-input-clear-icon[class~='ant-input-clear-icon-hidden'] {
     display: unset;
     visibility: hidden;
   }
@@ -140,9 +141,9 @@
         }
       }
 
-      .@{ant-prefix}-form-item-control-input-content > span {
-        background: @zaui-contract-bg;
+      .@{ant-prefix}-form-item-control-input-content > .pro-form-view-container {
         padding: 4px 8px;
+        background: @zaui-contract-bg;
         border-radius: 4px;
       }
     }
@@ -306,7 +307,7 @@
 
   div.pro-form-custom-footer {
     width: unset !important;
-    height:32px;
+    height: 32px;
     margin-bottom: calc(var(--zaui-height-size-md, 16px) * var(--zaui-size, 1));
 
     &.pro-form-custom-footer-hidden {

package/es/ProForm/utils/contrastOriginal.d.ts

@@ -1,6 +1,5 @@
 import { FormInstance } from 'antd';
 interface Params {
-    originalValues: any;
     originalValue: any;
     value: any;
     form: FormInstance;

package/es/ProForm/utils/contrastOriginal.js

@@ -2,7 +2,6 @@ import { isEqual, isFunction } from 'lodash';
 var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
 export var contrastOriginal = function contrastOriginal(params) {
   var originalValue = params.originalValue,
-    originalValues = params.originalValues,
     value = params.value,
     equalWith = params.equalWith;
   // 支持传入自定义比较事件

package/es/ProForm/utils/useChanged.d.ts

@@ -1,15 +1,8 @@
-import { FormInstance } from 'antd';
-import { NamePath } from 'antd/lib/form/interface';
-interface Params {
-    name?: NamePath;
-    names?: NamePath[];
-    namesStr?: NamePath;
-    originalName?: NamePath;
-    originalNames?: NamePath[];
-    originalNameStr?: NamePath;
+export declare const useChanged: ({ name, names, namesStr, originalValues, form, equalWith }: {
+    name: any;
+    names: any;
+    namesStr: any;
     originalValues: any;
-    form: FormInstance;
-    equalWith?: (originalValue: any, currentValue: any) => boolean;
-}
-export declare const useChanged: (params: Params) => any[];
-export {};
+    form: any;
+    equalWith: any;
+}) => any[];

package/es/ProForm/utils/useChanged.js

@@ -2,30 +2,23 @@ import "antd/es/form/style";
 import _Form from "antd/es/form";
 import { get } from 'lodash';
 import { contrastOriginal } from './contrastOriginal';
-export var useChanged = function useChanged(params) {
-  var name = params.name,
-    names = params.names,
-    namesStr = params.namesStr,
-    _params$originalName = params.originalName,
-    originalName = _params$originalName === void 0 ? name : _params$originalName,
-    _params$originalNames = params.originalNames,
-    originalNames = _params$originalNames === void 0 ? names : _params$originalNames,
-    originalValues = params.originalValues,
-    form = params.form,
-    equalWith = params.equalWith;
-  var _form = form;
-  var originalValue = (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
-    return get(originalValues, originalName);
-  }) : get(originalValues, originalName);
+export var useChanged = function useChanged(_ref) {
+  var name = _ref.name,
+    names = _ref.names,
+    namesStr = _ref.namesStr,
+    originalValues = _ref.originalValues,
+    form = _ref.form,
+    equalWith = _ref.equalWith;
+  var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
+    return get(originalValues, name);
+  }) : get(originalValues, name);
   var notWatch = !originalValues || originalValue === undefined;
-  // @ts-ignore
-  if (notWatch) _form = [];
-  var value = _Form.useWatch(namesStr || name, _form);
+  if (notWatch) form = [];
+  var value = _Form.useWatch(namesStr || name, form);
   if (notWatch) return [false];
   var changed = contrastOriginal({
-    value: value,
     originalValue: originalValue,
-    originalValues: originalValues,
+    value: value,
     form: form,
     equalWith: equalWith
   });

package/es/ProForm/utils/useListChanged.d.ts

@@ -0,0 +1,16 @@
+import { FormInstance } from 'antd';
+import { InternalNamePath, NamePath } from 'antd/lib/form/interface';
+interface Params {
+    name?: NamePath;
+    names?: NamePath[];
+    namesStr?: NamePath;
+    originalName?: NamePath;
+    originalNames?: NamePath[];
+    originalNameStr?: NamePath;
+    originalValues: any;
+    form: FormInstance;
+    rowKeyPath?: InternalNamePath;
+    equalWith?: (originalValue: any, currentValue: any) => boolean;
+}
+export declare const useListChanged: (params: Params) => any[];
+export {};

package/es/ProForm/utils/useListChanged.js

@@ -0,0 +1,81 @@
+import "antd/es/form/style";
+import _Form from "antd/es/form";
+import { get } from 'lodash';
+import { contrastOriginal } from './contrastOriginal';
+var toNamePath = function toNamePath(name) {
+  if (Array.isArray(name)) {
+    return name;
+  }
+  return [name];
+};
+var toNamePaths = function toNamePaths(names) {
+  return names.map(function (name) {
+    return toNamePath(name);
+  });
+};
+var getOriginalValue = function getOriginalValue(_ref) {
+  var namePath = _ref.namePath,
+    originalName = _ref.originalName,
+    originalNames = _ref.originalNames,
+    originalValues = _ref.originalValues,
+    rowKeyPath = _ref.rowKeyPath,
+    form = _ref.form;
+  if (!originalValues) {
+    return undefined;
+  }
+  if (rowKeyPath) {
+    var rowValueNamePath = namePath.slice(0, rowKeyPath.length - 1); // 表单中变动值所在行
+    var rowKeyName = rowKeyPath[rowKeyPath.length - 1]; // rowKey在行内的name
+    var rowValue = form.getFieldValue(rowValueNamePath);
+    var keyValue = rowValue[rowKeyName]; // 获取表单中rowKey值
+    if (!keyValue) return undefined;
+    var originalValueList = get(originalValues, originalName.slice(0, rowKeyPath.length - 2));
+    var originalValueRow = originalValueList.find(function (item) {
+      return item[rowKeyPath[rowKeyPath.length - 1]] === keyValue;
+    });
+    var originalValue = (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
+      return get(originalValueRow, originalName.slice(rowKeyPath.length - 1));
+    }) : get(originalValueRow, originalName.slice(rowKeyPath.length - 1));
+    return originalValue;
+  }
+  return (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
+    return get(originalValues, originalName);
+  }) : get(originalValues, originalName);
+};
+export var useListChanged = function useListChanged(params) {
+  var name = params.name,
+    names = params.names,
+    namesStr = params.namesStr,
+    _params$originalName = params.originalName,
+    originalName = _params$originalName === void 0 ? name : _params$originalName,
+    _params$originalNames = params.originalNames,
+    originalNames = _params$originalNames === void 0 ? names : _params$originalNames,
+    originalValues = params.originalValues,
+    form = params.form,
+    equalWith = params.equalWith,
+    rowKeyPath = params.rowKeyPath;
+  // let _form = form;
+  var namePath = toNamePath(namesStr || name);
+  var originalNamePath = toNamePath(originalName);
+  var originalNamePaths = originalNames && toNamePaths(originalNames);
+  var originalValue = getOriginalValue({
+    namePath: namePath,
+    originalName: originalNamePath,
+    originalNames: originalNamePaths,
+    originalValues: originalValues,
+    rowKeyPath: rowKeyPath,
+    form: form
+  });
+  var notWatch = !originalValues || originalValue === undefined;
+  // @ts-ignore
+  // if (notWatch) _form = [];
+  var value = _Form.useWatch(namePath, form);
+  if (notWatch) return [false];
+  var changed = contrastOriginal({
+    value: value,
+    originalValue: originalValue,
+    form: form,
+    equalWith: equalWith
+  });
+  return [changed, originalValue];
+};

package/es/ProLayout/components/Layout/Menu/index.js

@@ -3,14 +3,17 @@ import classnames from 'classnames';
 import OpenMenu from './OpenMenu';
 import FoldMenu from './FoldMenu'; // 折叠后菜单
 var Menu = function Menu(props) {
-  var headerHeight = props.headerHeight,
-    dataSource = props.dataSource,
-    iconfontUrl = props.iconfontUrl,
-    collapsed = props.collapsed,
-    notice = props.notice,
-    onToggle = props.onToggle,
-    pure = props.pure,
-    theme = props.theme;
+  var _ref = props || {},
+    headerHeight = _ref.headerHeight,
+    dataSource = _ref.dataSource,
+    iconfontUrl = _ref.iconfontUrl,
+    collapsed = _ref.collapsed,
+    notice = _ref.notice,
+    onToggle = _ref.onToggle,
+    pure = _ref.pure,
+    theme = _ref.theme,
+    sideMenuFooterRender = _ref.sideMenuFooterRender,
+    sideMenuHeaderRender = _ref.sideMenuHeaderRender;
   var menus = [];
   var menuCls = classnames({
     'pro-layout-menu': true,
@@ -29,7 +32,7 @@ var Menu = function Menu(props) {
     style: {
       top: notice ? 80 + headerHeight - 48 : headerHeight
     },
-    children: [_jsx(OpenMenu, {
+    children: [sideMenuHeaderRender, _jsx(OpenMenu, {
       dataSource: {
         menus: menus,
         iconfontUrl: iconfontUrl,
@@ -52,7 +55,7 @@ var Menu = function Menu(props) {
         display: collapsed ? 'none' : 'block',
         height: "calc(100vh - ".concat(headerHeight + (notice ? 32 : 0) + 48 || 0, "px)")
       }
-    }), _jsx("div", {
+    }), sideMenuFooterRender || _jsx("div", {
       className: "pro-layout-menu-collapsed",
       onClick: onToggle,
       children: _jsx("div", {

package/es/ProLayout/propTypes.d.ts

@@ -36,6 +36,8 @@ export interface ProLayoutProps {
     rightContentRender?: ReactNode;
     headerContentRender?: ReactNode;
     headerTitleRender?: ReactNode;
+    sideMenuHeaderRender?: ReactNode;
+    sideMenuFooterRender?: ReactNode;
     headerNotice?: ReactNode | string;
     notice?: ReactNode | string;
     title?: string;

package/es/ProTreeModal/components/Trigger.d.ts

@@ -2,6 +2,7 @@ import { CSSProperties } from 'react';
 interface TriggerProps {
     checkedValues: any[];
     value: any;
+    label?: React.ReactNode;
     disabled?: boolean;
     isView?: boolean;
     checkAll?: boolean;

package/es/ProTreeModal/components/Trigger.js

@@ -17,6 +17,7 @@ import viewSvg from '../../assets/view.svg';
 function Trigger(props) {
   var _locale$ProTreeModal2, _locale$ProTreeModal3;
   var value = props.value,
+    label = props.label,
     disabled = props.disabled,
     isView = props.isView,
     triggerStyle = props.triggerStyle,
@@ -34,7 +35,7 @@ function Trigger(props) {
     state = _useSetState2[0],
     setState = _useSetState2[1];
   useEffect(function () {
-    if (checkAll && appoint) {
+    if (allValue === value && appoint) {
       setState({
         mode: 'all'
       });
@@ -51,7 +52,9 @@ function Trigger(props) {
     return _jsxs("div", {
       className: "pro-tree-modal-isView",
       children: [_jsx("div", {
-        children: checkedValues.length === 0 ? '-' : checkAll ? locale === null || locale === void 0 ? void 0 : locale.ProTreeModal.checkAll : formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProTreeModal = locale.ProTreeModal) === null || _locale$ProTreeModal === void 0 ? void 0 : _locale$ProTreeModal.checkNumber, {
+        children: checkedValues.length === 0 ? '-' : state.mode === 'all' ? formatMessage(locale === null || locale === void 0 ? void 0 : locale.ProTreeModal.checkAll1, {
+          all: label
+        }) : formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProTreeModal = locale.ProTreeModal) === null || _locale$ProTreeModal === void 0 ? void 0 : _locale$ProTreeModal.checkNumber, {
           num: checkedValues.length
         })
       }), _jsx("div", {
@@ -90,10 +93,10 @@ function Trigger(props) {
           onChange: onAppointChange,
           children: [_jsx(_Select.Option, {
             value: "all",
-            children: "\u5168\u90E8"
+            children: locale === null || locale === void 0 ? void 0 : locale.ProTreeModal.specifyMode[0]
           }), _jsx(_Select.Option, {
             value: "appoint",
-            children: "\u6307\u5B9A"
+            children: locale === null || locale === void 0 ? void 0 : locale.ProTreeModal.specifyMode[1]
           })]
         }), props.children]
       });
@@ -104,10 +107,12 @@ function Trigger(props) {
     children: _jsx(_Input, {
       className: classNames(disabled ? 'trigger-no-hover' : '', appoint ? 'pro-tree-modal-input-appoint' : ''),
       onClick: handleClick,
-      value: checkedValues.length === 0 ? null : checkAll ? locale === null || locale === void 0 ? void 0 : locale.ProTreeModal.checkAll : formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProTreeModal2 = locale.ProTreeModal) === null || _locale$ProTreeModal2 === void 0 ? void 0 : _locale$ProTreeModal2.checkNumber, {
+      value: checkedValues.length === 0 ? null : state.mode === 'all' ? formatMessage(locale === null || locale === void 0 ? void 0 : locale.ProTreeModal.checkAll1, {
+        all: label
+      }) : formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProTreeModal2 = locale.ProTreeModal) === null || _locale$ProTreeModal2 === void 0 ? void 0 : _locale$ProTreeModal2.checkNumber, {
         num: checkedValues.length
       }),
-      addonAfter: _jsxs("div", {
+      addonAfter: state.mode === 'all' ? null : _jsxs("div", {
         className: "pro-enum-input-addonAfter",
         children: [checkedValues.length > 0 && !disabled && _jsx("span", {
           className: "close-icon",
@@ -121,7 +126,7 @@ function Trigger(props) {
         })]
       }),
       placeholder: locale === null || locale === void 0 ? void 0 : (_locale$ProTreeModal3 = locale.ProTreeModal) === null || _locale$ProTreeModal3 === void 0 ? void 0 : _locale$ProTreeModal3.select,
-      disabled: disabled || appoint && value === allValue,
+      disabled: disabled || state.mode === 'all',
       style: _objectSpread({}, triggerStyle)
     })
   });

package/es/ProTreeModal/index.js

@@ -42,7 +42,6 @@ var ProTreeModal = function ProTreeModal(props) {
     _props$title = props.title,
     title = _props$title === void 0 ? locale === null || locale === void 0 ? void 0 : (_locale$ProTreeModal = locale.ProTreeModal) === null || _locale$ProTreeModal === void 0 ? void 0 : _locale$ProTreeModal.select : _props$title,
     useRequest = props.useRequest,
-    allValue = props.allValue,
     _props$showCodeName = props.showCodeName,
     showCodeName = _props$showCodeName === void 0 ? false : _props$showCodeName,
     _props$checkStrictly = props.checkStrictly,
@@ -72,9 +71,14 @@ var ProTreeModal = function ProTreeModal(props) {
     optionRender = props.optionRender,
     openChange = props.openChange,
     maxMessage = props.maxMessage;
+  var allValue = props.allValue;
   var modeType = mode.toUpperCase();
   var fieldNameLabel = fieldNames.label;
   var fieldNameValue = fieldNames.value;
+  if (appoint && !allValue) {
+    console.error('allValue must be input');
+    allValue = 'all';
+  }
   var _useSetState = useSetState({
       open: false,
       checkedValues: [],
@@ -217,8 +221,11 @@ var ProTreeModal = function ProTreeModal(props) {
    */
   var handleFinish = function handleFinish() {
     // 全选的时候返回 allValue 标记即可
+    // 3.3.2 版本全选的时候返回所有值的合集 list
     if (allValue !== undefined && state.checkAll && !draggable) {
-      onChange === null || onChange === void 0 ? void 0 : onChange(allValue);
+      onChange === null || onChange === void 0 ? void 0 : onChange(state.flatTreeData.map(function (item) {
+        return item[fieldNameValue];
+      }));
     } else if (draggable && span) {
       var _listRef$current;
       // 开启 draggable 使用拖拽后的顺序
@@ -269,6 +276,7 @@ var ProTreeModal = function ProTreeModal(props) {
       treeViewData: [],
       checkAll: false
     });
+    onChange === null || onChange === void 0 ? void 0 : onChange(_checkedValues);
   };
   /**
    * Drawer close
@@ -493,6 +501,7 @@ var ProTreeModal = function ProTreeModal(props) {
    * @returns
    */
   var TriggerComponent = useMemo(function () {
+    var _props$otherProps3;
     if (trigger && /*#__PURE__*/React.isValidElement(trigger)) {
       return _jsx("div", {
         onClick: handleClick,
@@ -508,6 +517,7 @@ var ProTreeModal = function ProTreeModal(props) {
       isView: isView,
       appoint: appoint,
       allValue: allValue,
+      label: props === null || props === void 0 ? void 0 : (_props$otherProps3 = props.otherProps) === null || _props$otherProps3 === void 0 ? void 0 : _props$otherProps3.label,
       handleClick: handleClick,
       handleClearAll: handleClearAll,
       appointChange: appointChange
@@ -698,7 +708,7 @@ var ProTreeModal = function ProTreeModal(props) {
         title: title,
         showType: "Modal",
         className: "pro-tree-modal-container",
-        extraLeft: allValue !== undefined && !appoint ? _jsx(_Checkbox, {
+        extraLeft: allValue !== undefined ? _jsx(_Checkbox, {
           checked: state.checkAll,
           disabled: disabled,
           onChange: handleAllCheck,

package/es/locale/en_US.d.ts

@@ -127,10 +127,12 @@ declare const _default: {
         selectMax: string;
         noCheck: string;
         checkAll: string;
+        checkAll1: string;
         check: string;
         clearAll: string;
         checkNumber: string;
         noFinal: string;
+        specifyMode: string[];
     };
     ProTimeLimit: {
         foreverText: string;

package/es/locale/en_US.js

@@ -127,10 +127,12 @@ export default {
     selectMax: 'Select at most {max} items',
     noCheck: 'None selected yet',
     checkAll: 'Select all',
+    checkAll1: 'Select all {all}',
     check: 'selected',
     clearAll: 'Clear all',
     checkNumber: '{num} items selected',
-    noFinal: 'Oops, the content you are looking for is not found.'
+    noFinal: 'Oops, the content you are looking for is not found.',
+    specifyMode: ['all', 'specify']
   },
   ProTimeLimit: {
     foreverText: 'long term'

package/es/locale/zh_CN.d.ts

@@ -127,9 +127,12 @@ declare const _default: {
         selectMax: string;
         noCheck: string;
         checkAll: string;
+        checkAll1: string;
         check: string;
         clearAll: string;
         checkNumber: string;
+        noFinal: string;
+        specifyMode: string[];
     };
     ProTimeLimit: {
         foreverText: string;

package/es/locale/zh_CN.js

@@ -127,9 +127,12 @@ export default {
     selectMax: '最多选择{max}个',
     noCheck: '暂无已选',
     checkAll: '全选',
+    checkAll1: '全部{all}',
     check: '已选',
     clearAll: '清空全部',
-    checkNumber: '已选择{num}项'
+    checkNumber: '已选择{num}项',
+    noFinal: '哎呀，你要找的内容没有找到。',
+    specifyMode: ['全部', '指定']
   },
   ProTimeLimit: {
     foreverText: '长期'

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

@@ -25,7 +25,7 @@ var componentMap = _interopRequireWildcard(require("../../../ProForm/components"
 var _Container = _interopRequireDefault(require("../../../ProForm/components/Container"));
 var _transformNames = _interopRequireDefault(require("../../../ProForm/utils/transformNames"));
 var _useFieldProps = require("../../../ProForm/utils/useFieldProps");
-var _useChanged3 = require("../../../ProForm/utils/useChanged");
+var _useListChanged3 = require("../../../ProForm/utils/useListChanged");
 var _useRules = _interopRequireDefault(require("../../../ProForm/utils/useRules"));
 var _utils = require("../../../ProForm/utils");
 var _locale = _interopRequireDefault(require("../../../locale"));
@@ -76,7 +76,8 @@ var RenderField = function RenderField(_ref) {
     virtualKey = config.virtualKey,
     viewEmpty = config.viewEmpty,
     originalValues = config.originalValues,
-    originalTip = config.originalTip;
+    originalTip = config.originalTip,
+    IsNew = config.IsNew;
   var _fieldProps = fieldProps || formItemProps || {};
   var _rules = rules || [];
   var _required = required;
@@ -90,6 +91,8 @@ var RenderField = function RenderField(_ref) {
   // 单行正在编辑时，临时生成一套formItem用来存储中间值，点击取消时候重置回上一次状态
   var namePath = (0, _tools.getNamePath)(name, virtualKey);
   var rowData = form.getFieldValue([].concat((0, _toConsumableArray2.default)(namePath), [index])) || record || {};
+  var originalArr = (0, _lodash.get)(originalValues, name);
+  var isAdd = IsNew(originalArr, rowData);
   var currentValue = dataIndex ? rowData === null || rowData === void 0 ? void 0 : rowData[dataIndex] : null;
   // 第三个参数
   var options = {
@@ -455,19 +458,24 @@ var RenderField = function RenderField(_ref) {
     };
   }();
   // 判断当前字段是否变更
-  var _useChanged = (0, _useChanged3.useChanged)({
+  var _useListChanged = (0, _useListChanged3.useListChanged)({
       name: cellName,
       names: names,
       namesStr: [].concat((0, _toConsumableArray2.default)(baseName), [index, dataIndex]),
+      rowKeyPath: [].concat((0, _toConsumableArray2.default)(baseName), [index, 'rowKey']),
       originalName: originalName,
       originalNames: originalNames,
       originalValues: originalValues,
-      form: form,
-      equalWith: equalWith
+      form: form
+      // equalWith: (originalValue, values) => {
+      //   console.log('originalValue', originalValue);
+      //   console.log('values', values);
+      //   return false;
+      // },
     }),
-    _useChanged2 = (0, _slicedToArray2.default)(_useChanged, 2),
-    changed = _useChanged2[0],
-    originalValue = _useChanged2[1];
+    _useListChanged2 = (0, _slicedToArray2.default)(_useListChanged, 2),
+    changed = _useListChanged2[0],
+    originalValue = _useListChanged2[1];
   var componentProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
     form: form,
     name: cellName,

package/lib/ProEditTable/index.js

@@ -109,6 +109,15 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     }
     return key;
   };
+  var IsNew = function IsNew(preArr, record) {
+    var _preArr$find;
+    if (!(preArr === null || preArr === void 0 ? void 0 : preArr.length)) {
+      return false;
+    }
+    return !(preArr === null || preArr === void 0 ? void 0 : (_preArr$find = preArr.find) === null || _preArr$find === void 0 ? void 0 : _preArr$find.call(preArr, function (item) {
+      return getRowKey(item) === getRowKey(record);
+    }));
+  };
   var config = {
     form: form,
     mode: mode,
@@ -139,12 +148,17 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     page: page,
     originalValues: originalValues,
     originalTip: originalTip,
-    prefixCls: prefixCls
+    prefixCls: prefixCls,
+    IsNew: IsNew
   };
   // 编辑行设置下样式
   var _rowClassName = function _rowClassName(record) {
     var isEdit = !virtualKey || editingKeys.includes(record.rowKey);
     var className = isEdit ? 'is-editing' : '';
+    var originalArr = (0, _lodash.get)(originalValues, name);
+    if (!isEdit && IsNew(originalArr, record)) {
+      return "is-new-row ".concat(className);
+    }
     return className;
   };
   // 复选框
@@ -249,11 +263,16 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     var _value$;
     // 初始化默认生成row-key
     if ((value === null || value === void 0 ? void 0 : value.length) && !(value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey)) {
+      var _originalArr$forEach;
       var nextValues = value === null || value === void 0 ? void 0 : value.map(function (item) {
         return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
           rowKey: getRowKey(item)
         });
       });
+      var originalArr = (0, _lodash.get)(originalValues, name);
+      originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$forEach = originalArr.forEach) === null || _originalArr$forEach === void 0 ? void 0 : _originalArr$forEach.call(originalArr, function (item) {
+        item.rowKey = getRowKey(item);
+      });
       onChange(nextValues);
       if (virtualKey) {
         form.setFieldValue(virtualRowName, nextValues);

package/lib/ProEditTable/style/index.less

@@ -296,6 +296,11 @@
     }
   }
 
+  .is-new-row, .is-new-row.@{ant-prefix}-table-row:hover {
+    td, .@{ant-prefix}-table-cell-row-hover {
+      background: var(--ant-primary-2) !important;
+    }
+  }
 }
 
 .pro-edit-table-header {

package/lib/ProForm/style/index.less

@@ -56,7 +56,8 @@
     visibility: unset;
   }
 
-  .@{ant-prefix}-input-affix-wrapper:hover span.@{ant-prefix}-input-clear-icon[class~='ant-input-clear-icon-hidden'] {
+  .@{ant-prefix}-input-affix-wrapper:hover
+    span.@{ant-prefix}-input-clear-icon[class~='ant-input-clear-icon-hidden'] {
     display: unset;
     visibility: hidden;
   }
@@ -140,9 +141,9 @@
         }
       }
 
-      .@{ant-prefix}-form-item-control-input-content > span {
-        background: @zaui-contract-bg;
+      .@{ant-prefix}-form-item-control-input-content > .pro-form-view-container {
         padding: 4px 8px;
+        background: @zaui-contract-bg;
         border-radius: 4px;
       }
     }
@@ -306,7 +307,7 @@
 
   div.pro-form-custom-footer {
     width: unset !important;
-    height:32px;
+    height: 32px;
     margin-bottom: calc(var(--zaui-height-size-md, 16px) * var(--zaui-size, 1));
 
     &.pro-form-custom-footer-hidden {

package/lib/ProForm/utils/contrastOriginal.d.ts

@@ -1,6 +1,5 @@
 import { FormInstance } from 'antd';
 interface Params {
-    originalValues: any;
     originalValue: any;
     value: any;
     form: FormInstance;

package/lib/ProForm/utils/contrastOriginal.js

@@ -8,7 +8,6 @@ var _lodash = require("lodash");
 var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
 var contrastOriginal = exports.contrastOriginal = function contrastOriginal(params) {
   var originalValue = params.originalValue,
-    originalValues = params.originalValues,
     value = params.value,
     equalWith = params.equalWith;
   // 支持传入自定义比较事件

package/lib/ProForm/utils/useChanged.d.ts

@@ -1,15 +1,8 @@
-import { FormInstance } from 'antd';
-import { NamePath } from 'antd/lib/form/interface';
-interface Params {
-    name?: NamePath;
-    names?: NamePath[];
-    namesStr?: NamePath;
-    originalName?: NamePath;
-    originalNames?: NamePath[];
-    originalNameStr?: NamePath;
+export declare const useChanged: ({ name, names, namesStr, originalValues, form, equalWith }: {
+    name: any;
+    names: any;
+    namesStr: any;
     originalValues: any;
-    form: FormInstance;
-    equalWith?: (originalValue: any, currentValue: any) => boolean;
-}
-export declare const useChanged: (params: Params) => any[];
-export {};
+    form: any;
+    equalWith: any;
+}) => any[];

package/lib/ProForm/utils/useChanged.js

@@ -7,30 +7,23 @@ exports.useChanged = void 0;
 var _antd = require("antd");
 var _lodash = require("lodash");
 var _contrastOriginal = require("./contrastOriginal");
-var useChanged = exports.useChanged = function useChanged(params) {
-  var name = params.name,
-    names = params.names,
-    namesStr = params.namesStr,
-    _params$originalName = params.originalName,
-    originalName = _params$originalName === void 0 ? name : _params$originalName,
-    _params$originalNames = params.originalNames,
-    originalNames = _params$originalNames === void 0 ? names : _params$originalNames,
-    originalValues = params.originalValues,
-    form = params.form,
-    equalWith = params.equalWith;
-  var _form = form;
-  var originalValue = (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
-    return (0, _lodash.get)(originalValues, originalName);
-  }) : (0, _lodash.get)(originalValues, originalName);
+var useChanged = exports.useChanged = function useChanged(_ref) {
+  var name = _ref.name,
+    names = _ref.names,
+    namesStr = _ref.namesStr,
+    originalValues = _ref.originalValues,
+    form = _ref.form,
+    equalWith = _ref.equalWith;
+  var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
+    return (0, _lodash.get)(originalValues, name);
+  }) : (0, _lodash.get)(originalValues, name);
   var notWatch = !originalValues || originalValue === undefined;
-  // @ts-ignore
-  if (notWatch) _form = [];
-  var value = _antd.Form.useWatch(namesStr || name, _form);
+  if (notWatch) form = [];
+  var value = _antd.Form.useWatch(namesStr || name, form);
   if (notWatch) return [false];
   var changed = (0, _contrastOriginal.contrastOriginal)({
-    value: value,
     originalValue: originalValue,
-    originalValues: originalValues,
+    value: value,
     form: form,
     equalWith: equalWith
   });

package/lib/ProForm/utils/useListChanged.d.ts

@@ -0,0 +1,16 @@
+import { FormInstance } from 'antd';
+import { InternalNamePath, NamePath } from 'antd/lib/form/interface';
+interface Params {
+    name?: NamePath;
+    names?: NamePath[];
+    namesStr?: NamePath;
+    originalName?: NamePath;
+    originalNames?: NamePath[];
+    originalNameStr?: NamePath;
+    originalValues: any;
+    form: FormInstance;
+    rowKeyPath?: InternalNamePath;
+    equalWith?: (originalValue: any, currentValue: any) => boolean;
+}
+export declare const useListChanged: (params: Params) => any[];
+export {};

package/lib/ProForm/utils/useListChanged.js

@@ -0,0 +1,86 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useListChanged = void 0;
+var _antd = require("antd");
+var _lodash = require("lodash");
+var _contrastOriginal = require("./contrastOriginal");
+var toNamePath = function toNamePath(name) {
+  if (Array.isArray(name)) {
+    return name;
+  }
+  return [name];
+};
+var toNamePaths = function toNamePaths(names) {
+  return names.map(function (name) {
+    return toNamePath(name);
+  });
+};
+var getOriginalValue = function getOriginalValue(_ref) {
+  var namePath = _ref.namePath,
+    originalName = _ref.originalName,
+    originalNames = _ref.originalNames,
+    originalValues = _ref.originalValues,
+    rowKeyPath = _ref.rowKeyPath,
+    form = _ref.form;
+  if (!originalValues) {
+    return undefined;
+  }
+  if (rowKeyPath) {
+    var rowValueNamePath = namePath.slice(0, rowKeyPath.length - 1); // 表单中变动值所在行
+    var rowKeyName = rowKeyPath[rowKeyPath.length - 1]; // rowKey在行内的name
+    var rowValue = form.getFieldValue(rowValueNamePath);
+    var keyValue = rowValue[rowKeyName]; // 获取表单中rowKey值
+    if (!keyValue) return undefined;
+    var originalValueList = (0, _lodash.get)(originalValues, originalName.slice(0, rowKeyPath.length - 2));
+    var originalValueRow = originalValueList.find(function (item) {
+      return item[rowKeyPath[rowKeyPath.length - 1]] === keyValue;
+    });
+    var originalValue = (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
+      return (0, _lodash.get)(originalValueRow, originalName.slice(rowKeyPath.length - 1));
+    }) : (0, _lodash.get)(originalValueRow, originalName.slice(rowKeyPath.length - 1));
+    return originalValue;
+  }
+  return (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
+    return (0, _lodash.get)(originalValues, originalName);
+  }) : (0, _lodash.get)(originalValues, originalName);
+};
+var useListChanged = exports.useListChanged = function useListChanged(params) {
+  var name = params.name,
+    names = params.names,
+    namesStr = params.namesStr,
+    _params$originalName = params.originalName,
+    originalName = _params$originalName === void 0 ? name : _params$originalName,
+    _params$originalNames = params.originalNames,
+    originalNames = _params$originalNames === void 0 ? names : _params$originalNames,
+    originalValues = params.originalValues,
+    form = params.form,
+    equalWith = params.equalWith,
+    rowKeyPath = params.rowKeyPath;
+  // let _form = form;
+  var namePath = toNamePath(namesStr || name);
+  var originalNamePath = toNamePath(originalName);
+  var originalNamePaths = originalNames && toNamePaths(originalNames);
+  var originalValue = getOriginalValue({
+    namePath: namePath,
+    originalName: originalNamePath,
+    originalNames: originalNamePaths,
+    originalValues: originalValues,
+    rowKeyPath: rowKeyPath,
+    form: form
+  });
+  var notWatch = !originalValues || originalValue === undefined;
+  // @ts-ignore
+  // if (notWatch) _form = [];
+  var value = _antd.Form.useWatch(namePath, form);
+  if (notWatch) return [false];
+  var changed = (0, _contrastOriginal.contrastOriginal)({
+    value: value,
+    originalValue: originalValue,
+    form: form,
+    equalWith: equalWith
+  });
+  return [changed, originalValue];
+};

package/lib/ProLayout/components/Layout/Menu/index.js

@@ -11,14 +11,17 @@ var _OpenMenu = _interopRequireDefault(require("./OpenMenu"));
 var _FoldMenu = _interopRequireDefault(require("./FoldMenu"));
 // 折叠后菜单
 var Menu = function Menu(props) {
-  var headerHeight = props.headerHeight,
-    dataSource = props.dataSource,
-    iconfontUrl = props.iconfontUrl,
-    collapsed = props.collapsed,
-    notice = props.notice,
-    onToggle = props.onToggle,
-    pure = props.pure,
-    theme = props.theme;
+  var _ref = props || {},
+    headerHeight = _ref.headerHeight,
+    dataSource = _ref.dataSource,
+    iconfontUrl = _ref.iconfontUrl,
+    collapsed = _ref.collapsed,
+    notice = _ref.notice,
+    onToggle = _ref.onToggle,
+    pure = _ref.pure,
+    theme = _ref.theme,
+    sideMenuFooterRender = _ref.sideMenuFooterRender,
+    sideMenuHeaderRender = _ref.sideMenuHeaderRender;
   var menus = [];
   var menuCls = (0, _classnames.default)({
     'pro-layout-menu': true,
@@ -37,7 +40,7 @@ var Menu = function Menu(props) {
     style: {
       top: notice ? 80 + headerHeight - 48 : headerHeight
     },
-    children: [(0, _jsxRuntime.jsx)(_OpenMenu.default, {
+    children: [sideMenuHeaderRender, (0, _jsxRuntime.jsx)(_OpenMenu.default, {
       dataSource: {
         menus: menus,
         iconfontUrl: iconfontUrl,
@@ -60,7 +63,7 @@ var Menu = function Menu(props) {
         display: collapsed ? 'none' : 'block',
         height: "calc(100vh - ".concat(headerHeight + (notice ? 32 : 0) + 48 || 0, "px)")
       }
-    }), (0, _jsxRuntime.jsx)("div", {
+    }), sideMenuFooterRender || (0, _jsxRuntime.jsx)("div", {
       className: "pro-layout-menu-collapsed",
       onClick: onToggle,
       children: (0, _jsxRuntime.jsx)("div", {

package/lib/ProLayout/propTypes.d.ts

@@ -36,6 +36,8 @@ export interface ProLayoutProps {
     rightContentRender?: ReactNode;
     headerContentRender?: ReactNode;
     headerTitleRender?: ReactNode;
+    sideMenuHeaderRender?: ReactNode;
+    sideMenuFooterRender?: ReactNode;
     headerNotice?: ReactNode | string;
     notice?: ReactNode | string;
     title?: string;

package/lib/ProTreeModal/components/Trigger.d.ts

@@ -2,6 +2,7 @@ import { CSSProperties } from 'react';
 interface TriggerProps {
     checkedValues: any[];
     value: any;
+    label?: React.ReactNode;
     disabled?: boolean;
     isView?: boolean;
     checkAll?: boolean;

package/lib/ProTreeModal/components/Trigger.js

@@ -20,6 +20,7 @@ var _view = _interopRequireDefault(require("../../assets/view.svg"));
 function Trigger(props) {
   var _locale$ProTreeModal2, _locale$ProTreeModal3;
   var value = props.value,
+    label = props.label,
     disabled = props.disabled,
     isView = props.isView,
     triggerStyle = props.triggerStyle,
@@ -37,7 +38,7 @@ function Trigger(props) {
     state = _useSetState2[0],
     setState = _useSetState2[1];
   (0, _react.useEffect)(function () {
-    if (checkAll && appoint) {
+    if (allValue === value && appoint) {
       setState({
         mode: 'all'
       });
@@ -54,7 +55,9 @@ function Trigger(props) {
     return (0, _jsxRuntime.jsxs)("div", {
       className: "pro-tree-modal-isView",
       children: [(0, _jsxRuntime.jsx)("div", {
-        children: checkedValues.length === 0 ? '-' : checkAll ? _locale.default === null || _locale.default === void 0 ? void 0 : _locale.default.ProTreeModal.checkAll : (0, _locale.formatMessage)(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProTreeModal = _locale.default.ProTreeModal) === null || _locale$ProTreeModal === void 0 ? void 0 : _locale$ProTreeModal.checkNumber, {
+        children: checkedValues.length === 0 ? '-' : state.mode === 'all' ? (0, _locale.formatMessage)(_locale.default === null || _locale.default === void 0 ? void 0 : _locale.default.ProTreeModal.checkAll1, {
+          all: label
+        }) : (0, _locale.formatMessage)(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProTreeModal = _locale.default.ProTreeModal) === null || _locale$ProTreeModal === void 0 ? void 0 : _locale$ProTreeModal.checkNumber, {
           num: checkedValues.length
         })
       }), (0, _jsxRuntime.jsx)("div", {
@@ -93,10 +96,10 @@ function Trigger(props) {
           onChange: onAppointChange,
           children: [(0, _jsxRuntime.jsx)(_antd.Select.Option, {
             value: "all",
-            children: "\u5168\u90E8"
+            children: _locale.default === null || _locale.default === void 0 ? void 0 : _locale.default.ProTreeModal.specifyMode[0]
           }), (0, _jsxRuntime.jsx)(_antd.Select.Option, {
             value: "appoint",
-            children: "\u6307\u5B9A"
+            children: _locale.default === null || _locale.default === void 0 ? void 0 : _locale.default.ProTreeModal.specifyMode[1]
           })]
         }), props.children]
       });
@@ -107,10 +110,12 @@ function Trigger(props) {
     children: (0, _jsxRuntime.jsx)(_antd.Input, {
       className: (0, _classnames.default)(disabled ? 'trigger-no-hover' : '', appoint ? 'pro-tree-modal-input-appoint' : ''),
       onClick: handleClick,
-      value: checkedValues.length === 0 ? null : checkAll ? _locale.default === null || _locale.default === void 0 ? void 0 : _locale.default.ProTreeModal.checkAll : (0, _locale.formatMessage)(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProTreeModal2 = _locale.default.ProTreeModal) === null || _locale$ProTreeModal2 === void 0 ? void 0 : _locale$ProTreeModal2.checkNumber, {
+      value: checkedValues.length === 0 ? null : state.mode === 'all' ? (0, _locale.formatMessage)(_locale.default === null || _locale.default === void 0 ? void 0 : _locale.default.ProTreeModal.checkAll1, {
+        all: label
+      }) : (0, _locale.formatMessage)(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProTreeModal2 = _locale.default.ProTreeModal) === null || _locale$ProTreeModal2 === void 0 ? void 0 : _locale$ProTreeModal2.checkNumber, {
         num: checkedValues.length
       }),
-      addonAfter: (0, _jsxRuntime.jsxs)("div", {
+      addonAfter: state.mode === 'all' ? null : (0, _jsxRuntime.jsxs)("div", {
         className: "pro-enum-input-addonAfter",
         children: [checkedValues.length > 0 && !disabled && (0, _jsxRuntime.jsx)("span", {
           className: "close-icon",
@@ -124,7 +129,7 @@ function Trigger(props) {
         })]
       }),
       placeholder: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProTreeModal3 = _locale.default.ProTreeModal) === null || _locale$ProTreeModal3 === void 0 ? void 0 : _locale$ProTreeModal3.select,
-      disabled: disabled || appoint && value === allValue,
+      disabled: disabled || state.mode === 'all',
       style: (0, _objectSpread2.default)({}, triggerStyle)
     })
   });

package/lib/ProTreeModal/index.js

@@ -43,7 +43,6 @@ var ProTreeModal = function ProTreeModal(props) {
     _props$title = props.title,
     title = _props$title === void 0 ? _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProTreeModal = _locale.default.ProTreeModal) === null || _locale$ProTreeModal === void 0 ? void 0 : _locale$ProTreeModal.select : _props$title,
     useRequest = props.useRequest,
-    allValue = props.allValue,
     _props$showCodeName = props.showCodeName,
     showCodeName = _props$showCodeName === void 0 ? false : _props$showCodeName,
     _props$checkStrictly = props.checkStrictly,
@@ -73,9 +72,14 @@ var ProTreeModal = function ProTreeModal(props) {
     optionRender = props.optionRender,
     openChange = props.openChange,
     maxMessage = props.maxMessage;
+  var allValue = props.allValue;
   var modeType = mode.toUpperCase();
   var fieldNameLabel = fieldNames.label;
   var fieldNameValue = fieldNames.value;
+  if (appoint && !allValue) {
+    console.error('allValue must be input');
+    allValue = 'all';
+  }
   var _useSetState = (0, _ahooks.useSetState)({
       open: false,
       checkedValues: [],
@@ -218,8 +222,11 @@ var ProTreeModal = function ProTreeModal(props) {
    */
   var handleFinish = function handleFinish() {
     // 全选的时候返回 allValue 标记即可
+    // 3.3.2 版本全选的时候返回所有值的合集 list
     if (allValue !== undefined && state.checkAll && !draggable) {
-      onChange === null || onChange === void 0 ? void 0 : onChange(allValue);
+      onChange === null || onChange === void 0 ? void 0 : onChange(state.flatTreeData.map(function (item) {
+        return item[fieldNameValue];
+      }));
     } else if (draggable && span) {
       var _listRef$current;
       // 开启 draggable 使用拖拽后的顺序
@@ -270,6 +277,7 @@ var ProTreeModal = function ProTreeModal(props) {
       treeViewData: [],
       checkAll: false
     });
+    onChange === null || onChange === void 0 ? void 0 : onChange(_checkedValues);
   };
   /**
    * Drawer close
@@ -494,6 +502,7 @@ var ProTreeModal = function ProTreeModal(props) {
    * @returns
    */
   var TriggerComponent = (0, _react.useMemo)(function () {
+    var _props$otherProps3;
     if (trigger && /*#__PURE__*/_react.default.isValidElement(trigger)) {
       return (0, _jsxRuntime.jsx)("div", {
         onClick: handleClick,
@@ -509,6 +518,7 @@ var ProTreeModal = function ProTreeModal(props) {
       isView: isView,
       appoint: appoint,
       allValue: allValue,
+      label: props === null || props === void 0 ? void 0 : (_props$otherProps3 = props.otherProps) === null || _props$otherProps3 === void 0 ? void 0 : _props$otherProps3.label,
       handleClick: handleClick,
       handleClearAll: handleClearAll,
       appointChange: appointChange
@@ -699,7 +709,7 @@ var ProTreeModal = function ProTreeModal(props) {
         title: title,
         showType: "Modal",
         className: "pro-tree-modal-container",
-        extraLeft: allValue !== undefined && !appoint ? (0, _jsxRuntime.jsx)(_antd.Checkbox, {
+        extraLeft: allValue !== undefined ? (0, _jsxRuntime.jsx)(_antd.Checkbox, {
           checked: state.checkAll,
           disabled: disabled,
           onChange: handleAllCheck,

package/lib/locale/en_US.d.ts

@@ -127,10 +127,12 @@ declare const _default: {
         selectMax: string;
         noCheck: string;
         checkAll: string;
+        checkAll1: string;
         check: string;
         clearAll: string;
         checkNumber: string;
         noFinal: string;
+        specifyMode: string[];
     };
     ProTimeLimit: {
         foreverText: string;

package/lib/locale/en_US.js

@@ -133,10 +133,12 @@ var _default = exports.default = {
     selectMax: 'Select at most {max} items',
     noCheck: 'None selected yet',
     checkAll: 'Select all',
+    checkAll1: 'Select all {all}',
     check: 'selected',
     clearAll: 'Clear all',
     checkNumber: '{num} items selected',
-    noFinal: 'Oops, the content you are looking for is not found.'
+    noFinal: 'Oops, the content you are looking for is not found.',
+    specifyMode: ['all', 'specify']
   },
   ProTimeLimit: {
     foreverText: 'long term'

package/lib/locale/zh_CN.d.ts

@@ -127,9 +127,12 @@ declare const _default: {
         selectMax: string;
         noCheck: string;
         checkAll: string;
+        checkAll1: string;
         check: string;
         clearAll: string;
         checkNumber: string;
+        noFinal: string;
+        specifyMode: string[];
     };
     ProTimeLimit: {
         foreverText: string;

package/lib/locale/zh_CN.js

@@ -133,9 +133,12 @@ var _default = exports.default = {
     selectMax: '最多选择{max}个',
     noCheck: '暂无已选',
     checkAll: '全选',
+    checkAll1: '全部{all}',
     check: '已选',
     clearAll: '清空全部',
-    checkNumber: '已选择{num}项'
+    checkNumber: '已选择{num}项',
+    noFinal: '哎呀，你要找的内容没有找到。',
+    specifyMode: ['全部', '指定']
   },
   ProTimeLimit: {
     foreverText: '长期'

package/package.json

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