aldehyde 0.2.498 → 0.2.500

package/src/aldehyde/lowcode-components/base-text/index.tsx

@@ -1,12 +1,7 @@
 
-import React, {
-    CSSProperties,
-    ForwardedRef,
-    forwardRef,
-    useImperativeHandle,
-    useState
-} from 'react';
+import React, { CSSProperties, ForwardedRef, forwardRef, useImperativeHandle, useMemo, useState } from 'react';
 import { useLocale } from "../../locale/useLocale";
+import { handleExpandStyle } from "../assets/utils";
 import './index.less';
 
 export interface BaseTextComponentStyle {
@@ -20,6 +15,7 @@ export interface BaseTextComponentStyle {
     strokeColor?: string;
     letterSpacing?: number;
     lineHeight?: number;
+    expandStyle?: string; // 扩展样式
 }
 
 export interface BaseTextComponentProps {
@@ -41,15 +37,21 @@ const BaseTextComponent = forwardRef((props: BaseTextComponentProps, ref: Forwar
         updateConfig: (newConfig) => setConfig({ ...newConfig }),
     }));
 
-    const strokeStyle: CSSProperties = {
-        WebkitTextStrokeWidth: style?.strokeWidth,
-        WebkitTextStrokeColor: style?.strokeColor,
-    }
+    const strokeStyle: CSSProperties = useMemo(() => {
+        const { strokeWidth, strokeColor } = style || {};
+        return {
+            WebkitTextStrokeWidth: strokeWidth,
+            WebkitTextStrokeColor: strokeColor,
+        }
+    }, [style]);
+
+    // 扩展样式处理
+    const expandStyle = useMemo(() => handleExpandStyle(style?.expandStyle), [style]);
 
     return (
         <div
             className={'base-text-component'}
-            style={{ ...style, ...strokeStyle }}
+            style={{ ...style, ...strokeStyle, ...expandStyle }}
         >
             {data?.staticData ? translate("${" + data.staticData + "}") : ""}
         </div>

package/src/aldehyde/lowcode-components/lowcode-view/component/component-container.tsx

@@ -1,4 +1,4 @@
-import React, { memo, Suspense, useEffect, useRef, useState, useContext } from "react";
+import React, { memo, Suspense, useEffect, useRef, useState, useContext, useMemo } from "react";
 import Loading from "./loading";
 import { ILayerItem, LayerManagerDataType } from "../interface";
 import ComponentController from "./component-controller";
@@ -6,6 +6,53 @@ import abstractDesignerLoader from "./abstract-designer-loader";
 import { useNavigate } from "react-router-dom";
 import { ControllerContext } from "../index";
 
+/** 静态 style，避免每次 render 重新创建对象 */
+const BASE_OUTER_STYLE: React.CSSProperties = {
+    position: 'absolute',
+    transformOrigin: 'center',
+};
+
+const BASE_INNER_STYLE: React.CSSProperties = {
+    width: '100%',
+    height: '100%',
+    transformOrigin: 'center',
+    position: 'relative',
+};
+
+/**
+ * 根据 layer 数据统一计算外层 2D transform 与内层 3D transform。
+ * 外层只承载 translate/2D-rotate（供 moveable 操作），内层承载 rotateX/Y/Z。
+ * 职责分离，避免 moveable 将 3D 值写入 layer.transform 导致重复叠加。
+ */
+const resolveTransforms = (
+    layer: ILayerItem,
+): { outerTransform: string; innerTransform?: string; has3D: boolean; perspective?: number } => {
+    const { rotateX, rotateY, rotateZ, perspective } = layer.transform3D || {};
+    const has3D = !!(rotateX || rotateY || rotateZ); // 是否存在3D转换
+    const baseTransform = layer.transform || `translate(${layer.x}px, ${layer.y}px)`;
+    // --- 外层 2D transform ---
+    let outerTransform: string;
+    if (has3D) {
+        // 仅提取 translate + 2D rotate，剥离可能混入的 3D 部分
+        const translateMatch = baseTransform.match(/translate\([^)]+\)/);
+        const translate = translateMatch ? translateMatch[0] : `translate(${layer.x}px, ${layer.y}px)`;
+        const rotateMatch = baseTransform.match(/\brotate\([^)]+\)/);
+        outerTransform = rotateMatch ? `${translate} ${rotateMatch[0]}` : translate;
+    } else {
+        outerTransform = baseTransform;
+    }
+    // --- 内层 3D transform ---
+    let innerTransform: string | undefined;
+    if (has3D) {
+        const parts: string[] = [];
+        if (rotateX) parts.push(`rotateX(${rotateX}deg)`);
+        if (rotateY) parts.push(`rotateY(${rotateY}deg)`);
+        if (rotateZ) parts.push(`rotateZ(${rotateZ}deg)`);
+        innerTransform = parts.join(' ');
+    }
+    return { outerTransform, innerTransform, has3D, perspective };
+};
+
 const registerProxy = (compId: string, controller: ComponentController) => {
     controller.changeData = new Proxy(controller.changeData, {
         apply(target, thisArg, argus) {
@@ -61,6 +108,11 @@ const ComponentContainer = memo((props: ComponentContainerProps) => {
         }
     }, []);
 
+    const { outerTransform, innerTransform, has3D, perspective } = useMemo(
+        () => resolveTransforms(layer),
+        [layer.transform, layer.x, layer.y, layer.transform3D],
+    );
+
     return (
         <Suspense fallback={<Loading />}>
             <div
@@ -70,18 +122,19 @@ const ComponentContainer = memo((props: ComponentContainerProps) => {
                 data-hide={layer.hide}
                 key={layer.id + ''}
                 style={{
+                    ...BASE_OUTER_STYLE,
                     width: layer.width,
                     height: layer.height,
-                    transform: layer.transform || `translate(${layer.x!}px, ${layer.y!}px)`,
-                    position: 'absolute',
-                    visibility: layer.hide ? "hidden" : "visible",
+                    transform: outerTransform,
+                    perspective: (has3D && perspective) ? `${perspective}px` : undefined,
+                    transformStyle: has3D ? 'preserve-3d' : undefined,
+                    visibility: layer.hide ? 'hidden' : 'visible',
                     border: 'none'
                 }} className={"lc-comp-item"}>
                 <div ref={ref} style={{
-                    width: '100%',
-                    height: '100%',
+                    ...BASE_INNER_STYLE,
+                    transform: innerTransform,
                     pointerEvents: 'auto',
-                    position: 'relative'
                 }} />
             </div>
         </Suspense>

package/src/aldehyde/lowcode-components/lowcode-view/interface.ts

@@ -33,6 +33,12 @@ export interface ILayerItem {
     next?: string;
     // 旋转
     transform?: string;
+    transform3D?: {  // 3D变换
+        rotateX?: number;
+        rotateY?: number;
+        rotateZ?: number;
+        perspective?: number;
+    };
 }
 
 export interface LayerManagerDataType {

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

@@ -123,6 +123,7 @@ interface ActTableStat {
   pageSizeOptions?: number[]; // 设备分页数
   customDrawerSize?: number | string; // 自定义页面抽屉宽度
   tableNumber?: number; // 添加多表格-显示表格数量
+  isQuery?: boolean; // 是否为查询状态(配置默认不查询使用)
 }
 let serial_number = new Date().getTime();
 let busyReminderTime = 0;
@@ -161,7 +162,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     pageSizeOptions: defPageSizeOptions,
     customDrawerSize: undefined,
     tableNumber: 0,
-    showTableAdd: undefined
+    showTableAdd: undefined,
+    isQuery: true, // 是否查询数据(配置默认不查询使用)
   };
 
   static contextType = LocaleContext;
@@ -500,28 +502,31 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
 
 
   async componentDidMount() {
-    const { ltmplConfig, tableType, userPageConfig, defShowType, onUpdatePageSizeOptions, setUserPageConfig, pageSize } = this.props;
+    const { ltmplConfig, tableType, userPageConfig, defShowType, onUpdatePageSizeOptions, setUserPageConfig, criteriaData } = this.props;
     const { sortedColIds } = userPageConfig || {};
     const { translate } = this.context;
     let sortedColConfigs = undefined;
     if (ltmplConfig) {
-      sortedColConfigs = tableType == 'report' ? ltmplConfig.columns : [
+      const { notAutoQuery, columns, showType, rowCardCount } = ltmplConfig;
+      sortedColConfigs = tableType == 'report' ? columns : [
         { id: "10000", title: translate("${排序}"), originalId: "10000" },
         { id: "20000", title: translate("${隐藏}"), originalId: "20000" },
-        ...ltmplConfig.columns,
+        ...columns,
       ];
       if (sortedColIds) { // 使用缓存的列排序
         sortedColConfigs.sort((a, b) => sortedColIds.indexOf(a.id) - sortedColIds.indexOf(b.id));
       }
-      const temViewModels = userPageConfig?.["viewModels"] || [defShowType || ltmplConfig?.showType || "table"];
+      const temViewModels = userPageConfig?.["viewModels"] || [defShowType || showType || "table"];
       this.setState({ viewModels: temViewModels });
       if (onUpdatePageSizeOptions && temViewModels.includes("cardList")) { // 初始化是卡片视图，则更新父组件中分页数组
-        const temPageSizes = Array.from({ length: 7 }, (_, i) => ltmplConfig.rowCardCount * Math.pow(2, i));
+        const temPageSizes = Array.from({ length: 7 }, (_, i) => rowCardCount * Math.pow(2, i));
         onUpdatePageSizeOptions(temPageSizes);
         if (setUserPageConfig && !(userPageConfig?.pageSize >= 0)) setUserPageConfig({ pageSize: 1 });
         this.setState({ pageSizeOptions: temPageSizes, sortedColConfigs });
-      } else {
+      } else if (!notAutoQuery) { // notAutoQuery页面加载时不默认请求数据
         this.loadData(userPageConfig?.hiddenColIds || defaultDisabledColIds, [], sortedColConfigs);
+      } else {
+        this.setState({ sortedColConfigs, userCriteriaData: criteriaData, loading: false, isQuery: false });
       }
     }
     this.getTabsOptions();
@@ -550,8 +555,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
 
   async componentDidUpdate(prevProps, prevState) {
     const { sourceId, criteriaData, ltmplConfig, tableType, pageSize, pageNo, userPageConfig, defShowType } = this.props;
-    // const {userCriteriaData:preUserCriteriaData}=prevState;
-    const { userCriteriaData } = this.state;
+    const { userCriteriaData, isQuery } = this.state;
     const { translate } = this.context;
     let {
       ltmplConfig: preLtmplConfig,
@@ -562,7 +566,9 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     if (!this.isSameSourceQuery(sourceId, criteriaData)) {
       return false;
     }
-
+    if (isQuery === false) { // 默认不可请求数据
+      return false;
+    }
     if (prePageSize != pageSize || pageNo != prePageNo) {
       this.setState({
         pageInfo: { pageNo, pageSize },
@@ -1293,6 +1299,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
 
   actTableDoSearch = (data: object) => {
     const { ltreeData } = this.state;
+    this.setState({ isQuery: true });
     this.doSearch_(data, ltreeData);
   }
 
@@ -1509,18 +1516,15 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   renderAggregates() { // 统计数据渲染
     const { aggregateVO } = this.state;
     const { ltmplConfig } = this.props;
+    const { columns, totalViewMode } = ltmplConfig;
     const aggregates = aggregateVO?.aggregates || [];
-    const columns = ltmplConfig?.columns || [];
     return aggregates?.length ? <div className="aggregates">{aggregates.map(item => {
-      const column = columns.find(r => r.id === item.fieldId);
-      if (!column) {
-        return "";
-      }
-      const { dataUnit, themeColor, themeIcon } = column;
-      return <Card className="aggregate-card" hoverable styles={{ body: { padding: 20 } }}>
+      const column = columns?.find(r => r.id === item.fieldId);
+      const { dataUnit, themeColor, themeIcon } = column || {};
+      const renderDefCard = <Card className="aggregate-card" hoverable styles={{ body: { padding: totalViewMode === "card" ? 20 : 8 } }}>
         <div style={{ display: "flex", alignItems: "start", justifyContent: "space-between" }}>
           <div style={{ width: "calc(100% - 40px)" }}>
-            <p className="title">{item.fieldTitle}</p>
+            <p className="title" style={{ marginBottom: totalViewMode === "card" ? "16px" : "0px" }}>{item.fieldTitle}</p>
             <div className="value">
               <Text
                 style={{ maxWidth: "100%" }}
@@ -1532,12 +1536,22 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
             </div>
           </div>
           {themeIcon ?
-            <div className="icon" style={{ color: themeColor, background: `${themeColor}26` }}>
-              <Icon type={themeIcon} />
-            </div> :
-            ""}
+            <div className="icon" style={{ color: themeColor, background: `${themeColor}26` }}><Icon type={themeIcon} /></div> : ""}
+        </div>
+      </Card>;
+      const renderSimple = <Card className="aggregate-card" hoverable styles={{ body: { padding: "6px 12px", display: "flex", alignItems: "center" } }}>
+        <div style={{ whiteSpace: "nowrap" }}>{item.fieldTitle}：</div>
+        <div className="value">
+          <Text
+            style={{ maxWidth: "100%" }}
+            ellipsis={{ tooltip: item.value }}
+          >
+            <span className="number">{item.value}</span>
+          </Text>
+          {dataUnit ? <span className="unit">{dataUnit}</span> : ""}
         </div>
-      </Card>
+      </Card>;
+      return totalViewMode === "simple" ? renderSimple : renderDefCard;
     }).filter(Boolean)
     }</div > : "";
   }

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

@@ -158,15 +158,16 @@ export default {
                 column["fixed"] = "right";
                 column["align"] = "left";
                 column["width"] = item.colWidth ? item.colWidth : 160;
-                column["className"] = "opsColumn";
+                if (ltmplConfig.tableLayout !== "auto") column["className"] = "opsColumn"; // 表格非自适应设置
                 column["title"] = <>{translate("${操作}")}</>;
-                column["render"] = (text, record) => this.renderAction(props, record);
+                column["render"] = (text, record) => this.renderAction(props, record, ltmplConfig.tableLayout !== "auto");
             } else {
                 currentDataColIndex++;
-                column["className"] = "opsColumn";
+                if (ltmplConfig.tableLayout !== "auto") column["className"] = "opsColumn"; // 表格非自适应设置
                 // column["title"] = item.tip? <>{title1}<Tooltip placement="top" title={item.tip}>
                 //     <Button icon={<QuestionCircleOutlined />} /></Tooltip> </>: title1;
                 column["width"] = item.colWidth ? item.colWidth : 160;
+                column["onCell"] = () => ({ style: { maxWidth: item.maxColWidth || undefined, minWidth: item.minColWidth || undefined } });
                 column["ellipsis"] = { showTitle: true };
                 column["align"] = item.valueAlign ? item.valueAlign : "left";
                 if (
@@ -544,7 +545,7 @@ export default {
         }).filter(Boolean);
         return actionButtons?.length ? <div className="column-action"><Space wrap size={4}>{actionButtons}</Space></div> : undefined;
     },
-    renderAction(props: ActionRenderProps, record: DtmplData) { // 操作列按钮渲染
+    renderAction(props: ActionRenderProps, record: DtmplData, isWrap = true) { // 操作列按钮渲染
         const { ltmplConfig, showView,
             doEdit,
             doRAction,
@@ -872,7 +873,7 @@ export default {
                 </Popover>
             );
         }
-        return <Space size={[0, 4]} wrap>
+        return <Space size={[0, 4]} wrap={isWrap}>
             {showButtons}
         </Space>
     }

package/src/aldehyde/table/index.css

@@ -110,6 +110,34 @@
   gap: 16px;
 }
 
+/* >= 640px: 2列 */
+@media (min-width: 640px) {
+  .aggregates {
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+  }
+}
+
+/* >= 768px: 3列 */
+@media (min-width: 768px) {
+  .aggregates {
+    grid-template-columns: repeat(3, minmax(0, 1fr));
+  }
+}
+
+/* >= 1024px: 4列 */
+@media (min-width: 1024px) {
+  .aggregates {
+    grid-template-columns: repeat(4, minmax(0, 1fr));
+  }
+}
+
+/* >= 1280px: 5列 */
+@media (min-width: 1280px) {
+  .aggregates {
+    grid-template-columns: repeat(5, minmax(0, 1fr));
+  }
+}
+
 .aggregate-card .title {
   margin-bottom: 16px;
   font-size: 14px;
@@ -170,18 +198,6 @@
   flex: 0 0 auto;
 }
 
-@media (min-width: 768px) {
-  .aggregates {
-    grid-template-columns: repeat(3, minmax(0, 1fr));
-  }
-}
-
-@media (min-width: 1024px) {
-  .aggregates {
-    grid-template-columns: repeat(5, minmax(0, 1fr));
-  }
-}
-
 /* 用户自定义配置按钮样式 */
 .page-config-menu-item {
   display: flex;

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

@@ -89,6 +89,8 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
     const { queryKey, pageInfo } = this.props;
     if (queryKey) {
       await this.loadData(queryKey.key, pageInfo);
+    } else {
+      this.setState({ loading: false });
     }
   }
 
@@ -124,7 +126,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
   );
 
   DraggableBodyRow = ({ className, style, ...restProps }) => {
-    const { dataSource } = this.state;
+    const { dataSource = [] } = this.state;
     if (dataSource) {
       const index = dataSource.findIndex(
         (x) => x.key === restProps["data-row-key"]
@@ -544,6 +546,20 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
       );
     }
 
+    // 表格空状态显示
+    const renderEmptyText = () => {
+      if (showEmpty === false) {
+        return false;
+      }
+      if (errorText) {
+        return <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} description={errorText} styles={{ description: { color: "#ff4d4f" } }} />;
+      }
+      if (!queryKey) {
+        return <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} description={translate("${请点击查询按钮查看数据}")} />;
+      }
+      return undefined;
+    }
+
     return (
       <>
         {/*{viewModels.includes("table") ? (*/}
@@ -578,6 +594,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
         {/*)}*/}
         {viewModels.includes("table") ? (
           <ResizableTable
+            tableLayout={ltmplConfig.tableLayout || "fixed"}
             size={tableProps.size ? tableProps.size : undefined}
             rowSelection={this.getRowSelection()}
             columns={current_cols}
@@ -602,9 +619,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
               },
             }}
             onChange={this.onChange.bind(this)}
-            locale={{
-              emptyText: errorText ? <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} description={errorText} styles={{ description: { color: "#ff4d4f" } }} /> : undefined
-            }}
+            locale={{ emptyText: renderEmptyText() }}
             expandable={isTreeTable ? {
               onExpand: (expanded, record) => {
                 if (expanded && !record.children?.length) { // 展开且没有子节点数据，请求子节点数据
@@ -613,7 +628,6 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
               }
             } : undefined}
             onChangeResize={onChangeResize}
-            showEmpty={showEmpty}
           />
         ) : (
           ""

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

@@ -43,7 +43,7 @@ const ResizableTitle = props => {
 
 const ResizableTable = props => {
 
-    const { columns: columns_, components: components_, onChangeResize, showEmpty, ...other } = props
+    const { columns: columns_, components: components_, onChangeResize, tableLayout, ...other } = props
     // const [columns, setColumns] = useState(columns_.map((col) => {
     //         col['onHeaderCell']=(col) => ({
     //             ...col['onHeaderCell'],
@@ -90,7 +90,7 @@ const ResizableTable = props => {
         header: { cell: ResizableTitle }
     }
 
-    return <Table components={components} columns={columns}  {...other} locale={showEmpty !== false ? undefined : { emptyText: false }} size="small" />;
+    return <Table components={tableLayout === "auto" ? components_ : components} columns={columns}  {...other} tableLayout={tableLayout} size="small" />;
 }
 
 export default ResizableTable;

package/src/aldehyde/tmpl/interface.tsx

@@ -296,6 +296,8 @@ export interface ColumnConfig extends FieldConfig {
   upperColumnTitle?: string,
   rowEditable?: boolean,
   columnGroupName?: string, // 列分组
+  maxColWidth?: number, // 最大列宽
+  minColWidth?: number, // 最小列宽
 }
 
 export type CodeSource = "new" | "listop" | "listop-new" | undefined;
@@ -680,7 +682,7 @@ export interface LtmplConfig extends SelectConfig {
   // 日历配置
   calendarDateColumnConfig?: ColumnConfig;
   calendarShowType?: "month" | "year";
-  calendarDateSelectorUsable?: boolean;
+  calendarDateSelectorUsable?: boolean; // 日历配置end
   strongDeleteConfirmText?: string; // 强确认删除文本
   splitTabShowType?: "tab" | "tag" | "radio"; // Tab拆解条件
   showSplitTabDataCount?: boolean; // tab拆解条件是否显示统计数据
@@ -689,6 +691,11 @@ export interface LtmplConfig extends SelectConfig {
   defTableSize?: number; // 添加多表格默认表格数
   singleTableSpan?: number; // 展示多表格-单表格占用列数
   copyMode?: "copyOnly" | "copyEdit" | "editCopy"; // 复制模式
+  totalViewMode?: "simple" | "compactCard" | "card"; // 聚合函数展示类型
+  showTotalNumInTotalView?: boolean; // 是否在聚合视图中显示总数
+  totalNumInTotalViewTitle?: string; // 聚合视图中显示总数的标题
+  notAutoQuery?: boolean; // 页面是否默认查询
+  tableLayout?: "auto" | "fixed"; // 表格布局(自适应列宽/固定列宽)
 }
 
 export interface EnumItem {

package/src/aldehyde/welcome/HCWelcome.js

@@ -334,6 +334,7 @@ const HCWelcome = (props) => {
   const [menus, setMenus] = useState([]);
   const [leafMenus, setLeafMenus] = useState([]);
   const [themeConfig, setThemeConfig] = useState();
+  const [showRightSidebar, setShowRightSidebar] = useState(true);
 
   const initUserConfig = async () => {
     let userInfo = await Units.getCurrentUserInfo();
@@ -378,7 +379,7 @@ const HCWelcome = (props) => {
           </Col>
           <Col span={24}>
             <Row gutter={16}>
-              <Col span={16}>
+              <Col span={showRightSidebar ? 16 : 24}>
                 <Row gutter={[0, 16]}>
                   {(themeConfig?.allowUserConfig || themeConfig?.allowUsermenu) ?
                     <Col span={24}><UserMenus menus={menus} leafMenus={leafMenus} themeConfig={themeConfig} /></Col> : ""}
@@ -386,12 +387,13 @@ const HCWelcome = (props) => {
                   <Col span={24}><MenuCard menus={menus} /></Col>
                 </Row>
               </Col>
-              <Col span={8}>
-                <Row gutter={[16, 16]}>
-                  <Col span={24}><PageCard fastMenu="RightSidebar01" layoutRootPath={layoutRootPath} menus={menus} menuOrder={1} /></Col>
-                  <Col span={24}><PageCard fastMenu="RightSidebar02" layoutRootPath={layoutRootPath} menus={menus} menuOrder={2} /></Col>
-                </Row>
-              </Col>
+              {showRightSidebar ?
+                <Col span={8}>
+                  <Row gutter={[16, 16]}>
+                    <Col span={24}><PageCard fastMenu="RightSidebar01" layoutRootPath={layoutRootPath} menus={menus} menuOrder={1} setShowRightSidebar={setShowRightSidebar} /></Col>
+                    <Col span={24}><PageCard fastMenu="RightSidebar02" layoutRootPath={layoutRootPath} menus={menus} menuOrder={2} /></Col>
+                  </Row>
+                </Col> : ""}
             </Row>
           </Col>
         </Row>

package/src/aldehyde/welcome/components/page-card.tsx

@@ -51,10 +51,11 @@ interface Props {
     fastMenu: string;
     menus: MenuType[];
     menuOrder: number;
+    setShowRightSidebar?: (val: boolean) => void;
 }
 
 const Index = (props: Props) => {
-    const { layoutRootPath, fastMenu, menus, menuOrder } = props;
+    const { layoutRootPath, fastMenu, menus, menuOrder, setShowRightSidebar } = props;
     const [l2Menu, setL2Menu] = useState<MenuType>();
     const navigate = useNavigate();
     const { translate } = useLocale();
@@ -62,6 +63,9 @@ const Index = (props: Props) => {
 
     const getL2Menu = async () => {
         let temData: Level2Menu[] = await HCDataSource.fastMenu(fastMenu);
+        if (!temData && setShowRightSidebar && fastMenu === "RightSidebar01") {
+            setShowRightSidebar(false);
+        }
         const itemMenu = temData?.[0];
         if (itemMenu && !itemMenu.disabled) {
             const { id, pageType, defaultCriteriaValue, customPath, dragDropPageId, fullScreen } = itemMenu;