@zat-design/sisyphus-react 3.3.0 → 3.3.1-beta.10

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

@@ -249,9 +249,10 @@ var Render = function Render(props) {
       ((_AutoComponent$props$ = (_AutoComponent$props = AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props)[changeKey]) === null || _AutoComponent$props$ === void 0 ? void 0 : _AutoComponent$props$.call.apply(_AutoComponent$props$, [_AutoComponent$props].concat((0, _toConsumableArray2.default)(_args)))) || ((_lastComponentProps$c = lastComponentProps[changeKey]) === null || _lastComponentProps$c === void 0 ? void 0 : _lastComponentProps$c.call.apply(_lastComponentProps$c, [lastComponentProps].concat((0, _toConsumableArray2.default)(_args))));
       return false;
     }
-    // Group默认校验, 延时校验解决值未同步最新的问题
+    // Group默认校验, 延时与重新setFieldValue，为了解决校验值未同步最新的问题,
     if (formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames) {
       setTimeout(function () {
+        form.setFieldValue(formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames, form.getFieldValue(formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames));
         form.validateFields([formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames]);
       }, 60);
     }
@@ -361,13 +362,13 @@ var Render = function Render(props) {
       };
     }
     // 需要过滤掉的form_item的key
-    var filterFormItemKey = ['onFieldChange',
-    // 'shouldUpdate',
-    'namePath', 'isView', 'parentNames', 'space', 'before', 'after'];
+    var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after'];
     if (type === 'FormList') {
       lastComponentProps.disabled = lastDisabled;
       var lessMode = lastComponentProps.mode === 'less';
-      child = (0, _jsxRuntime.jsx)(_antd.Form.List, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _otherFormItemProps), {}, {
+      child = (0, _jsxRuntime.jsx)(_antd.Form.List, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        name: _otherFormItemProps.name
+      }, (0, _lodash.omit)(_otherFormItemProps, ['rules'])), {}, {
         children: function children(fields, operation, meta) {
           return (0, _jsxRuntime.jsx)(AutoComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(lastComponentProps, ['onFieldChange', 'disabledStrictly'])), {}, {
             otherProps: otherProps,
@@ -387,31 +388,24 @@ var Render = function Render(props) {
         span: 24 // 默认占一行
       });
     }
-    // 当存在shouldUpdate时补货所有form变更（防止表单onchange设置form值时无法更新的问题）
-    // if (_otherFormItemProps.shouldUpdate) {
-    //   return (
-    //     <Form.Item shouldUpdate={_otherFormItemProps.shouldUpdate} noStyle>
-    //       {() => {
-    //         return (
-    //           <Form.Item
-    //             {...omit(_otherFormItemProps, filterFormItemKey)}
-    //             // @ts-ignore
-    //             _internalItemRender={internalItemRender}
-    //             className={_className}
-    //           >
-    //             {child}
-    //           </Form.Item>
-    //         );
-    //       }}
-    //     </Form.Item>
-    //   );
-    // }
-    var formItem = (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
+
+    var orgFormItem = (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
       // @ts-ignore
       _internalItemRender: internalItemRender,
       className: _className,
       children: child
     }));
+    var formItem = orgFormItem;
+    // 当存在shouldUpdate时捕获所有form变更（防止表单onchange设置form值时无法更新的问题）
+    if (_otherFormItemProps.shouldUpdate) {
+      formItem = (0, _jsxRuntime.jsx)(_antd.Form.Item, {
+        shouldUpdate: _otherFormItemProps.shouldUpdate,
+        noStyle: true,
+        children: function children() {
+          return orgFormItem;
+        }
+      });
+    }
     // 不渲染tooltip
     if (!originalTip || ['FormList', 'ProEditTable'].includes(type)) {
       return formItem;

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

@@ -137,7 +137,11 @@ var RenderFields = function RenderFields(props) {
       dataSource: dataSource,
       type: _type
     });
-    var _placeholder = placeholder || "".concat(_isSelect ? "".concat(_locale.default.ProForm.selectPlaceHolder) : "".concat(_locale.default.ProForm.inputPlaceholder)).concat(label || formLabel || '');
+    var placeholderHandle = function placeholderHandle() {
+      var _label = (0, _lodash.isString)(label) ? label : '';
+      var _formLabel = (0, _lodash.isString)(formLabel) ? formLabel : '';
+      return placeholder || "".concat(_isSelect ? "".concat(_locale.default.ProForm.selectPlaceHolder) : "".concat(_locale.default.ProForm.inputPlaceholder)).concat(_label || _formLabel || '');
+    };
     // 表单组件Props 兼容2.0版本
     var _fieldProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, formItemChildProps), fieldProps);
     if ((0, _lodash.isBoolean)(formDisabled)) {
@@ -145,7 +149,7 @@ var RenderFields = function RenderFields(props) {
     }
     var componentProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({
       disabledStrictly: true,
-      placeholder: _placeholder
+      placeholder: placeholderHandle()
     }, _fieldProps), {}, {
       disabled: _disabled
     });

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/rulesCreator.js

@@ -7,11 +7,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.rulesCreator = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _utils = require("@zat-design/utils");
+var _lodash = require("lodash");
 var _index = require("./index");
 var _locale = _interopRequireDefault(require("../../locale"));
 var rulesCreator = exports.rulesCreator = function rulesCreator(rules, label, isSelect) {
   var _result;
-  var message = "".concat(isSelect ? "".concat(_locale.default.ProForm.selectPlaceHolder) : "".concat(_locale.default.ProForm.inputPlaceholder)).concat(_locale.default.ProForm.ruleText).concat(label || '');
+  var message = "".concat(isSelect ? "".concat(_locale.default.ProForm.selectPlaceHolder) : "".concat(_locale.default.ProForm.inputPlaceholder)).concat(_locale.default.ProForm.ruleText).concat((0, _lodash.isString)(label) ? label : '');
   var result = [];
   result = rules.map(function (ruleItem) {
     var rule = (0, _objectSpread2.default)({}, ruleItem);

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/useForm.js

@@ -53,23 +53,31 @@ var useForm = exports.useForm = function useForm(originForm) {
     };
     var _validateFields = /*#__PURE__*/function () {
       var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(nameList) {
-        var values, _values;
+        var _len,
+          rest,
+          _key,
+          values,
+          _values,
+          _args = arguments;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              _context.next = 2;
-              return validateFields(nameList);
-            case 2:
+              for (_len = _args.length, rest = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+                rest[_key - 1] = _args[_key];
+              }
+              _context.next = 3;
+              return validateFields.apply(void 0, [nameList].concat(rest));
+            case 3:
               values = _context.sent;
               if (!nameList) {
-                _context.next = 5;
+                _context.next = 6;
                 break;
               }
               return _context.abrupt("return", values);
-            case 5:
+            case 6:
               _values = _getFieldsValue();
               return _context.abrupt("return", _values);
-            case 7:
+            case 8:
             case "end":
               return _context.stop();
           }

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/ProForm/utils/useRules.js

@@ -19,6 +19,7 @@ var useRules = function useRules(props) {
     names = props.names,
     labelRequired = props.labelRequired,
     type = props.type;
+  var _label = (0, _lodash.isString)(label) ? label : '';
   // 根据 required 添加 rules, names 字段会添加数组的必填校验
   var internalRule = (0, _react.useMemo)(function () {
     var result = {
@@ -29,7 +30,7 @@ var useRules = function useRules(props) {
         return 'required' in rule;
       }));
       if (!requiredRule) {
-        var message = isSelect ? "".concat(_locale.default.ProForm.selectPlaceHolder).concat(label || '') : "".concat(_locale.default.ProForm.inputPlaceholder).concat(label || '');
+        var message = isSelect ? "".concat(_locale.default.ProForm.selectPlaceHolder).concat(_label) : "".concat(_locale.default.ProForm.inputPlaceholder).concat(_label);
         var rule = {
           required: required,
           message: message
@@ -38,7 +39,7 @@ var useRules = function useRules(props) {
         if (names === null || names === void 0 ? void 0 : names.length) {
           rule.validator = function (_, value) {
             if (!value || (0, _index.isNullArray)(value)) {
-              return Promise.reject(new Error("".concat(_locale.default.ProForm.inputPlaceholder).concat(label)));
+              return Promise.reject(new Error("".concat(_locale.default.ProForm.inputPlaceholder).concat(_label)));
             }
             return Promise.resolve();
           };
@@ -49,7 +50,7 @@ var useRules = function useRules(props) {
     return result;
   }, [rules, required]);
   // type转换为内置rules
-  internalRule.rules = internalRule.rules && (0, _rulesCreator.rulesCreator)(internalRule.rules, label, isSelect);
+  internalRule.rules = internalRule.rules && (0, _rulesCreator.rulesCreator)(internalRule.rules, _label, isSelect);
   (0, _react.useEffect)(function () {
     // 添加完整性校验
     if (names && !(0, _lodash.isBoolean)(labelRequired) || type === 'Group' && Array.isArray(names) && required) {
@@ -57,7 +58,7 @@ var useRules = function useRules(props) {
         validator: function validator(rules, value) {
           // 完整性校验, 空数组不校验, 数组有值且值不完整则校验不通过
           if (Array.isArray(value) && !(0, _index.isNullArray)(value) && (0, _index.isNotFullArray)(value, names.length)) {
-            return Promise.reject(new Error("".concat(_locale.default.ProForm.completeText).concat(label || '')));
+            return Promise.reject(new Error("".concat(_locale.default.ProForm.completeText).concat(_label)));
           }
           return Promise.resolve();
         }

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

@@ -30,7 +30,8 @@ var FoldMenu = function FoldMenu(props) {
     'pro-layout-menu-tooltip-nav-open': collapsed
   });
   var _useContext = (0, _react.useContext)(_index2.LayoutContext),
-    selectedPath = _useContext.selectedPath;
+    selectedPath = _useContext.selectedPath,
+    onSelected = _useContext.onSelected;
   return (0, _jsxRuntime.jsx)("div", {
     className: "pro-layout-menu-fold",
     style: (0, _objectSpread2.default)({}, style),
@@ -98,10 +99,17 @@ var FoldMenu = function FoldMenu(props) {
         }, "".concat(id, "-").concat(name)) : !collapsed ? (0, _jsxRuntime.jsx)(_antd.Tooltip, {
           placement: "right",
           title: name,
-          children: (0, _jsxRuntime.jsx)(_reactRouterDom.Link, {
-            to: toPath,
-            children: LiNode
-          }, toPath)
+          children: (0, _jsxRuntime.jsx)("span", {
+            onClick: function onClick() {
+              onSelected({
+                selectedPath: toPath
+              });
+            },
+            children: (0, _jsxRuntime.jsx)(_reactRouterDom.Link, {
+              to: toPath,
+              children: LiNode
+            }, toPath)
+          })
         }, toPath) : (0, _jsxRuntime.jsx)(_reactRouterDom.Link, {
           to: toPath,
           children: LiNode

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/ProStep/index.js

@@ -170,7 +170,7 @@ var ProStep = function ProStep(_ref) {
 
     observer.observe(targetElement, config);
   };
-  (0, _react.useEffect)(function () {
+  (0, _ahooks.useDeepCompareEffect)(function () {
     var errorModuleKeys = Object.keys(errorCollection).reverse();
     if (errorModuleKeys === null || errorModuleKeys === void 0 ? void 0 : errorModuleKeys.length) {
       var _dataSource$find;

package/lib/ProTable/style/index.less

@@ -64,13 +64,14 @@
   }
 
   .@{ant-prefix}-table-body {
-    // .@{ant-prefix}-table-tbody .@{ant-prefix}-table-row:nth-child(odd).new-cell {
-    //   background: #00ae4d !important;
+    .@{ant-prefix}-table-tbody .@{ant-prefix}-table-row:nth-child(odd).new-cell {
+      background: #d2fff4 !important;
 
-    //   td {
-    //     background: #00ae4d !important;
-    //   }
-    // }
+      td {
+        background: #d2fff4 !important;
+        border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
+      }
+    }
 
     .@{ant-prefix}-table-cell .varied-cell {
       margin-left: -8px;

package/lib/ProTooltip/index.js

@@ -143,10 +143,23 @@ var ProTooltip = function ProTooltip(props) {
   };
   (0, _react.useEffect)(function () {
     if (isResponsiveWidth && parentElement) {
+      var _contentDom$style$wid;
       var cWidth = parentElement.clientWidth - 32;
       var contentDom = childRef.current;
+      var flag = false;
+      var styleWidth = Number((_contentDom$style$wid = contentDom.style.width) === null || _contentDom$style$wid === void 0 ? void 0 : _contentDom$style$wid.replace('px', ''));
+      if (contentDom.offsetWidth < styleWidth) {
+        flag = contentDom.scrollWidth > styleWidth;
+      } else if (contentDom.offsetWidth === styleWidth && contentDom.scrollWidth === styleWidth && contentDom.clientWidth === styleWidth) {
+        flag = false;
+      } else {
+        flag = contentDom.scrollWidth > contentDom.clientWidth;
+      }
+      if (parentElement.scrollWidth > parentElement.clientWidth) {
+        flag = true;
+      }
       setState({
-        isShowToolTip: contentDom.scrollWidth > contentDom.offsetWidth,
+        isShowToolTip: flag,
         localWidth: cWidth
       });
     }

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", {
@@ -81,16 +84,22 @@ function Trigger(props) {
     if (appoint) {
       return (0, _jsxRuntime.jsxs)(_antd.Space.Compact, {
         block: true,
+        style: (0, _objectSpread2.default)({}, triggerStyle),
         children: [(0, _jsxRuntime.jsxs)(_antd.Select, {
+          style: {
+            width: 'auto'
+          },
+          disabled: disabled,
+          className: (0, _classnames.default)(disabled ? 'trigger-no-hover' : '', appoint ? 'pro-tree-modal-input-appoint' : ''),
           defaultValue: "appoint",
           value: state.mode,
           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]
       });
@@ -101,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",
@@ -118,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)
     })
   });