@ecoding/components.antd 0.4.20 → 0.4.22

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

@@ -12,7 +12,7 @@ import { Cascader } from "antd";
 import { LoadingOutlined } from "@ant-design/icons";
 import http from "../../helpers/http";
 import { isSomething } from "@ecoding/helper.is";
-import { jsonFormatNewKey } from "@ecoding/helper.json";
+import { jsonFormatNewKey2 } from "@ecoding/helper.json";
 const setSourceChilren = (source, key, res) => {
     const ex = (ary) => {
         for (let i = 0; i < ary.length; i++) {
@@ -68,7 +68,7 @@ const AsyncCascader = memo((props) => {
                         firResOrigin = firResOrigin[firIFace.fromKey];
                     }
                 }
-                const res = jsonFormatNewKey(firResOrigin, firIFace.format);
+                const res = jsonFormatNewKey2(firResOrigin, firIFace.format);
                 const opts = res;
                 // 踢除第一级联的接口，剩下接口根据value数组遍历请求
                 const afterFirFaces = interfaceUrls.slice(1);
@@ -114,7 +114,7 @@ const AsyncCascader = memo((props) => {
                                     resOrigin = resOrigin[iFace.fromKey];
                                 }
                             }
-                            const formatRes = jsonFormatNewKey(resOrigin, iFace.format);
+                            const formatRes = jsonFormatNewKey2(resOrigin, iFace.format);
                             temp = setSourceChilren(opts, ary[i], formatRes);
                             if (i < ary.length) {
                                 yield exx();
@@ -169,7 +169,7 @@ const AsyncCascader = memo((props) => {
                 resOrigin = resOrigin[iFace.fromKey];
             }
         }
-        const res = jsonFormatNewKey(resOrigin, iFace.format);
+        const res = jsonFormatNewKey2(resOrigin, iFace.format);
         targetOption.loading = false;
         targetOption.children = res;
         setOptions([...options]);

package/lib/core/drawer/index.d.ts

@@ -71,7 +71,7 @@ export declare class Drawers extends React.Component<IDrawerProps, IDrawerProps>
         width?: string | number | undefined;
         zIndex?: number | undefined;
         height?: string | number | undefined;
-        placement?: import("rc-drawer/lib/DrawerPopup").Placement | undefined;
+        placement?: import("@rc-component/drawer/lib/DrawerPopup").Placement | undefined;
         okDanger?: boolean | undefined;
         title?: React.ReactNode;
         okType?: "link" | "text" | "dashed" | "default" | "primary" | undefined;

package/lib/core/drawer/index.js

@@ -89,6 +89,9 @@ export default {
         if (props.footer !== null && !props.footer) {
             props.footer = "";
         }
+        if (props.extra !== null && !props.extra) {
+            props.extra = "";
+        }
         if (!props.okText) {
             props.okText = props.i18n ? props.i18n.$t('global.save') : "保存";
         }

package/lib/core/form.label/index.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 interface IProps {
     value?: string | string[];
     type?: 'secondary' | 'success' | 'warning' | 'danger';
-    splitDot?: string;
+    separator?: string;
     empty?: React.ReactNode;
     disabled?: boolean;
     mark?: boolean;

package/lib/core/form.label/index.js

@@ -25,7 +25,7 @@ const C = (_a) => {
         if (!Array.isArray(props.value)) {
             return (React.createElement(Badge, { status: opts.status ? opts.status : isSomething(props.value) ? "processing" : "error", text: props.value }));
         }
-        return (React.createElement(Space, { split: props.splitDot, wrap: true }, props.value.map((item) => {
+        return (React.createElement(Space, { separator: props.separator, wrap: true }, props.value.map((item) => {
             return (React.createElement(Badge, { status: opts.status ? opts.status : isSomething(item) ? "processing" : "error", text: item }));
         })));
     }
@@ -34,7 +34,7 @@ const C = (_a) => {
         if (!Array.isArray(props.value)) {
             return (React.createElement(Tag, { style: { marginInlineEnd: 0 }, color: opts.color, bordered: opts.bordered }, props.value));
         }
-        return (React.createElement(Space, { split: props.splitDot, wrap: true }, props.value.map((item) => {
+        return (React.createElement(Space, { separator: props.separator, wrap: true }, props.value.map((item) => {
             return (React.createElement(Tag, { style: { marginInlineEnd: 0 }, color: opts.color, bordered: opts.bordered }, item));
         })));
     }
@@ -46,7 +46,7 @@ const C = (_a) => {
             return (React.createElement(Typography.Text, { type: props.type, italic: props.italic, strong: props.strong, delete: props.delete, underline: props.underline, disabled: props.disabled, mark: props.mark, code: props.code, keyboard: props.keyboard }, props.value));
         }
     }
-    return (React.createElement(Space, { split: props.splitDot, wrap: true }, props.value.map((item) => {
+    return (React.createElement(Space, { separator: props.separator, wrap: true }, props.value.map((item) => {
         if (props.link) {
             return React.createElement(Typography.Link, Object.assign({}, props.link), item);
         }

package/lib/core/form.label.attachment/index.js

@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import { isSomething } from '@ecoding/helper.is';
 import { LinkOutlined, CloudDownloadOutlined, EyeOutlined } from '@ant-design/icons';
 import { Typography, Popover, Tag, Checkbox, Space } from 'antd';
-import { jsonFormatNewKey } from "@ecoding/helper.json";
+import { jsonFormatNewKey2 } from "@ecoding/helper.json";
 import http from "../../helpers/http";
 const InfosRender = ({ infos, i18n, format, batchDownload }) => {
     const [checkedList, setCheckedList] = useState([]);
@@ -78,7 +78,7 @@ const InfosRender = ({ infos, i18n, format, batchDownload }) => {
     };
     return (React.createElement("ul", { style: { width: 300, overflow: "hidden" } },
         React.createElement(Checkbox.Group, { style: { display: "block" }, onChange: checkChange, value: checkedList }, infos.map((info, i) => {
-            info = format ? jsonFormatNewKey(info, format) : info;
+            info = format ? jsonFormatNewKey2(info, format) : info;
             return (React.createElement("li", { style: { marginBottom: 6 }, key: i },
                 React.createElement("div", { style: style },
                     infos.length > 1 ? (React.createElement(Checkbox, { value: info.url },
@@ -105,7 +105,7 @@ const C = ({ value, empty, render, i18n, batchDownload, format }) => {
         return React.createElement(React.Fragment, null, empty || '-');
     }
     if (Array.isArray(value)) {
-        return (React.createElement(Popover, { destroyTooltipOnHide: true, placement: "right", trigger: "hover", title: "Uploaded", content: render ? render(value) : React.createElement(InfosRender, { batchDownload: batchDownload, format: format, i18n: i18n, infos: value }) },
+        return (React.createElement(Popover, { destroyOnHidden: true, placement: "right", trigger: "hover", title: "Uploaded", content: render ? render(value) : React.createElement(InfosRender, { batchDownload: batchDownload, format: format, i18n: i18n, infos: value }) },
             React.createElement(Tag, { icon: React.createElement(EyeOutlined, null), color: "processing" }, i18n ? i18n.$t('global.attachment', '附件') : '附件')));
     }
     if (typeof value === 'string') {

package/lib/core/form.list/index.js

@@ -133,7 +133,7 @@ const C = ({ columns, rules, tStyle, name, hideHeader, hideBottom, operation, i1
                                 column.tooltip ? (React.createElement(Tooltip, { placement: "top", title: column.tooltip || undefined },
                                     React.createElement(QuestionCircleOutlined, { style: { paddingLeft: 4, color: "rgba(0, 0, 0, 0.45)" } }))) : null));
                         }),
-                        (operation === null || operation === void 0 ? void 0 : operation.hide) ? null : (React.createElement("th", { style: Object.assign({}, thStyle, { right: 0 }) }, i18n ? i18n.$t("global.operation", "操作") : "操作"))))),
+                        (operation === null || operation === void 0 ? void 0 : operation.hide) ? null : (React.createElement("th", { style: Object.assign({}, thStyle, { right: 0 }) }, i18n ? i18n.$t("global.operation", "操作") : `${(operation === null || operation === void 0 ? void 0 : operation.title) || "操作"}`))))),
                     React.createElement("tbody", null,
                         React.createElement(DndContext, { sensors: sensors, collisionDetection: closestCenter, onDragEnd: ({ active, over }) => {
                                 if (active.id !== (over === null || over === void 0 ? void 0 : over.id)) {

package/lib/core/modal/index.d.ts

@@ -91,6 +91,7 @@ export declare class Modals extends React.Component<IModalProps> {
         } | undefined;
         loading: boolean;
     };
+    update(props: IModalProps): void;
     cancel: () => void;
     ok: () => void;
     render(): JSX.Element;

package/lib/core/modal/index.js

@@ -44,6 +44,9 @@ export class Modals extends React.Component {
                 });
         };
     }
+    update(props) {
+        this.setState(props);
+    }
     render() {
         // if (!this.props.visible) return null;
         return (React.createElement(Modal, { className: this.state.className, wrapClassName: this.state.wrapClassName, open: this.state.open, style: this.state.style, width: this.state.width, height: this.state.height ? this.state.height : undefined, zIndex: this.state.zIndex, mask: this.state.mask, title: typeof this.state.title === "string" ? (React.createElement("div", { style: { boxShadow: "inset 0px -1px 0px #F0F0F0", marginBottom: "20px", paddingBottom: "12px" } }, this.state.title)) : (this.state.title), closable: this.state.closable, maskClosable: this.state.maskClosable, onCancel: this.cancel, destroyOnHidden: true, keyboard: false, footer: this.state.footer === null ? null : this.state.footer ? (this.state.footer) : (React.createElement(React.Fragment, null,

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

@@ -18,11 +18,11 @@ const InfosRender = ({ infos, setInfos, onChange }) => {
         const temp = infos.concat([]);
         temp.splice(i, 1);
         setInfos(temp);
-        onChange(temp);
+        onChange && onChange(temp);
     };
     if (infos && infos.length > 0) {
         return (React.createElement("ul", null, infos.map((info, i) => {
-            return (React.createElement("li", { style: {
+            return (React.createElement("li", { key: info.url, style: {
                     display: "flex",
                     justifyContent: "space-between",
                     maxWidth: 250
@@ -35,7 +35,7 @@ const InfosRender = ({ infos, setInfos, onChange }) => {
                     React.createElement(DeleteOutlined, null))));
         })));
     }
-    return React.createElement(Empty, { imageStyle: { height: 30 }, image: Empty.PRESENTED_IMAGE_SIMPLE });
+    return React.createElement(Empty, { style: { height: 30 }, image: Empty.PRESENTED_IMAGE_SIMPLE });
 };
 const MultipleUpload = (props) => {
     const [infos, setInfos] = useState([]);
@@ -125,7 +125,7 @@ const MultipleUpload = (props) => {
                 props.onRemove && props.onRemove(e);
             }, maxCount: props.maxCount },
             React.createElement(Button, { disabled: props.disabled, icon: props.icon ? React.createElement(UploadOutlined, null) : null }, props.buttonText)),
-        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(Popover, { destroyOnHidden: 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) }))));
 };
 MultipleUpload.defaultProps = {
@@ -137,7 +137,7 @@ MultipleUpload.defaultProps = {
     maxCount: 10,
     headers: undefined,
     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, mkv, mov, avi, xlsx, xls, doc, docx, ppt, pptx, rar, 7z',
+    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, mkv, mov, avi, xlsx, xls, csv, yml, py, doc, docx, ppt, pptx, rar, 7z',
     style: {}
 };
 export default MultipleUpload;

package/lib/core/search.input/index.js

@@ -70,7 +70,7 @@ const C = (_a) => {
             setV(value);
         }
     }, [value]);
-    return (React.createElement(Dropdown, { destroyPopupOnHide: true, open: open, menu: { items, onClick }, overlayStyle: { maxHeight: rest.maxHeight, overflowY: "auto", boxShadow: "0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 9px 28px 8px rgba(0, 0, 0, 0.05)" } },
+    return (React.createElement(Dropdown, { destroyOnHidden: true, open: open, menu: { items, onClick }, overlayStyle: { maxHeight: rest.maxHeight, overflowY: "auto", boxShadow: "0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 9px 28px 8px rgba(0, 0, 0, 0.05)" } },
         React.createElement("div", { style: { position: "relative" } },
             React.createElement(Input, Object.assign({}, rest, { value: v, placeholder: placeholder, onChange: keyUpHandler, onBlur: () => {
                     setTimeout(() => {

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

@@ -84,9 +84,8 @@ const SingleFileUpload = (props) => {
         }
     }, [props.value]);
     return (React.createElement(Space.Compact, { block: true },
-        React.createElement(Input, { addonBefore: fileUrl ? (React.createElement("a", { style: { color: "#666" }, href: fileUrl, target: "_blank" }, "view")) : null, value: fileUrl, onChange: (e) => {
+        React.createElement(Input, { addonBefore: fileUrl ? (React.createElement("a", { style: { color: "#666" }, href: fileUrl, target: "_blank" }, "View")) : null, value: fileUrl, onChange: (e) => {
                 const v = e.target.value.trim();
-                // setFileUrl(v);
                 props.onChange && props.onChange(v);
             } }),
         React.createElement(Upload, { ref: props.uploadRef, withCredentials: true, openFileDialogOnClick: props.openFileDialogOnClick, beforeUpload: beforeUpload, name: props.name, disabled: props.disabled, headers: props.headers, data: props.data, action: action, onChange: handleChange, showUploadList: false, onRemove: (e) => {
@@ -101,7 +100,7 @@ SingleFileUpload.defaultProps = {
     data: {},
     actionParams: {},
     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, mkv, mov, avi, xlsx, xls, doc, docx, ppt, pptx, rar, 7z",
+    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, mkv, mov, avi, xlsx, xls, csv, yml, py, doc, docx, ppt, pptx, rar, 7z",
     style: {}
 };
 export default SingleFileUpload;

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

@@ -11,7 +11,7 @@ interface IProps {
     header?: React.ReactNode;
     buttonArea?: React.ReactNode;
     scrollY?: string | number;
-    scrollX?: string | number;
+    scrollX?: string | number | 'max-content';
     filters?: {
         overMax?: number;
         colOpts?: ColProps;

package/lib/core/table-pro/index.js

@@ -11,7 +11,6 @@ const TablePro = ({ className, header, buttonArea, filterArea, filters, searchIn
     const [y, setY] = useState(scrollY);
     const [innerColumns, setColumns] = useState(columns);
     const [selectedRowKeys, setSelectedRowKeys] = useState([]);
-    const [selectedRows, setSelectedRows] = useState([]);
     const flexColumnStyle = {
         display: 'flex',
         height: '100%',
@@ -114,7 +113,7 @@ const TablePro = ({ className, header, buttonArea, filterArea, filters, searchIn
                 }
             }, 100);
         }
-    }, [header, loading, innerColumns]);
+    }, [header, loading]);
     useEffect(() => {
         if (selectKeys && selectKeys.length > 0 && !isEqual(selectedRowKeys, selectKeys)) {
             setSelectedRowKeys(selectKeys);

package/lib/core/tree.select/index.d.ts

@@ -15,6 +15,7 @@ interface IProps {
     multiple?: boolean;
     treeCheckable?: boolean;
     onChange?: (value: any) => void;
+    onSearch?: (value: any) => void;
 }
 declare const C: React.FC<IProps>;
 export default C;

package/lib/core/tree.select/index.js

@@ -13,7 +13,7 @@ const processTreeData = (data) => {
     });
 };
 const C = (props) => {
-    const { treeCheckable, i18n, disabledParent, treeData, fieldNames, treeNodeFilterProp, onChange, emptyType } = props;
+    const { treeCheckable, i18n, onSearch, disabledParent, treeData, fieldNames, treeNodeFilterProp, onChange, emptyType } = props;
     // 是否禁用父级
     const treeDataFormat = disabledParent ? processTreeData(treeData || []) : treeData || [];
     const changeHandler = (v) => {
@@ -46,7 +46,10 @@ const C = (props) => {
         }
         onChange && onChange(v);
     };
-    return (React.createElement(TreeSelect, Object.assign({}, props, { fieldNames: fieldNames, treeData: treeDataFormat, treeCheckable: treeCheckable, showSearch: true, style: { width: '100%' }, placeholder: i18n ? i18n.$t('global.please.select') : '请选择', allowClear: true, treeDefaultExpandAll: true, treeNodeFilterProp: treeNodeFilterProp, onChange: changeHandler })));
+    return (React.createElement(TreeSelect, Object.assign({}, props, { fieldNames: fieldNames, treeData: treeDataFormat, treeCheckable: treeCheckable, showSearch: {
+            onSearch: onSearch || undefined,
+            treeNodeFilterProp: treeNodeFilterProp || undefined
+        }, style: { width: '100%' }, placeholder: i18n ? i18n.$t('global.please.select') : '请选择', allowClear: true, treeDefaultExpandAll: true, treeNodeFilterProp: treeNodeFilterProp, onChange: changeHandler })));
 };
 C.defaultProps = {
     disabledParent: true

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ecoding/components.antd",
-    "version": "0.4.20",
+    "version": "0.4.22",
     "author": "cxc",
     "homepage": "",
     "license": "MIT",
@@ -44,8 +44,8 @@
         "@ecoding/helper.request": "*",
         "@ecoding/helper.request.hook": "*",
         "@ecoding/helper.url": "*",
-        "antd": "5.27.0",
+        "antd": "^6.0.0",
         "axios": "^1.1.2"
     },
-    "gitHead": "571168c21c039e8eed8da932957c8b567fa22abb"
+    "gitHead": "92f998a40fb7a5d3f41530d8533ca3eed9fd22a0"
 }