aldehyde 0.2.197 → 0.2.199

package/src/aldehyde/layout/menu/menu-2layers.tsx

@@ -1,117 +1,117 @@
-import React from "react";
-import { Menu } from "antd";
-import { Menu2layersProps } from "../../tmpl/interface";
-import MenuRender from "./menu-render";
-import { LocaleContext } from "../../locale/LocaleProvider";
-
-interface Menu2layersState {
-  openKeys?: string[];
-}
-
-class Menu2layers extends React.PureComponent<
-  Menu2layersProps,
-  Menu2layersState
-> {
-  static contextType = LocaleContext;
-  context: React.ContextType<typeof LocaleContext>;
-  constructor(props) {
-    super(props);
-    this.state = {
-      openKeys: [],
-    };
-  }
-
-  componentDidMount() {
-    const { currentL2MenuId, blockMenu, collapsed } = this.props;
-    const { openKeys } = this.state;
-    let openKey = blockMenu
-      ? MenuRender.findOpenId(blockMenu, currentL2MenuId)
-      : undefined;
-    if (openKey && openKeys.length < 1) {
-      this.setState({
-        openKeys: [openKey.toString()],
-      });
-    }
-  }
-  componentDidUpdate(prevProps) {
-    const { currentL2MenuId, blockMenu, collapsed } = this.props;
-    let { currentL2MenuId: preMenuId, blockMenu: preBlockMenu } = prevProps;
-    const { openKeys } = this.state;
-
-    if (!preBlockMenu || !blockMenu || blockMenu.id != preBlockMenu.id) {
-      //console.log('currentL2MenuId:',currentL2MenuId);
-      let openKey = blockMenu
-        ? MenuRender.findOpenId(blockMenu, currentL2MenuId)
-        : undefined;
-      if (openKey) {
-        this.setState({
-          openKeys: [openKey],
-        });
-      }
-    } else {
-      let openKey = blockMenu
-        ? MenuRender.findOpenId(blockMenu, currentL2MenuId)
-        : undefined;
-      let preOpenKey = blockMenu
-        ? MenuRender.findOpenId(preBlockMenu, preMenuId)
-        : undefined;
-      if ((!preOpenKey && openKey) || (openKey && openKey != preOpenKey)) {
-        this.setState({
-          openKeys: [openKey],
-        });
-      }
-    }
-  }
-
-  handleOpen = (openKeys) => {
-    if (openKeys && openKeys.length > 1) {
-      openKeys.splice(0, 1);
-    }
-    this.setState({
-      openKeys,
-    });
-  };
-
-  get computedBlockMenu() {
-    const { translate } = this.context;
-    const menu = JSON.parse(JSON.stringify(this.props.blockMenu));
-    menu &&
-      Array.isArray(menu.items) &&
-      menu.items.forEach((item) => {
-        item.title = translate("${" + item.title + "}");
-        return item;
-      });
-    return menu;
-  }
-
-  render() {
-    const {
-      blockMenu,
-      collapsed,
-      currentL2MenuId,
-      basePath,
-      ...other
-    } = this.props;
-    const { openKeys } = this.state;
-
-    const items = blockMenu
-      ? MenuRender.getMenu(this.computedBlockMenu, undefined, basePath)
-      : [];
-
-    other.title = "";
-
-    return (
-      <Menu
-        {...other}
-        onOpenChange={this.handleOpen} //手风琴
-        selectedKeys={
-          currentL2MenuId ? [currentL2MenuId.toString()] : undefined
-        }
-        openKeys={!collapsed ? openKeys : undefined}
-        items={items}
-      ></Menu>
-    );
-  }
-}
-
-export default Menu2layers;
+import React from "react";
+import { Menu } from "antd";
+import { Menu2layersProps } from "../../tmpl/interface";
+import MenuRender from "./menu-render";
+import { LocaleContext } from "../../locale/LocaleProvider";
+
+interface Menu2layersState {
+  openKeys?: string[];
+}
+
+class Menu2layers extends React.PureComponent<
+  Menu2layersProps,
+  Menu2layersState
+> {
+  static contextType = LocaleContext;
+  context: React.ContextType<typeof LocaleContext>;
+  constructor(props) {
+    super(props);
+    this.state = {
+      openKeys: [],
+    };
+  }
+
+  componentDidMount() {
+    const { currentL2MenuId, blockMenu, collapsed } = this.props;
+    const { openKeys } = this.state;
+    let openKey = blockMenu
+      ? MenuRender.findOpenId(blockMenu, currentL2MenuId)
+      : undefined;
+    if (openKey && openKeys.length < 1) {
+      this.setState({
+        openKeys: [openKey.toString()],
+      });
+    }
+  }
+  componentDidUpdate(prevProps) {
+    const { currentL2MenuId, blockMenu, collapsed } = this.props;
+    let { currentL2MenuId: preMenuId, blockMenu: preBlockMenu } = prevProps;
+    const { openKeys } = this.state;
+
+    if (!preBlockMenu || !blockMenu || blockMenu.id != preBlockMenu.id) {
+      //console.log('currentL2MenuId:',currentL2MenuId);
+      let openKey = blockMenu
+        ? MenuRender.findOpenId(blockMenu, currentL2MenuId)
+        : undefined;
+      if (openKey) {
+        this.setState({
+          openKeys: [openKey],
+        });
+      }
+    } else {
+      let openKey = blockMenu
+        ? MenuRender.findOpenId(blockMenu, currentL2MenuId)
+        : undefined;
+      let preOpenKey = blockMenu
+        ? MenuRender.findOpenId(preBlockMenu, preMenuId)
+        : undefined;
+      if ((!preOpenKey && openKey) || (openKey && openKey != preOpenKey)) {
+        this.setState({
+          openKeys: [openKey],
+        });
+      }
+    }
+  }
+
+  handleOpen = (openKeys) => {
+    if (openKeys && openKeys.length > 1) {
+      openKeys.splice(0, 1);
+    }
+    this.setState({
+      openKeys,
+    });
+  };
+
+  get computedBlockMenu() {
+    const { translate } = this.context;
+    const menu = JSON.parse(JSON.stringify(this.props.blockMenu));
+    menu &&
+      Array.isArray(menu.items) &&
+      menu.items.forEach((item) => {
+        item.title = translate("${" + item.title + "}");
+        return item;
+      });
+    return menu;
+  }
+
+  render() {
+    const {
+      blockMenu,
+      collapsed,
+      currentL2MenuId,
+      basePath,
+      ...other
+    } = this.props;
+    const { openKeys } = this.state;
+
+    const items = blockMenu
+      ? MenuRender.getMenu(this.computedBlockMenu, undefined, basePath)
+      : [];
+
+    other.title = "";
+
+    return (
+      <Menu
+        {...other}
+        onOpenChange={this.handleOpen} //手风琴
+        selectedKeys={
+          currentL2MenuId ? [currentL2MenuId.toString()] : undefined
+        }
+        openKeys={!collapsed ? openKeys : undefined}
+        items={items}
+      ></Menu>
+    );
+  }
+}
+
+export default Menu2layers;

package/src/aldehyde/layout/menu/menu-render.tsx

@@ -1,166 +1,166 @@
-import {BlockMenu, Level1Menu, Level2Menu} from "../../tmpl/interface";
-import {Menu,Tooltip} from "antd";
-import type {MenuProps} from "antd";
-import React from "react";
-import {NavLink} from 'react-router-dom';
-import Units from "../../units";
-import translate from "../../locale/translate";
-
-
-export default {
-    getMenu(blockMenu: BlockMenu , target, basePath = ""){
-        if(blockMenu.l1Menus){
-           return this.toL1Menu(blockMenu.l1Menus, target, basePath = "")
-        }else{
-            return this.toSubMenu(blockMenu.items, target, basePath = "");
-        }
-    },
-
-    toL1Menu(subMenus: (Level1Menu)[], target, basePath = "") {
-        let menus:MenuProps['items'] =[];
-        let menu;
-        if(subMenus){
-            subMenus.map((item) => {
-                menu = {key: item.id};
-                let subItems = item.l2Menus;
-                if (subItems) {//菜单
-                    menu.label = translate('${' + item.title + '}');
-                    menu.title = translate('${' + item.title + '}');
-                    menu.children = this.toSubMenu(subItems, target, basePath);
-                }
-                menus.push(menu);
-            })
-        }
-        return menus;
-    },
-
-    toSubMenu(subMenus: (Level2Menu |BlockMenu)[], target, basePath = "") {
-
-        let menus:MenuProps['items'] =[];
-        let menu;
-        if(subMenus){
-            subMenus.map((item) => {
-                menu = {key: item.id, title: translate('${' + item.title + '}')};
-                let subItems = item.items;
-                if (subItems) {//菜单
-                    menu.label = translate('${' + item.title + '}');
-                    menu.children = this.toSubMenu(subItems, target, basePath);
-                } else {
-                    let i:Level2Menu=item as Level2Menu;
-                    if(i.disabled ){
-                        if(i.hiddenOnDisabled){
-                            menu=null;
-                        }else{
-                            menu.disabled=i.disabled;
-                            if(i.tip){
-                                menu.label= <Tooltip placement="top" title={translate('${' + i.tip + '}')} >
-                                    {translate('${' + i.title + '}')}
-                                </Tooltip>
-                            }else{
-                                menu.label=translate('${' + i.title + '}');
-                            }
-                        }
-                    }else{
-                        menu.label = this.toL2MenuTitle(i, target, basePath);
-                        menu.path = (i as (Level2Menu & {path: string})).path
-                    }
-                }
-                if(menu){
-                    menus.push(menu);
-                }
-            })
-        }
-        return menus;
-    },
-    getRoutePath(menu: Level2Menu, basePath, defaultCriteriaData) {
-        if (menu) {
-            let pageType = menu.pageType;
-
-            let routePath = 'act-table';
-
-            let codeSource = '';
-            switch (pageType) {
-                case "列表":
-                    routePath = 'act-table';
-                    break;
-                case "树":
-                    routePath = 'act-tree';
-                    break;
-                case "添加":
-                    routePath = 'detail-edit';
-                    codeSource = '&codeSource=new';
-                    break;
-                case "编辑":
-                    routePath = 'detail-edit';
-                    codeSource = '&codeSource=listop';
-                    break;
-                case "编辑或添加":
-                    routePath = 'detail-edit';
-                    codeSource = '&codeSource=listop-new';
-                    break;
-                case "详情":
-                    routePath = 'detail-view';
-                    codeSource = '&codeSource=listop';
-                    break;
-                case "导入":
-                    routePath = 'importer';
-                    break;
-            }
-            return `${basePath}/${menu.id}/${routePath}?menuId=${menu.id}${codeSource}${defaultCriteriaData}`;
-        }
-        return null;
-    },
-    toL2MenuTitle(item: Level2Menu & {path?: string}, target, basePath = "") {
-        if(!item){
-            return null;
-        }
-        let delimiter = "/";
-        let customPath = item.customPath;
-        if (customPath) {
-            if (customPath.startsWith('/') || customPath.startsWith('\\')) {
-                delimiter = "";
-            }
-        }
-        let defaultCriteriaData = "";
-        if (item['defaultCriteriaValue']) {
-            defaultCriteriaData = '&' + Units.transQueryParamsToStr(item.defaultCriteriaValue);
-        }
-
-        let path = customPath ? `${basePath}/page/${item.id}${delimiter}${customPath}?menuId=${item.id}` : this.getRoutePath(item, basePath, defaultCriteriaData);
-
-        item.path = path;
-
-        return <NavLink to={path} target={item.linkTarget ? item.linkTarget : target}>{translate('${' + item.title + '}')}</NavLink>;
-    },
-    findOpenId(blockMenu: BlockMenu, currentL2MenuId: string) {
-        let openL2MenuId: string = undefined;
-        if(blockMenu.l1Menus){
-            for (const menul1 of blockMenu.l1Menus) {
-                    for (const menul2 of menul1.l2Menus) {
-                        if (menul2.id == currentL2MenuId) {
-                            openL2MenuId = menul1.id;
-                            return openL2MenuId;
-                        }
-                    }
-                }
-        }else{
-            for (const menul1 of blockMenu.items) {
-                if(menul1.items){
-                    for (const menul2 of menul1.items) {
-                        if (menul2.id == currentL2MenuId) {
-                            openL2MenuId = menul1.id;
-                            return openL2MenuId;
-                        }
-                    }
-                }else{
-                    if (menul1.id == currentL2MenuId) {
-                        openL2MenuId = menul1.id;
-                        return openL2MenuId;
-                    }
-                }
-
-            }
-        }
-        return openL2MenuId;
-    }
+import {BlockMenu, Level1Menu, Level2Menu} from "../../tmpl/interface";
+import {Menu,Tooltip} from "antd";
+import type {MenuProps} from "antd";
+import React from "react";
+import {NavLink} from 'react-router-dom';
+import Units from "../../units";
+import translate from "../../locale/translate";
+
+
+export default {
+    getMenu(blockMenu: BlockMenu , target, basePath = ""){
+        if(blockMenu.l1Menus){
+           return this.toL1Menu(blockMenu.l1Menus, target, basePath = "")
+        }else{
+            return this.toSubMenu(blockMenu.items, target, basePath = "");
+        }
+    },
+
+    toL1Menu(subMenus: (Level1Menu)[], target, basePath = "") {
+        let menus:MenuProps['items'] =[];
+        let menu;
+        if(subMenus){
+            subMenus.map((item) => {
+                menu = {key: item.id};
+                let subItems = item.l2Menus;
+                if (subItems) {//菜单
+                    menu.label = translate('${' + item.title + '}');
+                    menu.title = translate('${' + item.title + '}');
+                    menu.children = this.toSubMenu(subItems, target, basePath);
+                }
+                menus.push(menu);
+            })
+        }
+        return menus;
+    },
+
+    toSubMenu(subMenus: (Level2Menu |BlockMenu)[], target, basePath = "") {
+
+        let menus:MenuProps['items'] =[];
+        let menu;
+        if(subMenus){
+            subMenus.map((item) => {
+                menu = {key: item.id, title: translate('${' + item.title + '}')};
+                let subItems = item.items;
+                if (subItems) {//菜单
+                    menu.label = translate('${' + item.title + '}');
+                    menu.children = this.toSubMenu(subItems, target, basePath);
+                } else {
+                    let i:Level2Menu=item as Level2Menu;
+                    if(i.disabled ){
+                        if(i.hiddenOnDisabled){
+                            menu=null;
+                        }else{
+                            menu.disabled=i.disabled;
+                            if(i.tip){
+                                menu.label= <Tooltip placement="top" title={translate('${' + i.tip + '}')} >
+                                    {translate('${' + i.title + '}')}
+                                </Tooltip>
+                            }else{
+                                menu.label=translate('${' + i.title + '}');
+                            }
+                        }
+                    }else{
+                        menu.label = this.toL2MenuTitle(i, target, basePath);
+                        menu.path = (i as (Level2Menu & {path: string})).path
+                    }
+                }
+                if(menu){
+                    menus.push(menu);
+                }
+            })
+        }
+        return menus;
+    },
+    getRoutePath(menu: Level2Menu, basePath, defaultCriteriaData) {
+        if (menu) {
+            let pageType = menu.pageType;
+
+            let routePath = 'act-table';
+
+            let codeSource = '';
+            switch (pageType) {
+                case "列表":
+                    routePath = 'act-table';
+                    break;
+                case "树":
+                    routePath = 'act-tree';
+                    break;
+                case "添加":
+                    routePath = 'detail-edit';
+                    codeSource = '&codeSource=new';
+                    break;
+                case "编辑":
+                    routePath = 'detail-edit';
+                    codeSource = '&codeSource=listop';
+                    break;
+                case "编辑或添加":
+                    routePath = 'detail-edit';
+                    codeSource = '&codeSource=listop-new';
+                    break;
+                case "详情":
+                    routePath = 'detail-view';
+                    codeSource = '&codeSource=listop';
+                    break;
+                case "导入":
+                    routePath = 'importer';
+                    break;
+            }
+            return `${basePath}/${menu.id}/${routePath}?menuId=${menu.id}${codeSource}${defaultCriteriaData}`;
+        }
+        return null;
+    },
+    toL2MenuTitle(item: Level2Menu & {path?: string}, target, basePath = "") {
+        if(!item){
+            return null;
+        }
+        let delimiter = "/";
+        let customPath = item.customPath;
+        if (customPath) {
+            if (customPath.startsWith('/') || customPath.startsWith('\\')) {
+                delimiter = "";
+            }
+        }
+        let defaultCriteriaData = "";
+        if (item['defaultCriteriaValue']) {
+            defaultCriteriaData = '&' + Units.transQueryParamsToStr(item.defaultCriteriaValue);
+        }
+
+        let path = customPath ? `${basePath}/page/${item.id}${delimiter}${customPath}?menuId=${item.id}` : this.getRoutePath(item, basePath, defaultCriteriaData);
+
+        item.path = path;
+
+        return <NavLink to={path} target={item.linkTarget ? item.linkTarget : target}>{translate('${' + item.title + '}')}</NavLink>;
+    },
+    findOpenId(blockMenu: BlockMenu, currentL2MenuId: string) {
+        let openL2MenuId: string = undefined;
+        if(blockMenu.l1Menus){
+            for (const menul1 of blockMenu.l1Menus) {
+                    for (const menul2 of menul1.l2Menus) {
+                        if (menul2.id == currentL2MenuId) {
+                            openL2MenuId = menul1.id;
+                            return openL2MenuId;
+                        }
+                    }
+                }
+        }else{
+            for (const menul1 of blockMenu.items) {
+                if(menul1.items){
+                    for (const menul2 of menul1.items) {
+                        if (menul2.id == currentL2MenuId) {
+                            openL2MenuId = menul1.id;
+                            return openL2MenuId;
+                        }
+                    }
+                }else{
+                    if (menul1.id == currentL2MenuId) {
+                        openL2MenuId = menul1.id;
+                        return openL2MenuId;
+                    }
+                }
+
+            }
+        }
+        return openL2MenuId;
+    }
 }