@ecoding/components.antd 0.3.15 → 0.3.17

package/lib/core/async-select/index.js

@@ -113,7 +113,6 @@ const AsyncSlect = memo((props) => {
                 const res = searchIface.format2 ? jsonFormatNewKey2(resOrigin, searchIface.format2) : searchIface.format ? jsonFormatNewKey(resOrigin, searchIface.format) : resOrigin;
                 setOptions(res);
             }
-            return Promise.reject("没有searchIface");
         });
         timeout = setTimeout(innerEx, 300);
     });

package/lib/core/multiple-upload/index.js

@@ -54,7 +54,6 @@ const SingleFileUpload = (props) => {
                 Loading.show();
                 break;
             case 'done':
-                Loading.hide();
                 const response = info.file.response || {};
                 const file = info.file;
                 const data = response.data || response.model;
@@ -62,6 +61,7 @@ const SingleFileUpload = (props) => {
                     response.code === 0 ||
                     response.success ||
                     response.successed) {
+                    Loading.hide();
                     const tempObj = Object.assign({ name: file.name, url: data.url }, props.extraData);
                     const tempRes = infos.concat([]);
                     tempRes.push(tempObj);
@@ -74,6 +74,7 @@ const SingleFileUpload = (props) => {
                     props.onChange && props.onChange(tempRes);
                 }
                 else {
+                    Loading.hide();
                     Toast.error({
                         mask: true,
                         title: response
@@ -83,6 +84,7 @@ const SingleFileUpload = (props) => {
                 }
                 break;
             case 'error':
+                Loading.hide();
                 Toast.error({
                     mask: true,
                     title: info.file.response
@@ -92,6 +94,7 @@ const SingleFileUpload = (props) => {
                 props.onError && props.onError(info.file);
                 break;
             default:
+                Loading.hide();
                 break;
         }
     };

package/lib/core/single-file-upload/index.js

@@ -14,6 +14,7 @@ import { buildURL } from "@ecoding/helper.url";
 import Toast from "../../core/toast";
 const SingleFileUpload = (props) => {
     const [fileUrl, setFileUrl] = useState('');
+    const [loading, setLoading] = useState(false);
     const action = useMemo(() => {
         if (typeof props.action === "string") {
             return buildURL(props.action, props.actionParams);
@@ -24,6 +25,7 @@ const SingleFileUpload = (props) => {
         // props.onChange && props.onChange(info.file);
         switch (info.file.status) {
             case "uploading":
+                setLoading(true);
                 break;
             case "done":
                 const response = info.file.response || {};
@@ -32,12 +34,14 @@ const SingleFileUpload = (props) => {
                     response.code === 0 ||
                     response.success ||
                     response.successed) {
+                    setLoading(false);
                     const url = data && data.url;
                     setFileUrl(url);
                     props.onChange && props.onChange(url);
                     props.onDone && props.onDone(info.file, data);
                 }
                 else {
+                    setLoading(false);
                     Toast.error({
                         mask: true,
                         title: info.file.response ? info.file.response.msg || info.file.response.message : "服务出错，文件上传失败"
@@ -45,6 +49,7 @@ const SingleFileUpload = (props) => {
                 }
                 break;
             case "error":
+                setLoading(false);
                 Toast.error({
                     mask: true,
                     title: info.file.response ? info.file.response.msg || info.file.response.message : "服务出错，文件上传失败"
@@ -52,6 +57,7 @@ const SingleFileUpload = (props) => {
                 props.onError && props.onError(info.file);
                 break;
             default:
+                setLoading(false);
                 break;
         }
     };
@@ -87,7 +93,7 @@ const SingleFileUpload = (props) => {
                 console.log(e);
                 props.onRemove && props.onRemove(e);
             }, maxCount: 1 },
-            React.createElement(Button, { disabled: props.disabled, icon: props.icon ? React.createElement(UploadOutlined, null) : null }, props.buttonText))));
+            React.createElement(Button, { loading: loading, disabled: props.disabled, icon: props.icon ? React.createElement(UploadOutlined, null) : null }, props.buttonText))));
 };
 SingleFileUpload.defaultProps = {
     name: "file",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ecoding/components.antd",
-    "version": "0.3.15",
+    "version": "0.3.17",
     "author": "cxc",
     "homepage": "",
     "license": "MIT",
@@ -43,5 +43,5 @@
         "antd": "^5.8.4",
         "axios": "^1.1.2"
     },
-    "gitHead": "9e240317e347a7143fcbffd27d9dca40c4f829b6"
+    "gitHead": "b9aa1f40fdf63fae954546b7b2ed6dc12b9960f2"
 }