aldehyde 0.2.52 → 0.2.54

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

@@ -82,7 +82,7 @@ interface ActTableProps extends TmplBaseProps {
 };
 
 interface ActTableStat {
-    tableColumns?: object[];
+    //tableColumns?: object[];
     sortedColConfigs?: ColumnConfig[];
     queryKey?: QueryKey;
     loading?: boolean;
@@ -99,7 +99,7 @@ interface ActTableStat {
 
 class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     state = {
-        tableColumns: undefined,
+        //tableColumns: undefined,
         sortedColConfigs: undefined,
         queryKey: undefined,
         loading: true,
@@ -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;
         }
@@ -149,7 +149,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
             });
         }
         /** 构建column **/
-        let tableColumns = this.buildTableColumns(ltmplConfig, hiddenColIds_, hiddenRowCodes, sortedColConfigs);
+       // let tableColumns = this.buildTableColumns(ltmplConfig, hiddenColIds_, hiddenRowCodes, sortedColConfigs);
 
         const {defaultPageSize} = ltmplConfig;
 
@@ -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
             });
@@ -180,7 +180,6 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
             hiddenColIds: hiddenColIds_,
             hiddenRowCodes,
             sortedColConfigs,
-            tableColumns,
             queryKey,
             loading: false,
             showL2Chart: false,
@@ -191,11 +190,10 @@ 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;
-
         let colConfigs = sortedColConfigs ? sortedColConfigs : ltmplConfig.columns;
 
         colConfigs.forEach((item) => {
@@ -301,7 +299,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 +311,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 +334,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'}/>
 
                 }
             }
@@ -362,7 +360,6 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         if ((sourceId && preSourceId != sourceId) ||
             (ltmplConfig && (!preLtmplConfig || ltmplConfig.id != preLtmplConfig.id)) ||
             (Units.transQueryParamsToStr(criteriaData,false,['pageSize','pageNo']) != Units.transQueryParamsToStr(preCriteriaData,false,['pageSize','pageNo']))) {
-
             if (ltmplConfig.id == preLtmplConfig.id) {
                 this.loadData(hiddenColIds, [], sortedColConfigs);
             } else {
@@ -397,7 +394,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         const {hiddenColIds, sortedColConfigs} = this.state;
         this.setState({
             hiddenRowCodes: [],
-            tableColumns: this.buildTableColumns(ltmplConfig, hiddenColIds, [], sortedColConfigs),
+           // tableColumns: this.buildTableColumns(ltmplConfig, hiddenColIds, [], sortedColConfigs),
         })
     }
 
@@ -407,7 +404,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         let hiddenCodes = [...hiddenRowCodes, code];
         this.setState({
             hiddenRowCodes: hiddenCodes,
-            tableColumns: this.buildTableColumns(ltmplConfig, hiddenColIds, hiddenCodes, sortedColConfigs),
+           // tableColumns: this.buildTableColumns(ltmplConfig, hiddenColIds, hiddenCodes, sortedColConfigs),
         })
     }
 
@@ -423,7 +420,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         this.setState({
             showL2Chart: false,
             hiddenColIds,
-            tableColumns: this.buildTableColumns(ltmplConfig, hiddenColIds, hiddenRowCodes, sortedColConfigs),
+           // tableColumns: this.buildTableColumns(ltmplConfig, hiddenColIds, hiddenRowCodes, sortedColConfigs),
         })
     }
 
@@ -433,12 +430,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 +450,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 +466,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 {
@@ -499,8 +496,6 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         // }
         let url=null;
 
-        debugger
-
         let path=jump.path;
         if(!path){
             path="/"
@@ -576,14 +571,14 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         const {hiddenRowCodes, hiddenColIds} = this.state;
         this.setState({
             sortedColConfigs,
-            tableColumns: this.buildTableColumns(ltmplConfig, hiddenColIds, hiddenRowCodes, sortedColConfigs),
+           // tableColumns: this.buildTableColumns(ltmplConfig, hiddenColIds, hiddenRowCodes, sortedColConfigs),
         })
     }
 
 
     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 +606,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
             </Button></Tooltip> : ''}
             <Popover
                 content={<ExportFrame //导出组件
+                    serverKey={serverKey}
                     queryKey={queryKey}
                     title={ltmplConfig.title}
                 />}
@@ -636,7 +632,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 +695,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}
@@ -710,8 +706,8 @@ 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 {queryKey, loading, selectedRows, hiddenRowCodes, viewModels, sortedColConfigs, hiddenColIds, showL2ActTable} = this.state;
+        let {sourceId, ltmplConfig, funcMode, title, collapsible,pageSize,pageNo,onChangePage,serverKey} = this.props;
 
         if (!ltmplConfig || !sourceId) {
             return <>
@@ -721,6 +717,9 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                 </Table>
             </>
         }
+
+        let tableColumns = this.buildTableColumns(ltmplConfig,hiddenColIds, hiddenRowCodes, sortedColConfigs);
+
         let {buttons} = ltmplConfig
         let displayCriteriaCard: boolean = false;
         if (funcMode == 'simple' || funcMode == 'common') {
@@ -747,7 +746,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 +764,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}
@@ -792,6 +791,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                 </Table>
             </>
         }
+
         return <> {
             collapsible ?
                 <CollapseCard

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} /> : ""
          );
     }

package/src/aldehyde/table/modal-select-table.tsx

@@ -10,11 +10,11 @@ import QueryTable from './query-table';
 import CriteriaForm from "../form/criteria-form";
 import ViewControl from "../controls/view-control";
 import SelectedRowsCard from './selected-rows-card'
-import ActTable from "./act-table";
 
 interface ModelSelectTableProps {
     maxSelectedRows: number,
     open: boolean,
+    serverKey:string,
     sourceId: string,
     mainCode:string,
     exceptCodes?: string[],
@@ -59,10 +59,10 @@ class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelS
             pageSize:pageSize?pageSize: defaultPageSize,
             virtualEndPageNo: undefined,
         }
-        const {sourceId, exceptCodes,mainCode} = this.props;
+        const {sourceId, exceptCodes,serverKey,mainCode} = this.props;
         /** 构建 dataSource **/
             //构建过滤条件
-        let queryKey: QueryKey = await HcserviceV3.requestLtmplQueryKey(sourceId, {exceptCodes, ...criteriaData, ...pageInfo,mainCode});
+        let queryKey: QueryKey = await HcserviceV3.requestLtmplQueryKey(serverKey,sourceId, {exceptCodes, ...criteriaData, ...pageInfo,mainCode});
         this.setState({
             queryKey,
             criteriaData,
@@ -78,12 +78,12 @@ class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelS
     }
 
     loadConfig = async () => {
-        const { sourceId, exceptCodes} = this.props;
+        const { sourceId, exceptCodes,serverKey} = this.props;
         this.setState({
             loading: true,
         })
 
-        let selectConfig = await HCDataSource.requestSelectConfig( sourceId);
+        let selectConfig = await HCDataSource.requestSelectConfig(serverKey, sourceId);
         /** 构建column **/
         let columns = [];
 
@@ -111,7 +111,7 @@ class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelS
                 item['sorter'] = undefined;
             } else {
                 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'} />
                 }
             }
         });
@@ -216,7 +216,7 @@ class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelS
 
 
     render() {
-        let {open, maxSelectedRows} = this.props;
+        let {open, maxSelectedRows,serverKey} = this.props;
         let {queryKey, columns, selectConfig, criteriaData, loading, selectedRows,pageSize,pageNo} = this.state;
 
         if (!selectConfig) {
@@ -245,9 +245,9 @@ class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelS
                 onOk={this.handleOk}
             >
                 <div className="actTable">
-                    <CriteriaForm selectedRows={selectedRows} ltmplConfig={selectConfig} data={criteriaData}
+                    <CriteriaForm serverKey={serverKey} selectedRows={selectedRows} ltmplConfig={selectConfig} data={criteriaData}
                                   doSearch={this.doSearch} loading={loading} />
-                    <QueryTable  pageInfo={{pageNo:pageNo?pageNo:1,pageSize:pageSize?pageSize:selectConfig.defaultPageSize}} onChangePage={this.onChangePage} maxSelectedRows={maxSelectedRows} selectedRows={selectedRows} columns={columns}
+                    <QueryTable serverKey={serverKey}  pageInfo={{pageNo:pageNo?pageNo:1,pageSize:pageSize?pageSize:selectConfig.defaultPageSize}} onChangePage={this.onChangePage} maxSelectedRows={maxSelectedRows} selectedRows={selectedRows} columns={columns}
                                 queryKey={queryKey}
                                 onChangeRowSelection={this.changeRowSelection}/>
                 </div>

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

@@ -35,6 +35,7 @@ interface QueryTableProps {
         pageSize: number
     },
     columns: any[];
+    serverKey:string,
     queryKey: QueryKey;
     onChangePage: (pageNo: number, pageSize: number) => void,
     onChangeRowSelection?: (selectedRows: SelectedRow[], selectedDatas: DtmplData[], allRowKeys: string[]) => void;
@@ -143,6 +144,8 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
             loading: true,
         })
         let {queryDataCache} = this.state;
+
+        let {serverKey}=this.props;
         let queryCache: Map<string, CacheData>;
         if (cleanCache || !queryDataCache) {
             queryCache = new Map<string, CacheData>();
@@ -158,7 +161,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
                 loading: false,
             })
         } else {
-            let queryData: QueryData = await HcserviceV3.requestQueryData(queryKey, pageInfo);
+            let queryData: QueryData = await HcserviceV3.requestQueryData(serverKey,queryKey, pageInfo);
             let dataSource: object[] = [];
             pageInfo = queryData.pageInfo;
             queryData.entities.forEach((item, index) => {
@@ -197,8 +200,8 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
     }
 
     queryTotal = async () => {
-        const {queryKey} = this.props;
-        let total = await HcserviceV3.requestQueryCount(queryKey.key);
+        const {queryKey,serverKey} = this.props;
+        let total = await HcserviceV3.requestQueryCount(serverKey,queryKey.key);
         this.setState({
             total
         });
@@ -267,7 +270,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
 
     initViewList = (data) => {
         //console.log("data:",data);
-        const {columns, columnConfigs} = this.props
+        const {columns, columnConfigs,serverKey} = this.props
         const formItemList = [];
         if (columnConfigs.length > 0) {
             columnConfigs.forEach((item, index) => {
@@ -284,7 +287,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
                     const formItem = <Descriptions.Item label={item.title} key={index}
                                                         className='labelcss'
                     >
-                        <ViewControl holderType={'table'} value={fieldValue} fieldConfig={item}/>
+                        <ViewControl serverKey={serverKey} holderType={'table'} value={fieldValue} fieldConfig={item}/>
                     </Descriptions.Item>
                     formItemList.push(formItem);
                 }

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

@@ -27,6 +27,7 @@ const {Text} = Typography;
 
 interface RelationTableProps {
     mainCode?: string,
+    serverKey:string,
     parentId: string,
     loading: boolean,
     viewOrEdit: ViewOrEdit,
@@ -125,7 +126,7 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
 
     buildColumns = () => {
 
-        const {viewOrEdit, value, fieldGroupConfig} = this.props;
+        const {viewOrEdit, value, fieldGroupConfig,serverKey} = this.props;
         const {title, buttons, fields, showRelationName, relationNames, showRowNum, disabled} = fieldGroupConfig;
         let columns = [];
         /** 构建column **/
@@ -143,7 +144,7 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
                 TableUnits.sort(column, itemType);
             }
             column['render'] = (text, record) => {
-                return <ViewControl holderType={'table'} fieldConfig={item} value={record[item.id]}/>
+                return <ViewControl serverKey={serverKey} holderType={'table'} fieldConfig={item} value={record[item.id]}/>
             }
         });
         if (showRelationName) {//判断是否有关系属性
@@ -196,12 +197,12 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
                         ></Button> : ""}
                     {fieldGroupConfig.rowActions && fieldGroupConfig.rowActions.length > 0 ?
                         fieldGroupConfig.rowActions.map((action) => {
-                            return <Action disabled={disabled} key={action.id} data={[record]} actionConfig={action}
+                            return <Action serverKey={serverKey} disabled={disabled} key={action.id} data={[record]} actionConfig={action}
                                            doAction={this.doRowAction} buttonSize={'small'}></Action>
                         }) : ""}
                     {/*行编辑*/}
                     {rowEdit ?
-                        <RowEditor disabled={disabled} buttonIcon={<EditOutlined/>}
+                        <RowEditor serverKey={serverKey} disabled={disabled} buttonIcon={<EditOutlined/>}
                                    dtmplData={this.getRowEditData(record.code)}
                                    fieldGroupConfig={fieldGroupConfig}
                                    onOk={this.handleRowEdit}
@@ -253,7 +254,8 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
         this.setState({
             tableLoading: true,
         })
-        let result: boolean = await HcserviceV3.postActions(actionId, selectedRows, params);
+        let {serverKey}=this.props;
+        let result: boolean = await HcserviceV3.postActions(serverKey,actionId, selectedRows, params);
         {
             this.setState({
                 tableLoading: false,
@@ -336,12 +338,12 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
     }
 
     add = async (codes: string[]) => {
-        const {value, fieldGroupConfig, onChange} = this.props;
-        const {title, fields, showRelationName, relationNames, showRowNum} = fieldGroupConfig;
+        const {value, fieldGroupConfig, onChange,serverKey} = this.props;
+        const {relationNames, } = fieldGroupConfig;
         this.setState({
             tableLoading: true,
         })
-        let selectdDatas: DtmplData[] = await HcserviceV3.requestSelectedData(fieldGroupConfig.id, codes);
+        let selectdDatas: DtmplData[] = await HcserviceV3.requestSelectedData(serverKey,fieldGroupConfig.id, codes);
 
         //添加默认关系
         if (selectdDatas) {
@@ -383,12 +385,12 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
 
     handleDtmplEdit = async (code: string) => {
         const {value, fieldGroupConfig, onChange} = this.props;
-        const {title, fields, showRelationName, relationNames, showRowNum} = fieldGroupConfig;
+        const {title, fields, showRelationName, relationNames, showRowNum,serverKey} = fieldGroupConfig;
         this.setState({
             tableLoading: true,
             showDtmplEdit: false,
         })
-        let data: DtmplData = (await HcserviceV3.requestSelectedData(fieldGroupConfig.id, [code]))[0];
+        let data: DtmplData = (await HcserviceV3.requestSelectedData(serverKey,fieldGroupConfig.id, [code]))[0];
         let datas: DtmplData[] = [...value];
 
         if (datas && data) {
@@ -450,7 +452,7 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
     }
 
     buildButtons = () => {
-        const {fieldGroupConfig, viewOrEdit, value} = this.props;
+        const {fieldGroupConfig, viewOrEdit, value,serverKey} = this.props;
         const {buttons, disabled} = fieldGroupConfig;
         const {showRowEdit} = this.state;
         const buttonDisabled: boolean = disabled ? disabled : fieldGroupConfig.max ? fieldGroupConfig.max <= (value ? value.length : 0) : false;
@@ -460,7 +462,7 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
                 <Col span={20}>
                     <Space>
                         {buttons.includes('rowAdd') ?
-                            <RowEditor disabled={buttonDisabled} buttonStyle={{marginBottom: 10}} buttonTitle={"新建一行"}
+                            <RowEditor serverKey={serverKey} disabled={buttonDisabled} buttonStyle={{marginBottom: 10}} buttonTitle={"新建一行"}
                                        fieldGroupConfig={fieldGroupConfig}
                                        onOk={this.handleRowEdit}
                             ></RowEditor>
@@ -510,7 +512,7 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
 
     render() {
 
-        const {fieldGroupConfig, value, parentId, loading, initCollapse, mainCode} = this.props;
+        const {fieldGroupConfig, value, parentId, loading, initCollapse, mainCode,serverKey} = this.props;
         const {pageSize, selectedCode, showDtmplView, showSelectTable, showDtmplEdit, tableLoading, showRowEdit, selectedDtmplData} = this.state;
 
         const {buttons} = fieldGroupConfig;
@@ -563,11 +565,11 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
                         </div>
                     </CollapseCard>
                     {buttons.includes('detail') ?
-                        <ModalDtmplView mainCode={mainCode1} open={showDtmplView} onCancel={this.hiddenEntityView}
+                        <ModalDtmplView serverKey={serverKey} mainCode={mainCode1} open={showDtmplView} onCancel={this.hiddenEntityView}
                                         sourceId={fieldGroupConfig.id}
                                         code={selectedCode}> </ModalDtmplView> : ""}
                     {buttons.includes('dtmplEdit') || buttons.includes('dtmplAdd') ?
-                        <DtmplEditPage mainCode={mainCode1} open={showDtmplEdit} onCancel={this.hiddenEntityEdit}
+                        <DtmplEditPage serverKey={serverKey} mainCode={mainCode1} open={showDtmplEdit} onCancel={this.hiddenEntityEdit}
                                        sourceId={fieldGroupConfig.id}
                                        code={selectedCode}
                                        onOk={selectedCode ? this.handleDtmplEdit : this.handleDtmplAdd}/>
@@ -578,7 +580,7 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
                     {/*                  fieldGroupConfig={fieldGroupConfig}> </ModalRowEdit>*/}
                     {/*    : ""}*/}
                     {buttons.includes('selectAdd') ?
-                        <ModelSelectTable maxSelectedRows={fieldGroupConfig.max} open={showSelectTable}
+                        <ModelSelectTable serverKey={serverKey} maxSelectedRows={fieldGroupConfig.max} open={showSelectTable}
                                           onOK={this.select} onCancel={() => {
                             this.setState({showSelectTable: false})
                         }} exceptCodes={exceptCodes} mainCode={mainCode1}

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

@@ -12,6 +12,7 @@ import ViewControl from "../controls/view-control";
 interface SelectTableProps {
     mainCode?:string,
     maxSelectedRows?: number,
+    serverKey:string,
     sourceId: string,
     selectedRows: SelectedRow[];
     selectedDatas?: DtmplData[];
@@ -50,7 +51,7 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
         this.setState({
             loading: true,
         })
-        const {mainCode}=this.props;
+        const {mainCode,serverKey,sourceId}=this.props;
         const {pageNo,pageSize}=this.state;
         const {defaultPageSize} = selectConfig;
         let pageInfo = {
@@ -58,10 +59,9 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
             pageSize: pageSize?pageSize:defaultPageSize ? defaultPageSize : 10,
             virtualEndPageNo: undefined,
         }
-        const {sourceId} = this.props;
         /** 构建 dataSource **/
             //构建过滤条件
-        let queryKey: QueryKey = await HcserviceV3.requestLtmplQueryKey(sourceId, {...criteriaData, ...pageInfo,mainCode});
+        let queryKey: QueryKey = await HcserviceV3.requestLtmplQueryKey(serverKey,sourceId, {...criteriaData, ...pageInfo,mainCode});
         this.setState({
             queryKey,
             criteriaData,
@@ -74,12 +74,12 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
     }
 
     loadConfig = async () => {
-        const {sourceId} = this.props;
+        const {sourceId,serverKey} = this.props;
         this.setState({
             loading: true,
         })
 
-        let selectConfig = await HCDataSource.requestSelectConfig(sourceId);
+        let selectConfig = await HCDataSource.requestSelectConfig(serverKey,sourceId);
         /** 构建column **/
         let columns = [];
 
@@ -107,7 +107,7 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
                 item['sorter'] = undefined;
             } else {
                 column['render'] = (text, record) => {
-                    return <ViewControl holderType={'table'} fieldConfig={item} value={record[item.id]}/>
+                    return <ViewControl serverKey={serverKey} holderType={'table'} fieldConfig={item} value={record[item.id]}/>
                 }
             }
         });
@@ -218,7 +218,7 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
 
 
     render() {
-        let {maxSelectedRows, selectedRows, selectedDatas} = this.props;
+        let {maxSelectedRows, selectedRows, selectedDatas,serverKey} = this.props;
         let {queryKey, columns, selectConfig, criteriaData, loading,pageNo,pageSize} = this.state;
 
         if (!selectConfig) {
@@ -240,10 +240,10 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
             <div className="actTable"
                 // style={{width: 1100,maxWidth: 'calc(100vw - 60px)', maxHeight: 'calc(100vh - 50px)',overflow:'auto'}}
             >
-                <CriteriaForm selectedRows={selectedRows} selectedDatas={selectedDatas} ltmplConfig={selectConfig}
+                <CriteriaForm serverKey={serverKey} selectedRows={selectedRows} selectedDatas={selectedDatas} ltmplConfig={selectConfig}
                               data={criteriaData}
                               doSearch={this.doSearch} loading={loading}/>
-                <QueryTable maxSelectedRows={maxSelectedRows} selectedRows={selectedRows} columns={columns}
+                <QueryTable serverKey={serverKey} maxSelectedRows={maxSelectedRows} selectedRows={selectedRows} columns={columns}
                             pageInfo={{pageNo,
                                 pageSize: pageSize?pageSize:selectConfig.defaultPageSize}}
                             onChangePage={this.onChangePage}