@zat-design/sisyphus-react 3.4.2 → 3.4.3-beta.10

package/lib/{ProTreeSelect → ProTree/components/ProTreeSelect}/index.js

@@ -15,10 +15,12 @@ var _antd = require("antd");
 var _classnames3 = _interopRequireDefault(require("classnames"));
 var _react = require("react");
 var _lodash = require("lodash");
-var _ProConfigProvider = require("../ProConfigProvider");
-var _Container = _interopRequireDefault(require("../ProForm/components/Container"));
+var _ProConfigProvider = require("../../../ProConfigProvider");
+var _Container = _interopRequireDefault(require("../../../ProForm/components/Container"));
 var _excluded = ["disabled", "code", "dataSource", "defaultDisableValue", "onChange", "useRequest", "transformResponse", "fieldNames", "tooltip", "showSearch", "filterTreeNode", "treeNodeFilterProp", "defaultExpandAll", "expandedKeys", "treeCheckable", "onSearch", "otherProps", "width", "dropdownStyle", "popupClassName", "style", "allowClear", "listHeight", "showCodeName", "className"],
   _excluded2 = ["children"];
+/* eslint-disable react/no-danger */
+/* eslint-disable react/jsx-closing-tag-location */
 var SHOW_PARENT = _antd.TreeSelect.SHOW_PARENT;
 var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
   // 全局属性配置在ConfigProvider
@@ -284,8 +286,7 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
    */
   var renderTreeNode = function renderTreeNode(node, grade) {
     var children = node.children,
-      icon = node.icon,
-      hideNodeClass = node.hideNodeClass;
+      icon = node.icon;
     var labelText = node[label];
     var value = node[code];
     var titleHtml = (0, _jsxRuntime.jsx)("span", {
@@ -304,10 +305,10 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
       children: [(0, _jsxRuntime.jsx)("span", {
         className: "check-option-text-content",
         children: titleHtml
-      }), (0, _jsxRuntime.jsx)("span", {
+      }), !disabled ? (0, _jsxRuntime.jsx)("span", {
         className: "check-mark-icon",
         children: (0, _jsxRuntime.jsx)(Icon, {})
-      })]
+      }) : null]
     });
     if (!children) {
       return (0, _jsxRuntime.jsx)(_antd.TreeSelect.TreeNode, {
@@ -359,10 +360,6 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
           item[label] = item[label].replace(regExp, "<span class=\"highlight-search-text\">".concat(keyWord, "</span>"));
         }
         currentAllNodeChild.push(item);
-        // if (tag || item?.children?.length) {
-        //   // 如果子节点有匹配项或者自己匹配了那么都加入结果中
-        //   currentAllNodeChild.push(item);
-        // }
       }
       return currentAllNodeChild;
     };
@@ -475,7 +472,6 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
   var treeProps = (0, _objectSpread2.default)({
     disabled: disabled,
     showSearch: showSearch,
-    // filterTreeNode: filterTreeNodeEvent,
     treeDefaultExpandAll: defaultExpandAll,
     treeExpandedKeys: expandedKeys,
     treeCheckable: treeCheckable,

package/lib/{ProTreeSelect → ProTree/components/ProTreeSelect}/propsType.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { TreeSelectProps } from 'antd';
 import { Service, Options, Result } from 'ahooks/lib/useRequest/src/types';
-import { ProFormOtherProps } from '../ProForm/propsType';
+import { ProFormOtherProps } from '../../../ProForm/propsType';
 export interface DataProps {
     label: string;
     value?: string;

package/lib/{ProTreeSelect → ProTree/components/ProTreeSelect}/style/index.less

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

package/lib/ProTree/index.js

@@ -8,7 +8,7 @@ exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _ProTree = _interopRequireDefault(require("./components/ProTree"));
-var _ProTreeSelect = _interopRequireDefault(require("../ProTreeSelect"));
+var _ProTreeSelect = _interopRequireDefault(require("./components/ProTreeSelect"));
 /* eslint-disable jsx-a11y/anchor-is-valid */
 /*
  *@Date: 2023-07-11 16:07:12

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/ProTreeModal/style/index.less

@@ -53,7 +53,7 @@
     font-size: var(--zaui-font-size, 14px);
     line-height: 20px;
     border: 1px solid #e6e6e6;
-    border-radius: var(--zaui-border-radius, 4px);
+    border-radius: var(--zaui-border-radius, 8px);
 
     &:first-child {
       margin-right: var(--zaui-space-size-md, 16px);
@@ -246,7 +246,7 @@
       font-size: var(--zaui-font-size, 14px);
       background: #f2f2f2;
       border: none;
-      border-radius: var(--zaui-border-radius, 4px);
+      border-radius: var(--zaui-border-radius, 8px);
 
       .pro-tooltip {
         flex: 1;

package/lib/ProUpload/style/fileItem.less

@@ -12,7 +12,7 @@
       line-height: 16px;
       &:hover {
         background: #F8F9FA;
-        border-radius: var(--zaui-border-radius, 4px);
+        border-radius: var(--zaui-border-radius, 8px);
         color: var(--zaui-brand);
         .file-actions-wrap {
           .file-actions{
@@ -93,7 +93,7 @@
       justify-content: center;
       &:hover {
         background: #F8F9FA;
-        border-radius: var(--zaui-border-radius, 4px);
+        border-radius: var(--zaui-border-radius, 8px);
       }
       &:hover,&.file-box-error {
         .file-actions-wrap {

package/lib/ProUpload/style/index.less

@@ -8,7 +8,7 @@
   .pro-upload-dragger {
     .pro-upload-handle-box {
       background   : #F8F9FA;
-      border-radius: var(--zaui-border-radius, 4px);
+      border-radius: var(--zaui-border-radius, 8px);
       padding      : var(--zaui-space-size-sm, 8px);
 
       .@{ant-prefix}-upload.@{ant-prefix}-upload-drag {
@@ -178,7 +178,7 @@
       text-align   : center;
       line-height  : 32px;
       background   : #FFFFFF;
-      border-radius: var(--zaui-border-radius, 4px);
+      border-radius: var(--zaui-border-radius, 8px);
       border       : 1px solid #DCDCDC;
 
     }
@@ -324,7 +324,7 @@
 }
 
 .proupload-modal-preview {
-  .ant-modal {
+  .@{ant-prefix}-modal {
     width: 600px;
   }
 }

package/lib/assets/catalog.svg

@@ -1 +1,30 @@
-<?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="1664417328557" class="icon" viewBox="0 0 1075 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="18351" xmlns:xlink="http://www.w3.org/1999/xlink" width="25.1953125" height="24"><path d="M1044.4288 758.3232v128.9728H313.7024V758.272h730.7264z m-833.1264 0v128.9728H71.7312V758.272h139.5712z m833.1264-310.784v128.9216H313.7024V447.5392h730.7264z m-833.1264 0v128.9216H71.7312V447.5392h139.5712z m833.1264-310.784v128.9216H313.7024V136.704h730.7264z m-833.1264 0v128.9216H71.7312V136.704h139.5712z" p-id="18352"></path></svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 52@1x</title>
+    <defs>
+        <rect id="path-1" x="0" y="4" width="24" height="18" rx="2"></rect>
+        <filter x="-14.6%" y="-13.9%" width="129.2%" height="138.9%" filterUnits="objectBoundingBox" id="filter-2">
+            <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
+            <feGaussianBlur stdDeviation="1" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+            <feColorMatrix values="0 0 0 0 0.653997356   0 0 0 0 0.779247182   0 0 0 0 1  0 0 0 1 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
+        </filter>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="画板备份-17" transform="translate(-1367, -56)">
+            <g id="编组-81" transform="translate(1359, 48)">
+                <g id="编组-52" transform="translate(8, 8)">
+                    <rect id="矩形" x="0" y="0" width="32" height="32"></rect>
+                    <g id="编组-13" transform="translate(4, 5)">
+                        <path d="M5.33152162,0 L15,0 C16.1045695,7.78148667e-16 17,0.8954305 17,2 L17,19 C17,20.1045695 16.1045695,21 15,21 L2,21 C0.8954305,21 6.76353751e-17,20.1045695 0,19 L-4.4408921e-16,5.64678021 C-5.05225217e-16,5.14756683 0.186696218,4.666401 0.523402611,4.29783242 L3.85492423,0.651052206 C4.233839,0.236281109 4.76972854,9.91378134e-16 5.33152162,8.8817842e-16 Z" id="矩形" fill="#87F1FC" transform="translate(8.5, 10.5) scale(-1, 1) translate(-8.5, -10.5)"></path>
+                        <g id="矩形">
+                            <use fill="black" fill-opacity="1" filter="url(#filter-2)" xlink:href="#path-1"></use>
+                            <use fill="#4181FF" fill-rule="evenodd" xlink:href="#path-1"></use>
+                        </g>
+                        <circle id="椭圆形" fill="#FFFFFF" cx="7.16666667" cy="12.8333333" r="1.5"></circle>
+                        <circle id="椭圆形" fill="#FFFFFF" cx="16.5" cy="12.8333333" r="1.5"></circle>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

package/lib/assets/fold.svg

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="15px" viewBox="0 0 16 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 2</title>
+    <defs>
+        <linearGradient x1="100%" y1="50%" x2="0%" y2="50%" id="linearGradient-1">
+            <stop stop-color="#ADDDFF" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#5FB3D8" stop-opacity="0" offset="13.9259178%"></stop>
+            <stop stop-color="#4181FF" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="画板备份-17" transform="translate(-81, -162)" fill="url(#linearGradient-1)">
+            <g id="编组-27" transform="translate(64, 146)">
+                <g id="Card_Tittle/带icon备份-4" transform="translate(1, 0)">
+                    <g id="编组-2" transform="translate(16, 16)">
+                        <g id="编组">
+                            <rect id="矩形" x="0" y="0" width="16" height="6" rx="3"></rect>
+                        </g>
+                        <g id="编组备份" transform="translate(8, 12) scale(-1, 1) translate(-8, -12)translate(0, 9)">
+                            <rect id="矩形" x="0" y="0" width="16" height="6" rx="3"></rect>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

package/lib/assets/setting.svg

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="21px" height="21px" viewBox="0 0 22 21" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-settings</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="画板备份-17" transform="translate(-1223, -14)" fill="#231F20" fill-rule="nonzero" stroke="#333333" stroke-width="0.3">
+            <g id="编组-2" transform="translate(1209.2372, 0)">
+                <g id="icon-settings" transform="translate(14.4202, 15)">
+                    <path d="M20.3848055,7.53659573 C20.2624144,6.90517801 19.8656126,6.49687157 19.3574341,6.49687157 L19.2693187,6.49687157 C17.8961096,6.49687157 16.7791849,5.40670117 16.7791849,4.0659785 C16.7791849,3.64243545 16.9874064,3.15949962 16.9954426,3.14030349 C17.2488001,2.58384094 17.0543916,1.90192685 16.5418484,1.55193559 L13.9650884,0.151544503 L13.9272182,0.133451014 C13.4117224,-0.0847484644 12.7061572,0.0549122231 12.3217819,0.445776738 C12.0436226,0.725799811 11.0846741,1.52424401 10.3529464,1.52424401 C9.61169334,1.52424401 8.65061387,0.709786336 8.37104252,0.424450467 C7.98733476,0.0307290821 7.28906108,-0.117076194 6.76773716,0.100747395 L4.09924158,1.52780256 L4.05918911,1.55268737 C3.54659457,1.90127525 3.35146717,2.5831643 3.60341257,3.13749673 C3.61211629,3.15777047 3.82110799,3.63677181 3.82110799,4.06600356 C3.82110799,5.40672622 2.70418334,6.49689663 1.33099995,6.49689663 L1.2268892,6.49689663 C0.73468034,6.49689663 0.337852817,6.90517801 0.215538765,7.53662079 C0.206424254,7.58105259 0,8.64957096 0,9.50630527 C0,10.3619369 0.206424254,11.4300794 0.215538765,11.4741603 C0.337852842,12.105979 0.73468034,12.5146363 1.24288452,12.5146363 L1.33099995,12.5146363 C2.70418336,12.5146363 3.82110799,13.6048318 3.82110799,14.9451535 C3.82110799,15.3715534 3.61214195,15.8526849 3.60413145,15.8711543 C3.35149282,16.4286944 3.54518244,17.1095309 4.05628784,17.457768 L6.58426601,18.8421957 L6.62285501,18.8592617 C7.1456424,19.0838515 7.85261977,18.9374246 8.23488975,18.5295191 C8.58799332,18.1570989 9.54475946,17.3838403 10.2473465,17.3838403 C11.0089339,17.3838403 11.9897315,18.249471 12.2722554,18.5536271 C12.5328788,18.8322217 12.9333521,19 13.3432737,19 C13.5347553,19 13.7160441,18.962986 13.8820564,18.8933687 L16.5032593,17.4834046 L16.5418483,17.4591713 C17.0543915,17.109556 17.2495446,16.4287195 16.9969316,15.8740362 C16.9881766,15.8534116 16.7792105,15.3743852 16.7792105,14.9451785 C16.7792105,13.6048568 17.8961352,12.5146614 19.2693442,12.5146614 L19.3720429,12.5146614 C19.8649193,12.5146614 20.26244,12.1060041 20.3848054,11.4741854 C20.3935348,11.4301045 20.6002928,10.361962 20.6002928,9.50633035 C20.6002928,8.64954589 20.3935349,7.58102751 20.3848055,7.53659573 M19.1062589,9.50628019 C19.1062589,10.0598859 18.9933931,10.7712959 18.9416844,11.0683599 C16.8818579,11.2332312 15.2851253,12.9132945 15.2851253,14.9451284 C15.2851253,15.518657 15.471549,16.0680024 15.5705761,16.3206848 L13.3345445,17.5259819 C13.2245799,17.413712 12.8998469,17.0938682 12.457909,16.7726211 C11.6817384,16.2111966 10.9375841,15.9244072 10.2473209,15.9244072 C9.56291156,15.9244072 8.82463676,16.2040795 8.05211198,16.7584119 C7.61233077,17.0711135 7.29198807,17.3823867 7.17984115,17.4975135 L5.0290237,16.3220881 C5.13387902,16.056625 5.31519344,15.5143716 5.31519344,14.9451284 C5.31519344,12.9132945 3.71846079,11.2332312 1.65937889,11.0683599 C1.60695125,10.7712959 1.49408545,10.0599109 1.49408545,9.50628019 C1.49408545,8.95157185 1.60695125,8.23983608 1.65937889,7.94277203 C3.71846079,7.77825158 5.31519344,6.09783742 5.31519344,4.06600356 C5.31519344,3.4956827 5.12879543,2.94455798 5.02976827,2.69225151 L7.32112879,1.46312209 C7.42087485,1.56050617 7.74779025,1.8728319 8.1948374,2.18340342 C8.95645045,2.71392862 9.68168251,2.98257437 10.3529721,2.98257437 C11.0177147,2.98257437 11.7378118,2.71891561 12.4943156,2.19869017 C12.9450086,1.8895471 13.2712051,1.58148161 13.3658419,1.49442234 L15.5712693,2.69012142 C15.4715233,2.94099944 15.2850996,3.4903449 15.2850996,4.06600358 C15.2850996,6.09783744 16.8818322,7.7782516 18.9416587,7.94277205 C18.9933931,8.2405127 19.1062589,8.95513042 19.1062589,9.50628019" id="形状"></path>
+                    <path d="M10.3001356,6.5 C8.59640655,6.5 7.21010249,7.84598945 7.21010249,9.50014713 C7.21010249,11.1545781 8.5964282,12.5 10.3001356,12.5 C12.0038646,12.5 13.3901903,11.1545781 13.3901903,9.50014713 C13.3901903,7.84598945 12.0038646,6.5 10.3001356,6.5 M12.1303626,9.50014713 C12.1303626,10.4798072 11.3095002,11.276765 10.3001356,11.276765 C9.29079259,11.276765 8.47053634,10.4798072 8.47053634,9.50014713 C8.47053634,8.52105462 9.29079259,7.72378156 10.3001356,7.72378156 C11.3095002,7.72378156 12.1303626,8.52105462 12.1303626,9.50014713" id="形状"></path>
+                </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;
@@ -154,5 +156,8 @@ declare const _default: {
     ProViewer: {
         preview: string;
     };
+    ProIcon: {
+        language: string;
+    };
 };
 export default _default;

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',
@@ -159,5 +161,8 @@ var _default = exports.default = {
   },
   ProViewer: {
     preview: 'preview'
+  },
+  ProIcon: {
+    language: 'en'
   }
 };

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;
@@ -154,5 +156,8 @@ declare const _default: {
     ProViewer: {
         preview: string;
     };
+    ProIcon: {
+        language: string;
+    };
 };
 export default _default;

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 必须为数据',
@@ -159,5 +161,8 @@ var _default = exports.default = {
   },
   ProViewer: {
     preview: '预览'
+  },
+  ProIcon: {
+    language: 'cn'
   }
 };

package/lib/style/components.less

@@ -11,7 +11,6 @@
 // 表单
 @import '../ProForm/style/index';
 @import '../ProUpload/style/index';
-@import '../ProTreeSelect/style/index';
 @import '../ProTreeModal/style/index';
 @import '../ProTree/style/index';
 
@@ -20,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/less.less

@@ -0,0 +1,2 @@
+@import "./components.less";
+@import "./theme/index.less";

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-sm;
+      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;
         }
       }
     }
@@ -673,7 +659,6 @@
       width: calc(100% - 18px);
       margin-bottom: 0;
       text-align: right;
-      // background: #fff;
     }
   }
 }
@@ -718,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),
@@ -735,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/style/theme/index.less

@@ -56,8 +56,8 @@
   --zaui-table-nested-bg            : #fafcfe;
   --zaui-contract-bg                : #fffaa1; // 对比背景色
   --zaui-form-label-width           : 130px; // 8个全角字符宽度
-  --zaui-border-radius              : 4px;
-  --zaui-border-radius-card         : 2px;
+  --zaui-border-radius              : 8px;
+  --zaui-border-radius-card         : 4px;
   --zaui-font-size-title            : 16px;
   --zaui-font-size-card-title       : var(--zaui-font-size-title);
   --zaui-font-size                  : 14px;

package/lib/style/theme/tokens.less

@@ -56,8 +56,8 @@
 @zaui-form-required-after: var(--zaui-form-required-after; inline);
 @zaui-form-required-before: var(--zaui-form-required-before; none);
 @zaui-form-label-width: var(--zaui-form-label-width; 130px);
-@zaui-border-radius: var(--zaui-border-radius; 4px);
-@zaui-border-radius-card: var(--zaui-border-radius-card; 2px);
+@zaui-border-radius: var(--zaui-border-radius; 8px);
+@zaui-border-radius-card: var(--zaui-border-radius-card; 4px);
 @zaui-font-size-title:
   calc(var(--zaui-font-size-title; 16px) + var(--zaui-base-font-size; 0px));
 @zaui-font-size-card-title:

package/lib/tokens.js

@@ -59,8 +59,8 @@ var tokens = {
   '@zaui-form-required-after': 'var(--zaui-form-required-after, inline)',
   '@zaui-form-required-before': 'var(--zaui-form-required-before, none)',
   '@zaui-form-label-width': 'var(--zaui-form-label-width, 130px)',
-  '@zaui-border-radius': 'var(--zaui-border-radius, 4px)',
-  '@zaui-border-radius-card': 'var(--zaui-border-radius-card, 2px)',
+  '@zaui-border-radius': 'var(--zaui-border-radius, 8px)',
+  '@zaui-border-radius-card': 'var(--zaui-border-radius-card, 4px)',
   '@zaui-font-size-title': 'calc(var(--zaui-font-size-title, 16px) + var(--zaui-base-font-size, 0px))',
   '@zaui-font-size-card-title': 'calc(var(--zaui-font-size-card-title, 16px) + var(--zaui-base-font-size, 0px))',
   '@zaui-font-size': 'calc(var(--zaui-font-size, 14px) + var(--zaui-base-font-size, 0px))',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.4.2",
+  "version": "3.4.3-beta.10",
   "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",

package/es/ProForm/utils/contrastOriginal.js

@@ -1,24 +0,0 @@
-import { isEqual, isFunction } from 'lodash';
-var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
-export var contrastOriginal = function contrastOriginal(params) {
-  var originalValue = params.originalValue,
-    value = params.value,
-    equalWith = params.equalWith;
-  // 支持传入自定义比较事件
-  if (isFunction(equalWith)) {
-    return !equalWith(originalValue, value);
-  }
-  if (Array.isArray(originalValue)) {
-    return originalValue.some(function (valueItem, index) {
-      // 如果两个值有一个不是空值, 则进行深比较
-      if (!nullValue.includes(value === null || value === void 0 ? void 0 : value[index]) || !nullValue.includes(valueItem)) {
-        return !isEqual(value === null || value === void 0 ? void 0 : value[index], valueItem);
-      }
-      return false;
-    });
-  }
-  if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
-    return !isEqual(value, originalValue);
-  }
-  return false;
-};

package/es/ProIcon/symbolIcon.js

@@ -1,43 +0,0 @@
-window._iconfont_svg_string_4063056 = '<svg><symbol id="icon-lock" viewBox="0 0 1024 1024"><path d="M752.384 412.1088h-55.6544V300.3904C696.7296 183.6544 608.512 102.4 501.76 102.4 395.0592 102.4 306.8928 183.6544 306.8928 300.3904V407.04H251.1872c-27.8016 0-46.3872 25.344-46.3872 50.7392v385.8432c0 30.464 23.1936 50.7904 46.3872 50.7904h501.248c27.8016 0 46.3872-25.3952 46.3872-50.7904V462.848c0-30.464-18.5856-50.7392-46.4384-50.7392z m-222.72 253.8496v86.272c0 5.12-4.6592 5.12-4.6592 5.12h-41.7792c-4.608 0-4.608-5.12-4.608-5.12v-86.272c-23.2448-10.1888-37.12-30.464-37.12-55.8592 0-35.5328 27.8016-66.048 60.3136-66.048 32.4608 0 60.3136 30.5152 60.3136 66.048 0 25.3952-13.9264 45.6704-32.4608 55.808z m92.7744-253.8496H381.1328V295.3216c0-60.928 55.7056-111.6672 120.6784-111.6672 64.9728 0 120.6272 50.7392 120.6272 111.6672v116.736z" fill="#BCBCBC" ></path></symbol><symbol id="icon-drag" viewBox="0 0 1024 1024"><path d="M670.72 179.2m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z" fill="#939599" ></path><path d="M670.72 506.88m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z" fill="#939599" ></path><path d="M670.72 834.56m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z" fill="#939599" ></path><path d="M343.04 179.2m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z" fill="#939599" ></path><path d="M343.04 506.88m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z" fill="#939599" ></path><path d="M343.04 834.56m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z" fill="#939599" ></path></symbol><symbol id="icon-plus" viewBox="0 0 1024 1024"><path d="M576 64H448v384H64v128h384v384h128V576h384V448H576z"  ></path></symbol><symbol id="icon-zengjia" viewBox="0 0 1024 1024"><path d="M939.94 459.073h-377.6V83.519H462.055v375.554h-377.6v100.284h377.6v379.646H562.34V559.357h377.6z" fill="#272636" ></path></symbol><symbol id="icon-dot" viewBox="0 0 1024 1024"><path d="M512 624a112 112 0 1 0 0-224 112 112 0 0 0 0 224z"  ></path></symbol><symbol id="icon-solid-close" viewBox="0 0 1024 1024"><path d="M516.707 66.513C272.86 66.513 75.16 264.212 75.16 508.06S272.86 949.607 516.707 949.607 958.254 751.91 958.254 508.06 760.556 66.513 516.707 66.513z m227.067 601.691c18.419 18.42 18.419 48.504 0 66.923s-48.504 18.42-66.923 0L516.707 574.983 356.563 735.127c-18.419 18.42-48.503 18.42-66.923 0s-18.419-48.504 0-66.923L449.784 508.06 289.64 347.916c-18.419-18.419-18.419-48.503 0-66.922 18.42-18.42 48.504-18.42 66.923 0l160.144 160.144 160.144-160.144c18.42-18.42 48.504-18.42 66.923 0 18.419 18.419 18.419 48.503 0 66.922L583.63 508.06l160.144 160.144z"  ></path></symbol><symbol id="icon-arrow" viewBox="0 0 1024 1024"><path d="M832 0a192 192 0 0 1 192 192v640a192 192 0 0 1-192 192H192A192 192 0 0 1 0 832V192A192 192 0 0 1 192 0z m0 42.667H192A149.333 149.333 0 0 0 42.667 192v640A149.333 149.333 0 0 0 192 981.333h640A149.333 149.333 0 0 0 981.333 832V192A149.333 149.333 0 0 0 832 42.667z m-94.165 329.386l60.33 60.331L512 718.592 225.835 432.384l60.33-60.33L512 597.887l225.835-225.835z"  ></path></symbol><symbol id="icon-delete" viewBox="0 0 1024 1024"><path d="M662.08 121.472v64H361.92v-64z m206.4 159.488v64H155.52v-64z"  ></path><path d="M280.512 303.232l-0.064 530.816h460.096V303.232h64v594.88H216.512v-594.88z"  ></path><path d="M431.424 440.704v337.728h-64V440.704z m225.152 0v337.728h-64V440.704z"  ></path></symbol><symbol id="icon-catalog" viewBox="0 0 1075 1024"><path d="M1044.429 758.323v128.973H313.702V758.272h730.727z m-833.127 0v128.973H71.732V758.272h139.57zM1044.43 447.54v128.922H313.702V447.539h730.727z m-833.127 0v128.922H71.732V447.539h139.57z m833.127-310.784v128.922H313.702V136.704h730.727z m-833.127 0v128.922H71.732V136.704h139.57z"  ></path></symbol><symbol id="icon-customColumn" viewBox="0 0 1024 1024"><path d="M170.368 128h0.576c28.288 0 42.368 14.848 42.368 44.608v678.784c0 29.76-14.08 44.608-42.368 44.608h-0.576C142.144 896 128 881.152 128 851.392V172.608c0-29.76 14.08-44.608 42.368-44.608z m682.752 0h0.576c28.224 0 42.368 14.848 42.368 44.608v678.784c0 29.76-14.08 44.608-42.368 44.608h-0.576c-28.288 0-42.368-14.848-42.368-44.608V172.608c0-29.76 14.08-44.608 42.368-44.608z m-453.632 0h225.024c38.784 0 58.176 20.16 58.176 60.416v647.168c0 40.32-19.392 60.416-58.176 60.416H399.488c-38.784 0-58.176-20.16-58.176-60.416V188.416c0-40.32 19.392-60.416 58.176-60.416z"  ></path></symbol><symbol id="icon-copy" viewBox="0 0 1024 1024"><path d="M363.746 0h565.883c52.05 0 94.286 42.236 94.286 94.285V660.17c0 52.049-42.237 94.285-94.286 94.285H363.746c-52.05 0-94.286-42.236-94.286-94.285V94.285C269.46 42.236 311.697 0 363.746 0z m0 80.804a13.482 13.482 0 0 0-13.482 13.481V660.17c0 7.423 6.058 13.482 13.482 13.482h565.883c7.424 0 13.482-6.059 13.482-13.482V94.285a13.482 13.482 0 0 0-13.482-13.481H363.746z m309.905 754.54a40.445 40.445 0 1 1 80.803 0v94.37c0 52.05-42.236 94.286-94.285 94.286H94.285C42.236 1023.915 0 981.678 0 929.63V363.745c0-52.05 42.236-94.286 94.285-94.286h94.371a40.445 40.445 0 0 1 0 80.804h-94.37a13.482 13.482 0 0 0-13.482 13.482v565.883c0 7.424 6.058 13.482 13.481 13.482H660.17c7.423 0 13.482-6.058 13.482-13.482v-94.37z"  ></path></symbol><symbol id="icon-drag-old" viewBox="0 0 1024 1024"><path d="M358.4 204.8m-51.2 0a51.2 51.2 0 1 0 102.4 0 51.2 51.2 0 1 0-102.4 0Z"  ></path><path d="M665.6 204.8m-51.2 0a51.2 51.2 0 1 0 102.4 0 51.2 51.2 0 1 0-102.4 0Z"  ></path><path d="M665.6 409.6m-51.2 0a51.2 51.2 0 1 0 102.4 0 51.2 51.2 0 1 0-102.4 0Z"  ></path><path d="M358.4 614.4m-51.2 0a51.2 51.2 0 1 0 102.4 0 51.2 51.2 0 1 0-102.4 0Z"  ></path><path d="M358.4 819.2m-51.2 0a51.2 51.2 0 1 0 102.4 0 51.2 51.2 0 1 0-102.4 0Z"  ></path><path d="M665.6 819.2m-51.2 0a51.2 51.2 0 1 0 102.4 0 51.2 51.2 0 1 0-102.4 0Z"  ></path><path d="M358.4 409.6m-51.2 0a51.2 51.2 0 1 0 102.4 0 51.2 51.2 0 1 0-102.4 0Z"  ></path><path d="M665.6 614.4m-51.2 0a51.2 51.2 0 1 0 102.4 0 51.2 51.2 0 1 0-102.4 0Z"  ></path></symbol><symbol id="icon-disabled" viewBox="0 0 1024 1024"><path d="M752.384 412.1088h-55.6544V300.3904C696.7296 183.6544 608.512 102.4 501.76 102.4 395.0592 102.4 306.8928 183.6544 306.8928 300.3904V407.04H251.1872c-27.8016 0-46.3872 25.344-46.3872 50.7392v385.8432c0 30.464 23.1936 50.7904 46.3872 50.7904h501.248c27.8016 0 46.3872-25.3952 46.3872-50.7904V462.848c0-30.464-18.5856-50.7392-46.4384-50.7392z m-222.72 253.8496v86.272c0 5.12-4.6592 5.12-4.6592 5.12h-41.7792c-4.608 0-4.608-5.12-4.608-5.12v-86.272c-23.2448-10.1888-37.12-30.464-37.12-55.8592 0-35.5328 27.8016-66.048 60.3136-66.048 32.4608 0 60.3136 30.5152 60.3136 66.048 0 25.3952-13.9264 45.6704-32.4608 55.808z m92.7744-253.8496H381.1328V295.3216c0-60.928 55.7056-111.6672 120.6784-111.6672 64.9728 0 120.6272 50.7392 120.6272 111.6672v116.736z"  ></path></symbol><symbol id="icon-tip" viewBox="0 0 1024 1024"><path d="M512 19.017a492.983 492.983 0 1 1-0.073 986.039A492.983 492.983 0 0 1 512 19.09z m0 48.786a444.27 444.27 0 1 0 0.073 888.467A444.27 444.27 0 0 0 512 67.803z m22.016 317.367c37.45 3.877 55.15 33.792 48.64 66.707l-78.41 259.072c-1.023 5.924 2.049 11.849 7.315 13.677 5.852 2.048 17.92-5.412 27.648-16.091l47.104-56.613c1.244 9.509-0.878 26.185-0.878 32.549-35.328 53.028-71.314 93.988-131.876 93.988-41.326-6.729-58.222-36.352-49.298-66.56l77.897-257.828c1.901-6.364-1.244-13.02-7.022-15.068-5.778-2.048-17.042 5.413-26.77 16.092l-47.031 56.612c-1.317-9.508-0.146-25.234-0.146-31.597 35.328-53.029 93.403-94.94 132.827-94.94z m40.96-144.823c29.77 0 53.906 21.724 53.906 53.614 0 31.964-24.137 53.614-53.906 53.614a52.297 52.297 0 0 1-53.906-53.614c0-31.89 24.137-53.614 53.906-53.614z"  ></path></symbol><symbol id="icon-reset" viewBox="0 0 1024 1024"><path d="M482.464768 117.691733L364.363435 66.696533A49.288533 49.288533 0 0 0 325.314901 157.013333a417.9968 417.9968 0 0 0 53.8624 789.845334 49.288533 49.288533 0 0 0 25.668267-95.163734 319.624533 319.624533 0 0 1-29.559467-608.324266l-7.850666 18.158933a49.152 49.152 0 0 0 26.0096 64.580267 49.288533 49.288533 0 0 0 64.580266-24.9856l50.107734-118.9888a49.425067 49.425067 0 0 0-25.668267-64.512z m429.602133 421.410134A418.884267 418.884267 0 0 0 614.424235 126.839467a49.288533 49.288533 0 1 0-28.398934 94.344533 319.829333 319.829333 0 0 1 56.9344 589.824 49.152 49.152 0 0 0-86.152533-47.240533l-67.106133 109.431466a48.9472 48.9472 0 0 0 16.110933 67.925334l109.294933 67.9936a49.288533 49.288533 0 1 0 50.9952-83.7632l-15.018666-9.352534a418.679467 418.679467 0 0 0 261.051733-376.900266z"  ></path></symbol><symbol id="icon-view" viewBox="0 0 1024 1024"><path d="M801.606 104.727a117.667 117.667 0 0 1 117.434 109.94l0.233 7.727v246.598a34.91 34.91 0 0 1-69.493 4.748l-0.325-4.748V222.394c0-24.669-18.619-44.963-42.636-47.57l-5.213-0.279H222.394c-24.669 0-44.963 18.619-47.57 42.636l-0.279 5.213v579.212c0 24.669 18.619 44.963 42.636 47.57l5.213 0.279h243.247a34.91 34.91 0 0 1 4.747 69.492l-4.747 0.326H222.394a117.667 117.667 0 0 1-117.434-109.94l-0.233-7.727V222.394a117.667 117.667 0 0 1 109.94-117.434l7.727-0.233h579.212zM448.559 585.728a34.91 34.91 0 1 1 0 69.818H332.195a34.91 34.91 0 1 1 0-69.818h116.364z m232.727-232.727a34.91 34.91 0 1 1 0 69.818H332.195a34.91 34.91 0 1 1 0-69.818h349.09z"  ></path><path d="M699.764 490.356a186.182 186.182 0 1 1 0 372.364 186.182 186.182 0 0 1 0-372.364z m0 69.819a116.364 116.364 0 1 0 0 232.727 116.364 116.364 0 0 0 0-232.727z"  ></path><path d="M798.673 769.35a34.91 34.91 0 0 1 49.339 0l82.292 82.246a34.91 34.91 0 1 1-49.338 49.384l-82.293-82.292a34.91 34.91 0 0 1 0-49.338z"  ></path></symbol><symbol id="icon-search" viewBox="0 0 1024 1024"><path d="M801.606 104.727a117.667 117.667 0 0 1 117.434 109.94l0.233 7.727v246.598a34.91 34.91 0 0 1-69.493 4.748l-0.325-4.748V222.394c0-24.669-18.619-44.963-42.636-47.57l-5.213-0.279H222.394c-24.669 0-44.963 18.619-47.57 42.636l-0.279 5.213v579.212c0 24.669 18.619 44.963 42.636 47.57l5.213 0.279h243.247a34.91 34.91 0 0 1 4.747 69.492l-4.747 0.326H222.394a117.667 117.667 0 0 1-117.434-109.94l-0.233-7.727V222.394a117.667 117.667 0 0 1 109.94-117.434l7.727-0.233h579.212zM448.559 585.728a34.91 34.91 0 1 1 0 69.818H332.195a34.91 34.91 0 1 1 0-69.818h116.364z m232.727-232.727a34.91 34.91 0 1 1 0 69.818H332.195a34.91 34.91 0 1 1 0-69.818h349.09z"  ></path><path d="M699.764 490.356a186.182 186.182 0 1 1 0 372.364 186.182 186.182 0 0 1 0-372.364z m0 69.819a116.364 116.364 0 1 0 0 232.727 116.364 116.364 0 0 0 0-232.727z"  ></path><path d="M798.673 769.35a34.91 34.91 0 0 1 49.339 0l82.292 82.246a34.91 34.91 0 1 1-49.338 49.384l-82.293-82.292a34.91 34.91 0 0 1 0-49.338z"  ></path></symbol></svg>', function (o) {
-  var t = (t = document.getElementsByTagName("script"))[t.length - 1],
-    a = t.getAttribute("data-injectcss"),
-    t = t.getAttribute("data-disable-injectsvg");
-  if (!t) {
-    var e,
-      _l,
-      h,
-      i,
-      c,
-      d = function d(t, a) {
-        a.parentNode.insertBefore(t, a);
-      };
-    if (a && !o.__iconfont__svg__cssinject__) {
-      o.__iconfont__svg__cssinject__ = !0;
-      try {
-        document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>");
-      } catch (t) {
-        console && console.log(t);
-      }
-    }
-    e = function e() {
-      var t,
-        a = document.createElement("div");
-      a.innerHTML = o._iconfont_svg_string_4063056, (a = a.getElementsByTagName("svg")[0]) && (a.setAttribute("aria-hidden", "true"), a.style.position = "absolute", a.style.width = 0, a.style.height = 0, a.style.overflow = "hidden", a = a, (t = document.body).firstChild ? d(a, t.firstChild) : t.appendChild(a));
-    }, document.addEventListener ? ~["complete", "loaded", "interactive"].indexOf(document.readyState) ? setTimeout(e, 0) : (_l = function l() {
-      document.removeEventListener("DOMContentLoaded", _l, !1), e();
-    }, document.addEventListener("DOMContentLoaded", _l, !1)) : document.attachEvent && (h = e, i = o.document, c = !1, n(), i.onreadystatechange = function () {
-      "complete" == i.readyState && (i.onreadystatechange = null, m());
-    });
-  }
-  function m() {
-    c || (c = !0, h());
-  }
-  function n() {
-    try {
-      i.documentElement.doScroll("left");
-    } catch (t) {
-      return void setTimeout(n, 50);
-    }
-    m();
-  }
-}(window);