shineout 3.5.3-beta.2 → 3.5.3-beta.4

package/cjs/hooks/use-field-common.js

@@ -16,8 +16,6 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 var useFieldCommon = function useFieldCommon(props, Origin, type) {
-  var _props$reserveAble;
-  var formConfig = (0, _hooks.useFormConfig)();
   var getValidateProps = (0, _hooks.usePersistFn)(function () {
     return _objectSpread({
       type: type
@@ -32,8 +30,7 @@ var useFieldCommon = function useFieldCommon(props, Origin, type) {
   var FieldParams = {
     name: props.name,
     defaultValue: props.defaultValue,
-    reserveAble: (_props$reserveAble = props.reserveAble) !== null && _props$reserveAble !== void 0 ? _props$reserveAble : formConfig.reserveAble,
-    formName: formConfig.formName,
+    reserveAble: props.reserveAble,
     rules: props.rules,
     onError: props.onError,
     bind: props.bind,

package/cjs/index.js

@@ -500,5 +500,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.5.3-beta.2'
+  version: '3.5.3-beta.4'
 };

package/cjs/tabs/tabs-panel.type.d.ts

@@ -3,4 +3,4 @@ import { TabsPanelProps as UnStyleTabsPanelProps } from '@sheinx/base';
  * @title Tabs.Panel
  * @sort 2
  */
-export type TabsPanelProps = Omit<UnStyleTabsPanelProps, 'jssStyle' | 'active' | 'shape' | 'isVertical' | 'lazy' | 'inactiveBackground' | 'onChange' | 'onCollapsible'>;
+export type TabsPanelProps = Omit<UnStyleTabsPanelProps, 'jssStyle' | 'active' | 'shape' | 'isVertical' | 'lazy' | 'inactiveBackground' | 'onChange' | 'onCollapsible' | 'setTabs' | 'tabs'>;

package/dist/shineout.js

@@ -12030,7 +12030,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.3-beta.2');
+/* harmony default export */ var version = ('3.5.3-beta.4');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -30223,6 +30223,7 @@ var src_config_config = {
   delay: 400,
   trim: undefined,
   spin: 'ring',
+  tooltip: undefined,
   direction: 'ltr',
   popupContainer: null
 };
@@ -34522,17 +34523,13 @@ var useFormConfig = function useFormConfig() {
 
 
 var useWithFormConfig = function useWithFormConfig(props) {
-  var _reserveAble;
   var formConfig = useFormConfig();
   var size = (props === null || props === void 0 ? void 0 : props.size) || formConfig.size;
   var disabled = formConfig.disabled || (props === null || props === void 0 ? void 0 : props.disabled);
-  var reserveAble = (_reserveAble = props === null || props === void 0 ? void 0 : props.reserveAble) !== null && _reserveAble !== void 0 ? _reserveAble : formConfig.reserveAble;
-  return objectSpread2_default()(objectSpread2_default()(objectSpread2_default()(objectSpread2_default()(objectSpread2_default()({}, props), size !== undefined && {
+  return objectSpread2_default()(objectSpread2_default()(objectSpread2_default()(objectSpread2_default()({}, props), size !== undefined && {
     size: size
   }), disabled !== undefined && {
     disabled: disabled
-  }), reserveAble !== undefined && {
-    reserveAble: reserveAble
   }), formConfig.formName !== undefined && {
     formName: formConfig.formName
   });
@@ -34703,8 +34700,7 @@ var input_Input = function Input(props) {
     integerLimit: commonProps.integerLimit,
     numType: commonProps.numType,
     trim: (_ref = (_commonProps$trim = commonProps.trim) !== null && _commonProps$trim !== void 0 ? _commonProps$trim : config.trim) !== null && _ref !== void 0 ? _ref : false,
-    // 移除 reserveAble 和 formName，避免渲染到原生 input 上
-    reserveAble: undefined,
+    // 移除 formName，避免渲染到原生 input 上
     formName: undefined
   };
   var inputFormatProps = use_input_format(objectSpread2_default()({
@@ -40453,6 +40449,7 @@ function useFormControl(props) {
 var FormField = function FormField(props) {
   var _childrenProps$error, _childrenProps$status;
   var children = props.children;
+  var formConfig = useFormConfig();
   var getValidateProps = usePersistFn(function () {
     if (props.getValidateProps) return props.getValidateProps();
     return props;
@@ -40485,15 +40482,15 @@ var FormField = function FormField(props) {
   var _useContext = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useContext)(FormFieldContext),
     separator = _useContext.separator;
   var formFieldId = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
-    if (!props.formName) return;
+    if (!formConfig.formName) return;
     if (childrenProps.id) return childrenProps.id;
     if (Array.isArray(formControl.name)) {
       return formControl.name.map(function (name) {
-        return getFieldId(name, props.formName);
+        return getFieldId(name, formConfig.formName);
       }).join(separator);
     }
-    return getFieldId(formControl.name, props.formName);
-  }, [formControl.name, props.formName, childrenProps.id]);
+    return getFieldId(formControl.name, formConfig.formName);
+  }, [formControl.name, formConfig.formName, childrenProps.id]);
   var cloneProps = {
     onChange: handleChange,
     status: status,
@@ -40529,8 +40526,6 @@ var FormField = function FormField(props) {
 
 
 var useFieldCommon = function useFieldCommon(props, Origin, type) {
-  var _props$reserveAble;
-  var formConfig = useFormConfig();
   var getValidateProps = usePersistFn(function () {
     return objectSpread2_default()({
       type: type
@@ -40545,8 +40540,7 @@ var useFieldCommon = function useFieldCommon(props, Origin, type) {
   var FieldParams = {
     name: props.name,
     defaultValue: props.defaultValue,
-    reserveAble: (_props$reserveAble = props.reserveAble) !== null && _props$reserveAble !== void 0 ? _props$reserveAble : formConfig.reserveAble,
-    formName: formConfig.formName,
+    reserveAble: props.reserveAble,
     rules: props.rules,
     onError: props.onError,
     bind: props.bind,
@@ -47487,7 +47481,6 @@ var useForm = function useForm(props) {
     throttle = _props$throttle === void 0 ? 1000 : _props$throttle,
     size = props.size,
     formName = props.name,
-    reserveAble = props.reserveAble,
     scrollParent = props.scrollParent;
   var deepSetOptions = {
     removeUndefined: removeUndefined,
@@ -47883,6 +47876,7 @@ var useForm = function useForm(props) {
       }
     },
     unbind: function unbind(n, reserveAble, validateField, update) {
+      var _props$reserveAble;
       var validateFieldSet = context.validateMap[n];
       if (validateField && validateFieldSet.has(validateField)) {
         validateFieldSet.delete(validateField);
@@ -47895,7 +47889,8 @@ var useForm = function useForm(props) {
         context.names.delete(n);
         delete context.defaultValues[n];
       }
-      if (!reserveAble && !context.removeLock) {
+      var finalReserveAble = (_props$reserveAble = props.reserveAble) !== null && _props$reserveAble !== void 0 ? _props$reserveAble : reserveAble;
+      if (!finalReserveAble && !context.removeLock) {
         addRemove(n);
       }
     },
@@ -47958,10 +47953,9 @@ var useForm = function useForm(props) {
       inline: inline,
       disabled: disabled,
       size: size,
-      reserveAble: reserveAble,
       formName: formName
     };
-  }, [labelWidth, labelAlign, labelVerticalAlign, keepErrorHeight, inline, disabled, size, reserveAble, formName]);
+  }, [labelWidth, labelAlign, labelVerticalAlign, keepErrorHeight, inline, disabled, size, formName]);
   var updateValue = function updateValue() {
     if (props.value !== context.lastValue && props.value !== context.value) {
       context.value = deepClone(props.value) || emptyObj;
@@ -48214,7 +48208,7 @@ var UseFormItem = function UseFormItem() {
 var tooltip_devUseWarning = devUseWarning;
 var defaultDelay = 0;
 var Tooltip = function Tooltip(props) {
-  var _jssStyle$tooltip;
+  var _jssStyle$tooltip, _config$tooltip$persi, _config$tooltip;
   var _props$trigger = props.trigger,
     trigger = _props$trigger === void 0 ? 'hover' : _props$trigger,
     priorityDirection = props.priorityDirection,
@@ -48225,13 +48219,14 @@ var Tooltip = function Tooltip(props) {
     className = props.className,
     style = props.style,
     zIndex = props.zIndex,
-    persistent = props.persistent,
+    persistentProp = props.persistent,
     _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 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 persistent = (_config$tooltip$persi = (_config$tooltip = config.tooltip) === null || _config$tooltip === void 0 ? void 0 : _config$tooltip.persistent) !== null && _config$tooltip$persi !== void 0 ? _config$tooltip$persi : persistentProp;
   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({
@@ -48512,7 +48507,8 @@ var FormFieldSet = function FormFieldSet(props) {
   var children = props.children,
     empty = props.empty;
   var _React$useRef = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useRef({
-      ids: []
+      ids: [],
+      lastValues: []
     }),
     context = _React$useRef.current;
   var formFunc = useFormFunc();
@@ -48566,8 +48562,11 @@ var FormFieldSet = function FormFieldSet(props) {
       return generateUUID();
     });
   }
-  var ids = context.ids || [];
   valueArr.forEach(function (v, i) {
+    var _context$ids$i;
+    if (context.lastValues[i] !== v) {
+      context.ids[i] = generateUUID();
+    }
     result.push( /*#__PURE__*/(0,jsx_runtime.jsx)(Provider, {
       value: {
         path: "".concat(ProviderValue.path, "[").concat(i, "]"),
@@ -48614,10 +48613,13 @@ var FormFieldSet = function FormFieldSet(props) {
           formFunc === null || formFunc === void 0 || formFunc.spliceError(name, i);
         }
       })
-    }, ids[i]));
+    }, (_context$ids$i = context.ids[i]) !== null && _context$ids$i !== void 0 ? _context$ids$i : i));
   });
+
+  // 更新 lastValues
+  context.lastValues = valueArr;
   return /*#__PURE__*/(0,jsx_runtime.jsx)(jsx_runtime.Fragment, {
-    children: result
+    children: "result"
   });
 };
 /* harmony default export */ var form_fieldset = (FormFieldSet);
@@ -58575,6 +58577,24 @@ var useTableTree = function useTableTree(props) {
 
 
 
+
+// 找出最大的连续数字的个数
+function getMaxRowSpanLength(input) {
+  var map = new Map();
+  var _iterator = createForOfIteratorHelper_default()(input),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var num = _step.value;
+      map.set(num, (map.get(num) || 0) + 1);
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return Math.max.apply(Math, toConsumableArray_default()(Array.from(map.values())));
+}
 var MAX_ROW_SPAN = 200;
 var useTableVirtual = function useTableVirtual(props) {
   var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(0),
@@ -58599,11 +58619,11 @@ var useTableVirtual = function useTableVirtual(props) {
     setOffsetY = _useState10[1];
   var rowsInView = props.rowsInView === 0 ? props.data.length : props.rowsInView;
   var sleft = props.scrollLeft !== undefined ? props.scrollLeft : innerLeft;
-  var rowSpanInfos = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
+  var rowSpanInfo = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
     var rowSpanColumns = props.columns.filter(function (col) {
       return typeof col.rowSpan === 'function';
     });
-    if (rowSpanColumns.length === 0) return;
+    if (rowSpanColumns.length === 0) return null;
     var _rowSpanInfos = [];
     var totalLength = props.data.length;
     var _loop = function _loop(i) {
@@ -58644,12 +58664,17 @@ var useTableVirtual = function useTableVirtual(props) {
         }
       }
     }
-    return _rowSpanInfos.map(function (_rowSpanInfo) {
+    var resultArr = _rowSpanInfos.map(function (_rowSpanInfo) {
       var startIndexs = _rowSpanInfo.map(function (arr) {
         return arr[0];
       });
       return Math.min.apply(Math, toConsumableArray_default()(startIndexs));
     });
+    var maxRowSpan = getMaxRowSpanLength(resultArr);
+    return maxRowSpan > 1 ? {
+      rowSpanIndexArray: resultArr,
+      maxRowSpan: maxRowSpan
+    } : null;
   }, [props.data, props.columns]);
   var _useRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({
       cachedHeight: [],
@@ -58710,15 +58735,20 @@ var useTableVirtual = function useTableVirtual(props) {
     var currentIndex = 0;
     var top = 0;
     var maxIndex = Math.max(props.data.length - rowsInView, 0);
+    var maxRowSpanLenth = 0;
+    if (rowSpanInfo) {
+      maxRowSpanLenth = Math.min(rowSpanInfo.rowSpanIndexArray.length,
+      // 根据data计算出实际需要的最大合并行数（rowSpanInfo.maxRowSpan），当rowSpanInfo.maxRowSpan大于外部传的rowsInView时，使用rowSpanInfo.maxRowSpan
+      Math.max(rowSpanInfo.maxRowSpan, props.rowsInView > MAX_ROW_SPAN ? props.rowsInView : props.rowsInView || MAX_ROW_SPAN));
+    }
     for (var i = 0; i <= maxIndex; i++) {
       context.rowSpanRows = 0;
       sum += context.cachedHeight[i] || props.rowHeight;
       var rowSpanHeight = 0;
-      if (rowSpanInfos) {
-        var maxRowSpanLenth = Math.min(rowSpanInfos.length, props.rowsInView > MAX_ROW_SPAN ? props.rowsInView : props.rowsInView || MAX_ROW_SPAN);
+      if (rowSpanInfo) {
         var siblingsIndexs = [];
-        for (var k = 0; k < maxRowSpanLenth; k++) {
-          if (rowSpanInfos[k] <= i && k > i) {
+        for (var k = i; k < maxRowSpanLenth + i; k++) {
+          if (rowSpanInfo.rowSpanIndexArray[k] <= i && k > i) {
             siblingsIndexs.push(k);
           }
         }
@@ -59874,29 +59904,23 @@ var Tr = function Tr(props) {
       });
     }
     if (col.type === 'checkbox') {
-      if (props.radio) {
-        return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-          className: tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.iconWrapper,
-          children: /*#__PURE__*/(0,jsx_runtime.jsx)(base_src_radio_radio, {
-            jssStyle: props.jssStyle,
-            style: {
-              margin: 0
-            },
-            checked: props.isSelect,
-            disabled: props.disabled,
-            onChange: function onChange(value) {
-              if (value) {
-                props.datum.add(data);
-              } else {
-                props.datum.remove(data);
-              }
-            }
-          })
-        });
-      }
-      return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+      var instance = /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
         className: tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.iconWrapper,
-        children: /*#__PURE__*/(0,jsx_runtime.jsx)(base_src_checkbox_checkbox, {
+        children: props.radio ? /*#__PURE__*/(0,jsx_runtime.jsx)(base_src_radio_radio, {
+          jssStyle: props.jssStyle,
+          style: {
+            margin: 0
+          },
+          checked: props.isSelect,
+          disabled: props.disabled,
+          onChange: function onChange(value) {
+            if (value) {
+              props.datum.add(data);
+            } else {
+              props.datum.remove(data);
+            }
+          }
+        }) : /*#__PURE__*/(0,jsx_runtime.jsx)(base_src_checkbox_checkbox, {
           jssStyle: props.jssStyle,
           disabled: props.disabled,
           style: {
@@ -59916,6 +59940,7 @@ var Tr = function Tr(props) {
           }
         })
       });
+      return typeof col.render === 'function' ? col.render(props.rawData, props.rowIndex, instance) : instance;
     }
     var content = render_render(col.render, data, props.rowIndex);
     if (col.treeColumnsName) {
@@ -60884,24 +60909,24 @@ var TabsPanel = function TabsPanel(props) {
   var isActive = active === id;
   var keekAlive = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(false);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useLayoutEffect)(function () {
+    var tabData = {
+      id: id,
+      tab: tab,
+      disabled: props.disabled,
+      jssStyle: jssStyle,
+      color: props.color || (active === id ? color : undefined)
+    };
     setTabs(function (prev) {
       var prevTab = prev.find(function (item) {
         return item.id === id;
       });
       if (prevTab) {
         return prev.map(function (item) {
-          return item.id === id ? objectSpread2_default()(objectSpread2_default()({}, item), {}, {
-            tab: tab
-          }) : item;
+          if (item.id !== id) return item;
+          return objectSpread2_default()(objectSpread2_default()({}, item), tabData);
         });
       }
-      return [].concat(toConsumableArray_default()(prev), [{
-        id: id,
-        tab: tab,
-        disabled: props.disabled,
-        jssStyle: jssStyle,
-        color: props.color || (active === id ? color : undefined)
-      }]);
+      return [].concat(toConsumableArray_default()(prev), [tabData]);
     });
   }, [id, tab, color].concat(toConsumableArray_default()(color ? [active] : []), [props.disabled, props.jssStyle]));
   if (!isActive && lazy && !keekAlive.current) {
@@ -66934,7 +66959,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.5.3-beta.2'
+  version: '3.5.3-beta.4'
 });
 }();
 /******/ 	return __webpack_exports__;