aldehyde 0.2.52 → 0.2.53

package/src/aldehyde/login/context-setter.tsx

@@ -8,6 +8,7 @@ import withRouter from "../routable/withroute";
 //以列表为入口的，页面内列表，基本原则是所有交互在页面内完成，不会触发路由。
 
 export interface ContextSetterProps {
+    serverKey:string,
     // match:any,
 };
 
@@ -73,6 +74,7 @@ class ContextSetter extends React.PureComponent<ContextSetterProps, ContextSette
 
     render() {
         const {config,loading,context}=this.state;
+        const {serverKey}=this.props;
         return <Modal title="全局配置" closable={false} open={true} footer={[]}>
             <Row  justify="center" align="middle" >
                 <Col>
@@ -93,7 +95,7 @@ class ContextSetter extends React.PureComponent<ContextSetterProps, ContextSette
                             return <Form.Item
                                 name={c.id} initialValue={initialValue} rules={[{required: true, message: '请选择' + c.title}]}
                             >
-                                <EntryControl id={'14'}
+                                <EntryControl serverKey={serverKey} id={'14'}
                                               fieldConfig={{
                                                   id: c.groupId,
                                                   title: c.title,

package/src/aldehyde/module/dtmpl-edit-card.tsx

@@ -1,5 +1,5 @@
 import React, {ReactNode} from 'react';
-import {Button, Drawer, FormInstance, Modal, Popconfirm, Space,Card} from 'antd'
+import {Button, FormInstance, Space,Card} from 'antd'
 import {DtmplBaseProps, DtmplConfig, DtmplData, PageType} from "../tmpl/interface";
 import DtmplForm from '../form/dtmpl-form';
 import HCDataSource from "../tmpl/hc-data-source";
@@ -63,15 +63,15 @@ export default class DtmplEditCard extends React.PureComponent<DtmplEditCardProp
     }
 
     loadConfigData = async () => {
-        const { sourceId,code} = this.props;
+        const { sourceId,code,serverKey} = this.props;
         this.setState({
             loading: true,
         })
         let dtmplConfig=undefined;
         if(code){
-            dtmplConfig = await HCDataSource.requestDtmplConfig(sourceId);
+            dtmplConfig = await HCDataSource.requestDtmplConfig(serverKey,sourceId);
         }else{
-            dtmplConfig = await HCDataSource.requestAddDtmplConfig(sourceId);
+            dtmplConfig = await HCDataSource.requestAddDtmplConfig(serverKey,sourceId);
         }
 
         if(dtmplConfig.authSaveInterval && dtmplConfig.authSaveInterval>0){
@@ -96,12 +96,12 @@ export default class DtmplEditCard extends React.PureComponent<DtmplEditCardProp
     }
 
     loadData = async (dtmplConfig:DtmplConfig ) => {
-        const { sourceId, code,defaultDtmplData} = this.props;
+        const { sourceId, code,defaultDtmplData,serverKey} = this.props;
         if (code) {
             this.setState({
                 loading: true,
             })
-            const dtmplData_ = await HcserviceV3.requestDtmplData( sourceId, code, null);
+            const dtmplData_ = await HcserviceV3.requestDtmplData(serverKey, sourceId, code, null);
             this.setState({
                 dtmplData:dtmplData_,
                 id:code,
@@ -143,6 +143,7 @@ export default class DtmplEditCard extends React.PureComponent<DtmplEditCardProp
     }
 
     getFooter = () => {
+        const {serverKey}=this.props;
         const {dtmplData,serial}=this.state;
         const footerButtons = [];
         footerButtons.unshift(
@@ -153,14 +154,14 @@ export default class DtmplEditCard extends React.PureComponent<DtmplEditCardProp
         //处理action
         if (dtmplConfig) {
             dtmplConfig.actions.forEach((ac, index) => {
-                footerButtons.unshift(<Action iconType={'icon-title'} hiddenType={'disabled'}  serial={serial} key={ac.id}  formRef={this.formRef} actionConfig={ac}  doAction={this.doSubmit}></Action>);
+                footerButtons.unshift(<Action serverKey={serverKey} iconType={'icon-title'} hiddenType={'disabled'}  serial={serial} key={ac.id}  formRef={this.formRef} actionConfig={ac}  doAction={this.doSubmit}></Action>);
             })
         }
         return footerButtons;
     }
 
     render() {
-        const { onOk, sourceId,mainCode,style,maxColsOnRow,title} = this.props
+        const { onOk, sourceId,mainCode,style,maxColsOnRow,title,serverKey} = this.props
         const {dtmplConfig,id,dtmplData} = this.state;
 
         return (<>
@@ -173,7 +174,7 @@ export default class DtmplEditCard extends React.PureComponent<DtmplEditCardProp
                     <Space>{this.getFooter()}</Space>
                 }
             >
-                <DtmplForm showHeader={false} mainCode={mainCode} parentId={id} dtmplConfig={dtmplConfig} formRef={this.formRef} sourceId={sourceId}
+                <DtmplForm serverKey={serverKey} showHeader={false} mainCode={mainCode} parentId={id} dtmplConfig={dtmplConfig} formRef={this.formRef} sourceId={sourceId}
                            onFinish={onOk}   maxColsOnRow={maxColsOnRow}
                            showConfirm={false} dtmplData={dtmplData} onValuesChange={this.onValuesChange} />
             </Card>

package/src/aldehyde/module/dtmpl-edit-drawer.tsx

@@ -18,7 +18,7 @@ interface DtmplEditDrawerState {
 export default class DtmplEditDrawer extends React.PureComponent<DtmplEditDrawerProps, DtmplEditDrawerState> {
 
     render() {
-        return <DtmplEditPage pageType={'drawer'} {...this.props}></DtmplEditPage>
+        return <DtmplEditPage  pageType={'drawer'} {...this.props}></DtmplEditPage>
     }
 
 }

package/src/aldehyde/module/dtmpl-edit-page.tsx

@@ -81,15 +81,15 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
     }
 
     loadConfigData = async () => {
-        const { sourceId,open,code} = this.props;
+        const { sourceId,open,code,serverKey} = this.props;
         this.setState({
             loading: true,
         })
         let dtmplConfig=undefined;
         if(code){
-            dtmplConfig = await HCDataSource.requestDtmplConfig(sourceId);
+            dtmplConfig = await HCDataSource.requestDtmplConfig(serverKey,sourceId);
         }else{
-            dtmplConfig = await HCDataSource.requestAddDtmplConfig(sourceId);
+            dtmplConfig = await HCDataSource.requestAddDtmplConfig(serverKey,sourceId);
         }
 
         if(dtmplConfig.authSaveInterval && dtmplConfig.authSaveInterval>0){
@@ -114,7 +114,7 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
     }
 
     loadData = async (dtmplConfig:DtmplConfig ) => {
-        const { sourceId, code,defaultDtmplData,open} = this.props;
+        const { sourceId, code,defaultDtmplData,open,serverKey} = this.props;
         if(!open){
             return;
         }
@@ -122,7 +122,7 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
             this.setState({
                 loading: true,
             })
-            const dtmplData_ = await HcserviceV3.requestDtmplData( sourceId, code, null);
+            const dtmplData_ = await HcserviceV3.requestDtmplData(serverKey, sourceId, code, null);
             this.setState({
                 dtmplData:dtmplData_,
                 id:code,
@@ -164,7 +164,7 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
     }
 
     getFooter = () => {
-        const {onCancel} = this.props
+        const {onCancel,serverKey} = this.props
         const {dtmplData,serial}=this.state;
         const footerButtons = [];
         const {dtmplConfig} = this.state;
@@ -177,7 +177,7 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
         //处理action
         if (dtmplConfig) {
             dtmplConfig.actions.forEach((ac, index) => {
-                footerButtons.unshift(<Action iconType={'icon-title'} hiddenType={'disabled'}  serial={serial} key={ac.id}  formRef={this.formRef} actionConfig={ac}  doAction={this.doSubmit}></Action>);
+                footerButtons.unshift(<Action serverKey={serverKey} iconType={'icon-title'} hiddenType={'disabled'}  serial={serial} key={ac.id}  formRef={this.formRef} actionConfig={ac}  doAction={this.doSubmit}></Action>);
             })
         }
         footerButtons.unshift(<Popconfirm key="back" placement="topLeft" title={"确定要取消本次修改内容吗?"} onConfirm={onCancel} okText="确定" cancelText="取消">
@@ -188,7 +188,7 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
     }
 
     render() {
-        const {height, onOk, onCancel, code,bodyWidth, sourceId,  open,mainCode,width,pageType,placement,maxColsOnRow,title} = this.props
+        const {height, onOk, onCancel, code,bodyWidth, sourceId,  open,mainCode,width,pageType,placement,maxColsOnRow,title,serverKey} = this.props
         const {dtmplConfig,id,dtmplData} = this.state;
 
         let title1=title?title:dtmplConfig ? dtmplConfig.title : "";
@@ -205,7 +205,7 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
             footer={this.getFooter()}
         >
             {open} <div onClick={this.onClickBody}>
-                <DtmplForm mainCode={mainCode} parentId={id} dtmplConfig={dtmplConfig} formRef={this.formRef} sourceId={sourceId}
+                <DtmplForm serverKey={serverKey} mainCode={mainCode} parentId={id} dtmplConfig={dtmplConfig} formRef={this.formRef} sourceId={sourceId}
                            onFinish={onOk} maxColsOnRow={maxColsOnRow}
                            showConfirm={false} dtmplData={dtmplData} onValuesChange={this.onValuesChange}  />
             </div>
@@ -226,11 +226,11 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
                     <Space>{this.getFooter()}</Space>
                 }
             >
-                <DtmplForm mainCode={mainCode} parentId={id} dtmplConfig={dtmplConfig} formRef={this.formRef} sourceId={sourceId}
+                <DtmplForm serverKey={serverKey} mainCode={mainCode} parentId={id} dtmplConfig={dtmplConfig} formRef={this.formRef} sourceId={sourceId}
                            onFinish={onOk}   maxColsOnRow={maxColsOnRow}
                            showConfirm={false} dtmplData={dtmplData} onValuesChange={this.onValuesChange} />
             </Drawer>:<Card  title={title1}>
-                        <DtmplForm mainCode={mainCode} parentId={id} dtmplConfig={dtmplConfig} formRef={this.formRef} sourceId={sourceId}
+                        <DtmplForm serverKey={serverKey} mainCode={mainCode} parentId={id} dtmplConfig={dtmplConfig} formRef={this.formRef} sourceId={sourceId}
                                    onFinish={onOk}   maxColsOnRow={maxColsOnRow}
                                    showConfirm={false} dtmplData={dtmplData} onValuesChange={this.onValuesChange} />
                     </Card>

package/src/aldehyde/module/dtmpl-editor.tsx

@@ -62,15 +62,15 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
     }
 
     loadConfigData = async () => {
-        const { sourceId,open,code} = this.props;
+        const { sourceId,open,code,serverKey} = this.props;
         this.setState({
             loading: true,
         })
         let dtmplConfig=undefined;
         if(code){
-            dtmplConfig = await HCDataSource.requestDtmplConfig(sourceId);
+            dtmplConfig = await HCDataSource.requestDtmplConfig(serverKey,sourceId);
         }else{
-            dtmplConfig = await HCDataSource.requestAddDtmplConfig(sourceId);
+            dtmplConfig = await HCDataSource.requestAddDtmplConfig(serverKey,sourceId);
         }
 
         if(dtmplConfig.authSaveInterval && dtmplConfig.authSaveInterval>0){
@@ -95,7 +95,7 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
     }
 
     loadData = async (dtmplConfig:DtmplConfig ) => {
-        const { sourceId, code,defaultDtmplData,open} = this.props;
+        const { sourceId, code,defaultDtmplData,open,serverKey} = this.props;
         if(!open){
             return;
         }
@@ -103,7 +103,7 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
             this.setState({
                 loading: true,
             })
-            const dtmplData_ = await HcserviceV3.requestDtmplData( sourceId, code, null);
+            const dtmplData_ = await HcserviceV3.requestDtmplData( serverKey,sourceId, code, null);
             this.setState({
                 dtmplData:dtmplData_,
                 id:code,
@@ -145,9 +145,9 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
     }
 
     render() {
-        const {onOk,sourceId,mainCode,maxColsOnRow} = this.props
+        const {onOk,sourceId,mainCode,maxColsOnRow,serverKey} = this.props
         const {dtmplConfig,id,dtmplData} = this.state;
-        return  <DtmplForm mainCode={mainCode} parentId={id} dtmplConfig={dtmplConfig} formRef={this.formRef} sourceId={sourceId}
+        return  <DtmplForm serverKey={serverKey} mainCode={mainCode} parentId={id} dtmplConfig={dtmplConfig} formRef={this.formRef} sourceId={sourceId}
                                    onFinish={onOk}   maxColsOnRow={maxColsOnRow}
                                    showConfirm={false} dtmplData={dtmplData} onValuesChange={this.onValuesChange} />
        }

package/src/aldehyde/module/dtmpl-view-card.tsx

@@ -5,6 +5,7 @@ import DtmplEditModal from './dtmpl-edit-modal';
 //以列表为入口的，页面内列表，基本原则是所有交互在页面内完成，不会触发路由。
 
 export interface DtmplViewCardProps  {
+    serverKey:string,
     sourceId?:string,
     code?:string;
     mainCode?:string;
@@ -48,10 +49,10 @@ class DtmplViewCard extends React.PureComponent<DtmplViewCardProps, DtmplViewCar
 
     render() {
         const {showDtmplEdit} = this.state;
-        const { sourceId,code,mainCode,editable} = this.props;
+        const { sourceId,code,mainCode,editable,serverKey} = this.props;
             return <>
-                <ActDtmplView goDtmpl={editable?this.goDtmpl:null}  sourceId={sourceId} code={code} mainCode={mainCode}></ActDtmplView>
-                {showDtmplEdit? <DtmplEditModal open={showDtmplEdit} onCancel={()=>{
+                <ActDtmplView serverKey={serverKey} goDtmpl={editable?this.goDtmpl:null}  sourceId={sourceId} code={code} mainCode={mainCode}></ActDtmplView>
+                {showDtmplEdit? <DtmplEditModal serverKey={serverKey} open={showDtmplEdit} onCancel={()=>{
                         this.setState({
                             showDtmplEdit:false,
                         })}}

package/src/aldehyde/module/dtmpl-view-drawer.tsx

@@ -38,7 +38,7 @@ class DtmplViewDrawer extends React.PureComponent<DtmplViewDrawerProps, DtmplVie
     }
 
     render() {
-        const {title,sourceId,code,placement,open,onClose,width,cancelText,editable}=this.props;
+        const {title,sourceId,code,placement,open,onClose,width,cancelText,editable,serverKey}=this.props;
         return  (<Drawer
                     placement={placement}
                     title={title}
@@ -56,7 +56,7 @@ class DtmplViewDrawer extends React.PureComponent<DtmplViewDrawerProps, DtmplVie
                         </Space>
                     }
                 >
-                   <DtmplViewCard editable={editable} sourceId={sourceId} code={code}></DtmplViewCard>
+                   <DtmplViewCard serverKey={serverKey} editable={editable} sourceId={sourceId} code={code}></DtmplViewCard>
              </Drawer>)
     }
 }

package/src/aldehyde/module/dtmpl-view-modal.tsx

@@ -34,7 +34,7 @@ class DtmplViewModal extends React.PureComponent<DtmplViewModalProps, DtmplViewM
     }
 
     render() {
-        const {title,sourceId,code,open,onClose,width,height}=this.props;
+        const {title,sourceId,code,open,onClose,width,height,serverKey}=this.props;
         return <Modal
                     open={open}
                     width={width}
@@ -43,7 +43,7 @@ class DtmplViewModal extends React.PureComponent<DtmplViewModalProps, DtmplViewM
                     destroyOnClose={true}
                     centered
                     onCancel={onClose}
-                ><DtmplViewCard sourceId={sourceId} code={code}></DtmplViewCard>
+                ><DtmplViewCard serverKey={serverKey} sourceId={sourceId} code={code}></DtmplViewCard>
                 </Modal>
     }
 }

package/src/aldehyde/module/ltmpl-table.tsx

@@ -12,6 +12,7 @@ import DtmplCustomEditModalPage from "../custom-page/dtmpl-custom-edit-modal-pag
 //以列表为入口的，页面内列表，基本原则是所有交互在页面内完成，不会触发路由。
 
 export interface LtmplTableProps {
+    serverKey:string,
     sourceId: string,
     mainCode?: string;
     showView?: (code: string, toCustomPage?: boolean) => void,
@@ -80,8 +81,8 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
     }
 
     loadLtmplConfig = async () => {
-        const {sourceId} = this.props;
-        let ltmplConfigRes: LtmplConfigRes = await HCDataSource.requestLtmplConfig(sourceId);
+        const {sourceId,serverKey} = this.props;
+        let ltmplConfigRes: LtmplConfigRes = await HCDataSource.requestLtmplConfig(serverKey,sourceId);
         let criteriaData;
         //提取 过滤条件的默认值
         if (ltmplConfigRes) {
@@ -200,21 +201,21 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
 
     render() {
         const {ltmplConfigRes, criteriaData,pageSize,pageNo, showDtmplView, selectedCode, showDtmplEdit, showDtmplCustomEdit, ractionId, showDraw, collapse} = this.state;
-        const {sourceId, mainCode, showView, doSearch, doRAction, funcMode, title, collapsible, initCollapse,doCustomEdit,doCustomCreate} = this.props;
+        const {sourceId, mainCode, showView, doSearch, doRAction, funcMode, title, collapsible, initCollapse,doCustomEdit,doCustomCreate,serverKey} = this.props;
 
         if (!ltmplConfigRes) {
             return <></>;
         } else {
             const {buttons,customEditPagePath} = ltmplConfigRes.ltmplConfig
             return <>
-                <ActTable pageSize={pageSize} pageNo={pageNo} onChangePage={this.onChangePage}  collapsible={collapsible} initCollapse={initCollapse && collapse} title={title}
+                <ActTable serverKey={serverKey} pageSize={pageSize} pageNo={pageNo} onChangePage={this.onChangePage}  collapsible={collapsible} initCollapse={initCollapse && collapse} title={title}
                           funcMode={funcMode} mainCode={mainCode} showView={showView ? showView : this.showView}
                           doRAction={doRAction ? doRAction : this.doRAction}
                           doSearch={doSearch ? doSearch : this.doSearch} doEdit={this.doEdit} doCreate={this.doCreate}
                           sourceId={sourceId} criteriaData={criteriaData} customEditable={doCustomEdit?true:false} customCreatable={doCustomCreate?true:false}
                           ltmplConfig={ltmplConfigRes.ltmplConfig}/>
                 {buttons.includes('detail') && showDtmplView ?
-                    <ModalDtmplView open={showDtmplView} onCancel={() => {
+                    <ModalDtmplView serverKey={serverKey} open={showDtmplView} onCancel={() => {
                         this.setState({
                             showDtmplView: false,
                         })
@@ -223,7 +224,7 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
                                     sourceId={sourceId}
                                     code={selectedCode}> </ModalDtmplView> : ""}
                 {(buttons.includes('dtmplEdit') || buttons.includes('dtmplAdd')) && showDtmplEdit ?
-                    <DtmplEditPage open={showDtmplEdit} onCancel={() => {
+                    <DtmplEditPage serverKey={serverKey} open={showDtmplEdit} onCancel={() => {
                         this.setState({
                             showDtmplEdit: false,
                         })
@@ -234,7 +235,7 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
                                    onOk={this.handleDtmplEdit}/>
                     : ""}
                 {showDtmplCustomEdit ?
-                    <DtmplCustomEditModalPage open={showDtmplCustomEdit} onOk={() => {
+                    <DtmplCustomEditModalPage serverKey={serverKey} open={showDtmplCustomEdit} onOk={() => {
                         this.doSearch(this.state.criteriaData)
                         this.setState({
                             showDtmplCustomEdit: false,
@@ -260,7 +261,7 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
                     }
                 >
                     {
-                        <LtmplTable sourceId={ractionId} mainCode={selectedCode}></LtmplTable>
+                        <LtmplTable serverKey={serverKey} sourceId={ractionId} mainCode={selectedCode}></LtmplTable>
                     }
                 </Drawer>
             </>

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

@@ -50,12 +50,12 @@ class DtmplRoute extends React.Component<DtmplRouteProps, DtmplRoutePropsStat> {
         let queriedCode=undefined;
         if(codeSource){
             if( codeSource=='listop'){
-                queriedCode=await HcserviceV3.queryTop1(sourceId);
+                queriedCode=await HcserviceV3.queryTop1(null,sourceId);
                 if(!queriedCode){
                     queriedCode="bad-code";
                 }
             }else if( codeSource=='listop-new'){
-                queriedCode=await HcserviceV3.queryTop1(sourceId);
+                queriedCode=await HcserviceV3.queryTop1(null,sourceId);
             }else if(codeSource=='new'){
                 queriedCode=null;
             }
@@ -152,11 +152,11 @@ class DtmplRoute extends React.Component<DtmplRouteProps, DtmplRoutePropsStat> {
         let versionId=params['versionId'];
         if(location.pathname.endsWith("detail-view")){
             return (
-                <ActDtmplView goDtmpl={this.goDtmpl} sourceId={sourceId}  versionId={versionId} code={code} mainCode={this.getMainCode()}  />
+                <ActDtmplView serverKey={null} goDtmpl={this.goDtmpl} sourceId={sourceId}  versionId={versionId} code={code} mainCode={this.getMainCode()}  />
             );
         }else{
             return (
-                <DtmplEdit addOrUpdate={this.getMode()} sourceId={sourceId} code={code} mainCode={this.getMainCode()} goBackToLtmpl={codeSource?undefined:this.goBackToLtmpl} goDtmpl={this.goDtmpl}></DtmplEdit>
+                <DtmplEdit serverKey={null} addOrUpdate={this.getMode()} sourceId={sourceId} code={code} mainCode={this.getMainCode()} goBackToLtmpl={codeSource?undefined:this.goBackToLtmpl} goDtmpl={this.goDtmpl}></DtmplEdit>
             );
         }
 

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

@@ -4,7 +4,7 @@ import ExcelImport from '../import/excel-import'
 import withRouter from "./withroute";
 
 export interface ImportRouteProps extends RouterCompProps {
-
+    serverKey:string,
 };
 interface ImportRouteStat{
 
@@ -20,9 +20,9 @@ class ExcelImportRoute extends React.PureComponent<ImportRouteProps, ImportRoute
 
 
     render() {
-        const { params, } = this.props;
+        const { params, serverKey} = this.props;
         const { sourceId} = params;
-       return <ExcelImport  sourceId={sourceId}></ExcelImport>
+       return <ExcelImport serverKey={serverKey} sourceId={sourceId}></ExcelImport>
     }
 }
 export default withRouter(ExcelImportRoute);

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

@@ -42,7 +42,7 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
     loadData = async () => {
         const {params} = this.props;
         const {sourceId} = params;
-        let ltmplConfigRes:LtmplConfigRes = await HCDataSource.requestLtmplConfig(sourceId);
+        let ltmplConfigRes:LtmplConfigRes = await HCDataSource.requestLtmplConfig(null,sourceId);
         this.setState({
             ltmplConfigRes:ltmplConfigRes,
         })
@@ -191,7 +191,7 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
         if (!ltmplConfigRes) {
             return <></>;
         } else {
-            return <ActTable pageSize={pageSize} pageNo={pageNo} onChangePage={this.onChangePage}
+            return <ActTable serverKey={null} pageSize={pageSize} pageNo={pageNo} onChangePage={this.onChangePage}
                              menuId={this.getMenuId()} mainCode={mainCode} showView={this.showView}
                              doSearch={this.onChangeSearch} doEdit={this.doEdit} doCreate={this.doCreate}
                              sourceId={sourceId} criteriaData={criteriaData}

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

@@ -123,7 +123,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     }
 
     loadData = async (hiddenColIds: string[], hiddenRowCodes: string[], sortedColConfigs: ColumnConfig[]) => {
-        const {sourceId, criteriaData, ltmplConfig, mainCode, level,pageNo,pageSize} = this.props;
+        const {sourceId, criteriaData, ltmplConfig, mainCode, level,pageNo,pageSize,serverKey} = this.props;
         if (!ltmplConfig) {
             return;
         }
@@ -163,12 +163,12 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
             //构建过滤条件
         let queryKey: QueryKey
         if (level && level == 'l2') {
-            queryKey = await HcserviceV3.requestL2LtmplQueryKey(sourceId, {
+            queryKey = await HcserviceV3.requestL2LtmplQueryKey(serverKey,sourceId, {
                 ...criteriaData, ...pageInfo,
                 mainCode
             });
         } else {
-            queryKey = await HcserviceV3.requestLtmplQueryKey(sourceId, {
+            queryKey = await HcserviceV3.requestLtmplQueryKey(serverKey,sourceId, {
                 ...criteriaData, ...pageInfo,
                 mainCode
             });
@@ -191,7 +191,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     }
 
     buildTableColumns = (ltmplConfig: LtmplConfig, hiddenColIds: string[], hiddenRowCodes: string[], sortedColConfigs: ColumnConfig[]) => {
-        const { showView, doEdit, doRAction,customEditable} = this.props
+        const { showView, doEdit, doRAction,customEditable,serverKey} = this.props
         const {buttons} = ltmplConfig;
         let tableColumns = [];
         let s = 0;
@@ -301,7 +301,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                         }) : ""}
                         {ltmplConfig.rowActions && ltmplConfig.rowActions.length > 0 ?
                             ltmplConfig.rowActions.map((action) => {
-                                return <Action iconType={'icon'} key={action.id} data={[record]} actionConfig={action}
+                                return <Action serverKey={serverKey} iconType={'icon'} key={action.id} data={[record]} actionConfig={action}
                                                doAction={this.doRowAction} buttonSize={'small'} serial={1}></Action>
                             }) : ""}
                         {ltmplConfig.rowJumps && ltmplConfig.rowJumps.length > 0 ?
@@ -313,7 +313,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                         {ltmplConfig.rowCQuerys && ltmplConfig.rowCQuerys.length > 0 ?
                             ltmplConfig.rowCQuerys.map((cquery) => {
                                 // console.log("record record", record);
-                                return <CquickButton key={cquery.id} size={"small"} pageType={'drawer'}
+                                return <CquickButton serverKey={serverKey} key={cquery.id} size={"small"} pageType={'drawer'}
                                     // onClick={() => doCQuery(cquery.id)}
                                                      cQueryConfig={cquery}
                                                      mainCode={cquery.mainCodeColId ? record[cquery.mainCodeColId] : record.code}/>
@@ -336,7 +336,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
             } else {
                 column['className'] = 'opsColumn';
                 column['render'] = (text, record) => {
-                    return <ViewControl fieldConfig={item} value={record[item.id]} holderType={'table'}/>
+                    return <ViewControl serverKey={serverKey} fieldConfig={item} value={record[item.id]} holderType={'table'}/>
 
                 }
             }
@@ -433,12 +433,12 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     }
 
     doAction = async (actionId: string, selectedRows: SelectedRow[], params) => {
-        const {sourceId} = this.props;
+        const {serverKey} = this.props;
         const {hiddenColIds, hiddenRowCodes, sortedColConfigs} = this.state;
         this.setState({
             loading: true,
         })
-        let result: boolean = await HcserviceV3.postActions(actionId, selectedRows, params);
+        let result: boolean = await HcserviceV3.postActions(serverKey,actionId, selectedRows, params);
         if (result) {//重新加载数据
             this.loadData(hiddenColIds, hiddenRowCodes, sortedColConfigs);
         } else {
@@ -453,12 +453,12 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     }
 
     doDelete = async () => {
-        const {sourceId} = this.props;
+        const {sourceId,serverKey} = this.props;
         const {selectedRows, hiddenColIds, hiddenRowCodes, sortedColConfigs} = this.state;
         this.setState({
             loading: true,
         })
-        let result: boolean = await HcserviceV3.deleteData(sourceId, selectedRows);
+        let result: boolean = await HcserviceV3.deleteData(serverKey,sourceId, selectedRows);
         if (result) {//重新加载数据
             this.loadData(hiddenColIds, hiddenRowCodes, sortedColConfigs);
         } else {
@@ -469,12 +469,12 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     }
 
     doDeleteByCode = async (code: string) => {
-        const {sourceId} = this.props;
+        const {sourceId,serverKey} = this.props;
         const {hiddenColIds, hiddenRowCodes, sortedColConfigs} = this.state;
         this.setState({
             loading: true,
         })
-        let result: boolean = await HcserviceV3.deleteByCode(sourceId, [code]);
+        let result: boolean = await HcserviceV3.deleteByCode(serverKey,sourceId, [code]);
         if (result) {//重新加载数据
             this.loadData(hiddenColIds, hiddenRowCodes, sortedColConfigs);
         } else {
@@ -583,7 +583,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
 
     renderHeaderButtons = () => {
         let {hiddenColIds, queryKey, viewModels, sortedColConfigs, disabledColIds, showL2Chart, showL2ActTable} = this.state;
-        const {ltmplConfig, sourceId, doCreate, doSearch, menuId, funcMode,customCreatable} = this.props;
+        const {ltmplConfig, sourceId, doCreate, doSearch, menuId, funcMode,customCreatable,serverKey} = this.props;
         let {buttons} = ltmplConfig;
 
         return <>
@@ -611,6 +611,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
             </Button></Tooltip> : ''}
             <Popover
                 content={<ExportFrame //导出组件
+                    serverKey={serverKey}
                     queryKey={queryKey}
                     title={ltmplConfig.title}
                 />}
@@ -636,7 +637,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                 onClick={this.handleDataAnalysis}>
                 <FundOutlined/>
             </Button></Tooltip> : ""}
-            {buttons.includes("reStat") ? <Restat fields={ltmplConfig.reStatParams} sourceId={sourceId}
+            {buttons.includes("reStat") ? <Restat serverKey={serverKey} fields={ltmplConfig.reStatParams} sourceId={sourceId}
                                                   onfinish={() => doSearch(null)}></Restat> : ""}
             <Popover content={<Checkbox.Group value={viewModels} onChange={this.changeViewModel}>
                 <Row style={{width: '120px'}}>
@@ -699,8 +700,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
 
     renderCriteriaForm = () => {
         let { loading, selectedRows, selectedDatas} = this.state;
-        let {ltmplConfig, doSearch,criteriaData} = this.props;
-        return <CriteriaForm loading={loading} selectedDatas={selectedDatas} selectedRows={selectedRows}
+        let {ltmplConfig, doSearch,criteriaData,serverKey} = this.props;
+        return <CriteriaForm serverKey={serverKey} loading={loading} selectedDatas={selectedDatas} selectedRows={selectedRows}
                              ltmplConfig={ltmplConfig} data={criteriaData}
                              doCQuery={this.doSelectedCQuery}
                              doAction={this.doSelectedAction}
@@ -711,7 +712,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
 
     renderContent=()=> {
         let {queryKey, tableColumns, loading, selectedRows, hiddenRowCodes, viewModels, sortedColConfigs, hiddenColIds, showL2ActTable} = this.state;
-        let {sourceId, ltmplConfig, funcMode, title, collapsible,pageSize,pageNo,onChangePage} = this.props;
+        let {sourceId, ltmplConfig, funcMode, title, collapsible,pageSize,pageNo,onChangePage,serverKey} = this.props;
 
         if (!ltmplConfig || !sourceId) {
             return <>
@@ -747,7 +748,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                 {/*</div> : ""*/}
                 {/*}*/}
                 {buttons.includes("analysis") && showL2ActTable ? <div>
-                    <L2ActTable innerQueryKey={queryKey.key} sourceId={sourceId}/>
+                    <L2ActTable  serverKey={serverKey} innerQueryKey={queryKey.key} sourceId={sourceId}/>
                     <Divider dashed style={{borderTopColor: "#40a9ff",}} plain></Divider>
                 </div> : ""
                 }
@@ -765,7 +766,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                     {displayCriteriaCard ?
                         this.renderCriteriaForm() : null
                     }
-                    {loading?"":<QueryTable  onChangePage={onChangePage} viewModels={viewModels} columnConfigs={columnConfigs}
+                    {loading?"":<QueryTable serverKey={serverKey}  onChangePage={onChangePage} viewModels={viewModels} columnConfigs={columnConfigs}
                                         maxSelectedRows={this.checkBoxUseful() ? 10000 : -1}
                                         selectedRows={selectedRows}
                                         columns={tableColumns}

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

@@ -25,8 +25,8 @@ class L2ActTable extends React.PureComponent<L2ActTableProps, L2ActTableStat> {
     }
 
     loadData = async (criteriaData:object) => {
-        const { sourceId} = this.props;
-        let ltmplConfigRes = await HCDataSource.requestL2LtmplConfig( sourceId);
+        const { sourceId,serverKey} = this.props;
+        let ltmplConfigRes = await HCDataSource.requestL2LtmplConfig(serverKey, sourceId);
         this.setState({
             ltmplConfigRes,
             criteriaData
@@ -80,10 +80,10 @@ class L2ActTable extends React.PureComponent<L2ActTableProps, L2ActTableStat> {
 
     render() {
         let {ltmplConfigRes,criteriaData,pageNo,pageSize} = this.state;
-        let {sourceId} = this.props;
+        let {sourceId,serverKey} = this.props;
         return (
             ltmplConfigRes?
-                <ActTable pageSize={pageSize} pageNo={pageNo} onChangePage={this.onChangePage}  doSearch={this.doSearch} level={'l2'} criteriaData={criteriaData} sourceId={sourceId}
+                <ActTable serverKey={serverKey} pageSize={pageSize} pageNo={pageNo} onChangePage={this.onChangePage}  doSearch={this.doSearch} level={'l2'} criteriaData={criteriaData} sourceId={sourceId}
                           ltmplConfig={ltmplConfigRes.ltmplConfig} /> : ""
          );
     }