assui 3.0.33 → 3.0.35

package/es/single-img-upload/index.js

@@ -175,9 +175,11 @@ import * as React from 'react';
 import Upload from 'rc-upload';
 import Progress from "antd/es/progress";
 import Image from "antd/es/image";
+import Spin from "antd/es/spin";
 import classNames from 'classnames';
 import useUpdateEffect from "ahooks/es/useUpdateEffect";
 import CloseOutlined from "a-icons/es/CloseOutlined";
+import heic2Jpeg from "aa-utils/es/heic2Jpeg";
 import isObject from 'lodash/isObject';
 var getLocalImgURL = function getLocalImgURL(file) {
   var URL = window.URL || window.webkitURL;
@@ -209,13 +211,22 @@ var SingleImgUpload = function SingleImgUpload(props) {
   var _c = __read(React.useState(0), 2),
     uploadPercent = _c[0],
     setUploadPercent = _c[1];
+  var _d = __read(React.useState(false), 2),
+    imageLoading = _d[0],
+    setImageLoading = _d[1];
   useUpdateEffect(function () {
     setFileUrl(value);
-    if (value) {
-      setUploadStatus('done');
-    } else {
-      setUploadStatus('init');
-    }
+    setImageLoading(true);
+    heic2Jpeg(value).then(function (resultUrl) {
+      setFileUrl(resultUrl);
+      if (value) {
+        setUploadStatus('done');
+      } else {
+        setUploadStatus('init');
+      }
+    })["finally"](function () {
+      setImageLoading(false);
+    });
   }, [value]);
   var onBeforeUpload = function onBeforeUpload() {
     var rest = [];
@@ -298,7 +309,9 @@ var SingleImgUpload = function SingleImgUpload(props) {
   }), /*#__PURE__*/React.createElement("div", {
     className: "as-img-upload-close-button",
     onClick: cancelUpload
-  }, /*#__PURE__*/React.createElement(CloseOutlined, null))), uploadStatus === 'done' && /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement(CloseOutlined, null))), uploadStatus === 'done' && /*#__PURE__*/React.createElement(Spin, {
+    spinning: imageLoading
+  }, /*#__PURE__*/React.createElement("div", {
     className: "as-img-upload-content"
   }, /*#__PURE__*/React.createElement(Image, {
     wrapperClassName: "as-img-upload-preview",
@@ -307,7 +320,7 @@ var SingleImgUpload = function SingleImgUpload(props) {
   }), !disabled && /*#__PURE__*/React.createElement("div", {
     className: "as-img-upload-close-button",
     onClick: handleDeleteUpload
-  }, /*#__PURE__*/React.createElement(CloseOutlined, null))), /*#__PURE__*/React.createElement(Upload, __assign({
+  }, /*#__PURE__*/React.createElement(CloseOutlined, null)))), /*#__PURE__*/React.createElement(Upload, __assign({
     ref: function ref(uploader) {
       uploadInstanceRef.current = uploader;
     },

package/es/single-img-upload/style/index.css

@@ -1309,6 +1309,10 @@ html {
   color: #fff;
   text-align: center;
 }
+.as-img-upload .ant-spin-container,
+.as-img-upload .ant-spin-nested-loading {
+  height: 100%;
+}
 .init-disable {
   color: rgba(0, 0, 0, 0.25);
   background-color: #f5f5f5;

package/es/single-img-upload/style/index.d.ts

@@ -1,3 +1,4 @@
 import 'antd/lib/image/style';
 import 'antd/lib/progress/style';
+import 'antd/lib/spin/style';
 import './index.less';

package/es/single-img-upload/style/index.js

@@ -1,3 +1,4 @@
 import "antd/es/image/style";
 import "antd/es/progress/style";
+import "antd/es/spin/style";
 import './index.less';

package/es/single-img-upload/style/index.less

@@ -88,6 +88,12 @@
       text-align: center;
     }
   }
+
+  .@{ant-prefix}-spin-container,
+  .@{ant-prefix}-spin-nested-loading {
+    height: 100%;
+  }
+
 }
 
 .init-disable {

package/lib/single-img-upload/index.js

@@ -218,9 +218,11 @@ var React = __importStar(require("react"));
 var rc_upload_1 = __importDefault(require("rc-upload"));
 var progress_1 = __importDefault(require("antd/lib/progress"));
 var image_1 = __importDefault(require("antd/lib/image"));
+var spin_1 = __importDefault(require("antd/lib/spin"));
 var classnames_1 = __importDefault(require("classnames"));
 var useUpdateEffect_1 = __importDefault(require("ahooks/lib/useUpdateEffect"));
 var CloseOutlined_1 = __importDefault(require("a-icons/lib/CloseOutlined"));
+var heic2Jpeg_1 = __importDefault(require("aa-utils/lib/heic2Jpeg"));
 var isObject_1 = __importDefault(require("lodash/isObject"));
 var getLocalImgURL = function getLocalImgURL(file) {
   var URL = window.URL || window.webkitURL;
@@ -252,13 +254,22 @@ var SingleImgUpload = function SingleImgUpload(props) {
   var _c = __read(React.useState(0), 2),
     uploadPercent = _c[0],
     setUploadPercent = _c[1];
+  var _d = __read(React.useState(false), 2),
+    imageLoading = _d[0],
+    setImageLoading = _d[1];
   (0, useUpdateEffect_1["default"])(function () {
     setFileUrl(value);
-    if (value) {
-      setUploadStatus('done');
-    } else {
-      setUploadStatus('init');
-    }
+    setImageLoading(true);
+    (0, heic2Jpeg_1["default"])(value).then(function (resultUrl) {
+      setFileUrl(resultUrl);
+      if (value) {
+        setUploadStatus('done');
+      } else {
+        setUploadStatus('init');
+      }
+    })["finally"](function () {
+      setImageLoading(false);
+    });
   }, [value]);
   var onBeforeUpload = function onBeforeUpload() {
     var rest = [];
@@ -341,7 +352,9 @@ var SingleImgUpload = function SingleImgUpload(props) {
   }), React.createElement("div", {
     className: "as-img-upload-close-button",
     onClick: cancelUpload
-  }, React.createElement(CloseOutlined_1["default"], null))), uploadStatus === 'done' && React.createElement("div", {
+  }, React.createElement(CloseOutlined_1["default"], null))), uploadStatus === 'done' && React.createElement(spin_1["default"], {
+    spinning: imageLoading
+  }, React.createElement("div", {
     className: "as-img-upload-content"
   }, React.createElement(image_1["default"], {
     wrapperClassName: "as-img-upload-preview",
@@ -350,7 +363,7 @@ var SingleImgUpload = function SingleImgUpload(props) {
   }), !disabled && React.createElement("div", {
     className: "as-img-upload-close-button",
     onClick: handleDeleteUpload
-  }, React.createElement(CloseOutlined_1["default"], null))), React.createElement(rc_upload_1["default"], __assign({
+  }, React.createElement(CloseOutlined_1["default"], null)))), React.createElement(rc_upload_1["default"], __assign({
     ref: function ref(uploader) {
       uploadInstanceRef.current = uploader;
     },

package/lib/single-img-upload/style/index.css

@@ -1309,6 +1309,10 @@ html {
   color: #fff;
   text-align: center;
 }
+.as-img-upload .ant-spin-container,
+.as-img-upload .ant-spin-nested-loading {
+  height: 100%;
+}
 .init-disable {
   color: rgba(0, 0, 0, 0.25);
   background-color: #f5f5f5;

package/lib/single-img-upload/style/index.d.ts

@@ -1,3 +1,4 @@
 import 'antd/lib/image/style';
 import 'antd/lib/progress/style';
+import 'antd/lib/spin/style';
 import './index.less';

package/lib/single-img-upload/style/index.js

@@ -5,4 +5,5 @@ Object.defineProperty(exports, "__esModule", {
 });
 require("antd/lib/image/style");
 require("antd/lib/progress/style");
+require("antd/lib/spin/style");
 require("./index.less");

package/lib/single-img-upload/style/index.less

@@ -88,6 +88,12 @@
       text-align: center;
     }
   }
+
+  .@{ant-prefix}-spin-container,
+  .@{ant-prefix}-spin-nested-loading {
+    height: 100%;
+  }
+
 }
 
 .init-disable {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "assui",
-  "version": "3.0.33",
+  "version": "3.0.35",
   "description": "react ui library",
   "author": "jason <usochen@gmail.com>",
   "main": "./lib/index.js",
@@ -36,7 +36,7 @@
     "@types/react-color": "^3.0.6",
     "@types/react-resizable": "^3.0.0",
     "a-icons": "^1.1.13",
-    "aa-utils": "^2.1.12",
+    "aa-utils": "^2.1.13",
     "ahooks": "^3.0.8",
     "bignumber.js": "^9.0.1",
     "copy-to-clipboard": "^3.3.1",
@@ -80,5 +80,5 @@
     "node": ">=10.0.0"
   },
   "license": "MIT",
-  "gitHead": "6d872c04f651087e5054682a3df6936a74d4c70e"
+  "gitHead": "1f3311be7cff2f462b91a9482f165fd42f2bf8f2"
 }