@zat-design/sisyphus-react 3.4.3 → 3.4.4

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

@@ -21,6 +21,7 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _lodash = _interopRequireWildcard(require("lodash"));
+var _moment = _interopRequireDefault(require("moment"));
 var getLayout = exports.getLayout = function getLayout(params) {
   var _params$span = params.span,
     span = _params$span === void 0 ? 8 : _params$span,
@@ -58,7 +59,7 @@ var useControlled = exports.useControlled = function useControlled(props) {
 var isSelect = exports.isSelect = function isSelect(props) {
   var dataSource = props.dataSource,
     type = props.type;
-  return (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) || ['Select', 'ProSelect', 'ProEnum', 'DatePicker', 'RangePicker', 'ProAddressBar', 'ProTimeLimit', 'ProModalSelect', 'ProTreeModal', 'ProUpload'].includes(type);
+  return (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) || ['Select', 'ProSelect', 'ProEnum', 'DatePicker', 'RangePicker', 'ProAddressBar', 'ProTimeLimit', 'ProModalSelect', 'ProTreeModal', 'ProUpload', 'TimePicker'].includes(type);
 };
 /**
  * Input TextArea 移除前后空格
@@ -138,8 +139,8 @@ var splitNameStr = exports.splitNameStr = function splitNameStr(name) {
 // 过滤掉字段名中包含 '-' 的字段
 var filterInternalFields = exports.filterInternalFields = function filterInternalFields(values) {
   var nextValues = values;
-  // fix: braft-editor对象不可遍历
-  if (values === null || values === void 0 ? void 0 : values._immutable) {
+  // fix: braft-editor对象不可遍历 Moment不过滤
+  if ((values === null || values === void 0 ? void 0 : values._immutable) || _moment.default.isMoment(values)) {
     return nextValues;
   }
   if (Array.isArray(nextValues)) {
@@ -187,10 +188,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) {
@@ -311,6 +317,10 @@ function initialValuesToNames() {
         values[key] = formInitialValue;
       }
     }
+    // 给FormList默认增加一行
+    if (item.type === 'FormList' && !item.initialValue && !(0, _lodash.get)(values, item.name)) {
+      item.initialValue = [{}];
+    }
   });
   return values;
 }

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,34 @@ 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 _errorValues3;
+        var errorValues = getNonEmptyValuesByIndex(required, value);
+        if ((value === null || value === void 0 ? void 0 : value.length) === 2) {
+          var _errorValues;
+          errorValues = errorValues.map(function (item) {
+            var _locale$ProForm;
+            return _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProForm = _locale.default.ProForm) === null || _locale$ProForm === void 0 ? void 0 : _locale$ProForm.ruleStartEndText[item - 1];
+          });
+          if ((_errorValues = errorValues) === null || _errorValues === void 0 ? void 0 : _errorValues.length) {
+            var _locale$ProForm2, _errorValues2;
+            return Promise.reject(new Error("".concat(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProForm2 = _locale.default.ProForm) === null || _locale$ProForm2 === void 0 ? void 0 : _locale$ProForm2.inputPlaceholder).concat((_errorValues2 = errorValues) === null || _errorValues2 === void 0 ? void 0 : _errorValues2.join(','))));
+          }
+        }
+        // 校验为true的值是否存在
+        if (Array.isArray(value) && ((_errorValues3 = errorValues) === null || _errorValues3 === void 0 ? void 0 : _errorValues3.length)) {
+          var _locale$ProForm3, _errorValues4;
+          return Promise.reject(new Error("".concat((0, _locale.formatMessage)(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProForm3 = _locale.default.ProForm) === null || _locale$ProForm3 === void 0 ? void 0 : _locale$ProForm3.halfRuleText, {
+            total: (_errorValues4 = errorValues) === null || _errorValues4 === void 0 ? void 0 : _errorValues4.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/ProLayout/components/ProCollapse/index.js

@@ -8,6 +8,7 @@ exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _jsxRuntime = require("react/jsx-runtime");
+var _react = require("react");
 var _antd = require("antd");
 var _icons = require("@ant-design/icons");
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -40,7 +41,8 @@ var ProCollapse = function ProCollapse(props) {
     'pro-collapse': true,
     'pro-collapse-level2': level === '2',
     'pro-collapse-list': titleList === null || titleList === void 0 ? void 0 : titleList.length,
-    'pro-collapse-no-title': !title
+    'pro-collapse-no-title': !title,
+    'pro-collapse-no-level1-title': !title && level !== '2'
   }, "".concat(className), className));
   var content = (0, _jsxRuntime.jsx)("div", {
     className: "pro-collapse-content",
@@ -109,6 +111,26 @@ var ProCollapse = function ProCollapse(props) {
       }), content]
     });
   };
+  // 当pro-layout-content只存在一个card时，高度动态计算
+  (0, _react.useLayoutEffect)(function () {
+    var proCollapseContent = document.querySelector('.pro-layout-content');
+    if (!proCollapseContent) {
+      return;
+    }
+    var proCollapseNoTitles = proCollapseContent.querySelectorAll('.pro-collapse-no-level1-title');
+    var proCollapses = proCollapseContent.querySelectorAll('.pro-collapse');
+    if (proCollapseNoTitles.length === 1 && proCollapses.length === 1) {
+      var rect = proCollapseNoTitles[0].getBoundingClientRect();
+      if ((rect === null || rect === void 0 ? void 0 : rect.height) < window.innerHeight - rect.top) {
+        proCollapseNoTitles[0].style.minHeight = "calc(100vh - ".concat(rect.top + 16, "px)");
+      }
+    }
+    return function () {
+      if (proCollapseNoTitles.length === 1 && proCollapses.length === 1) {
+        proCollapseNoTitles[0].style.minHeight = 'auto'; // 移除 minHeight 的设置
+      }
+    };
+  });
   return (0, _jsxRuntime.jsx)("div", {
     id: id,
     style: style,

package/lib/ProLayout/components/ProCollapse/style/index.less

@@ -23,7 +23,7 @@
 
   &.@{ant-prefix}-collapse {
     .pro-collapse-panel {
-      margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
+      margin-bottom: 16px;
     }
   }
 

package/lib/ProThemeTools/component/PrdTools/index.js

@@ -12,6 +12,7 @@ var _icons = require("@ant-design/icons");
 var _antd = require("antd");
 var _react = require("react");
 var _index = require("../../utils/index");
+var _ProConfigProvider = require("../../../ProConfigProvider");
 var _locale = _interopRequireDefault(require("../../../locale"));
 var connect = function connect(Component) {
   var ComponentWrapper = function ComponentWrapper(props) {
@@ -29,6 +30,10 @@ var PrdTools = function PrdTools(_ref) {
     tableBorder = _ref.tableBorder,
     tableStripe = _ref.tableStripe,
     prefixCls = _ref.prefixCls;
+  var _useProConfig = (0, _ProConfigProvider.useProConfig)(),
+    config = _useProConfig.state,
+    dispatch = _useProConfig.dispatch;
+  var ProForm = config.ProForm;
   var _useState = (0, _react.useState)([{
       color: '#006AFF',
       active: true
@@ -146,35 +151,16 @@ var PrdTools = function PrdTools(_ref) {
       }), (0, _jsxRuntime.jsx)("div", {
         className: "pro-theme-tools-item",
         children: (0, _jsxRuntime.jsxs)(_antd.Radio.Group, {
-          value: state.zauiFormAlign,
+          value: ProForm === null || ProForm === void 0 ? void 0 : ProForm.labelAlign,
           onChange: function onChange(e) {
-            var after = e.target.value === 'left' ? 'inline' : 'none';
-            var before = e.target.value === 'right' ? 'inline' : 'none';
-            // 遍历添加className
-            var formItemLabels = document.querySelectorAll(".".concat(prefixCls, "-form-item-label"));
-            // 遍历元素列表，为每个元素添加新的 class
-            formItemLabels.forEach(function (label) {
-              var _label$classList, _label$classList$valu, _label$classList2, _label$classList2$val;
-              if (!label) {
-                return false;
-              }
-              if (e.target.value === 'left' && !((_label$classList = label.classList) === null || _label$classList === void 0 ? void 0 : (_label$classList$valu = _label$classList.value) === null || _label$classList$valu === void 0 ? void 0 : _label$classList$valu.includes("".concat(prefixCls, "-form-item-label-left")))) {
-                label.classList.add("".concat(prefixCls, "-form-item-label-left"));
-              }
-              if (e.target.value === 'right' && ((_label$classList2 = label.classList) === null || _label$classList2 === void 0 ? void 0 : (_label$classList2$val = _label$classList2.value) === null || _label$classList2$val === void 0 ? void 0 : _label$classList2$val.includes("".concat(prefixCls, "-form-item-label-left")))) {
-                label.classList.remove("".concat(prefixCls, "-form-item-label-left"));
+            dispatch({
+              type: 'setWithLocal',
+              payload: {
+                ProForm: {
+                  labelAlign: e.target.value
+                }
               }
             });
-            setState((0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
-              zauiFormAlign: e.target.value,
-              zauiFormRequiredAfter: after,
-              zauiFormRequiredBefore: before
-            }));
-            (0, _index.setThemes)({
-              'zaui-form-align': e.target.value,
-              'zaui-form-required-after': after,
-              'zaui-form-required-before': before
-            });
           },
           children: [(0, _jsxRuntime.jsx)(_antd.Radio.Button, {
             value: "left",
@@ -185,30 +171,6 @@ var PrdTools = function PrdTools(_ref) {
           })]
         })
       })]
-    }), (0, _jsxRuntime.jsxs)("div", {
-      className: "pro-theme-tools-box pro-theme-tools-space pro-theme-tools-small-space",
-      children: [(0, _jsxRuntime.jsx)("div", {
-        className: "pro-theme-tools-item",
-        children: (0, _jsxRuntime.jsx)("p", {
-          children: "".concat(_locale.default.ProThemeTools.bigText)
-        })
-      }), (0, _jsxRuntime.jsx)("div", {
-        className: "pro-theme-tools-item",
-        children: (0, _jsxRuntime.jsx)(_antd.Switch, {
-          checkedChildren: "".concat(_locale.default.ProThemeTools.switchText[0]),
-          unCheckedChildren: "".concat(_locale.default.ProThemeTools.switchText[1]),
-          checked: state.zauiBigText,
-          onClick: function onClick(value) {
-            setState((0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
-              zauiBaseFontSize: value ? 2 : 0,
-              zauiBigText: value
-            }));
-            (0, _index.setThemes)({
-              'zaui-base-font-size': value ? '2px' : '0px'
-            });
-          }
-        })
-      })]
     }), tableBorder && (0, _jsxRuntime.jsxs)("div", {
       className: "pro-theme-tools-box pro-theme-tools-space pro-theme-tools-small-space",
       children: [(0, _jsxRuntime.jsx)("div", {

package/lib/ProThemeTools/index.js

@@ -73,7 +73,6 @@ var ProThemeTools = function ProThemeTools(_ref) {
     (0, _index.setThemes)({
       'zaui-brand': '#006AFF',
       'zaui-text': '#343434',
-      'zaui-form-align': 'left',
       'zaui-form-required-after': 'inline',
       'zaui-form-required-before': 'none',
       'zaui-size': 1,

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-prefix}-select-dropdown.pro-tree-select-drop-down-container.checkable-tree{
+  overflow: hidden!important;
+}

package/lib/ProUpload/style/index.less

@@ -324,7 +324,7 @@
 }
 
 .proupload-modal-preview {
-  .ant-modal {
+  .@{ant-prefix}-modal {
     width: 600px;
   }
 }

package/lib/assets/view.svg

@@ -1 +1,20 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1664364279428" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2737" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24"><path d="M801.605818 104.727273a117.666909 117.666909 0 0 1 117.434182 109.940363l0.232727 7.726546v246.597818a34.909091 34.909091 0 0 1-69.492363 4.747636l-0.325819-4.747636V222.394182c0-24.669091-18.618182-44.962909-42.635636-47.569455l-5.213091-0.279272H222.394182c-24.669091 0-44.962909 18.618182-47.569455 42.635636l-0.279272 5.213091v579.211636c0 24.669091 18.618182 44.962909 42.635636 47.569455l5.213091 0.279272h243.246545a34.909091 34.909091 0 0 1 4.747637 69.492364l-4.747637 0.325818H222.394182a117.666909 117.666909 0 0 1-117.434182-109.940363l-0.232727-7.726546V222.394182a117.666909 117.666909 0 0 1 109.940363-117.434182l7.726546-0.232727h579.211636zM448.558545 585.728a34.909091 34.909091 0 1 1 0 69.818182h-116.363636a34.909091 34.909091 0 1 1 0-69.818182h116.363636z m232.727273-232.727273a34.909091 34.909091 0 1 1 0 69.818182h-349.090909a34.909091 34.909091 0 1 1 0-69.818182h349.090909z" p-id="2738"></path><path d="M699.764364 490.356364a186.181818 186.181818 0 1 1 0 372.363636 186.181818 186.181818 0 0 1 0-372.363636z m0 69.818181a116.363636 116.363636 0 1 0 0 232.727273 116.363636 116.363636 0 0 0 0-232.727273z" p-id="2739"></path><path d="M798.673455 769.349818a34.909091 34.909091 0 0 1 49.338181 0l82.292364 82.245818a34.909091 34.909091 0 1 1-49.338182 49.384728l-82.292363-82.292364a34.909091 34.909091 0 0 1 0-49.338182z" p-id="2740"></path></svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="19px" height="15px" viewBox="0 0 19 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-dropdown-searchlist</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="询报价录入交互说明" transform="translate(-531, -308)" fill="#999999" fill-rule="nonzero">
+            <g id="Dropdown/下拉弹窗切换/default备份-2" transform="translate(215, 299)">
+                <g id="编组-2" transform="translate(288, 1)">
+                    <g id="编组" transform="translate(22, 0)">
+                        <g id="icon-dropdown-searchlist" transform="translate(6, 8)">
+                            <path d="M18.8595156,13.853235 L15.9118005,9.83277831 C16.9574103,8.79234063 17.6131433,7.33016175 17.6131433,5.70884872 C17.6131433,2.56113225 15.1539732,0 12.1315716,0 C9.10917008,0 6.65,2.56113225 6.65,5.70884872 C6.65,8.85656518 9.10917008,11.4176974 12.1315716,11.4176974 C13.1052358,11.4176974 14.0179175,11.1493815 14.811375,10.6841104 L17.7693681,14.7188392 C17.9043518,14.9029496 18.1078551,15 18.3147844,15 C18.4593609,15 18.6059929,14.952902 18.7293283,14.8537108 C19.0314999,14.6139391 19.0890564,14.1657945 18.8595156,13.853235 Z M8.02107811,5.70813511 C8.02107811,3.34681256 9.86494177,1.42649857 12.1322568,1.42649857 C14.3995719,1.42649857 16.2434356,3.34681256 16.2434356,5.70813511 C16.2434356,8.06945766 14.3995719,9.98977165 12.1322568,9.98977165 C9.86494177,9.98977165 8.02107811,8.06945766 8.02107811,5.70813511 Z" id="形状"></path>
+                            <path d="M4.9875,2.34375 L0.7125,2.34375 C0.3192,2.34375 0,2.02875 0,1.640625 C0,1.2525 0.3192,0.9375 0.7125,0.9375 L4.9875,0.9375 C5.3808,0.9375 5.7,1.2525 5.7,1.640625 C5.7,2.02875 5.3808,2.34375 4.9875,2.34375 Z" id="路径"></path>
+                            <path d="M3.95833333,7.96875 L0.791666667,7.96875 C0.354666667,7.96875 0,7.65445313 0,7.265625 C0,6.8775 0.354666667,6.5625 0.791666667,6.5625 L3.95833333,6.5625 C4.39533333,6.5625 4.75,6.8775 4.75,7.265625 C4.75,7.65445313 4.39533333,7.96875 3.95833333,7.96875 Z" id="路径"></path>
+                            <path d="M7.89230769,13.59375 L0.657692308,13.59375 C0.294646154,13.59375 0,13.2794531 0,12.890625 C0,12.5017969 0.294646154,12.1875 0.657692308,12.1875 L7.89230769,12.1875 C8.25535385,12.1875 8.55,12.5017969 8.55,12.890625 C8.55,13.2794531 8.25535385,13.59375 7.89230769,13.59375 Z" id="路径"></path>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

package/lib/locale/en_US.d.ts

@@ -27,12 +27,14 @@ declare const _default: {
         inputPlaceholder: string;
         selectPlaceHolder: string;
         switchText: string[];
+        ruleStartEndText: string[];
         search: string;
         reset: string;
         ruleText: string;
         completeText: string;
-        formList_actions: string[];
-        formList_confirmMessage: string;
+        halfRuleText: string;
+        formListActions: string[];
+        formListConfirmMessage: string;
     };
     ProAction: {
         errorMessage: string;

package/lib/locale/en_US.js

@@ -33,12 +33,14 @@ var _default = exports.default = {
     inputPlaceholder: 'Please enter',
     selectPlaceHolder: 'Please select',
     switchText: ['Yes', 'No'],
+    ruleStartEndText: ['start value', 'end value'],
     search: 'Search',
     reset: 'Reset',
     ruleText: 'correct',
     completeText: 'enter in full',
-    formList_actions: ['Add', 'Delete', 'Copy', 'Move up', 'Move down', 'Add a new line'],
-    formList_confirmMessage: 'Are you sure delete it?'
+    halfRuleText: 'Enter the value of ({total})',
+    formListActions: ['Add', 'Delete', 'Copy', 'Move up', 'Move down', 'Add a new line'],
+    formListConfirmMessage: 'Are you sure delete it?'
   },
   ProAction: {
     errorMessage: 'The configuration config for ProAction must be data',

package/lib/locale/zh_CN.d.ts

@@ -27,12 +27,14 @@ declare const _default: {
         inputPlaceholder: string;
         selectPlaceHolder: string;
         switchText: string[];
+        ruleStartEndText: string[];
         search: string;
         reset: string;
         ruleText: string;
         completeText: string;
-        formList_actions: string[];
-        formList_confirmMessage: string;
+        halfRuleText: string;
+        formListActions: string[];
+        formListConfirmMessage: string;
     };
     ProAction: {
         errorMessage: string;

package/lib/locale/zh_CN.js

@@ -33,12 +33,14 @@ var _default = exports.default = {
     inputPlaceholder: '请输入',
     selectPlaceHolder: '请选择',
     switchText: ['是', '否'],
+    ruleStartEndText: ['起始值', '截止值'],
     search: '查询',
     reset: '重置',
     ruleText: '正确的',
     completeText: '请完整输入',
-    formList_actions: ['新增', '删除', '复制', '上移', '下移', '新增一行'],
-    formList_confirmMessage: '确认删除吗?'
+    halfRuleText: '请输入第({total})个表单的值',
+    formListActions: ['新增', '删除', '复制', '上移', '下移', '新增一行'],
+    formListConfirmMessage: '确认删除吗?'
   },
   ProAction: {
     errorMessage: 'ProAction 配置 config 必须为数据',

package/lib/style/components.less

@@ -19,13 +19,10 @@
 @import '../ProEditTable/style/index';
 @import '../ProEditLabel/style/index';
 
-
 // 通用
 @import '../ProIcon/style/index';
 @import '../ProThemeTools/style/index';
 @import '../ProDownload/style/index';
 
-
-
 // old 待废弃
 @import '../old/ProEditableTable/style/index';

package/lib/style/theme/antd.less

@@ -24,48 +24,34 @@
     // label 超过130px换行
     .@{ant-prefix}-form-item-label {
       flex: 0 0 @zaui-form-label-width;
-      padding-right: @zaui-space-size-md;
+      padding-right: 16px;
       overflow: initial;
       line-height: 1;
       white-space: pre-wrap;
-      text-align: @zaui-form-align;
 
       .@{ant-prefix}-form-item-required {
-        &::after {
-          display: block;
+        position: relative;
+        &::before {
+          position: absolute;
+          top: calc(50% - 7px);
+          left: -8px;
+          margin: 0;
         }
       }
 
       & > label {
         word-break: break-word;
 
+        // 隐藏冒号
         &::after {
           display: none;
-          margin: 0;
         }
       }
 
-      & .@{ant-prefix}-form-item-required::before {
-        display: inline-block;
-      }
-
       &.@{ant-prefix}-form-item-label-left {
         & > .@{ant-prefix}-form-item-required::before {
-          display: none;
-        }
-
-        & > .@{ant-prefix}-form-item-required::after {
-          margin-top: 1px;
-          color: #ff4d4f;
-          font-size: var(--zaui-font-size, 14px);
-          line-height: 1;
-          content: '*';
-        }
-      }
-
-      &:not(.@{ant-prefix}-form-item-label-left) {
-        & > .@{ant-prefix}-form-item-required::after {
-          display: none;
+          right: -10px;
+          left: unset;
         }
       }
     }
@@ -717,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),
@@ -734,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",
+  "version": "3.4.4",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -58,7 +58,7 @@
     "@dnd-kit/sortable": "^7.0.2",
     "@dnd-kit/utilities": "^3.2.1",
     "@pansy/react-watermark": "^3.1.13",
-    "@zat-design/utils": "^1.1.16",
+    "@zat-design/utils": "1.1.16",
     "ahooks": "3.7.4",
     "antd": "4.24.8",
     "big.js": "^6.2.1",