aldehyde 0.2.52 → 0.2.53

package/src/aldehyde/detail/edit/fields-edit-card.tsx

@@ -6,6 +6,7 @@ import {ButtonType} from "antd/es/button";
 import FieldsForm from "../../form/fields-form";
 
 interface FieldsEditCardProps {
+    serverKey:string,
     title?:any,
     height?: any,
     onCancel?: () => void,
@@ -54,7 +55,7 @@ export default class FieldsEditCard extends React.PureComponent<FieldsEditCardPr
 
 
     render() {
-        const {title,height, onOk, fields, value, onCancel, okButtonType, needConfirm, okDanger,onValuesChange} = this.props
+        const {title,height, onOk, fields, value, onCancel, okButtonType, needConfirm, okDanger,onValuesChange,serverKey} = this.props
         const {} = this.state;
 
         function okButton(onOk) {
@@ -93,7 +94,7 @@ export default class FieldsEditCard extends React.PureComponent<FieldsEditCardPr
                 {onCancel ? <Button onClick={onCancel}><CloseOutlined/></Button> : ""}
             </Space></>}
         >
-            <FieldsForm onValuesChange={onValuesChange} fields={fields} formRef={this.formRef}
+            <FieldsForm serverKey={serverKey} onValuesChange={onValuesChange} fields={fields} formRef={this.formRef}
                         value={value}
                         onFinish={onOk} ></FieldsForm>
         </Card>

package/src/aldehyde/detail/edit/modal-row-edit.tsx

@@ -4,6 +4,7 @@ import {DtmplData, FieldGroupConfig} from "../../tmpl/interface";
 import FieldGroupForm from '../../form/field-group-form';
 
 interface ModalRowEditorProps {
+    serverKey:string,
     height?: any,
     open: boolean,
     onOk: (value: DtmplData) => void,
@@ -49,7 +50,7 @@ export default class ModalRowEdit extends React.PureComponent<ModalRowEditorProp
     }
 
     render() {
-        const {height, onOk, onCancel, fieldGroupConfig, open, dtmplData} = this.props
+        const {height, onOk, onCancel, fieldGroupConfig, open, dtmplData,serverKey} = this.props
         const {} = this.state;
         return <Modal
             open={open}
@@ -63,7 +64,7 @@ export default class ModalRowEdit extends React.PureComponent<ModalRowEditorProp
             onOk={this.onOk}
             onCancel={onCancel}
         >
-            <FieldGroupForm fieldGroupConfig={fieldGroupConfig} formRef={this.formRef}
+            <FieldGroupForm serverKey={serverKey} fieldGroupConfig={fieldGroupConfig} formRef={this.formRef}
                             onFinish={onOk}
                             dtmplData={dtmplData} />
         </Modal>

package/src/aldehyde/detail/edit/row-edit-card.tsx

@@ -6,6 +6,7 @@ import FieldGroupForm from '../../form/field-group-form';
 import {ButtonType} from "antd/es/button";
 
 interface RowEditCardProps {
+    serverKey:string,
     height?: any,
     onCancel?: () => void,
     onOk: (value: DtmplData,hidden:boolean) => void,
@@ -70,7 +71,7 @@ export default class RowEditCard extends React.PureComponent<RowEditCardProps, R
     }
 
     render() {
-        const {height, onOk, fieldGroupConfig, dtmplData, onCancel, okButtonType, needConfirm, okDanger} = this.props
+        const {height, onOk, fieldGroupConfig, dtmplData, onCancel, okButtonType, needConfirm, okDanger,serverKey} = this.props
         const {isAdded} = this.state;
 
         function okButton(onOk) {
@@ -116,7 +117,7 @@ export default class RowEditCard extends React.PureComponent<RowEditCardProps, R
                 {onCancel ? <Button onClick={onCancel}><CloseOutlined/></Button> : ""}
             </Space></>}
         >
-            <FieldGroupForm fieldGroupConfig={fieldGroupConfig} formRef={this.formRef}
+            <FieldGroupForm serverKey={serverKey} fieldGroupConfig={fieldGroupConfig} formRef={this.formRef}
                             onFinish={(value)=>onOk(value,!isAdded)}
                             dtmplData={dtmplData} />
         </Card>

package/src/aldehyde/detail/edit/row-editor.tsx

@@ -4,6 +4,7 @@ import {DtmplData, FieldGroupConfig} from "../../tmpl/interface";
 import {RenderFunction} from "antd/lib/tooltip";
 import RowEditCard from './row-edit-card'
 interface RowEditorProps {
+    serverKey:string,
     buttonTitle?: string,
     buttonIcon: React.ReactNode,
     tooltipTitle?: React.ReactNode | RenderFunction;
@@ -52,9 +53,9 @@ export default class RowEditor extends React.PureComponent<RowEditorProps, RowEd
 
     render() {
         const {popoverOpen}=this.state;
-        const { disabled, buttonIcon, buttonTitle, tooltipTitle, fieldGroupConfig, dtmplData,buttonStyle} = this.props;
+        const { disabled, buttonIcon, buttonTitle, tooltipTitle, fieldGroupConfig, dtmplData,buttonStyle,serverKey} = this.props;
         return <Popover  destroyTooltipOnHide={true} placement="leftBottom" open={popoverOpen}
-                        content={<RowEditCard fieldGroupConfig={fieldGroupConfig} dtmplData={dtmplData}
+                        content={<RowEditCard serverKey={serverKey} fieldGroupConfig={fieldGroupConfig} dtmplData={dtmplData}
                                               onCancel={()=>{
                                                   this.setState({popoverOpen:false});}
                                               }   onOk={this.onOk}></RowEditCard>} trigger="click">

package/src/aldehyde/detail/view/act-dtmpl-view.tsx

@@ -40,8 +40,8 @@ class ActDtmplView extends React.PureComponent<ActDtmplViewProps, ActDtmplViewSt
     }
 
     async componentDidMount() {
-        const { sourceId} = this.props;
-        let dtmplConfig = await HCDataSource.requestViewDtmplConfig(sourceId);
+        const { sourceId,serverKey} = this.props;
+        let dtmplConfig = await HCDataSource.requestViewDtmplConfig(serverKey,sourceId);
         this.setState({
             dtmplConfig,
         })
@@ -80,7 +80,7 @@ class ActDtmplView extends React.PureComponent<ActDtmplViewProps, ActDtmplViewSt
     }
 
     render() {
-        const {showRightNav, rightBarPositionRight, code,  sourceId,goDtmpl} = this.props;
+        const {showRightNav, rightBarPositionRight, code,  sourceId,goDtmpl,serverKey} = this.props;
         const {dtmplConfig, premisesTitle, loading, layout, snapshotOpen,refreshCode} = this.state;
         const buttons = dtmplConfig ? dtmplConfig.buttons : undefined;
         const premises = dtmplConfig ? dtmplConfig.premises : undefined;
@@ -115,13 +115,13 @@ class ActDtmplView extends React.PureComponent<ActDtmplViewProps, ActDtmplViewSt
                                 title="刷新"
                                 onClick={this.doRefresh}
                             ><ReloadOutlined/></Button>
-                            <SnapshotTimeline dtmplConfig={dtmplConfig} code={code} onClose={this.onSnapshotClose}
+                            <SnapshotTimeline serverKey={serverKey} dtmplConfig={dtmplConfig} code={code} onClose={this.onSnapshotClose}
                                               showSnapshot={this.toSnapshot} sourceId={sourceId}
                                               open={snapshotOpen}></SnapshotTimeline>
                         </div>
                     </h3>
                 </Card>
-                <DtmplView refreshCode={refreshCode} showRightNav={showRightNav_} rightBarPositionRight={rightBarPositionRight}
+                <DtmplView serverKey={serverKey} refreshCode={refreshCode} showRightNav={showRightNav_} rightBarPositionRight={rightBarPositionRight}
                            dtmplConfig={dtmplConfig} sourceId={sourceId}
                            code={code}></DtmplView>
             </div>

package/src/aldehyde/detail/view/dtmpl-view.tsx

@@ -55,12 +55,12 @@ class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
     }
 
     loadData = async () => {
-        const { sourceId, code, versionId} = this.props;
+        const { sourceId, code, versionId,serverKey} = this.props;
         if (code) {
             this.setState({
                 loading: true,
             })
-            const dtmplData = await HcserviceV3.requestViewDtmplData( sourceId, code, versionId);
+            const dtmplData = await HcserviceV3.requestViewDtmplData(serverKey, sourceId, code, versionId);
             this.setState({
                 dtmplData, loading:false,
             })
@@ -72,7 +72,7 @@ class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
     }
 
     fieldGroupList = () => {
-        const {dtmplConfig} = this.props;
+        const {dtmplConfig,serverKey} = this.props;
         const { dtmplData, loading,id} = this.state;
 
         let groups: FieldGroupConfig[] = [];
@@ -89,7 +89,7 @@ class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
                         // console.log("dtmplData", dtmplData );
                         // console.log("dtmplData data", data );
                         // console.log("initCollapsed", dtmplData && (!data || data.length<=0));
-                        return <RelationTable initCollapse={ dtmplData && (!data || data.length<=0)} loading={loading} parentId={id} key={item.id} fieldGroupConfig={item} value={data}
+                        return <RelationTable serverKey={serverKey} initCollapse={ dtmplData && (!data || data.length<=0)} loading={loading} parentId={id} key={item.id} fieldGroupConfig={item} value={data}
                                               viewOrEdit={"view"}/>
                     }
                 } else {//字段组
@@ -101,7 +101,7 @@ class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
                         headStyle={{background: "#f2f4f5"}}
                         loading={loading}
                     >
-                        <FieldViewGroup fields={item.fields} valueMap={dtmplData ? dtmplData.fieldMap : undefined}
+                        <FieldViewGroup serverKey={serverKey} fields={item.fields} valueMap={dtmplData ? dtmplData.fieldMap : undefined}
                                         width={220}></FieldViewGroup>
                     </CollapseCard>
                 }
@@ -111,7 +111,7 @@ class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
     }
 
     render() {
-        const {showRightNav, rightBarPositionRight, code,  sourceId,dtmplConfig} = this.props;
+        const {showRightNav, rightBarPositionRight, code,  sourceId,dtmplConfig,serverKey} = this.props;
         const {premisesTitle, loading, dtmplData, layout, snapshotOpen,id} = this.state;
         const premises = dtmplConfig ? dtmplConfig.premises : undefined;
 
@@ -129,7 +129,7 @@ class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
                         headStyle={{background: "#f2f4f5"}}
                         loading={loading}
                     >
-                        <FieldViewGroup
+                        <FieldViewGroup serverKey={serverKey}
                             fields={premises}/>
                     </CollapseCard>
                     : ""
@@ -137,7 +137,7 @@ class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
                 {showRightNav ?
                     <RightBar parentId={id} positionRight={rightBarPositionRight} dtmplConfig={dtmplConfig}/> : ""
                 }
-                <CqueryButtonBar  dtmplConfig={dtmplConfig} mainCode={code}></CqueryButtonBar>
+                <CqueryButtonBar serverKey={serverKey}  dtmplConfig={dtmplConfig} mainCode={code}></CqueryButtonBar>
             </div>
         );
     }

package/src/aldehyde/detail/view/field-view-group.tsx

@@ -5,6 +5,7 @@ import ViewControl from '../../controls/view-control';
 
 
 interface FieldViewGroupProps {
+    serverKey:string,
     fields: FieldConfig[],
     valueMap?: object,
     width?: number,
@@ -24,7 +25,7 @@ export default class FieldViewGroup extends React.PureComponent<FieldViewGroupPr
     }
 
     initViewList = () => {
-        const {fields, valueMap} = this.props
+        const {fields, valueMap,serverKey} = this.props
         const formItemList = [];
 
         if (fields.length > 0) {
@@ -39,7 +40,7 @@ export default class FieldViewGroup extends React.PureComponent<FieldViewGroupPr
                     const formItem = <Descriptions.Item  label={item.title} span={item.colNum} key={index}
                                                          className='labelcss'
                     >
-                        <ViewControl holderType={'descriptions'} value={fieldValue} fieldConfig={item}/>
+                        <ViewControl serverKey={serverKey} holderType={'descriptions'} value={fieldValue} fieldConfig={item}/>
                     </Descriptions.Item>
                     formItemList.push(formItem);
                 }

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

@@ -32,7 +32,7 @@ export default class ModalDtmplView extends React.PureComponent<ModalDtmplViewPr
 
     render() {
         // console.log('antdModalProps:',this.antdModalProps);
-        const {height,onOk,onCancel,code,style,sourceId,open} = this.props
+        const {height,onOk,onCancel,code,style,sourceId,open,serverKey} = this.props
         //console.log('antdModalProps code :',code);
         //const {code} = this.state;o
         return <Modal
@@ -49,7 +49,7 @@ export default class ModalDtmplView extends React.PureComponent<ModalDtmplViewPr
                     取 消
                 </Button>]}
         >
-            {code?<ActDtmplView showRightNav={false} sourceId={sourceId}  code={code} />:""}
+            {code?<ActDtmplView serverKey={serverKey} showRightNav={false} sourceId={sourceId}  code={code} />:""}
         </Modal>
     }
 

package/src/aldehyde/detail/view/snapshot-timeline.tsx

@@ -8,6 +8,7 @@ import DtmplView from "./dtmpl-view";
 
 export interface SnapshotTimelineProps {
     sourceId: string;
+    serverKey:string,
     code: string;
     showSnapshot?: (id: number) => void;
     onClose: () => void;
@@ -43,13 +44,13 @@ class SnapshotTimeline extends React.PureComponent<SnapshotTimelineProps, Snapsh
     }
 
     loadData = async () => {
-        const {sourceId, code, showSnapshot} = this.props;
+        const {sourceId, code, showSnapshot,serverKey} = this.props;
         const {current} = this.state;
         if (code) {
             this.setState({
                 loading: true,
             })
-            const list = await HcserviceV3.requestVersionList( sourceId, code);
+            const list = await HcserviceV3.requestVersionList(serverKey, sourceId, code);
             this.setState({
                 list, current: !current && list.length > 0 ? list[0].code : current,
                 loading: false,
@@ -90,7 +91,7 @@ class SnapshotTimeline extends React.PureComponent<SnapshotTimelineProps, Snapsh
     }
 
     render() {
-        const {open, onClose, dtmplConfig, sourceId,  code} = this.props;
+        const {open, onClose, dtmplConfig, sourceId,  code,serverKey} = this.props;
         const {list, current} = this.state;
         return (
             <>
@@ -117,7 +118,7 @@ class SnapshotTimeline extends React.PureComponent<SnapshotTimelineProps, Snapsh
                         maxWidth: 1960,
                     }}
                 >
-                    <DtmplView showRightNav={false} dtmplConfig={dtmplConfig} sourceId={sourceId}
+                    <DtmplView serverKey={serverKey} showRightNav={false} dtmplConfig={dtmplConfig} sourceId={sourceId}
                                 code={code} versionId={current}></DtmplView>
                 </Drawer>
             </>

package/src/aldehyde/exportor/export-frame.tsx

@@ -9,6 +9,7 @@ type ExportStatus = 'ready'|'exporting' | 'success'|'fail' |'stop';
 type ExportMode = 'current'|'all';
 interface ExportFrameProps {
     defaultExportMode?:string,
+    serverKey:string,
     queryKey: QueryKey;
     currentPage?:PageInfo;
     title:string;
@@ -70,7 +71,7 @@ export default class ExportFrame extends React.PureComponent<ExportFrameProps, E
     }
 
     handleStart=()=>{
-        const {queryKey,currentPage,title }=this.props
+        const {queryKey,currentPage,title,serverKey }=this.props
         const { startPageNo,endPageNo,exportMode }=this.state
 
         this.setState({
@@ -79,6 +80,7 @@ export default class ExportFrame extends React.PureComponent<ExportFrameProps, E
 
         Super.super({
             url:`/v3/ltmp/data/exporter`,
+            serverKey,
             method:'GET',
             query:{
                 scope:exportMode,
@@ -106,9 +108,11 @@ export default class ExportFrame extends React.PureComponent<ExportFrameProps, E
 		})
     }
     statusOut=(exportId)=>{
+        const {serverKey}=this.props;
         const {exportStatus}=this.state;
         Super.super({
             url:`/v3/exporter/status`,
+            serverKey,
             query:{
                 interrupted:exportStatus=='stop',
                 exportId
@@ -151,10 +155,10 @@ export default class ExportFrame extends React.PureComponent<ExportFrameProps, E
 		})
     }
     download=()=>{
-        const {title}=this.props;
+        const {title,serverKey}=this.props;
         const {exportId}=this.state;
         const hydrocarbonToken=Units.hydrocarbonToken();
-        Units.downloadFile(Units.joinPath(Units.api(),`/v3/exporter/excel?exportId=${exportId}&@token=${hydrocarbonToken}&@programToken=${Units.programCode()}`),title)
+        Units.downloadFile(Units.joinPath(Units.api(serverKey),`/v3/exporter/excel?exportId=${exportId}&@token=${hydrocarbonToken}&@programToken=${Units.programCode(serverKey)}`),title)
     }
 
     handleCancel=()=>{

package/src/aldehyde/form/criteria-form.tsx

@@ -9,6 +9,7 @@ const {Panel} = Collapse;
 const FormItem = AntdForm.Item;
 
 export interface CriteriaFormProps {
+    serverKey:string;
     ltmplConfig: LtmplConfig | SelectConfig;
     data: object;
     selectedRows: SelectedRow[];
@@ -26,7 +27,7 @@ export interface CriteriaFormProps {
 
 const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
 
-    const {ltmplConfig, doSearch, doAction, doJump, doDelete, selectedRows, data, open, loading, selectedDatas, doCQuery} = props;
+    const {ltmplConfig, doSearch, doAction, doJump, doDelete, selectedRows, data, open, loading, selectedDatas, doCQuery,serverKey} = props;
     let [form] = AntdForm.useForm();
     // @ts-ignore
     let {buttons, actions, jumps, cQuerys, criterias, drillingParams, columns} = ltmplConfig;
@@ -58,7 +59,7 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
                     }
                 }
 
-                return <Action hiddenType={"disabled"} key={action.id} disabled={disabled} data={selectedDatas}
+                return <Action serverKey={serverKey} hiddenType={"disabled"} key={action.id} disabled={disabled} data={selectedDatas}
                                actionConfig={action} doAction={doAction} serial={1}></Action>
             });
         }
@@ -79,13 +80,14 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
     }
 
     const renderCQuery = () => {
+        const {serverKey}=props;
         if (doCQuery && cQuerys && cQuerys.length > 0) {
             return cQuerys.map((cquery) => {
                 let disabled = true;
                 if (selectedRows && selectedRows.length == 1) {
                     disabled = false;
                 }
-                return <CquickButton key={cquery.id}
+                return <CquickButton serverKey={serverKey} key={cquery.id}
                                      disabled={disabled} cQueryConfig={cquery}
                                      mainCode={!disabled ? selectedRows[0].code : undefined}/>;
             });
@@ -142,7 +144,7 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
         if (!criterias) {
             return;
         }
-        const {hiddenCriteriaIds} = props;
+        const {hiddenCriteriaIds,serverKey} = props;
         criterias.map((item) => {
             let formItemName = 'c_' + item.id;
             let fieldValue = data ? data[formItemName] : undefined;
@@ -159,7 +161,7 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
                                      rules={item.required ? [{
                                          required: true, message: `请选择${item.title}`,
                                      }] : undefined}>
-                        <EntryControl mainCode={props.mainCode} value={fieldValue} fieldConfig={item}/>
+                        <EntryControl serverKey={serverKey} mainCode={props.mainCode} value={fieldValue} fieldConfig={item}/>
                     </FormItem>
                 }
             })

package/src/aldehyde/form/dtmpl-form.tsx

@@ -46,13 +46,13 @@ export default class DtmplForm extends React.PureComponent<DtmplFormProps, Dtmpl
     }
 
     loadData = async () => {
-        const { sourceId, code, formRef,dtmplData,dtmplConfig} = this.props;
+        const { sourceId, code, formRef,dtmplData,dtmplConfig,serverKey} = this.props;
         let dtmplData_;
         if (code) {
             this.setState({
                 loading: true,
             })
-            dtmplData_= await HcserviceV3.requestDtmplData( sourceId, code, null);
+            dtmplData_= await HcserviceV3.requestDtmplData(serverKey, sourceId, code, null);
 
         }else if(dtmplData){
             dtmplData_=dtmplData;
@@ -93,13 +93,13 @@ export default class DtmplForm extends React.PureComponent<DtmplFormProps, Dtmpl
         this.setState({
             loading:true,
         })
-        const {sourceId, code,dtmplData} = this.props;
+        const {sourceId, code,dtmplData,serverKey} = this.props;
         if (code) { //有code是修改，没有是新增实体模板
             result['唯一编码'] = code;
         }else if(dtmplData && dtmplData.code){
             result['唯一编码'] = dtmplData.code;
         }
-        let res = await HcserviceV3.postDtmplData(sourceId, result, message);
+        let res = await HcserviceV3.postDtmplData(serverKey,sourceId, result, message);
         this.setState({
             loading:false,
         })
@@ -145,7 +145,7 @@ export default class DtmplForm extends React.PureComponent<DtmplFormProps, Dtmpl
 
     fieldGroupList = (dtmplConfig:DtmplConfig,dtmplData:DtmplData) => {
 
-        const {parentId,maxColsOnRow,mainCode,formRef} = this.props;
+        const {parentId,maxColsOnRow,mainCode,formRef,serverKey} = this.props;
         const {loading} = this.state;
 
         let groups: FieldGroupConfig[]=[];
@@ -160,7 +160,7 @@ export default class DtmplForm extends React.PureComponent<DtmplFormProps, Dtmpl
                         if (dtmplData) {
                             data = dtmplData.arrayMap[item.id];
                         }
-                        return <RelationTable mainCode={mainCode?mainCode:parentId} loading={loading} parentId={parentId}  key={item.id} fieldGroupConfig={item} value={data}
+                        return <RelationTable serverKey={serverKey} mainCode={mainCode?mainCode:parentId} loading={loading} parentId={parentId}  key={item.id} fieldGroupConfig={item} value={data}
                                               viewOrEdit={"edit"} onChange={this.onGroupChange}/>
                     }
                 } else {//字段组
@@ -174,7 +174,7 @@ export default class DtmplForm extends React.PureComponent<DtmplFormProps, Dtmpl
                         bodyStyle={{padding:'6px'}}
                     >
 
-                        <FormItemGroup formRef={formRef} mainCode={mainCode} maxColsOnRow={maxColsOnRow} fields={item?item.fields:undefined} valueMap={dtmplData ? dtmplData.fieldMap : undefined}
+                        <FormItemGroup serverKey={serverKey} formRef={formRef} mainCode={mainCode} maxColsOnRow={maxColsOnRow} fields={item?item.fields:undefined} valueMap={dtmplData ? dtmplData.fieldMap : undefined}
                             ></FormItemGroup>
 
 
@@ -194,7 +194,7 @@ export default class DtmplForm extends React.PureComponent<DtmplFormProps, Dtmpl
     }
    // nameValue = AntdForm.useWatch(this.props.dtmplConfig.groups[0].fields[0].id, this.props.formRef.current);
     render() {
-        const {formRef,dtmplConfig, code,parentId,showHeader} = this.props;
+        const {formRef,dtmplConfig, code,parentId,showHeader,serverKey} = this.props;
         const {currentDtmplData,appDtmplConfig}=this.state;
         if(!dtmplConfig){
            return <Card loading={true}>
@@ -243,7 +243,7 @@ export default class DtmplForm extends React.PureComponent<DtmplFormProps, Dtmpl
                         headStyle={{background: "#f2f4f5"}}
                         // loading={loading}
                     >
-                        <FieldViewGroup
+                        <FieldViewGroup serverKey={serverKey}
                             fields={premises}/>
                     </CollapseCard>
                     : ""

package/src/aldehyde/form/field-group-form.tsx

@@ -9,6 +9,7 @@ import Units from '../units'
 
 
 export interface FieldGroupFormProps  {
+    serverKey:string,
     fieldGroupConfig: FieldGroupConfig,
     formRef?: RefObject<FormInstance>,
     dtmplData?:DtmplData,
@@ -59,12 +60,12 @@ export default class Form extends React.PureComponent<FieldGroupFormProps, Field
     }
 
     render() {
-        const {formRef, fieldGroupConfig, dtmplData} = this.props;
+        const {formRef, fieldGroupConfig, dtmplData,serverKey} = this.props;
         return (
             <>
                 <AntdForm labelWrap={true} ref={formRef} name="control-hooks" onFinish={this.onSubmit}>
                     {this.selectRelation()}
-                    <FormItemGroup formRef={formRef} nameAttr={'id'} fields={fieldGroupConfig?fieldGroupConfig.fields:undefined} valueMap={dtmplData?dtmplData.fieldMap:{}}></FormItemGroup>
+                    <FormItemGroup serverKey={serverKey} formRef={formRef} nameAttr={'id'} fields={fieldGroupConfig?fieldGroupConfig.fields:undefined} valueMap={dtmplData?dtmplData.fieldMap:{}}></FormItemGroup>
                 </AntdForm>
             </>
         );

package/src/aldehyde/form/fields-form.tsx

@@ -7,6 +7,7 @@ import FormItemGroup from './form-Item-group';
 
 
 export interface FieldsFormProps {
+    serverKey:string,
     fields: FieldConfig[],
     formRef?: RefObject<FormInstance>,
     value?: object,
@@ -27,11 +28,11 @@ export default class FieldsForm extends React.PureComponent<FieldsFormProps, Fie
 
 
     render() {
-        const {formRef, fields, value,onFinish,onValuesChange} = this.props;
+        const {formRef, fields, value,onFinish,onValuesChange,serverKey} = this.props;
         return (
             <>
                 <AntdForm onValuesChange={onValuesChange} labelWrap={true} ref={formRef} name="control-hooks" onFinish={onFinish}>
-                    <FormItemGroup formRef={formRef} nameAttr={'id'} fields={fields}
+                    <FormItemGroup serverKey={serverKey} formRef={formRef} nameAttr={'id'} fields={fields}
                                    valueMap={value}></FormItemGroup>
                 </AntdForm>
             </>

package/src/aldehyde/form/form-Item-group.tsx

@@ -8,6 +8,7 @@ import {FormInstance} from "antd/lib/form/hooks/useForm";
 const FormItem = Form.Item
 
 export interface FieldGroupProps {
+    serverKey:string,
     fields: FieldConfig[],
     nameAttr?: string,
     valueMap: object,
@@ -70,7 +71,7 @@ export default class FormItemGroup extends React.PureComponent<FieldGroupProps,
         return fieldConfig;
     }
     initFormItem = (fieldConfig: FieldConfig, fieldValue) => {
-        const { nameAttr, maxColsOnRow, mainCode} = this.props
+        const { nameAttr, maxColsOnRow, mainCode,serverKey} = this.props
         let item = this.getFieldConfig(fieldConfig);
         const title = item.title;
         // let fieldValue = valueMap ? valueMap[item.id] : undefined;
@@ -88,13 +89,13 @@ export default class FormItemGroup extends React.PureComponent<FieldGroupProps,
                          rules={item.required ? [{
                              required: true, message: `请输入${title}`,
                          }] : undefined}>
-            <EntryControl mainCode={this.getMainCode(item, mainCode)}
+            <EntryControl serverKey={serverKey} mainCode={this.getMainCode(item, mainCode)}
                           value={fieldValue} fieldConfig={item}/>
         </FormItem>
     }
 
     initFormList = () => {
-        const {fields, valueMap, nameAttr, maxColsOnRow, mainCode} = this.props
+        const {fields, valueMap, nameAttr, maxColsOnRow, mainCode,serverKey} = this.props
         const formItemList = [];
 
         if (fields && fields.length > 0) {
@@ -107,7 +108,7 @@ export default class FormItemGroup extends React.PureComponent<FieldGroupProps,
                     formItem = <FormItem hidden={true}
                                          initialValue={fieldValue}
                                          name={item[nameAttr]} key={item.id}>
-                        <EntryControl mainCode={this.getMainCode(item, mainCode)} value={fieldValue}
+                        <EntryControl serverKey={serverKey} mainCode={this.getMainCode(item, mainCode)} value={fieldValue}
                                       fieldConfig={item}/>
                     </FormItem>
                 } else {

package/src/aldehyde/import/excel-import.tsx

@@ -14,6 +14,7 @@ type LogLevel = 'INFO'| 'SUC'|'ERROR'|'WARN';
 type ImportStatus = 'waitingFile'| 'fileSelected' |'importing' | 'success'|'fail' |'stop';
 const { Text } = Typography;
 interface ExcelImportProps  {
+    serverKey:string,
     sourceId:string,
 };
 
@@ -50,9 +51,9 @@ export default class ExcelImport extends React.PureComponent<ExcelImportProps, E
     timerId=undefined;
 
    async componentDidMount(){
-       const {sourceId}=this.props;
+       const {sourceId,serverKey}=this.props;
 
-        let ltmplConfigRes = await HCDataSource.requestLtmplConfig(sourceId);
+        let ltmplConfigRes = await HCDataSource.requestLtmplConfig(serverKey,sourceId);
 
         this.setState({
             ltmplConfig:ltmplConfigRes.ltmplConfig,
@@ -68,7 +69,7 @@ export default class ExcelImport extends React.PureComponent<ExcelImportProps, E
 
 
     handleUpload = () => {
-        const {sourceId}=this.props;
+        const {sourceId,serverKey}=this.props;
         const { importFile } = this.state;
         const formData = new FormData();
         formData.append('file', importFile);
@@ -76,6 +77,7 @@ export default class ExcelImport extends React.PureComponent<ExcelImportProps, E
 
         Super.super({
             url:`/v3/ltmpl/importer`,
+            serverKey,
             method:'POST',
             data:formData,   
 		},"formdata").then((res)=>{
@@ -101,9 +103,11 @@ export default class ExcelImport extends React.PureComponent<ExcelImportProps, E
     }
 
     handleStatus=(importId)=>{
+       const {serverKey}=this.props;
         const {maxMsgCount,importStatus}=this.state
         Super.super({
             url:`/v3/importer/status`,
+            serverKey,
             method:'GET',
             query:{
                 importId:importId,

package/src/aldehyde/layout/menu/l2menu-message-bar.tsx

@@ -41,13 +41,13 @@ class L2MenuMessageBar extends React.PureComponent<L2MenuMessageBarProps, L2Menu
            };
            let that=this;
             setInterval(async () => {
-                let count = await HcserviceV3.requestLtmplCount(item.id);
+                let count = await HcserviceV3.requestLtmplCount(null,item.id);
                 messageBar.count = count;
                 this.setState({
                     anyState:!this.state.anyState,
                 });
             }, 180000);
-            let count = await HcserviceV3.requestLtmplCount(item.id);
+            let count = await HcserviceV3.requestLtmplCount(null,item.id);
             messageBar.count=count;
             messageBars.push(messageBar);
         }

package/src/aldehyde/layout/menu/l2menu-quick-bar.tsx

@@ -124,7 +124,7 @@ class L2MenuQuickBar extends React.PureComponent<L2MenuQuickBarProps, L2MenuQuic
                         </Space>
                     }
                 >
-                   <LtmplTable sourceId={currentId}></LtmplTable>
+                   <LtmplTable serverKey={null} sourceId={currentId}></LtmplTable>
                 </Drawer>
             </>
         );

package/src/aldehyde/layout/menu/userinfo-bar.tsx

@@ -43,7 +43,7 @@ class UserInfoBar extends React.PureComponent<UserInfoBarProps, UserInfoBarState
             <>{userCode?
                 <>
                 <span onClick={this.showDraw}>个人信息</span>
-                {showDraw  ?<DtmplViewDrawer editable={editable} title={'个人信息'} width={'calc(100% - 280px)'}  sourceId={gtmplSourceId} open={showDraw} code={userCode} onClose={this.closeDrawer}></DtmplViewDrawer>:null}
+                {showDraw  ?<DtmplViewDrawer serverKey={null} editable={editable} title={'个人信息'} width={'calc(100% - 280px)'}  sourceId={gtmplSourceId} open={showDraw} code={userCode} onClose={this.closeDrawer}></DtmplViewDrawer>:null}
            </>:null } </>
         );
     }