aldehyde 0.2.420 → 0.2.422

package/src/aldehyde/table/column/column-builder.tsx

@@ -427,31 +427,24 @@ export default {
 
         let actionButtons: any[] = [];
 
-        if (buttons.includes("detail") &&
-            showView &&
-            ActionUtils.isShow(
-                ltmplConfig.buttonViewAction?.preposes,
-                [record],
-                undefined
-            )) {
-            actionButtons.push(<ViewButton
-                showView={showView}
-                data={record}
-                ltmplConfig={ltmplConfig}></ViewButton>);
-        }
-        if (buttons.includes("customDetail") &&
-            showView &&
-            ActionUtils.isShow(
-                ltmplConfig.buttonViewAction?.preposes,
-                [record],
-                undefined
-            )) {
+        const isShowDetail = buttons.includes("detail") && showView && ActionUtils.isShow(ltmplConfig.buttonViewAction?.preposes, [record], undefined);
+        const isShowCustomDetail = buttons.includes("customDetail") && showView && ActionUtils.isShow(ltmplConfig.buttonViewAction?.preposes, [record], undefined);
+
+        if (isShowCustomDetail) { // 自定义详情
             actionButtons.push(<Button
                 size="small"
                 type="primary"
                 icon={<AlignLeftOutlined />}
                 onClick={() => showView({ code: record.code, toCustomPage: true, })}
-            ></Button>)
+            />)
+        }
+
+        if (isShowDetail) { // 默认详情
+            actionButtons.push(<ViewButton
+                showView={showView}
+                data={record}
+                ltmplConfig={ltmplConfig}
+                buttonType={isShowCustomDetail ? "default" : "primary"} />);
         }
 
         if (buttons.includes("dtmplEdit") && doEdit && !readOnly) {

package/src/aldehyde/table/index.css

@@ -127,8 +127,6 @@
   font-size: 28px;
   line-height: 32px;
   font-weight: 700;
-  overflow: hidden;
-  text-overflow: ellipsis;
 }
 
 .aggregate-card .value .unit {
@@ -182,4 +180,33 @@
   .aggregates {
     grid-template-columns: repeat(5, minmax(0, 1fr));
   }
+}
+
+/* 用户自定义配置按钮样式 */
+.page-config-menu-item {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 152px;
+}
+
+.page-config-menu-item .page-config-menu-item-title {
+  width: 80px;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+  text-align: left;
+}
+
+.page-config-menu-item .page-config-menu-item-icon {
+  display: none;
+  margin-left: 12px;
+}
+
+.page-config-menu-item:hover .page-config-menu-item-icon {
+  display: block;
+}
+
+.page-config-menu-item-edit .page-config-menu-item-icon {
+  display: block !important;
 }

package/src/aldehyde/table/page-config-button.tsx

@@ -0,0 +1,199 @@
+import React, { useEffect, useRef, useState } from "react";
+import { theme, Dropdown, Button, Tooltip, Divider, Popover, Form, Input, Popconfirm } from "antd";
+import { SettingOutlined, PlusOutlined, SyncOutlined, UploadOutlined, DeleteOutlined, DownloadOutlined, EditOutlined } from "@ant-design/icons";
+import { useLocale } from "../locale/useLocale";
+import HcserviceV3 from "../tmpl/hcservice-v3";
+import ProgramConfig from "../units";
+import "./index.css";
+
+/**
+ * 页面自定义配置
+ */
+
+const { useToken } = theme;
+
+interface Props {
+    menuCode: string;
+    handleResetUserPageConfig: () => void;
+    handleUpdateUserPageConfig?: (config: { [key: string]: any }) => void; // 更新用户页面配置本地缓存
+    userCriteriaData: { [key: string]: any }; // 搜索条件，自定义配置使用
+}
+
+const Index = (props: Props) => {
+    const { menuCode, handleResetUserPageConfig, handleUpdateUserPageConfig, userCriteriaData = {} } = props;
+    const [menus, setMenus] = useState<{ recordCode: string, name: string, content: string }[]>([]);
+    const [addOpen, setAddOpen] = useState<boolean>(false);
+    const [editOpen, setEditOpen] = useState<boolean>(false);
+    const [currentKey, setCurrentKey] = useState<string>();
+    const { translate } = useLocale();
+    const { token } = useToken();
+    const [form] = Form.useForm();
+
+    // 设置默认配置
+    const setPageConfigDefault = async () => {
+        const userPageConfig = await ProgramConfig.getUserPageConfig(menuCode);
+        if (!userPageConfig || !menuCode) {
+            return;
+        }
+        const content = JSON.stringify(userPageConfig);
+        await HcserviceV3.setPageConfigDefault("默认", menuCode, content);
+        setCurrentKey(undefined);
+        handleUpdateUserPageConfig(userPageConfig);
+    }
+
+    // 获取全局默认配置，更新缓存
+    const getPageConfigDefault = async () => {
+        const defUserPageConfig = await ProgramConfig.getPageConfigDefault();
+        handleUpdateUserPageConfig(defUserPageConfig[menuCode]);
+    }
+
+    // 更新当前页面配置
+    const onChangeUserPageConfig = (item) => {
+        const { content } = item;
+        if (!content) {
+            return;
+        }
+        const config = JSON.parse(content);
+        handleUpdateUserPageConfig(config);
+    }
+
+    const onClickOperation = (e, item) => {
+        e.stopPropagation();
+        setCurrentKey(item.key);
+    }
+
+    const renderMenuItem = (item) => {
+        const { key, name, recordCode } = item;
+        return {
+            key,
+            label: <div className={`page-config-menu-item ${currentKey === item.key ? "page-config-menu-item-edit" : ""}`} onClick={() => onChangeUserPageConfig(item)}>
+                <div className="page-config-menu-item-title">{name || translate("配置")}</div>
+                <Popconfirm
+                    placement="rightBottom"
+                    title={translate("${确定要[更新]此数据吗}?")}
+                    onConfirm={(e) => {
+                        e.stopPropagation();
+                        key === "default" ? setPageConfigDefault() : setPageConfigCommon(item);
+                    }}
+                    okText={translate("${确定}")}
+                    cancelText={translate("${取消}")}
+                    okType={"danger"}
+                >
+                    <Tooltip title={translate("${更新}")}><UploadOutlined onClick={(e) => onClickOperation(e, item)} className="page-config-menu-item-icon" style={{ color: token.colorPrimary }} /></Tooltip>
+                </Popconfirm>
+                {key === "default" ? <Popconfirm
+                    placement="rightBottom"
+                    title={translate("${确定要[拉取]默认配置吗}?")}
+                    onConfirm={(e) => {
+                        e.stopPropagation();
+                        getPageConfigDefault();
+                    }}
+                    okText={translate("${确定}")}
+                    cancelText={translate("${取消}")}
+                    okType={"danger"}
+                >
+                    <Tooltip title={translate("${拉取云端默认配置}")}><DownloadOutlined onClick={(e) => onClickOperation(e, item)} className="page-config-menu-item-icon" style={{ color: token.colorPrimary }} /></Tooltip>
+                </Popconfirm> : ""}
+                {key !== "default" ?
+                    <>
+                        <Popover placement="bottom" open={editOpen && currentKey === item.key} destroyOnHidden={true} onOpenChange={(val) => { setEditOpen(val); form.setFieldValue("name", val ? item.name : undefined); }} zIndex={9999} content={renderAddForm} trigger="click">
+                            <Tooltip title={translate("${编辑}")}>
+                                <EditOutlined onClick={(e) => onClickOperation(e, item)} className="page-config-menu-item-icon" style={{ color: token.colorPrimary }} />
+                            </Tooltip>
+                        </Popover>
+                        <Popconfirm
+                            placement="rightBottom"
+                            title={translate("${确定要[删除]此数据吗}?")}
+                            onConfirm={(e) => {
+                                e.stopPropagation();
+                                deletePageConfigCommon(recordCode);
+                            }}
+                            okText={translate("${确定}")}
+                            cancelText={translate("${取消}")}
+                            okType={"danger"}
+                        >
+                            <Tooltip title={translate("${删除}")}><DeleteOutlined onClick={(e) => onClickOperation(e, item)} className="page-config-menu-item-icon" style={{ color: token.colorError }} /></Tooltip>
+                        </Popconfirm>
+                    </> : ""}
+            </div >
+        };
+    };
+
+    // 设置自定义菜单配置
+    const setPageConfigCommon = async (val: { key: string, name: string }) => {
+        const userPageConfig = await ProgramConfig.getUserPageConfig(menuCode);
+        if (!userPageConfig || !menuCode) {
+            return;
+        }
+        let content = undefined;
+        // val.key存在-更新配置；val.key和currentKey都不存在-添加自定义配置；val.key不存在-更新name
+        if (val.key || !(val.key || currentKey)) {
+            userPageConfig["criteriaData"] = { ...userCriteriaData, serial_number: undefined };
+            content = JSON.stringify(userPageConfig);
+            handleUpdateUserPageConfig(userPageConfig);
+        } else {
+            content = menus.find(r => r.recordCode === currentKey)?.content;
+        }
+        await HcserviceV3.setPageConfigCommon(val.name, menuCode, content, val.key || currentKey);
+        getPageConfigCommon("addOrEdit");
+        setAddOpen(false);
+        setEditOpen(false);
+        setCurrentKey(undefined);
+    }
+
+    // 删除自定义菜单配置
+    const deletePageConfigCommon = async (configCode: string) => {
+        if (!configCode) {
+            return;
+        }
+        await HcserviceV3.deletePageConfigCommon(configCode);
+        getPageConfigCommon("delete");
+        setCurrentKey(undefined);
+    }
+
+    // 获取自定义菜单配置
+    const getPageConfigCommon = async (type: string) => {
+        const configs = await ProgramConfig.getPageConfigCommon(menuCode, type === "init" ? "default" : "refresh");
+        setMenus(configs || []);
+    }
+
+    useEffect(() => {
+        if (menuCode) {
+            getPageConfigCommon("init");
+        }
+    }, [menuCode]);
+
+    const contentStyle: React.CSSProperties = {
+        backgroundColor: token.colorBgElevated,
+        borderRadius: token.borderRadiusLG,
+        boxShadow: token.boxShadowSecondary,
+    };
+
+    const renderAddForm = <Form clearOnDestroy={true} form={form} layout="vertical" onFinish={setPageConfigCommon} onClick={(e) => e.stopPropagation()} >
+        <Form.Item name="name" label={translate("名称")} rules={[{ required: true }]}>
+            <Input placeholder={translate("名称")} />
+        </Form.Item>
+        <Form.Item style={{ margin: 0, textAlign: "right" }}><Button type="primary" htmlType="submit">{translate("${提交}")}</Button></Form.Item>
+    </Form>;
+
+    return <Dropdown trigger={["click"]} menu={{ items: [renderMenuItem({ key: "default", name: "默认" }), ...menus.map(r => renderMenuItem({ ...r, key: r.recordCode }))].filter(Boolean) }} popupRender={(menu) => (
+        <div style={contentStyle}>
+            {React.cloneElement(menu as any, { style: { boxShadow: 'none' } },)}
+            <Divider style={{ margin: 0 }} />
+            <div style={{ padding: "4px", display: "flex", justifyContent: "space-between", alignItems: "center" }}>
+                <Tooltip title={translate("${重置}")}>
+                    <Button onClick={handleResetUserPageConfig} icon={<SyncOutlined />} />
+                </Tooltip>
+                <Popover placement="bottomLeft" destroyOnHidden={true} open={addOpen} onOpenChange={setAddOpen} getPopupContainer={(val) => val} zIndex={9999} content={renderAddForm} trigger="click">
+                    <Tooltip title={translate("${添加我的菜单}")}><Button disabled={menus?.length > 4} icon={<PlusOutlined />} /></Tooltip>
+                </Popover>
+            </div>
+        </div>
+    )}>
+        <Tooltip title={translate("${我的配置}")}>
+            <Button><SettingOutlined /></Button>
+        </Tooltip>
+    </Dropdown>;
+}
+
+export default Index;

package/src/aldehyde/table/pagination.tsx

@@ -10,16 +10,17 @@ interface PaginationProps {
   pageInfo: PageInfo;
   total: number;
   touchEnd: boolean;
+  paginationPosition?: "left" | "middle" | "right";
 }
 
-interface PaginationStat {}
+interface PaginationStat { }
 
 class Pagination extends React.PureComponent<PaginationProps, PaginationStat> {
   static contextType = LocaleContext;
   context: React.ContextType<typeof LocaleContext>;
 
   render() {
-    const { queryTotal, pageInfo, total, pageTo, touchEnd } = this.props;
+    const { queryTotal, pageInfo, total, pageTo, touchEnd, paginationPosition } = this.props;
     const { translate } = this.context;
 
     if (!pageInfo) {
@@ -48,7 +49,7 @@ class Pagination extends React.PureComponent<PaginationProps, PaginationStat> {
     }
 
     return (
-      <div className="Pagination">
+      <div className="Pagination" style={{ justifyContent: paginationPosition === "middle" ? "center" : (paginationPosition || "left") }}>
         <span
           className={sewTotal ? "sewTotal" : "seeTotal"}
           onClick={queryTotal}
@@ -59,11 +60,11 @@ class Pagination extends React.PureComponent<PaginationProps, PaginationStat> {
           style={{ display: "inline-block" }}
           showQuickJumper
           showSizeChanger
-          pageSizeOptions={["5", "10", "20", "50", "100", "200","500"]} //
+          pageSizeOptions={["5", "10", "20", "50", "100", "200", "500"]} //
           defaultCurrent={1}
-          current={parseInt(pageInfo.pageNo?pageInfo.pageNo.toString():"1")}
-          pageSize={pageInfo.pageSize?pageInfo.pageSize:10}
-          onChange={(page, pageSize) => {pageTo(page, pageSize)}}
+          current={parseInt(pageInfo.pageNo ? pageInfo.pageNo.toString() : "1")}
+          pageSize={pageInfo.pageSize ? pageInfo.pageSize : 10}
+          onChange={(page, pageSize) => { pageTo(page, pageSize) }}
           //onShowSizeChange={(current, size) => {debugger;pageTo(current, size)}}
           hideOnSinglePage={total === 0}
           total={virtualTotal}

package/src/aldehyde/table/query-table.tsx

@@ -632,6 +632,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
           pageTo={this.pageTo}
           queryTotal={this.queryTotal}
           total={aggregateVO?.count}
+          paginationPosition={ltmplConfig?.paginationPosition}
         /> : ""}
       </>
     );

package/src/aldehyde/tmpl/hcservice-v3.tsx

@@ -1360,4 +1360,140 @@ export default class HcserviceV3 {
       return [];
     }
   }
+
+  // 设置页面默认配置
+  static async setPageConfigDefault(name: string, menuCode: string, content: string) {
+    let res = await Super.super({
+      url: `/v3/devops/page-config/default`,
+      method: "POST",
+      data: { name, menuCode, content },
+    });
+    if (res?.status === "success") {
+      message.success(translate("${保存成功}"), 1);
+      return true;
+    } else {
+      message.error(translate("${保存失败}"), 3);
+      return false;
+    }
+  }
+
+  // 获取页面默认配置
+  static async getPageConfigDefault() {
+    let res = await Super.super({
+      url: `/v3/devops/page-config/default`,
+      method: "GET",
+    });
+    if (res?.status === "success") {
+      message.success(translate("${拉取成功}"), 1);
+      return res.configs;
+    } else {
+      message.error(translate("${拉取失败}"), 3);
+      return null;
+    }
+  }
+
+  static async deletePageConfigDefault(menuCode: string) {
+    let res = await Super.super({
+      url: `/v3/devops/page-config/default`,
+      data: { menuCode },
+      method: "DELETE",
+    });
+    if (res?.status === "success") {
+      message.success(translate("${删除成功}"), 1);
+      return true;
+    } else {
+      message.error(translate("${删除失败}"), 3);
+      return false;
+    }
+  }
+
+  // 设置页面用户自定义配置
+  static async setPageConfigCommon(name: string, menuCode: string, content: string, configCode?: string) {
+    let res = await Super.super({
+      url: `/v3/devops/page-config/common`,
+      method: "POST",
+      data: { name, menuCode, content, configCode },
+    });
+    if (res?.status === "success") {
+      message.success(translate("${保存成功}"), 1);
+      return true;
+    } else {
+      message.error(translate("${保存失败}"), 3);
+      return false;
+    }
+  }
+
+  // 获取用户页面自定义配置
+  static async getPageConfigCommon(menuCode?: string) {
+    let res = await Super.super({
+      url: `/v3/devops/page-config/common`,
+      method: "GET",
+      query: { menuCode }
+    });
+    if (res?.status === "success") {
+      return res.configs;
+    } else {
+      return null;
+    }
+  }
+
+  static async deletePageConfigCommon(configCode: string) {
+    let res = await Super.super({
+      url: `/v3/devops/page-config/common`,
+      data: { configCode },
+      method: "DELETE",
+    });
+    if (res?.status === "success") {
+      message.success(translate("${删除成功}"), 1);
+      return true;
+    } else {
+      message.error(translate("${删除失败}"), 3);
+      return false;
+    }
+  }
+
+  // 请求用户我的菜单
+  static async getQuickMenu() {
+    let res = await Super.super({
+      url: `/v3/devops/menu-config/quick-menu`,
+      method: "GET",
+    });
+    if (res?.status === "success") {
+      return res.configs;
+    } else {
+      return null;
+    }
+  }
+
+  // 添加用户我的菜单
+  static async postQuickMenu(menuCodes: string[]) {
+    let res = await Super.super({
+      url: `/v3/devops/menu-config/quick-menu`,
+      method: "POST",
+      data: { menuCodes },
+    });
+    if (res?.status === "success") {
+      message.success(translate("${保存成功}"), 1);
+      return true;
+    } else {
+      message.error(translate("${保存失败}"), 3);
+      return false;
+    }
+  }
+
+  // 删除用户我的菜单
+  static async deleteQuickMenu(menuCode: string) {
+    let res = await Super.super({
+      url: `/v3/devops/menu-config/quick-menu`,
+      data: { menuCode },
+      method: "DELETE",
+    });
+    if (res?.status === "success") {
+      message.success(translate("${删除成功}"), 1);
+      return true;
+    } else {
+      message.error(translate("${删除失败}"), 3);
+      return false;
+    }
+  }
 }

package/src/aldehyde/tmpl/interface.tsx

@@ -455,6 +455,7 @@ export interface FieldConfig extends FieldBase {
   exceptCodes?: string[];
   relDeduplication?: boolean;
   preview?: boolean; // 图片组件预览配置
+  isFallback?: boolean, // 图片组件是否显示容错
   dateControlShortcutKeys?: string[]; // 时间范围预设配置
   placeholder?: string; // 占位符
   appendCriteria?: CriteriaConfig; // 列查询条件配置
@@ -635,6 +636,7 @@ export interface LtmplConfig extends SelectConfig {
   strongDeleteConfirmText?: string; // 强确认删除文本
   splitTabShowType?: "tab" | "tag" | "radio"; // Tab拆解条件
   showSplitTabDataCount?: boolean; // tab拆解条件是否显示统计数据
+  paginationPosition?: "left" | "middle" | "right"; // 分页组件位置
 }
 
 export interface EnumItem {
@@ -857,4 +859,24 @@ export interface BlockType {
   icon?: string;
   themeColor?: string;
   funcDescription?: string;
+}
+
+export interface ThemeConfig {
+  id: string;
+  allowUserConfig?: boolean;
+  allowUsermenu?: boolean;
+  defaultStyleTheme?: string;
+  hideLeftMenuTheme?: string;
+  loginMainPicture?: string;
+  loginPagePasswordResetable?: boolean;
+  loginPageRegisterable?: boolean;
+  loginPageSubTitle?: string;
+  loginPageTitle?: string;
+  programIcon?: string;
+  programName?: string;
+  recordCode?: string;
+  showLeftMenuIcon?: boolean;
+  showTopMenuIcon?: boolean;
+  styleTheme?: string;
+  themeColor?: string;
 }

package/src/aldehyde/units/index.tsx

@@ -7,6 +7,7 @@ import {
   EnumItem,
   LtmplConfig,
   SelectConfig,
+  ThemeConfig
 } from "../tmpl/interface";
 import dayjs from "dayjs";
 import TmplConfigAnalysis from "../tmpl/tmpl-config-analysis";
@@ -45,7 +46,9 @@ const CUSTOM_COMPONENT_MAP = {};
 // 主题url vx替换正则
 const regexTheme = /(?<=#\/)vx/g;
 
-let themeConfig = undefined; // 系统配置主题等
+let themeConfig: ThemeConfig = undefined; // 系统配置主题等
+
+const pageConfigCommons = {}; // 用户页面自定义配置
 
 // let siderCollapsed:boolean = true;
 
@@ -1141,6 +1144,9 @@ export default {
     return new Date().getTime().toString();
   },
   async getUserInfo(programCode?: string, token?: string) {
+    if (currentUser) {
+      return currentUser;
+    }
     let user = await HcserviceV3.getUser(programCode, token);
     if (user?.orgGtmplSourceId && !["null"].includes(user.orgGtmplSourceId)) {
       const { ltmplConfig } = await HcserviceV3.requestLtmplConfig(null, user.orgGtmplSourceId) || {};
@@ -1201,6 +1207,13 @@ export default {
   getThemeConfigInfo() {
     return themeConfig;
   },
+  coverUserPageConfig(setting: { [key: string]: any }) { // 页面配置覆盖
+    const currentUser = this.getCurrentUserInfo();
+    if (!setting || !currentUser) return;
+    const programCode = this.programCode();
+    const localKey = `${currentUser.id}-${programCode}-userPageConfig`;
+    localStorage.setItem(localKey, JSON.stringify(setting));
+  },
   setUserPageConfig(key: string, setting: { [key: string]: any }) { // 页面配置(视图、列、分页等)存本地
     const currentUser = this.getCurrentUserInfo();
     if (!key || !setting || !currentUser) return;
@@ -1217,8 +1230,8 @@ export default {
     localStorage.setItem(localKey, JSON.stringify(config));
     return config[key];
   },
-  getUserPageConfig(key: string) { // 获取当前页面配置本地缓存
-    const currentUser = this.getCurrentUserInfo();
+  async getUserPageConfig(key: string) { // 获取当前页面配置本地缓存
+    const currentUser = await this.getUserInfo();
     if (!key || !currentUser) return;
     const programCode = this.programCode();
     const localKey = `${currentUser.id}-${programCode}-userPageConfig`;
@@ -1243,5 +1256,23 @@ export default {
     } catch {
       return;
     }
+  },
+  async getPageConfigCommon(menuCode: string, type?: "default" | "refresh") {
+    // type == refresh 请求新数据，不使用缓存
+    if ((!type || type === "default") && pageConfigCommons[menuCode]) {
+      return pageConfigCommons[menuCode];
+    }
+    const configs = await HcserviceV3.getPageConfigCommon(menuCode);
+    pageConfigCommons[menuCode] = configs;
+    return configs;
+  },
+  async getPageConfigDefault() { // 拉取用户默认配置
+    const configs = await HcserviceV3.getPageConfigDefault();
+    const defUserPageConfig = configs.reduce((total, cur) => {
+      total[cur.menuCode] = cur.content ? JSON.parse(cur.content) : undefined;
+      return total;
+    }, {});
+    this.coverUserPageConfig(defUserPageConfig); // 覆盖本地缓存
+    return configs;
   }
 };

package/src/aldehyde/welcome/HCWelcome.js

@@ -5,6 +5,7 @@ import QuickEntrance from "./components/quick-entrance";
 import Workbench from "./components/workbench";
 import MenuCard from "./components/menu-card";
 import PageCard from "./components/page-card";
+import UserMenus from "./components/user-menus";
 import "./index.css";
 import Units from "../units";
 import withRouter from "../routable/withroute";
@@ -331,6 +332,7 @@ const HCWelcome = (props) => {
   const [orgHomeImg, setOrgHomeImg] = useState();
   const [menus, setMenus] = useState([]);
   const [leafMenus, setLeafMenus] = useState([]);
+  const [themeConfig, setThemeConfig] = useState();
 
   const initUserConfig = async () => {
     let userInfo = await Units.getCurrentUserInfo();
@@ -347,6 +349,11 @@ const HCWelcome = (props) => {
     }
   };
 
+  const getThemeConfig = async () => {
+    const config = await Units.getThemeConfig();
+    setThemeConfig(config);
+  }
+
   const getMenus = async () => {
     const temData = await getMenuConfig(layoutRootPath || "v2");
     const temMenus = handleMenu(temData?.menu || []);
@@ -358,6 +365,7 @@ const HCWelcome = (props) => {
   useEffect(() => {
     initUserConfig();
     getMenus();
+    getThemeConfig();
   }, []);
 
   return (
@@ -371,6 +379,8 @@ const HCWelcome = (props) => {
             <Row gutter={16}>
               <Col span={16}>
                 <Row gutter={[0, 16]}>
+                  {(themeConfig?.allowUserConfig || themeConfig?.allowUsermenu) ?
+                    <Col span={24}><UserMenus menus={menus} leafMenus={leafMenus} themeConfig={themeConfig} /></Col> : ""}
                   <Col span={24}><QuickEntrance layoutRootPath={layoutRootPath} menus={menus[0]?.children || []} /></Col>
                   <Col span={24}><MenuCard menus={menus} /></Col>
                 </Row>

package/src/aldehyde/welcome/components/menu-card.less

@@ -12,6 +12,7 @@
         justify-content: space-between;
         border: 1px solid;
         cursor: pointer;
+        height: 100%;
 
         .ant-row {
             width: 100%;