shineout 3.5.3 → 3.5.4-beta.10

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');
+/* harmony default export */ var version = ('3.5.4-beta.10');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -21544,12 +21544,50 @@ var normalize_token = {
 };
 var lineHeightComputed = '20px';
 var lineHeightComputed2 = '10px';
-var normalize_css = "*,\n*::before,\n*::after {\n  box-sizing: border-box;\n}\nhtml {\n  font-family: sans-serif;\n  line-height: 1.15;\n  -ms-overflow-style: scrollbar;\n  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);\n  -webkit-text-size-adjust: 100%;\n  -ms-text-size-adjust: 100%;\n}\n\narticle,\naside,\ndialog,\nfigcaption,\nfigure,\nfooter,\nheader,\nhgroup,\nmain,\nnav,\nsection {\n  display: block;\n}\n\nbody {\n  margin: 0;\n  color: ".concat(normalize_token.color, ";\n  font-family: ").concat(normalize_token.fontFamily, ";\n  font-size: ").concat(normalize_token.fontSize, ";\n  line-height: ").concat(normalize_token.lineHeight, ";\n}\n\n\narticle,\naside,\nfooter,\nheader,\nnav,\nsection {\n  display: block;\n}\n\nh1 {\n  margin: 0.67em 0;\n  font-size: 2em;\n}\n\nfigcaption,\nfigure,\nmain {\n  display: block;\n}\n\nfigure {\n  margin: 1em 40px;\n}\n\nhr {\n  overflow: visible;\n  height: 0;\n  box-sizing: content-box;\n}\n\npre {\n  font-family: \"SFMono-Regular\", Menlo, Monaco, Consolas, \"Courier New\", monospace;\n  font-size: 1em;\n}\n\na {\n  background-color: transparent;\n  color: ").concat(normalize_token.linkColor, ";\n  cursor: pointer;\n  outline: none;\n  text-decoration: ").concat(normalize_token.linkHoverDecoration, ";\n  -webkit-text-decoration-skip: objects;\n  transition: color 0.3s;\n}\n\na:active,\na:hover {\n  color: ").concat(normalize_token.linkColor, ";\n  outline: 0;\n  text-decoration: ").concat(normalize_token.linkHoverDecoration, ";\n}\na[disabled] {\n  color: ").concat(normalize_token.linkDisabledColor, ";\n  cursor: not-allowed;\n  pointer-events: none;\n}\n\nabbr[title] {\n  border-bottom: none;\n  text-decoration: underline;\n  text-decoration: underline dotted;\n}\n\nb,\nstrong {\n  font-weight: inherit;\n}\n\nb,\nstrong {\n  font-weight: bolder;\n}\n\ncode,\nkbd,\nsamp {\n  font-family: monospace, monospace;\n  font-size: 1em;\n}\n\ndfn {\n  font-style: italic;\n}\n\nmark {\n  background-color: #ff0;\n  color: #000;\n}\n\nsmall {\n  font-size: 80%;\n}\n\nsub,\nsup {\n  position: relative;\n  font-size: 75%;\n  line-height: 0;\n  vertical-align: baseline;\n}\n\nsub {\n  bottom: -0.25em;\n}\n\nsup {\n  top: -0.5em;\n}\n\naudio,\nvideo {\n  display: inline-block;\n}\n\naudio:not([controls]) {\n  display: none;\n  height: 0;\n}\n\nimg {\n  border-style: none;\n}\n\nsvg:not(:root) {\n  overflow: hidden;\n}\n\nbutton,\ninput,\noptgroup,\nselect,\ntextarea {\n  margin: 0;\n  font-family: inherit;\n  font-size: 100%;\n  line-height: 1.15;\n}\n\nbutton,\ninput {\n  overflow: visible;\n}\n\nbutton,\nselect {\n  text-transform: none;\n}\n\nbutton,\nhtml [type=\"button\"],\n[type=\"reset\"],\n[type=\"submit\"] {\n  -webkit-appearance: button;\n}\n\nbutton::-moz-focus-inner,\n[type='button']::-moz-focus-inner,\n[type='reset']::-moz-focus-inner,\n[type='submit']::-moz-focus-inner {\n  padding: 0;\n  border-style: none;\n}\n\nbutton:-moz-focusring,\n[type='button']:-moz-focusring,\n[type='reset']:-moz-focusring,\n[type='submit']:-moz-focusring {\n  outline: 1px dotted ButtonText;\n}\n\nfieldset {\n  padding: 0.35em 0.75em 0.625em;\n}\n\nlegend {\n  display: table;\n  max-width: 100%;\n  box-sizing: border-box;\n  padding: 0;\n  color: inherit;\n  white-space: normal;\n}\n\nprogress {\n  display: inline-block;\n  vertical-align: baseline;\n}\n\ntextarea {\n  overflow: auto;\n}\n\n[type='checkbox'],\n[type='radio'] {\n  box-sizing: border-box;\n  padding: 0;\n}\n\n\n[type='number']::-webkit-inner-spin-button,\n[type='number']::-webkit-outer-spin-button {\n  height: auto;\n}\n\n[type='search'] {\n  -webkit-appearance: textfield;\n  outline-offset: -2px;\n}\n\n[type='search']::-webkit-search-cancel-button,\n[type='search']::-webkit-search-decoration {\n  -webkit-appearance: none;\n}\n\n\n::-webkit-file-upload-button {\n  -webkit-appearance: button;\n  font: inherit;\n}\n\n\ndetails,\nmenu {\n  display: block;\n}\n\n\nsummary {\n  display: list-item;\n}\n\n\ncanvas {\n  display: inline-block;\n}\n\n\ntemplate {\n  display: none;\n}\n\n\n[hidden] {\n  display: none;\n}\n\nh1,\nh2,\nh3,\nh4,\nh5,\nh6,\n.h1,\n.h2,\n.h3,\n.h4,\n.h5,\n.h6 {\n  color: ").concat(normalize_token.headingsColor, ";\n  font-family: ").concat(normalize_token.headingsFontFamily, ";\n  font-weight: ").concat(normalize_token.headingsFontWeight, ";\n  line-height: ").concat(normalize_token.headingsLineHeight, ";\n}\nh1 small, h1 .small, .h1 small, .h1 .small,\nh2 small, h2 .small, .h2 small, .h2 .small,\nh3 small, h3 .small, .h3 small, .h3 .small,\nh4 small, h4 .small, .h4 small, .h4 .small,\nh5 small, h5 .small, .h5 small, .h5 .small,\nh6 small, h6 .small, .h6 small, .h6 .small {\n  color: ").concat(normalize_token.headingsSmallColor, ";\n  font-weight: normal;\n  line-height: 1;\n}\n\n\nh1,\n.h1,\nh2,\n.h2,\nh3,\n.h3 {\n  margin-top: ").concat(lineHeightComputed, ";\n  margin-bottom: ").concat(lineHeightComputed2, ";\n}\n\nhi small, h1 .small, .h1 small, .h1 .small,\nh2 small, h2 .small, .h2 small, .h2 .small,\nh3 small, h3 .small, .h3 small, .h3 .small {\n  font-size: 65%;\n}\n\nh4,\n.h4,\nh5,\n.h5,\nh6,\n.h6 {\n  margin-top: ").concat(lineHeightComputed2, ";\n  margin-bottom: ").concat(lineHeightComputed2, ";\n}\n\nh4 small, h4 .small, .h4 small, .h4 .small,\nh5 small, h5 .small, .h5 small, .h5 .small,\nh6 small, h6 .small, .h6 small, .h6 .small {\n  font-size: 75%;\n}\n\np {\n  margin: 0 0 ").concat(lineHeightComputed2, ";\n}");
+var normalizeStyle = "*,\n*::before,\n*::after {\n  box-sizing: border-box;\n}\nhtml {\n  font-family: sans-serif;\n  line-height: 1.15;\n  -ms-overflow-style: scrollbar;\n  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);\n  -webkit-text-size-adjust: 100%;\n  -ms-text-size-adjust: 100%;\n}\n\narticle,\naside,\ndialog,\nfigcaption,\nfigure,\nfooter,\nheader,\nhgroup,\nmain,\nnav,\nsection {\n  display: block;\n}\n\nbody {\n  margin: 0;\n  color: ".concat(normalize_token.color, ";\n  font-family: ").concat(normalize_token.fontFamily, ";\n  font-size: ").concat(normalize_token.fontSize, ";\n  line-height: ").concat(normalize_token.lineHeight, ";\n}\n\n\narticle,\naside,\nfooter,\nheader,\nnav,\nsection {\n  display: block;\n}\n\nh1 {\n  margin: 0.67em 0;\n  font-size: 2em;\n}\n\nfigcaption,\nfigure,\nmain {\n  display: block;\n}\n\nfigure {\n  margin: 1em 40px;\n}\n\nhr {\n  overflow: visible;\n  height: 0;\n  box-sizing: content-box;\n}\n\npre {\n  font-family: \"SFMono-Regular\", Menlo, Monaco, Consolas, \"Courier New\", monospace;\n  font-size: 1em;\n}\n\na {\n  background-color: transparent;\n  color: ").concat(normalize_token.linkColor, ";\n  cursor: pointer;\n  outline: none;\n  text-decoration: ").concat(normalize_token.linkHoverDecoration, ";\n  -webkit-text-decoration-skip: objects;\n  transition: color 0.3s;\n}\n\na:active,\na:hover {\n  color: ").concat(normalize_token.linkColor, ";\n  outline: 0;\n  text-decoration: ").concat(normalize_token.linkHoverDecoration, ";\n}\na[disabled] {\n  color: ").concat(normalize_token.linkDisabledColor, ";\n  cursor: not-allowed;\n  pointer-events: none;\n}\n\nabbr[title] {\n  border-bottom: none;\n  text-decoration: underline;\n  text-decoration: underline dotted;\n}\n\nb,\nstrong {\n  font-weight: inherit;\n}\n\nb,\nstrong {\n  font-weight: bolder;\n}\n\ncode,\nkbd,\nsamp {\n  font-family: monospace, monospace;\n  font-size: 1em;\n}\n\ndfn {\n  font-style: italic;\n}\n\nmark {\n  background-color: #ff0;\n  color: #000;\n}\n\nsmall {\n  font-size: 80%;\n}\n\nsub,\nsup {\n  position: relative;\n  font-size: 75%;\n  line-height: 0;\n  vertical-align: baseline;\n}\n\nsub {\n  bottom: -0.25em;\n}\n\nsup {\n  top: -0.5em;\n}\n\naudio,\nvideo {\n  display: inline-block;\n}\n\naudio:not([controls]) {\n  display: none;\n  height: 0;\n}\n\nimg {\n  border-style: none;\n}\n\nsvg:not(:root) {\n  overflow: hidden;\n}\n\nbutton,\ninput,\noptgroup,\nselect,\ntextarea {\n  margin: 0;\n  font-family: inherit;\n  font-size: 100%;\n  line-height: 1.15;\n}\n\nbutton,\ninput {\n  overflow: visible;\n}\n\nbutton,\nselect {\n  text-transform: none;\n}\n\nbutton,\nhtml [type=\"button\"],\n[type=\"reset\"],\n[type=\"submit\"] {\n  -webkit-appearance: button;\n}\n\nbutton::-moz-focus-inner,\n[type='button']::-moz-focus-inner,\n[type='reset']::-moz-focus-inner,\n[type='submit']::-moz-focus-inner {\n  padding: 0;\n  border-style: none;\n}\n\nbutton:-moz-focusring,\n[type='button']:-moz-focusring,\n[type='reset']:-moz-focusring,\n[type='submit']:-moz-focusring {\n  outline: 1px dotted ButtonText;\n}\n\nfieldset {\n  padding: 0.35em 0.75em 0.625em;\n}\n\nlegend {\n  display: table;\n  max-width: 100%;\n  box-sizing: border-box;\n  padding: 0;\n  color: inherit;\n  white-space: normal;\n}\n\nprogress {\n  display: inline-block;\n  vertical-align: baseline;\n}\n\ntextarea {\n  overflow: auto;\n}\n\n[type='checkbox'],\n[type='radio'] {\n  box-sizing: border-box;\n  padding: 0;\n}\n\n\n[type='number']::-webkit-inner-spin-button,\n[type='number']::-webkit-outer-spin-button {\n  height: auto;\n}\n\n[type='search'] {\n  -webkit-appearance: textfield;\n  outline-offset: -2px;\n}\n\n[type='search']::-webkit-search-cancel-button,\n[type='search']::-webkit-search-decoration {\n  -webkit-appearance: none;\n}\n\n\n::-webkit-file-upload-button {\n  -webkit-appearance: button;\n  font: inherit;\n}\n\n\ndetails,\nmenu {\n  display: block;\n}\n\n\nsummary {\n  display: list-item;\n}\n\n\ncanvas {\n  display: inline-block;\n}\n\n\ntemplate {\n  display: none;\n}\n\n\n[hidden] {\n  display: none;\n}\n\nh1,\nh2,\nh3,\nh4,\nh5,\nh6,\n.h1,\n.h2,\n.h3,\n.h4,\n.h5,\n.h6 {\n  color: ").concat(normalize_token.headingsColor, ";\n  font-family: ").concat(normalize_token.headingsFontFamily, ";\n  font-weight: ").concat(normalize_token.headingsFontWeight, ";\n  line-height: ").concat(normalize_token.headingsLineHeight, ";\n}\nh1 small, h1 .small, .h1 small, .h1 .small,\nh2 small, h2 .small, .h2 small, .h2 .small,\nh3 small, h3 .small, .h3 small, .h3 .small,\nh4 small, h4 .small, .h4 small, .h4 .small,\nh5 small, h5 .small, .h5 small, .h5 .small,\nh6 small, h6 .small, .h6 small, .h6 .small {\n  color: ").concat(normalize_token.headingsSmallColor, ";\n  font-weight: normal;\n  line-height: 1;\n}\n\n\nh1,\n.h1,\nh2,\n.h2,\nh3,\n.h3 {\n  margin-top: ").concat(lineHeightComputed, ";\n  margin-bottom: ").concat(lineHeightComputed2, ";\n}\n\nhi small, h1 .small, .h1 small, .h1 .small,\nh2 small, h2 .small, .h2 small, .h2 .small,\nh3 small, h3 .small, .h3 small, .h3 .small {\n  font-size: 65%;\n}\n\nh4,\n.h4,\nh5,\n.h5,\nh6,\n.h6 {\n  margin-top: ").concat(lineHeightComputed2, ";\n  margin-bottom: ").concat(lineHeightComputed2, ";\n}\n\nh4 small, h4 .small, .h4 small, .h4 .small,\nh5 small, h5 .small, .h5 small, .h5 .small,\nh6 small, h6 .small, .h6 small, .h6 .small {\n  font-size: 75%;\n}\n\np {\n  margin: 0 0 ").concat(lineHeightComputed2, ";\n}");
+function appendNormalizeStyle(styleString, id) {
+  var style = document.createElement('style');
+  style.id = id;
+  style.innerHTML = styleString;
+  document.head.appendChild(style);
+}
+var uniqueStyleId = 'shineout-next-normalize__' + Math.random().toString(36).substring(2, 15);
 if (typeof window !== 'undefined') {
-  var normalize_link = document.createElement('style');
-  normalize_link.innerHTML = normalize_css;
-  document.head.appendChild(normalize_link);
+  appendNormalizeStyle(normalizeStyle, uniqueStyleId);
 }
+var scopeNormalizeStyle = function scopeNormalizeStyle() {
+  var csScopePrefix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '#app';
+  var styleElement = document.getElementById(uniqueStyleId);
+  // 移除styleElement
+
+  var styleSheet = styleElement === null || styleElement === void 0 ? void 0 : styleElement.sheet;
+  var cssRules = styleSheet === null || styleSheet === void 0 ? void 0 : styleSheet.cssRules;
+  // 遍历cssRules，给每一个selectorText添加前缀
+  if (cssRules) {
+    for (var i = 0; i < cssRules.length; i++) {
+      var rule = cssRules[i];
+      if (rule instanceof CSSStyleRule) {
+        // 如果选择器包含了body或html，则替换，不是加前缀
+        if (rule.selectorText.includes('body')) {
+          rule.selectorText = rule.selectorText.replace('body', csScopePrefix);
+        } else if (rule.selectorText.includes('html')) {
+          rule.selectorText = rule.selectorText.replace('html', csScopePrefix);
+        } else {
+          var selectors = rule.selectorText.split(',');
+          var newSelectors = selectors.map(function (selector) {
+            return "".concat(csScopePrefix, " ").concat(selector);
+          });
+          rule.selectorText = newSelectors.join(',');
+        }
+      }
+    }
+  }
+  var scopedStyleString = cssRules ? Array.from(cssRules).map(function (rule) {
+    return rule.cssText;
+  }).join('') : '';
+  document.head.removeChild(styleElement);
+  appendNormalizeStyle(scopedStyleString, uniqueStyleId);
+};
 token_setter({
   onlyExtra: true,
   tokenName: 'shineout-extra',
@@ -23889,20 +23927,20 @@ var stepsStyle = {
       transition: 'color ease 0.3s'
     },
     '&$arrow': {
-      '& $step': {
+      '& $step:not($disabled)': {
         cursor: 'pointer'
       }
     },
     '&$default': {
-      '& $step:not($process)': {
+      '& $step:not($process):not($disabled)': {
         cursor: 'pointer'
       },
-      '& $step$wait:hover': {
+      '& $step$wait:not($disabled):hover': {
         '& $title,$description': {
           color: src.stepsWaitHoverFontColor
         }
       },
-      '& $step$finish:hover': {
+      '& $step$finish:not($disabled):hover': {
         '& $title,$description': {
           color: src.stepsFinishHoverFontColor
         }
@@ -24144,7 +24182,14 @@ var stepsStyle = {
       marginRight: 0
     }
   },
-  disabled: {},
+  disabled: {
+    '&$step': {
+      cursor: 'not-allowed'
+    },
+    '& $icon:not($process)': {
+      cursor: 'not-allowed'
+    }
+  },
   horizontalLabel: {
     '&$step': {
       overflow: 'hidden'
@@ -38131,6 +38176,7 @@ var Result = function Result(props) {
         children: /*#__PURE__*/(0,jsx_runtime.jsx)(result_Input, {
           onRef: function onRef(el) {
             _onRef.current.inputRef = el;
+            _onRef.current.inputRefs[info.index] = el;
             context.inputRefs[info.index] = el;
           },
           disabled: dis && info.inputable,
@@ -42532,13 +42578,17 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
     _useState8 = slicedToArray_default()(_useState7, 2),
     targetArr = _useState8[0],
     setTargetArr = _useState8[1];
-  var _useState9 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)({
+  var _useState9 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)([]),
+    _useState10 = slicedToArray_default()(_useState9, 2),
+    inputArr = _useState10[0],
+    setInputArr = _useState10[1];
+  var _useState11 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)({
       type: undefined,
       quick: undefined
     }),
-    _useState10 = slicedToArray_default()(_useState9, 2),
-    params = _useState10[0],
-    setParams = _useState10[1];
+    _useState12 = slicedToArray_default()(_useState11, 2),
+    params = _useState12[0],
+    setParams = _useState12[1];
   var _useRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({
       cachedDateArr: convertValueToDateArr(value, format, options),
       modeDisabledStart: {},
@@ -42546,14 +42596,14 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
     }),
     context = _useRef.current;
   // 当edit 为true时，stateDate 否则返回 props date
-  var _useState11 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(context.cachedDateArr),
-    _useState12 = slicedToArray_default()(_useState11, 2),
-    stateDate = _useState12[0],
-    setStateDate = _useState12[1];
-  var _useState13 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(false),
+  var _useState13 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(context.cachedDateArr),
     _useState14 = slicedToArray_default()(_useState13, 2),
-    edit = _useState14[0],
-    setEdit = _useState14[1];
+    stateDate = _useState14[0],
+    setStateDate = _useState14[1];
+  var _useState15 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(false),
+    _useState16 = slicedToArray_default()(_useState15, 2),
+    edit = _useState16[0],
+    setEdit = _useState16[1];
 
   // 收集所有的disabled
   var registerModeDisabled = usePersistFn(function (position, mode, fn) {
@@ -42571,6 +42621,39 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
       quick: quick
     });
   });
+  var isDisabledInputDate = function isDisabledInputDate(rangeData) {
+    var start = rangeData[0];
+    var end = rangeData[1];
+    var isDis = false;
+    if (disabled && typeof disabled === 'function') {
+      if (start && disabled(start)) isDis = true;
+      if (end && disabled(end)) isDis = true;
+      if (isDis) return isDis;
+    }
+    if (start && end) {
+      if (util.compareAsc(start, end) > 0) {
+        isDis = true;
+        return isDis;
+      }
+    }
+    if (range && typeof range === 'number') {
+      if (start) {
+        if (!end) return isDis;
+        var rangeDate = util.addSeconds(start, range, options);
+        if (util.compareAsc(end, rangeDate) > 0) {
+          isDis = true;
+        }
+      }
+      if (end) {
+        if (!start) return isDis;
+        var _rangeDate = util.addSeconds(end, -range, options);
+        if (util.compareAsc(start, _rangeDate) < 0) {
+          isDis = true;
+        }
+      }
+    }
+    return isDis;
+  };
   var isDisabledDate = usePersistFn(function (date, position, triggerType) {
     var mode = getTypeMode(type);
     var disabled = position === 'end' ? context.modeDisabledEnd[mode] : context.modeDisabledStart[mode];
@@ -42627,6 +42710,19 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
   var finishEdit = function finishEdit() {
     setEdit(false);
     var formatValue = getFormatValueArr(stateDate);
+    if (inputArr.length && inputArr.some(function (i) {
+      return i;
+    })) {
+      var inputValue = stateDate.map(function (item, index) {
+        if (inputArr[index]) return inputArr[index];
+        return item;
+      });
+      var isDis = isDisabledInputDate(inputValue);
+      if (!isDis) {
+        formatValue = getFormatValueArr(inputValue);
+      }
+    }
+    // const formatValue = getFormatValueArr(stateDate);
     var v = range ? formatValue : formatValue[0];
     if (range && (!stateDate[0] || !stateDate[1]) && !props.allowSingle) {
       return;
@@ -42641,6 +42737,7 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
     if (!clearable) return;
     e === null || e === void 0 || e.stopPropagation();
     if (disabledStatus === 'all') return;
+    setInputArr([]);
     if (edit) {
       if (range) {
         if (disabledStatus === 'left') setStateDate(function (arr) {
@@ -42676,6 +42773,12 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
     var isValid = util.isValidString(str, format);
     if (!isValid) return;
     var date = util.toDateWithFormat(str, format, undefined, options);
+    setInputArr(function (prev) {
+      var arr = toConsumableArray_default()(prev);
+      arr[index] = date;
+      return arr;
+    });
+
     // 此次校验是由输入触发的
     if (date && isDisabledDate(date, index === 1 ? 'end' : 'start', 'input')) {
       return;
@@ -42691,6 +42794,17 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
       return arr;
     });
   });
+  var handleClearInputArr = usePersistFn(function (index) {
+    if (index !== undefined) {
+      setInputArr(function (prev) {
+        var arr = toConsumableArray_default()(prev);
+        arr[index] = undefined;
+        return arr;
+      });
+      return;
+    }
+    setInputArr([]);
+  });
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     handlePropsValueChange(value);
   }, [value]);
@@ -42721,12 +42835,14 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
     setCurrentArr: setCurrentArr,
     setTargetArr: setTargetArr,
     handleClear: handleClear,
+    handleClearInputArr: handleClearInputArr,
     handleInputChange: handleInputChange,
     registerModeDisabled: registerModeDisabled,
     setCurrentArrWithParams: setCurrentArrWithParams,
     isDisabledDate: isDisabledDate
   });
   return {
+    inputArr: inputArr,
     resultArr: resultArr,
     targetResultArr: targetResultArr,
     dateArr: dateArr,
@@ -42748,6 +42864,7 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
 
 var useDate = function useDate(props) {
   var options = props.options,
+    position = props.position,
     type = props.type;
   var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(props.defaultCurrent || new Date()),
     _useState2 = slicedToArray_default()(_useState, 2),
@@ -42840,6 +42957,7 @@ var useDate = function useDate(props) {
     var _props$onChange;
     if (isDisabled(date)) return;
     var newDate = getDateWithTime(date);
+    props === null || props === void 0 || props.onClearInputArr(position === 'start' ? 0 : 1);
     (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, newDate, noClose);
     setCurrent(newDate);
   };
@@ -43389,7 +43507,10 @@ var Day = function Day(props) {
       current: props.current,
       onCurrentChange: setCurrent,
       value: props.value,
+      range: props.range,
       onChange: onChange,
+      onClearInputArr: props.onClearInputArr,
+      position: props.position,
       min: props.min,
       max: props.max,
       type: props.type,
@@ -44332,6 +44453,7 @@ var Quick = function Quick(props) {
   var jssStyle = props.jssStyle,
     quickSelect = props.quickSelect,
     format = props.format,
+    onClearInputArr = props.onClearInputArr,
     options = props.options,
     children = props.children,
     type = props.type,
@@ -44355,6 +44477,7 @@ var Quick = function Quick(props) {
     });
     props.setDateArr(dateArr);
     props.setCurrentArr(dateArr, 'quick', item);
+    onClearInputArr();
     if (immediate && closePop) {
       closePop();
     }
@@ -44639,6 +44762,7 @@ var Picker = function Picker(props) {
       type: props.type,
       defaultTime: props.defaultTime,
       range: props.range,
+      inputArr: props.inputArr,
       dateArr: props.dateArr,
       setDateArr: props.setDateArr,
       currentArr: props.currentArr,
@@ -44682,6 +44806,7 @@ var Picker = function Picker(props) {
       setMode: position === 'end' ? func.setModeEnd : func.setModeStart,
       onChange: position === 'end' ? func.setDateEnd : func.setDateStart,
       setCurrent: position === 'end' ? func.setCurrentEnd : func.setCurrentStart,
+      onClearInputArr: props.onClearInputArr,
       type: props.type,
       format: props.format,
       disabled: position === 'end' ? func.endDisabled : func.startDisabled,
@@ -44759,6 +44884,7 @@ var Picker = function Picker(props) {
       jssStyle: jssStyle,
       dateArr: dateArr,
       type: type,
+      onClearInputArr: props.onClearInputArr,
       setDateArr: props.setDateArr,
       setCurrentArr: props.setCurrentArr,
       format: props.format,
@@ -44845,7 +44971,8 @@ var DatePicker = function DatePicker(props0) {
     oldDateArr = _React$useState8[0],
     setOldDateArr = _React$useState8[1];
   var inputRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({
-    inputRef: null
+    inputRef: null,
+    inputRefs: []
   });
   var styles = jssStyle === null || jssStyle === void 0 || (_jssStyle$datePicker = jssStyle.datePicker) === null || _jssStyle$datePicker === void 0 ? void 0 : _jssStyle$datePicker.call(jssStyle);
   var isRTL = direction === 'rtl';
@@ -44889,6 +45016,7 @@ var DatePicker = function DatePicker(props0) {
       formatResult: props.formatResult,
       onPickerChange: props.onPickerChange
     }),
+    inputArr = _useDatePickerFormat.inputArr,
     resultArr = _useDatePickerFormat.resultArr,
     targetResultArr = _useDatePickerFormat.targetResultArr,
     dateArr = _useDatePickerFormat.dateArr,
@@ -44959,13 +45087,14 @@ var DatePicker = function DatePicker(props0) {
     (_props$onBlur = props.onBlur) === null || _props$onBlur === void 0 || _props$onBlur.call(props, e);
   });
   var handleClose = function handleClose(isFromConfirm) {
-    var _inputRef$current$inp;
     setIsCloseFromConfirm(isFromConfirm || false);
     closePop();
     if (isFromConfirm) {
       func.finishEdit();
     }
-    (_inputRef$current$inp = inputRef.current.inputRef) === null || _inputRef$current$inp === void 0 || _inputRef$current$inp.blur();
+    inputRef.current.inputRefs.forEach(function (el) {
+      el === null || el === void 0 || el.blur();
+    });
   };
   var handleResultClick = usePersistFn(function () {
     if (disabledStatus === 'all') return;
@@ -45055,7 +45184,9 @@ var DatePicker = function DatePicker(props0) {
         children: /*#__PURE__*/(0,jsx_runtime.jsx)(picker, {
           setTargetArr: func.setTargetArr,
           dateArr: dateArr,
+          inputArr: inputArr,
           setDateArr: func.setDateArr,
+          onClearInputArr: func.handleClearInputArr,
           currentArr: currentArr,
           range: range,
           setCurrentArr: func.setCurrentArrWithParams,
@@ -48036,19 +48167,21 @@ function useFormRef() {
   };
   return [ref.current, setFormRef];
 }
-function useFromInstance() {
+function useFormInstance() {
   var formCtx = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useContext(FormContext);
   return formCtx;
 }
 ;// CONCATENATED MODULE: ../base/src/form/form.tsx
 
 
+
 var form_excluded = ["jssStyle", "className", "style", "children", "formRef"];
 
 
 
 
 
+
 var Form = function Form(props) {
   var _jssStyle$form;
   var jssStyle = props.jssStyle,
@@ -48089,6 +48222,16 @@ var Form = function Form(props) {
       type: 'withValue'
     });
   });
+  var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(0),
+    _useState2 = slicedToArray_default()(_useState, 2),
+    renderKey = _useState2[0],
+    setRenderKey = _useState2[1];
+  var handleOuterSet = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useCallback)(function (vals) {
+    formFunc.setValue(vals);
+    setRenderKey(function (prev) {
+      return prev + 1;
+    });
+  }, [formFunc]);
   var formRefObj = useLatestObj({
     clearValidate: formFunc.clearValidate,
     getValue: formFunc.getValue,
@@ -48098,7 +48241,7 @@ var Form = function Form(props) {
     validateFields: validateFields,
     validateFieldsWithValue: validateFieldsWithValue,
     validateFieldsWithError: formFunc.validateFields,
-    set: formFunc.setValue,
+    set: handleOuterSet,
     scrollToField: formFunc.scrollToField
   });
   external_root_React_commonjs2_react_commonjs_react_amd_react_default().useEffect(function () {
@@ -48132,17 +48275,32 @@ var Form = function Form(props) {
     handleFormModalInfo();
   }, [props.disabled, props.pending]);
   var rootClass = classnames_default()([formClasses === null || formClasses === void 0 ? void 0 : formClasses.rootClass, formClasses === null || formClasses === void 0 ? void 0 : formClasses.wrapper, className, props.inline && (formClasses === null || formClasses === void 0 ? void 0 : formClasses.wrapperInline)]);
-  return /*#__PURE__*/(0,jsx_runtime.jsx)("form", objectSpread2_default()(objectSpread2_default()({}, getFormProps({
+  var formProps = getFormProps({
     className: rootClass,
     style: style
+  });
+  var formElRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
+    if (formElRef.current instanceof HTMLFormElement) {
+      formElRef.current.addEventListener('submit', formProps.onSubmit);
+    }
+    return function () {
+      if (formElRef.current instanceof HTMLFormElement) {
+        formElRef.current.removeEventListener('submit', formProps.onSubmit);
+      }
+    };
+  }, [formProps.onSubmit]);
+  return /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.createElement)("form", objectSpread2_default()(objectSpread2_default()({}, removeProps(formProps, {
+    onSubmit: true
   })), {}, {
-    children: /*#__PURE__*/(0,jsx_runtime.jsx)(Provider, objectSpread2_default()(objectSpread2_default()({}, ProviderProps), {}, {
-      children: /*#__PURE__*/(0,jsx_runtime.jsx)(FormContext.Provider, {
-        value: formRefObj,
-        children: children
-      })
-    }))
-  }));
+    ref: formElRef,
+    key: renderKey
+  }), /*#__PURE__*/(0,jsx_runtime.jsx)(Provider, objectSpread2_default()(objectSpread2_default()({}, ProviderProps), {}, {
+    children: /*#__PURE__*/(0,jsx_runtime.jsx)(FormContext.Provider, {
+      value: formRefObj,
+      children: children
+    })
+  })));
 };
 /* harmony default export */ var base_src_form_form = (Form);
 ;// CONCATENATED MODULE: ./src/form/form.tsx
@@ -48574,8 +48732,7 @@ var FormFieldSet = function FormFieldSet(props) {
     });
   }
   valueArr.forEach(function (v, i) {
-    var _context$ids$i;
-    if (context.lastValues[i] !== v) {
+    if (context.lastValues.length !== valueArr.length) {
       context.ids[i] = generateUUID();
     }
     result.push( /*#__PURE__*/(0,jsx_runtime.jsx)(Provider, {
@@ -48624,7 +48781,7 @@ var FormFieldSet = function FormFieldSet(props) {
           formFunc === null || formFunc === void 0 || formFunc.spliceError(name, i);
         }
       })
-    }, (_context$ids$i = context.ids[i]) !== null && _context$ids$i !== void 0 ? _context$ids$i : i));
+    }, context.ids[i]));
   });
 
   // 更新 lastValues
@@ -48691,6 +48848,11 @@ var FormButton = function FormButton(props) {
     if (formFunc && props.htmlType === 'button') {
       formFunc.submit();
     }
+    if (formFunc && props.htmlType === 'reset') {
+      // 阻止默认的form reset，改用formFunc.reset。处理嵌套form的reset问题。
+      e.preventDefault();
+      formFunc.reset();
+    }
     if (props.onClick) {
       props.onClick(e);
     }
@@ -48763,7 +48925,7 @@ FormComp.Submit = form_Submit;
 FormComp.Reset = form_Reset;
 FormComp.Flow = form_FormFlow;
 FormComp.useForm = useFormRef;
-FormComp.useFromInstance = useFromInstance;
+FormComp.useFormInstance = useFormInstance;
 /* harmony default export */ var src_form_0 = (FormComp);
 ;// CONCATENATED MODULE: ../base/src/gap/support.ts
 function support_flexGapSupport() {
@@ -50041,7 +50203,7 @@ var Image = function Image(props) {
   var renderDivInnerEl = function renderDivInnerEl(src) {
     var imageDivProps = getImageDivProps({
       style: {
-        backgroundImage: "url(".concat(src, ")")
+        backgroundImage: "url(\"".concat(src, "\")")
       }
     });
     return /*#__PURE__*/(0,jsx_runtime.jsx)("div", objectSpread2_default()({
@@ -57161,6 +57323,7 @@ var Step = function Step(props) {
   var labelPlacement = getLabelPlacement();
   var rootClass = classnames_default()(styles.step, className, styles[status], defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()({}, styles.disabled, disabled), styles.finish, current > index), styles.horizontalLabel, labelPlacement === 'horizontal'), styles.verticalLabel, labelPlacement === 'vertical'), styles.widthDescription, !!description));
   var handleChange = function handleChange(e) {
+    if (disabled) return;
     onClick === null || onClick === void 0 || onClick(e, index, id);
     onChange === null || onChange === void 0 || onChange(index);
   };
@@ -57544,7 +57707,7 @@ var Sticky = function Sticky(props) {
     cancelFixedObserver();
     context.fixedObserver = new IntersectionObserver(handleFixedInter, {
       root: null,
-      rootMargin: "-".concat(top || 0, "px 0px -").concat(bottom || 0, "px 0px"),
+      rootMargin: "".concat(-(top || 0), "px 0px ").concat(-(bottom || 0), "px 0px"),
       threshold: 1.0
     });
   };
@@ -57580,7 +57743,7 @@ var Sticky = function Sticky(props) {
       if (window.IntersectionObserver) {
         var observer = new IntersectionObserver(handleTargetPosition, {
           root: context.target,
-          rootMargin: "-".concat(top || 0, "px 0px -").concat(bottom || 0, "px 0px"),
+          rootMargin: "".concat(-(top || 0), "px 0px ").concat(-(bottom || 0), "px 0px"),
           threshold: 1.0
         });
         context.targetObserver = observer;
@@ -57598,7 +57761,7 @@ var Sticky = function Sticky(props) {
     cancelParentObserver();
     context.parentObserver = new IntersectionObserver(handleParentVisible, {
       root: context.target,
-      rootMargin: "-".concat(top || 0, "px 0px -").concat(bottom || 0, "px 0px"),
+      rootMargin: "".concat(-(top || 0), "px 0px ").concat(-(bottom || 0), "px 0px"),
       threshold: 0
     });
     context.parentObserver.observe(props.parent);
@@ -58472,6 +58635,7 @@ var useTableSort = function useTableSort(props) {
 
 
 
+
 var getExpandData = function getExpandData(_treeData, keys, keygen, treeColumnsName) {
   var expandKeys = keys;
   var expandSet = new Set(expandKeys);
@@ -58572,6 +58736,9 @@ var useTableTree = function useTableTree(props) {
     var newExpandKeys = expandKeysState.filter(function (key) {
       return !unmatchExpandKeys.includes(key);
     });
+    if (shallowEqual(newExpandKeys, expandKeysState)) {
+      return;
+    }
     setExpandKeysState(newExpandKeys);
   }, [unmatchExpandKeys, expandKeysState]);
   return {
@@ -58606,7 +58773,6 @@ function getMaxRowSpanLength(input) {
   }
   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),
     _useState2 = slicedToArray_default()(_useState, 2),
@@ -58639,7 +58805,7 @@ var useTableVirtual = function useTableVirtual(props) {
     var totalLength = props.data.length;
     var _loop = function _loop(i) {
       var startIndex = i;
-      var rowSpanInfo = rowSpanColumns.map(function (col) {
+      var _rowSpanInfo = rowSpanColumns.map(function (col) {
         var rowSpan = col.rowSpan;
         function getRowSpanCount(index, _count) {
           var count = _count;
@@ -58655,7 +58821,7 @@ var useTableVirtual = function useTableVirtual(props) {
         var count = getRowSpanCount(i, 1);
         return [startIndex, startIndex + count - 1];
       });
-      _rowSpanInfos.push(rowSpanInfo);
+      _rowSpanInfos.push(_rowSpanInfo);
     };
     for (var i = 0; i < totalLength; i++) {
       _loop(i);
@@ -58681,10 +58847,12 @@ var useTableVirtual = function useTableVirtual(props) {
       });
       return Math.min.apply(Math, toConsumableArray_default()(startIndexs));
     });
-    var maxRowSpan = getMaxRowSpanLength(resultArr);
-    return maxRowSpan > 1 ? {
+
+    // 根据data计算出实际需要的最大合并行数
+    var _maxRowSpan = getMaxRowSpanLength(resultArr);
+    return _maxRowSpan > 1 ? {
       rowSpanIndexArray: resultArr,
-      maxRowSpan: maxRowSpan
+      maxRowSpan: _maxRowSpan
     } : null;
   }, [props.data, props.columns]);
   var _useRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({
@@ -58741,32 +58909,32 @@ var useTableVirtual = function useTableVirtual(props) {
     }
   });
   var updateIndexAndTopFromTop = function updateIndexAndTopFromTop(scrollTop) {
+    var _props$scrollRef$curr;
     if (props.disabled) return;
     var sum = 0;
     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));
-    }
+    var scrollContainerHeight = Math.max(((_props$scrollRef$curr = props.scrollRef.current) === null || _props$scrollRef$curr === void 0 ? void 0 : _props$scrollRef$curr.clientHeight) || 0, 200);
     for (var i = 0; i <= maxIndex; i++) {
       context.rowSpanRows = 0;
-      sum += context.cachedHeight[i] || props.rowHeight;
-      var rowSpanHeight = 0;
+      var currentRowHeight = context.cachedHeight[i] || props.rowHeight;
+      sum += currentRowHeight;
+      var rowSpanHeight = currentRowHeight;
       if (rowSpanInfo) {
         var siblingsIndexs = [];
-        for (var k = i; k < maxRowSpanLenth + i; k++) {
+        for (var k = i; k < rowSpanInfo.maxRowSpan + i; k++) {
           if (rowSpanInfo.rowSpanIndexArray[k] <= i && k > i) {
             siblingsIndexs.push(k);
           }
         }
         for (var j = 0; j < siblingsIndexs.length; j++) {
-          var index = siblingsIndexs[j];
-          context.rowSpanRows += 1;
-          rowSpanHeight += context.cachedHeight[index] || props.rowHeight;
+          // 在当前滚动容器滚动一屏上方销毁tr，不在可见区域内销毁重建，避免引起可见的单元格（合并的）内容闪烁
+          if (rowSpanHeight < scrollContainerHeight) {
+            var index = siblingsIndexs[j];
+            context.rowSpanRows += 1;
+            rowSpanHeight += context.cachedHeight[index] || props.rowHeight;
+          }
         }
       }
       if (scrollTop < sum + rowSpanHeight || i === maxIndex) {
@@ -59974,23 +60142,30 @@ var Tr = function Tr(props) {
       var col = cols[i];
       if (data[i]) {
         var last = cols[i + (data[i].colSpan || 1) - 1] || {};
+        var isRowSpanTd = data[i].rowSpan > 1;
+        var $tdContent = renderContent(col, data[i].data);
         var td = /*#__PURE__*/(0,jsx_runtime.jsx)("td", {
           colSpan: data[i].colSpan,
           rowSpan: data[i].rowSpan,
-          onMouseEnter: props.hover && hasSiblingRowSpan || data[i].rowSpan > 1 ? function () {
+          onMouseEnter: props.hover && hasSiblingRowSpan || isRowSpanTd ? function () {
             props.handleCellHover(props.rowIndex, data[i].rowSpan);
           } : undefined,
-          onMouseLeave: props.hover && hasSiblingRowSpan || data[i].rowSpan > 1 ? function () {
+          onMouseLeave: props.hover && hasSiblingRowSpan || isRowSpanTd ? 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), 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)),
+          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), isRowSpanTd && 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,
           onClick: props.onCellClick ? function () {
             return handleCellClick(data[i].data, i);
           } : undefined,
-          children: renderContent(col, data[i].data)
+          children: isRowSpanTd ? /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+            style: {
+              height: 0
+            },
+            children: $tdContent
+          }) : $tdContent
         }, col.key);
         tds.push(td);
         if (data[i].colSpan) skip = data[i].colSpan - 1;
@@ -66970,7 +67145,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.5.3'
+  version: '3.5.4-beta.10'
 });
 }();
 /******/ 	return __webpack_exports__;