aldehyde 0.2.410 → 0.2.413

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

@@ -1,24 +1,24 @@
-import React, {useEffect, useState} from 'react'
+import React, { useEffect, useState } from 'react'
 import "./index.css"
-import { ReportData, ReportTableProps} from "../tmpl/interface";
+import { ReportData, ReportTableProps } from "../tmpl/interface";
 import HcserviceV3 from "../tmpl/hcservice-v3";
-import {useLocale} from "../locale/useLocale";
+import { useLocale } from "../locale/useLocale";
 import ColumnBuilder from "./column/column-builder";
 import ResizableTable from "./resizable-table";
 
-const ReportTable=(props:ReportTableProps)=> {
+const ReportTable = (props: ReportTableProps) => {
 
     const [loading, setLoading] = useState<boolean>(false);
     const [dataSource, setDataSource] = useState<object[]>(undefined);
     const [reportData, setReportData] = useState<ReportData>(undefined);
 
-    const { getServiceLangStr, translate} = useLocale();
-    const {tableProps,columns,queryKey,serverKey,leftFixedCols,hiddenColIds}=props
+    const { getServiceLangStr, translate } = useLocale();
+    const { tableProps, columns, queryKey, serverKey, leftFixedCols, hiddenColIds } = props
 
-    useEffect( () => {
+    useEffect(() => {
         const queryData = async () => {
             if (queryKey) {
-                await loadData(queryKey.key,serverKey);
+                await loadData(queryKey.key, serverKey);
             }
         };
         queryData()
@@ -27,81 +27,81 @@ const ReportTable=(props:ReportTableProps)=> {
 
 
     const loadData = async (
-        queryKey: string,serverKey:string
+        queryKey: string, serverKey: string
     ) => {
         setLoading(true);
         let reportData: ReportData = await HcserviceV3.requestQueryReportData(
-                serverKey,
-                queryKey,getServiceLangStr()
-            );
-            if (reportData?.key != queryKey) {
-                return;
-            } else {
-                let dataSource: object[] = [];
-                if (reportData.entities) {
-                    reportData.entities.forEach((item, index) => {
-                        if (item) {
-                            let row = {
-                                key: item.code,
-                                code: item.code, //增加code,为了删除操作
-                                ...item.fieldMap,
-                                index,
-                            };
-                            dataSource.push(row);
-                        }
-                    });
-                }
-
-                setDataSource(dataSource);
-                setReportData(reportData);
-                setLoading(false);
+            serverKey,
+            queryKey, getServiceLangStr()
+        );
+        if (reportData?.key != queryKey) {
+            return;
+        } else {
+            let dataSource: object[] = [];
+            if (reportData.entities) {
+                reportData.entities.forEach((item, index) => {
+                    if (item) {
+                        let row = {
+                            key: item.code,
+                            code: item.code, //增加code,为了删除操作
+                            ...item.fieldMap,
+                            index,
+                        };
+                        dataSource.push(row);
+                    }
+                });
             }
+
+            setDataSource(dataSource);
+            setReportData(reportData);
+            setLoading(false);
+        }
     }
-    const addColumnOnCell=(current_cols,hiddenColIds:string[])=>{
-        if(!reportData){
+    const addColumnOnCell = (current_cols, hiddenColIds: string[]) => {
+        if (!reportData) {
             return;
         }
-        const {rowGrids}=reportData
+        const { rowGrids } = reportData
         current_cols.forEach((c) => {
             debugger
-            if(rowGrids){
-                c.onCell=(record,index)=>{
-                  let rowGrid= rowGrids[record.code];
-                  if(rowGrid && rowGrid.cellMap){
-                      if(rowGrid.cellMap[c.dataIndex]){
-                        let a=  {
-                          ...rowGrid.cellMap[c.dataIndex]
-                          }
-                          if(a.colSpan>1){
-                              let hiddenDim=0;
-                              if(hiddenColIds){
-                                  debugger
-                                  hiddenColIds.forEach(id=>{
-                                      if(rowGrid.cellMap[id]){
-                                          hiddenDim++;
-                                      }
-                                  })
-                              }
-                              return {colSpan:a.colSpan-hiddenDim,rowSpan:1}
-                          }else{
-                              return  a;
-                          }
-                      }else{
-                          return {colSpan:1,rowSpan:1}
-                      }
-                  }
+            if (rowGrids) {
+                c.onCell = (record, index) => {
+                    let rowGrid = rowGrids[record.code];
+                    if (rowGrid && rowGrid.cellMap) {
+                        if (rowGrid.cellMap[c.dataIndex]) {
+                            let a = {
+                                ...rowGrid.cellMap[c.dataIndex]
+                            }
+                            if (a.colSpan > 1) {
+                                let hiddenDim = 0;
+                                if (hiddenColIds) {
+                                    debugger
+                                    hiddenColIds.forEach(id => {
+                                        if (rowGrid.cellMap[id]) {
+                                            hiddenDim++;
+                                        }
+                                    })
+                                }
+                                return { colSpan: a.colSpan - hiddenDim, rowSpan: 1 }
+                            } else {
+                                return a;
+                            }
+                        } else {
+                            return { colSpan: 1, rowSpan: 1 }
+                        }
+                    }
                 }
             }
         });
     }
 
-    let current_cols=reportData?.columnConfigs?ColumnBuilder.buildReportTableColumns({columnConfigs:[...reportData.columnConfigs],translate,leftFixedCols,hiddenColIds}):columns ;
-        let table_x = 20;
+    let current_cols = reportData?.columnConfigs ? ColumnBuilder.buildReportTableColumns({ columnConfigs: [...reportData.columnConfigs], translate, leftFixedCols, hiddenColIds }) : columns;
+    let table_x = 20;
 
-        current_cols.forEach((c) => {
-            table_x = table_x + (c.width ? c.width : 140);
-        });
-    addColumnOnCell(current_cols,hiddenColIds);
+    current_cols.forEach((c) => {
+        table_x = table_x + (c.width ? c.width : 140);
+    });
+    addColumnOnCell(current_cols, hiddenColIds);
 
     return <ResizableTable
         size={tableProps?.size ? tableProps.size : undefined}
@@ -118,7 +118,7 @@ const ReportTable=(props:ReportTableProps)=> {
         }
         bordered
         pagination={false}
-        style={{ display: columns ? "block" : "none" }}></ResizableTable>
+        style={{ display: columns ? "block" : "none", marginBottom: "12px" }}></ResizableTable>
 }
 
 export default ReportTable;

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

@@ -1333,4 +1333,18 @@ export default class HcserviceV3 {
     return res;
   }
 
+  static async getThemeConfig(serverKey?: string, programCode?: string) {
+    let res = await Super.super({
+      url: "/v3/theme-config",
+      header: { programCode },
+      serverKey,
+      method: "GET",
+    });
+    if (res && res.status === "success") {
+      return res;
+    } else {
+      return null;
+    }
+  }
+
 }

package/src/aldehyde/tmpl/interface.tsx

@@ -90,6 +90,7 @@ export interface QueryTableProps extends ReportTableProps {
   ltmplConfig?: LtmplConfig;
   showView?: (showVievParam: ShowViewParam) => void;
   showPagination?: boolean;
+  onChangeAggregateVO?: (aggregateVO: AggregateVO) => void;
 }
 
 export interface AggregateVO {
@@ -454,6 +455,9 @@ export interface FieldConfig extends FieldBase {
   dateControlShortcutKeys?: string[]; // 时间范围预设配置
   placeholder?: string; // 占位符
   appendCriteria?: CriteriaConfig; // 列查询条件配置
+  dataUnit?: string; // 单位
+  themeColor?: string; // 颜色
+  themeIcon?: string; // Icon
 }
 
 export interface ActionRenderProps {

package/src/aldehyde/tmpl/tmpl-config-analysis.tsx

@@ -400,7 +400,7 @@ TmplConfigAnalysis.buildInDtmplConfig = (
                     }
                 }
                 if (!changedValues) {
-                    return;
+                    continue;
                 }
                 const requireValue = field.requiredRuleCriterias?.some(r => {
                     const id = TmplConfigAnalysis.getFieldId(dtmplConfig, r.mstrucId);

package/src/aldehyde/units/index.tsx

@@ -45,6 +45,8 @@ const CUSTOM_COMPONENT_MAP = {};
 // 主题url vx替换正则
 const regexTheme = /(?<=#\/)vx/g;
 
+let themeConfig = undefined; // 系统配置主题等
+
 // let siderCollapsed:boolean = true;
 
 export default {
@@ -1178,10 +1180,25 @@ export default {
     };
     return themes;
   },
-  toDefaultTheme() {
-    const defTheme = ProgramConfig.getDefaultTheme();
+  toDefaultTheme(defTheme?: string) {
+    const temTheme = defTheme || ProgramConfig.getDefaultTheme();
     const hash = window.location.hash;
-    let newHash = hash.replace(regexTheme, `${defTheme}/home`);
+    let newHash = hash.replace(regexTheme, `${temTheme}/home`);
     window.location.hash = newHash;
-  }
+  },
+  async getThemeConfig(serverKey?: string) {
+    if (themeConfig) {
+      return themeConfig;
+    }
+    const programCode = this.programCode();
+    const server = this.api(serverKey);
+    const { themeConfig: temConfig } = await HcserviceV3.getThemeConfig(serverKey, programCode) || {};
+    const loginMainPicture = temConfig?.loginMainPicture ? this.joinPath(server, `/v3/theme-files/${temConfig?.loginMainPicture}?@programToken=${programCode}`) : null;
+    const programIcon = temConfig?.programIcon ? this.joinPath(server, `/v3/theme-files/${temConfig?.programIcon}?@programToken=${programCode}`) : null;
+    themeConfig = { ...temConfig, loginMainPicture, programIcon };
+    return themeConfig;
+  },
+  getThemeConfigInfo() {
+    return themeConfig;
+  },
 };

package/src/aldehyde/welcome/HCWelcome.js

@@ -298,6 +298,19 @@ const handleMenu = (arr) => {
   });
 }
 
+// 获取菜单的所有子节点
+const getLeafNodes = (tree, result = []) => {
+  if (!tree || !Array.isArray(tree)) return result;
+  tree.forEach(node => {
+    if (!node.children || node.children.length === 0) {
+      result.push(node);
+    } else {
+      getLeafNodes(node.children, result);
+    }
+  });
+  return result;
+}
+
 // 处理图片地址
 const handleImgUrl = (basePath) => {
   if (basePath.startsWith("http")) {
@@ -317,6 +330,7 @@ const HCWelcome = (props) => {
   if (programCode) Units.setProgramCode(programCode);
   const [orgHomeImg, setOrgHomeImg] = useState();
   const [menus, setMenus] = useState([]);
+  const [leafMenus, setLeafMenus] = useState([]);
 
   const initUserConfig = async () => {
     let userInfo = await Units.getCurrentUserInfo();
@@ -336,7 +350,9 @@ const HCWelcome = (props) => {
   const getMenus = async () => {
     const temData = await getMenuConfig(layoutRootPath || "v2");
     const temMenus = handleMenu(temData?.menu || []);
+    const temLeafNodes = getLeafNodes(temMenus);
     setMenus(temMenus);
+    setLeafMenus(temLeafNodes)
   }
 
   useEffect(() => {
@@ -349,7 +365,7 @@ const HCWelcome = (props) => {
       <div style={{ width: "100%", paddingTop: "12px" }} >
         <Row gutter={[0]}>
           <Col span={24}>
-            <Workbench layoutRootPath={layoutRootPath} menus={menus[0]?.children || []} />
+            <Workbench layoutRootPath={layoutRootPath} menus={leafMenus || []} />
           </Col>
           <Col span={24}>
             <Row gutter={16}>

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

@@ -19,6 +19,10 @@ const findNthLeaf = (tree, n = 1) => {
     let count = 0; // 已找到的叶子数量（从 0 开始计）
     const dfs = (nodes) => {
         for (const node of nodes) {
+            // 检查当前节点是否为大屏或者自定义页面
+            if (node.dragDropPageId || node.customPath) {
+                continue; // 跳过被排除的节点及其子树
+            }
             const isLeaf = !node.children || node.children.length === 0;
             if (isLeaf) {
                 count++;

package/src/aldehyde/welcome/components/workbench.tsx

@@ -34,7 +34,7 @@ const Workbench = (props: WorkbenchProps) => {
     let temData: Level2Menu[] = await HCDataSource.fastMenu("QuickPanel");
     let temMenu: MenuType[] = [];
     if (!temData?.length) {
-      temMenu = menus?.slice(0, 4) || [];
+      temMenu = menus.filter(r => !r.dragDropPageId && !r.customPath)?.slice(0, 4) || []
     } else {
       temData.forEach(item => {
         const { id, pageType, defaultCriteriaValue, customPath, dragDropPageId, fullScreen } = item;