aldehyde 0.2.493 → 0.2.495

package/src/aldehyde/routable/dtmpl-route.tsx

@@ -67,6 +67,12 @@ class DtmplRoute extends React.Component<DtmplRouteProps, DtmplRoutePropsStat> {
     return menuId;
   };
 
+  getServerKey = () => { // 获取serverKey
+    const { searchParams } = this.props;
+    let serverKey = searchParams.get("serverKey");
+    return serverKey || null;
+  };
+
   getCodeSource = () => {
     const { searchParams } = this.props;
     // let params=Units.transQueryStrToParams(location.search);
@@ -84,16 +90,15 @@ class DtmplRoute extends React.Component<DtmplRouteProps, DtmplRoutePropsStat> {
   };
 
   goNavigatel = () => {
-    this.props.navigate(window.location.hash.replace("#/","/"));
+    this.props.navigate(window.location.hash.replace("#/", "/"));
     //.reload();
   };
 
   goDtmpl = (code: string) => {
     const { sourceId } = this.props.params;
     const { basePath } = this.props;
-    let url = `${basePath}${
-      this.computedLayoutPath
-    }/${sourceId}/detail-edit?menuId=${this.getMenuId()}`;
+    let url = `${basePath}${this.computedLayoutPath
+      }/${sourceId}/detail-edit?menuId=${this.getMenuId()}`;
     if (code) {
       url = url + `&code=${code}`;
     }
@@ -130,6 +135,7 @@ class DtmplRoute extends React.Component<DtmplRouteProps, DtmplRoutePropsStat> {
   render() {
     const { location, params, searchParams } = this.props;
     const { sourceId } = params;
+    const serverKey = this.getServerKey();
 
     const { codeSource } = this.state;
     if (!location) {
@@ -143,8 +149,8 @@ class DtmplRoute extends React.Component<DtmplRouteProps, DtmplRoutePropsStat> {
     let versionId = params["versionId"];
     if (location.pathname.endsWith("detail-view")) {
       return (
-        <TabActDtmplView key={sourceId+code+versionId}
-          serverKey={null}
+        <TabActDtmplView key={sourceId + code + versionId}
+          serverKey={serverKey}
           goBackToLtmpl={codeSource ? undefined : this.goBackToLtmpl}
           goDtmpl={this.goDtmpl}
           sourceId={sourceId}
@@ -155,9 +161,9 @@ class DtmplRoute extends React.Component<DtmplRouteProps, DtmplRoutePropsStat> {
       );
     } else {
       return (
-        <DtmplEdit key={sourceId+code+versionId}
+        <DtmplEdit key={sourceId + code + versionId}
           addTmplId={searchParams.get("addTmplId")}
-          serverKey={null}
+          serverKey={serverKey}
           addOrUpdate={this.getMode()}
           sourceId={sourceId}
           code={code}

package/src/aldehyde/routable/import-route.tsx

@@ -2,13 +2,12 @@ import React from "react";
 import { RouterCompProps } from "../tmpl/interface";
 import ExcelImport from "../import/excel-import";
 import withRouter from "./withroute";
-import Units from "../units";
 
 export interface ImportRouteProps extends RouterCompProps {
   serverKey?: string;
   layoutRootPath?: string;
 }
-interface ImportRouteStat {}
+interface ImportRouteStat { }
 
 class ExcelImportRoute extends React.PureComponent<
   ImportRouteProps,
@@ -16,7 +15,7 @@ class ExcelImportRoute extends React.PureComponent<
 > {
   state = {};
 
-  async componentDidMount() {}
+  async componentDidMount() { }
 
   get computedLayoutPath() {
     const { layoutRootPath } = this.props;
@@ -24,11 +23,19 @@ class ExcelImportRoute extends React.PureComponent<
     return "";
   }
 
+  getServerKey = () => { // 获取serverKey
+    const { searchParams, serverKey } = this.props;
+    if (serverKey) return serverKey;
+    let temServerKey = searchParams.get("serverKey");
+    return temServerKey || null;
+  };
+
   render() {
-    const { params, serverKey } = this.props;
+    const { params } = this.props;
     const { sourceId } = params;
+    const serverKey = this.getServerKey();
     return (
-      <ExcelImport key={"excelimport"+sourceId} serverKey={serverKey} sourceId={sourceId}></ExcelImport>
+      <ExcelImport key={"excelimport" + sourceId} serverKey={serverKey} sourceId={sourceId}></ExcelImport>
     );
   }
 }

package/src/aldehyde/routable/ltmpl-route.tsx

@@ -137,6 +137,12 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
         return menuId;
     };
 
+    getServerKey = () => { // 获取serverKey
+        const { searchParams } = this.props;
+        let serverKey = searchParams.get("serverKey");
+        return serverKey || null;
+    };
+
     doClose = () => {
         this.setState(
             {
@@ -155,10 +161,8 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
     loadData = async () => {
         const { params } = this.props;
         const { sourceId } = params;
-        let ltmplConfigRes: LtmplConfigRes = await HCDataSource.requestLtmplConfig(
-            null,
-            sourceId
-        );
+        const serverKey = this.getServerKey();
+        let ltmplConfigRes: LtmplConfigRes = await HCDataSource.requestLtmplConfig(serverKey, sourceId);
         this.setState({ ltmplConfigRes: ltmplConfigRes });
     };
 
@@ -399,6 +403,7 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
         } = this.state;
         const { location, params, tableType, rowOperatable, defShowType } = this.props;
         const { sourceId } = params;
+        const serverKey = this.getServerKey();
         const { translate } = this.context;
         //let menuId = undefined;
         let mainCode = undefined;
@@ -435,7 +440,7 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
             return (
                 <>
                     <ActTable key={"acttable" + sourceId}
-                        tableType={tableType} serverKey={null} pageSize={pageSize} pageNo={pageNo} onChangePage={this.onChangePage}
+                        tableType={tableType} serverKey={serverKey} pageSize={pageSize} pageNo={pageNo} onChangePage={this.onChangePage}
                         menuId={this.getMenuId()} operatable={rowOperatable}
                         mainCode={mainCode} showView={this.showView} doSearch={this.onChangeSearch} doEdit={this.doEdit}
                         doCreate={this.doCreate} sourceId={sourceId}
@@ -459,14 +464,14 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
                             }
                             styles={{ body: { minWidth: "720px" } }}
                         >
-                            <LtmplTable serverKey={null} sourceId={ractionId} mainCode={selectedCode} />
+                            <LtmplTable serverKey={serverKey} sourceId={ractionId} mainCode={selectedCode} />
                         </Drawer>
                     ) : null}
                     {showViewDrawer && selectedCode ? (
                         toCustomPage && ltmplConfig.customViewPagePath ? <CustomDetailModalPage width={1000} minHeight="70vh" mainCode={mainCode} sourceId={sourceId} code={selectedCode} open={showViewDrawer} customPath={ltmplConfig.customViewPagePath} onCancel={this.doClose} />
                             :
                             <DtmplViewDrawer
-                                serverKey={null} placement={ltmplConfig?.buttonViewConfig?.windowPosition}
+                                serverKey={serverKey} placement={ltmplConfig?.buttonViewConfig?.windowPosition}
                                 width={windowWidth}
                                 height={windowHeight}
                                 onClose={this.doClose}
@@ -479,7 +484,7 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
                         toCustomPage && ltmplConfig.customViewPagePath ? <CustomDetailModalPage width={1000} minHeight="70vh" mainCode={mainCode} sourceId={sourceId} code={selectedCode} open={showViewModal} customPath={ltmplConfig.customViewPagePath} onCancel={this.doClose} />
                             :
                             <DtmplViewModal
-                                serverKey={null} width={windowWidth} height={windowHeight} onClose={this.doClose}
+                                serverKey={serverKey} width={windowWidth} height={windowHeight} onClose={this.doClose}
                                 open={showViewModal} sourceId={viewSourceId ? viewSourceId : sourceId}
                                 code={selectedCode}
                             />
@@ -500,7 +505,7 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
                         ) : (
                             <DtmplEditPage
                                 defaultDtmplData={ltmplConfig.defaultDtmplData}
-                                serverKey={null}
+                                serverKey={serverKey}
                                 pageType={showWindowType == "modal" ? "modal" : "drawer"}
                                 placement={ltmplConfig?.buttonEditConfig?.windowPosition}
                                 open={showEdit}

package/src/aldehyde/routable/splitview-ltmpl-route.tsx

@@ -49,15 +49,16 @@ const Index = (props: Props) => {
     const navigate = useNavigate();
     const computedLayoutPath = layoutRootPath !== undefined ? `/${layoutRootPath}` : "";
 
-    const { mainCode, menuId } = useMemo(() => {
+    const { mainCode, menuId, serverKey } = useMemo(() => {
         const temParams = new URLSearchParams(search);
         const mainCode = temParams.get("mainCode");
         const menuId = temParams.get("menuId");
-        return { mainCode, menuId }
+        const serverKey = temParams.get("serverKey") || null;
+        return { mainCode, menuId, serverKey }
     }, [search])
 
     const getLtmplConfig = async () => {
-        const ltmplConfigRes: LtmplConfigRes = await HCDataSource.requestLtmplConfig(null, sourceId);
+        const ltmplConfigRes: LtmplConfigRes = await HCDataSource.requestLtmplConfig(serverKey, sourceId);
         const ltmplConfig = ltmplConfigRes?.ltmplConfig;
         setLtmplConfig(ltmplConfig);
         setSplitterSize(`${ltmplConfig?.rightPercent || 50}%`);
@@ -224,7 +225,7 @@ const Index = (props: Props) => {
             return <></>;
         }
         return <ActTable key={"acttable" + sourceId}
-            tableType={tableType} serverKey={null} pageSize={pageSize} pageNo={pageInfo?.pageNo} onChangePage={onChangePage}
+            tableType={tableType} serverKey={serverKey} pageSize={pageSize} pageNo={pageInfo?.pageNo} onChangePage={onChangePage}
             menuId={menuId} operatable={rowOperatable}
             mainCode={mainCode} showView={onShowView} doSearch={onChangeSearch} doEdit={doEdit}
             doCreate={doCreate} sourceId={sourceId}
@@ -299,6 +300,7 @@ const Index = (props: Props) => {
                             isReset={false}
                             onOk={() => doSearch({ serial_number: new Date().getTime() })}
                             isCopy={isCopy}
+                            serverKey={serverKey}
                         />
                         : null}
                     {showView && selectedCode && showWindowType === "default" ?
@@ -306,6 +308,7 @@ const Index = (props: Props) => {
                             mainCode={mainCode}
                             sourceId={sourceId}
                             code={selectedCode}
+                            serverKey={serverKey}
                         />
                         : null}
                 </Splitter.Panel>
@@ -323,14 +326,14 @@ const Index = (props: Props) => {
                     </Space>
                 }
             >
-                <LtmplTable serverKey={null} sourceId={ractionId} mainCode={selectedCode} />
+                <LtmplTable serverKey={serverKey} sourceId={ractionId} mainCode={selectedCode} />
             </Drawer>
         ) : null}
         {showView && showWindowType === "drawer" && selectedCode ? (
             toCustomPage && ltmplConfig?.customViewPagePath ? <CustomDetailModalPage width={1000} minHeight="70vh" mainCode={mainCode} sourceId={sourceId} code={selectedCode} open={showView} customPath={ltmplConfig?.customViewPagePath} onCancel={doClose} />
                 :
                 <DtmplViewDrawer
-                    serverKey={null} placement={ltmplConfig?.buttonViewConfig?.windowPosition}
+                    serverKey={serverKey} placement={ltmplConfig?.buttonViewConfig?.windowPosition}
                     width={windowSize.width}
                     height={windowSize.height}
                     onClose={doClose}
@@ -343,7 +346,7 @@ const Index = (props: Props) => {
             toCustomPage && ltmplConfig?.customViewPagePath ? <CustomDetailModalPage width={1000} minHeight="70vh" mainCode={mainCode} sourceId={sourceId} code={selectedCode} open={showView} customPath={ltmplConfig?.customViewPagePath} onCancel={doClose} />
                 :
                 <DtmplViewModal
-                    serverKey={null} width={windowSize.width} height={windowSize.height} onClose={doClose}
+                    serverKey={serverKey} width={windowSize.width} height={windowSize.height} onClose={doClose}
                     open={showView} sourceId={viewSourceId ? viewSourceId : sourceId}
                     code={selectedCode}
                 />
@@ -362,7 +365,7 @@ const Index = (props: Props) => {
             ) : (
                 <DtmplEditPage
                     defaultDtmplData={ltmplConfig?.defaultDtmplData}
-                    serverKey={null}
+                    serverKey={serverKey}
                     pageType={showWindowType === "modal" ? "modal" : "drawer"}
                     placement={ltmplConfig?.buttonEditConfig?.windowPosition}
                     open={showEdit}

package/src/aldehyde/routable/ttmpl-route.tsx

@@ -6,10 +6,10 @@ import {
 import HCDataSource from "../tmpl/hc-data-source";
 import withRouter from "../routable/withroute";
 import ActTree from "../tree/act-tree";
-import {Card, message} from "antd";
+import { Card, message } from "antd";
 export interface TtmplRouteProps extends RouterCompProps {
   layoutRootPath?: string;
-  treeTop?:number,
+  treeTop?: number,
 }
 
 export interface TtmplRouteState {
@@ -44,13 +44,17 @@ class TtmplRoute extends React.PureComponent<TtmplRouteProps, TtmplRouteState> {
     return menuId;
   };
 
+  getServerKey = () => { // 获取serverKey
+    const { searchParams } = this.props;
+    let serverKey = searchParams.get("serverKey");
+    return serverKey || null;
+  };
+
   loadData = async () => {
     const { params } = this.props;
     const { sourceId } = params;
-    let ttmplConfig: TtmplConfig = await HCDataSource.requestTtmplConfig(
-      null,
-      sourceId
-    );
+    const serverKey = this.getServerKey();
+    let ttmplConfig: TtmplConfig = await HCDataSource.requestTtmplConfig(serverKey, sourceId);
     // debugger;
     if (ttmplConfig.type == "1M") {//此处待优化。不建议支持
       message.error("不支持的配置树。请联系管理员！")
@@ -76,14 +80,15 @@ class TtmplRoute extends React.PureComponent<TtmplRouteProps, TtmplRouteState> {
   }
 
   render() {
-    const {treeTop} = this.props;
+    const { treeTop } = this.props;
     const { ttmplConfig } = this.state;
+    const serverKey = this.getServerKey();
     if (!ttmplConfig) {
       return <Card loading={true}></Card>;
     } else {
       return (
         <>
-          <ActTree key={ttmplConfig.sourceId} top={treeTop} ttmplConfig={ttmplConfig}></ActTree>
+          <ActTree key={ttmplConfig.sourceId} top={treeTop} ttmplConfig={ttmplConfig} serverKey={serverKey}></ActTree>
         </>
       );
     }

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

@@ -1,12 +1,13 @@
 import React, { ReactNode } from "react";
 import {
   Button, Card, Checkbox, Col, Divider, Popover, Row, Space, Drawer, Tooltip,
-  message, Layout, Table, Form as AntdForm, FormInstance, Modal, Input, Alert, Tabs, Radio, Typography
+  message, Layout, Table, Form as AntdForm, FormInstance, Modal, Input, Alert, Tabs, Radio, Typography,
+  Dropdown
 } from "antd";
 import {
   ExportOutlined, FundOutlined, LineChartOutlined,
   PlusCircleOutlined, PlusOutlined, ReloadOutlined, RetweetOutlined, SearchOutlined,
-  TableOutlined, ImportOutlined, AppstoreAddOutlined
+  TableOutlined, ImportOutlined, AppstoreAddOutlined, PlusSquareOutlined, DeleteOutlined
 } from "@ant-design/icons";
 import _ from "lodash";
 import "./index.css";
@@ -1017,6 +1018,19 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     setUserPageConfig({ ...val, criteriaData: undefined });
   }
 
+  // 更新多表格数量及缓存
+  editRowTableNum = (type: "add" | "delete") => {
+    const { ltmplConfig, setUserPageConfig, userPageConfig } = this.props;
+    const { rowTableNumber, rowTableCondig } = userPageConfig || {};
+    let { defTableSize } = ltmplConfig;
+    const temNum = (rowTableNumber || defTableSize || 0) + (type === "add" ? 1 : -1);
+    if (setUserPageConfig) {
+      const temRowTableCondig = (type === "delete" && rowTableCondig) ? rowTableCondig.slice(0, -1) : rowTableCondig;
+      setUserPageConfig({ rowTableNumber: temNum, rowTableCondig: temRowTableCondig }); // 缓存多表格数量
+    }
+  }
+
+  // 渲染顶部操作栏
   renderHeaderButtons = () => {
     let {
       hiddenColIds, viewModels, sortedColConfigs, disabledColIds, showL2Chart,
@@ -1027,7 +1041,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       funcMode, customCreatable, serverKey, readOnly, userPageConfig, allowUserConfig, showTableAdd
     } = this.props;
     const { translate } = this.context;
-    let { buttons, defTableSize } = ltmplConfig;
+    let { buttons } = ltmplConfig;
     const version = localStorage.getItem("version") || "";
 
     return (
@@ -1035,9 +1049,14 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         <Space>
           {userPageConfig && allowUserConfig ? <PageConfigButton menuCode={menuId} handleResetUserPageConfig={this.handleResetUserPageConfig} handleUpdateUserPageConfig={this.handleUpdateUserPageConfig} userCriteriaData={userCriteriaData} /> : ""}
           {(showTableAdd !== false && buttons.includes("showTableAdd")) ?
-            <Tooltip title={translate("${添加列表}")}>
-              <Button onClick={() => this.setState((prevState) => ({ tableNumber: (prevState.tableNumber || defTableSize) + 1 }))}><AppstoreAddOutlined /></Button>
-            </Tooltip> : ""}
+            <Dropdown styles={{ item: { padding: 0 } }} menu={{
+              items: [
+                { key: "add", label: <Button type="text" onClick={() => this.editRowTableNum("add")}><PlusSquareOutlined />{translate("${添加列表}")}</Button> },
+                { key: "delete", label: <Button type="text" disabled={(userPageConfig?.rowTableNumber || 0) <= 1} onClick={() => this.editRowTableNum("delete")}><DeleteOutlined />{translate("${删除列表}")}</Button> }]
+            }} arrow>
+              <Button><AppstoreAddOutlined /></Button>
+            </Dropdown>
+            : ""}
           {funcMode == "common" && this.criteriaFormUseful() ? (
             <Popover trigger="click" content={this.renderCriteriaForm()}>
               <Button>
@@ -1526,14 +1545,14 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   renderContent = () => {
     let {
       queryKey, loading, selectedRows, hiddenRowCodes, viewModels, sortedColConfigs, hiddenColIds, showL2ActTable,
-      pageInfo, editings, userCriteriaData, tabsOptions, tabActiveKey, pageSizeOptions, tableNumber
+      pageInfo, editings, userCriteriaData, tabsOptions, tabActiveKey, pageSizeOptions
     } = this.state;
     let {
       mainCode, sourceId, ltmplConfig, funcMode, operatable,
       title, collapsible,
       onChangePage, serverKey, criteriaData, showEmpty, loadDataCallback,
       showView, doEdit, doRAction, customEditable, readOnly, tableType, showPagination, showAggregates, userPageConfig,
-      doEdit2D, doView2D, showTableAdd
+      doEdit2D, doView2D, showTableAdd, setUserPageConfig
     } = this.props;
     const { translate } = this.context;
 
@@ -1707,7 +1726,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                 )}
               </Col>
             </Row> : null}
-          {(showTableAdd !== false && buttons.includes("showTableAdd")) ? <RowTable mainTable={renderTable} ltmplConfig={ltmplConfig} tableNumber={tableNumber} sourceId={sourceId} /> : renderTable}
+          {(showTableAdd !== false && buttons.includes("showTableAdd")) ? <RowTable mainTable={renderTable} ltmplConfig={ltmplConfig} tableNumber={userPageConfig?.rowTableNumber} sourceId={sourceId} rowTableCondig={userPageConfig?.rowTableCondig || []} setUserPageConfig={setUserPageConfig} /> : renderTable}
           {/*此处放页脚*/}
           {ltmplConfig.footer ? (
             <div

package/src/aldehyde/table/page-chart.tsx

@@ -132,7 +132,7 @@ const Index = memo((props: Props) => {
                 total[`c_${item.sourceId}`] = criteriaData[`c_${item.sourceId}`];
             }
             return total;
-        }, {});
+        }, { pageSize: 8640 }); // 10秒一个数据，24小时数据量
     }, [criteriaData]);
 
     useEffect(() => {

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

@@ -1,5 +1,6 @@
 import React, { ReactElement, memo } from "react";
-import { Row, Col } from "antd";
+import { Row, Col, Card } from "antd";
+import _ from "lodash";
 import { LtmplConfig } from "../tmpl/interface";
 import { LtmplTable } from "../index";
 
@@ -8,15 +9,37 @@ interface Props {
     ltmplConfig: LtmplConfig;
     tableNumber: number; // 表格数量
     sourceId: string;
+    rowTableCondig?: { [key: string]: any }[];
+    setUserPageConfig?: (config: { [key: string]: any }) => void; // 更新用户页面配置本地缓存
 }
 
 const Index = memo((props: Props) => {
-    const { mainTable, ltmplConfig, tableNumber, sourceId } = props;
-    const showTableNum = (tableNumber || ltmplConfig.defTableSize || 1) - 1;
+    const { mainTable, ltmplConfig, tableNumber, sourceId, rowTableCondig, setUserPageConfig } = props;
+    const { defTableSize, singleTableSpan } = ltmplConfig;
+    const showTableNum = (tableNumber || defTableSize || 1) - 1;
 
-    return <Row>
-        <Col span={24}>{mainTable}</Col>
-        {Array(showTableNum).fill(1).map((_, index) => <Col span={24} key={index}></Col>)}
+    // 处理缓存
+    const handleUserPageConfig = (val: { [key: string]: any }, index: number) => {
+        if (!setUserPageConfig) {
+            return;
+        }
+        const temConfig = _.cloneDeep(rowTableCondig);
+        temConfig[index] = { ...temConfig[index], ...val };
+        setUserPageConfig({ rowTableCondig: temConfig });
+    }
+
+    return <Row gutter={12}>
+        <Col span={singleTableSpan || 24}>
+            <Card styles={{ body: { padding: 12 } }}>
+                {mainTable}
+            </Card>
+        </Col>
+        {Array(showTableNum).fill(1).map((_, index) =>
+            <Col span={singleTableSpan || 24} key={index}>
+                <Card styles={{ body: { padding: 12 } }}>
+                    <LtmplTable funcMode="search" sourceId={sourceId} userPageConfig={rowTableCondig?.[index]} setUserPageConfig={val => handleUserPageConfig(val, index)} />
+                </Card>
+            </Col>)}
     </Row>;
 });
 

package/src/aldehyde/tmpl/interface.tsx

@@ -912,6 +912,7 @@ export interface BlockType {
   icon?: string;
   themeColor?: string;
   funcDescription?: string;
+  targetProgram?: string; // 跨项目菜单 programCode
 }
 
 export interface ThemeConfig {

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

@@ -1,5 +1,5 @@
 import React from "react";
-import { Card, Layout, Typography } from "antd";
+import { Card, Layout } from "antd";
 import TmplTree from "./tmpl-tree";
 import TreeUtils, { TtmplNodeConfig } from "./tree-utils";
 import { TtmplConfig } from "../tmpl/interface";
@@ -8,11 +8,11 @@ import HcserviceV3 from "../tmpl/hcservice-v3";
 import { LocaleContext } from "../locale/LocaleProvider";
 
 const { Content, Sider } = Layout;
-const { Text, Title } = Typography;
 
 interface ActTreeProps {
   ttmplConfig: TtmplConfig;
-  top: number,
+  top: number;
+  serverKey?: string;
 }
 
 interface ActTreeState {
@@ -51,8 +51,8 @@ export default class ActTree extends React.PureComponent<
   }
 
   loadData = async () => {
-    const { ttmplConfig } = this.props;
-    let ttmplNodeConfig = await TreeUtils.initTtmplNodeConfig(ttmplConfig);
+    const { ttmplConfig, serverKey } = this.props;
+    let ttmplNodeConfig = await TreeUtils.initTtmplNodeConfig(ttmplConfig, serverKey);
     this.setState({
       ttmplNodeConfig,
       showEdit: false,
@@ -138,7 +138,7 @@ export default class ActTree extends React.PureComponent<
   };
 
   render() {
-    const { top } = this.props;
+    const { top, serverKey } = this.props;
     const { translate, siderCollapsed } = this.context;
 
 
@@ -200,6 +200,7 @@ export default class ActTree extends React.PureComponent<
                   let a = this.refTmplTree.current?.reloadData(mainCode, recordCode);
                   this.setState({ recordCode });
                 }}
+                serverKey={serverKey}
               />
             ) : null}
             {showView ? (
@@ -207,6 +208,7 @@ export default class ActTree extends React.PureComponent<
                 mainCode={mainCode}
                 sourceId={sourceId}
                 code={recordCode}
+                serverKey={serverKey}
               />
             ) : null}
           </Content>

package/src/aldehyde/tree/tree-utils.tsx

@@ -25,26 +25,26 @@ export interface TreeDataNode extends DataNode {
 
 export default class TreeUtils {
 
-    static initTtmplNodeConfig = async (config: TtmplConfig) => {
+    static initTtmplNodeConfig = async (config: TtmplConfig, serverKey?: string) => {
 
         if (!config) {
             return null;
         }
         let ttmplNodeConfig: TtmplNodeConfig = { ...config }
         if (ttmplNodeConfig.rootGtmplId) {
-            let res: LtmplConfigRes = await HCDataSource.requestLtmplConfig(null, ttmplNodeConfig.rootGtmplId);
+            let res: LtmplConfigRes = await HCDataSource.requestLtmplConfig(serverKey || null, ttmplNodeConfig.rootGtmplId);
             let rootLTmplConfig: LtmplConfig = res.ltmplConfig;
             ttmplNodeConfig.rootLTmplConfig = rootLTmplConfig;
             ttmplNodeConfig.rootTitleId = rootLTmplConfig.extDisplayConfig.primaryColumn?.id;
         }
         if (ttmplNodeConfig.branchRatmplId) {
-            let res: LtmplConfigRes = await HCDataSource.requestLtmplConfig(null, ttmplNodeConfig.branchRatmplId);
+            let res: LtmplConfigRes = await HCDataSource.requestLtmplConfig(serverKey || null, ttmplNodeConfig.branchRatmplId);
             let branchLTmplConfig: LtmplConfig = res.ltmplConfig;
             ttmplNodeConfig.branchLTmplConfig = branchLTmplConfig;
             ttmplNodeConfig.branchTitleId = branchLTmplConfig.extDisplayConfig.primaryColumn?.id;
         }
         if (ttmplNodeConfig.leafRatmplId) {
-            let res: LtmplConfigRes = await HCDataSource.requestLtmplConfig(null, ttmplNodeConfig.leafRatmplId);
+            let res: LtmplConfigRes = await HCDataSource.requestLtmplConfig(serverKey || null, ttmplNodeConfig.leafRatmplId);
             let leafLTmplConfig: LtmplConfig = res.ltmplConfig;
             ttmplNodeConfig.leafLTmplConfig = leafLTmplConfig;
             ttmplNodeConfig.leafTitleId = leafLTmplConfig.extDisplayConfig.primaryColumn?.id;

package/src/aldehyde/units/index.tsx

@@ -52,6 +52,8 @@ const pageConfigCommons = {}; // 用户页面自定义配置
 
 let components2DMap = {}; // 2D图形组件
 
+let Cross_Project_Code = {}; // 跨项目编码
+
 // let siderCollapsed:boolean = true;
 
 export default {
@@ -229,8 +231,8 @@ export default {
   },
   programCode(key?: string) {
     let programCode = null;
-    if (key) {
-      programCode = window.localStorage.getItem(key + "programCode");
+    if (key) { // 存在key时优先从本地缓存获取是否是跨项目的菜单
+      programCode = this.getCrossProjectCode(key) || window.localStorage.getItem(key + "programCode");
       if (!programCode && key === "localDevopsServer") { // 2D图图片上传模型，配置为空则使用默认值
         programCode = "282877560559017986";
       }
@@ -297,7 +299,7 @@ export default {
   },
   api(key?: string) {
     let appi = null;
-    if (key) {
+    if (key && !key.startsWith("cp_")) { // 跨项目菜单的api走原来配置
       appi = window.localStorage.getItem(key + "hydrocarbonServer");
     } else {
       appi = window.localStorage.getItem(
@@ -1363,5 +1365,11 @@ export default {
     }
     const item = Object.values(components2DMap).flat(Infinity).find((r: any) => r.type === type);
     return item;
+  },
+  setCrossProjectCode(codes: { [key: string]: string }) { // 设置全局跨项目code 
+    Cross_Project_Code = codes;
+  },
+  getCrossProjectCode(sourceId: string) { // 获取全局跨项目code
+    return Cross_Project_Code[sourceId];
   }
 };