bhd-components 0.7.34 → 0.7.35

package/es2017/bhdAppLayout/components/BhdTableSimple/index.js

@@ -16,19 +16,7 @@ import i18Conversion from "../../../i18n";
     className
     超长内容 出现滚动条  需在管理列定义好width   没有定义的max-width:300
  */ const BhdTableSimple = (props)=>{
-    let { className ="" , locale , borderBottom =false , rowSelection , ajaxErr , dataSource , kind ="simple" , loading , notDataText =i18Conversion("noData") , components ={
-        table: null,
-        header: {
-            wrapper: null,
-            row: null,
-            cell: null
-        },
-        body: {
-            wrapper: null,
-            row: null,
-            cell: null
-        }
-    }  } = props;
+    let { className , locale , borderBottom =false , rowSelection , ajaxErr , dataSource , kind ="simple" , loading , notDataText =i18Conversion("noData")  } = props;
     const renderTableText = ()=>{
         if (ajaxErr) {
             return /*#__PURE__*/ _jsxs("div", {
@@ -45,11 +33,24 @@ import i18Conversion from "../../../i18n";
             });
         }
         if (loading) {
-            return /*#__PURE__*/ _jsx("div", {
-                className: "app_BhdTableSimple_noTable",
+            return /*#__PURE__*/ _jsxs("div", {
+                className: "app_BhdTableSimple_noTable app_BhdTableSimple_noTable_loadingTable",
                 style: {
                     minHeight: "150px"
-                }
+                },
+                children: [
+                    /*#__PURE__*/ _jsx("img", {
+                        src: Loading,
+                        alt: "",
+                        style: {
+                            width: "48px",
+                            height: "48px"
+                        }
+                    }),
+                    /*#__PURE__*/ _jsx("p", {
+                        children: i18Conversion("Load")
+                    })
+                ]
             });
         }
         return /*#__PURE__*/ _jsxs("div", {
@@ -84,37 +85,25 @@ import i18Conversion from "../../../i18n";
             })
         ]
     });
-    if (kind === "simple") {
-        className += " app_BhdTableSimple_simple";
-    }
-    if (loading) {
-        if (!components.body) {
-            components.body = {
-                wrapper: null,
-                row: null,
-                cell: null
-            };
-        }
-        components = _object_spread_props(_object_spread({}, components.body), {
-            body: {
-                wrapper: ()=>loadingTable
-            }
-        });
-    }
     const tableProps = _object_spread_props(_object_spread({
         style: {
             width: "100%"
         }
     }, props), {
         loading: false,
-        components,
-        dataSource: ajaxErr ? [] : dataSource,
+        dataSource: ajaxErr || loading ? [] : dataSource,
         className: `app_BhdTableSimple ${className || " "} ${rowSelection ? "app_BhdTableSimple_rowSelection" : ""}`,
         locale: {
             emptyText: renderTableText()
         },
         scroll: props.scroll
     });
+    if (kind === "simple") {
+        className += " app_BhdTableSimple_simple";
+    }
+    // if (loading) {
+    //   return loadingTable;
+    // }
     return /*#__PURE__*/ _jsx(Table, _object_spread({}, tableProps));
 };
 export default BhdTableSimple;

package/es2017/bhdAppLayout/components/BhdTableSimple/index.less

@@ -31,9 +31,6 @@
       }
     }
   }
-
-
-
 }
 
  /* 加载样式 */
@@ -42,9 +39,6 @@
   align-items: center;
   justify-content: center;
   flex-direction: column;
-  position: absolute;
-  left: 50%;
-  transform: translateX(-50%);
   img {
     margin-bottom: 24px;
   }

package/es2017/bhdAppLayout/components/BhdTableSimple/index/347/232/204/345/211/257/346/234/254.js

@@ -0,0 +1,120 @@
+import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
+import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
+import { jsx as _jsx, jsxs as _jsxs } from "@ice/jsx-runtime/jsx-runtime";
+import * as React from "react";
+import "./index.less";
+import Table from "../../../table";
+import { Loading, NotData, ServerError } from "../../../images";
+import i18Conversion from "../../../i18n";
+/* 
+    参数与Table一致
+
+    ajaxErr:接口是否报错
+    notDataText:无数据时,显示的文案
+    borderBottom: 是否显示下边框线
+    loading:是否加载中
+    className
+    超长内容 出现滚动条  需在管理列定义好width   没有定义的max-width:300
+ */ const BhdTableSimple = (props)=>{
+    let { className ="" , locale , borderBottom =false , rowSelection , ajaxErr , dataSource , kind ="simple" , loading , notDataText =i18Conversion("noData") , components ={
+        table: null,
+        header: {
+            wrapper: null,
+            row: null,
+            cell: null
+        },
+        body: {
+            wrapper: null,
+            row: null,
+            cell: null
+        }
+    }  } = props;
+    const renderTableText = ()=>{
+        if (ajaxErr) {
+            return /*#__PURE__*/ _jsxs("div", {
+                className: "app_BhdTableSimple_errorTable",
+                children: [
+                    /*#__PURE__*/ _jsx("img", {
+                        src: ServerError,
+                        alt: ""
+                    }),
+                    /*#__PURE__*/ _jsx("p", {
+                        children: i18Conversion("系统繁忙，稍后重试!")
+                    })
+                ]
+            });
+        }
+        if (loading) {
+            return /*#__PURE__*/ _jsx("div", {
+                className: "app_BhdTableSimple_noTable",
+                style: {
+                    minHeight: "150px"
+                }
+            });
+        }
+        return /*#__PURE__*/ _jsxs("div", {
+            className: "app_BhdTableSimple_noTable",
+            style: {
+                width: "100%"
+            },
+            children: [
+                /*#__PURE__*/ _jsx("img", {
+                    src: NotData,
+                    alt: ""
+                }),
+                /*#__PURE__*/ _jsx("div", {
+                    children: notDataText
+                })
+            ]
+        });
+    };
+    const loadingTable = /*#__PURE__*/ _jsxs("div", {
+        className: "app_BhdTableSimple_noTable app_BhdTableSimple_noTable_loadingTable",
+        children: [
+            /*#__PURE__*/ _jsx("img", {
+                src: Loading,
+                alt: "",
+                style: {
+                    width: "48px",
+                    height: "48px"
+                }
+            }),
+            /*#__PURE__*/ _jsx("p", {
+                children: i18Conversion("Load")
+            })
+        ]
+    });
+    if (kind === "simple") {
+        className += " app_BhdTableSimple_simple";
+    }
+    if (loading) {
+        if (!components.body) {
+            components.body = {
+                wrapper: null,
+                row: null,
+                cell: null
+            };
+        }
+        components = _object_spread_props(_object_spread({}, components.body), {
+            body: {
+                wrapper: ()=>loadingTable
+            }
+        });
+    }
+    const tableProps = _object_spread_props(_object_spread({
+        style: {
+            width: "100%"
+        }
+    }, props), {
+        loading: false,
+        components,
+        dataSource: ajaxErr ? [] : dataSource,
+        className: `app_BhdTableSimple ${className || " "} ${rowSelection ? "app_BhdTableSimple_rowSelection" : ""}`,
+        locale: {
+            emptyText: renderTableText()
+        },
+        scroll: props.scroll
+    });
+    return /*#__PURE__*/ _jsx(Table, _object_spread({}, tableProps));
+};
+export default BhdTableSimple;

package/es2017/bhdTipModal/index.js

@@ -2,7 +2,7 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { jsx as _jsx, jsxs as _jsxs } from "@ice/jsx-runtime/jsx-runtime";
 import * as React from "react";
-import { Modal } from "antd";
+import { Modal } from "./modal";
 import { Confirm, Success, Info } from "../images/index";
 import styles from "./index.module.less";
 const initConFirmModal = (obj)=>{
@@ -182,6 +182,7 @@ const initWarnModal = (obj)=>{
 };
 const BhdTipModal = {
     confirm: (obj)=>{
+        console.log("Modal", Modal);
         let modal = Modal.confirm(initConFirmModal(obj));
         modal.updateModal = (updateObj = {})=>{
             modal.update(initConFirmModal(_object_spread({}, obj, updateObj)));
@@ -189,6 +190,7 @@ const BhdTipModal = {
         return modal;
     },
     success: (obj)=>{
+        console.log("Modal", Modal);
         let modal = Modal.confirm(initSuccessModal(obj));
         modal.updateModal = (updateObj = {})=>{
             modal.update(initSuccessModal(_object_spread({}, obj, updateObj)));
@@ -196,6 +198,7 @@ const BhdTipModal = {
         return modal;
     },
     custom: (obj)=>{
+        console.log("Modal", Modal);
         let modal = Modal.confirm(initCustomModal(obj));
         modal.updateModal = (updateObj = {})=>{
             modal.update(initCustomModal(_object_spread({}, obj, updateObj)));

package/es2017/bhdTipModal/modal.d.ts

@@ -0,0 +1,6 @@
+declare let Modal: any;
+declare let message: any;
+declare let notification: any;
+declare const _default: () => null;
+export default _default;
+export { Modal, message, notification };

package/es2017/bhdTipModal/modal.js

@@ -0,0 +1,15 @@
+import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
+import * as React from "react";
+import { App, message as AntdMessage, Modal as AntdModal, notification as AntdNotification } from "antd";
+let Modal = {};
+let message = {};
+let notification = {};
+export default (()=>{
+    const staticFunction = App.useApp();
+    message = _object_spread({}, AntdMessage, staticFunction.message);
+    Modal = _object_spread({}, AntdModal, staticFunction.modal);
+    notification = _object_spread({}, AntdNotification, staticFunction.notification);
+    console.log("mess1", staticFunction, message);
+    return null;
+});
+export { Modal, message, notification };

package/es2017/index.d.ts

@@ -64,6 +64,7 @@ export { default as Upload } from "antd/es/upload";
 export { default as Watermark } from "antd/es/watermark";
 export { default as QRCode } from "antd/es/qrcode";
 export { default as version } from "antd/es/version";
+export { default as AntdMessage } from "antd/es/message";
 export { default as Provider } from "./provider";
 export { default as TextTootip } from "./textTootip";
 export { default as zh_CN } from "antd/locale/zh_CN";

package/es2017/index.js

@@ -69,6 +69,7 @@ export { default as Upload } from "antd/es/upload";
 export { default as Watermark } from "antd/es/watermark";
 export { default as QRCode } from "antd/es/qrcode";
 export { default as version } from "antd/es/version";
+export { default as AntdMessage } from "antd/es/message";
 /* 自定义修改 */ export { default as Provider } from "./provider/index";
 export { default as TextTootip } from "./textTootip/index";
 export { default as zh_CN } from "antd/locale/zh_CN";

package/es2017/message/index.d.ts

@@ -1,18 +1,16 @@
-import * as React from "react";
 import type { ArgsProps } from "antd/es/message";
 declare const BhdMessage: {
-    customSuccess: (config: ArgsProps | string) => import("antd/es/message/interface").MessageType;
-    customWarning: (config: ArgsProps | string) => import("antd/es/message/interface").MessageType;
-    customError: (config: ArgsProps | string) => import("antd/es/message/interface").MessageType;
-    info: import("antd/es/message/interface").TypeOpen;
-    success: import("antd/es/message/interface").TypeOpen;
-    error: import("antd/es/message/interface").TypeOpen;
-    warning: import("antd/es/message/interface").TypeOpen;
-    loading: import("antd/es/message/interface").TypeOpen;
-    open: (config: ArgsProps) => import("antd/es/message/interface").MessageType;
-    destroy: (key?: React.Key) => void;
-    config: (config: import("antd/es/message/interface").ConfigOptions) => void;
-    useMessage: typeof import("antd/es/message/useMessage").default;
-    _InternalPanelDoNotUseOrYouWillBeFired: typeof import("antd/es/message/PurePanel").default;
+    customSuccess: (config: ArgsProps | string) => any;
+    customWarning: (config: ArgsProps | string) => any;
+    customError: (config: ArgsProps | string) => any;
+    open: (...arg: any) => any;
+    destroy: (...arg: any) => any;
+    error: (...arg: any) => any;
+    info: (...arg: any) => any;
+    loading: (...arg: any) => any;
+    success: (...arg: any) => any;
+    useMessage: (...arg: any) => any;
+    warning: (...arg: any) => any;
+    _InternalPanelDoNotUseOrYouWillBeFired: (...arg: any) => any;
 };
 export default BhdMessage;

package/es2017/message/index.js

@@ -3,11 +3,12 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { jsx as _jsx } from "@ice/jsx-runtime/jsx-runtime";
 import * as React from "react";
 import styles from "./index.module.less";
-import { message } from "antd";
+import { message } from "../bhdTipModal/modal";
 import { ExclamationCircleFilled } from "../icons/index";
-const BhdMessage = _object_spread_props(_object_spread({}, message), {
+const BhdMessage = {
     customSuccess: (config)=>{
         let className = styles.customSuccess;
+        console.log("customSuccess", message);
         if (typeof config === "string") {
             return message.success({
                 content: config,
@@ -43,6 +44,15 @@ const BhdMessage = _object_spread_props(_object_spread({}, message), {
             className: `${className} ${config.className || ""}`,
             icon: config.icon || /*#__PURE__*/ _jsx(ExclamationCircleFilled, {})
         }));
-    }
-});
+    },
+    open: (...arg)=>message.open(...arg),
+    destroy: (...arg)=>message.destroy(...arg),
+    error: (...arg)=>message.error(...arg),
+    info: (...arg)=>message.info(...arg),
+    loading: (...arg)=>message.loading(...arg),
+    success: (...arg)=>message.success(...arg),
+    useMessage: (...arg)=>message.useMessage(...arg),
+    warning: (...arg)=>message.warning(...arg),
+    _InternalPanelDoNotUseOrYouWillBeFired: (...arg)=>message._InternalPanelDoNotUseOrYouWillBeFired(...arg)
+};
 export default BhdMessage;

package/es2017/provider/config.d.ts

@@ -1,3 +1,9 @@
 import type { ConfigProviderProps } from "antd/es/config-provider";
-declare const config: ConfigProviderProps;
+import type { ConfigOptions } from "antd/es/message/interface";
+import type { NotificationConfig } from "antd/es/notification/interface";
+interface IConfigProviderProps extends ConfigProviderProps {
+    message: ConfigOptions;
+    notification: NotificationConfig;
+}
+declare const config: IConfigProviderProps;
 export default config;

package/es2017/provider/config.js

@@ -42,6 +42,12 @@ const config = {
             }
         }
     },
-    locale: zhCN
+    locale: zhCN,
+    message: {
+        top: 100,
+        duration: 3,
+        maxCount: 1
+    },
+    notification: {}
 };
 export default config;

package/es2017/provider/index.js

@@ -2,14 +2,16 @@ import { _ as _extends } from "@swc/helpers/_/_extends";
 import { _ as _object_destructuring_empty } from "@swc/helpers/_/_object_destructuring_empty";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
-import { jsx as _jsx } from "@ice/jsx-runtime/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "@ice/jsx-runtime/jsx-runtime";
 import * as React from "react";
-import { ConfigProvider } from "antd";
+import { ConfigProvider, App } from "antd";
 import config from "./config";
 import "../theme/variable.less";
 import { StyleProvider, legacyLogicalPropertiesTransformer } from "@ant-design/cssinjs";
+import BhdTipModal from "../bhdTipModal/modal";
 const Provider = (Component, customConfig = {})=>{
     let AppConfig = Object.assign(config, customConfig);
+    const { message ={} , notification ={}  } = AppConfig;
     ConfigProvider.config(AppConfig);
     ConfigProvider.__proto__.lang = AppConfig.locale.locale;
     return (_param)=>{
@@ -20,7 +22,14 @@ const Provider = (Component, customConfig = {})=>{
                 transformers: [
                     legacyLogicalPropertiesTransformer
                 ],
-                children: /*#__PURE__*/ _jsx(Component, _object_spread({}, props))
+                children: /*#__PURE__*/ _jsxs(App, {
+                    message: message,
+                    notification: notification,
+                    children: [
+                        /*#__PURE__*/ _jsx(BhdTipModal, {}),
+                        /*#__PURE__*/ _jsx(Component, _object_spread({}, props))
+                    ]
+                })
             })
         }));
     };
@@ -29,13 +38,21 @@ Provider.Component = (props)=>{
     let AppConfig = Object.assign(config, props);
     ConfigProvider.__proto__.lang = AppConfig.locale.locale;
     ConfigProvider.config(AppConfig);
+    const { message ={} , notification ={}  } = AppConfig;
     return /*#__PURE__*/ _jsx(ConfigProvider, _object_spread_props(_object_spread({}, AppConfig), {
         children: /*#__PURE__*/ _jsx(StyleProvider, {
             hashPriority: "high",
             transformers: [
                 legacyLogicalPropertiesTransformer
             ],
-            children: props.children
+            children: /*#__PURE__*/ _jsxs(App, {
+                message: message,
+                notification: notification,
+                children: [
+                    /*#__PURE__*/ _jsx(BhdTipModal, {}),
+                    props.children
+                ]
+            })
         })
     }));
 };

package/esm/bhdAppLayout/components/BhdTableSimple/index.js

@@ -16,19 +16,7 @@ import i18Conversion from "../../../i18n";
     className
     超长内容 出现滚动条  需在管理列定义好width   没有定义的max-width:300
  */ var BhdTableSimple = function(props) {
-    var _props_className = props.className, className = _props_className === void 0 ? "" : _props_className, locale = props.locale, _props_borderBottom = props.borderBottom, borderBottom = _props_borderBottom === void 0 ? false : _props_borderBottom, rowSelection = props.rowSelection, ajaxErr = props.ajaxErr, dataSource = props.dataSource, _props_kind = props.kind, kind = _props_kind === void 0 ? "simple" : _props_kind, loading = props.loading, _props_notDataText = props.notDataText, notDataText = _props_notDataText === void 0 ? i18Conversion("noData") : _props_notDataText, _props_components = props.components, components = _props_components === void 0 ? {
-        table: null,
-        header: {
-            wrapper: null,
-            row: null,
-            cell: null
-        },
-        body: {
-            wrapper: null,
-            row: null,
-            cell: null
-        }
-    } : _props_components;
+    var className = props.className, locale = props.locale, _props_borderBottom = props.borderBottom, borderBottom = _props_borderBottom === void 0 ? false : _props_borderBottom, rowSelection = props.rowSelection, ajaxErr = props.ajaxErr, dataSource = props.dataSource, _props_kind = props.kind, kind = _props_kind === void 0 ? "simple" : _props_kind, loading = props.loading, _props_notDataText = props.notDataText, notDataText = _props_notDataText === void 0 ? i18Conversion("noData") : _props_notDataText;
     var renderTableText = function() {
         if (ajaxErr) {
             return /*#__PURE__*/ _jsxs("div", {
@@ -45,11 +33,24 @@ import i18Conversion from "../../../i18n";
             });
         }
         if (loading) {
-            return /*#__PURE__*/ _jsx("div", {
-                className: "app_BhdTableSimple_noTable",
+            return /*#__PURE__*/ _jsxs("div", {
+                className: "app_BhdTableSimple_noTable app_BhdTableSimple_noTable_loadingTable",
                 style: {
                     minHeight: "150px"
-                }
+                },
+                children: [
+                    /*#__PURE__*/ _jsx("img", {
+                        src: Loading,
+                        alt: "",
+                        style: {
+                            width: "48px",
+                            height: "48px"
+                        }
+                    }),
+                    /*#__PURE__*/ _jsx("p", {
+                        children: i18Conversion("Load")
+                    })
+                ]
             });
         }
         return /*#__PURE__*/ _jsxs("div", {
@@ -84,39 +85,25 @@ import i18Conversion from "../../../i18n";
             })
         ]
     });
-    if (kind === "simple") {
-        className += " app_BhdTableSimple_simple";
-    }
-    if (loading) {
-        if (!components.body) {
-            components.body = {
-                wrapper: null,
-                row: null,
-                cell: null
-            };
-        }
-        components = _object_spread_props(_object_spread({}, components.body), {
-            body: {
-                wrapper: function() {
-                    return loadingTable;
-                }
-            }
-        });
-    }
     var tableProps = _object_spread_props(_object_spread({
         style: {
             width: "100%"
         }
     }, props), {
         loading: false,
-        components: components,
-        dataSource: ajaxErr ? [] : dataSource,
+        dataSource: ajaxErr || loading ? [] : dataSource,
         className: "app_BhdTableSimple ".concat(className || " ", " ").concat(rowSelection ? "app_BhdTableSimple_rowSelection" : ""),
         locale: {
             emptyText: renderTableText()
         },
         scroll: props.scroll
     });
+    if (kind === "simple") {
+        className += " app_BhdTableSimple_simple";
+    }
+    // if (loading) {
+    //   return loadingTable;
+    // }
     return /*#__PURE__*/ _jsx(Table, _object_spread({}, tableProps));
 };
 export default BhdTableSimple;

package/esm/bhdAppLayout/components/BhdTableSimple/index.less

@@ -31,9 +31,6 @@
       }
     }
   }
-
-
-
 }
 
  /* 加载样式 */
@@ -42,9 +39,6 @@
   align-items: center;
   justify-content: center;
   flex-direction: column;
-  position: absolute;
-  left: 50%;
-  transform: translateX(-50%);
   img {
     margin-bottom: 24px;
   }