@ecoding/components.antd 0.5.9 → 0.5.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -74,7 +74,7 @@ const AsyncSelect = memo((props) => {
|
|
|
74
74
|
}
|
|
75
75
|
}
|
|
76
76
|
const res = iface.format2 ? jsonFormatNewKey2(resOrigin, iface.format2) : iface.format ? jsonFormatNewKey(resOrigin, iface.format) : resOrigin;
|
|
77
|
-
return Promise.resolve(res);
|
|
77
|
+
return Promise.resolve(iface.filters ? iface.filters(res) : res);
|
|
78
78
|
}
|
|
79
79
|
return Promise.reject("没有iface或data");
|
|
80
80
|
});
|
|
@@ -131,7 +131,7 @@ const AsyncSelect = memo((props) => {
|
|
|
131
131
|
}
|
|
132
132
|
}
|
|
133
133
|
const res = searchIface.format2 ? jsonFormatNewKey2(resOrigin, searchIface.format2) : searchIface.format ? jsonFormatNewKey(resOrigin, searchIface.format) : resOrigin;
|
|
134
|
-
setOptions(res);
|
|
134
|
+
setOptions(searchIface.filters ? searchIface.filters(res) : res);
|
|
135
135
|
}
|
|
136
136
|
});
|
|
137
137
|
timeout = setTimeout(innerEx, 300);
|
|
@@ -12,7 +12,7 @@ import { Upload, message, Button, Popover, Typography, Space, Empty } from 'antd
|
|
|
12
12
|
import { UploadOutlined, LinkOutlined, DeleteOutlined, EllipsisOutlined } from '@ant-design/icons';
|
|
13
13
|
import { buildURL } from '@ecoding/helper.url';
|
|
14
14
|
import Toast from "../../core/toast";
|
|
15
|
-
const InfosRender = ({ infos, updateItems, domain }) => {
|
|
15
|
+
const InfosRender = ({ infos, updateItems, domain, nameKey }) => {
|
|
16
16
|
const remove = (i) => {
|
|
17
17
|
const temp = infos.concat([]);
|
|
18
18
|
temp.splice(i, 1);
|
|
@@ -27,7 +27,7 @@ const InfosRender = ({ infos, updateItems, domain }) => {
|
|
|
27
27
|
}
|
|
28
28
|
else {
|
|
29
29
|
url = info.url;
|
|
30
|
-
name = info.name || info.filename || info.file_name || info.fileName || info.original_file_name || info.originalFilename || info.originalFileName;
|
|
30
|
+
name = info[nameKey || ''] || info.name || info.filename || info.file_name || info.fileName || info.original_file_name || info.originalFilename || info.originalFileName;
|
|
31
31
|
}
|
|
32
32
|
return (React.createElement("li", { key: url, style: {
|
|
33
33
|
display: "flex",
|
|
@@ -45,7 +45,7 @@ const InfosRender = ({ infos, updateItems, domain }) => {
|
|
|
45
45
|
return React.createElement(Empty, { style: { height: 30 }, image: Empty.PRESENTED_IMAGE_SIMPLE });
|
|
46
46
|
};
|
|
47
47
|
const MultipleUpload = (props) => {
|
|
48
|
-
const { value, domain, onChange, valueKey, objectInValue } = props;
|
|
48
|
+
const { value, domain, onChange, valueKey, objectInValue, nameKey } = props;
|
|
49
49
|
const isInnerChange = useRef(false);
|
|
50
50
|
const [infos, setInfos] = useState(() => {
|
|
51
51
|
return [];
|
|
@@ -162,6 +162,7 @@ const MultipleUpload = (props) => {
|
|
|
162
162
|
// 防止重复拼接domain
|
|
163
163
|
item.url = domain ? item.url.replace(domain, "") : item.url;
|
|
164
164
|
item.url = domain ? `${domain}${item.url}` : item.url;
|
|
165
|
+
item.name = item[nameKey || ''] || item.name || item.filename || item.file_name || item.fileName || item.original_file_name || item.originalFilename || item.originalFileName;
|
|
165
166
|
temp.push(item);
|
|
166
167
|
}
|
|
167
168
|
}
|
|
@@ -170,11 +171,11 @@ const MultipleUpload = (props) => {
|
|
|
170
171
|
}
|
|
171
172
|
}, [value]);
|
|
172
173
|
return (React.createElement(Space.Compact, { block: true },
|
|
173
|
-
React.createElement(Upload, { ref: props.uploadRef, withCredentials: true, multiple: true, data: props.data, openFileDialogOnClick: props.openFileDialogOnClick, beforeUpload: beforeUpload, name: props.name, disabled: props.disabled, headers: props.headers, action: action, onChange: handleChange, showUploadList: false, onRemove: (file) => {
|
|
174
|
+
React.createElement(Upload, { ref: props.uploadRef, withCredentials: true, multiple: true, fileList: infos, data: props.data, openFileDialogOnClick: props.openFileDialogOnClick, beforeUpload: beforeUpload, name: props.name, disabled: props.disabled, headers: props.headers, action: action, onChange: handleChange, showUploadList: false, onRemove: (file) => {
|
|
174
175
|
props.onRemove && props.onRemove(file);
|
|
175
176
|
}, maxCount: props.maxCount },
|
|
176
177
|
React.createElement(Button, { disabled: props.disabled, icon: props.icon ? React.createElement(UploadOutlined, null) : null }, props.buttonText)),
|
|
177
|
-
React.createElement(Popover, { destroyOnHidden: true, open: open, placement: "right", trigger: "hover", title: "Uploaded", content: React.createElement(InfosRender, { infos: infos, updateItems: updateItems, domain: props.domain }) },
|
|
178
|
+
React.createElement(Popover, { destroyOnHidden: true, open: open, placement: "right", trigger: "hover", title: "Uploaded", content: React.createElement(InfosRender, { infos: infos, nameKey: nameKey || '', updateItems: updateItems, domain: props.domain }) },
|
|
178
179
|
React.createElement(Button, { icon: React.createElement(EllipsisOutlined, null) }))));
|
|
179
180
|
};
|
|
180
181
|
MultipleUpload.defaultProps = {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ecoding/components.antd",
|
|
3
|
-
"version": "0.5.
|
|
3
|
+
"version": "0.5.10",
|
|
4
4
|
"author": "cxc",
|
|
5
5
|
"homepage": "",
|
|
6
6
|
"license": "MIT",
|
|
@@ -47,5 +47,5 @@
|
|
|
47
47
|
"antd": "^6.0.0",
|
|
48
48
|
"axios": "^1.1.2"
|
|
49
49
|
},
|
|
50
|
-
"gitHead": "
|
|
50
|
+
"gitHead": "5c4d4d658e2d27364f43a4316ab851d1dc70a36c"
|
|
51
51
|
}
|