shineout 3.5.0-beta.8 → 3.5.0

package/dist/shineout.js

@@ -6535,9 +6535,9 @@ __webpack_require__.d(detect_namespaceObject, {
 });
 
 // NAMESPACE OBJECT: ./src/utils/dom/document.ts
-var dom_document_namespaceObject = {};
-__webpack_require__.r(dom_document_namespaceObject);
-__webpack_require__.d(dom_document_namespaceObject, {
+var utils_dom_document_namespaceObject = {};
+__webpack_require__.r(utils_dom_document_namespaceObject);
+__webpack_require__.d(utils_dom_document_namespaceObject, {
   addEventListener: function() { return addEventListener; },
   docScroll: function() { return document_docScroll; },
   docSize: function() { return document_docSize; }
@@ -6577,7 +6577,7 @@ __webpack_require__.d(src_utils_namespaceObject, {
   cssAccessors: function() { return cssAccessors; },
   cssInject: function() { return cssInject; },
   detect: function() { return detect_namespaceObject; },
-  doc: function() { return dom_document_namespaceObject; },
+  doc: function() { return utils_dom_document_namespaceObject; },
   element: function() { return dom_element_namespaceObject; },
   flat: function() { return utils_flat_namespaceObject; },
   func: function() { return utils_func_namespaceObject; },
@@ -6807,6 +6807,11 @@ var treeArrow = ['M18.2209 9.72141L12.6344 15.2952C12.2441 15.6847 11.6121 15.68
 var treePlus = ['M19.5 2C20.8807 2 22 3.11929 22 4.5V19.5C22 20.8807 20.8807 22 19.5 22H4.5C3.11929 22 2 20.8807 2 19.5V4.5C2 3.11929 3.11929 2 4.5 2H19.5ZM19.5 4H4.5C4.22386 4 4 4.22386 4 4.5V19.5C4 19.7761 4.22386 20 4.5 20H19.5C19.7761 20 20 19.7761 20 19.5V4.5C20 4.22386 19.7761 4 19.5 4ZM12 7C12.5128 7 12.9355 7.38604 12.9933 7.88338L13 8V11H16C16.5523 11 17 11.4477 17 12C17 12.5128 16.614 12.9355 16.1166 12.9933L16 13H13V16C13 16.5523 12.5523 17 12 17C11.4872 17 11.0645 16.614 11.0067 16.1166L11 16V13H8C7.44772 13 7 12.5523 7 12C7 11.4872 7.38604 11.0645 7.88338 11.0067L8 11H11V8C11 7.44772 11.4477 7 12 7Z'];
 var treeMinus = ['M22 4.5C22 3.11929 20.8807 2 19.5 2H4.5C3.11929 2 2 3.11929 2 4.5V19.5C2 20.8807 3.11929 22 4.5 22H19.5C20.8807 22 22 20.8807 22 19.5V4.5ZM4.5 4H19.5C19.7761 4 20 4.22386 20 4.5V19.5C20 19.7761 19.7761 20 19.5 20H4.5C4.22386 20 4 19.7761 4 19.5V4.5C4 4.22386 4.22386 4 4.5 4ZM8 11C7.44772 11 7 11.4477 7 12C7 12.5523 7.44772 13 8 13H16C16.5523 13 17 12.5523 17 12C17 11.4477 16.5523 11 16 11H8Z'];
 var pcHelpCircleFill = ['M11 0C13.9562 0 16.7292 1.17289 18.7782 3.22183C20.8271 5.27079 22 8.04381 22 11C22 13.9562 20.8271 16.7292 18.7782 18.7782C16.7292 20.8271 13.9562 22 11 22C8.04381 22 5.27079 20.8271 3.22182 18.7782C1.17289 16.7292 0 13.9562 0 11C0 8.04381 1.17289 5.27079 3.22183 3.22182C5.27079 1.17289 8.04381 0 11 0ZM11 15.3125C10.3097 15.3125 9.75 15.8721 9.75 16.5625C9.75 17.2528 10.3097 17.8125 11 17.8125C11.6903 17.8125 12.25 17.2528 12.25 16.5625C12.25 15.8721 11.6903 15.3125 11 15.3125ZM11 4.31245C8.79086 4.31245 7 6.10332 7 8.31245C7 8.86474 7.44772 9.31245 8 9.31245C8.55229 9.31245 9 8.86474 9 8.31245C9 7.20789 9.89543 6.31245 11 6.31245C12.1046 6.31245 13 7.20789 13 8.31245C13 9.41702 12.1046 10.3125 11 10.3125L10.8834 10.3192C10.386 10.3769 10 10.7996 10 11.3125V13.3125L10.0067 13.4291C10.0645 13.9264 10.4872 14.3125 11 14.3125L11.1166 14.3057C11.614 14.248 12 13.8253 12 13.3125V12.185L12.1553 12.1431C13.8012 11.6474 15 10.1199 15 8.31245C15 6.10332 13.2091 4.31245 11 4.31245Z'];
+var pcHelpCircleOutline = [/*#__PURE__*/(0,jsx_runtime.jsx)("path", {
+  fillRule: "evenodd",
+  clipRule: "evenodd",
+  d: "M12.002 1C18.0771 1 23.002 5.92487 23.002 12C23.002 18.0751 18.0771 23 12.002 23C5.92682 23 1.00195 18.0751 1.00195 12C1.00195 5.92487 5.92682 1 12.002 1ZM12.002 3C7.03139 3 3.00195 7.02944 3.00195 12C3.00195 16.9706 7.03139 21 12.002 21C16.9725 21 21.002 16.9706 21.002 12C21.002 7.02944 16.9725 3 12.002 3ZM12.002 16.0263C12.7225 16.0263 13.3066 16.6105 13.3066 17.331C13.3066 18.0516 12.7225 18.6357 12.002 18.6357C11.2814 18.6357 10.6973 18.0516 10.6973 17.331C10.6973 16.6105 11.2814 16.0263 12.002 16.0263ZM12.002 5.36428C14.0358 5.36428 15.6895 7.02546 15.6895 9.06758C15.6895 9.99304 15.2656 10.622 14.1552 11.7338C14.1184 11.7707 14.1184 11.7707 14.0815 11.8076C13.2372 12.65 12.9395 13.0376 12.9395 13.3995V14.5621C12.9395 15.0797 12.5195 15.5003 12.002 15.5003C11.4844 15.5003 11.0644 15.0803 11.0644 14.5628V13.4002C11.0644 12.3785 11.5209 11.715 12.7559 10.4811C12.783 10.454 12.783 10.454 12.81 10.4269L12.8599 10.3769L12.9277 10.3087C12.9406 10.2956 12.9562 10.2798 12.9769 10.2589C13.5549 9.67191 13.8144 9.31374 13.8144 9.06758C13.8144 8.05926 13.0006 7.23928 12.002 7.23928C10.9828 7.23928 10.1895 8.02064 10.1895 9.02083C10.1895 9.53842 9.76954 9.95831 9.25195 9.95831C8.73437 9.95831 8.31444 9.53839 8.31444 9.02083C8.31444 7.00396 9.96896 5.36428 12.002 5.36428Z"
+}, 0)];
 var pcInfoCircleFill = ['M12 23C5.92487 23 1 18.0751 1 12C1 5.92487 5.92487 1 12 1C18.0751 1 23 5.92487 23 12C23 18.0751 18.0751 23 12 23ZM12 8C12.5523 8 13 7.55228 13 7C13 6.44772 12.5523 6 12 6C11.4477 6 11 6.44772 11 7C11 7.55228 11.4477 8 12 8ZM12 19C12.5523 19 13 18.5523 13 18V10C13 9.44772 12.5523 9 12 9C11.4477 9 11 9.44772 11 10V18C11 18.5523 11.4477 19 12 19Z'];
 var search = ['M11 2C15.9706 2 20 6.02944 20 11C20 13.1248 19.2637 15.0776 18.0323 16.6172L21.1213 19.7071C21.5118 20.0976 21.5118 20.7308 21.1213 21.1213C20.7308 21.5118 20.0976 21.5118 19.7071 21.1213L16.6172 18.0323C15.0776 19.2637 13.1248 20 11 20C6.02944 20 2 15.9706 2 11C2 6.02944 6.02944 2 11 2ZM11 4C7.13401 4 4 7.13401 4 11C4 14.866 7.13401 18 11 18C14.866 18 18 14.866 18 11C18 7.13401 14.866 4 11 4Z'];
 var icons_link = ['M8.83231 20.7322C7.27024 22.2943 4.73759 22.2943 3.17546 20.7322C1.66545 19.2222 1.61512 16.8053 3.02446 15.2347L3.17546 15.0754L12.6109 3.70711C14.7588 1.55923 18.2412 1.55923 20.3891 3.70711C22.4773 5.79532 22.5353 9.14496 20.5631 11.3032L20.3891 11.4853L12.3679 21.4393C11.9773 21.8299 11.3442 21.8299 10.9536 21.4394C10.5932 21.0789 10.5654 20.5116 10.8705 20.1193L10.9536 20.0251L18.9749 10.0711C20.3417 8.70423 20.3417 6.48814 18.9749 5.12132C17.6569 3.8033 15.5492 3.75623 14.1747 4.9801L14.0251 5.12132L4.58968 16.4896C3.80864 17.2706 3.80864 18.537 4.58966 19.318C5.32963 20.058 6.5051 20.0969 7.29088 19.4348L7.41809 19.318L16.8535 7.94978C17.0488 7.7545 17.0488 7.43787 16.8536 7.24262C16.68 7.06904 16.4106 7.04975 16.2157 7.18476L16.1464 7.24261L8.12521 17.1967C7.73468 17.5873 7.10152 17.5873 6.71099 17.1967C6.35051 16.8362 6.32277 16.269 6.6278 15.8767L6.71099 15.7825L14.7322 5.8284C15.7085 4.85208 17.2915 4.85208 18.2678 5.82843C19.2016 6.7623 19.2422 8.25112 18.3896 9.23328L18.2678 9.36397L8.83231 20.7322Z'];
@@ -6831,6 +6836,7 @@ var Icons = {
   ArrowDown: icon(arrowDown),
   PcArrowFillDown: icon(caretFill),
   PcHelpCircleFill: icon(pcHelpCircleFill),
+  PcHelpCircleOutline: icon(pcHelpCircleOutline),
   PcInfoCircleFill: icon(pcInfoCircleFill),
   PcCloseCircleFill: icon(danger),
   PcWarningCircleFill: icon(pcAttentionCircleFill),
@@ -6870,6 +6876,9 @@ var config = {
     Error: icons.PcWarningCircleFill,
     Confirm: icons.PcHelpCircleFill
   },
+  form: {
+    Tooltip: icons.PcHelpCircleOutline
+  },
   breadcrumb: {
     DropdownArrow: icons.ArrowDown
   },
@@ -11993,7 +12002,7 @@ var handleStyle = function handleStyle(style) {
 };
 /* harmony default export */ var jss_style_handleStyle = (handleStyle);
 ;// CONCATENATED MODULE: ../shineout-style/src/version.ts
-/* harmony default export */ var version = ('3.5.0-beta.8');
+/* harmony default export */ var version = ('3.5.0');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -13541,6 +13550,9 @@ var emptyTokens = {
 var formTokens = {
   formItemFontSize: 'Font-14',
   formItemFontColor: 'Neutral-text-5',
+  formItemTooltipIconColor: 'Neutral-text-4',
+  formItemTooltipIconFontSize: 'Font-14',
+  formItemTooltipIconMarginXStart: 'Spacing-4',
   formItemMarginYEnd: 'Spacing-12',
   formItemMarginXEnd: 'Spacing-16',
   formItemLabelWidth: '140px',
@@ -18918,6 +18930,18 @@ var formItemStyle = {
       display: 'inline-block'
     }
   },
+  labelTooltip: {
+    display: 'inline-block',
+    verticalAlign: 'middle',
+    cursor: 'help',
+    color: src.formItemTooltipIconColor,
+    width: src.formItemTooltipIconFontSize,
+    fontSize: src.formItemTooltipIconFontSize,
+    marginLeft: src.formItemTooltipIconMarginXStart,
+    '& svg': {
+      width: '100%'
+    }
+  },
   labelLeft: {
     textAlign: 'start'
   },
@@ -28465,15 +28489,6 @@ var isFirefox = function isFirefox() {
   if (!is_isBrowser()) return false;
   return navigator.userAgent.toLowerCase().indexOf('firefox') > -1;
 };
-var isChromeLowerThan = function isChromeLowerThan(version) {
-  // 服务器端渲染时，不执行版本检查
-  if (typeof window === 'undefined' || typeof navigator === 'undefined') {
-    return false;
-  }
-  var ua = navigator.userAgent;
-  var chrome = ua.match(/chrome\/(\d+)/i);
-  return Boolean(chrome && chrome[1] && parseInt(chrome[1], 10) < version);
-};
 function isDomElement(element) {
   return (typeof HTMLElement === "undefined" ? "undefined" : typeof_default()(HTMLElement)) === 'object' ? element instanceof HTMLElement // DOM2
   : element && typeof_default()(element) === 'object' && element !== null && element.nodeType === 1 && typeof element.nodeName === 'string';
@@ -29229,6 +29244,50 @@ function shallowEqual(objA, objB) {
   return true;
 }
 /* harmony default export */ var shallow_equal = (shallowEqual);
+;// CONCATENATED MODULE: ../hooks/src/utils/dom/document.ts
+var cachedZoom = 0;
+var getCurrentCSSZoom = function getCurrentCSSZoom() {
+  if (cachedZoom) return cachedZoom;
+  if (typeof window === 'undefined' || typeof navigator === 'undefined' || !document.body) {
+    return 1;
+  }
+  var currentCSSZoom = Math.round(document.body.getBoundingClientRect().width) / document.body.clientWidth;
+  if (window.ResizeObserver) {
+    // 监听document.body的变化，更新缓存的zoom
+    var resizeObserver = new ResizeObserver(function () {
+      cachedZoom = Math.round(document.body.getBoundingClientRect().width) / document.body.clientWidth;
+    });
+    resizeObserver.observe(document.body);
+  }
+  cachedZoom = currentCSSZoom;
+  return currentCSSZoom;
+};
+
+// export const getZoomBoundingClientRect = (element: HTMLElement) => {
+//   const currentCSSZoom = getCurrentCSSZoom()
+//   if (currentCSSZoom === 1 || !currentCSSZoom) {
+//     return element.getBoundingClientRect()
+//   }
+//   const isNotZoom = currentCSSZoom === 1 || !currentCSSZoom
+
+//   if (isNotZoom) {
+//     return element.getBoundingClientRect()
+//   }
+
+//   const zoomRatio = 1 / currentCSSZoom
+//   const rect = element.getBoundingClientRect()
+
+//   return {
+//     x: rect.x * zoomRatio,
+//     y: rect.y * zoomRatio,
+//     top: rect.top * zoomRatio,
+//     right: rect.right * zoomRatio,
+//     bottom: rect.bottom * zoomRatio,
+//     left: rect.left * zoomRatio,
+//     width: rect.width * zoomRatio,
+//     height: rect.height * zoomRatio,
+//   }
+// }
 ;// CONCATENATED MODULE: ../hooks/src/common/use-position-style/index.ts
 
 
@@ -29237,6 +29296,7 @@ function shallowEqual(objA, objB) {
 
 
 
+
 var horizontalPosition = ['left-bottom', 'left-top', 'right-bottom', 'right-top', 'left', 'right'];
 var verticalPosition = ['bottom-left', 'bottom-right', 'top-left', 'top-right', 'bottom', 'top'];
 var hideStyle = {
@@ -29473,13 +29533,14 @@ var usePositionStyle = function usePositionStyle(config) {
     };
   };
   var getAbsoluteStyle = function getAbsoluteStyle(position) {
+    var _scrollElRef$current;
     if (!parentElRef.current) return {
       style: hideStyle
     };
     var rect = context.parentRect;
-    if (scrollElRef !== null && scrollElRef !== void 0 && scrollElRef.current) {
-      var _scrollElRef$current;
-      var visibleRect = ((_scrollElRef$current = scrollElRef.current) === null || _scrollElRef$current === void 0 ? void 0 : _scrollElRef$current.getBoundingClientRect()) || {};
+    if (scrollElRef !== null && scrollElRef !== void 0 && scrollElRef.current && (_scrollElRef$current = scrollElRef.current) !== null && _scrollElRef$current !== void 0 && _scrollElRef$current.contains(parentElRef.current)) {
+      var _scrollElRef$current2;
+      var visibleRect = ((_scrollElRef$current2 = scrollElRef.current) === null || _scrollElRef$current2 === void 0 ? void 0 : _scrollElRef$current2.getBoundingClientRect()) || {};
       if (rect.bottom < visibleRect.top || rect.top > visibleRect.bottom || rect.right < visibleRect.left || rect.left > visibleRect.right) {
         return {
           style: hideStyle
@@ -29489,15 +29550,8 @@ var usePositionStyle = function usePositionStyle(config) {
     var _getAbsolutePositionS = getAbsolutePositionStyle(rect, position),
       style = _getAbsolutePositionS.style,
       arrayStyle = _getAbsolutePositionS.arrayStyle;
-
-    // TODO: 如果是版本大于chrome128，需要根据currentCSSZoom处理chrome的bug
-    if (!isChromeLowerThan(128)) {
-      // @ts-ignore currentCSSZoom
-      var currentCSSZoom = document.body.currentCSSZoom;
-      if (currentCSSZoom === 1 || !currentCSSZoom) return {
-        style: style,
-        arrayStyle: arrayStyle
-      };
+    var currentCSSZoom = getCurrentCSSZoom();
+    if (currentCSSZoom && currentCSSZoom !== 1) {
       if (style.left && typeof style.left === 'number') {
         style.left = style.left * (1 / currentCSSZoom);
       }
@@ -31772,9 +31826,12 @@ var spin_Spin = function Spin() {
     tipProps = props.tip,
     tipClassName = props.tipClassName,
     colorProps = props.color,
-    modeProps = props.mode;
+    modeProps = props.mode,
+    _props$ignoreConfig = props.ignoreConfig,
+    ignoreConfig = _props$ignoreConfig === void 0 ? false : _props$ignoreConfig;
   var config = useConfig();
   var getSpinName = function getSpinName() {
+    if (ignoreConfig) return props.name;
     var spin = config.spin;
     if (!spin) return;
     if (typeof spin === 'string') {
@@ -31787,18 +31844,21 @@ var spin_Spin = function Spin() {
     return;
   };
   var getSpinTip = function getSpinTip() {
+    if (ignoreConfig) return props.tip;
     var spin = config.spin;
     if (!spin || typeof_default()(spin) !== 'object') return;
     var tip = spin.tip;
     return tip;
   };
   var getSpinColor = function getSpinColor() {
+    if (ignoreConfig) return props.color;
     var spin = config.spin;
     if (!spin || typeof_default()(spin) !== 'object') return;
     var color = spin.color;
     return color;
   };
   var getSpinMode = function getSpinMode() {
+    if (ignoreConfig) return props.mode;
     var spin = config.spin;
     if (!spin || typeof_default()(spin) !== 'object') return;
     var mode = spin.mode;
@@ -31944,7 +32004,8 @@ var Button = function Button(props) {
     children: /*#__PURE__*/(0,jsx_runtime.jsx)(src_spin_spin, {
       size: getSpinSize(),
       jssStyle: jssStyle,
-      name: "ring"
+      name: "ring",
+      ignoreConfig: true
     })
   });
   if (renderLoading) {
@@ -37466,7 +37527,9 @@ var CascaderNode = function CascaderNode(props) {
         },
         children: /*#__PURE__*/(0,jsx_runtime.jsx)(src_spin_spin, {
           jssStyle: jssStyle,
-          size: 10
+          size: 10,
+          name: "ring",
+          ignoreConfig: true
         })
       });
     }
@@ -38548,6 +38611,14 @@ var result_Result = function Result(props) {
   var empty = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
     return isEmptyResult();
   }, [props.value]);
+  var basePlaceholder = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
+    return /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+      className: classnames_default()(styles.placeholder, styles.ellipsis),
+      children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+        children: placeholder
+      })
+    });
+  }, [placeholder]);
   var isCompressedBound = function isCompressedBound() {
     return compressedBound && result_isNumber(compressedBound) && compressedBound >= 1;
   };
@@ -38565,7 +38636,9 @@ var result_Result = function Result(props) {
     if (!multiple && valueProp && valueProp !== 0) {
       var _result = getDataByValues(value);
       _placeholder = renderResultContent(_result[0]);
-      if (_placeholder === undefined) _placeholder = placeholder;
+      if (_placeholder === undefined) {
+        return basePlaceholder;
+      }
     }
     return /*#__PURE__*/(0,jsx_runtime.jsx)((external_root_React_commonjs2_react_commonjs_react_amd_react_default()).Fragment, {
       children: /*#__PURE__*/(0,jsx_runtime.jsx)(result_input, {
@@ -38650,12 +38723,7 @@ var result_Result = function Result(props) {
       return renderInput();
     }
     if (!placeholder) return renderNbsp();
-    return /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
-      className: classnames_default()(styles.placeholder, styles.ellipsis),
-      children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
-        children: placeholder
-      })
-    });
+    return basePlaceholder;
   };
   var renderSingleResult = function renderSingleResult() {
     if (isEmptyResult()) return renderNbsp();
@@ -38691,7 +38759,7 @@ var result_Result = function Result(props) {
       results: result,
       datas: datas
     };
-  }, [props.value]);
+  }, [props.value, props.data]);
   var result = renderMultipleResult.results;
   var moreNumber = getCompressedBound();
   var renderMultipleResultMore = /*#__PURE__*/(0,jsx_runtime.jsx)(result_more, {
@@ -47692,9 +47760,120 @@ var UseFormItem = function UseFormItem() {
   };
 };
 /* harmony default export */ var use_form_item = (UseFormItem);
+;// CONCATENATED MODULE: ../base/src/tooltip/tooltip.tsx
+
+
+
+
+
+
+
+
+
+var defaultDelay = 0;
+var Tooltip = function Tooltip(props) {
+  var _jssStyle$tooltip;
+  var _props$trigger = props.trigger,
+    trigger = _props$trigger === void 0 ? 'hover' : _props$trigger,
+    priorityDirection = props.priorityDirection,
+    children = props.children,
+    tip = props.tip,
+    disabledChild = props.disabledChild,
+    jssStyle = props.jssStyle,
+    className = props.className,
+    style = props.style,
+    zIndex = props.zIndex,
+    _props$type = props.type,
+    type = _props$type === void 0 ? 'default' : _props$type,
+    _props$position = props.position,
+    popsitionProps = _props$position === void 0 ? 'auto' : _props$position;
+  var arrowStyleRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({});
+  var tooltipClasses = jssStyle === null || jssStyle === void 0 || (_jssStyle$tooltip = jssStyle.tooltip) === null || _jssStyle$tooltip === void 0 ? void 0 : _jssStyle$tooltip.call(jssStyle);
+  var config = useConfig();
+  var childrenProps = /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.isValidElement)(children) ? children === null || children === void 0 ? void 0 : children.props : {};
+  var delay = props.delay || props.mouseEnterDelay || defaultDelay;
+  var _usePopup = use_popup({
+      position: popsitionProps,
+      trigger: trigger,
+      autoMode: 'popover',
+      priorityDirection: priorityDirection,
+      mouseEnterDelay: delay,
+      targetEvents: disabledChild ? {} : childrenProps
+    }),
+    open = _usePopup.open,
+    position = _usePopup.position,
+    getTargetProps = _usePopup.getTargetProps,
+    targetRef = _usePopup.targetRef,
+    popupRef = _usePopup.popupRef,
+    arrowRef = _usePopup.arrowRef;
+  if (! /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.isValidElement)(children)) {
+    console.error(new Error('Tooltip children expect a single ReactElement.'));
+    return null;
+  }
+  if (!tip) return children;
+  var inner = disabledChild ? /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+    className: tooltipClasses === null || tooltipClasses === void 0 ? void 0 : tooltipClasses.target,
+    style: {
+      cursor: 'not-allowed'
+    },
+    children: /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.cloneElement)(children, {
+      style: objectSpread2_default()(objectSpread2_default()({}, childrenProps.style), {}, {
+        pointerEvents: 'none'
+      })
+    })
+  }) : children;
+  var events = getTargetProps();
+  return /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
+    children: [/*#__PURE__*/(0,jsx_runtime.jsx)("noscript", {
+      ref: function ref(el) {
+        if (!el) return;
+        var targetEl = el.nextElementSibling;
+        if (!targetEl) return;
+        if (targetRef.current === targetEl) return;
+        targetRef.current = targetEl;
+      }
+    }, 'ns'), /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.cloneElement)(inner, events), /*#__PURE__*/(0,jsx_runtime.jsx)(absolute_list, {
+      focus: open,
+      parentElRef: targetRef,
+      popupElRef: popupRef,
+      arrowRef: arrowRef,
+      absolute: true,
+      adjust: popsitionProps === 'auto',
+      position: position,
+      fixedWidth: false,
+      popupGap: 0
+      // arrowStyleRef={arrowStyleRef}
+      ,
+      zIndex: zIndex,
+      children: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", objectSpread2_default()(objectSpread2_default()({
+        className: classnames_default()(className, tooltipClasses === null || tooltipClasses === void 0 ? void 0 : tooltipClasses.wrapper, open && (tooltipClasses === null || tooltipClasses === void 0 ? void 0 : tooltipClasses.wrapperOpen))
+      }, getDataAttribute({
+        type: type,
+        position: position
+      })), {}, {
+        ref: popupRef,
+        onMouseLeave: events.onMouseLeave,
+        dir: config.direction,
+        children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", objectSpread2_default()({
+          ref: arrowRef,
+          style: arrowStyleRef.current,
+          className: tooltipClasses === null || tooltipClasses === void 0 ? void 0 : tooltipClasses.arrow
+        }, getDataAttribute({
+          role: 'arrow'
+        }))), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+          style: style,
+          className: classnames_default()(tooltipClasses === null || tooltipClasses === void 0 ? void 0 : tooltipClasses.content),
+          children: tip
+        })]
+      }))
+    })]
+  });
+};
+/* harmony default export */ var src_tooltip_tooltip = (Tooltip);
 ;// CONCATENATED MODULE: ../base/src/form/form-item.tsx
 
 
+
 var form_item_excluded = ["children", "jssStyle", "className", "style", "label", "tip", "required"];
 
 
@@ -47702,6 +47881,10 @@ var form_item_excluded = ["children", "jssStyle", "className", "style", "label",
 
 
 
+
+
+
+
 /* harmony default export */ var form_form_item = (function (props) {
   var _jssStyle$formItem;
   var children = props.children,
@@ -47726,6 +47909,36 @@ var form_item_excluded = ["children", "jssStyle", "className", "style", "label",
     labelVerticalAlign = _labelConfig$rest.labelVerticalAlign,
     inline = _labelConfig$rest.inline,
     keepErrorHeight = _labelConfig$rest.keepErrorHeight;
+  var renderLabel = function renderLabel() {
+    if (label === undefined || label === null) return null;
+    var $tooltip;
+    if (typeof_default()(label) === 'object' && 'tooltip' in label && label.tooltip) {
+      var _label$tooltip;
+      var tooltipProps = objectSpread2_default()({
+        jssStyle: {
+          tooltip: useTooltipStyle
+        }
+      }, typeof_default()(label.tooltip) === 'object' && 'tip' in label.tooltip ? objectSpread2_default()(objectSpread2_default()({}, label.tooltip), {}, {
+        tip: label.tooltip.tip,
+        position: ((_label$tooltip = label.tooltip) === null || _label$tooltip === void 0 ? void 0 : _label$tooltip.position) || 'top'
+      }) : {
+        tip: label.tooltip,
+        position: 'top'
+      });
+      $tooltip = /*#__PURE__*/(0,jsx_runtime.jsx)(src_tooltip_tooltip, objectSpread2_default()(objectSpread2_default()({}, tooltipProps), {}, {
+        children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+          className: formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.labelTooltip,
+          children: tooltipProps.icon || icons_config.form.Tooltip
+        })
+      }));
+    }
+    if (typeof_default()(label) === 'object' && 'tooltip' in label) {
+      return /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
+        children: [label.content, $tooltip]
+      });
+    }
+    return label;
+  };
   return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", objectSpread2_default()(objectSpread2_default()({
     className: classnames_default()(className, formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapper, labelAlign === 'top' && (formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperLabelTop), labelAlign !== 'top' && labelVerticalAlign === 'middle' && (formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperLabelVerticalMiddle), labelAlign !== 'top' && labelVerticalAlign === 'bottom' && (formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperLabelVerticalBottom), inline && (formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperInline), keepErrorHeight && (formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperKeepHeight), required && (formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperRequired), (showError || tip) && (formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperTip))
   }, attributes), {}, {
@@ -47735,7 +47948,7 @@ var form_item_excluded = ["children", "jssStyle", "className", "style", "label",
       style: labelAlign !== 'top' || inline ? {
         width: labelWidth
       } : undefined,
-      children: label
+      children: renderLabel()
     }) : null, /*#__PURE__*/(0,jsx_runtime.jsxs)("div", objectSpread2_default()(objectSpread2_default()({
       className: formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.control
     }, getDataAttribute({
@@ -49355,7 +49568,9 @@ var Image = function Image(props) {
       children: /*#__PURE__*/(0,jsx_runtime.jsx)(src_spin_spin, {
         jssStyle: jssStyle,
         color: "#B3B7C1",
-        size: 16
+        size: 16,
+        name: "ring",
+        ignoreConfig: true
       })
     });
   };
@@ -50733,7 +50948,9 @@ var NodeContent = function NodeContent(props) {
       dir: config.direction,
       children: /*#__PURE__*/(0,jsx_runtime.jsx)(src_spin_spin, {
         size: 12,
-        jssStyle: jssStyle
+        jssStyle: jssStyle,
+        ignoreConfig: true,
+        name: "ring"
       })
     });
   };
@@ -57679,35 +57896,47 @@ var useTableSort = function useTableSort(props) {
 
 
 
-var getExpandData = function getExpandData(data, keys, keygen, treeColumnsName) {
+var getExpandData = function getExpandData(_treeData, keys, keygen, treeColumnsName) {
   var expandKeys = keys;
   var expandSet = new Set(expandKeys);
-  var expandLevel = new Map();
+  var unmatchExpandKeys = [];
+  var treeExpandLevel = new Map();
   if (expandSet.size === 0 || !treeColumnsName) {
-    return [data, expandLevel];
+    return {
+      treeData: _treeData,
+      treeExpandLevel: treeExpandLevel,
+      unmatchExpandKeys: unmatchExpandKeys
+    };
   }
-  var newData = toConsumableArray_default()(data || []);
+  var treeData = toConsumableArray_default()(_treeData || []);
   var _loop = function _loop() {
     if (expandSet.size === 0) return 1; // break
-    var item = newData[i];
+    var item = treeData[i];
     var key = getKey(keygen, item, i);
-    var parentLevel = expandLevel.get(key) || 0;
+    var parentLevel = treeExpandLevel.get(key) || 0;
     var children = is_isObject(item) && item[treeColumnsName];
-    if (expandSet.has(key) && children) {
-      children.forEach(function (child) {
-        expandLevel.set(getKey(keygen, child), parentLevel + 1);
-      });
-      newData.splice.apply(newData, [i + 1, 0].concat(toConsumableArray_default()(children)));
-      expandSet.delete(key);
+    if (expandSet.has(key)) {
+      if (children && children.length > 0) {
+        children.forEach(function (child) {
+          treeExpandLevel.set(getKey(keygen, child), parentLevel + 1);
+        });
+        treeData.splice.apply(treeData, [i + 1, 0].concat(toConsumableArray_default()(children)));
+        expandSet.delete(key);
+      } else {
+        unmatchExpandKeys.push(key);
+      }
     }
   };
-  for (var i = 0; i < newData.length; i++) {
+  for (var i = 0; i < treeData.length; i++) {
     if (_loop()) break;
   }
-  return [newData, expandLevel];
+  return {
+    treeData: treeData,
+    treeExpandLevel: treeExpandLevel,
+    unmatchExpandKeys: unmatchExpandKeys
+  };
 };
 var useTableTree = function useTableTree(props) {
-  var _props$data$filter;
   var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(props.defaultTreeExpandKeys || []),
     _useState2 = slicedToArray_default()(_useState, 2),
     expandKeysState = _useState2[0],
@@ -57748,13 +57977,27 @@ var useTableTree = function useTableTree(props) {
   var _useMemo = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
       return getExpandData(props.data, expandKeys, props.keygen, props.treeColumnsName);
     }, [props.data, expandKeys, props.treeColumnsName]),
-    _useMemo2 = slicedToArray_default()(_useMemo, 2),
-    treeData = _useMemo2[0],
-    treeExpandLevel = _useMemo2[1];
-  var isEmptyTree = ((_props$data$filter = props.data.filter(function (item) {
-    var _item;
-    return (_item = item[props.treeColumnsName]) === null || _item === void 0 ? void 0 : _item.length;
-  })) === null || _props$data$filter === void 0 ? void 0 : _props$data$filter.length) === 0;
+    treeData = _useMemo.treeData,
+    treeExpandLevel = _useMemo.treeExpandLevel,
+    unmatchExpandKeys = _useMemo.unmatchExpandKeys;
+  var isEmptyTree = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
+    var _props$data$filter;
+    return ((_props$data$filter = props.data.filter(function (item) {
+      var _item;
+      return (_item = item[props.treeColumnsName]) === null || _item === void 0 ? void 0 : _item.length;
+    })) === null || _props$data$filter === void 0 ? void 0 : _props$data$filter.length) === 0;
+  }, [props.data, props.treeColumnsName]);
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
+    if (!unmatchExpandKeys.length || !expandKeysState.length) {
+      return;
+    }
+
+    // 检查treeData中的每一项，对比expandKeysState，如果expandKeysState有但是children是空的，则需要修正expandKeysState
+    var newExpandKeys = expandKeysState.filter(function (key) {
+      return !unmatchExpandKeys.includes(key);
+    });
+    setExpandKeysState(newExpandKeys);
+  }, [unmatchExpandKeys, expandKeysState]);
   return {
     data: treeData,
     treeExpandLevel: treeExpandLevel,
@@ -58520,6 +58763,7 @@ var thead_toNum = toNum;
     };
     var isCustomRender = props.renderSorter && typeof props.renderSorter === 'function';
     var renderedSortDirections = (_ref = (_column$sortDirection = column.sortDirections) !== null && _column$sortDirection !== void 0 ? _column$sortDirection : props.sortDirections) !== null && _ref !== void 0 ? _ref : ['asc', 'desc'];
+    var onlyOneDirection = renderedSortDirections.length === 1;
     return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
       className: tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.sorterContainer,
       dir: config.direction,
@@ -58537,12 +58781,18 @@ var thead_toNum = toNum;
           onClick: function onClick() {
             handleChange(currentOrder === 'asc' ? null : 'asc');
           },
+          style: onlyOneDirection ? {
+            marginBottom: 0
+          } : {},
           children: icons_config.table.SortUp
         }), renderedSortDirections.includes('desc') && /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
           className: classnames_default()(tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.sorterDesc, currentOrder === 'desc' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.sorterActive)),
           onClick: function onClick() {
             handleChange(currentOrder === 'desc' ? null : 'desc');
           },
+          style: onlyOneDirection ? {
+            marginTop: 0
+          } : {},
           children: icons_config.table.SortDown
         })]
       })
@@ -58959,7 +59209,7 @@ var Tr = function Tr(props) {
       return regeneratorRuntime_default()().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            if (!(showLoader && props.loader)) {
+            if (!(showLoader && props.loader && typeof props.loader === 'function')) {
               _context.next = 11;
               break;
             }
@@ -59015,7 +59265,9 @@ var Tr = function Tr(props) {
     if (isExpandLoading) {
       $expandIcon = /*#__PURE__*/(0,jsx_runtime.jsx)(src_spin_spin, {
         size: 12,
-        jssStyle: props.jssStyle
+        jssStyle: props.jssStyle,
+        name: "ring",
+        ignoreConfig: true
       });
     }
     var $expandIconWrapper;
@@ -60951,116 +61203,6 @@ var BaseTextarea = function BaseTextarea(props) {
 
 src_textarea_textarea_0.displayName = 'ShineoutTextarea';
 /* harmony default export */ var src_textarea_0 = (src_textarea_textarea_0);
-;// CONCATENATED MODULE: ../base/src/tooltip/tooltip.tsx
-
-
-
-
-
-
-
-
-
-var defaultDelay = 0;
-var Tooltip = function Tooltip(props) {
-  var _jssStyle$tooltip;
-  var _props$trigger = props.trigger,
-    trigger = _props$trigger === void 0 ? 'hover' : _props$trigger,
-    priorityDirection = props.priorityDirection,
-    children = props.children,
-    tip = props.tip,
-    disabledChild = props.disabledChild,
-    jssStyle = props.jssStyle,
-    className = props.className,
-    style = props.style,
-    zIndex = props.zIndex,
-    _props$type = props.type,
-    type = _props$type === void 0 ? 'default' : _props$type,
-    _props$position = props.position,
-    popsitionProps = _props$position === void 0 ? 'auto' : _props$position;
-  var arrowStyleRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({});
-  var tooltipClasses = jssStyle === null || jssStyle === void 0 || (_jssStyle$tooltip = jssStyle.tooltip) === null || _jssStyle$tooltip === void 0 ? void 0 : _jssStyle$tooltip.call(jssStyle);
-  var config = useConfig();
-  var childrenProps = /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.isValidElement)(children) ? children === null || children === void 0 ? void 0 : children.props : {};
-  var delay = props.delay || props.mouseEnterDelay || defaultDelay;
-  var _usePopup = use_popup({
-      position: popsitionProps,
-      trigger: trigger,
-      autoMode: 'popover',
-      priorityDirection: priorityDirection,
-      mouseEnterDelay: delay,
-      targetEvents: disabledChild ? {} : childrenProps
-    }),
-    open = _usePopup.open,
-    position = _usePopup.position,
-    getTargetProps = _usePopup.getTargetProps,
-    targetRef = _usePopup.targetRef,
-    popupRef = _usePopup.popupRef,
-    arrowRef = _usePopup.arrowRef;
-  if (! /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.isValidElement)(children)) {
-    console.error(new Error('Tooltip children expect a single ReactElement.'));
-    return null;
-  }
-  if (!tip) return children;
-  var inner = disabledChild ? /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
-    className: tooltipClasses === null || tooltipClasses === void 0 ? void 0 : tooltipClasses.target,
-    style: {
-      cursor: 'not-allowed'
-    },
-    children: /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.cloneElement)(children, {
-      style: objectSpread2_default()(objectSpread2_default()({}, childrenProps.style), {}, {
-        pointerEvents: 'none'
-      })
-    })
-  }) : children;
-  var events = getTargetProps();
-  return /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
-    children: [/*#__PURE__*/(0,jsx_runtime.jsx)("noscript", {
-      ref: function ref(el) {
-        if (!el) return;
-        var targetEl = el.nextElementSibling;
-        if (!targetEl) return;
-        if (targetRef.current === targetEl) return;
-        targetRef.current = targetEl;
-      }
-    }, 'ns'), /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.cloneElement)(inner, events), /*#__PURE__*/(0,jsx_runtime.jsx)(absolute_list, {
-      focus: open,
-      parentElRef: targetRef,
-      popupElRef: popupRef,
-      arrowRef: arrowRef,
-      absolute: true,
-      adjust: popsitionProps === 'auto',
-      position: position,
-      fixedWidth: false,
-      popupGap: 0
-      // arrowStyleRef={arrowStyleRef}
-      ,
-      zIndex: zIndex,
-      children: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", objectSpread2_default()(objectSpread2_default()({
-        className: classnames_default()(className, tooltipClasses === null || tooltipClasses === void 0 ? void 0 : tooltipClasses.wrapper, open && (tooltipClasses === null || tooltipClasses === void 0 ? void 0 : tooltipClasses.wrapperOpen))
-      }, getDataAttribute({
-        type: type,
-        position: position
-      })), {}, {
-        ref: popupRef,
-        onMouseLeave: events.onMouseLeave,
-        dir: config.direction,
-        children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", objectSpread2_default()({
-          ref: arrowRef,
-          style: arrowStyleRef.current,
-          className: tooltipClasses === null || tooltipClasses === void 0 ? void 0 : tooltipClasses.arrow
-        }, getDataAttribute({
-          role: 'arrow'
-        }))), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-          style: style,
-          className: classnames_default()(tooltipClasses === null || tooltipClasses === void 0 ? void 0 : tooltipClasses.content),
-          children: tip
-        })]
-      }))
-    })]
-  });
-};
-/* harmony default export */ var src_tooltip_tooltip = (Tooltip);
 ;// CONCATENATED MODULE: ./src/tooltip/tooltip.tsx
 
 
@@ -61487,7 +61629,7 @@ var TransferList = function TransferList(props) {
   var listClass = classnames_default()(styles.list, listClassName);
   var getLineHeight = function getLineHeight() {
     if (lineHeightProp) {
-      console.log('lineHeightProp', lineHeightProp);
+      // console.log('lineHeightProp', lineHeightProp);
       return lineHeightProp;
     }
     if (size === 'small') {
@@ -61629,6 +61771,8 @@ var TransferList = function TransferList(props) {
       jssStyle: jssStyle,
       loading: loading,
       size: 24,
+      name: "ring",
+      ignoreConfig: true,
       children: [onFilter && renderFilter(), renderList(), renderFooter()]
     })]
   });
@@ -63252,7 +63396,8 @@ var upload_result_Result = function Result(props) {
             children: [status === 1 && /*#__PURE__*/(0,jsx_runtime.jsx)(src_spin_spin, {
               jssStyle: props.jssStyle,
               size: 10,
-              name: 'ring'
+              name: 'ring',
+              ignoreConfig: true
             }), status === 2 && icons_config.upload.Success, status === 3 && icons_config.upload.Warning]
           }), status === 1 && props.process !== -1 && /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
             children: [Math.min(99, Math.floor(props.process || 0)), "%"]
@@ -63305,6 +63450,7 @@ var upload_result_Result = function Result(props) {
             size: 'null',
             jssStyle: props.jssStyle,
             name: 'ring',
+            ignoreConfig: true,
             className: uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.imageResultLoading
           }), (status === 2 || status === -1) && src && /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
             className: classnames_default()(uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.icon),
@@ -63752,7 +63898,9 @@ var UploadButton = function UploadButton(props) {
         children: /*#__PURE__*/(0,jsx_runtime.jsx)(src_spin_spin, {
           jssStyle: props.jssStyle,
           size: 10,
-          color: color
+          color: color,
+          ignoreConfig: true,
+          name: "ring"
         })
       }), typeof loading === 'string' ? loading : placeholder]
     });
@@ -66146,7 +66294,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.5.0-beta.8'
+  version: '3.5.0'
 });
 }();
 /******/ 	return __webpack_exports__;