@ecoding/components.antd 0.5.14 → 0.5.16

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

@@ -12,6 +12,7 @@ import { Upload, message, Button, Popover, Typography, Space, Empty } from 'antd
 import { UploadOutlined, LinkOutlined, DeleteOutlined, EllipsisOutlined } from '@ant-design/icons';
 import { buildURL } from '@ecoding/helper.url';
 import Toast from "../../core/toast";
+import Loading from "../../core/loading";
 const InfosRender = ({ infos, updateItems, domain, nameKey }) => {
     const remove = (i) => {
         const temp = infos.concat([]);
@@ -47,6 +48,7 @@ const InfosRender = ({ infos, updateItems, domain, nameKey }) => {
 const MultipleUpload = (props) => {
     const { value, domain, onChange, valueKey, objectInValue, nameKey } = props;
     const isInnerChange = useRef(false);
+    const isInnerDone = useRef([]);
     const [infos, setInfos] = useState(() => {
         return [];
     });
@@ -88,15 +90,19 @@ const MultipleUpload = (props) => {
             const urls = temp.map((item) => domain ? item.url.replace(domain, '') : item.url);
             onChange && onChange(!isEmpty ? urls : undefined);
         }
-        if (open) {
-            setOpen(true);
-            clearTimeout(timeout.current);
-            timeout.current = setTimeout(() => {
-                setOpen(undefined);
-            }, 3000);
+        if (isInnerDone.current.length == newItems.length) {
+            if (open) {
+                setOpen(true);
+                clearTimeout(timeout.current);
+                timeout.current = setTimeout(() => {
+                    setOpen(undefined);
+                }, 3000);
+            }
+            Loading.hide();
         }
     };
     const handleChange = ({ fileList }) => {
+        Loading.show();
         fileList && fileList.forEach((file) => {
             if (file.status == "done") {
                 const response = file.response || {};
@@ -107,6 +113,7 @@ const MultipleUpload = (props) => {
                     const data = response.data || response.model;
                     file.url = data && data[valueKey || "url"];
                     file.responseData = data;
+                    isInnerDone.current.push(true);
                     delete file.response;
                     delete file.xhr;
                     delete file.lastModifiedDate;
@@ -114,6 +121,7 @@ const MultipleUpload = (props) => {
                 }
             }
             else if (file.status === "error") {
+                Loading.hide();
                 Toast.error({
                     mask: true,
                     title: file.response ? file.response.msg || file.response.message : `${props.i18n ? props.i18n.$t('global.upload.error.img') : '服务出错，文件上传失败'}`
@@ -144,9 +152,13 @@ const MultipleUpload = (props) => {
             isInnerChange.current = false;
             return;
         }
+        if (!value) {
+            setInfos([]);
+        }
         if (value && value.length > 0) {
             const temp = [];
             value.forEach((item, index) => {
+                isInnerDone.current.push(true);
                 if (typeof item === "string" && item) {
                     // 防止重复拼接domain
                     item = domain ? item.replace(domain, "") : item;

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

@@ -222,6 +222,9 @@ const MultipleImgUpload = (props) => {
             isInnerChange.current = false;
             return;
         }
+        if (!value) {
+            setImgList([]);
+        }
         if (value && value.length > 0) {
             const temp = [];
             value.forEach((item, index) => {

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

@@ -13,7 +13,7 @@ import { UploadOutlined } from "@ant-design/icons";
 import { buildURL } from "@ecoding/helper.url";
 import Toast from "../../core/toast";
 const SingleFileUpload = (props) => {
-    const [fileUrl, setFileUrl] = useState('');
+    const [fileUrl, setFileUrl] = useState(undefined);
     const [loading, setLoading] = useState(false);
     const action = useMemo(() => {
         if (typeof props.action === "string") {
@@ -93,6 +93,9 @@ const SingleFileUpload = (props) => {
     }, []);
     useEffect(() => {
         let item = props.value;
+        if (!item) {
+            setFileUrl(undefined);
+        }
         if (typeof item === "string" && (item || item == '') && fileUrl != item) {
             // 防止重复拼接domain
             item = props.domain ? item.replace(props.domain, "") : item;

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

@@ -166,6 +166,9 @@ const ImgUpload = (props) => {
         React.createElement("div", { style: { marginTop: 8 } }, props.buttonText))), [loading]);
     useEffect(() => {
         let item = props.value;
+        if (!item) {
+            setImageUrl(undefined);
+        }
         if (typeof item === "string" && item) {
             // 防止重复拼接domain
             item = props.domain ? item.replace(props.domain, "") : item;

package/lib/core/table-pro/filters.horizontal.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 interface IProps {
     items: React.ReactElement[];
+    itemValues?: any;
     overMax?: number;
     colOpts?: any;
     onFinish?: (v: any) => Promise<void>;

package/lib/core/table-pro/filters.horizontal.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import React, { useRef, useEffect, useState, useMemo, memo } from 'react';
 import { Button, Form, Row, Col, Space } from 'antd';
 import { DownOutlined, UpOutlined } from '@ant-design/icons';
-const FiltersHorizontal = ({ items, onFinish, onClear, y, setY, overMax, colOpts, searchText, resetText, i18n }) => {
+const FiltersHorizontal = ({ items, itemValues, onFinish, onClear, y, setY, overMax, colOpts, searchText, resetText, i18n }) => {
     const [form] = Form.useForm(); // 该组件内form全局变量
     const ref = useRef(null);
     const refInitY = useRef(undefined);
@@ -71,6 +71,9 @@ const FiltersHorizontal = ({ items, onFinish, onClear, y, setY, overMax, colOpts
                 setShowMore(true);
                 setWrapH(110);
             }
+            if (itemValues) {
+                form.setFieldsValue(itemValues);
+            }
         }
     }, []);
     useEffect(() => {

package/lib/core/table-pro/index.d.ts

@@ -17,6 +17,7 @@ interface IProps {
         overMax?: number;
         colOpts?: ColProps;
         items: React.ReactElement[];
+        itemValues?: any;
         onFinish?: (v: any) => Promise<void>;
         onClear?: () => Promise<void>;
         searchText?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ecoding/components.antd",
-    "version": "0.5.14",
+    "version": "0.5.16",
     "author": "cxc",
     "homepage": "",
     "license": "MIT",
@@ -47,5 +47,5 @@
         "antd": "^6.0.0",
         "axios": "^1.1.2"
     },
-    "gitHead": "63dbd74fd806139370f6f812cc712756866283ff"
+    "gitHead": "078ccdbbe6892e97efd42efdd2afbe123be1daef"
 }