aldehyde 0.2.197 → 0.2.199

package/src/aldehyde/layout2/main.tsx

@@ -1,27 +1,27 @@
-import { Layout } from "antd";
-import React, { useState } from "react";
-import { Outlet } from "react-router-dom";
-
-type MainPropsType = {
-  style?: typeof Layout.Content.defaultProps.style;
-  children?: React.ReactNode;
-};
-
-const Main: React.FC<MainPropsType> = ({ style, children }) => {
-  return (
-    <Layout.Content style={{ background: "#fff", overflow: "auto", ...style }}>
-      <div
-        style={{
-          width: "100%",
-          height: "100%",
-          overflow: "auto",
-          padding: 10,
-        }}
-      >
-        {children ? children : <Outlet />}
-      </div>
-    </Layout.Content>
-  );
-};
-
-export default Main;
+import { Layout } from "antd";
+import React, { useState } from "react";
+import { Outlet } from "react-router-dom";
+
+type MainPropsType = {
+  style?: typeof Layout.Content.defaultProps.style;
+  children?: React.ReactNode;
+};
+
+const Main: React.FC<MainPropsType> = ({ style, children }) => {
+  return (
+    <Layout.Content style={{ background: "#fff", overflow: "auto", ...style }}>
+      <div
+        style={{
+          width: "100%",
+          height: "100%",
+          overflow: "auto",
+          padding: 10,
+        }}
+      >
+        {children ? children : <Outlet />}
+      </div>
+    </Layout.Content>
+  );
+};
+
+export default Main;

package/src/aldehyde/layout2/page.tsx

@@ -1,189 +1,189 @@
-import { Layout, theme } from "antd";
-import React, {
-  HTMLAttributeAnchorTarget,
-  useEffect,
-  useRef,
-  useState,
-} from "react";
-import Header from "./header";
-import Sider from "./sider";
-import Main from "./main";
-import HcserviceV3 from "../tmpl/hcservice-v3";
-import { MenuType } from "./type/layout.type";
-import { BlockType, MenuConfigAPIType } from "../tmpl/interface";
-import { useVarCssColor } from "../hooks/useVarCssColor";
-import { generate } from "@ant-design/colors";
-import { LayoutProvider, useLayoutContext } from "./LayoutContext";
-import DocumentTitle from "react-document-title";
-
-type PagePropsType = {
-  children?: React.ReactNode;
-};
-
-const handleMenuItemUrl = (
-  id: string,
-  pageType: BlockType["pageType"],
-  query: { [key: string]: string } = {},
-  customPath?: string
-) => {
-  if (customPath) return customPath;
-
-  const queryParam = { ...query };
-  queryParam["menuId"] = id;
-
-  let routePath = "",
-    operator = "";
-
-  switch (pageType) {
-    case "列表":
-      routePath = "act-table";
-      break;
-    case "树":
-      routePath = "act-tree";
-      break;
-    case "添加":
-      routePath = "detail-edit";
-      operator = "new";
-      break;
-    case "编辑":
-      routePath = "detail-edit";
-      operator = "listop";
-      break;
-    case "编辑或添加":
-      routePath = "detail-edit";
-      operator = "listop-new";
-      break;
-    case "详情":
-      routePath = "detail-view";
-      operator = "listop";
-      break;
-    case "导入":
-      routePath = "importer";
-      break;
-    default:
-      routePath = "";
-  }
-
-  if (operator !== "") queryParam["codeSource"] = operator;
-  return `v2/${id}/${routePath}?${Object.entries(queryParam)
-    .map(([key, val]) => `${key}=${val}`)
-    .join("&")}`;
-};
-
-const handleMenuRes = (menuList: MenuConfigAPIType["blocks"]): MenuType[] => {
-  const retList: MenuType[] = [];
-
-  menuList.sort((a, b) => {
-    const aOrder = Number(a.order);
-    const bOrder = Number(b.order);
-    if (aOrder < bOrder) return -1;
-    if (aOrder > bOrder) return 1;
-    return 0;
-  });
-
-  for (const {
-    id,
-    title,
-    disabled,
-    hiddenOnDisabled,
-    customPath,
-    pageType,
-    linkTarget,
-    defaultCriteriaValue,
-    items,
-  } of menuList) {
-    if (!(hiddenOnDisabled === true && disabled === true)) {
-      const menu: MenuType = {
-        id,
-        label: title,
-        disabled: disabled === undefined ? false : disabled,
-        url: handleMenuItemUrl(id, pageType, defaultCriteriaValue, customPath),
-        linkTarget,
-        children: items?.length ? handleMenuRes(items) : [],
-      };
-
-      retList.push(menu);
-    }
-  }
-
-  return retList;
-};
-
-const getMenuConfig = async (): Promise<{
-  systemName: string;
-  menu: MenuType[];
-}> => {
-  const res = await HcserviceV3.requestBlocks("", "");
-
-  const menuList: MenuType[] = handleMenuRes(res.blocks);
-
-  return {
-    menu: menuList,
-    systemName: res.programName,
-  };
-};
-
-const { useToken } = theme;
-
-const Page: React.FC<PagePropsType> = (props: PagePropsType) => {
-  const {
-    documentTitle,
-    updateMenuItemIdToFirstFloorIdxMap,
-  } = useLayoutContext();
-  const {
-    token: { colorPrimary },
-  } = useToken();
-
-  useEffect(() => {
-    localStorage.setItem("version", "v2");
-  }, []);
-
-  const [systemName, setSystemName] = useState("");
-
-  const [menu, SetMenu] = useState<MenuType[]>([]);
-
-  useEffect(() => {
-    getMenuConfig().then(({ menu, systemName: name }) => {
-      setSystemName(name);
-      SetMenu(menu);
-      updateMenuItemIdToFirstFloorIdxMap(menu);
-    });
-  }, []);
-
-  // page ref
-  const pageRef = useRef<HTMLDivElement>();
-  useEffect(() => {
-    useVarCssColor(generate(colorPrimary));
-  }, []);
-
-  return (
-    <DocumentTitle title={documentTitle}>
-      <div
-        ref={pageRef}
-        style={{
-          width: "100%",
-          height: "100%",
-          position: "absolute",
-        }}
-      >
-        <Layout style={{ height: "100%" }}>
-          <Header systemName={systemName} menuList={menu}></Header>
-          <Layout>
-            <Sider menuList={menu}></Sider>
-            <Main>{props.children}</Main>
-          </Layout>
-        </Layout>
-      </div>
-    </DocumentTitle>
-  );
-};
-
-const ContextPage: React.FC<PagePropsType> = (props: PagePropsType) => {
-  return (
-    <LayoutProvider>
-      <Page>{props.children}</Page>
-    </LayoutProvider>
-  );
-};
-
-export default ContextPage;
+import { Layout, theme } from "antd";
+import React, {
+  HTMLAttributeAnchorTarget,
+  useEffect,
+  useRef,
+  useState,
+} from "react";
+import Header from "./header";
+import Sider from "./sider";
+import Main from "./main";
+import HcserviceV3 from "../tmpl/hcservice-v3";
+import { MenuType } from "./type/layout.type";
+import { BlockType, MenuConfigAPIType } from "../tmpl/interface";
+import { useVarCssColor } from "../hooks/useVarCssColor";
+import { generate } from "@ant-design/colors";
+import { LayoutProvider, useLayoutContext } from "./LayoutContext";
+import DocumentTitle from "react-document-title";
+
+type PagePropsType = {
+  children?: React.ReactNode;
+};
+
+const handleMenuItemUrl = (
+  id: string,
+  pageType: BlockType["pageType"],
+  query: { [key: string]: string } = {},
+  customPath?: string
+) => {
+  if (customPath) return customPath;
+
+  const queryParam = { ...query };
+  queryParam["menuId"] = id;
+
+  let routePath = "",
+    operator = "";
+
+  switch (pageType) {
+    case "列表":
+      routePath = "act-table";
+      break;
+    case "树":
+      routePath = "act-tree";
+      break;
+    case "添加":
+      routePath = "detail-edit";
+      operator = "new";
+      break;
+    case "编辑":
+      routePath = "detail-edit";
+      operator = "listop";
+      break;
+    case "编辑或添加":
+      routePath = "detail-edit";
+      operator = "listop-new";
+      break;
+    case "详情":
+      routePath = "detail-view";
+      operator = "listop";
+      break;
+    case "导入":
+      routePath = "importer";
+      break;
+    default:
+      routePath = "";
+  }
+
+  if (operator !== "") queryParam["codeSource"] = operator;
+  return `v2/${id}/${routePath}?${Object.entries(queryParam)
+    .map(([key, val]) => `${key}=${val}`)
+    .join("&")}`;
+};
+
+const handleMenuRes = (menuList: MenuConfigAPIType["blocks"]): MenuType[] => {
+  const retList: MenuType[] = [];
+
+  menuList.sort((a, b) => {
+    const aOrder = Number(a.order);
+    const bOrder = Number(b.order);
+    if (aOrder < bOrder) return -1;
+    if (aOrder > bOrder) return 1;
+    return 0;
+  });
+
+  for (const {
+    id,
+    title,
+    disabled,
+    hiddenOnDisabled,
+    customPath,
+    pageType,
+    linkTarget,
+    defaultCriteriaValue,
+    items,
+  } of menuList) {
+    if (!(hiddenOnDisabled === true && disabled === true)) {
+      const menu: MenuType = {
+        id,
+        label: title,
+        disabled: disabled === undefined ? false : disabled,
+        url: handleMenuItemUrl(id, pageType, defaultCriteriaValue, customPath),
+        linkTarget,
+        children: items?.length ? handleMenuRes(items) : [],
+      };
+
+      retList.push(menu);
+    }
+  }
+
+  return retList;
+};
+
+const getMenuConfig = async (): Promise<{
+  systemName: string;
+  menu: MenuType[];
+}> => {
+  const res = await HcserviceV3.requestBlocks("", "");
+
+  const menuList: MenuType[] = handleMenuRes(res.blocks);
+
+  return {
+    menu: menuList,
+    systemName: res.programName,
+  };
+};
+
+const { useToken } = theme;
+
+const Page: React.FC<PagePropsType> = (props: PagePropsType) => {
+  const {
+    documentTitle,
+    updateMenuItemIdToFirstFloorIdxMap,
+  } = useLayoutContext();
+  const {
+    token: { colorPrimary },
+  } = useToken();
+
+  useEffect(() => {
+    localStorage.setItem("version", "v2");
+  }, []);
+
+  const [systemName, setSystemName] = useState("");
+
+  const [menu, SetMenu] = useState<MenuType[]>([]);
+
+  useEffect(() => {
+    getMenuConfig().then(({ menu, systemName: name }) => {
+      setSystemName(name);
+      SetMenu(menu);
+      updateMenuItemIdToFirstFloorIdxMap(menu);
+    });
+  }, []);
+
+  // page ref
+  const pageRef = useRef<HTMLDivElement>();
+  useEffect(() => {
+    useVarCssColor(generate(colorPrimary));
+  }, []);
+
+  return (
+    <DocumentTitle title={documentTitle}>
+      <div
+        ref={pageRef}
+        style={{
+          width: "100%",
+          height: "100%",
+          position: "absolute",
+        }}
+      >
+        <Layout style={{ height: "100%" }}>
+          <Header systemName={systemName} menuList={menu}></Header>
+          <Layout>
+            <Sider menuList={menu}></Sider>
+            <Main>{props.children}</Main>
+          </Layout>
+        </Layout>
+      </div>
+    </DocumentTitle>
+  );
+};
+
+const ContextPage: React.FC<PagePropsType> = (props: PagePropsType) => {
+  return (
+    <LayoutProvider>
+      <Page>{props.children}</Page>
+    </LayoutProvider>
+  );
+};
+
+export default ContextPage;