aldehyde 0.2.480 → 0.2.481

package/src/aldehyde/layout/sidebar/index.css

@@ -1,57 +1,57 @@
-.logo-dark{
-	line-height: 38px;
-	height: 42px;
-	margin: 16px;
-	background: rgba(255, 255, 255, 0.3);
-}
-.logo-blue{
-	line-height: 50px;
-	height: 58px;
-	margin: 0 0px 0 0px;
-	background: rgba(255, 255, 255, 0.3);
-}
-.logo-blue h1{
-	font-size: 20px;
-	color:#fff;
-	display: inline-block;
-	text-align: center;
-	vertical-align: middle;
-	width:100%;
-	margin:0;
-	background: var(--logo-blue-background);
-}
-
-.logo-dark h1{
-	font-size: 20px;
-	color:#fff;
-	display: inline-block;
-	text-align: center;
-	/*vertical-align: middle;*/
-	width:100%;
-	margin:0;
-}
-
-.logonly h1{
-	font-size: 20px;
-	color:#fff;
-	display: inline-block;
-	text-align: center;
-	/*vertical-align: middle;*/
-	width:100%;
-	margin:0;
-	background: var(--logo-blue-background);
-}
-
-.logonly{
-	border-radius: 4px;
-	line-height: 58px;
-	height: 48px;
-	margin: 0px;
-	/*background: rgba(0, 0, 0, 0.8);*/
-	background: rgba(255, 255, 255, 0.8);
-}
-
-.ant-menu-inline-collapsed{
-	width: 50px!important;
-}
-
+.logo-dark{
+	line-height: 38px;
+	height: 42px;
+	margin: 16px;
+	background: rgba(255, 255, 255, 0.3);
+}
+.logo-blue{
+	line-height: 50px;
+	height: 58px;
+	margin: 0 0px 0 0px;
+	background: rgba(255, 255, 255, 0.3);
+}
+.logo-blue h1{
+	font-size: 20px;
+	color:#fff;
+	display: inline-block;
+	text-align: center;
+	vertical-align: middle;
+	width:100%;
+	margin:0;
+	background: var(--logo-blue-background);
+}
+
+.logo-dark h1{
+	font-size: 20px;
+	color:#fff;
+	display: inline-block;
+	text-align: center;
+	/*vertical-align: middle;*/
+	width:100%;
+	margin:0;
+}
+
+.logonly h1{
+	font-size: 20px;
+	color:#fff;
+	display: inline-block;
+	text-align: center;
+	/*vertical-align: middle;*/
+	width:100%;
+	margin:0;
+	background: var(--logo-blue-background);
+}
+
+.logonly{
+	border-radius: 4px;
+	line-height: 58px;
+	height: 48px;
+	margin: 0px;
+	/*background: rgba(0, 0, 0, 0.8);*/
+	background: rgba(255, 255, 255, 0.8);
+}
+
+.ant-menu-inline-collapsed{
+	width: 50px!important;
+}
+

package/src/aldehyde/layout/sidebar/index.tsx

@@ -1,84 +1,84 @@
-import React, { CSSProperties } from "react";
-import "./index.css";
-import Units from "../../units";
-import Menu2layers from "../menu/menu-2layers";
-import { Menu2layersProps } from "../../tmpl/interface";
-import Scrollbars from "react-custom-scrollbars";
-import { Image, theme } from "antd";
-import { useLocale } from "../../locale/useLocale";
-interface SideBarProps extends Menu2layersProps {
-  header?:any;
-  collapsedHeader?:any;
-  title?: string;
-  logo?: any;
-}
-
-interface SideBarState {}
-const { useToken } = theme;
-const SideBar: React.FC<SideBarProps> = (props) => {
-  const { translate } = useLocale();
-  const { token } = useToken();
-  let syyy = { "--logo-blue-background": token.colorPrimary } as CSSProperties;
-  let { collapsed,header,collapsedHeader ,title} = props;
-  let programLabel= title ? title : Units.programName_NavLeft();
-  programLabel=translate("${"+ programLabel +"}");
-  return (
-    <div>
-      <Scrollbars
-        style={{ height: "calc(100vh)" }}
-        autoHide
-        autoHideTimeout={1000}
-      >
-        <div className={collapsed ? "logonly" : "logo-blue"} style={syyy}>
-          <a href="#/home">
-            {collapsed ?( collapsedHeader ? <div style={{
-                      overflow: "hidden",
-                      height: "56px",
-                      padding:"2px"
-                    }}>{collapsedHeader}</div>:
-                props.logo ?
-                    <Image src={props.logo}/>
-                 : (
-                    <h1
-                        style={{
-                          overflow: "hidden",
-                          height: "56px",
-                          paddingLeft: "-20px",
-                        }}
-                    >
-                      M
-                    </h1>
-                )
-            ) : (header ? <div style={{
-                      overflow: "hidden",
-                      height: "56px",
-                      padding: "2px"
-                    }}>{header}</div> :
-                    <>
-                      <h1
-                          style={{
-                            overflow: "hidden",
-                            height: "56px",
-                            paddingLeft: "-20px",
-                          }}
-                      >
-                        <>
-                          {props.logo ? (
-                              <Image width={"30px"} src={props.logo}/>
-                          ) : (
-                              <></>
-                          )}
-                          {programLabel}
-                        </>
-                      </h1>
-                    </>
-            )}
-          </a>
-        </div>
-        <Menu2layers mode="inline" theme="light" {...props}></Menu2layers>
-      </Scrollbars>
-    </div>
-  );
-};
-
-export default SideBar;
+import React, { CSSProperties } from "react";
+import "./index.css";
+import Units from "../../units";
+import Menu2layers from "../menu/menu-2layers";
+import { Menu2layersProps } from "../../tmpl/interface";
+import Scrollbars from "react-custom-scrollbars";
+import { Image, theme } from "antd";
+import { useLocale } from "../../locale/useLocale";
+interface SideBarProps extends Menu2layersProps {
+  header?:any;
+  collapsedHeader?:any;
+  title?: string;
+  logo?: any;
+}
+
+interface SideBarState {}
+const { useToken } = theme;
+const SideBar: React.FC<SideBarProps> = (props) => {
+  const { translate } = useLocale();
+  const { token } = useToken();
+  let syyy = { "--logo-blue-background": token.colorPrimary } as CSSProperties;
+  let { collapsed,header,collapsedHeader ,title} = props;
+  let programLabel= title ? title : Units.programName_NavLeft();
+  programLabel=translate("${"+ programLabel +"}");
+  return (
+    <div>
+      <Scrollbars
+        style={{ height: "calc(100vh)" }}
+        autoHide
+        autoHideTimeout={1000}
+      >
+        <div className={collapsed ? "logonly" : "logo-blue"} style={syyy}>
+          <a href="#/home">
+            {collapsed ?( collapsedHeader ? <div style={{
+                      overflow: "hidden",
+                      height: "56px",
+                      padding:"2px"
+                    }}>{collapsedHeader}</div>:
+                props.logo ?
+                    <Image src={props.logo}/>
+                 : (
+                    <h1
+                        style={{
+                          overflow: "hidden",
+                          height: "56px",
+                          paddingLeft: "-20px",
+                        }}
+                    >
+                      M
+                    </h1>
+                )
+            ) : (header ? <div style={{
+                      overflow: "hidden",
+                      height: "56px",
+                      padding: "2px"
+                    }}>{header}</div> :
+                    <>
+                      <h1
+                          style={{
+                            overflow: "hidden",
+                            height: "56px",
+                            paddingLeft: "-20px",
+                          }}
+                      >
+                        <>
+                          {props.logo ? (
+                              <Image width={"30px"} src={props.logo}/>
+                          ) : (
+                              <></>
+                          )}
+                          {programLabel}
+                        </>
+                      </h1>
+                    </>
+            )}
+          </a>
+        </div>
+        <Menu2layers mode="inline" theme="light" {...props}></Menu2layers>
+      </Scrollbars>
+    </div>
+  );
+};
+
+export default SideBar;

package/src/aldehyde/layout2/components/icon-font.tsx

@@ -1,8 +1,8 @@
-import React from 'react';
-import { createFromIconfontCN } from '@ant-design/icons';
-// @ts-ignore
-import iconfont from '../../controls/icon-selector/icon/aldehyde-menu-icon/iconfont.js';
-
-const IconFont = createFromIconfontCN({ scriptUrl: iconfont });
-
+import React from 'react';
+import { createFromIconfontCN } from '@ant-design/icons';
+// @ts-ignore
+import iconfont from '../../controls/icon-selector/icon/aldehyde-menu-icon/iconfont.js';
+
+const IconFont = createFromIconfontCN({ scriptUrl: iconfont });
+
 export default IconFont;

package/src/aldehyde/layout2/components/screenfull-button.tsx

@@ -1,21 +1,21 @@
-import React from "react";
-import { Button, ButtonProps } from "antd";
-import { FullscreenOutlined, FullscreenExitOutlined } from '@ant-design/icons';
-import { useLocale } from "../../locale/useLocale";
-
-const Index = (props: ButtonProps) => {
-    const { screenfull, changeScreenfull } = useLocale();
-
-    return (
-        <Button
-            shape="default"
-            size="large"
-            type="link"
-            icon={screenfull ? <FullscreenExitOutlined /> : <FullscreenOutlined />}
-            onClick={() => changeScreenfull()}
-            {...props}
-        />
-    );
-};
-
-export default Index;
+import React from "react";
+import { Button, ButtonProps } from "antd";
+import { FullscreenOutlined, FullscreenExitOutlined } from '@ant-design/icons';
+import { useLocale } from "../../locale/useLocale";
+
+const Index = (props: ButtonProps) => {
+    const { screenfull, changeScreenfull } = useLocale();
+
+    return (
+        <Button
+            shape="default"
+            size="large"
+            type="link"
+            icon={screenfull ? <FullscreenExitOutlined /> : <FullscreenOutlined />}
+            onClick={() => changeScreenfull()}
+            {...props}
+        />
+    );
+};
+
+export default Index;

package/src/aldehyde/layout2/components/search-menu.tsx

@@ -1,85 +1,85 @@
-import React, { useEffect, useState } from "react";
-import { Button, ButtonProps, Popover, TreeSelect } from "antd";
-import { SearchOutlined } from "@ant-design/icons";
-import { useNavigate } from "react-router-dom";
-import { MenuType } from "../type/layout-type";
-import { useLocale } from "../../locale/useLocale";
-
-const handleMenu = (arr: MenuType[], translate: any) => {
-    return arr.map(item => {
-        const newItem = {
-            ...item,
-            value: item.id,
-            label: translate("${" + item.label + "}")
-        };
-        if (item.children && Array.isArray(item.children) && item.children.length > 0) {
-            newItem.children = handleMenu(item.children, translate);
-            newItem.url = newItem.children[0].url; // 存在子菜单时，url 为第一个子菜单的 url
-        }
-        return newItem;
-    });
-}
-
-interface Props extends ButtonProps {
-    menuList: MenuType[];
-}
-
-const Index = (props: Props) => {
-    const { menuList, ...otherProps } = props;
-    const { translate, getLocale } = useLocale();
-    const [menu, setMenu] = useState<MenuType[]>([]);
-    const [searchValue, setSearchValue] = useState<string>();
-    const [selectInit, setSelectInit] = useState<boolean>(true); // 解决搜索框初始化设置searchValue，onSearch返回空value的问题
-    const navigate = useNavigate();
-
-    useEffect(() => {
-        const newMenu = handleMenu(menuList, translate);
-        setMenu(newMenu);
-    }, [menuList, getLocale()]);
-
-    const handleRouter = (value: string, node: MenuType) => {
-        if (value) {
-            if (node.linkTarget === "_blank") {
-                window.open(`${window.location.origin}/#/${node.url}`, '_blank', 'noopener,noreferrer');
-            } else {
-                navigate(`/${node.url}`);
-            }
-        }
-    }
-
-    const renderMenu = <TreeSelect
-        style={{ width: 200 }}
-        showSearch
-        placeholder={translate("${请输入}")}
-        treeNodeFilterProp="label"
-        treeNodeLabelProp="label"
-        allowClear
-        treeData={menu}
-        onSelect={handleRouter}
-        onSearch={(value) => {
-            // 解决搜索框显示设置searchValue，onSearch返回空value的问题(初始化显示不设置searchValue)
-            !selectInit && setSearchValue(value);
-            setSelectInit(false);
-        }}
-        searchValue={searchValue}
-        open
-        variant="borderless"
-    />;
-
-    return (
-        <Popover placement="bottom" trigger="click" content={renderMenu} styles={{ container: { padding: 2 } }} destroyOnHidden onOpenChange={(val) => val && setSelectInit(true)}>
-            <Button type="link" icon={<SearchOutlined />} shape="default" size="large"
-                style={{
-                    width: "100%",
-                    height: "100%",
-                    boxSizing: "border-box",
-                    padding: 0,
-                    borderRadius: 0,
-                    color: "#fff",
-                }} {...otherProps}
-            />
-        </Popover>
-    );
-};
-
-export default Index;
+import React, { useEffect, useState } from "react";
+import { Button, ButtonProps, Popover, TreeSelect } from "antd";
+import { SearchOutlined } from "@ant-design/icons";
+import { useNavigate } from "react-router-dom";
+import { MenuType } from "../type/layout-type";
+import { useLocale } from "../../locale/useLocale";
+
+const handleMenu = (arr: MenuType[], translate: any) => {
+    return arr.map(item => {
+        const newItem = {
+            ...item,
+            value: item.id,
+            label: translate("${" + item.label + "}")
+        };
+        if (item.children && Array.isArray(item.children) && item.children.length > 0) {
+            newItem.children = handleMenu(item.children, translate);
+            newItem.url = newItem.children[0].url; // 存在子菜单时，url 为第一个子菜单的 url
+        }
+        return newItem;
+    });
+}
+
+interface Props extends ButtonProps {
+    menuList: MenuType[];
+}
+
+const Index = (props: Props) => {
+    const { menuList, ...otherProps } = props;
+    const { translate, getLocale } = useLocale();
+    const [menu, setMenu] = useState<MenuType[]>([]);
+    const [searchValue, setSearchValue] = useState<string>();
+    const [selectInit, setSelectInit] = useState<boolean>(true); // 解决搜索框初始化设置searchValue，onSearch返回空value的问题
+    const navigate = useNavigate();
+
+    useEffect(() => {
+        const newMenu = handleMenu(menuList, translate);
+        setMenu(newMenu);
+    }, [menuList, getLocale()]);
+
+    const handleRouter = (value: string, node: MenuType) => {
+        if (value) {
+            if (node.linkTarget === "_blank") {
+                window.open(`${window.location.origin}/#/${node.url}`, '_blank', 'noopener,noreferrer');
+            } else {
+                navigate(`/${node.url}`);
+            }
+        }
+    }
+
+    const renderMenu = <TreeSelect
+        style={{ width: 200 }}
+        showSearch
+        placeholder={translate("${请输入}")}
+        treeNodeFilterProp="label"
+        treeNodeLabelProp="label"
+        allowClear
+        treeData={menu}
+        onSelect={handleRouter}
+        onSearch={(value) => {
+            // 解决搜索框显示设置searchValue，onSearch返回空value的问题(初始化显示不设置searchValue)
+            !selectInit && setSearchValue(value);
+            setSelectInit(false);
+        }}
+        searchValue={searchValue}
+        open
+        variant="borderless"
+    />;
+
+    return (
+        <Popover placement="bottom" trigger="click" content={renderMenu} styles={{ container: { padding: 2 } }} destroyOnHidden onOpenChange={(val) => val && setSelectInit(true)}>
+            <Button type="link" icon={<SearchOutlined />} shape="default" size="large"
+                style={{
+                    width: "100%",
+                    height: "100%",
+                    boxSizing: "border-box",
+                    padding: 0,
+                    borderRadius: 0,
+                    color: "#fff",
+                }} {...otherProps}
+            />
+        </Popover>
+    );
+};
+
+export default Index;

package/src/aldehyde/layout2/components/system-messages.tsx

@@ -1,75 +1,75 @@
-import React, { useEffect, useRef } from "react";
-import { notification, Modal, Button } from "antd";
-import { useNavigate } from "react-router-dom";
-import { MenuType } from "../type/layout-type";
-import WebSocket from "../../tmpl/web-socket";
-import Units from "../../units";
-import { useLocale } from "../../locale/useLocale";
-
-interface SystemMessage {
-    title?: string; // 标题
-    description?: string; // 内容
-    duration?: number; // 延迟时间
-    type?: "success" | "error" | "info" | "warning"; // 类型
-    closable?: boolean; // 是否可以关闭
-    sysDisabled?: boolean; // 是否显示遮罩层
-    sourceId?: string; // 用户消息推送，菜单sourceId
-}
-
-interface Props {
-    menuList: MenuType[];
-}
-
-// 系统广播
-const Index = (props: Props) => {
-    const { menuList } = props;
-    const [api, contextHolder] = notification.useNotification();
-    const { translate } = useLocale();
-    const navigate = useNavigate();
-    const wsRef = useRef(undefined); // 实时数据websocket连接
-    const subscribeRef = useRef(undefined); // 实时数据订阅
-
-    // 订阅消息数据
-    const getWebSocketSystemMessage = async () => {
-        if (subscribeRef.current) { subscribeRef.current.unsubscribe(); }
-        const programCode = Units.programCode();
-        wsRef.current = WebSocket.getInstance("v3/kk-ws");
-        subscribeRef.current = await wsRef.current.subscribe(`/topic/sys-messages/${programCode}`, {}, (data) => {
-            openNotification(data);
-        });
-    }
-
-    useEffect(() => {
-        getWebSocketSystemMessage();
-        return () => {
-            if (subscribeRef.current) { subscribeRef.current.unsubscribe(); }
-        }
-    }, []);
-
-    const routerTo = (sourceId: string) => {
-        const menu = Units.findItemByIdIterative(menuList, sourceId);
-        if (menu) {
-            navigate(`/${menu.url}`);
-        }
-    }
-
-    const openNotification = (message: SystemMessage) => {
-        if (!message) {
-            return;
-        }
-        const { title, description, duration, type, closable, sysDisabled, sourceId } = message;
-        const btn = sourceId ? <div style={{ textAlign: "end" }}><Button style={{ padding: 0 }} type="link" onClick={() => routerTo(sourceId)}>{translate("${查看}")}</Button></div> : false;
-        const nContent = { style: { padding: "12px" }, message: title, description, duration, closeIcon: closable, btn };
-        const mContent = { styles: { content: { padding: "20px 20px 12px" } }, title, content: description, closable, footer: btn };
-        if (sysDisabled) { // 带遮罩层
-            const modal = Modal[type || "confirm"](mContent);
-            if (duration) setTimeout(() => modal.destroy(), duration * 1000);
-        } else { // 不带遮罩层
-            api[type || "open"](nContent);
-        }
-    };
-
-    return contextHolder;
-};
-
-export default Index;
+import React, { useEffect, useRef } from "react";
+import { notification, Modal, Button } from "antd";
+import { useNavigate } from "react-router-dom";
+import { MenuType } from "../type/layout-type";
+import WebSocket from "../../tmpl/web-socket";
+import Units from "../../units";
+import { useLocale } from "../../locale/useLocale";
+
+interface SystemMessage {
+    title?: string; // 标题
+    description?: string; // 内容
+    duration?: number; // 延迟时间
+    type?: "success" | "error" | "info" | "warning"; // 类型
+    closable?: boolean; // 是否可以关闭
+    sysDisabled?: boolean; // 是否显示遮罩层
+    sourceId?: string; // 用户消息推送，菜单sourceId
+}
+
+interface Props {
+    menuList: MenuType[];
+}
+
+// 系统广播
+const Index = (props: Props) => {
+    const { menuList } = props;
+    const [api, contextHolder] = notification.useNotification();
+    const { translate } = useLocale();
+    const navigate = useNavigate();
+    const wsRef = useRef(undefined); // 实时数据websocket连接
+    const subscribeRef = useRef(undefined); // 实时数据订阅
+
+    // 订阅消息数据
+    const getWebSocketSystemMessage = async () => {
+        if (subscribeRef.current) { subscribeRef.current.unsubscribe(); }
+        const programCode = Units.programCode();
+        wsRef.current = WebSocket.getInstance("v3/kk-ws");
+        subscribeRef.current = await wsRef.current.subscribe(`/topic/sys-messages/${programCode}`, {}, (data) => {
+            openNotification(data);
+        });
+    }
+
+    useEffect(() => {
+        getWebSocketSystemMessage();
+        return () => {
+            if (subscribeRef.current) { subscribeRef.current.unsubscribe(); }
+        }
+    }, []);
+
+    const routerTo = (sourceId: string) => {
+        const menu = Units.findItemByIdIterative(menuList, sourceId);
+        if (menu) {
+            navigate(`/${menu.url}`);
+        }
+    }
+
+    const openNotification = (message: SystemMessage) => {
+        if (!message) {
+            return;
+        }
+        const { title, description, duration, type, closable, sysDisabled, sourceId } = message;
+        const btn = sourceId ? <div style={{ textAlign: "end" }}><Button style={{ padding: 0 }} type="link" onClick={() => routerTo(sourceId)}>{translate("${查看}")}</Button></div> : false;
+        const nContent = { style: { padding: "12px" }, message: title, description, duration, closeIcon: closable, btn };
+        const mContent = { styles: { content: { padding: "20px 20px 12px" } }, title, content: description, closable, footer: btn };
+        if (sysDisabled) { // 带遮罩层
+            const modal = Modal[type || "confirm"](mContent);
+            if (duration) setTimeout(() => modal.destroy(), duration * 1000);
+        } else { // 不带遮罩层
+            api[type || "open"](nContent);
+        }
+    };
+
+    return contextHolder;
+};
+
+export default Index;