shineout 3.9.11-beta.4 → 3.9.11-beta.6

package/cjs/index.js

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

package/dist/shineout.js

@@ -12402,7 +12402,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.9.11-beta.4');
+/* harmony default export */ var version = ('3.9.11-beta.6');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -22303,26 +22303,26 @@ var modalStyle = objectSpread2_default()(objectSpread2_default()({
     }
   },
   wrapperDrawerLeft: {
-    '& $panel': {
+    '& > $mask > $panel': {
       left: 0,
       height: '100vh'
     }
   },
   wrapperDrawerRight: {
-    '& $panel': {
+    '& > $mask > $panel': {
       right: 0,
       height: '100vh'
     }
   },
   wrapperDrawerTop: {
-    '& $panel': {
+    '& > $mask > $panel': {
       top: 0,
       left: 0,
       width: '100vw'
     }
   },
   wrapperDrawerBottom: {
-    '& $panel': {
+    '& > $mask > $panel': {
       bottom: 0,
       left: 0,
       width: '100vw'
@@ -56204,7 +56204,8 @@ var useNumberFormat = function useNumberFormat(props) {
     step = _props$step === void 0 ? 1 : _props$step,
     cancelBlurChange = props.cancelBlurChange,
     disabled = props.disabled,
-    coin = props.coin;
+    coin = props.coin,
+    defaultValue = props.defaultValue;
   var getStringValue = function getStringValue(value) {
     if (value === undefined) return value;
     if (typeof value === 'number') {
@@ -56217,8 +56218,10 @@ var useNumberFormat = function useNumberFormat(props) {
     _React$useState2 = slicedToArray_default()(_React$useState, 2),
     inernalInputValue = _React$useState2[0],
     setInternalInputValue = _React$useState2[1];
+  var focusedRef = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useRef(false);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
-    if (props.value !== inernalInputValue) {
+    // 聚焦编辑期间不同步外部值，避免 form 回填 defaultValue 覆盖用户输入
+    if (props.value !== inernalInputValue && !focusedRef.current) {
       setInternalInputValue(getStringValue(props.value));
     }
   }, [props.value]);
@@ -56245,8 +56248,10 @@ var useNumberFormat = function useNumberFormat(props) {
       if (val.endsWith('.') || val.includes('.') && val.endsWith('0')) return;
       var num = parseFloat(val);
       if (val === '') {
-        // 如果允许空值，则返回 null，否则返回 undefined
-        onChange === null || onChange === void 0 || onChange(allowNull ? null : undefined);
+        // 聚焦编辑期间清空发送 null 而非 undefined
+        // 因为 form 层的 defaultValue 回填仅检查 value === undefined
+        // 发送 null 可以让 form 数据跟随更新，同时避免触发回填
+        onChange === null || onChange === void 0 || onChange(focusedRef.current ? null : allowNull ? null : undefined);
         return;
       }
       if (isNaN(num)) return;
@@ -56257,9 +56262,27 @@ var useNumberFormat = function useNumberFormat(props) {
     ;
   });
   var onNumberBlur = use_persist_fn(function (e) {
+    focusedRef.current = false;
     var target = e.target;
     var newValue = target.value;
 
+    // 输入为空且有 defaultValue 时，失焦恢复为 defaultValue
+    if (newValue === '' && defaultValue != null) {
+      var _num = typeof defaultValue === 'number' ? defaultValue : parseFloat(String(defaultValue));
+      if (isNaN(_num)) _num = 0;
+      if (typeof digits === 'number') {
+        _num = parseFloat(_num.toFixed(digits));
+      }
+      _num = commonFormat(_num);
+      setInternalInputValue(getStringValue(_num));
+      if (_num !== value) {
+        target.value = String(_num);
+        if (!cancelBlurChange) onInnerChange(_num);
+      }
+      onBlur === null || onBlur === void 0 || onBlur(e);
+      return;
+    }
+
     // 没有输入值
     if (newValue === '' && value === undefined) {
       onBlur === null || onBlur === void 0 || onBlur(e);
@@ -56290,6 +56313,11 @@ var useNumberFormat = function useNumberFormat(props) {
     }
     onBlur === null || onBlur === void 0 || onBlur(e);
   });
+  var onNumberFocus = use_persist_fn(function (e) {
+    var _props$onFocus;
+    focusedRef.current = true;
+    (_props$onFocus = props.onFocus) === null || _props$onFocus === void 0 || _props$onFocus.call(props, e);
+  });
   var onNumberChange = use_persist_fn(function (value) {
     var result = value;
     onInnerChange(result);
@@ -56326,7 +56354,7 @@ var useNumberFormat = function useNumberFormat(props) {
     coin: coin,
     onChange: onNumberChange,
     onBlur: onNumberBlur,
-    onFocus: props.onFocus,
+    onFocus: onNumberFocus,
     cancelBlurChange: true
   })), {}, {
     onPlus: handlePlus,
@@ -56377,7 +56405,8 @@ var InputNumber = function InputNumber(props) {
   var _useInputNumber = use_input_number(objectSpread2_default()({
       value: commonProps.value,
       onChange: commonProps.onChange,
-      disabled: !!commonProps.disabled
+      disabled: !!commonProps.disabled,
+      defaultValue: props.defaultValue
     }, numberFormatParams)),
     onMinus = _useInputNumber.onMinus,
     onPlus = _useInputNumber.onPlus,
@@ -75510,7 +75539,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.9.11-beta.4'
+  version: '3.9.11-beta.6'
 });
 }();
 /******/ 	return __webpack_exports__;