shineout 3.5.0-beta.6 → 3.5.0-beta.7

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

@@ -16,6 +16,8 @@ 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
@@ -30,7 +32,7 @@ var useFieldCommon = function useFieldCommon(props, Origin, type) {
   var FieldParams = {
     name: props.name,
     defaultValue: props.defaultValue,
-    reserveAble: props.reserveAble,
+    reserveAble: (_props$reserveAble = props.reserveAble) !== null && _props$reserveAble !== void 0 ? _props$reserveAble : formConfig.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.0-beta.6'
+  version: '3.5.0-beta.7'
 };

package/dist/shineout.js

@@ -11993,7 +11993,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.6');
+/* harmony default export */ var version = ('3.5.0-beta.7');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -24897,19 +24897,19 @@ var tableStyle = objectSpread2_default()(objectSpread2_default()({}, globalStyle
     flexGrow: 1,
     minHeight: '0',
     '$wrapper & table': {
-      '& th, & td': {
-        position: 'sticky',
-        top: 0
-      },
       '& th': {
         zIndex: fixedFixedIndex + 1,
         '&$cellFixedLeft': {
+          position: 'sticky',
+          top: 'auto',
           zIndex: fixedFixedIndex + 2
         }
       },
       '& td': {
         zIndex: fixedIndex,
         '&$cellFixedLeft': {
+          position: 'sticky',
+          top: 'auto',
           zIndex: fixedIndex + 1
         }
       }
@@ -25008,7 +25008,8 @@ var tableStyle = objectSpread2_default()(objectSpread2_default()({}, globalStyle
       },
       '& td': {
         '&$cellFixedLeft': {
-          zIndex: fixedFixedIndex
+          zIndex: fixedFixedIndex,
+          top: 'auto'
         }
       }
     }
@@ -25039,7 +25040,8 @@ var tableStyle = objectSpread2_default()(objectSpread2_default()({}, globalStyle
       },
       '& td': {
         '&$cellFixedRight': {
-          zIndex: fixedFixedIndex
+          zIndex: fixedFixedIndex,
+          top: 'auto'
         }
       }
     }
@@ -34233,12 +34235,15 @@ 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()({}, props), {}, {
     size: size,
-    disabled: disabled
+    disabled: disabled,
+    reserveAble: reserveAble
   });
 };
 /* harmony default export */ var use_with_form_config = (useWithFormConfig);
@@ -40052,6 +40057,8 @@ 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
@@ -40066,7 +40073,7 @@ var useFieldCommon = function useFieldCommon(props, Origin, type) {
   var FieldParams = {
     name: props.name,
     defaultValue: props.defaultValue,
-    reserveAble: props.reserveAble,
+    reserveAble: (_props$reserveAble = props.reserveAble) !== null && _props$reserveAble !== void 0 ? _props$reserveAble : formConfig.reserveAble,
     rules: props.rules,
     onError: props.onError,
     bind: props.bind,
@@ -46933,6 +46940,7 @@ var useForm = function useForm(props) {
     _props$throttle = props.throttle,
     throttle = _props$throttle === void 0 ? 1000 : _props$throttle,
     size = props.size,
+    reserveAble = props.reserveAble,
     scrollParent = props.scrollParent;
   var deepSetOptions = {
     removeUndefined: removeUndefined,
@@ -47331,9 +47339,10 @@ var useForm = function useForm(props) {
       keepErrorHeight: keepErrorHeight,
       inline: inline,
       disabled: disabled,
-      size: size
+      size: size,
+      reserveAble: reserveAble
     };
-  }, [labelWidth, labelAlign, labelVerticalAlign, keepErrorHeight, inline, disabled, size]);
+  }, [labelWidth, labelAlign, labelVerticalAlign, keepErrorHeight, inline, disabled, size, reserveAble]);
   var updateValue = function updateValue() {
     if (props.value !== context.lastValue && props.value !== context.value) {
       context.value = deepClone(props.value) || emptyObj;
@@ -58993,13 +59002,13 @@ var Tr = function Tr(props) {
         var td = /*#__PURE__*/(0,jsx_runtime.jsx)("td", {
           colSpan: data[i].colSpan,
           rowSpan: data[i].rowSpan,
-          onMouseEnter: props.hover && hasSiblingRowSpan ? function () {
+          onMouseEnter: props.hover && hasSiblingRowSpan || data[i].rowSpan > 1 ? function () {
             props.handleCellHover(props.rowIndex, data[i].rowSpan);
           } : undefined,
-          onMouseLeave: props.hover && hasSiblingRowSpan ? function () {
+          onMouseLeave: props.hover && hasSiblingRowSpan || data[i].rowSpan > 1 ? function () {
             props.handleCellHover(-1, 0);
           } : undefined,
-          className: classnames_default()(col.className, col.type === 'checkbox' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellCheckbox), col.fixed === 'left' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedLeft), col.fixed === 'right' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedRight), col.align === 'center' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignCenter), col.align === 'right' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignRight), (col.lastFixed || col.firstFixed || last.lastFixed) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedLast), lastRowIndex === i && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellIgnoreBorder), data[i].rowSpan > 1 && props.isCellHover(props.rowIndex, data[i].rowSpan) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellHover)),
+          className: classnames_default()(col.className, col.type === 'checkbox' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellCheckbox), col.fixed === 'left' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedLeft), col.fixed === 'right' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedRight), col.align === 'center' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignCenter), col.align === 'right' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignRight), (col.lastFixed || col.firstFixed || last.lastFixed) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedLast), lastRowIndex === i && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellIgnoreBorder), props.hoverIndex.has(props.rowIndex) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellHover), data[i].rowSpan > 1 && props.isCellHover(props.rowIndex, data[i].rowSpan) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellHover)),
           style: getTdStyle(col, data[i].colSpan),
           dir: config.direction,
           "data-role": col.type === 'checkbox' ? 'checkbox' : undefined,
@@ -66006,7 +66015,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.5.0-beta.6'
+  version: '3.5.0-beta.7'
 });
 }();
 /******/ 	return __webpack_exports__;