shineout 3.3.7-beta.2 → 3.3.7-beta.3

package/cjs/index.js

@@ -476,5 +476,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.3.7-beta.2'
+  version: '3.3.7-beta.3'
 };

package/dist/shineout.js

@@ -11968,7 +11968,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.3.7-beta.2');
+/* harmony default export */ var version = ('3.3.7-beta.3');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -31974,10 +31974,10 @@ function useInputAble(props) {
       clearTimeout(context.timer);
       context.timer = null;
     }
-    if (delay && props.value !== stateValue) {
+    if (delay && control && props.value !== stateValue) {
       changeStateValue(props.value);
     }
-  }, [props.value, delay]);
+  }, [props.value, delay, control]);
   var forceDelayChange = use_persist_fn(function () {
     if (context.timer && context.delayChange) {
       clearTimeout(context.timer);
@@ -32795,6 +32795,9 @@ var useInnerTitle = function useInnerTitle(props) {
 
 
 
+var emptyEvent = function emptyEvent(e) {
+  return e.stopPropagation();
+};
 var Popover = function Popover(props) {
   var _jssStyle$popover;
   var children = props.children,
@@ -32936,6 +32939,7 @@ var Popover = function Popover(props) {
         dir: config.direction
       }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
         style: style,
+        onClick: emptyEvent,
         className: classnames_default()(popoverStyle === null || popoverStyle === void 0 ? void 0 : popoverStyle.content, (typeof childrened === 'string' || props.useTextStyle) && (popoverStyle === null || popoverStyle === void 0 ? void 0 : popoverStyle.text)),
         children: /*#__PURE__*/(0,jsx_runtime.jsx)(Provider, {
           value: providerValue,
@@ -47801,6 +47805,8 @@ var InputPassword = function InputPassword(props) {
 
 
 
+
+
 var useNumberFormat = function useNumberFormat(props) {
   var onChange = props.onChange,
     value = props.value,
@@ -47823,6 +47829,15 @@ var useNumberFormat = function useNumberFormat(props) {
     }
     return value || '';
   };
+  var _React$useState = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useState(getStringValue(props.value)),
+    _React$useState2 = slicedToArray_default()(_React$useState, 2),
+    inernalInputValue = _React$useState2[0],
+    setInternalInputValue = _React$useState2[1];
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
+    if (props.value !== inernalInputValue) {
+      setInternalInputValue(getStringValue(props.value));
+    }
+  }, [props.value]);
   var getNumberValue = function getNumberValue(value) {
     if (isNaN(value)) return 0;
     if (typeof value === 'number') {
@@ -47840,6 +47855,17 @@ var useNumberFormat = function useNumberFormat(props) {
     }
     return num;
   };
+  var onInnerChange = use_persist_fn(function (val) {
+    setInternalInputValue(getStringValue(val));
+    if (typeof val === 'string') {
+      var num = parseFloat(val);
+      if (isNaN(num)) return;
+      onChange === null || onChange === void 0 || onChange(num);
+    } else {
+      onChange === null || onChange === void 0 || onChange(val);
+    }
+    ;
+  });
   var onNumberBlur = use_persist_fn(function (e) {
     var target = e.target;
     var newValue = target.value;
@@ -47850,7 +47876,7 @@ var useNumberFormat = function useNumberFormat(props) {
       return;
     }
     if (newValue === '' && allowNull) {
-      onChange === null || onChange === void 0 || onChange(null);
+      onInnerChange(null);
       onBlur === null || onBlur === void 0 || onBlur(e);
       return;
     }
@@ -47865,15 +47891,18 @@ var useNumberFormat = function useNumberFormat(props) {
       num = parseFloat(num.toFixed(digits));
     }
     num = commonFormat(num);
+
+    // 失焦时，将非法值转换为合法值
+    setInternalInputValue(getStringValue(num));
     if (num !== value) {
       target.value = typeof num === 'number' ? String(num) : '';
-      if (!cancelBlurChange) onChange === null || onChange === void 0 || onChange(num);
+      if (!cancelBlurChange) onInnerChange(num);
     }
     onBlur === null || onBlur === void 0 || onBlur(e);
   });
   var onNumberChange = use_persist_fn(function (value) {
     var result = value;
-    onChange === null || onChange === void 0 || onChange(result);
+    onInnerChange(result);
   });
   var changeValue = function changeValue(mod) {
     var num = getNumberValue(props.value);
@@ -47899,7 +47928,7 @@ var useNumberFormat = function useNumberFormat(props) {
     changeValue(-step);
   });
   return objectSpread2_default()(objectSpread2_default()({}, use_input_format({
-    value: getStringValue(props.value),
+    value: inernalInputValue,
     type: 'number',
     numType: numType,
     integerLimit: integerLimit,
@@ -58918,12 +58947,15 @@ var useTransfer = function useTransfer(props) {
     _useState4 = slicedToArray_default()(_useState3, 2),
     filterTargetText = _useState4[0],
     setFilterTargetText = _useState4[1];
+  var handleSelectedChange = function handleSelectedChange(_value, source, target) {
+    onSelectChangeProp === null || onSelectChangeProp === void 0 || onSelectChangeProp(source, target);
+  };
   var _useInputAble = useInputAble({
       value: selectValue,
       defaultValue: defaultSelectValue,
       control: selectControl,
       beforeChange: undefined,
-      onChange: onSelectChangeProp
+      onChange: handleSelectedChange
     }),
     selectedKeys = _useInputAble.value,
     onSelectChange = _useInputAble.onChange;
@@ -58980,24 +59012,12 @@ var useTransfer = function useTransfer(props) {
     return keygen;
   };
   var handleSourceSelectedChange = function handleSourceSelectedChange(value) {
-    if (selectControl) {
-      // 受控情况下整合工作交给用户处理
-      onSelectChange === null || onSelectChange === void 0 || onSelectChange(value, targetSelectedKeys);
-    } else {
-      // 非受控内部直接整合 source target
-      var next = [].concat(toConsumableArray_default()(value), toConsumableArray_default()(targetSelectedKeys));
-      onSelectChange === null || onSelectChange === void 0 || onSelectChange(next);
-    }
+    var next = [].concat(toConsumableArray_default()(value), toConsumableArray_default()(targetSelectedKeys));
+    onSelectChange === null || onSelectChange === void 0 || onSelectChange(next, value, targetSelectedKeys);
   };
   var handleTargetSelectedChange = function handleTargetSelectedChange(value) {
-    if (selectControl) {
-      // 受控情况下整合工作交给用户处理
-      onSelectChange === null || onSelectChange === void 0 || onSelectChange(sourceSelectedKeys, value);
-    } else {
-      // 非受控内部直接整合 source target
-      var next = [].concat(toConsumableArray_default()(sourceSelectedKeys), toConsumableArray_default()(value));
-      onSelectChange === null || onSelectChange === void 0 || onSelectChange(next);
-    }
+    var next = [].concat(toConsumableArray_default()(sourceSelectedKeys), toConsumableArray_default()(value));
+    onSelectChange === null || onSelectChange === void 0 || onSelectChange(next, sourceSelectedKeys, value);
   };
   var sourceDatum = use_list_select_multiple({
     value: sourceSelectedKeys,
@@ -63954,7 +63974,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.3.7-beta.2'
+  version: '3.3.7-beta.3'
 });
 }();
 /******/ 	return __webpack_exports__;