aldehyde 0.2.52 → 0.2.53

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}

package/src/aldehyde/table/stat/restat.tsx

@@ -9,6 +9,7 @@ interface RestatProps {
     onfinish: () => void;
     fields: FieldConfig[];
     value?: object;
+    serverKey:string,
     sourceId:string;
 };
 
@@ -26,11 +27,11 @@ class Restat extends React.PureComponent<RestatProps, RestatStat> {
     }
     formRef = React.createRef<FormInstance>();
     onRestat =async (val) => {
-        const {sourceId,onfinish}=this.props;
+        const {sourceId,onfinish,serverKey}=this.props;
         this.setState({
             loading:true,
         })
-       await HcserviceV3.increCalc(sourceId,val);
+       await HcserviceV3.increCalc(serverKey,sourceId,val);
         this.setState({
             loading:false,
         })
@@ -39,7 +40,7 @@ class Restat extends React.PureComponent<RestatProps, RestatStat> {
 
     render() {
         const {popoverOpen,loading} = this.state;
-        const {fields, value} = this.props;
+        const {fields, value,serverKey} = this.props;
         return <Popover open={popoverOpen}
                         content={
                             <Card loading={loading}
@@ -60,7 +61,7 @@ class Restat extends React.PureComponent<RestatProps, RestatStat> {
                                 </Space></>}
                             >
                                 <AntdForm labelWrap={true} ref={this.formRef} name="control-hooks" onFinish={this.onRestat}>
-                                    <FormItemGroup  nameAttr={'id'} fields={fields}
+                                    <FormItemGroup serverKey={serverKey}  nameAttr={'id'} fields={fields}
                                                    valueMap={value}></FormItemGroup>
                                 </AntdForm>
                             </Card>}

package/src/aldehyde/tmpl/hc-data-source.tsx

@@ -58,7 +58,7 @@ function findUnloadEnumMstrucIdOfActions(actions: ActionConfig[]) {
 }
 
 
-async function loadEnumOfDtmplConfig(selectConfig: DtmplConfig) {
+async function loadEnumOfDtmplConfig(serverKey:string,selectConfig: DtmplConfig) {
     const mstrucIds = [];
     if (selectConfig.groups) {
         selectConfig.groups.forEach(group => {
@@ -68,7 +68,7 @@ async function loadEnumOfDtmplConfig(selectConfig: DtmplConfig) {
     }
     let subs = findUnloadEnumMstrucIdOfActions(selectConfig.actions);
     concat(mstrucIds, subs);
-    await loadEnum(mstrucIds);
+    await loadEnum(serverKey,mstrucIds);
 }
 
 function concat(mstrucIds, sub) {
@@ -82,16 +82,16 @@ function concat(mstrucIds, sub) {
     return mstrucIds;
 }
 
-async function loadEnumOfSelectConfig(selectConfig: SelectConfig) {
+async function loadEnumOfSelectConfig(serverKey:string,selectConfig: SelectConfig) {
     const mstrucIds = [];
     let subs = findUnloadEnumMstrucIdOfFields(selectConfig.columns);
     concat(mstrucIds, subs);
     subs = findUnloadEnumMstrucIdOfFields(selectConfig.criterias);
     concat(mstrucIds, subs);
-    await loadEnum(mstrucIds);
+    await loadEnum(serverKey,mstrucIds);
 }
 
-async function loadEnumOfLtmplConfig(selectConfig: LtmplConfig) {
+async function loadEnumOfLtmplConfig(serverKey:string,selectConfig: LtmplConfig) {
     const mstrucIds = [];
     let subs = findUnloadEnumMstrucIdOfFields(selectConfig.columns);
     concat(mstrucIds, subs);
@@ -105,12 +105,12 @@ async function loadEnumOfLtmplConfig(selectConfig: LtmplConfig) {
     concat(mstrucIds, subs);
     subs = findUnloadEnumMstrucIdOfActions(selectConfig.rowActions);
     concat(mstrucIds, subs);
-    await loadEnum(mstrucIds);
+    await loadEnum(serverKey,mstrucIds);
 }
 
-async function loadEnum(mstrucIds: string[], path?: string) {
+async function loadEnum(serverKey:string,mstrucIds: string[], path?: string) {
     if (mstrucIds && mstrucIds.length > 0) {
-        let reqEnum = await HcserviceV3.requestEnum(mstrucIds, path);
+        let reqEnum = await HcserviceV3.requestEnum(serverKey,mstrucIds, path);
         for (let key in reqEnum) {
             let ems = reqEnum[key];
             for (let option of ems) {
@@ -128,22 +128,22 @@ function HCDataSource() {
 
 }
 
-HCDataSource.loadEnumOfFields = async function (fields: FieldBase[]) {
+HCDataSource.loadEnumOfFields = async function (serverKey:string,fields: FieldBase[]) {
     const mstrucIds = findUnloadEnumMstrucIdOfFields(fields);
-    await loadEnum(mstrucIds);
+    await loadEnum(serverKey,mstrucIds);
 }
 
-HCDataSource.loadEnumOfFieldsWithPath = async function (fields: FieldBase[], path: string) {
+HCDataSource.loadEnumOfFieldsWithPath = async function (serverKey:string,fields: FieldBase[], path: string) {
     const mstrucIds = findUnloadEnumMstrucIdOfFields(fields);
-    await loadEnum(mstrucIds, path);
+    await loadEnum(serverKey,mstrucIds, path);
 }
 
-HCDataSource.getOptions = async function (mstrucId: string) {
+HCDataSource.getOptions = async function (serverKey:string,mstrucId: string) {
     if (!mstrucId) {
         return null;
     }
     if (!enumMap.has(mstrucId)) {
-        let reqOptions = await HcserviceV3.requestOptions(mstrucId)[mstrucId];
+        let reqOptions = await HcserviceV3.requestOptions(serverKey,mstrucId)[mstrucId];
         if (reqOptions != null) {
             for (let option of reqOptions) {
                 if (option['css']) {
@@ -158,57 +158,57 @@ HCDataSource.getOptions = async function (mstrucId: string) {
     return enumMap.get(mstrucId);
 }
 
-HCDataSource.requestLtmplConfig = async function (sourceId: string) {
+HCDataSource.requestLtmplConfig = async function (serverKey:string,sourceId: string) {
     if (!ltmplConfigMap.has(sourceId)) {
-        ltmplConfigMap.set(sourceId, await HcserviceV3.requestLtmplConfig(sourceId));
+        ltmplConfigMap.set(sourceId, await HcserviceV3.requestLtmplConfig(serverKey,sourceId));
         //加载枚举
         let res: LtmplConfigRes = ltmplConfigMap.get(sourceId);
-        await loadEnumOfLtmplConfig(res.ltmplConfig);
+        await loadEnumOfLtmplConfig(serverKey,res.ltmplConfig);
     }
     return ltmplConfigMap.get(sourceId);
 };
-HCDataSource.requestL2LtmplConfig = async function (sourceId: string) {
+HCDataSource.requestL2LtmplConfig = async function (serverKey:string,sourceId: string) {
     if (!l2LtmplConfigMap.has(sourceId)) {
-        l2LtmplConfigMap.set(sourceId, await HcserviceV3.requestL2LtmplConfig(sourceId));
+        l2LtmplConfigMap.set(sourceId, await HcserviceV3.requestL2LtmplConfig(serverKey,sourceId));
         //加载枚举
         let res: LtmplConfigRes = l2LtmplConfigMap.get(sourceId);
-        await loadEnumOfLtmplConfig(res.ltmplConfig);
+        await loadEnumOfLtmplConfig(serverKey,res.ltmplConfig);
     }
     return l2LtmplConfigMap.get(sourceId);
 };
 
 
-HCDataSource.requestSelectConfig = async function (sourceId: string) {
+HCDataSource.requestSelectConfig = async function (serverKey:string,sourceId: string) {
     if (!selectConfigMap.has(sourceId)) {
-        selectConfigMap.set(sourceId, await HcserviceV3.requestSelectConfig(sourceId));
+        selectConfigMap.set(sourceId, await HcserviceV3.requestSelectConfig(serverKey,sourceId));
         //加载枚举
-        await loadEnumOfSelectConfig(selectConfigMap.get(sourceId));
+        await loadEnumOfSelectConfig(serverKey,selectConfigMap.get(sourceId));
     }
     return selectConfigMap.get(sourceId);
 };
-HCDataSource.requestDtmplConfig = async function (sourceId: string) {
+HCDataSource.requestDtmplConfig = async function (serverKey:string,sourceId: string) {
     if (!dtmplConfigMap.has(sourceId)) {
-        dtmplConfigMap.set(sourceId, await HcserviceV3.requestDtmplConfig(sourceId));
+        dtmplConfigMap.set(sourceId, await HcserviceV3.requestDtmplConfig(serverKey,sourceId));
         //加载枚举
-        await loadEnumOfDtmplConfig(dtmplConfigMap.get(sourceId));
+        await loadEnumOfDtmplConfig(serverKey,dtmplConfigMap.get(sourceId));
     }
     return dtmplConfigMap.get(sourceId);
 };
 
-HCDataSource.requestViewDtmplConfig = async function (sourceId: string) {
+HCDataSource.requestViewDtmplConfig = async function (serverKey:string,sourceId: string) {
     if (!viewDtmplConfigMap.has(sourceId)) {
-        viewDtmplConfigMap.set(sourceId, await HcserviceV3.requestViewDtmplConfig(sourceId));
+        viewDtmplConfigMap.set(sourceId, await HcserviceV3.requestViewDtmplConfig(serverKey,sourceId));
         //加载枚举
-        await loadEnumOfDtmplConfig(viewDtmplConfigMap.get(sourceId));
+        await loadEnumOfDtmplConfig(serverKey,viewDtmplConfigMap.get(sourceId));
     }
     return viewDtmplConfigMap.get(sourceId);
 };
 
-HCDataSource.requestAddDtmplConfig = async function (sourceId: string) {
+HCDataSource.requestAddDtmplConfig = async function (serverKey:string,sourceId: string) {
     if (!addDtmplConfigMap.has(sourceId)) {
-        addDtmplConfigMap.set(sourceId, await HcserviceV3.requestAddDtmplConfig(sourceId));
+        addDtmplConfigMap.set(sourceId, await HcserviceV3.requestAddDtmplConfig(serverKey,sourceId));
         //加载枚举
-        await loadEnumOfDtmplConfig(addDtmplConfigMap.get(sourceId));
+        await loadEnumOfDtmplConfig(serverKey,addDtmplConfigMap.get(sourceId));
     }
     return addDtmplConfigMap.get(sourceId);
 };