@ecoding/components.antd 0.3.60 → 0.3.62

package/lib/core/async-select/index.d.ts

@@ -31,5 +31,5 @@ interface IProps extends SelectProps<any> {
     onChange?: any;
     onChangeOpts?: any;
 }
-declare const AsyncSlect: React.FC<IProps>;
-export default AsyncSlect;
+declare const AsyncSelect: React.FC<IProps>;
+export default AsyncSelect;

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

@@ -26,7 +26,7 @@ import { isSomething } from "@ecoding/helper.is";
 import { jsonFormatNewKey, jsonFormatNewKey2 } from "@ecoding/helper.json";
 const { Option } = Select;
 let timeout;
-const AsyncSlect = memo((props) => {
+const AsyncSelect = memo((props) => {
     const r = http.getRequest();
     const [loading, setLoading] = useState(true);
     const [options, setOptions] = useState([]);
@@ -37,57 +37,57 @@ const AsyncSlect = memo((props) => {
         const { onChange, searchIface, data, iface } = p, rest = __rest(p, ["onChange", "searchIface", "data", "iface"]);
         return rest;
     };
-    useEffect(() => {
-        const ex = () => __awaiter(void 0, void 0, void 0, function* () {
-            const innerEx = () => __awaiter(void 0, void 0, void 0, function* () {
-                var _a;
-                // 获得第一个接口信息
-                if (data) {
-                    const res = data.format2 ? jsonFormatNewKey2(data.datas, data.format2) : data.format ? jsonFormatNewKey(data.datas, data.format) : data.datas;
-                    return Promise.resolve(res);
+    const initEx = () => __awaiter(void 0, void 0, void 0, function* () {
+        var _a;
+        // 获得第一个接口信息
+        if (data) {
+            const res = data.format2 ? jsonFormatNewKey2(data.datas, data.format2) : data.format ? jsonFormatNewKey(data.datas, data.format) : data.datas;
+            return Promise.resolve(res);
+        }
+        let params = {};
+        if (iface) {
+            if (iface.paramKey) {
+                // 设置接口调用参数
+                params[iface.paramKey] = iface.paramValue;
+            }
+            if (iface.params) {
+                params = Object.assign({}, params, iface.params);
+            }
+            let resOrigin = [];
+            // 这里支持了外部直接传入列表结果
+            const cache = isSomething(iface.cache) ? iface.cache : false;
+            if (((_a = iface.method) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase()) === "post") {
+                resOrigin = yield r.post(iface.url, params, { cache });
+            }
+            else {
+                resOrigin = yield r.get(iface.url, params, { cache });
+            }
+            // 指定数据key
+            if (iface && iface.fromKey) {
+                if (Array.isArray(iface.fromKey)) {
+                    iface.fromKey.forEach((key) => {
+                        resOrigin = resOrigin[key];
+                    });
                 }
-                let params = {};
-                if (iface) {
-                    if (iface.paramKey) {
-                        // 设置接口调用参数
-                        params[iface.paramKey] = iface.paramValue;
-                    }
-                    if (iface.params) {
-                        params = Object.assign({}, params, iface.params);
-                    }
-                    let resOrigin = [];
-                    // 这里支持了外部直接传入列表结果
-                    const cache = isSomething(iface.cache) ? iface.cache : false;
-                    if (((_a = iface.method) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase()) === "post") {
-                        resOrigin = yield r.post(iface.url, params, { cache });
-                    }
-                    else {
-                        resOrigin = yield r.get(iface.url, params, { cache });
-                    }
-                    // 指定数据key
-                    if (iface && iface.fromKey) {
-                        if (Array.isArray(iface.fromKey)) {
-                            iface.fromKey.forEach((key) => {
-                                resOrigin = resOrigin[key];
-                            });
-                        }
-                        else {
-                            resOrigin = resOrigin[iface.fromKey];
-                        }
-                    }
-                    const res = iface.format2 ? jsonFormatNewKey2(resOrigin, iface.format2) : iface.format ? jsonFormatNewKey(resOrigin, iface.format) : resOrigin;
-                    return Promise.resolve(res);
+                else {
+                    resOrigin = resOrigin[iface.fromKey];
                 }
-                return Promise.reject("没有iface或data");
-            });
-            const res = yield innerEx();
+            }
+            const res = iface.format2 ? jsonFormatNewKey2(resOrigin, iface.format2) : iface.format ? jsonFormatNewKey(resOrigin, iface.format) : resOrigin;
+            return Promise.resolve(res);
+        }
+        return Promise.reject("没有iface或data");
+    });
+    useEffect(() => {
+        const ex = () => __awaiter(void 0, void 0, void 0, function* () {
+            const res = yield initEx();
             setOptions(res);
             setLoading(false);
         });
         ex();
     }, [data, iface]);
     const handleSearch = (newValue) => __awaiter(void 0, void 0, void 0, function* () {
-        if (!newValue || !searchIface) {
+        if (!searchIface) {
             return null;
         }
         if (timeout) {
@@ -95,8 +95,13 @@ const AsyncSlect = memo((props) => {
             timeout = null;
         }
         const innerEx = () => __awaiter(void 0, void 0, void 0, function* () {
-            var _a;
+            var _b;
             let params = {};
+            if (!newValue) {
+                const res = yield initEx();
+                setOptions(res);
+                return;
+            }
             if (searchIface) {
                 if (searchIface.paramKey) {
                     // 设置接口调用参数
@@ -108,7 +113,7 @@ const AsyncSlect = memo((props) => {
                 let resOrigin = [];
                 // 这里支持了外部直接传入列表结果
                 const cache = isSomething(searchIface.cache) ? searchIface.cache : false;
-                if (((_a = searchIface.method) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase()) === "post") {
+                if (((_b = searchIface.method) === null || _b === void 0 ? void 0 : _b.toLocaleLowerCase()) === "post") {
                     resOrigin = yield r.post(searchIface.url, params, { cache });
                 }
                 else {
@@ -151,4 +156,4 @@ const AsyncSlect = memo((props) => {
             return option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
         }, allowClear: true, showSearch: true, onSearch: handleSearch, optionFilterProp: "children" }, getRest(props), { onChange: changeHandler }), children));
 });
-export default AsyncSlect;
+export default AsyncSelect;

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

@@ -11,8 +11,6 @@ import React, { useState, useCallback, useMemo } from 'react';
 import { Upload, Image as Img, Alert, Flex, message } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
 import { buildURL } from "@ecoding/helper.url";
-import Toast from "../../core/toast";
-import Loading from "../../core/loading";
 import { DndContext, PointerSensor, useSensor } from '@dnd-kit/core';
 import { arrayMove, SortableContext, useSortable, horizontalListSortingStrategy, } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
@@ -63,39 +61,17 @@ const MultipleImgUpload = (props) => {
         });
         onChange && (onChange === null || onChange === void 0 ? void 0 : onChange(!isEmpty ? urls : undefined));
     };
-    const handleChange = (info) => {
-        switch (info.file.status) {
-            case 'uploading':
-                Loading.show();
-                break;
-            case 'done': {
-                Loading.hide();
-                const response = info.file.response;
-                if (response && response.code === 200) {
-                    const data = response.data || {};
-                    const temp = imgList.concat([Object.assign({}, data)]);
-                    updateItems(temp);
-                }
-                else {
-                    Toast.error({
-                        mask: true,
-                        title: response.message || '服务出错，图片上传失败'
-                    });
-                }
-                break;
+    const handleChange = ({ fileList }) => {
+        fileList && fileList.forEach((item) => {
+            if (item.status == "done" && item.response.code == 200 && item.response.data) {
+                item.url = item.response.data.url;
             }
-            case 'error': {
-                const response = info.file.response;
-                Toast.error({
-                    mask: true,
-                    title: response.message || '服务出错，图片上传失败'
-                });
-                Loading.hide();
-                break;
-            }
-            default:
-                break;
-        }
+        });
+        updateItems(fileList);
+        // if (len) {
+        //     return;
+        // }
+        // updateItems(fileList)
     };
     const handleRemove = (file) => {
         const lefts = imgList.filter(item => item.uid !== file.uid);
@@ -221,7 +197,7 @@ MultipleImgUpload.defaultProps = {
     action: "/api/upload/img",
     name: "file",
     gif: false,
-    buttonText: '上传图片',
+    buttonText: 'Upload',
     data: {},
     actionParams: {},
     opts: {

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

@@ -122,7 +122,7 @@ MultiPileImgUpload.defaultProps = {
     action: '/api/upload/img',
     name: 'file',
     gif: false,
-    buttonText: '上传图片',
+    buttonText: 'Upload',
     data: {},
     isTip: false,
     actionParams: {},

package/lib/core/multiple-upload/index.d.ts

@@ -26,5 +26,5 @@ interface IProps {
     openFileDialogOnClick?: boolean;
     style?: React.CSSProperties;
 }
-declare const SingleFileUpload: React.FC<IProps>;
-export default SingleFileUpload;
+declare const MultipleUpload: React.FC<IProps>;
+export default MultipleUpload;

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

@@ -37,7 +37,7 @@ const InfosRender = ({ infos, setInfos, onChange }) => {
     }
     return React.createElement(Empty, { imageStyle: { height: 30 }, image: Empty.PRESENTED_IMAGE_SIMPLE });
 };
-const SingleFileUpload = (props) => {
+const MultipleUpload = (props) => {
     const [infos, setInfos] = useState([]);
     const [open, setOpen] = useState(undefined);
     const timeout = useRef();
@@ -128,7 +128,7 @@ const SingleFileUpload = (props) => {
         React.createElement(Popover, { destroyTooltipOnHide: true, open: open, placement: "right", trigger: "hover", title: "Uploaded", content: React.createElement(InfosRender, { onChange: props.onChange, infos: infos, setInfos: setInfos }) },
             React.createElement(Button, { icon: React.createElement(EllipsisOutlined, null) }))));
 };
-SingleFileUpload.defaultProps = {
+MultipleUpload.defaultProps = {
     name: 'file',
     openFileDialogOnClick: true,
     icon: true,
@@ -136,8 +136,8 @@ SingleFileUpload.defaultProps = {
     extraData: {},
     maxCount: 10,
     headers: undefined,
-    buttonText: '点击上传',
+    buttonText: 'Upload',
     type: 'jpg, jpeg, png, gif, bmp, wbmp, webp, tif, woff, woff2, ttf, otf, txt, psd, svg, js, jsx, json, css, less, html, htm, xml, pdf, zip, gz, tgz, gzip, mp3, mp4, avi, xlsx, xls, doc, docx, ppt, pptx, rar, 7z',
     style: {}
 };
-export default SingleFileUpload;
+export default MultipleUpload;

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

@@ -101,7 +101,7 @@ SingleFileUpload.defaultProps = {
     icon: true,
     data: {},
     actionParams: {},
-    buttonText: "点击上传",
+    buttonText: "Upload",
     type: "jpg, jpeg, png, gif, bmp, wbmp, webp, tif, woff, woff2, ttf, otf, txt, psd, svg, js, jsx, json, css, less, html, htm, xml, pdf, zip, gz, tgz, gzip, mp3, mp4, avi, xlsx, xls, doc, docx, ppt, pptx, rar, 7z",
     style: {}
 };

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

@@ -133,6 +133,7 @@ const ImgUpload = (props) => {
                     height: "18px",
                     opacity: ".9",
                     cursor: "pointer",
+                    zIndex: 1
                 }, onClick: (e) => {
                     e.stopPropagation();
                     clear();
@@ -163,7 +164,7 @@ ImgUpload.defaultProps = {
     name: "file",
     value: "",
     gif: false,
-    buttonText: '上传图片',
+    buttonText: 'Upload',
     data: {},
     isTip: true,
     actionParams: {},

package/lib/core/tag.items/index.d.ts

@@ -6,6 +6,7 @@ interface IProps {
     disabled?: boolean;
     fixedFirst?: boolean;
     addTagText?: string;
+    multipleError?: string;
 }
 declare const C: React.FC<IProps>;
 export default C;

package/lib/core/tag.items/index.js

@@ -1,7 +1,7 @@
 import React, { useEffect, useRef, useState } from 'react';
 import { PlusOutlined } from '@ant-design/icons';
 import { isEqual } from "@ecoding/helper.is";
-import { Flex, Input, Tag, theme, Tooltip } from 'antd';
+import { Flex, Input, message, Tag, theme, Tooltip } from 'antd';
 const tagInputStyle = {
     width: 64,
     height: 22,
@@ -39,10 +39,15 @@ const C = (props) => {
         setInputValue(e.target.value);
     };
     const handleInputConfirm = () => {
-        if (inputValue && !tags.includes(inputValue)) {
-            const values = [...tags, inputValue];
-            setTags(values);
-            props.onChange && props.onChange(values && values.length > 0 ? values : undefined);
+        if (inputValue) {
+            if (!tags.includes(inputValue.trim())) {
+                const values = [...tags, inputValue.trim()];
+                setTags(values);
+                props.onChange && props.onChange(values && values.length > 0 ? values : undefined);
+            }
+            else {
+                message.error(props.multipleError || '标签已存在');
+            }
         }
         setInputVisible(false);
         setInputValue('');
@@ -52,9 +57,14 @@ const C = (props) => {
     };
     const handleEditInputConfirm = () => {
         const newTags = [...(tags || [])];
-        newTags[editInputIndex] = editInputValue;
-        setTags(newTags);
-        props.onChange && props.onChange(newTags && newTags.length > 0 ? newTags : undefined);
+        if (!newTags.includes(editInputValue.trim())) {
+            newTags[editInputIndex] = editInputValue.trim();
+            setTags(newTags);
+            props.onChange && props.onChange(newTags && newTags.length > 0 ? newTags : undefined);
+        }
+        else {
+            message.error(props.multipleError || '标签已存在');
+        }
         setEditInputIndex(-1);
         setEditInputValue('');
     };
@@ -63,6 +73,12 @@ const C = (props) => {
         background: token.colorBgContainer,
         borderStyle: 'dashed'
     };
+    const tagDisabledPlusStyle = {
+        height: 22,
+        background: token.colorBgContainerDisabled,
+        borderStyle: 'dashed',
+        color: token.colorTextDisabled
+    };
     useEffect(() => {
         if (props.value && !isEqual(props.value, tags)) {
             setTags(props.value);
@@ -74,7 +90,7 @@ const C = (props) => {
                 return (React.createElement(Input, { ref: editInputRef, key: tag, size: "small", style: tagInputStyle, value: editInputValue, onChange: handleEditInputChange, onBlur: handleEditInputConfirm, onPressEnter: handleEditInputConfirm }));
             }
             const isLongTag = tag.length > 20;
-            const tagElem = (React.createElement(Tag, { key: tag, closable: props.fixedFirst ? index !== 0 : true, style: { userSelect: 'none' }, onClose: () => handleClose(tag) },
+            const tagElem = (React.createElement(Tag, { key: tag, closable: props.disabled ? false : props.fixedFirst ? index !== 0 : true, style: { userSelect: 'none' }, onClose: () => handleClose(tag) },
                 React.createElement("span", { onDoubleClick: (e) => {
                         if (props.disabled) {
                             return;
@@ -87,7 +103,7 @@ const C = (props) => {
                     } }, isLongTag ? `${tag.slice(0, 20)}...` : tag)));
             return isLongTag ? (React.createElement(Tooltip, { title: tag, key: tag }, tagElem)) : (tagElem);
         }),
-        props.disabled ? null : inputVisible ? (React.createElement(Input, { ref: inputRef, type: "text", size: "small", style: tagInputStyle, value: inputValue, onChange: handleInputChange, onBlur: handleInputConfirm, onPressEnter: handleInputConfirm })) : (React.createElement(Tag, { style: tagPlusStyle, icon: React.createElement(PlusOutlined, null), onClick: showInput }, props.addTagText))));
+        props.disabled ? (React.createElement(Tag, { style: tagDisabledPlusStyle, icon: React.createElement(PlusOutlined, null) }, props.addTagText)) : inputVisible ? (React.createElement(Input, { ref: inputRef, type: "text", size: "small", style: tagInputStyle, value: inputValue, onChange: handleInputChange, onBlur: handleInputConfirm, onPressEnter: handleInputConfirm })) : (React.createElement(Tag, { style: tagPlusStyle, icon: React.createElement(PlusOutlined, null), onClick: showInput }, props.addTagText))));
 };
 C.defaultProps = {
     disabled: false,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ecoding/components.antd",
-    "version": "0.3.60",
+    "version": "0.3.62",
     "author": "cxc",
     "homepage": "",
     "license": "MIT",
@@ -47,5 +47,5 @@
         "antd": "5.27.0",
         "axios": "^1.1.2"
     },
-    "gitHead": "ba3818c41417032a2fb1c71f400cf283940dd54f"
+    "gitHead": "08d74aa3e9086a168e7482332a68a209d1dce911"
 }