shineout 3.6.5-beta.5 → 3.6.5-beta.7

package/cjs/index.js

@@ -514,5 +514,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.6.5-beta.5'
+  version: '3.6.5-beta.7'
 };

package/dist/shineout.js

@@ -12217,7 +12217,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.6.5-beta.5');
+/* harmony default export */ var version = ('3.6.5-beta.7');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -34961,11 +34961,11 @@ function useInputAble(props) {
     context.delayChange = function () {
       context.timer = null;
       context.delayChange = null;
-      onChange.apply(void 0, [isFunc(vv) ? vv() : vv].concat(other));
+      onChange.apply(void 0, [vv].concat(other));
       render();
     };
     if (!delay) {
-      onChange.apply(void 0, [isFunc(vv) ? vv() : vv].concat(other));
+      onChange.apply(void 0, [vv].concat(other));
     } else {
       if (context.timer) clearTimeout(context.timer);
       context.timer = setTimeout(context.delayChange, delay);
@@ -66490,6 +66490,7 @@ function attrAccept(file, acceptedFiles) {
 
 
 
+
 var VALIDATORITEMS = [{
   key: 'size',
   param: function param(blob) {
@@ -66648,21 +66649,22 @@ var useUpload = function useUpload(props) {
       responseType: props.responseType,
       onStart: props.onStart,
       onProgress: function onProgress(e, msg) {
-        if (throttle) return;
+        var percent = typeof e.percent === 'number' ? e.percent : e.loaded / e.total * 100;
+        if (throttle && percent !== 100) return;
         throttle = true;
         setTimeout(function () {
           throttle = false;
         }, 16);
-        var percent = typeof e.percent === 'number' ? e.percent : e.loaded / e.total * 100;
-        var filesState = latestState.filesState;
-        var newFiles = objectSpread2_default()({}, filesState);
-        if (!newFiles[id]) return;
-        newFiles[id].process = percent;
-        if (msg) newFiles[id].message = msg;
-        setFiles(newFiles);
-        if (typeof props.onProgress === 'function') {
-          props.onProgress(newFiles[id]);
-        }
+        setFiles(function (files) {
+          return utils_immer_produce(files, function (draft) {
+            if (!draft[id]) return draft;
+            draft[id].process = percent;
+            if (msg) draft[id].message = msg;
+            if (typeof props.onProgress === 'function') {
+              props.onProgress(draft[id]);
+            }
+          });
+        });
       },
       onLoad: function onLoad(xhr) {
         if (!/^2|1223/.test("".concat(xhr.status))) {
@@ -66690,10 +66692,17 @@ var useUpload = function useUpload(props) {
               delete draft[id];
             });
           });
-          // add value
-          props.onChange(function (prev) {
-            return [].concat(toConsumableArray_default()(prev || []), [result]);
-          });
+          if (props.functionalOnChange) {
+            // 回调型 setState不会丢值
+            props.onChange(function (prev) {
+              return [].concat(toConsumableArray_default()(prev || []), [result]);
+            });
+          } else {
+            var latestValue = latestState.value;
+            var newValue = toConsumableArray_default()(latestValue);
+            newValue.push(result);
+            props.onChange(newValue);
+          }
         }
       },
       onError: function onError(xhr) {
@@ -66811,48 +66820,60 @@ var useUpload = function useUpload(props) {
                     error = _context2.sent;
                   case 21:
                     if (!(error instanceof Error)) {
-                      _context2.next = 30;
+                      _context2.next = 29;
                       break;
                     }
                     if (validatorHandle(error, blob)) {
-                      _context2.next = 26;
+                      _context2.next = 25;
                       break;
                     }
-                    delete newFiles[id];
-                    setFiles(objectSpread2_default()({}, newFiles));
+                    setFiles(function (prev) {
+                      return utils_immer_produce(prev, function (draft) {
+                        delete draft[id];
+                      });
+                    });
                     return _context2.abrupt("return", 0);
-                  case 26:
+                  case 25:
                     fileRecord.message = error.message;
                     fileRecord.status = 3;
-                    setFiles(objectSpread2_default()({}, newFiles));
+                    setFiles(function (prev) {
+                      return objectSpread2_default()(objectSpread2_default()({}, prev), {}, defineProperty_default()({}, id, fileRecord));
+                    });
                     return _context2.abrupt("return", 0);
-                  case 30:
+                  case 29:
                     if (!props.beforeUpload) {
-                      _context2.next = 37;
+                      _context2.next = 36;
                       break;
                     }
                     beforeUploadResult = props.beforeUpload(blob); // @ts-ignoreq
                     if (!(beforeUploadResult && beforeUploadResult.then)) {
-                      _context2.next = 35;
+                      _context2.next = 34;
                       break;
                     }
                     props.beforeUpload(blob).then(function (args) {
                       if (args.status !== 'error') {
                         newFiles[id].xhr = uploadFile(id, blob, fileRecord.src);
-                        setFiles(objectSpread2_default()({}, newFiles));
+                        setFiles(function (prev) {
+                          return objectSpread2_default()(objectSpread2_default()({}, prev), {}, defineProperty_default()({}, id, fileRecord));
+                        });
                       }
                     }).catch(function () {
-                      delete newFiles[id];
-                      setFiles(objectSpread2_default()({}, newFiles));
+                      setFiles(function (prev) {
+                        return utils_immer_produce(prev, function (draft) {
+                          delete draft[id];
+                        });
+                      });
                     });
                     return _context2.abrupt("return", 0);
-                  case 35:
-                    _context2.next = 39;
+                  case 34:
+                    _context2.next = 38;
                     break;
-                  case 37:
+                  case 36:
                     fileRecord.xhr = uploadFile(id, blob, fileRecord.src);
-                    setFiles(objectSpread2_default()({}, newFiles));
-                  case 39:
+                    setFiles(function (prev) {
+                      return objectSpread2_default()(objectSpread2_default()({}, prev), {}, defineProperty_default()({}, id, fileRecord));
+                    });
+                  case 38:
                   case "end":
                     return _context2.stop();
                 }
@@ -67250,7 +67271,8 @@ var Upload = function Upload(props0) {
         invalidImage: getLocale(locale, 'invalidImage')
       },
       value: value,
-      onChange: onChange
+      onChange: onChange,
+      functionalOnChange: props.functionalOnChange
     })),
     func = _useUpload.func,
     files = _useUpload.files,
@@ -70034,7 +70056,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.6.5-beta.5'
+  version: '3.6.5-beta.7'
 });
 }();
 /******/ 	return __webpack_exports__;