@zat-design/sisyphus-react 3.4.3-beta.1 → 3.4.3-beta.2

package/dist/index.esm.css

@@ -3864,6 +3864,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form.pro-form-view .ant-form-item .pro-tree .ant-tree-checkbox * {
   height: 16px !important;
 }
+.ant-select-dropdown.pro-tree-select-drop-down-container.checkable-tree {
+  overflow: hidden!important;
+}
 .pro-drawer .pro-drawer-close {
   position: absolute;
   top: 6px;

package/dist/less.esm.css

@@ -3864,6 +3864,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form.pro-form-view .ant-form-item .pro-tree .ant-tree-checkbox * {
   height: 16px !important;
 }
+.ant-select-dropdown.pro-tree-select-drop-down-container.checkable-tree {
+  overflow: hidden!important;
+}
 .pro-drawer .pro-drawer-close {
   position: absolute;
   top: 6px;

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

@@ -86,13 +86,14 @@ var Group = function Group(props) {
       });
     }
   }, [value]);
+  var _otherProps = omit(otherProps, ['colProps', 'required']);
   return _jsx("div", {
     className: _className,
     children: space.compact || (space === null || space === void 0 ? void 0 : space.separator) ? _jsx(_Space.Compact, {
       children: _jsx(RenderFields, _objectSpread({
         columns: data.columns,
         form: form
-      }, omit(otherProps, ['colProps'])))
+      }, _otherProps))
     }) : _jsx(_Space, _objectSpread(_objectSpread({
       align: "start"
     }, omit(space, ['separator', 'compact'])), {}, {
@@ -100,7 +101,7 @@ var Group = function Group(props) {
         return _jsx(RenderFields, _objectSpread({
           columns: [column],
           form: form
-        }, omit(otherProps, ['colProps'])), (column === null || column === void 0 ? void 0 : column.name) || index);
+        }, _otherProps), (column === null || column === void 0 ? void 0 : column.name) || index);
       })
     }))
   });

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

@@ -16,7 +16,7 @@ interface Props<T = any> {
     originalValues?: ProFormProps<T>['originalValues'];
     clearNotShow?: boolean;
     requiredOnView?: boolean;
-    required?: boolean | (() => boolean);
+    required?: boolean | boolean[] | (() => boolean | boolean[]);
     originalDiffTip?: boolean;
     globalControl?: boolean;
 }

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

@@ -206,7 +206,7 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     hiddenNames?: string[] | any[];
     rules?: ProRule[] | ReactiveFunction<Values, ProRule[]>;
     equalWith?: (originValue: any, currentValue: any) => boolean;
-    required?: boolean | ReactiveFunction<Values, boolean>;
+    required?: boolean | boolean[] | ReactiveFunction<Values, boolean | boolean[]>;
     labelRequired?: boolean;
     toISOString?: boolean;
     clearNotShow?: boolean;

package/es/ProForm/propsType.d.ts

@@ -38,7 +38,7 @@ export interface ProFormOtherProps {
     colProps: ColProps;
     disabled: boolean;
     show?: boolean | (() => boolean);
-    required?: boolean | (() => boolean);
+    required?: boolean | boolean[] | (() => boolean | boolean[]);
     mode?: string;
     namePath?: any[] | string | number;
 }
@@ -70,7 +70,7 @@ export interface ProFormProps<Values = any> extends FormProps<Values> {
     clearNotShow?: boolean;
     requiredOnView?: boolean;
     formId?: string;
-    required?: boolean;
+    required?: boolean | boolean[];
     originalDiffTip?: boolean;
 }
 export interface Transform<T = any> {

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

@@ -36,7 +36,7 @@ export declare const isNullValue: (value: any) => boolean;
  * @param arr 值
  * @returns boole
  */
-export declare const isNotFullArray: (arr: any, length: any) => boolean;
+export declare const isNotFullArray: (arr: any, length: any, required: any) => boolean;
 /**
  * 判断数组中值是否都为空 全部为空则为true
  * @param arr 值

package/es/ProForm/utils/index.js

@@ -171,10 +171,15 @@ export var isNullValue = function isNullValue(value) {
  * @param arr 值
  * @returns boole
  */
-export var isNotFullArray = function isNotFullArray(arr, length) {
+export var isNotFullArray = function isNotFullArray(arr, length, required) {
   if (!Array.isArray(arr)) {
     return false;
   }
+  if (Array.isArray(required) && required.some(function (item) {
+    return item === false;
+  })) {
+    return false;
+  }
   if (arr.length < length) return true;
   return arr.some(function (item) {
     if (item === undefined || item === null) {

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

@@ -1 +1,7 @@
-export declare const rulesCreator: (rules: any, label: any, isSelect: any) => any[];
+export declare const rulesCreator: ({ rules, label, isSelect, names, required }: {
+    rules: any;
+    label: any;
+    isSelect: any;
+    names: any;
+    required: any;
+}) => any[];

package/es/ProForm/utils/rulesCreator.js

@@ -1,10 +1,24 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { validate, regExp } from '@zat-design/utils';
-import { isString } from 'lodash';
+import { isString, isNumber } from 'lodash';
 import { isNullValue } from './index';
-import locale from '../../locale';
-export var rulesCreator = function rulesCreator(rules, label, isSelect) {
+import locale, { formatMessage } from '../../locale';
+var getNonEmptyValuesByIndex = function getNonEmptyValuesByIndex(required, valueArray) {
+  var result = [];
+  required.forEach(function (item, index) {
+    if (item && !valueArray[index] && !isNumber(valueArray[index])) {
+      result.push(index + 1);
+    }
+  });
+  return result;
+};
+export var rulesCreator = function rulesCreator(_ref) {
   var _result;
+  var rules = _ref.rules,
+    label = _ref.label,
+    isSelect = _ref.isSelect,
+    names = _ref.names,
+    required = _ref.required;
   var message = "".concat(isSelect ? "".concat(locale.ProForm.selectPlaceHolder) : "".concat(locale.ProForm.inputPlaceholder)).concat(locale.ProForm.ruleText).concat(isString(label) ? label : '');
   var result = [];
   result = rules.map(function (ruleItem) {
@@ -29,6 +43,22 @@ export var rulesCreator = function rulesCreator(rules, label, isSelect) {
     }
     return rule;
   });
+  if ((names === null || names === void 0 ? void 0 : names.length) && (required === null || required === void 0 ? void 0 : required.length)) {
+    var customRequired = {
+      validator: function validator(rules, value) {
+        var errorIndexes = getNonEmptyValuesByIndex(required, value);
+        // 校验为true的值是否存在
+        if (Array.isArray(value) && (errorIndexes === null || errorIndexes === void 0 ? void 0 : errorIndexes.length)) {
+          var _locale$ProForm;
+          return Promise.reject(new Error("".concat(formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProForm = locale.ProForm) === null || _locale$ProForm === void 0 ? void 0 : _locale$ProForm.halfRuleText, {
+            total: errorIndexes === null || errorIndexes === void 0 ? void 0 : errorIndexes.join(',')
+          }))));
+        }
+        return Promise.resolve();
+      }
+    };
+    result.push(customRequired);
+  }
   if (!((_result = result) === null || _result === void 0 ? void 0 : _result.length)) {
     result = [{
       required: false

package/es/ProForm/utils/useRules.js

@@ -13,19 +13,26 @@ var useRules = function useRules(props) {
     labelRequired = props.labelRequired,
     type = props.type;
   var _label = isString(label) ? label : '';
+  var requiredRule = Array.isArray(rules) && (rules === null || rules === void 0 ? void 0 : rules.find(function (rule) {
+    return 'required' in rule;
+  }));
+  var allRequired = required === true || Array.isArray(required) && required.every(function (item) {
+    return item === true;
+  });
   // 根据 required 添加 rules, names 字段会添加数组的必填校验
   var internalRule = useMemo(function () {
     var result = {
       rules: rules || []
     };
-    if (required === true) {
-      var requiredRule = Array.isArray(rules) && (rules === null || rules === void 0 ? void 0 : rules.find(function (rule) {
-        return 'required' in rule;
-      }));
+    // Group required: true时，直接走完整校验
+    if (allRequired && type === 'Group') {
+      return result;
+    }
+    if (allRequired) {
       if (!requiredRule) {
         var message = isSelect ? "".concat(locale.ProForm.selectPlaceHolder).concat(_label) : "".concat(locale.ProForm.inputPlaceholder).concat(_label);
         var rule = {
-          required: required,
+          required: allRequired,
           message: message
         };
         // names字段的必填校验
@@ -43,22 +50,40 @@ var useRules = function useRules(props) {
     return result;
   }, [rules, required]);
   // type转换为内置rules
-  internalRule.rules = internalRule.rules && rulesCreator(internalRule.rules, _label, isSelect);
+  internalRule.rules = internalRule.rules && rulesCreator({
+    rules: internalRule.rules,
+    label: _label,
+    isSelect: isSelect,
+    names: names,
+    required: required
+  });
   useEffect(function () {
+    if (type === 'Group' && (allRequired || requiredRule)) {
+      var customRequired = {
+        validator: function validator(rules, value) {
+          // 完整性校验, 数组有值且值不完整则校验不通过
+          if (Array.isArray(value) && isNotFullArray(value, names.length, required)) {
+            return Promise.reject(new Error("".concat(locale.ProForm.completeText).concat(_label)));
+          }
+          return Promise.resolve();
+        }
+      };
+      // 插入rules第一条，完整性校验大于自定义
+      internalRule.rules.unshift(customRequired);
+      return;
+    }
     // 添加完整性校验
     if (names && !isBoolean(labelRequired)) {
-      var customRequired = {
+      var _customRequired = {
         validator: function validator(rules, value) {
           // 完整性校验, 空数组不校验, 数组有值且值不完整则校验不通过
-          if (Array.isArray(value) && !isNullArray(value) && isNotFullArray(value, names.length)) {
+          if (Array.isArray(value) && !isNullArray(value) && isNotFullArray(value, names.length, required)) {
             return Promise.reject(new Error("".concat(locale.ProForm.completeText).concat(_label)));
           }
           return Promise.resolve();
         }
       };
-      if (!(type === 'Group' && Array.isArray(names) && !required)) {
-        internalRule.rules.push(customRequired);
-      }
+      internalRule.rules.unshift(_customRequired);
     }
   }, [internalRule]);
   return internalRule;

package/es/ProForm/utils/useShouldUpdate.js

@@ -84,11 +84,11 @@ var useShouldUpdate = function useShouldUpdate(props) {
     disabledRef.current = disabled;
   }
   if (isFunction(required)) {
-    requiredRef.current = Boolean(required(values, {
+    requiredRef.current = required(values, {
       form: form,
       index: index,
       namePath: namePath
-    }));
+    });
   } else {
     requiredRef.current = required;
   }
@@ -133,11 +133,11 @@ var useShouldUpdate = function useShouldUpdate(props) {
         index: index,
         namePath: namePath
       })) : disabled;
-      var _required = isFunction(required) ? Boolean(required(_currentValues, {
+      var _required = isFunction(required) ? required(_currentValues, {
         form: form,
         index: index,
         namePath: namePath
-      })) : required;
+      }) : required;
       var _rules = isFunction(rules) ? rules(_currentValues, {
         form: form,
         index: index,

package/es/ProTree/components/ProTreeSelect/style/index.less

@@ -113,4 +113,4 @@
             }
         }
     }
-}
+}

package/es/ProTree/style/index.less

@@ -336,3 +336,8 @@
 .pro-form.pro-form-view .@{ant-prefix}-form-item .pro-tree .@{ant-prefix}-tree-checkbox * {
   height: 16px !important;
 }
+
+// 解决双滚动条
+.ant-select-dropdown.pro-tree-select-drop-down-container.checkable-tree{
+  overflow: hidden!important;
+}

package/es/locale/en_US.d.ts

@@ -31,6 +31,7 @@ declare const _default: {
         reset: string;
         ruleText: string;
         completeText: string;
+        halfRuleText: string;
         formList_actions: string[];
         formList_confirmMessage: string;
     };

package/es/locale/en_US.js

@@ -31,6 +31,7 @@ export default {
     reset: 'Reset',
     ruleText: 'correct',
     completeText: 'enter in full',
+    halfRuleText: 'Enter the value of ({total})',
     formList_actions: ['Add', 'Delete', 'Copy', 'Move up', 'Move down', 'Add a new line'],
     formList_confirmMessage: 'Are you sure delete it?'
   },

package/es/locale/zh_CN.d.ts

@@ -31,6 +31,7 @@ declare const _default: {
         reset: string;
         ruleText: string;
         completeText: string;
+        halfRuleText: string;
         formList_actions: string[];
         formList_confirmMessage: string;
     };

package/es/locale/zh_CN.js

@@ -31,6 +31,7 @@ export default {
     reset: '重置',
     ruleText: '正确的',
     completeText: '请完整输入',
+    halfRuleText: '请输入第({total})表单的值',
     formList_actions: ['新增', '删除', '复制', '上移', '下移', '新增一行'],
     formList_confirmMessage: '确认删除吗?'
   },

package/es/style/theme/antd.less

@@ -703,8 +703,8 @@
 
 // tooltip样式重载
 .@{ant-prefix}-tooltip {
-  > .ant-tooltip-content {
-    > .ant-tooltip-inner {
+  > .@{ant-prefix}-tooltip-content {
+    > .@{ant-prefix}-tooltip-inner {
       color: rgb(29, 33, 41);
       background-color: #fff;
       box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08),
@@ -720,8 +720,8 @@
         }
       }
     }
-    > .ant-tooltip-arrow {
-      > .ant-tooltip-arrow-content {
+    > .@{ant-prefix}-tooltip-arrow {
+      > .@{ant-prefix}-tooltip-arrow-content {
         --antd-arrow-background-color: linear-gradient(
           to right bottom,
           rgba(255, 255, 255, 0.95),

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

@@ -90,13 +90,14 @@ var Group = function Group(props) {
       });
     }
   }, [value]);
+  var _otherProps = (0, _lodash.omit)(otherProps, ['colProps', 'required']);
   return (0, _jsxRuntime.jsx)("div", {
     className: _className,
     children: space.compact || (space === null || space === void 0 ? void 0 : space.separator) ? (0, _jsxRuntime.jsx)(_antd.Space.Compact, {
       children: (0, _jsxRuntime.jsx)(_RenderFields.default, (0, _objectSpread2.default)({
         columns: data.columns,
         form: form
-      }, (0, _lodash.omit)(otherProps, ['colProps'])))
+      }, _otherProps))
     }) : (0, _jsxRuntime.jsx)(_antd.Space, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       align: "start"
     }, (0, _lodash.omit)(space, ['separator', 'compact'])), {}, {
@@ -104,7 +105,7 @@ var Group = function Group(props) {
         return (0, _jsxRuntime.jsx)(_RenderFields.default, (0, _objectSpread2.default)({
           columns: [column],
           form: form
-        }, (0, _lodash.omit)(otherProps, ['colProps'])), (column === null || column === void 0 ? void 0 : column.name) || index);
+        }, _otherProps), (column === null || column === void 0 ? void 0 : column.name) || index);
       })
     }))
   });

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

@@ -16,7 +16,7 @@ interface Props<T = any> {
     originalValues?: ProFormProps<T>['originalValues'];
     clearNotShow?: boolean;
     requiredOnView?: boolean;
-    required?: boolean | (() => boolean);
+    required?: boolean | boolean[] | (() => boolean | boolean[]);
     originalDiffTip?: boolean;
     globalControl?: boolean;
 }

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

@@ -206,7 +206,7 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     hiddenNames?: string[] | any[];
     rules?: ProRule[] | ReactiveFunction<Values, ProRule[]>;
     equalWith?: (originValue: any, currentValue: any) => boolean;
-    required?: boolean | ReactiveFunction<Values, boolean>;
+    required?: boolean | boolean[] | ReactiveFunction<Values, boolean | boolean[]>;
     labelRequired?: boolean;
     toISOString?: boolean;
     clearNotShow?: boolean;

package/lib/ProForm/propsType.d.ts

@@ -38,7 +38,7 @@ export interface ProFormOtherProps {
     colProps: ColProps;
     disabled: boolean;
     show?: boolean | (() => boolean);
-    required?: boolean | (() => boolean);
+    required?: boolean | boolean[] | (() => boolean | boolean[]);
     mode?: string;
     namePath?: any[] | string | number;
 }
@@ -70,7 +70,7 @@ export interface ProFormProps<Values = any> extends FormProps<Values> {
     clearNotShow?: boolean;
     requiredOnView?: boolean;
     formId?: string;
-    required?: boolean;
+    required?: boolean | boolean[];
     originalDiffTip?: boolean;
 }
 export interface Transform<T = any> {

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

@@ -36,7 +36,7 @@ export declare const isNullValue: (value: any) => boolean;
  * @param arr 值
  * @returns boole
  */
-export declare const isNotFullArray: (arr: any, length: any) => boolean;
+export declare const isNotFullArray: (arr: any, length: any, required: any) => boolean;
 /**
  * 判断数组中值是否都为空 全部为空则为true
  * @param arr 值

package/lib/ProForm/utils/index.js

@@ -187,10 +187,15 @@ var isNullValue = exports.isNullValue = function isNullValue(value) {
  * @param arr 值
  * @returns boole
  */
-var isNotFullArray = exports.isNotFullArray = function isNotFullArray(arr, length) {
+var isNotFullArray = exports.isNotFullArray = function isNotFullArray(arr, length, required) {
   if (!Array.isArray(arr)) {
     return false;
   }
+  if (Array.isArray(required) && required.some(function (item) {
+    return item === false;
+  })) {
+    return false;
+  }
   if (arr.length < length) return true;
   return arr.some(function (item) {
     if (item === undefined || item === null) {

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

@@ -1 +1,7 @@
-export declare const rulesCreator: (rules: any, label: any, isSelect: any) => any[];
+export declare const rulesCreator: ({ rules, label, isSelect, names, required }: {
+    rules: any;
+    label: any;
+    isSelect: any;
+    names: any;
+    required: any;
+}) => any[];

package/lib/ProForm/utils/rulesCreator.js

@@ -1,5 +1,6 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -9,9 +10,23 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 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 _locale = _interopRequireWildcard(require("../../locale"));
+var getNonEmptyValuesByIndex = function getNonEmptyValuesByIndex(required, valueArray) {
+  var result = [];
+  required.forEach(function (item, index) {
+    if (item && !valueArray[index] && !(0, _lodash.isNumber)(valueArray[index])) {
+      result.push(index + 1);
+    }
+  });
+  return result;
+};
+var rulesCreator = exports.rulesCreator = function rulesCreator(_ref) {
   var _result;
+  var rules = _ref.rules,
+    label = _ref.label,
+    isSelect = _ref.isSelect,
+    names = _ref.names,
+    required = _ref.required;
   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) {
@@ -36,6 +51,22 @@ var rulesCreator = exports.rulesCreator = function rulesCreator(rules, label, is
     }
     return rule;
   });
+  if ((names === null || names === void 0 ? void 0 : names.length) && (required === null || required === void 0 ? void 0 : required.length)) {
+    var customRequired = {
+      validator: function validator(rules, value) {
+        var errorIndexes = getNonEmptyValuesByIndex(required, value);
+        // 校验为true的值是否存在
+        if (Array.isArray(value) && (errorIndexes === null || errorIndexes === void 0 ? void 0 : errorIndexes.length)) {
+          var _locale$ProForm;
+          return Promise.reject(new Error("".concat((0, _locale.formatMessage)(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProForm = _locale.default.ProForm) === null || _locale$ProForm === void 0 ? void 0 : _locale$ProForm.halfRuleText, {
+            total: errorIndexes === null || errorIndexes === void 0 ? void 0 : errorIndexes.join(',')
+          }))));
+        }
+        return Promise.resolve();
+      }
+    };
+    result.push(customRequired);
+  }
   if (!((_result = result) === null || _result === void 0 ? void 0 : _result.length)) {
     result = [{
       required: false

package/lib/ProForm/utils/useRules.js

@@ -20,19 +20,26 @@ var useRules = function useRules(props) {
     labelRequired = props.labelRequired,
     type = props.type;
   var _label = (0, _lodash.isString)(label) ? label : '';
+  var requiredRule = Array.isArray(rules) && (rules === null || rules === void 0 ? void 0 : rules.find(function (rule) {
+    return 'required' in rule;
+  }));
+  var allRequired = required === true || Array.isArray(required) && required.every(function (item) {
+    return item === true;
+  });
   // 根据 required 添加 rules, names 字段会添加数组的必填校验
   var internalRule = (0, _react.useMemo)(function () {
     var result = {
       rules: rules || []
     };
-    if (required === true) {
-      var requiredRule = Array.isArray(rules) && (rules === null || rules === void 0 ? void 0 : rules.find(function (rule) {
-        return 'required' in rule;
-      }));
+    // Group required: true时，直接走完整校验
+    if (allRequired && type === 'Group') {
+      return result;
+    }
+    if (allRequired) {
       if (!requiredRule) {
         var message = isSelect ? "".concat(_locale.default.ProForm.selectPlaceHolder).concat(_label) : "".concat(_locale.default.ProForm.inputPlaceholder).concat(_label);
         var rule = {
-          required: required,
+          required: allRequired,
           message: message
         };
         // names字段的必填校验
@@ -50,22 +57,40 @@ 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)({
+    rules: internalRule.rules,
+    label: _label,
+    isSelect: isSelect,
+    names: names,
+    required: required
+  });
   (0, _react.useEffect)(function () {
+    if (type === 'Group' && (allRequired || requiredRule)) {
+      var customRequired = {
+        validator: function validator(rules, value) {
+          // 完整性校验, 数组有值且值不完整则校验不通过
+          if (Array.isArray(value) && (0, _index.isNotFullArray)(value, names.length, required)) {
+            return Promise.reject(new Error("".concat(_locale.default.ProForm.completeText).concat(_label)));
+          }
+          return Promise.resolve();
+        }
+      };
+      // 插入rules第一条，完整性校验大于自定义
+      internalRule.rules.unshift(customRequired);
+      return;
+    }
     // 添加完整性校验
     if (names && !(0, _lodash.isBoolean)(labelRequired)) {
-      var customRequired = {
+      var _customRequired = {
         validator: function validator(rules, value) {
           // 完整性校验, 空数组不校验, 数组有值且值不完整则校验不通过
-          if (Array.isArray(value) && !(0, _index.isNullArray)(value) && (0, _index.isNotFullArray)(value, names.length)) {
+          if (Array.isArray(value) && !(0, _index.isNullArray)(value) && (0, _index.isNotFullArray)(value, names.length, required)) {
             return Promise.reject(new Error("".concat(_locale.default.ProForm.completeText).concat(_label)));
           }
           return Promise.resolve();
         }
       };
-      if (!(type === 'Group' && Array.isArray(names) && !required)) {
-        internalRule.rules.push(customRequired);
-      }
+      internalRule.rules.unshift(_customRequired);
     }
   }, [internalRule]);
   return internalRule;

package/lib/ProForm/utils/useShouldUpdate.js

@@ -91,11 +91,11 @@ var useShouldUpdate = function useShouldUpdate(props) {
     disabledRef.current = disabled;
   }
   if ((0, _lodash.isFunction)(required)) {
-    requiredRef.current = Boolean(required(values, {
+    requiredRef.current = required(values, {
       form: form,
       index: index,
       namePath: namePath
-    }));
+    });
   } else {
     requiredRef.current = required;
   }
@@ -140,11 +140,11 @@ var useShouldUpdate = function useShouldUpdate(props) {
         index: index,
         namePath: namePath
       })) : disabled;
-      var _required = (0, _lodash.isFunction)(required) ? Boolean(required(_currentValues, {
+      var _required = (0, _lodash.isFunction)(required) ? required(_currentValues, {
         form: form,
         index: index,
         namePath: namePath
-      })) : required;
+      }) : required;
       var _rules = (0, _lodash.isFunction)(rules) ? rules(_currentValues, {
         form: form,
         index: index,

package/lib/ProTree/components/ProTreeSelect/style/index.less

@@ -113,4 +113,4 @@
             }
         }
     }
-}
+}

package/lib/ProTree/style/index.less

@@ -336,3 +336,8 @@
 .pro-form.pro-form-view .@{ant-prefix}-form-item .pro-tree .@{ant-prefix}-tree-checkbox * {
   height: 16px !important;
 }
+
+// 解决双滚动条
+.ant-select-dropdown.pro-tree-select-drop-down-container.checkable-tree{
+  overflow: hidden!important;
+}

package/lib/locale/en_US.d.ts

@@ -31,6 +31,7 @@ declare const _default: {
         reset: string;
         ruleText: string;
         completeText: string;
+        halfRuleText: string;
         formList_actions: string[];
         formList_confirmMessage: string;
     };

package/lib/locale/en_US.js

@@ -37,6 +37,7 @@ var _default = exports.default = {
     reset: 'Reset',
     ruleText: 'correct',
     completeText: 'enter in full',
+    halfRuleText: 'Enter the value of ({total})',
     formList_actions: ['Add', 'Delete', 'Copy', 'Move up', 'Move down', 'Add a new line'],
     formList_confirmMessage: 'Are you sure delete it?'
   },

package/lib/locale/zh_CN.d.ts

@@ -31,6 +31,7 @@ declare const _default: {
         reset: string;
         ruleText: string;
         completeText: string;
+        halfRuleText: string;
         formList_actions: string[];
         formList_confirmMessage: string;
     };

package/lib/locale/zh_CN.js

@@ -37,6 +37,7 @@ var _default = exports.default = {
     reset: '重置',
     ruleText: '正确的',
     completeText: '请完整输入',
+    halfRuleText: '请输入第({total})表单的值',
     formList_actions: ['新增', '删除', '复制', '上移', '下移', '新增一行'],
     formList_confirmMessage: '确认删除吗?'
   },

package/lib/style/theme/antd.less

@@ -703,8 +703,8 @@
 
 // tooltip样式重载
 .@{ant-prefix}-tooltip {
-  > .ant-tooltip-content {
-    > .ant-tooltip-inner {
+  > .@{ant-prefix}-tooltip-content {
+    > .@{ant-prefix}-tooltip-inner {
       color: rgb(29, 33, 41);
       background-color: #fff;
       box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08),
@@ -720,8 +720,8 @@
         }
       }
     }
-    > .ant-tooltip-arrow {
-      > .ant-tooltip-arrow-content {
+    > .@{ant-prefix}-tooltip-arrow {
+      > .@{ant-prefix}-tooltip-arrow-content {
         --antd-arrow-background-color: linear-gradient(
           to right bottom,
           rgba(255, 255, 255, 0.95),

package/package.json

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