aldehyde 0.2.326 → 0.2.328

package/src/aldehyde/controls/icon-selector/icon/aldehyde-menu-icon/iconfont.json

@@ -0,0 +1,23 @@
+{
+  "id": "5037133",
+  "name": "aldehyde-menu-icon",
+  "font_family": "iconfont",
+  "css_prefix_text": "icon-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "11487981",
+      "name": "all",
+      "font_class": "all",
+      "unicode": "e743",
+      "unicode_decimal": 59203
+    },
+    {
+      "icon_id": "15838501",
+      "name": "menu",
+      "font_class": "menu",
+      "unicode": "e677",
+      "unicode_decimal": 58999
+    }
+  ]
+}

package/src/aldehyde/controls/icon-selector/icon/phonenode-menu-icon/iconfont.css

@@ -0,0 +1,19 @@
+@font-face {
+  font-family: "iconfont"; /* Project id 5037136 */
+  src: url('iconfont.woff2?t=1760081625440') format('woff2'),
+       url('iconfont.woff?t=1760081625440') format('woff'),
+       url('iconfont.ttf?t=1760081625440') format('truetype');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-menu:before {
+  content: "\e677";
+}
+

package/src/aldehyde/controls/icon-selector/icon/phonenode-menu-icon/iconfont.js

@@ -0,0 +1 @@
+window._iconfont_svg_string_5037136='<svg><symbol id="icon-menu" viewBox="0 0 1024 1024"><path d="M170.666667 213.333333m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0Z"  ></path><path d="M170.666667 512m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0Z"  ></path><path d="M170.666667 810.666667m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0Z"  ></path><path d="M896 778.666667H362.666667c-17.066667 0-32 14.933333-32 32s14.933333 32 32 32h533.333333c17.066667 0 32-14.933333 32-32s-14.933333-32-32-32zM362.666667 245.333333h533.333333c17.066667 0 32-14.933333 32-32s-14.933333-32-32-32H362.666667c-17.066667 0-32 14.933333-32 32s14.933333 32 32 32zM896 480H362.666667c-17.066667 0-32 14.933333-32 32s14.933333 32 32 32h533.333333c17.066667 0 32-14.933333 32-32s-14.933333-32-32-32z"  ></path></symbol></svg>',(n=>{var t=(e=(e=document.getElementsByTagName("script"))[e.length-1]).getAttribute("data-injectcss"),e=e.getAttribute("data-disable-injectsvg");if(!e){var o,i,c,a,d,s=function(t,e){e.parentNode.insertBefore(t,e)};if(t&&!n.__iconfont__svg__cssinject__){n.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(t){console&&console.log(t)}}o=function(){var t,e=document.createElement("div");e.innerHTML=n._iconfont_svg_string_5037136,(e=e.getElementsByTagName("svg")[0])&&(e.setAttribute("aria-hidden","true"),e.style.position="absolute",e.style.width=0,e.style.height=0,e.style.overflow="hidden",e=e,(t=document.body).firstChild?s(e,t.firstChild):t.appendChild(e))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(o,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),o()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(c=o,a=n.document,d=!1,r(),a.onreadystatechange=function(){"complete"==a.readyState&&(a.onreadystatechange=null,l())})}function l(){d||(d=!0,c())}function r(){try{a.documentElement.doScroll("left")}catch(t){return void setTimeout(r,50)}l()}})(window);

package/src/aldehyde/controls/icon-selector/icon/phonenode-menu-icon/iconfont.json

@@ -0,0 +1,16 @@
+{
+  "id": "5037136",
+  "name": "phonenode-menu-icon",
+  "font_family": "iconfont",
+  "css_prefix_text": "icon-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "15838501",
+      "name": "menu",
+      "font_class": "menu",
+      "unicode": "e677",
+      "unicode_decimal": 58999
+    }
+  ]
+}

package/src/aldehyde/controls/icon-selector/pc-icon-selector.tsx

@@ -0,0 +1,67 @@
+import React, { useState } from 'react';
+import { createFromIconfontCN } from '@ant-design/icons';
+import { Select, Empty, Row, Col } from "antd";
+import iconEnum from "./icon/aldehyde-menu-icon/iconfont.json";
+import { EControlProps } from "../../tmpl/interface";
+import { useLocale } from "../../locale/useLocale";
+
+const IconFont = createFromIconfontCN({ scriptUrl: "./icon/aldehyde-menu-icon/iconfont.js" });
+
+const options = iconEnum.glyphs.map(item => ({ value: `icon-${item.font_class}`, label: <IconFont type={`icon-${item.font_class}`} /> }))
+
+interface Props extends EControlProps {
+    value?: string;
+    onChange?: (data: string) => void;
+    id?: string;
+}
+
+const Index = (props: Props) => {
+    const { value, onChange, fieldConfig, id } = props;
+    const [filterOptions, setFilterOptions] = useState<{ value: string, label: React.ReactNode }[]>(options);
+    const [open, setOpen] = useState(false);
+    const { translate } = useLocale();
+    const placeholder = !fieldConfig.disabled
+        ? translate("${请选择}${" + fieldConfig.title + "}")
+        : translate("${无需选择}");
+
+    const handleSearch = (val) => {
+        setFilterOptions(val ? options.filter(item => item.value.includes(val)) : options);
+    }
+
+    return <Select
+        allowClear={true}
+        open={open}
+        showSearch={true}
+        id={id}
+        disabled={fieldConfig.disabled}
+        value={value}
+        options={options}
+        onChange={onChange}
+        onSearch={handleSearch}
+        onOpenChange={setOpen}
+        popupMatchSelectWidth={false}
+        placeholder={placeholder}
+        popupRender={() => {
+            return <div style={{ padding: 4, maxWidth: 240 }}>
+                {filterOptions.length === 0 ? (
+                    <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
+                ) : (
+                    <Row gutter={12}>
+                        {filterOptions.map((opt) => (
+                            <Col
+                                style={{ textAlign: "center", cursor: "pointer" }}
+                                onClick={() => {
+                                    onChange(opt.value);
+                                    setOpen(false);
+                                }}>
+                                {opt.label}
+                            </Col>
+                        ))}
+                    </Row>
+                )}
+            </div>
+        }}
+    />;
+}
+
+export default Index;

package/src/aldehyde/layout/menu/l2menu-quick-bar.tsx

@@ -6,6 +6,7 @@ import { Level2Menu } from "../../tmpl/interface";
 import HCDataSource from "../../tmpl/hc-data-source";
 import LtmplTable from "../../module/ltmpl-table";
 import { LocaleContext } from "../../locale/LocaleProvider";
+import IconFont from "../../layout2/components/icon-font";
 
 interface L2MenuQuickBarProps {
   backgroudColor?: string;
@@ -86,10 +87,14 @@ class L2MenuQuickBar extends React.PureComponent<
           if (quickBar.count) {
             total = total + quickBar.count;
           }
+          const renderIcon = quickBar.l2Menu.icon ? <IconFont type={quickBar.l2Menu.icon} /> : "";
           return (
-            <Menu.Item key={index}>
+            <Menu.Item key={index} style={{ textAlign: "left" }}>
               <span onClick={() => this.showDraw(quickBar.l2Menu.id)}>
-                {quickBar.l2Menu.title}
+                <Space>
+                  {renderIcon}
+                  {quickBar.l2Menu.title}
+                </Space>
               </span>
             </Menu.Item>
           );
@@ -108,7 +113,7 @@ class L2MenuQuickBar extends React.PureComponent<
           style={syyy}
           onClick={() => this.showDraw(quickBar.l2Menu.id)}
         >
-          <span style={{ fontSize: "20px", color: "#08c" }}>
+          <span style={{ fontSize: "20px" }}>
             <AppstoreOutlined />
           </span>
         </div>
@@ -117,7 +122,7 @@ class L2MenuQuickBar extends React.PureComponent<
       return (
         <Dropdown overlay={menu} placement="bottomCenter">
           <div className={"message-bar"} style={syyy}>
-            <span style={{ fontSize: "20px", color: "#08c" }}>
+            <span style={{ fontSize: "20px" }}>
               <AppstoreOutlined />
             </span>
           </div>

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

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

package/src/aldehyde/layout2/header.tsx

@@ -23,8 +23,7 @@ import { useLocale } from "../locale/useLocale";
 import { generate } from "@ant-design/colors";
 import { useLayoutContext } from "./layout-context";
 import ThemeButton from "./components/theme-button";
-
-import Units from "../units";
+import IconFont from "./components/icon-font";
 
 type HeaderPropsType = {
   systemName: string;
@@ -57,7 +56,8 @@ const Header: React.FC<HeaderPropsType> = ({ systemName, menuList, style }) => {
       handlePropsMenuToAntdMenu(
         menuList,
         (menuItem, floor) => {
-          const { disabled, label, children, id } = menuItem;
+          const { disabled, label, children, icon } = menuItem;
+          const renderIcon = icon ? <IconFont type={icon} /> : "";
           if (disabled)
             return (
               <div
@@ -68,7 +68,7 @@ const Header: React.FC<HeaderPropsType> = ({ systemName, menuList, style }) => {
                   display: "block",
                 }}
               >
-                <Space size={"small"}>{Units.mapMenuIcon(id)}{translate("${" + label + "}")}</Space>
+                <Space size={"small"}>{renderIcon}{translate("${" + label + "}")}</Space>
               </div>
             );
           const { path, target } = getLeftMostRouteInfo(menuItem);
@@ -94,7 +94,7 @@ const Header: React.FC<HeaderPropsType> = ({ systemName, menuList, style }) => {
                   height: "100%",
                   display: "block",
                 }}
-              ><Space size={"small"}>{Units.mapMenuIcon(id)}{translate("${" + label + "}")}</Space>
+              ><Space size={"small"}>{renderIcon}{translate("${" + label + "}")}</Space>
               </NavLink>
             );
           if (Array.isArray(children) && !children.length)
@@ -113,7 +113,7 @@ const Header: React.FC<HeaderPropsType> = ({ systemName, menuList, style }) => {
               </NavLink>
             );
 
-          return <Space size={"small"}>{Units.mapMenuIcon(id)}{translate("${" + label + "}")}</Space>;
+          return <Space size={"small"}>{renderIcon}{translate("${" + label + "}")}</Space>;
         },
         "layout2-header-menu-item"
       )
@@ -239,37 +239,9 @@ const Header: React.FC<HeaderPropsType> = ({ systemName, menuList, style }) => {
             flexDirection: "row",
           }}
         >
-          <div
-            style={{
-              width: "64px",
-              height: "100%",
-              display: "flex",
-              justifyContent: "center",
-              alignItems: "center",
-            }}
-          >
-            <L2MenuQuickBar></L2MenuQuickBar>
-          </div>
-          <div
-            style={{
-              width: "64px",
-              height: "100%",
-              display: "flex",
-              justifyContent: "center",
-              alignItems: "center",
-            }}
-          >
-            <L2MenuMessageBar></L2MenuMessageBar>
-          </div>
-          <div
-            style={{
-              width: "64px",
-              height: "100%",
-              display: "flex",
-              justifyContent: "center",
-              alignItems: "center",
-            }}
-          >
+          <Space size={28}>
+            <L2MenuQuickBar />
+            <L2MenuMessageBar />
             <LocaleButton
               shape="default"
               size="large"
@@ -282,17 +254,7 @@ const Header: React.FC<HeaderPropsType> = ({ systemName, menuList, style }) => {
                 borderRadius: 0,
                 color: "#fff",
               }}
-            ></LocaleButton>
-          </div>
-          <div
-            style={{
-              width: "64px",
-              height: "100%",
-              display: "flex",
-              justifyContent: "center",
-              alignItems: "center",
-            }}
-          >
+            />
             <ThemeButton shape="default"
               size="large"
               type="text"
@@ -304,17 +266,8 @@ const Header: React.FC<HeaderPropsType> = ({ systemName, menuList, style }) => {
                 borderRadius: 0,
                 color: "#fff",
               }} />
-          </div>
-          <div
-            style={{
-              height: "100%",
-              display: "flex",
-              justifyContent: "center",
-              alignItems: "center",
-            }}
-          >
-            <UserButton></UserButton>
-          </div>
+            <UserButton />
+          </Space>
         </div>
       </div>
     </Layout.Header>

package/src/aldehyde/layout2/page.tsx

@@ -103,7 +103,8 @@ const handleMenuRes = (menuList: MenuConfigAPIType["blocks"], version: string):
     linkTarget,
     defaultCriteriaValue,
     items,
-    fullScreen
+    fullScreen,
+    icon
   } of menuList) {
     if (!(hiddenOnDisabled === true && disabled === true)) {
       const menu: MenuType = {
@@ -113,6 +114,7 @@ const handleMenuRes = (menuList: MenuConfigAPIType["blocks"], version: string):
         url: handleMenuItemUrl(id, pageType, defaultCriteriaValue, customPath, dragDropPageId, fullScreen, version),
         linkTarget,
         children: items?.length ? handleMenuRes(items, version) : [],
+        icon,
       };
 
       retList.push(menu);

package/src/aldehyde/layout2/sider.tsx

@@ -1,4 +1,4 @@
-import {ConfigProvider, Layout, Menu, MenuProps, Space, theme, Tooltip} from "antd";
+import { ConfigProvider, Layout, Menu, MenuProps, Space, theme, Tooltip } from "antd";
 import React, { useEffect, useRef, useState } from "react";
 
 import { MenuType } from "./type/layout-type";
@@ -10,16 +10,13 @@ import {
 } from "./util/menu-util";
 import { useLocale } from "../locale/useLocale";
 import { generate } from "@ant-design/colors";
-import {
-  useLayoutContext,
-} from "./layout-context";
-import {AppstoreOutlined, SettingOutlined} from "@ant-design/icons";
-import Units from "../units";
+import { useLayoutContext } from "./layout-context";
+import IconFont from "./components/icon-font";
 
 type SiderPropsType = {
   menuList: MenuType[];
- // style?: typeof Layout.Sider.defaultProps.style;
-  collapsed:boolean;
+  // style?: typeof Layout.Sider.defaultProps.style;
+  collapsed: boolean;
 };
 
 type MenuItem = Required<MenuProps>["items"][number];
@@ -54,7 +51,7 @@ const getSecoundFloorMenuList = (
 
 const { useToken } = theme;
 
-const Sider: React.FC<SiderPropsType> = ({ menuList,collapsed }) => {
+const Sider: React.FC<SiderPropsType> = ({ menuList, collapsed }) => {
   const { setDocumentTitle, menuItemIdToFirstFloorIdxMap } = useLayoutContext();
 
   // token
@@ -77,7 +74,8 @@ const Sider: React.FC<SiderPropsType> = ({ menuList,collapsed }) => {
     secoundFloorMenu: SecoundFloorMenuList[number]
   ) => {
     return handlePropsMenuToAntdMenu(secoundFloorMenu, (menuItem, floor) => {
-      const { disabled, label, children,id } = menuItem;
+      const { disabled, label, children, icon } = menuItem;
+      const renderIcon = icon ? <IconFont type={icon} /> : "";
 
       if (disabled)
         return (
@@ -110,12 +108,12 @@ const Sider: React.FC<SiderPropsType> = ({ menuList,collapsed }) => {
                 overflow: "hidden",
               }}
             >
-              <Space size={"small"}>{Units.mapMenuIcon(id)}{translate("${" + label + "}")}</Space>
+              <Space size={"small"}>{renderIcon}{translate("${" + label + "}")}</Space>
             </NavLink>
           </Tooltip>
         );
 
-      return <Space size={"small"}>{Units.mapMenuIcon(id)}{translate("${" + label + "}")}</Space>;
+      return <Space size={"small"}>{renderIcon}{translate("${" + label + "}")}</Space>;
     });
   };
 
@@ -163,7 +161,7 @@ const Sider: React.FC<SiderPropsType> = ({ menuList,collapsed }) => {
     setSelectedKeys([...openKeys]);
   };
   return (
-    <Layout.Sider  collapsed={collapsed}  collapsedWidth={0}
+    <Layout.Sider collapsed={collapsed} collapsedWidth={0}
       style={{
         background: colors[0],
         // color: "#FFFFFF",

package/src/aldehyde/layout2/type/layout-type.ts

@@ -6,5 +6,6 @@ export type MenuType = {
   disabled: boolean; // 是否禁用
   url: string | null; // 菜单链接
   linkTarget?: HTMLAttributeAnchorTarget;
+  icon?: string;
   children?: MenuType[]; // 子菜单
 };

package/src/aldehyde/layout3/header.tsx

@@ -14,6 +14,7 @@ import UserButton from "../layout2/components/user-button";
 import headerBgImg from "./imgs/header-bg.png";
 import homeBgImg from "./imgs/home-bg.png";
 import Time from "./components/time";
+import IconFont from "../layout2/components/icon-font";
 import "./css/header.css";
 
 // 查找当前选中菜单的顶层菜单id
@@ -59,8 +60,9 @@ const Header: React.FC<HeaderPropsType> = ({ systemName, menuList }) => {
   const menuId: string = search.get("menuId");
 
   const renderMenuItem = (menuItem) => {
-    const { label, id, disabled } = menuItem;
-    return <div className={`menu-item ${disabled ? "menu-disabled" : ""}`}><div className={selParentId === id ? "menu-item-border-sel" : "menu-item-border"}>{translate("${" + label + "}")}</div></div>;
+    const { label, id, disabled, icon } = menuItem;
+    const renderIcon = icon ? <IconFont type={icon} /> : "";
+    return <div className={`menu-item ${disabled ? "menu-disabled" : ""}`}><div className={selParentId === id ? "menu-item-border-sel" : "menu-item-border"}><Space size={"small"}>{renderIcon}{translate("${" + label + "}")}</Space></div></div>;
   }
 
   const handleMenu = (menuItem, floor) => {

package/src/aldehyde/layout3/sider.tsx

@@ -9,7 +9,7 @@ import {
 import { useLayoutContext } from "../layout2/layout-context";
 import { MenuType } from "../layout2/type/layout-type";
 import { useLocale } from "../locale/useLocale";
-import Units from "../units";
+import IconFont from "../layout2/components/icon-font";
 import "./css/sider.css"
 
 type SiderPropsType = {
@@ -59,7 +59,8 @@ const Sider: React.FC<SiderPropsType> = ({ menuList, collapsed }) => {
   // menu
   const getMenuWithSecoundFloor = (secoundFloorMenu: SecoundFloorMenuList[number]) => {
     return handlePropsMenuToAntdMenu(secoundFloorMenu, (menuItem) => {
-      const { disabled, label, children, id } = menuItem;
+      const { disabled, label, children, icon } = menuItem;
+      const renderIcon = icon ? <IconFont type={icon} /> : "";
       if (disabled)
         return (
           <div
@@ -89,11 +90,11 @@ const Sider: React.FC<SiderPropsType> = ({ menuList, collapsed }) => {
                 overflow: "hidden",
               }}
             >
-              <Space size={"small"}>{Units.mapMenuIcon(id)}{translate("${" + label + "}")}</Space>
+              <Space size={"small"}>{renderIcon}{translate("${" + label + "}")}</Space>
             </NavLink>
           </Tooltip>
         );
-      return <Space size={"small"}>{Units.mapMenuIcon(id)}{translate("${" + label + "}")}</Space>;
+      return <Space size={"small"}>{renderIcon}{translate("${" + label + "}")}</Space>;
     });
   };
 

package/src/aldehyde/tmpl/interface.tsx

@@ -225,6 +225,7 @@ export interface Level2Menu extends MenuBase {
   pageType: "列表" | "详情" | "编辑" | "添加" | "编辑或添加" | "树" | "导入" | "报表";
   programAuths?: ProgramAuth[];
   linkTarget?: HTMLAttributeAnchorTarget;
+  icon?: string;
 }
 
 export interface Level1Menu extends MenuBase {
@@ -766,4 +767,5 @@ export interface BlockType {
   linkTarget?: HTMLAttributeAnchorTarget; // 页面跳转方式
   items?: BlockType[];
   fullScreen?: boolean; // 是否全屏展示
+  icon?: string;
 }

package/src/aldehyde/welcome/quick-entrance.tsx

@@ -6,8 +6,9 @@ import HcserviceV3 from "../tmpl/hcservice-v3";
 import HCDataSource from "../tmpl/hc-data-source";
 import { Level2Menu } from "../tmpl/interface";
 import { LocaleContext } from "../locale/LocaleProvider";
+import IconFont from "../layout2/components/icon-font";
 
-interface QuickEntranceProps extends CardProps {}
+interface QuickEntranceProps extends CardProps { }
 
 interface QuickEntranceState {
   l2Menus?: Level2Menu[];
@@ -69,11 +70,12 @@ class QuickEntrance extends React.PureComponent<
         if (l2Menu.disabled) {
           return null;
         }
+        const renderIcon = l2Menu.icon ? <IconFont type={l2Menu.icon} /> : <CodeTwoTone />;
         let comp = (
           <Badge key={l2Menu.id} count={l2Menu.count}>
             <Button
               shape="round"
-              icon={<CodeTwoTone />}
+              icon={renderIcon}
               href={`#/${l2Menu.id}/act-table?menuId=${l2Menu.id}`}
               size="large"
             >

package/src/aldehyde/welcome/workbench.tsx

@@ -6,8 +6,9 @@ import HcserviceV3 from "../tmpl/hcservice-v3";
 import HCDataSource from "../tmpl/hc-data-source";
 import { Level2Menu } from "../tmpl/interface";
 import { LocaleContext } from "../locale/LocaleProvider";
+import IconFont from "../layout2/components/icon-font";
 
-interface WorkbenchProps extends CardProps {}
+interface WorkbenchProps extends CardProps { }
 
 interface WorkbenchState {
   l2Menus?: Level2Menu[];
@@ -65,10 +66,11 @@ class Workbench extends React.PureComponent<WorkbenchProps, WorkbenchState> {
         if (l2Menu.disabled) {
           return null;
         }
+        const renderIcon = l2Menu.icon ? <IconFont type={l2Menu.icon} /> : <RocketTwoTone />;
         let comp = (
           <Card size={"small"} key={l2Menu.id}>
             <Statistic
-              prefix={<RocketTwoTone />}
+              prefix={renderIcon}
               title={l2Menu.title}
               value={l2Menu.count}
             />