@sheinx/base 3.2.1 → 3.2.2

package/cjs/config/locale/en_US.d.ts

@@ -30,7 +30,6 @@ declare const _default: {
         short: string[];
         long: string[];
     };
-    pickerTitle: string[];
     timeOfDayValues: string[];
     ok: string;
     cancel: string;

package/cjs/config/locale/en_US.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"en_US.d.ts","sourceRoot":"","sources":["en_US.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wBAyFE"}
+{"version":3,"file":"en_US.d.ts","sourceRoot":"","sources":["en_US.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wBAuFE"}

package/cjs/config/locale/en_US.js

@@ -36,7 +36,6 @@ var _default = exports.default = {
     short: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
     long: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']
   },
-  pickerTitle: ['Start Time', 'End Time'],
   timeOfDayValues: ['a.m.', 'p.m.'],
   ok: 'Ok',
   cancel: 'Cancel',

package/cjs/config/locale/zh-CN.d.ts

@@ -30,7 +30,6 @@ declare const _default: {
         short: string[];
         long: string[];
     };
-    pickerTitle: string[];
     timeOfDayValues: string[];
     ok: string;
     cancel: string;

package/cjs/config/locale/zh-CN.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zh-CN.d.ts","sourceRoot":"","sources":["zh-CN.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wBA0FE"}
+{"version":3,"file":"zh-CN.d.ts","sourceRoot":"","sources":["zh-CN.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wBAwFE"}

package/cjs/config/locale/zh-CN.js

@@ -36,7 +36,6 @@ var _default = exports.default = {
     short: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
     long: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月']
   },
-  pickerTitle: ['开始时间', '结束时间'],
   timeOfDayValues: ['上午', '下午'],
   ok: '确定',
   cancel: '取消',

package/cjs/form/form-fieldset.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-fieldset.d.ts","sourceRoot":"","sources":["form-fieldset.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAGzD,QAAA,MAAM,YAAY,iDA+EjB,CAAC;AAEF,eAAe,YAAY,CAAC"}
+{"version":3,"file":"form-fieldset.d.ts","sourceRoot":"","sources":["form-fieldset.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAGzD,QAAA,MAAM,YAAY,iDA0FjB,CAAC;AAEF,eAAe,YAAY,CAAC"}

package/cjs/form/form-fieldset.js

@@ -16,6 +16,7 @@ var FormFieldSet = function FormFieldSet(props) {
       ids: []
     }),
     context = _React$useRef.current;
+  var formFunc = (0, _hooks.useFormFunc)();
   var getValidateProps = (0, _hooks.usePersistFn)(function () {
     return props;
   });
@@ -29,16 +30,16 @@ var FormFieldSet = function FormFieldSet(props) {
     }),
     Provider = _useFormFieldSet.Provider,
     ProviderValue = _useFormFieldSet.ProviderValue,
-    value = _useFormFieldSet.value,
     error = _useFormFieldSet.error,
-    _onChange = _useFormFieldSet.onChange;
+    _onChange = _useFormFieldSet.onChange,
+    name = _useFormFieldSet.name;
   if (typeof children !== 'function') {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(Provider, {
       value: ProviderValue,
       children: children
     });
   }
-  var valueArr = value || [];
+  var valueArr = (formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name)) || [];
   valueArr = Array.isArray(valueArr) ? valueArr : [valueArr];
   var result = [];
   if (valueArr.length === 0 && valueArr && empty) {
@@ -49,6 +50,7 @@ var FormFieldSet = function FormFieldSet(props) {
         });
         _onChange(newValue);
         context.ids.push(_hooks.util.generateUUID());
+        formFunc === null || formFunc === void 0 || formFunc.insertError(name, 0);
       })
     }, 'empty'));
   }
@@ -70,31 +72,39 @@ var FormFieldSet = function FormFieldSet(props) {
         index: i,
         error: errorList,
         onChange: function onChange(val) {
-          var newValue = produce(valueArr, function (draft) {
+          var oldValue = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name);
+          var newValue = produce(oldValue, function (draft) {
             draft[i] = val;
           });
           _onChange(newValue);
+          formFunc === null || formFunc === void 0 || formFunc.validateFieldset("".concat(name, "[").concat(i, "]"));
         },
         onInsert: function onInsert(val) {
-          var newValue = produce(valueArr, function (draft) {
+          var oldValue = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name);
+          var newValue = produce(oldValue, function (draft) {
             draft.splice(i, 0, val);
           });
           _onChange(newValue);
           context.ids.splice(i, 0, _hooks.util.generateUUID());
+          formFunc === null || formFunc === void 0 || formFunc.insertError(name, i);
         },
         onAppend: function onAppend(val) {
-          var newValue = produce(valueArr, function (draft) {
+          var oldValue = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name);
+          var newValue = produce(oldValue, function (draft) {
             draft.splice(i + 1, 0, val);
           });
           _onChange(newValue);
           context.ids.splice(i + 1, 0, _hooks.util.generateUUID());
+          formFunc === null || formFunc === void 0 || formFunc.insertError(name, i + 1);
         },
         onRemove: function onRemove() {
-          var newValue = produce(valueArr, function (draft) {
+          var oldValue = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name);
+          var newValue = produce(oldValue, function (draft) {
             draft.splice(i, 1);
           });
           _onChange(newValue);
           context.ids.splice(i, 1);
+          formFunc === null || formFunc === void 0 || formFunc.spliceError(name, i);
         }
       })
     }, ids[i]));

package/cjs/input/input-number.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"input-number.d.ts","sourceRoot":"","sources":["input-number.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;;AAgFvD,wBAAuC"}
+{"version":3,"file":"input-number.d.ts","sourceRoot":"","sources":["input-number.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;;AA4FvD,wBAAuC"}

package/cjs/input/input-number.js

@@ -12,7 +12,7 @@ var _hooks = require("@sheinx/hooks");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _useInputCommon = _interopRequireDefault(require("./use-input-common"));
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["jssStyle", "hideArrow"],
+var _excluded = ["jssStyle", "hideArrow", "numType", "integerLimit", "digits", "min", "max", "step", "allowNull"],
   _excluded2 = ["onMinus", "onPlus"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -27,18 +27,25 @@ var InputNumber = function InputNumber(props) {
   var commonProps = (0, _useInputCommon.default)(props);
   var jssStyle = commonProps.jssStyle,
     hideArrow = commonProps.hideArrow,
+    numType = commonProps.numType,
+    integerLimit = commonProps.integerLimit,
+    digits = commonProps.digits,
+    min = commonProps.min,
+    max = commonProps.max,
+    step = commonProps.step,
+    allowNull = commonProps.allowNull,
     restProps = _objectWithoutProperties(commonProps, _excluded);
   var inputStyle = jssStyle === null || jssStyle === void 0 || (_jssStyle$input = jssStyle.input) === null || _jssStyle$input === void 0 ? void 0 : _jssStyle$input.call(jssStyle);
   var numberFormatParams = {
     onBlur: restProps.onBlur,
     onFocus: restProps.onFocus,
-    digits: restProps.digits,
-    integerLimit: restProps.integerLimit,
-    numType: restProps.numType,
-    min: restProps.min,
-    max: restProps.max,
-    step: restProps.step,
-    allowNull: restProps.allowNull
+    digits: digits,
+    integerLimit: integerLimit,
+    numType: numType,
+    min: min,
+    max: max,
+    step: step,
+    allowNull: allowNull
   };
   var _useInputNumber = (0, _hooks.useInputNumber)(_objectSpread({
       value: commonProps.value,
@@ -48,7 +55,9 @@ var InputNumber = function InputNumber(props) {
     onMinus = _useInputNumber.onMinus,
     onPlus = _useInputNumber.onPlus,
     numberFormatProps = _objectWithoutProperties(_useInputNumber, _excluded2);
-  var forwardProps = _hooks.util.removeProps(commonProps, _objectSpread({}, numberFormatParams));
+  var forwardProps = _hooks.util.removeProps(commonProps, _objectSpread(_objectSpread({}, numberFormatParams), {}, {
+    hideArrow: hideArrow
+  }));
   var addEnd = hideArrow ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.default.Fragment, {
     children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.numberStep,

package/cjs/menu/item.js

@@ -150,7 +150,7 @@ var MenuItem = function MenuItem(props) {
       }
     }) : null;
     var item = _hooks.util.render(props.renderItem, props.dataItem, props.index);
-    var link = props.linkKey ? _hooks.util.getKey(props.linkKey, props.dataItem, props.index) : undefined;
+    var link = props.linkKey ? _hooks.util.getKey(props.linkKey, props.dataItem, props.index, true) : undefined;
     var title = null;
     if (_hooks.util.isLink(item)) {
       var mergeClass = (0, _classnames.default)(classes === null || classes === void 0 ? void 0 : classes.title, item.props && item.props.className);

package/cjs/modal/modal-content.js

@@ -92,7 +92,7 @@ var Modal = function Modal(props) {
       hasMask = true;
     }
   };
-  handleMaskVisible();
+  (0, _react.useEffect)(handleMaskVisible, [visible]);
   var updateOrigin = function updateOrigin() {
     // 更新transform-origin
     if (props.position || props.moveable || !props.zoom) return;

package/cjs/table/table.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["table.tsx"],"names":[],"mappings":";AAsBA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;;AAyB1C,wBAycE"}
+{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["table.tsx"],"names":[],"mappings":";AAsBA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;;AAyB1C,wBAmdE"}

package/cjs/table/table.js

@@ -68,6 +68,10 @@ var _default = exports.default = function _default(props) {
   var tfootRef = (0, _react.useRef)(null);
   var scrollRef = (0, _react.useRef)(null);
   var tableRef = (0, _react.useRef)(null);
+  var _useRef = (0, _react.useRef)({
+      emptyHeight: 0
+    }),
+    context = _useRef.current;
   var virtual = ((_props$data = props.data) === null || _props$data === void 0 ? void 0 : _props$data.length) && props.rowsInView !== 0 && (!!props.virtual || props.fixed === 'both' || props.fixed === 'y' || props.fixed === 'auto');
 
   // 虚拟列表高度另外计算
@@ -237,6 +241,9 @@ var _default = exports.default = function _default(props) {
     if ((_props$data2 = props.data) !== null && _props$data2 !== void 0 && _props$data2.length) return null;
     return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.emptyWrapper,
+      ref: function ref(el) {
+        context.emptyHeight = (el === null || el === void 0 ? void 0 : el.clientHeight) || 0;
+      },
       children: props.empty || /*#__PURE__*/(0, _jsxRuntime.jsx)(_empty.default, {
         jssStyle: props.jssStyle
       })
@@ -353,6 +360,7 @@ var _default = exports.default = function _default(props) {
         scrollWidth: width || 1,
         scrollHeight: virtual ? virtualInfo.scrollHeight : tbodyHeight,
         onScroll: handleVirtualScroll,
+        defaultHeight: context.emptyHeight,
         children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("table", {
           style: {
             width: width,

package/cjs/table/tr.js

@@ -68,8 +68,8 @@ var Tr = function Tr(props) {
   };
   (0, _react.useEffect)(function () {
     if (props.setRowHeight && trRef.current) {
-      var expandHeight = expandRef.current ? expandRef.current.offsetHeight : 0;
-      props.setRowHeight(props.rowIndex, trRef.current.offsetHeight + expandHeight);
+      var expandHeight = expandRef.current ? expandRef.current.getBoundingClientRect().height : 0;
+      props.setRowHeight(props.rowIndex, trRef.current.getBoundingClientRect().height + expandHeight);
     }
   }, [props.expanded, props.rowIndex, props.bodyScrollWidth, props.resizeFlag]);
   var renderTreeExpand = function renderTreeExpand(content) {

package/cjs/virtual-scroll/scroll.d.ts

@@ -18,6 +18,7 @@ interface scrollProps {
     style?: React.CSSProperties;
     scrollerStyle?: React.CSSProperties;
     onMouseMove?: () => void;
+    defaultHeight?: number;
 }
 declare const Scroll: (props: scrollProps) => JSX.Element;
 export default Scroll;

package/cjs/virtual-scroll/scroll.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scroll.d.ts","sourceRoot":"","sources":["scroll.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAiB,MAAM,OAAO,CAAC;AAItC,UAAU,WAAW;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,aAAa,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACpC,UAAU,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE;QAChB,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;QAClB,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;QACV,QAAQ,EAAE,OAAO,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;KACf,KAAK,IAAI,CAAC;IACX,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC5B,aAAa,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACpC,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;CAC1B;AAED,QAAA,MAAM,MAAM,UAAW,WAAW,gBA2FjC,CAAC;AAEF,eAAe,MAAM,CAAC"}
+{"version":3,"file":"scroll.d.ts","sourceRoot":"","sources":["scroll.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAiB,MAAM,OAAO,CAAC;AAItC,UAAU,WAAW;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,aAAa,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACpC,UAAU,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE;QAChB,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;QAClB,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;QACV,QAAQ,EAAE,OAAO,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;KACf,KAAK,IAAI,CAAC;IACX,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC5B,aAAa,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACpC,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,QAAA,MAAM,MAAM,UAAW,WAAW,gBA2FjC,CAAC;AAEF,eAAe,MAAM,CAAC"}

package/cjs/virtual-scroll/scroll.js

@@ -23,17 +23,20 @@ var Scroll = function Scroll(props) {
       isMouseDown: false
     }),
     context = _useRef.current;
+  var _props$scrollHeight = props.scrollHeight,
+    scrollHeight = _props$scrollHeight === void 0 ? 0 : _props$scrollHeight,
+    _props$scrollWidth = props.scrollWidth,
+    scrollWidth = _props$scrollWidth === void 0 ? 0 : _props$scrollWidth,
+    _props$defaultHeight = props.defaultHeight,
+    defaultHeight = _props$defaultHeight === void 0 ? 0 : _props$defaultHeight;
   var _useResize = (0, _hooks.useResize)({
       targetRef: containerRef
     }),
     width = _useResize.width,
-    height = _useResize.height;
+    h = _useResize.height;
+  var height = h || defaultHeight;
   var config = (0, _config.useConfig)();
   var isRtl = config.direction === 'rtl';
-  var _props$scrollHeight = props.scrollHeight,
-    scrollHeight = _props$scrollHeight === void 0 ? 0 : _props$scrollHeight,
-    _props$scrollWidth = props.scrollWidth,
-    scrollWidth = _props$scrollWidth === void 0 ? 0 : _props$scrollWidth;
   var scrollerStyle = props.scrollerStyle || {
     height: '100%',
     width: '100%',

package/esm/config/locale/en_US.d.ts

@@ -30,7 +30,6 @@ declare const _default: {
         short: string[];
         long: string[];
     };
-    pickerTitle: string[];
     timeOfDayValues: string[];
     ok: string;
     cancel: string;

package/esm/config/locale/en_US.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"en_US.d.ts","sourceRoot":"","sources":["en_US.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wBAyFE"}
+{"version":3,"file":"en_US.d.ts","sourceRoot":"","sources":["en_US.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wBAuFE"}

package/esm/config/locale/en_US.js

@@ -30,7 +30,6 @@ export default {
     short: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
     long: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']
   },
-  pickerTitle: ['Start Time', 'End Time'],
   timeOfDayValues: ['a.m.', 'p.m.'],
   ok: 'Ok',
   cancel: 'Cancel',

package/esm/config/locale/zh-CN.d.ts

@@ -30,7 +30,6 @@ declare const _default: {
         short: string[];
         long: string[];
     };
-    pickerTitle: string[];
     timeOfDayValues: string[];
     ok: string;
     cancel: string;

package/esm/config/locale/zh-CN.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zh-CN.d.ts","sourceRoot":"","sources":["zh-CN.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wBA0FE"}
+{"version":3,"file":"zh-CN.d.ts","sourceRoot":"","sources":["zh-CN.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wBAwFE"}

package/esm/config/locale/zh-CN.js

@@ -30,7 +30,6 @@ export default {
     short: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
     long: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月']
   },
-  pickerTitle: ['开始时间', '结束时间'],
   timeOfDayValues: ['上午', '下午'],
   ok: '确定',
   cancel: '取消',

package/esm/form/form-fieldset.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-fieldset.d.ts","sourceRoot":"","sources":["form-fieldset.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAGzD,QAAA,MAAM,YAAY,iDA+EjB,CAAC;AAEF,eAAe,YAAY,CAAC"}
+{"version":3,"file":"form-fieldset.d.ts","sourceRoot":"","sources":["form-fieldset.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAGzD,QAAA,MAAM,YAAY,iDA0FjB,CAAC;AAEF,eAAe,YAAY,CAAC"}

package/esm/form/form-fieldset.js

@@ -1,4 +1,4 @@
-import { useFormFieldSet, util, usePersistFn } from '@sheinx/hooks';
+import { useFormFieldSet, util, usePersistFn, useFormFunc } from '@sheinx/hooks';
 import React from 'react';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
@@ -10,6 +10,7 @@ var FormFieldSet = function FormFieldSet(props) {
       ids: []
     }),
     context = _React$useRef.current;
+  var formFunc = useFormFunc();
   var getValidateProps = usePersistFn(function () {
     return props;
   });
@@ -23,16 +24,16 @@ var FormFieldSet = function FormFieldSet(props) {
     }),
     Provider = _useFormFieldSet.Provider,
     ProviderValue = _useFormFieldSet.ProviderValue,
-    value = _useFormFieldSet.value,
     error = _useFormFieldSet.error,
-    _onChange = _useFormFieldSet.onChange;
+    _onChange = _useFormFieldSet.onChange,
+    name = _useFormFieldSet.name;
   if (typeof children !== 'function') {
     return /*#__PURE__*/_jsx(Provider, {
       value: ProviderValue,
       children: children
     });
   }
-  var valueArr = value || [];
+  var valueArr = (formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name)) || [];
   valueArr = Array.isArray(valueArr) ? valueArr : [valueArr];
   var result = [];
   if (valueArr.length === 0 && valueArr && empty) {
@@ -43,6 +44,7 @@ var FormFieldSet = function FormFieldSet(props) {
         });
         _onChange(newValue);
         context.ids.push(util.generateUUID());
+        formFunc === null || formFunc === void 0 || formFunc.insertError(name, 0);
       })
     }, 'empty'));
   }
@@ -64,31 +66,39 @@ var FormFieldSet = function FormFieldSet(props) {
         index: i,
         error: errorList,
         onChange: function onChange(val) {
-          var newValue = produce(valueArr, function (draft) {
+          var oldValue = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name);
+          var newValue = produce(oldValue, function (draft) {
             draft[i] = val;
           });
           _onChange(newValue);
+          formFunc === null || formFunc === void 0 || formFunc.validateFieldset("".concat(name, "[").concat(i, "]"));
         },
         onInsert: function onInsert(val) {
-          var newValue = produce(valueArr, function (draft) {
+          var oldValue = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name);
+          var newValue = produce(oldValue, function (draft) {
             draft.splice(i, 0, val);
           });
           _onChange(newValue);
           context.ids.splice(i, 0, util.generateUUID());
+          formFunc === null || formFunc === void 0 || formFunc.insertError(name, i);
         },
         onAppend: function onAppend(val) {
-          var newValue = produce(valueArr, function (draft) {
+          var oldValue = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name);
+          var newValue = produce(oldValue, function (draft) {
             draft.splice(i + 1, 0, val);
           });
           _onChange(newValue);
           context.ids.splice(i + 1, 0, util.generateUUID());
+          formFunc === null || formFunc === void 0 || formFunc.insertError(name, i + 1);
         },
         onRemove: function onRemove() {
-          var newValue = produce(valueArr, function (draft) {
+          var oldValue = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name);
+          var newValue = produce(oldValue, function (draft) {
             draft.splice(i, 1);
           });
           _onChange(newValue);
           context.ids.splice(i, 1);
+          formFunc === null || formFunc === void 0 || formFunc.spliceError(name, i);
         }
       })
     }, ids[i]));

package/esm/input/input-number.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"input-number.d.ts","sourceRoot":"","sources":["input-number.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;;AAgFvD,wBAAuC"}
+{"version":3,"file":"input-number.d.ts","sourceRoot":"","sources":["input-number.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;;AA4FvD,wBAAuC"}

package/esm/input/input-number.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["jssStyle", "hideArrow"],
+var _excluded = ["jssStyle", "hideArrow", "numType", "integerLimit", "digits", "min", "max", "step", "allowNull"],
   _excluded2 = ["onMinus", "onPlus"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -21,18 +21,25 @@ var InputNumber = function InputNumber(props) {
   var commonProps = useInputCommon(props);
   var jssStyle = commonProps.jssStyle,
     hideArrow = commonProps.hideArrow,
+    numType = commonProps.numType,
+    integerLimit = commonProps.integerLimit,
+    digits = commonProps.digits,
+    min = commonProps.min,
+    max = commonProps.max,
+    step = commonProps.step,
+    allowNull = commonProps.allowNull,
     restProps = _objectWithoutProperties(commonProps, _excluded);
   var inputStyle = jssStyle === null || jssStyle === void 0 || (_jssStyle$input = jssStyle.input) === null || _jssStyle$input === void 0 ? void 0 : _jssStyle$input.call(jssStyle);
   var numberFormatParams = {
     onBlur: restProps.onBlur,
     onFocus: restProps.onFocus,
-    digits: restProps.digits,
-    integerLimit: restProps.integerLimit,
-    numType: restProps.numType,
-    min: restProps.min,
-    max: restProps.max,
-    step: restProps.step,
-    allowNull: restProps.allowNull
+    digits: digits,
+    integerLimit: integerLimit,
+    numType: numType,
+    min: min,
+    max: max,
+    step: step,
+    allowNull: allowNull
   };
   var _useInputNumber = useInputNumber(_objectSpread({
       value: commonProps.value,
@@ -42,7 +49,9 @@ var InputNumber = function InputNumber(props) {
     onMinus = _useInputNumber.onMinus,
     onPlus = _useInputNumber.onPlus,
     numberFormatProps = _objectWithoutProperties(_useInputNumber, _excluded2);
-  var forwardProps = util.removeProps(commonProps, _objectSpread({}, numberFormatParams));
+  var forwardProps = util.removeProps(commonProps, _objectSpread(_objectSpread({}, numberFormatParams), {}, {
+    hideArrow: hideArrow
+  }));
   var addEnd = hideArrow ? null : /*#__PURE__*/_jsx(React.Fragment, {
     children: /*#__PURE__*/_jsxs("div", {
       className: inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.numberStep,

package/esm/menu/item.js

@@ -144,7 +144,7 @@ var MenuItem = function MenuItem(props) {
       }
     }) : null;
     var item = util.render(props.renderItem, props.dataItem, props.index);
-    var link = props.linkKey ? util.getKey(props.linkKey, props.dataItem, props.index) : undefined;
+    var link = props.linkKey ? util.getKey(props.linkKey, props.dataItem, props.index, true) : undefined;
     var title = null;
     if (util.isLink(item)) {
       var mergeClass = classNames(classes === null || classes === void 0 ? void 0 : classes.title, item.props && item.props.className);

package/esm/modal/modal-content.js

@@ -86,7 +86,7 @@ var Modal = function Modal(props) {
       hasMask = true;
     }
   };
-  handleMaskVisible();
+  useEffect(handleMaskVisible, [visible]);
   var updateOrigin = function updateOrigin() {
     // 更新transform-origin
     if (props.position || props.moveable || !props.zoom) return;

package/esm/table/table.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["table.tsx"],"names":[],"mappings":";AAsBA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;;AAyB1C,wBAycE"}
+{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["table.tsx"],"names":[],"mappings":";AAsBA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;;AAyB1C,wBAmdE"}

package/esm/table/table.js

@@ -61,6 +61,10 @@ export default (function (props) {
   var tfootRef = useRef(null);
   var scrollRef = useRef(null);
   var tableRef = useRef(null);
+  var _useRef = useRef({
+      emptyHeight: 0
+    }),
+    context = _useRef.current;
   var virtual = ((_props$data = props.data) === null || _props$data === void 0 ? void 0 : _props$data.length) && props.rowsInView !== 0 && (!!props.virtual || props.fixed === 'both' || props.fixed === 'y' || props.fixed === 'auto');
 
   // 虚拟列表高度另外计算
@@ -230,6 +234,9 @@ export default (function (props) {
     if ((_props$data2 = props.data) !== null && _props$data2 !== void 0 && _props$data2.length) return null;
     return /*#__PURE__*/_jsx("div", {
       className: tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.emptyWrapper,
+      ref: function ref(el) {
+        context.emptyHeight = (el === null || el === void 0 ? void 0 : el.clientHeight) || 0;
+      },
       children: props.empty || /*#__PURE__*/_jsx(Empty, {
         jssStyle: props.jssStyle
       })
@@ -346,6 +353,7 @@ export default (function (props) {
         scrollWidth: width || 1,
         scrollHeight: virtual ? virtualInfo.scrollHeight : tbodyHeight,
         onScroll: handleVirtualScroll,
+        defaultHeight: context.emptyHeight,
         children: /*#__PURE__*/_jsxs("table", {
           style: {
             width: width,

package/esm/table/tr.js

@@ -61,8 +61,8 @@ var Tr = function Tr(props) {
   };
   useEffect(function () {
     if (props.setRowHeight && trRef.current) {
-      var expandHeight = expandRef.current ? expandRef.current.offsetHeight : 0;
-      props.setRowHeight(props.rowIndex, trRef.current.offsetHeight + expandHeight);
+      var expandHeight = expandRef.current ? expandRef.current.getBoundingClientRect().height : 0;
+      props.setRowHeight(props.rowIndex, trRef.current.getBoundingClientRect().height + expandHeight);
     }
   }, [props.expanded, props.rowIndex, props.bodyScrollWidth, props.resizeFlag]);
   var renderTreeExpand = function renderTreeExpand(content) {

package/esm/virtual-scroll/scroll.d.ts

@@ -18,6 +18,7 @@ interface scrollProps {
     style?: React.CSSProperties;
     scrollerStyle?: React.CSSProperties;
     onMouseMove?: () => void;
+    defaultHeight?: number;
 }
 declare const Scroll: (props: scrollProps) => JSX.Element;
 export default Scroll;

package/esm/virtual-scroll/scroll.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scroll.d.ts","sourceRoot":"","sources":["scroll.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAiB,MAAM,OAAO,CAAC;AAItC,UAAU,WAAW;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,aAAa,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACpC,UAAU,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE;QAChB,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;QAClB,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;QACV,QAAQ,EAAE,OAAO,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;KACf,KAAK,IAAI,CAAC;IACX,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC5B,aAAa,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACpC,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;CAC1B;AAED,QAAA,MAAM,MAAM,UAAW,WAAW,gBA2FjC,CAAC;AAEF,eAAe,MAAM,CAAC"}
+{"version":3,"file":"scroll.d.ts","sourceRoot":"","sources":["scroll.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAiB,MAAM,OAAO,CAAC;AAItC,UAAU,WAAW;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,aAAa,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACpC,UAAU,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE;QAChB,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;QAClB,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;QACV,QAAQ,EAAE,OAAO,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;KACf,KAAK,IAAI,CAAC;IACX,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC5B,aAAa,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACpC,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,QAAA,MAAM,MAAM,UAAW,WAAW,gBA2FjC,CAAC;AAEF,eAAe,MAAM,CAAC"}

package/esm/virtual-scroll/scroll.js

@@ -16,17 +16,20 @@ var Scroll = function Scroll(props) {
       isMouseDown: false
     }),
     context = _useRef.current;
+  var _props$scrollHeight = props.scrollHeight,
+    scrollHeight = _props$scrollHeight === void 0 ? 0 : _props$scrollHeight,
+    _props$scrollWidth = props.scrollWidth,
+    scrollWidth = _props$scrollWidth === void 0 ? 0 : _props$scrollWidth,
+    _props$defaultHeight = props.defaultHeight,
+    defaultHeight = _props$defaultHeight === void 0 ? 0 : _props$defaultHeight;
   var _useResize = useResize({
       targetRef: containerRef
     }),
     width = _useResize.width,
-    height = _useResize.height;
+    h = _useResize.height;
+  var height = h || defaultHeight;
   var config = useConfig();
   var isRtl = config.direction === 'rtl';
-  var _props$scrollHeight = props.scrollHeight,
-    scrollHeight = _props$scrollHeight === void 0 ? 0 : _props$scrollHeight,
-    _props$scrollWidth = props.scrollWidth,
-    scrollWidth = _props$scrollWidth === void 0 ? 0 : _props$scrollWidth;
   var scrollerStyle = props.scrollerStyle || {
     height: '100%',
     width: '100%',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sheinx/base",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "description": "",
   "keywords": [],
   "license": "MIT",
@@ -10,7 +10,7 @@
   "module": "./esm/index.js",
   "typings": "./cjs/index.d.ts",
   "dependencies": {
-    "@sheinx/hooks": "3.2.1",
+    "@sheinx/hooks": "3.2.2",
     "immer": "^10.0.0",
     "classnames": "^2.0.0",
     "@shined/reactive": "^0.1.3-alpha.0"