shineout 3.8.0-beta.16 → 3.8.0-beta.17

package/cjs/index.js

@@ -522,5 +522,5 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // 此文件由脚本自动生成，请勿直接修改。
 // This file was generated automatically by a script. Please do not modify it directly.
 var _default = exports.default = {
-  version: '3.8.0-beta.16'
+  version: '3.8.0-beta.17'
 };

package/dist/shineout.js

@@ -12234,7 +12234,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.8.0-beta.16');
+/* harmony default export */ var version = ('3.8.0-beta.17');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -22820,7 +22820,7 @@ var popoverStyle = objectSpread2_default()(objectSpread2_default()({}, tooltipAn
     borderRadius: src.popoverRadius,
     border: "1px solid ".concat(src.popoverBorderColor),
     wordWrap: 'break-word',
-    '& $arrow': {
+    '& > $arrow': {
       'z-index': 1,
       position: 'absolute',
       content: '" "',
@@ -22841,7 +22841,7 @@ var popoverStyle = objectSpread2_default()(objectSpread2_default()({}, tooltipAn
     '&$hideArrow': defineProperty_default()({}, popover_cssvar, '4px'),
     '&[data-soui-position^="bottom"]': {
       marginTop: "calc(".concat(hideArrowGap, " - 2px)"),
-      '& $arrow': {
+      '& > $arrow': {
         top: '0',
         transform: 'translate(0, -50%) rotate(-45deg)',
         left: '0',
@@ -22861,7 +22861,7 @@ var popoverStyle = objectSpread2_default()(objectSpread2_default()({}, tooltipAn
     '&[data-soui-position^="top"]': {
       // marginTop: (arrowGap - 2) * -1,
       marginTop: "calc((".concat(hideArrowGap, " - 2px) * -1)"),
-      '& $arrow': {
+      '& > $arrow': {
         bottom: '0',
         transform: 'translate(0, 50%) rotate(135deg)',
         left: '0',
@@ -22887,7 +22887,7 @@ var popoverStyle = objectSpread2_default()(objectSpread2_default()({}, tooltipAn
       '&[dir=rtl]': {
         marginLeft: "calc((".concat(hideArrowGap, " - 2px))")
       },
-      '& $arrow': {
+      '& > $arrow': {
         right: src.popoverBorderWidth,
         transform: 'translate(50%, 0) rotate(45deg)',
         top: '0',
@@ -22911,7 +22911,7 @@ var popoverStyle = objectSpread2_default()(objectSpread2_default()({}, tooltipAn
       '&[dir=rtl]': {
         marginRight: "calc(".concat(hideArrowGap, " - 2px)")
       },
-      '& $arrow': {
+      '& > $arrow': {
         left: '0',
         transform: 'translate(-50%, 0) rotate(-135deg)',
         top: '0',
@@ -22930,19 +22930,19 @@ var popoverStyle = objectSpread2_default()(objectSpread2_default()({}, tooltipAn
         position: 'absolute'
       }
     },
-    '&&[data-soui-position$="-left"] $arrow': {
+    '&&[data-soui-position$="-left"] > $arrow': {
       left: arrowMargin,
       right: 'auto'
     },
-    '&&[data-soui-position$="-right"] $arrow': {
+    '&&[data-soui-position$="-right"] > $arrow': {
       right: arrowMargin,
       left: 'auto'
     },
-    '&&[data-soui-position$="-top"] $arrow': {
+    '&&[data-soui-position$="-top"] > $arrow': {
       top: arrowMargin,
       bottom: 'auto'
     },
-    '&&[data-soui-position$="-bottom"] $arrow': {
+    '&&[data-soui-position$="-bottom"] > $arrow': {
       bottom: arrowMargin,
       top: 'auto'
     },
@@ -35694,6 +35694,26 @@ var getCompleteFieldKeys = function getCompleteFieldKeys(fields, allFields) {
   // 返回之前去重
   return Array.from(new Set(completeFields));
 };
+
+/**
+ * 将对象中的所有值设置为空, 如果值是数组，重置为空数组，如果是对象，重置为空对象，如果是基础类型，重置为undefined
+ * @param obj 对象
+ * @returns 空对象
+ */
+var clearValue = function clearValue(obj) {
+  if (isArray(obj)) {
+    return obj.map(function (item) {
+      return clearValue(item);
+    });
+  }
+  if (is_isObject(obj)) {
+    return Object.keys(obj).reduce(function (acc, key) {
+      acc[key] = clearValue(obj[key]);
+      return acc;
+    }, {});
+  }
+  return undefined;
+};
 ;// CONCATENATED MODULE: ../hooks/src/components/use-check/use-check.ts
 
 
@@ -36085,7 +36105,10 @@ var useInput = function useInput(params) {
       (_otherHandlers$onFocu = otherHandlers.onFocus) === null || _otherHandlers$onFocu === void 0 || _otherHandlers$onFocu.call(otherHandlers, event);
       setFocused(true);
       if (autoSelect) {
-        event.target.select();
+        // why requestAnimationFrame: 当在文字身体上hover后立即点击，select()与浏览器的光标定位逻辑产生竞争，有可能导致只选中的部分文本，所以需要延迟一下
+        requestAnimationFrame(function () {
+          event.target.select();
+        });
       }
     };
   };
@@ -36641,6 +36664,7 @@ function escapeRegExp() {
   search: '搜索',
   urlInvalidMsg: '图片格式不正确，请重新上传',
   invalidAccept: '文件格式不正确',
+  invalidImage: '图片格式不正确',
   notFound: '未找到'
 });
 ;// CONCATENATED MODULE: ../base/src/config/locale/en_US.ts
@@ -36706,6 +36730,7 @@ function escapeRegExp() {
   search: 'search',
   urlInvalidMsg: 'Picture format is incorrect, please upload again',
   invalidAccept: 'Invalid file format',
+  invalidImage: 'Invalid image format',
   notFound: 'not found'
 });
 ;// CONCATENATED MODULE: ../base/src/config/locale/index.ts
@@ -41509,7 +41534,7 @@ function getResetMore(onFilter, container, doms) {
   var paddingLeft = parsePxToNumber(style.paddingLeft);
   var paddingRight = parsePxToNumber(style.paddingRight);
   var minFilterWidth = onFilter ? 16 : 0;
-  var contentWidth = clientWidth - paddingLeft - paddingRight - minFilterWidth - 1;
+  var contentWidth = clientWidth - paddingLeft - paddingRight - minFilterWidth;
   var hideEl = items.pop();
   var hideElStyle = getComputedStyle(hideEl);
   var hideMargin = parsePxToNumber(hideElStyle.marginLeft) + parsePxToNumber(hideElStyle.marginRight);
@@ -46508,6 +46533,7 @@ var Time = function Time(props) {
       })]
     });
   };
+  var shouldRenderTimes = times && times.length > 0;
   return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
     onMouseEnter: props.onMouseEnter,
     onMouseLeave: props.onMouseLeave,
@@ -46516,7 +46542,7 @@ var Time = function Time(props) {
     children: [props.showTitle && /*#__PURE__*/(0,jsx_runtime.jsx)(pickerTitle, {
       position: props.position,
       jssStyle: props.jssStyle
-    }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+    }), shouldRenderTimes && /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
       className: styles === null || styles === void 0 ? void 0 : styles.pickerBody,
       children: times.map(function (item) {
         return /*#__PURE__*/(0,jsx_runtime.jsx)(TimeScroll, {
@@ -50989,7 +51015,7 @@ var useForm = function useForm(props) {
     var _props$onChange;
     var newValue = typeof change === 'function' ? utils_immer_produce(context.value, change) : change;
     context.value = newValue;
-    (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, context.value);
+    (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, deepClone(context.value));
   });
   var scrollToField = use_persist_fn(function (name) {
     var _document;
@@ -51373,11 +51399,6 @@ var useForm = function useForm(props) {
   // 默认值更新
   external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect(function () {
     context.removeLock = false;
-    // 内部 onChange 改的 value, 不需要更新
-    if (props.value === context.value) {
-      if (!isControl) update();
-      return;
-    }
     if (initValidate && !context.resetTime) {
       var keys = Object.keys(context.validateMap).filter(function (key) {
         var oldValue = deepGet(preValue || emptyObj, key);
@@ -51387,6 +51408,7 @@ var useForm = function useForm(props) {
       validateFields(keys).catch(function () {});
     }
     update();
+    if (!isControl) return;
     // 默认值上位时会提前触发外部的onChange, 导致外部的多次setFormValue不能合并后生效的问题(ReactDOM.render方式渲染)
     setTimeout(updateDefaultValue);
     context.resetTime = 0;
@@ -51892,8 +51914,13 @@ var FormFieldSet = function FormFieldSet(props) {
         },
         onInsert: function onInsert(val) {
           var oldValue = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name);
+          var insertValue = val;
+          var valueTemplate = oldValue[i];
+          if (insertValue === undefined) {
+            insertValue = clearValue(deepClone(valueTemplate));
+          }
           var newValue = form_fieldset_produce(oldValue, function (draft) {
-            draft.splice(i, 0, val);
+            draft.splice(i, 0, insertValue);
           });
           _onChange(newValue);
           // context.ids.splice(i, 0, util.generateUUID());
@@ -51901,8 +51928,13 @@ var FormFieldSet = function FormFieldSet(props) {
         },
         onAppend: function onAppend(val) {
           var oldValue = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name);
+          var insertValue = val;
+          var valueTemplate = oldValue[i];
+          if (insertValue === undefined) {
+            insertValue = clearValue(deepClone(valueTemplate));
+          }
           var newValue = form_fieldset_produce(oldValue, function (draft) {
-            draft.splice(i + 1, 0, val);
+            draft.splice(i + 1, 0, insertValue);
           });
           _onChange(newValue);
           // context.ids.splice(i + 1, 0, util.generateUUID());
@@ -62032,7 +62064,8 @@ var scroll_table_Scroll = function Scroll(props) {
   var wrapperRef = useForkRef(scrollRef, props.wrapperRef);
   var _useRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({
       isMouseDown: false,
-      lastTableHeight: 0
+      lastTableHeight: 0,
+      unmounted: false
     }),
     context = _useRef.current;
   var _props$scrollHeight = props.scrollHeight,
@@ -62141,7 +62174,7 @@ var scroll_table_Scroll = function Scroll(props) {
 
   // 非定高的Table但依旧采用了virtual渲染方式，需要渲染出全部的data
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useLayoutEffect)(function () {
-    if (!props.tableRef.current) return;
+    if (!props.tableRef.current || context.unmounted) return;
     var rootTableHeight = props.tableRef.current.clientHeight;
     var container = containerRef.current;
     // 判断内容滚动高度是否真的超过了容器高度
@@ -62153,6 +62186,9 @@ var scroll_table_Scroll = function Scroll(props) {
     } else {
       context.lastTableHeight = rootTableHeight;
     }
+    return function () {
+      context.unmounted = true;
+    };
   }, [paddingTop]);
   if (props.isEmpty) {
     return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", objectSpread2_default()(objectSpread2_default()({}, scrollRoleProps), {}, {
@@ -63039,7 +63075,7 @@ var useTableVirtual = function useTableVirtual(props) {
     for (var i = 0; i <= index; i++) {
       sum += context.cachedHeight[i] || props.rowHeight;
     }
-    return sum + props.theadAndTfootHeight;
+    return sum + props.theadHeight + props.tfootHeight;
   };
   var setRowHeight = usePersistFn(function (index, height) {
     if (props.disabled) return;
@@ -63182,7 +63218,7 @@ var useTableVirtual = function useTableVirtual(props) {
           callback();
         }
       };
-      props.scrollRef.current.scrollTop = beforeHeight;
+      props.scrollRef.current.scrollTop = beforeHeight - props.theadHeight;
     }
   });
   var scrollColumnByLeft = usePersistFn(function (targetLeft) {
@@ -63259,7 +63295,7 @@ var useTableVirtual = function useTableVirtual(props) {
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     if (props.disabled) return;
     setHeight(getContentHeight(props.data.length - 1));
-  }, [props.data.length, props.theadAndTfootHeight]);
+  }, [props.data.length, props.theadHeight, props.tfootHeight]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     if (props.disabled) return;
     if (context.heightCallback) {
@@ -65061,7 +65097,8 @@ var emptyRef = {
   };
   var _useRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({
       emptyHeight: 0,
-      theadAndTfootHeight: 0,
+      theadHeight: 0,
+      tfootHeight: 0,
       scrollingTimer: null
     }),
     context = _useRef.current;
@@ -65194,15 +65231,38 @@ var emptyRef = {
     onChange: inputableData.onChange,
     disabled: props.disabled
   });
-  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
+  var handleTheadAndTfootHeight = usePersistFn(function () {
     var _theadRef$current, _tfootRef$current;
     var theadHeight = (theadRef === null || theadRef === void 0 || (_theadRef$current = theadRef.current) === null || _theadRef$current === void 0 ? void 0 : _theadRef$current.clientHeight) || 0;
     var tfootHeight = ((_tfootRef$current = tfootRef.current) === null || _tfootRef$current === void 0 ? void 0 : _tfootRef$current.clientHeight) || 0;
     if (props.sticky) {
-      context.theadAndTfootHeight = tfootHeight;
+      context.tfootHeight = tfootHeight;
     } else {
-      context.theadAndTfootHeight = theadHeight + tfootHeight;
+      context.theadHeight = theadHeight;
+      context.tfootHeight = tfootHeight;
+    }
+  });
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
+    handleTheadAndTfootHeight();
+    var cancelFunc1;
+    if (theadRef !== null && theadRef !== void 0 && theadRef.current) {
+      cancelFunc1 = addResizeObserver(theadRef === null || theadRef === void 0 ? void 0 : theadRef.current, handleTheadAndTfootHeight, {
+        direction: 'y',
+        timer: 10
+      });
+    }
+    var cancelFunc2;
+    if (tfootRef !== null && tfootRef !== void 0 && tfootRef.current) {
+      cancelFunc2 = addResizeObserver(tfootRef === null || tfootRef === void 0 ? void 0 : tfootRef.current, handleTheadAndTfootHeight, {
+        direction: 'y',
+        timer: 10
+      });
     }
+    return function () {
+      var _cancelFunc, _cancelFunc2;
+      (_cancelFunc = cancelFunc1) === null || _cancelFunc === void 0 || _cancelFunc();
+      (_cancelFunc2 = cancelFunc2) === null || _cancelFunc2 === void 0 || _cancelFunc2();
+    };
   }, [theadRef.current, tfootRef.current]);
   var virtualInfo = use_table_virtual({
     disabled: !virtual,
@@ -65215,7 +65275,8 @@ var emptyRef = {
     innerRef: tbodyRef,
     scrollLeft: props.scrollLeft,
     isRtl: isRtl,
-    theadAndTfootHeight: context.theadAndTfootHeight
+    theadHeight: context.theadHeight,
+    tfootHeight: context.tfootHeight
   });
   var syncHeaderScroll = usePersistFn(function (left) {
     var _tableRef$current;
@@ -66202,36 +66263,43 @@ var TabsHeader = function TabsHeader(props) {
     _useState2 = slicedToArray_default()(_useState, 2),
     currentTabOffset = _useState2[0],
     setCurrentTabOffset = _useState2[1];
-  var _useState3 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(null),
+  var _useState3 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)({
+      width: 0,
+      height: 0
+    }),
     _useState4 = slicedToArray_default()(_useState3, 2),
-    currentTabRect = _useState4[0],
-    setCurrentTabRect = _useState4[1];
+    currentTabSize = _useState4[0],
+    setCurrentTabSize = _useState4[1];
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useLayoutEffect)(function () {
-    var _currentTab$getBoundi;
     if (shape !== 'line' && shape !== 'dash') return;
     var currentTab = tabRef.current[active];
     setCurrentTabOffset({
       offsetTop: (currentTab === null || currentTab === void 0 ? void 0 : currentTab.offsetTop) || 0,
       offsetLeft: (currentTab === null || currentTab === void 0 ? void 0 : currentTab.offsetLeft) || 0
     });
-    var currentTabRect = currentTab === null || currentTab === void 0 || (_currentTab$getBoundi = currentTab.getBoundingClientRect) === null || _currentTab$getBoundi === void 0 ? void 0 : _currentTab$getBoundi.call(currentTab);
-    setCurrentTabRect(currentTabRect);
+
+    // 使用 offsetWidth/offsetHeight 而不是 getBoundingClientRect()
+    // 这样可以避免受到外部容器 CSS transform scale 的影响
+    setCurrentTabSize({
+      width: (currentTab === null || currentTab === void 0 ? void 0 : currentTab.offsetWidth) || 0,
+      height: (currentTab === null || currentTab === void 0 ? void 0 : currentTab.offsetHeight) || 0
+    });
   }, [active, tabs]);
   var renderHeaderScrollBar = function renderHeaderScrollBar() {
     if (shape !== 'line' && shape !== 'dash') return;
-    if (!currentTabRect) return;
+    if (!currentTabSize.width || !currentTabSize.height) return;
     var scrollBarStyle = isVertical ? {
       right: getPosition !== null && getPosition !== void 0 && getPosition.startsWith('left') ? 0 : 'auto',
       left: getPosition !== null && getPosition !== void 0 && getPosition.startsWith('right') ? 0 : 'auto',
-      top: currentTabOffset.offsetTop + currentTabRect.height / 2,
-      height: shape === 'line' ? currentTabRect.height : 24,
+      top: currentTabOffset.offsetTop + currentTabSize.height / 2,
+      height: shape === 'line' ? currentTabSize.height : 24,
       width: 2,
       transform: 'translateY(-50%)'
     } : {
       bottom: getPosition !== null && getPosition !== void 0 && getPosition.startsWith('top') ? 0 : 'auto',
       top: getPosition !== null && getPosition !== void 0 && getPosition.startsWith('bottom') ? 0 : 'auto',
-      left: currentTabOffset.offsetLeft + currentTabRect.width / 2,
-      width: shape === 'line' ? currentTabRect.width : 24,
+      left: currentTabOffset.offsetLeft + currentTabSize.width / 2,
+      width: shape === 'line' ? currentTabSize.width : 24,
       height: 2,
       transform: 'translateX(-50%)'
     };
@@ -69218,6 +69286,10 @@ var useInputClick = function useInputClick() {
     type: 'file',
     style: {
       display: 'none'
+    },
+    onClick: function onClick(event) {
+      // 阻止程序化触发(inputRef.current.click())的input点击事件冒泡
+      event.stopPropagation();
     }
   };
   var wrapperProps = {
@@ -72091,7 +72163,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.8.0-beta.16'
+  version: '3.8.0-beta.17'
 });
 }();
 /******/ 	return __webpack_exports__;