aldehyde 0.2.410 → 0.2.413

package/lib/controls/color-picker/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/color-picker/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,MAAM,WAAW,KAAK;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC9B;AAED,QAAA,MAAM,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAM1B,CAAC;AAEF,eAAe,KAAK,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/color-picker/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B,MAAM,WAAW,KAAK;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC9B;AAED,QAAA,MAAM,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAM1B,CAAC;AAEF,eAAe,KAAK,CAAC"}

package/lib/controls/color-picker/index.js

@@ -1,8 +1,9 @@
 import React from "react";
 import { ColorPicker } from "antd";
+const presets = [{ label: "预设颜色", colors: ["#52c41a", "#faad14", "#ff4d4f", "#1677ff", "#21d5ed", "#af57db"] }];
 const Index = (props) => {
     const { onChange, disabled, value, id, viewOrEdit } = props;
-    return (React.createElement(ColorPicker, { allowClear: true, showText: true, key: id, disabled: viewOrEdit === "view" || disabled, value: value, onClear: () => onChange(undefined), onChange: (val) => onChange(val.toHexString()) }));
+    return (React.createElement(ColorPicker, { presets: presets, allowClear: true, showText: true, key: id, disabled: viewOrEdit === "view" || disabled, value: value, onClear: () => onChange(undefined), onChange: (val) => onChange(val.toHexString()) }));
 };
 export default Index;
 //# sourceMappingURL=index.js.map

package/lib/controls/color-picker/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/color-picker/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AAUnC,MAAM,KAAK,GAAoB,CAAC,KAAK,EAAE,EAAE;IACvC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC;IAE5D,OAAO,CACL,oBAAC,WAAW,IAAC,UAAU,QAAC,QAAQ,QAAC,GAAG,EAAE,EAAE,EAAE,QAAQ,EAAE,UAAU,KAAK,MAAM,IAAI,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,GAAI,CAC5L,CAAA;AACH,CAAC,CAAC;AAEF,eAAe,KAAK,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/color-picker/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AAEnC,MAAM,OAAO,GAAG,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;AAUhH,MAAM,KAAK,GAAoB,CAAC,KAAK,EAAE,EAAE;IACvC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC;IAE5D,OAAO,CACL,oBAAC,WAAW,IAAC,OAAO,EAAE,OAAO,EAAE,UAAU,QAAC,QAAQ,QAAC,GAAG,EAAE,EAAE,EAAE,QAAQ,EAAE,UAAU,KAAK,MAAM,IAAI,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,GAAI,CAC9M,CAAA;AACH,CAAC,CAAC;AAEF,eAAe,KAAK,CAAC"}

package/lib/controls/entity-select/popover-entity-select.js

@@ -95,7 +95,7 @@ class PopoverEntitySelect extends React.PureComponent {
                         maxHeight: "calc(100vh - 50px)",
                     },
                     body: { padding: 0 }
-                }, getPopupContainer: (triggerNode) => triggerNode, content: React.createElement("div", { className: "select-table-popover", style: {
+                }, align: { offset: [20, 0] }, content: React.createElement("div", { className: "select-table-popover", style: {
                         padding: 4,
                         height: 350,
                         backgroundColor: "#fafafa",

package/lib/controls/entity-select/popover-entity-select.js.map

@@ -1 +1 @@
-{"version":3,"file":"popover-entity-select.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/entity-select/popover-entity-select.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"popover-entity-select.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/entity-select/popover-entity-select.tsx"],"names":[],"mappings":"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"}

package/lib/controls/enum-badge/index.js

@@ -7,7 +7,7 @@ const MenuBadge = (props) => {
     const { value, itemType, fieldConfig } = props;
     let viewControl = undefined;
     let color = HCDataSource.getEnumValueColor(fieldConfig.mstrucId, value);
-    viewControl = (React.createElement("span", { className: "infoStyle" }, value ? (React.createElement(Badge, { status: "processing", color: color ? color : "green", text: translate("${" + value + "}") })) : null));
+    viewControl = (React.createElement("span", { className: "infoStyle" }, value ? (React.createElement(Badge, { status: "processing", color: color ? color : "green", text: React.createElement("span", { style: { color: color ? color : "green" } }, translate("${" + value + "}")) })) : null));
     return viewControl;
 };
 export default MenuBadge;

package/lib/controls/enum-badge/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/enum-badge/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAE7B,OAAO,YAAY,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAInD,MAAM,SAAS,GAA6B,CAAC,KAAK,EAAE,EAAE;IACpD,MAAM,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CAAC;IAElC,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;IAE/C,IAAI,WAAW,GAAG,SAAS,CAAC;IAE5B,IAAI,KAAK,GAAG,YAAY,CAAC,iBAAiB,CAAC,WAAW,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACxE,WAAW,GAAG,CACZ,8BAAM,SAAS,EAAC,WAAW,IACxB,KAAK,CAAC,CAAC,CAAC,CACP,oBAAC,KAAK,IACJ,MAAM,EAAC,YAAY,EACnB,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,EAC9B,IAAI,EAAE,SAAS,CAAC,IAAI,GAAG,KAAK,GAAG,GAAG,CAAC,GACnC,CACH,CAAC,CAAC,CAAC,IAAI,CACH,CACR,CAAC;IAEF,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/enum-badge/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAE7B,OAAO,YAAY,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAInD,MAAM,SAAS,GAA6B,CAAC,KAAK,EAAE,EAAE;IACpD,MAAM,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CAAC;IAElC,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;IAE/C,IAAI,WAAW,GAAG,SAAS,CAAC;IAE5B,IAAI,KAAK,GAAG,YAAY,CAAC,iBAAiB,CAAC,WAAW,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACxE,WAAW,GAAG,CACZ,8BAAM,SAAS,EAAC,WAAW,IACxB,KAAK,CAAC,CAAC,CAAC,CACP,oBAAC,KAAK,IACJ,MAAM,EAAC,YAAY,EACnB,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,EAC9B,IAAI,EAAE,8BAAM,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,IAAG,SAAS,CAAC,IAAI,GAAG,KAAK,GAAG,GAAG,CAAC,CAAQ,GAC7F,CACH,CAAC,CAAC,CAAC,IAAI,CACH,CACR,CAAC;IAEF,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/lib/layout2/components/theme-button.d.ts

@@ -1,5 +1,9 @@
 import React from "react";
 import { ButtonProps } from "antd";
-declare const ThemeButton: (props: ButtonProps) => React.JSX.Element;
+interface Props extends ButtonProps {
+    children?: React.ReactNode;
+    placement?: "topLeft" | "topCenter" | "topRight" | "bottomLeft" | "bottomCenter" | "bottomRight" | "top" | "bottom";
+}
+declare const ThemeButton: (props: Props) => React.JSX.Element;
 export default ThemeButton;
 //# sourceMappingURL=theme-button.d.ts.map

package/lib/layout2/components/theme-button.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"theme-button.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout2/components/theme-button.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAuC,MAAM,OAAO,CAAC;AAC5D,OAAO,EAAU,WAAW,EAA8B,MAAM,MAAM,CAAC;AAWvE,QAAA,MAAM,WAAW,GAAI,OAAO,WAAW,sBAqCtC,CAAC;AAEF,eAAe,WAAW,CAAC"}
+{"version":3,"file":"theme-button.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout2/components/theme-button.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAuC,MAAM,OAAO,CAAC;AAC5D,OAAO,EAAU,WAAW,EAA8B,MAAM,MAAM,CAAC;AAWvE,UAAU,KAAM,SAAQ,WAAW;IAC/B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,SAAS,CAAC,EAAE,SAAS,GAAG,WAAW,GAAG,UAAU,GAAG,YAAY,GAAG,cAAc,GAAG,aAAa,GAAG,KAAK,GAAG,QAAQ,CAAC;CACvH;AAED,QAAA,MAAM,WAAW,GAAI,OAAO,KAAK,sBA2ChC,CAAC;AAEF,eAAe,WAAW,CAAC"}

package/lib/layout2/components/theme-button.js

@@ -1,3 +1,23 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 import React, { useEffect, useMemo, useState } from "react";
 import { Button, Dropdown, theme } from "antd";
 import { useSessionStorageState } from "ahooks";
@@ -7,16 +27,22 @@ const { useToken } = theme;
 const regex = /#\/v\d+\/(.*)/;
 const defThemes = [{ label: "默认", value: "v2" }, { label: "科技风一", value: "v3" }, { label: "科技风二", value: "v4" }, { label: "侧边布局", value: "v5" }];
 const ThemeButton = (props) => {
+    const { children, placement } = props, otherProps = __rest(props, ["children", "placement"]);
     const { token } = useToken();
     const [version, setVersion] = useState();
     const [themes, setThemes] = useState([]);
     const [keepAliveTabs, setKeepAliveTabs] = useSessionStorageState('keepAliveTabs', { defaultValue: [] });
-    const themeKeys = ProgramConfig.themes();
+    const getThemeConfig = () => __awaiter(void 0, void 0, void 0, function* () {
+        var _a;
+        const themeConfig = yield ProgramConfig.getThemeConfig();
+        const themeKeys = ((_a = themeConfig === null || themeConfig === void 0 ? void 0 : themeConfig.styleTheme) === null || _a === void 0 ? void 0 : _a.split(",")) || ProgramConfig.themes();
+        const temThemes = defThemes.filter(item => themeKeys === null || themeKeys === void 0 ? void 0 : themeKeys.includes(item.value));
+        setThemes(temThemes.length ? temThemes : [{ label: "默认", value: "v2" }]);
+    });
     useEffect(() => {
+        getThemeConfig();
         const version = localStorage.getItem("version") || "v2";
         setVersion(version);
-        const temThemes = defThemes.filter(item => themeKeys === null || themeKeys === void 0 ? void 0 : themeKeys.includes(item.value));
-        setThemes(temThemes.length ? temThemes : [{ label: "默认", value: "v2" }]);
     }, []);
     const onClick = ({ key }) => {
         setKeepAliveTabs([]);
@@ -30,8 +56,7 @@ const ThemeButton = (props) => {
         label: (React.createElement("span", { style: version === item.value ? { color: token.colorPrimary } : {} }, item.label)),
         key: item.value,
     })), [themes]);
-    return (themes.length > 1 ? React.createElement(Dropdown, { overlayClassName: "themeButton", menu: { items, onClick } },
-        React.createElement(Button, Object.assign({ type: "text", icon: React.createElement(AliIcon, { type: "icon-theme" }) }, props))) : undefined);
+    return (themes.length > 1 ? React.createElement(Dropdown, { arrow: { pointAtCenter: true }, placement: placement, overlayStyle: { minWidth: "105px" }, overlayClassName: "themeButton", menu: { items, onClick, selectedKeys: [version] } }, children || React.createElement(Button, Object.assign({ type: "text", icon: React.createElement(AliIcon, { type: "icon-theme" }) }, otherProps))) : undefined);
 };
 export default ThemeButton;
 //# sourceMappingURL=theme-button.js.map

package/lib/layout2/components/theme-button.js.map

@@ -1 +1 @@
-{"version":3,"file":"theme-button.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout2/components/theme-button.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"theme-button.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout2/components/theme-button.tsx"],"names":[],"mappings":"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"}

package/lib/layout2/components/user-button.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user-button.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout2/components/user-button.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAuB,MAAM,OAAO,CAAC;AAW9D,OAAO,EAAU,WAAW,EAAgC,MAAM,MAAM,CAAC;AAmBzE,UAAU,KAAM,SAAQ,WAAW;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,SAAS,CAAC;CAC1B;AAED,QAAA,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CA4K/B,CAAC;AAEF,eAAe,UAAU,CAAC"}
+{"version":3,"file":"user-button.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout2/components/user-button.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAuB,MAAM,OAAO,CAAC;AAW9D,OAAO,EAAU,WAAW,EAAgC,MAAM,MAAM,CAAC;AAsBzE,UAAU,KAAM,SAAQ,WAAW;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,SAAS,CAAC;CAC1B;AAED,QAAA,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAwL/B,CAAC;AAEF,eAAe,UAAU,CAAC"}

package/lib/layout2/components/user-button.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import React, { useEffect, useState } from "react";
-import { CaretDownOutlined, ClearOutlined, LoginOutlined, LogoutOutlined, MenuFoldOutlined, MenuUnfoldOutlined, SettingOutlined, UnlockOutlined, UserOutlined, CompressOutlined } from "@ant-design/icons";
+import { CaretDownOutlined, ClearOutlined, LoginOutlined, LogoutOutlined, MenuFoldOutlined, MenuUnfoldOutlined, SettingOutlined, UnlockOutlined, UserOutlined, CompressOutlined, GlobalOutlined } from "@ant-design/icons";
 import { Button, Dropdown } from "antd";
 import HcserviceV3 from "../../tmpl/hcservice-v3";
 import UserInfoBar from "../../layout/menu/userinfo-bar";
@@ -18,6 +18,9 @@ import ResetPassword from "../../layout/menu/reset-password";
 import HCDataSource from "../../tmpl/hc-data-source";
 import { useSessionStorageState } from 'ahooks';
 import Units from "../../units";
+import ThemeButton from "./theme-button";
+import LocaleButton from "../../locale/LocaleButton";
+import AliIcon from "../../icon/aliIcon";
 const UserButton = (props) => {
     const { logoutUrl = "/login2", customRender } = props;
     // translate
@@ -112,13 +115,27 @@ const UserButton = (props) => {
             },
         },
         {
-            label: React.createElement("span", { onClick: () => changeCompactTheme() }, compactTheme ? "默认主题" : "紧凑主题"),
+            label: React.createElement("span", { onClick: () => changeCompactTheme() }, translate(compactTheme ? "${默认主题}" : "${紧凑主题}")),
             key: "compactTheme",
             icon: React.createElement(CompressOutlined, null),
             show: () => isLogin,
         },
         {
-            label: (React.createElement("span", { onClick: () => changeSiderCollapsed() }, getSiderCollapsed() ? translate("${显示侧边栏}") : translate("${隐藏侧边栏}"))),
+            label: React.createElement(ThemeButton, { placement: "bottomRight" },
+                React.createElement("div", { style: { width: "100%" } }, translate("${主题切换}"))),
+            key: "changeTheme",
+            icon: React.createElement(AliIcon, { type: "icon-theme" }),
+            show: () => isLogin,
+        },
+        {
+            label: React.createElement(LocaleButton, { placement: "bottomRight" },
+                React.createElement("div", { style: { width: "100%" } }, translate("${语言}"))),
+            key: "changeLocale",
+            icon: React.createElement(GlobalOutlined, null),
+            show: () => isLogin,
+        },
+        {
+            label: (React.createElement("span", { onClick: () => changeSiderCollapsed() }, getSiderCollapsed() ? translate("${显示侧边栏}") : translate("${ 隐藏侧边栏 }"))),
             key: "collapseSider",
             icon: React.createElement("span", null, getSiderCollapsed() ? React.createElement(MenuUnfoldOutlined, null) : React.createElement(MenuFoldOutlined, null)),
             show: () => {

package/lib/layout2/components/user-button.js.map

@@ -1 +1 @@
-{"version":3,"file":"user-button.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout2/components/user-button.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"user-button.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout2/components/user-button.tsx"],"names":[],"mappings":"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"}

package/lib/layout2/css/header.css

@@ -8,13 +8,13 @@
   border-color: #ffffff !important;
 } */
 
-.ant-menu-submenu > .ant-menu-submenu-selected {
+.ant-menu-submenu>.ant-menu-submenu-selected {
   /* background: #fff !important; */
   /* color: #53b572; */
   /* width: calc(100% - 8px); */
 }
 
-.ant-menu-submenu-selected > .ant-menu-submenu-title {
+.ant-menu-submenu-selected>.ant-menu-submenu-title {
   /*color: #fff !important;*/
 }
 
@@ -27,12 +27,16 @@
   width: 0;
 }
 
-.layout2-header-menu > li:nth-last-child(1)::after {
+.layout2-header-menu>li:nth-last-child(1)::after {
   width: 0;
 }
 
-.ant-menu-sub:has(.layout2-header-menu-item)
-  > .ant-menu-submenu-selected
-  > .ant-menu-submenu-title {
+.ant-menu-sub:has(.layout2-header-menu-item)>.ant-menu-submenu-selected>.ant-menu-submenu-title {
   background-color: var(--color-3) !important;
 }
+
+.v2-header .header-logo {
+  width: 24%;
+  max-width: 80px;
+  margin-right: 4%;
+}

package/lib/layout2/css/tabs-layout.less

@@ -10,4 +10,10 @@
     .overflow-y-auto {
         height: 100%;
     }
+
+    .list-item {
+        .list-item-icon {
+            background: var(--ant-layout-body-bg);
+        }
+    }
 }

package/lib/layout2/header.d.ts

@@ -5,7 +5,7 @@ type HeaderPropsType = {
     systemName: string;
     menuList: MenuType[];
     style?: any;
-    logoImg?: React.ReactNode;
+    logoImg: string;
 };
 declare const Header: React.FC<HeaderPropsType>;
 export default Header;

package/lib/layout2/header.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"header.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/header.tsx"],"names":[],"mappings":"AAQA,OAAO,KAA6C,MAAM,OAAO,CAAC;AAClE,OAAO,kBAAkB,CAAC;AAM1B,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAwB9C,KAAK,eAAe,GAAG;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,QAAQ,EAAE,CAAC;IACrB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,OAAO,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B,CAAC;AAOF,QAAA,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CA6NrC,CAAC;AAEF,eAAe,MAAM,CAAC"}
+{"version":3,"file":"header.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/header.tsx"],"names":[],"mappings":"AAQA,OAAO,KAA6C,MAAM,OAAO,CAAC;AAClE,OAAO,kBAAkB,CAAC;AAK1B,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAwB9C,KAAK,eAAe,GAAG;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,QAAQ,EAAE,CAAC;IACrB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAOF,QAAA,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CA0NrC,CAAC;AAEF,eAAe,MAAM,CAAC"}

package/lib/layout2/header.js

@@ -3,15 +3,14 @@ import React, { useEffect, useState } from "react";
 import "./css/header.css";
 import L2MenuQuickBar from "../layout/menu/l2menu-quick-bar";
 import L2MenuMessageBar from "../layout/menu/l2menu-message-bar";
-import LocaleButton from "../locale/LocaleButton";
+// import LocaleButton from "../locale/LocaleButton";
 import UserButton from "./components/user-button";
-import homePng from "./imgs/home.png";
 import { NavLink, useParams, useSearchParams } from "react-router-dom";
 import { getLeftMostRouteInfo, handlePropsMenuToAntdMenu, } from "./util/menu-util";
 import { useLocale } from "../locale/useLocale";
 import { generate } from "@ant-design/colors";
 import { useLayoutContext } from "./layout-context";
-import ThemeButton from "./components/theme-button";
+// import ThemeButton from "./components/theme-button";
 import IconFont from "./components/icon-font";
 import SearchMenu from "./components/search-menu";
 import ScreenfullButton from "./components/screenfull-button";
@@ -107,7 +106,7 @@ const Header = ({ systemName, menuList, style, logoImg }) => {
         }
     }, [menuList, sourceId]);
     let systemLabel = translate("${" + systemName + "}");
-    return (React.createElement(Layout.Header, { style: Object.assign({ padding: 0, display: "flex", flexDirection: "row", background: colorPrimary, color: "#FFFFFF" }, style) },
+    return (React.createElement(Layout.Header, { style: Object.assign({ padding: 0, display: "flex", flexDirection: "row", background: colorPrimary, color: "#FFFFFF" }, style), className: "v2-header" },
         React.createElement(NavLink, { style: {
                 width: "200px",
                 minWidth: "200px",
@@ -119,9 +118,7 @@ const Header = ({ systemName, menuList, style, logoImg }) => {
                 userSelect: "none",
                 color: "inherit",
             }, to: "/v2/home" },
-            React.createElement("img", { src: logoImg || homePng, alt: "home", width: 35, height: 35, style: {
-                    marginRight: 5,
-                } }),
+            logoImg ? React.createElement("img", { className: "header-logo", src: logoImg, alt: "home" }) : "",
             React.createElement(Tooltip, { title: systemLabel },
                 React.createElement("span", { style: {
                         width: "100%",
@@ -169,8 +166,6 @@ const Header = ({ systemName, menuList, style, logoImg }) => {
                     React.createElement(SearchMenu, { menuList: menuList }),
                     React.createElement(L2MenuQuickBar, { style: { color: "#fff" } }),
                     React.createElement(L2MenuMessageBar, { version: "v2", style: { color: "#fff" } }),
-                    React.createElement(LocaleButton, { shape: "default", size: "large", type: "link", style: toolbarStyle }),
-                    React.createElement(ThemeButton, { shape: "default", size: "large", type: "link", style: toolbarStyle }),
                     React.createElement(UserButton, { style: { padding: 0, marginRight: "15px", color: "#ffffff" } }))))));
 };
 export default Header;

package/lib/layout2/header.js.map

@@ -1 +1 @@
-{"version":3,"file":"header.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/header.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"header.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/header.tsx"],"names":[],"mappings":"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"}

package/lib/layout2/main.js

@@ -2,7 +2,7 @@ import React from "react";
 import { Layout } from "antd";
 import TabsLayout from "./tabs/tabs-layout";
 const Main = ({ style, children }) => {
-    return (React.createElement(Layout.Content, { style: Object.assign({ background: "#fff", overflow: "auto" }, style) },
+    return (React.createElement(Layout.Content, { style: Object.assign({ background: "#fff", overflow: "auto", paddingBottom: 10 }, style) },
         React.createElement("div", { style: {
                 width: "100%",
                 height: "100%",

package/lib/layout2/main.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/main.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,UAAU,MAAM,oBAAoB,CAAC;AAQ5C,MAAM,IAAI,GAA4B,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC5D,OAAO,CACL,oBAAC,MAAM,CAAC,OAAO,IAAC,KAAK,kBAAI,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,IAAK,KAAK;QACrE,6BACE,KAAK,EAAE;gBACL,KAAK,EAAE,MAAM;gBACb,MAAM,EAAE,MAAM;gBACd,QAAQ,EAAE,MAAM;gBAChB,OAAO,EAAE,EAAE;aACZ,IAEA,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAA,oBAAC,UAAU,OAAE,CAC/B,CACS,CAClB,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,IAAI,CAAC"}
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/main.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,UAAU,MAAM,oBAAoB,CAAC;AAQ5C,MAAM,IAAI,GAA4B,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC5D,OAAO,CACL,oBAAC,MAAM,CAAC,OAAO,IAAC,KAAK,kBAAI,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,EAAE,IAAK,KAAK;QACxF,6BACE,KAAK,EAAE;gBACL,KAAK,EAAE,MAAM;gBACb,MAAM,EAAE,MAAM;gBACd,QAAQ,EAAE,MAAM;gBAChB,OAAO,EAAE,EAAE;aACZ,IAEA,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,oBAAC,UAAU,OAAG,CACjC,CACS,CAClB,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,IAAI,CAAC"}

package/lib/layout2/page.d.ts

@@ -3,7 +3,7 @@ import { MenuType } from "./type/layout-type";
 import { BlockType } from "../tmpl/interface";
 type PagePropsType = {
     children?: React.ReactNode;
-    logo?: React.ReactNode;
+    logo?: string;
 };
 export declare const handleMenuItemUrl: (id: string, pageType: BlockType["pageType"], query?: {
     [key: string]: string;

package/lib/layout2/page.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/page.tsx"],"names":[],"mappings":"AACA,OAAO,KAIN,MAAM,OAAO,CAAC;AAKf,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAqB,MAAM,mBAAmB,CAAC;AAUjE,KAAK,aAAa,GAAG;IACnB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,IAAI,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAC5B,IAAI,MAAM,EACV,UAAU,SAAS,CAAC,UAAU,CAAC,EAC/B,QAAO;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAO,EACrC,aAAa,MAAM,EACnB,iBAAiB,MAAM,EACvB,aAAa,OAAO,EACpB,UAAU,MAAM,WA8DjB,CAAC;AAiDF,eAAO,MAAM,aAAa,GAAU,gBAAc,KAAG,OAAO,CAAC;IAC3D,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,QAAQ,EAAE,CAAC;CAClB,CAiBA,CAAC;AAqFF,QAAA,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,aAAa,CAOxC,CAAC;AAEF,eAAe,WAAW,CAAC"}
+{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/page.tsx"],"names":[],"mappings":"AACA,OAAO,KAIN,MAAM,OAAO,CAAC;AAKf,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAqB,MAAM,mBAAmB,CAAC;AAWjE,KAAK,aAAa,GAAG;IACnB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAC5B,IAAI,MAAM,EACV,UAAU,SAAS,CAAC,UAAU,CAAC,EAC/B,QAAO;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAO,EACrC,aAAa,MAAM,EACnB,iBAAiB,MAAM,EACvB,aAAa,OAAO,EACpB,UAAU,MAAM,WA8DjB,CAAC;AAmDF,eAAO,MAAM,aAAa,GAAU,gBAAc,KAAG,OAAO,CAAC;IAC3D,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,QAAQ,EAAE,CAAC;CAClB,CAiBA,CAAC;AA0FF,QAAA,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,aAAa,CAOxC,CAAC;AAEF,eAAe,WAAW,CAAC"}

package/lib/layout2/page.js

@@ -20,6 +20,7 @@ import DocumentTitle from "react-document-title";
 import Units from '../units';
 import { useLocale } from "../locale/useLocale";
 import { useSessionStorageState } from "ahooks";
+import homePng from "./imgs/home.png";
 export const handleMenuItemUrl = (id, pageType, query = {}, customPath, dragDropPageId, fullScreen, version) => {
     if (customPath)
         return `${fullScreen ? "" : `${version}/`}page/${id}/${customPath}?menuId=${id}`;
@@ -101,7 +102,9 @@ const handleMenuRes = (menuList, version) => {
                 children: (items === null || items === void 0 ? void 0 : items.length) ? handleMenuRes(items, version) : [],
                 icon,
                 themeColor,
-                funcDescription
+                funcDescription,
+                dragDropPageId,
+                customPath
             };
             retList.push(menu);
         }
@@ -151,13 +154,18 @@ const Page = (props) => {
         localStorage.setItem("version", "v2");
     }, []);
     const [systemName, setSystemName] = useState("");
+    const [systemLogo, setSystemLogo] = useState("");
     const [menu, SetMenu] = useState([]);
+    const getThemeConfigAndMenuConfig = () => __awaiter(void 0, void 0, void 0, function* () {
+        const themeConfig = yield Units.getThemeConfig();
+        const menuConfig = yield getMenuConfig();
+        setSystemName((themeConfig === null || themeConfig === void 0 ? void 0 : themeConfig.programName) || (menuConfig === null || menuConfig === void 0 ? void 0 : menuConfig.systemName));
+        setSystemLogo((themeConfig === null || themeConfig === void 0 ? void 0 : themeConfig.programIcon) || homePng);
+        SetMenu(menuConfig === null || menuConfig === void 0 ? void 0 : menuConfig.menu);
+        updateMenuItemIdToFirstFloorIdxMap(menuConfig === null || menuConfig === void 0 ? void 0 : menuConfig.menu);
+    });
     useEffect(() => {
-        getMenuConfig().then(({ menu, systemName: name }) => {
-            setSystemName(name);
-            SetMenu(menu);
-            updateMenuItemIdToFirstFloorIdxMap(menu);
-        });
+        getThemeConfigAndMenuConfig();
     }, []);
     // page ref
     const pageRef = useRef(undefined);
@@ -174,7 +182,7 @@ const Page = (props) => {
                     algorithm: compactTheme ? [theme.compactAlgorithm] : [],
                 } },
                 React.createElement(Layout, { style: { height: "100%" }, className: compactTheme ? "layout-compactTheme" : undefined },
-                    React.createElement(Header, { logoImg: logo, systemName: systemName ? systemName : Units.programName_NavLeft(), menuList: menu }),
+                    React.createElement(Header, { logoImg: logo || systemLogo, systemName: systemName ? systemName : Units.programName_NavLeft(), menuList: menu }),
                     React.createElement(Layout, null,
                         React.createElement(Sider, { menuList: menu, collapsed: getSiderCollapsed() }),
                         React.createElement(Main, null, props.children)))))));

package/lib/layout2/page.js.map

@@ -1 +1 @@
-{"version":3,"file":"page.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/page.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"page.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/page.tsx"],"names":[],"mappings":"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"}

package/lib/layout2/type/layout-type.d.ts

@@ -9,5 +9,7 @@ export type MenuType = {
     children?: MenuType[];
     themeColor?: string;
     funcDescription?: string;
+    dragDropPageId?: string;
+    customPath?: string;
 };
 //# sourceMappingURL=layout-type.d.ts.map

package/lib/layout2/type/layout-type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"layout-type.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout2/type/layout-type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,OAAO,CAAC;AAElD,MAAM,MAAM,QAAQ,GAAG;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,OAAO,CAAC;IAClB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,UAAU,CAAC,EAAE,yBAAyB,CAAC;IACvC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,QAAQ,EAAE,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC"}
+{"version":3,"file":"layout-type.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout2/type/layout-type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,OAAO,CAAC;AAElD,MAAM,MAAM,QAAQ,GAAG;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,OAAO,CAAC;IAClB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,UAAU,CAAC,EAAE,yBAAyB,CAAC;IACvC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,QAAQ,EAAE,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC"}

package/lib/layout3/header.js

@@ -4,8 +4,8 @@ import { NavLink, useParams, useSearchParams } from "react-router-dom";
 import { HomeFilled } from '@ant-design/icons';
 import L2MenuQuickBar from "../layout/menu/l2menu-quick-bar";
 import L2MenuMessageBar from "../layout/menu/l2menu-message-bar";
-import LocaleButton from "../locale/LocaleButton";
-import ThemeButton from "../layout2/components/theme-button";
+// import LocaleButton from "../locale/LocaleButton";
+// import ThemeButton from "../layout2/components/theme-button";
 import { getLeftMostRouteInfo, handlePropsMenuToAntdMenu } from "../layout2/util/menu-util";
 import { useLocale } from "../locale/useLocale";
 import { useLayoutContext } from "../layout2/layout-context";
@@ -121,8 +121,6 @@ const Header = ({ systemName, menuList }) => {
                     React.createElement(SearchMenu, { menuList: menuList, style: toolbarStyle }),
                     React.createElement(L2MenuQuickBar, { style: { color: "#009BFF" } }),
                     React.createElement(L2MenuMessageBar, { version: "v3", style: { color: "#009BFF" } }),
-                    React.createElement(LocaleButton, { shape: "default", size: "large", type: "link", style: toolbarStyle }),
-                    React.createElement(ThemeButton, { shape: "default", size: "large", type: "link", style: toolbarStyle }),
                     React.createElement("div", { className: "header-user" },
                         React.createElement(UserButton, { logoutUrl: "/login3", style: { padding: 0, color: "#fff" } }))))),
         React.createElement("div", { className: "header-nav" },

package/lib/layout3/header.js.map

@@ -1 +1 @@
-{"version":3,"file":"header.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout3/header.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"header.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout3/header.tsx"],"names":[],"mappings":"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"}