shineout 3.8.0-beta.41 → 3.8.0-beta.42

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.8.0-beta.41'
+  version: '3.8.0-beta.42'
 };

package/dist/shineout.js

@@ -12386,7 +12386,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.8.0-beta.41');
+/* harmony default export */ var version = ('3.8.0-beta.42');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -29832,7 +29832,11 @@ var uploadStyle = {
     width: src.uploadImageResultMaskIconSize,
     height: src.uploadImageResultMaskIconSize,
     borderColor: src.uploadImageResultMaskIconColor,
-    borderTopColor: 'transparent'
+    borderTopColor: 'transparent',
+    '$resultText &': {
+      borderColor: src.uploadResultUploadingIconColor,
+      borderTopColor: 'transparent'
+    }
   },
   imageResultMaskInfo: {
     lineHeight: src.lineHeightDynamic,
@@ -69945,6 +69949,23 @@ var upload_result_Result = function Result(props) {
     }),
     context = _useRef.current;
   var renderText = function renderText() {
+    var $loading;
+    if (status === 1) {
+      if (props.process !== -1) {
+        $loading = /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+          className: uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.resultProgressText,
+          children: [Math.min(99, Math.floor(props.process || 0)), "%"]
+        });
+      } else {
+        $loading = /*#__PURE__*/(0,jsx_runtime.jsx)(src_spin_spin, {
+          size: 'null',
+          jssStyle: props.jssStyle,
+          name: 'ring',
+          ignoreConfig: true,
+          className: uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.imageResultLoading
+        });
+      }
+    }
     return /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
       children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
         className: uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.resultText,
@@ -69956,12 +69977,9 @@ var upload_result_Result = function Result(props) {
           children: [name, message && /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
             children: ["(", message, ") "]
           })]
-        }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+        }), $loading && /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
           className: uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.resultTextFooter,
-          children: status === 1 && props.process !== -1 && /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
-            className: uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.resultProgressText,
-            children: [Math.min(99, Math.floor(props.process || 0)), "%"]
-          })
+          children: $loading
         })]
       }), props.removeAble && /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
         className: classnames_default()(uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.resultClose, uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.icon, uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.iconHover, status === 3 && (uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.resultErrorClose)),
@@ -72941,7 +72959,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.8.0-beta.41'
+  version: '3.8.0-beta.42'
 });
 }();
 /******/ 	return __webpack_exports__;