aldehyde 0.2.52 → 0.2.53

package/src/aldehyde/controls/action/index.tsx

@@ -15,6 +15,7 @@ export  type ActionButtonType = 'primary-block' | 'dashed' | 'primary'
 export  type ActionButtonHiddenType = 'hidden' | 'disabled'
 
 interface ActionProps {
+    serverKey:string,
     disabled?: boolean,
     actionConfig: ActionConfig,
     data?: DtmplData[] |object[],
@@ -136,7 +137,7 @@ export default class Action extends React.PureComponent<ActionProps, ActionState
 
     formButton = () => {
         const {popoverOpen} = this.state;
-        const {actionConfig, doAction, data, disabled, buttonType,hiddenType, buttonSize} = this.props;
+        const {actionConfig, doAction, data, disabled, buttonType,hiddenType, buttonSize,serverKey} = this.props;
         let disabled_ = disabled;
         if (!this.isShow()) {
             if (!hiddenType || hiddenType == 'hidden') {
@@ -146,7 +147,7 @@ export default class Action extends React.PureComponent<ActionProps, ActionState
             }
         }
         return <Popover placement="bottom" open={popoverOpen} trigger="click" content={
-            <FieldsEditCard okDanger={actionConfig.beforeExeConfirm == 'danger'} needConfirm={true} title={actionConfig.title} onCancel={() => this.onCancel()} fields={actionConfig.writes}
+            <FieldsEditCard serverKey={serverKey} okDanger={actionConfig.beforeExeConfirm == 'danger'} needConfirm={true} title={actionConfig.title} onCancel={() => this.onCancel()} fields={actionConfig.writes}
                             value={this.getValue()} onOk={this.onOk}
                             onValuesChange={this.onValuesChange}/>}>
             <Button danger={actionConfig.beforeExeConfirm == 'danger'} type={this.getButtonType()} block={this.blockButton()} size={buttonSize}

package/src/aldehyde/controls/cascader/index.tsx

@@ -45,8 +45,8 @@ export default class Cascader extends React.PureComponent<CascaderProps, Cascade
     }
 
     getOptions=async ()=>{
-        const { fieldConfig,baseValue }=this.props
-       let options= await HCDataSource.getOptions(fieldConfig.mstrucId);
+        const { fieldConfig,baseValue,serverKey }=this.props
+       let options= await HCDataSource.getOptions(serverKey,fieldConfig.mstrucId);
 		const ops=[]
         let newOptions=[];
 
@@ -55,8 +55,7 @@ export default class Cascader extends React.PureComponent<CascaderProps, Cascade
         //先根据 baseValue 过滤一层
         if(baseValue.length>0){
             baseValue.map((v,i)=>{
-                if(i>0){
-                    currentOptions[0].subOptions=[];
+                if(i>0){currentOptions[0].subOptions=[];
                     currentOptions= currentOptions[0].subOptions;
                 }
                 if(nextOptions){

package/src/aldehyde/controls/chemstruc/graph.tsx

@@ -45,12 +45,12 @@ export default class ChemStruc extends React.PureComponent<ChemStrucProps, ChemS
 
 
     loadData = async () => {
-        const {value} = this.props
+        const {value,serverKey} = this.props
         if (value) {
             let val = JSON.parse(value);
             let molFile
             if (val.valid == true) {//此处要优化
-                molFile = await HcserviceV3.loadFileTxt(val.base.path);
+                molFile = await HcserviceV3.loadFileTxt(serverKey,val.base.path);
             } else if (val.valid == 'new') {
                 molFile = val.body;
             } else {

package/src/aldehyde/controls/cquery/cquick-button.tsx

@@ -11,6 +11,7 @@ interface CquickButtonProps extends ButtonProps{
     mainCode:string;
     cQueryConfig:CQueryConfig;
     pageType:PageType;
+    serverKey:string,
 }
 
 interface CquickButtonState {
@@ -48,7 +49,7 @@ class CquickButton extends React.PureComponent<CquickButtonProps, CquickButtonSt
 
 
     render() {
-        const {cQueryConfig,mainCode,type,pageType,...button}=this.props;
+        const {cQueryConfig,mainCode,type,pageType,serverKey,...button}=this.props;
         const {showDraw,} = this.state;
         //console.log("cQuery mainCode",mainCode);
        let mcode=mainCode && mainCode.indexOf("@R@")>0?mainCode.split("@R@")[0]:mainCode;
@@ -65,7 +66,7 @@ class CquickButton extends React.PureComponent<CquickButtonProps, CquickButtonSt
                 }}>{outlinedMap[cQueryConfig.title]?outlinedMap[cQueryConfig.title]:cQueryConfig.title}</Button>}
                 {!showDraw?null:
                     cQueryConfig.type=='edit'?
-                         <DtmplEditPage pageType={pageType} open={showDraw} onCancel={()=>{
+                         <DtmplEditPage serverKey={serverKey} pageType={pageType} open={showDraw} onCancel={()=>{
                             this.setState({
                                 showDraw:false,
                             })}}
@@ -91,7 +92,7 @@ class CquickButton extends React.PureComponent<CquickButtonProps, CquickButtonSt
                             }
                         >
                             {cQueryConfig.path?  React.createElement(Units.getCustomPage(cQueryConfig.path)):
-                                <LtmplTable sourceId={cQueryConfig.id} mainCode={mcode}></LtmplTable>
+                                <LtmplTable serverKey={serverKey} sourceId={cQueryConfig.id} mainCode={mcode}></LtmplTable>
                             }
                         </Drawer>
                 }

package/src/aldehyde/controls/entity-select/entity-select.tsx

@@ -121,11 +121,11 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
     }
 
     loadLtmplConfig=async ()=>{
-        const {fieldConfig}=this.props;
+        const {fieldConfig,serverKey}=this.props;
         const { ltmplConfig} = this.state;
         let ltmplConfig_ = ltmplConfig;
         if (!ltmplConfig_) {
-            ltmplConfig_ = (await HCDataSource.requestLtmplConfig(fieldConfig.id)).ltmplConfig;
+            ltmplConfig_ = (await HCDataSource.requestLtmplConfig(serverKey,fieldConfig.id)).ltmplConfig;
         }
         this.setState({
             ltmplConfig:ltmplConfig_
@@ -298,7 +298,7 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
     }
 
     fetchOptions = async (searchText) => {
-        const {fieldConfig, mainCode, baseCriteria} = this.props;
+        const {fieldConfig, mainCode, baseCriteria,serverKey} = this.props;
         const {optionsCache, ltmplConfig,preMainCode} = this.state;
         const currentMainCode=mainCode?mainCode:fieldConfig.mainCode
         if(preMainCode!=currentMainCode){
@@ -353,7 +353,7 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
             //     }
             // }
             criteriaData[formItemName] = searchText;
-            let queryKey: QueryKey = await HcserviceV3.requestLtmplQueryKey(fieldConfig.id, {
+            let queryKey: QueryKey = await HcserviceV3.requestLtmplQueryKey(serverKey,fieldConfig.id, {
                 ...criteriaData, ...pageInfo,
                 mainCode:currentMainCode,
             });
@@ -428,9 +428,9 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
 
 
     loadData = async (queryKey: string, pageInfo: PageInfo, titleId: string): Promise<LoadDataSource> => {
-        const {onEntityClick, baseCriteria} = this.props;
+        const {onEntityClick, baseCriteria,serverKey} = this.props;
 
-        let queryData: QueryData = await HcserviceV3.requestQueryData(queryKey, pageInfo);
+        let queryData: QueryData = await HcserviceV3.requestQueryData(serverKey,queryKey, pageInfo);
         let options: object[] = [];
         pageInfo = queryData.pageInfo;
         queryData.entities.forEach((item, index) => {
@@ -468,7 +468,7 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
     }
 
     render() {
-        const {id, value, fieldConfig, onChange, disabled, style, maxSelected, onEntityClick,mainCode} = this.props;
+        const {id, value, fieldConfig, onChange, disabled, style, maxSelected, onEntityClick,mainCode,serverKey} = this.props;
         const {actions}=fieldConfig;
         const {optionCacheKey, loading, optionsCache, drawCode, showEdit, showView,showTable,ltmplConfig} = this.state;
 
@@ -525,19 +525,19 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
             }}>
         </Select>
             {showView && drawCode ?
-                <DtmplViewDrawer placement={'left'} onClose={this.doClose} open={showView}
+                <DtmplViewDrawer serverKey={serverKey} placement={'left'} onClose={this.doClose} open={showView}
                                sourceId={fieldConfig.id} code={drawCode}></DtmplViewDrawer> : null}
             {showEdit && ltmplConfig ?ltmplConfig.customEditPagePath?<DtmplCustomEditModalPage  open={showEdit} onOk={() => {
                     this.drawSubmited();
                 }} customPath={ltmplConfig.customEditPagePath} sourceId={fieldConfig.id} mainCode={mainCode}
                        code={drawCode} />
-                :<DtmplEditPage pageType={"modal"}  open={showEdit}
+                :<DtmplEditPage serverKey={serverKey} pageType={"modal"}  open={showEdit}
                                        onCancel={this.doClose} mainCode={mainCode}
                                        width={960}
                                        sourceId={fieldConfig.id}
                                        code={drawCode}
                                        onOk={this.drawSubmited}/> : null}
-            {showTable ? <LtmplModal  open={showTable}
+            {showTable ? <LtmplModal serverKey={serverKey}  open={showTable}
                                       onCancel={this.closeTable}
                                       width={960}
                                       sourceId={fieldConfig.id}

package/src/aldehyde/controls/entity-select/lab-tree-select.tsx

@@ -34,7 +34,7 @@ export default class LabTreeSelect extends React.PureComponent<LabTreeSelectProp
     //第一步查根
     loadSchoolLevelUnit=async ()=>{
         let data=[];
-     let  res=await  HcserviceV3.requestLtmplQueryTop('221036732522497',{});
+     let  res=await  HcserviceV3.requestLtmplQueryTop(null,'221036732522497',{});
 
       if(res.entities){
           res.entities.forEach((item, index) => {
@@ -54,7 +54,7 @@ export default class LabTreeSelect extends React.PureComponent<LabTreeSelectProp
 
     loadLab=async (mainCode)=>{
         let data=[];
-        let  res=await  HcserviceV3.requestLtmplQueryTop('228261345665025',{mainCode});
+        let  res=await  HcserviceV3.requestLtmplQueryTop(null,'228261345665025',{mainCode});
 
         if(res.entities){
             res.entities.forEach((item, index) => {
@@ -74,7 +74,7 @@ export default class LabTreeSelect extends React.PureComponent<LabTreeSelectProp
 
     loadRoom=async (mainCode)=>{
         let data=[];
-        let  res=await  HcserviceV3.requestLtmplQueryTop('228261733638145',{mainCode});
+        let  res=await  HcserviceV3.requestLtmplQueryTop(null,'228261733638145',{mainCode});
 
         if(res.entities){
             res.entities.forEach((item, index) => {

package/src/aldehyde/controls/entity-select/popover-entity-select.tsx

@@ -53,7 +53,7 @@ export default class PopoverEntitySelect extends React.PureComponent<PopoverEnti
 
 
     render() {
-        const {id,value, itemType, fieldConfig, onChange, style, maxSelected, onEntityClick,mainCode} = this.props;
+        const {id,value, itemType, fieldConfig, onChange, style, maxSelected, onEntityClick,mainCode,serverKey} = this.props;
         const {} = this.state;
         let selectedRows: SelectedRow[] = [];
         let relationOptions = []
@@ -99,7 +99,7 @@ export default class PopoverEntitySelect extends React.PureComponent<PopoverEnti
                          borderRadius: '6px',
                          borderWidth: '0px',
                          borderColor: '#8c8c8c'
-                     }}><SelectTable mainCode={mainCode} maxSelectedRows={maxSelected} selectedRows={selectedRows} sourceId={fieldConfig.id}
+                     }}><SelectTable serverKey={serverKey} mainCode={mainCode} maxSelectedRows={maxSelected} selectedRows={selectedRows} sourceId={fieldConfig.id}
                                       onChange={this.onSelect}></SelectTable></div>}
                      trigger="click">
                 <Select id={id} style={{...style}}

package/src/aldehyde/controls/entry-control.tsx

@@ -43,6 +43,7 @@ const DatePicker = loadable(() =>
 const {TextArea} = Input;
 
 interface EntryControlProps {
+    serverKey:string,
     mainCode?:string|Promise<string>,
     value?: any;
     fieldConfig: FieldConfig;

package/src/aldehyde/controls/file-view/drawer-file-view.tsx

@@ -13,6 +13,7 @@ const FileViewer = loadable(() =>
     import('react-file-viewer'), {fallback: Loading});
 interface DrawerFileViewProps {
     file: FileValue,
+    serverKey:string,
     downloadable?:boolean,
 };
 
@@ -37,14 +38,14 @@ export default class DrawerFileView extends React.PureComponent<DrawerFileViewPr
     }
 
     render() {
-        const {file,downloadable} = this.props;
+        const {file,downloadable,serverKey} = this.props;
         const {drawerOpen} = this.state;
         return <span className='labelcss'>
                         <Button type={'link'} onClick={() => {
                             this.setState({drawerOpen: true})
                         }} size="small">{file.base.fileName}</Button>
             {downloadable? <Button type={'text'} onClick={async () => {
-                        await HCService.download(file.base.path);
+                        await HCService.download(serverKey,file.base.path);
                     }} size="small"><DownloadOutlined/></Button>:null}
             {drawerOpen ? <Drawer
                 title={file.base.fileName}
@@ -56,7 +57,7 @@ export default class DrawerFileView extends React.PureComponent<DrawerFileViewPr
                 extra={
                 <Space>
                     {downloadable? <Button  onClick={async () => {
-                        await HCService.download(file.base.path);
+                        await HCService.download(serverKey,file.base.path);
                     }} ><DownloadOutlined/></Button>:null}
                     <Button onClick={this.onClose}><CloseOutlined /></Button>
                 </Space>
@@ -64,7 +65,7 @@ export default class DrawerFileView extends React.PureComponent<DrawerFileViewPr
                 <FileViewer
                     style={{width: '100%'}}
                     fileType={file.base.type}
-                    filePath={HCService.getFileUrl(file.base.path)}
+                    filePath={HCService.getFileUrl(serverKey,file.base.path)}
                     errorComponent={undefined}
                     onError={this.onError}/>
             </Drawer> : null

package/src/aldehyde/controls/file-view/index.tsx

@@ -9,6 +9,7 @@ import Player from "griffith";
 
 interface FileViewProps {
     fieldConfig: FieldConfig,
+    serverKey:string,
     downloadable?:boolean,
     value: any,
     width?: number,
@@ -30,12 +31,12 @@ export default class FileView extends React.PureComponent<FileViewProps, FileVie
     }
 
     loadData= async ()=>{
-        const {value}=this.props;
+        const {value,serverKey}=this.props;
         let jsonFile=this.getJsonValue(value);
         if(jsonFile){
             if(/^image\/\w+;base64/.test(jsonFile.base.type)){
                 this.setState({
-                    urlData :await HCService.loadFileTxt(jsonFile.base.path)
+                    urlData :await HCService.loadFileTxt(serverKey,jsonFile.base.path)
                 })
             }
         }
@@ -63,7 +64,7 @@ export default class FileView extends React.PureComponent<FileViewProps, FileVie
         return jsonFile;
     }
 
-    packFile2Show =  (file) => {
+    packFile2Show =  (serverKey:string,file) => {
         const {urlData}=this.state;
        const {downloadable}=this.props;
         let jsonFile=this.getJsonValue(file);
@@ -75,9 +76,9 @@ export default class FileView extends React.PureComponent<FileViewProps, FileVie
                 } else if (['png', 'jpg', 'jpeg', 'gif', 'PNG', 'JPG', 'JPEG', 'GIF', 'svg', 'SVG'].includes(jsonFile.base.type)) {
                     return <Image
                         width={90}
-                        src={jsonFile.icon.type ? HCService.getFileUrl(jsonFile.icon.path) : HCService.getFileUrl(jsonFile.base.path)}
+                        src={jsonFile.icon.type ? HCService.getFileUrl(serverKey,jsonFile.icon.path) : HCService.getFileUrl(serverKey,jsonFile.base.path)}
                         preview={{
-                            src: HCService.getFileUrl(jsonFile.base.path),
+                            src: HCService.getFileUrl(serverKey,jsonFile.base.path),
                         }}
                     />
                 } else if (urlData) {
@@ -92,7 +93,7 @@ export default class FileView extends React.PureComponent<FileViewProps, FileVie
                 } else if (['mp4', 'MP4', 'mov', 'MOV', 'avi', 'AVI', 'WMV', 'wmv'].includes(jsonFile.base.type)) {
                     let sources = {
                         ld: {
-                            play_url: HCService.getFileUrl(jsonFile.base.path),
+                            play_url: HCService.getFileUrl(serverKey,jsonFile.base.path),
                         }
                     }
                     return (<Row align={'middle'}>
@@ -112,17 +113,17 @@ export default class FileView extends React.PureComponent<FileViewProps, FileVie
                     //         errorComponent={undefined}
                     //         onError={this.onError}/>
                     //   </span>
-                    return <DrawerFileView file={jsonFile} downloadable={downloadable}></DrawerFileView>
+                    return <DrawerFileView serverKey={serverKey} file={jsonFile} downloadable={downloadable}></DrawerFileView>
                 }
                 else if ([ 'pdf','txt'].includes(jsonFile.base.type)){
 
                     return <span className='labelcss'>
                         {/*<a href={this.getFileUrl(file.base.path)}>{file.base.fileName}</a>*/}
                         <Button type={'link'} onClick={async () => {
-                            await HCService.openfile(jsonFile.base.path, downloadable? "":'#toolbar=0');
+                            await HCService.openfile(serverKey,jsonFile.base.path, downloadable? "":'#toolbar=0');
                         }} size="small">{jsonFile.base.fileName}</Button>
                             {downloadable? <Button type={'text'}  onClick={async () => {
-                             await HCService.download(jsonFile.base.path);
+                             await HCService.download(serverKey,jsonFile.base.path);
                          }} size="small"><DownloadOutlined/></Button>:null}
                       </span>
                 }
@@ -130,10 +131,10 @@ export default class FileView extends React.PureComponent<FileViewProps, FileVie
                     return <Space className='labelcss'>
                         {/*<a href={this.getFileUrl(file.base.path)}>{file.base.fileName}</a>*/}
                         {downloadable?<><Button type={'link'} onClick={async () => {
-                            await HCService.download(jsonFile.base.path);
+                            await HCService.download(serverKey,jsonFile.base.path);
                         }} size="small">{jsonFile.base.fileName}</Button>
                         <Button type={'text'}  onClick={async () => {
-                            await HCService.download(jsonFile.base.path);
+                            await HCService.download(serverKey,jsonFile.base.path);
                         }} size="small"><DownloadOutlined/></Button></>:
                             <Button type={'text'}  size="small">{jsonFile.base.fileName}</Button>}
                       </Space>
@@ -145,7 +146,7 @@ export default class FileView extends React.PureComponent<FileViewProps, FileVie
     }
 
     render() {
-        return <>{this.packFile2Show(this.props.value)}</>;
+        return <>{this.packFile2Show(this.props.serverKey,this.props.value)}</>;
     }
 
 }

package/src/aldehyde/controls/relation-existion/index.tsx

@@ -59,7 +59,7 @@ export default class RelationExistion extends React.PureComponent<RelationExisti
 
 
     render() {
-        const {id,value, itemType, fieldConfig, onChange, style} = this.props;
+        const {id,value, itemType, fieldConfig, onChange, style,serverKey} = this.props;
         const {showSelectTable} = this.state;
         let selectedRows: SelectedRow[] = [];
         let relationOptions = []
@@ -78,7 +78,7 @@ export default class RelationExistion extends React.PureComponent<RelationExisti
                      // getPopupContainer={(triggerNode) => {
                      //        return triggerNode.parentNode;}}
                      content={<div style={{height:300,backgroundColor:'#fafafa',overflow:'auto',borderStyle:'solid',borderRadius:'6px',
-                         borderWidth:'0px',borderColor:'#8c8c8c'}}><SelectTable selectedRows={selectedRows} sourceId={fieldConfig.id}  onChange={this.onSelect}></SelectTable></div>}
+                         borderWidth:'0px',borderColor:'#8c8c8c'}}><SelectTable serverKey={serverKey} selectedRows={selectedRows} sourceId={fieldConfig.id}  onChange={this.onSelect}></SelectTable></div>}
                      trigger="click">
             <Select id={id} style={{...style}}
                     value={value}

package/src/aldehyde/controls/rfield/index.tsx

@@ -134,7 +134,7 @@ export default class Rfield extends React.PureComponent<RfieldProps, RfieldState
     }
 
     render() {
-        const {fieldConfig, value, itemType} = this.props;
+        const {fieldConfig, value, itemType,serverKey} = this.props;
         const {showDtmplView, openCode} = this.state;
         const {buttons} = fieldConfig;
 
@@ -153,7 +153,7 @@ export default class Rfield extends React.PureComponent<RfieldProps, RfieldState
                 </Popover> : null
             }
             {buttons && buttons.includes('detail') ?
-                <ModalDtmplView key={'mdv'} open={showDtmplView} onCancel={this.hiddenDtmplView}
+                <ModalDtmplView serverKey={serverKey} key={'mdv'} open={showDtmplView} onCancel={this.hiddenDtmplView}
                                 sourceId={fieldConfig.id}
                                 code={openCode}> </ModalDtmplView> : ""}
             </Space>

package/src/aldehyde/controls/signature/index.tsx

@@ -35,13 +35,13 @@ export default class Signature extends React.PureComponent<SignatureProps, Signa
    signCanvas=undefined;
 
     loadData = async () => {
-        const {value} = this.props
+        const {value,serverKey} = this.props
         if (value) {
             let val = JSON.parse(value);
             let file
             if (val.valid == true) {//此处要优化
                 if(/^image\/png;base64/.test(val.base.type)){
-                    file = await HcserviceV3.loadFileTxt(val.base.path);
+                    file = await HcserviceV3.loadFileTxt(serverKey,val.base.path);
                 }
             } else if (val.valid == 'new') {
                 file = val.body;

package/src/aldehyde/controls/upload/index.tsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import {Button, Upload as AntdUpload, message, Modal} from 'antd'
+import {Button, Upload as AntdUpload, message} from 'antd'
 import {UploadOutlined} from '@ant-design/icons';
 import HcserviceV3 from "./../../tmpl/hcservice-v3"
 import {EControlProps,FileValue} from "../../tmpl/interface";
@@ -74,7 +74,7 @@ export default class Upload extends React.PureComponent<UploadProps, UploadState
     }
 
     render(){
-        const {id,itemType,disabled,value}=this.props
+        const {id,itemType,disabled,value,serverKey}=this.props
         let fileList:UploadFile[]=[];
         if(value){
             let value_1:FileValue=value;
@@ -106,7 +106,7 @@ export default class Upload extends React.PureComponent<UploadProps, UploadState
                     disabled={disabled}
                     name={'file'}
                     headers={Super.getHeaderObj()}
-                    action={HcserviceV3.postFileAction}
+                    action={(file)=>HcserviceV3.postFileAction(serverKey,file)}
                     beforeUpload={this.beforeUpload}
                     onChange={this.handleChange}
                     onRemove={this.handleRemove}

package/src/aldehyde/controls/view-control.tsx

@@ -32,12 +32,13 @@ const ColorPicker = loadable(() =>
 const FileView = loadable(() =>
     import("../controls/file-view"), {fallback: Loading});
 interface FieldViewControlProps {
+    serverKey:string,
     value?: any;
     fieldConfig: FieldConfig;
     holderType:ControlHolderType;
 }
 
-function renderControl(fieldConfig: FieldConfig, fieldValue: any,pHolderType:ControlHolderType, width: any) {
+function renderControl(fieldConfig: FieldConfig, fieldValue: any,pHolderType:ControlHolderType, width: any,other:any) {
 
     let itemType = ControlTypeSupportor.getControlType(fieldConfig, fieldValue);
     let holderType:ControlHolderType=pHolderType;
@@ -57,7 +58,7 @@ function renderControl(fieldConfig: FieldConfig, fieldValue: any,pHolderType:Con
     let value = fieldValue ? fieldValue : fieldConfig.defaultValue && !Units.isConfigDefaultValue(fieldConfig.defaultValue) ? fieldConfig.defaultValue : "";
     let viewOrEdit:ViewOrEdit='view';
     let controlProps = {
-        fieldConfig, itemType, value,viewOrEdit,
+        fieldConfig, itemType, value,viewOrEdit,...other
     }
     //自定义组件为先
     if(ProgramConfig.getCustomEditControl(itemType)){
@@ -197,8 +198,8 @@ function renderControl(fieldConfig: FieldConfig, fieldValue: any,pHolderType:Con
 }
 
 const ViewControl: React.FC<FieldViewControlProps> = (props) => {
-    const {fieldConfig, value,holderType} = props;
-    return renderControl(fieldConfig, value, holderType,null);
+    const {fieldConfig, value,holderType,...other} = props;
+    return renderControl(fieldConfig, value, holderType,null,other);
 }
 
 export default ViewControl;

package/src/aldehyde/custom-page/dtmpl-custom-edit-modal-page.tsx

@@ -4,6 +4,7 @@ import DefCustomPage from "./def-custom-page";
 import {ProgramConfig} from "../index";
 
 interface DtmplCustomEditModalPageProps {
+    serverKey?:string,
     height?: any,
     width?: number,
     bodyWidth?:number|string,

package/src/aldehyde/detail/button/cquery-button-bar.tsx

@@ -6,6 +6,7 @@ import {LeftOutlined, SaveOutlined} from '@ant-design/icons';
 import CquickButton from "../../controls/cquery/cquick-button";
 
 interface CqueryButtonBarProps {
+    serverKey:string,
     dtmplConfig: DtmplConfig,
     mainCode:string,
 }
@@ -52,7 +53,7 @@ class CqueryButtonBar extends React.PureComponent<CqueryButtonBarProps, CqueryBu
 
     render() {
        const {}=this.state;
-        const {dtmplConfig,mainCode} = this.props
+        const {dtmplConfig,mainCode,serverKey} = this.props
 
         if(!dtmplConfig){
             return null;
@@ -68,7 +69,7 @@ class CqueryButtonBar extends React.PureComponent<CqueryButtonBarProps, CqueryBu
                     <Space direction="vertical">
                         {cQuerys.map((item, index) => {
                             if (index > 2) {
-                                return <CquickButton  block={true} key={item.id}  mainCode={mainCode} cQueryConfig={item}  ></CquickButton>
+                                return <CquickButton serverKey={serverKey}  block={true} key={item.id}  mainCode={mainCode} cQueryConfig={item}  ></CquickButton>
                             }
                         })
                         }
@@ -87,7 +88,7 @@ class CqueryButtonBar extends React.PureComponent<CqueryButtonBarProps, CqueryBu
                             cQuerys ? cQuerys.map((item, index) => {
                                     if (index < 3) {
                                         return <li key={index}>
-                                            <CquickButton type={'text'}  block={true} key={item.id}  mainCode={mainCode} cQueryConfig={item}  ></CquickButton>
+                                            <CquickButton serverKey={serverKey} type={'text'}  block={true} key={item.id}  mainCode={mainCode} cQueryConfig={item}  ></CquickButton>
                                         </li>
                                     }
                                 }

package/src/aldehyde/detail/button/submit-button-bar.tsx

@@ -7,6 +7,7 @@ import Action from "../../controls/action";
 import {FormInstance} from "antd/lib/form/hooks/useForm";
 
 interface SubmitButtonProps {
+    serverKey:string,
     dtmplConfig: DtmplConfig,
    // dtmplData:DtmplData,
     doSubmit: (actionId?: string,codes?:string[],params?:object) => void;
@@ -63,7 +64,7 @@ class SubmitButtonBar extends React.PureComponent<SubmitButtonProps, SubmitButto
 
     render() {
        const {}=this.state;
-        const {dtmplConfig, doSubmit,formRef,serial} = this.props
+        const {dtmplConfig, doSubmit,formRef,serial,serverKey} = this.props
         const {buttons, actions} = dtmplConfig;
         const cardList: TmplBase[] = [];
 
@@ -94,7 +95,7 @@ class SubmitButtonBar extends React.PureComponent<SubmitButtonProps, SubmitButto
                             //     type="primary"
                             // >{item.title}</Button>
                             // </Popconfirm>
-                           return <Action iconType={'icon-title'} hiddenType={'disabled'} buttonType={'primary'} serial={serial} key={item.id}   formRef={formRef} actionConfig={item}  doAction={doSubmit}></Action>
+                           return <Action serverKey={serverKey} iconType={'icon-title'} hiddenType={'disabled'} buttonType={'primary'} serial={serial} key={item.id}   formRef={formRef} actionConfig={item}  doAction={doSubmit}></Action>
                         }
                     })
                     }
@@ -128,7 +129,7 @@ class SubmitButtonBar extends React.PureComponent<SubmitButtonProps, SubmitButto
                                             {/*<Button  block*/}
                                             {/*        type={'primary'}>{item.title}</Button>*/}
                                             {/*</Popconfirm>*/}
-                                            <Action hiddenType={'disabled'} buttonType={'primary-block'} serial={serial}  key={item.id}  formRef={formRef} actionConfig={item}  doAction={doSubmit}></Action>
+                                            <Action serverKey={serverKey} hiddenType={'disabled'} buttonType={'primary-block'} serial={serial}  key={item.id}  formRef={formRef} actionConfig={item}  doAction={doSubmit}></Action>
                                         </li>
                                     }
                                 }

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

@@ -66,15 +66,15 @@ export default class DtmplEdit extends React.PureComponent<DtmplEditProps, Dtmpl
     }
 
     loadConfigData = async () => {
-        const { sourceId,code} = this.props;
+        const { sourceId,code,serverKey} = this.props;
         this.setState({
             loading: true,
         })
         let dtmplConfig=undefined;
         if(code){
-            dtmplConfig = await HCDataSource.requestDtmplConfig(sourceId);
+            dtmplConfig = await HCDataSource.requestDtmplConfig(serverKey,sourceId);
         }else{
-            dtmplConfig = await HCDataSource.requestAddDtmplConfig(sourceId);
+            dtmplConfig = await HCDataSource.requestAddDtmplConfig(serverKey,sourceId);
         }
 
        if(dtmplConfig.authSaveInterval && dtmplConfig.authSaveInterval>0){
@@ -102,12 +102,12 @@ export default class DtmplEdit extends React.PureComponent<DtmplEditProps, Dtmpl
     }
 
     loadData = async (dtmplConfig:DtmplConfig ) => {
-        const { sourceId, code,addOrUpdate} = this.props;
+        const { sourceId, code,addOrUpdate,serverKey} = this.props;
         if (code) {
             this.setState({
                 loading: true,
             })
-            const dtmplData_ = await HcserviceV3.requestDtmplData( sourceId, code, null);
+            const dtmplData_ = await HcserviceV3.requestDtmplData(serverKey, sourceId, code, null);
             if(addOrUpdate=='copy'&& dtmplData_){
                 dtmplData_.code=undefined;
             }
@@ -192,7 +192,7 @@ export default class DtmplEdit extends React.PureComponent<DtmplEditProps, Dtmpl
     render() {
         const {dtmplConfig, showPostResult,loading,id,serial,dtmplData} = this.state;
         //console.log(" dtmpl edit serial:",serial);
-        const { sourceId, showRightNav, code,addOrUpdate,maxColsOnRow,mainCode} = this.props;
+        const { sourceId, showRightNav, code,addOrUpdate,maxColsOnRow,mainCode,serverKey} = this.props;
         //const {title} = dtmplConfig;
         if (!dtmplConfig) {
             return  <Card loading={loading}>
@@ -200,14 +200,14 @@ export default class DtmplEdit extends React.PureComponent<DtmplEditProps, Dtmpl
         }
         return (
             <div className={`detailPage ${showRightNav ? 'showRightNav' : 'noRightNav'}`} onClick={this.onClickBody}>
-                <DtmplForm mainCode={mainCode}  parentId={id} dtmplConfig={dtmplConfig}  formRef={this.formRef} sourceId={sourceId}
+                <DtmplForm  serverKey={serverKey} mainCode={mainCode}  parentId={id} dtmplConfig={dtmplConfig}  formRef={this.formRef} sourceId={sourceId}
                            onFinish={this.onFinish} maxColsOnRow={maxColsOnRow}
                            showConfirm={true} dtmplData={dtmplData}  onValuesChange={this.onValuesChange}></DtmplForm>
                 {showRightNav ?
-                    <RightBar parentId={id} dtmplConfig={dtmplConfig}/> : ""
+                    <RightBar  parentId={id} dtmplConfig={dtmplConfig}/> : ""
                 }
-                <SubmitButtonBar serial={serial} dtmplConfig={dtmplConfig} doSubmit={this.doSubmit}  formRef={this.formRef}></SubmitButtonBar>
-                <CqueryButtonBar  dtmplConfig={dtmplConfig} mainCode={code}></CqueryButtonBar>
+                <SubmitButtonBar serverKey={serverKey} serial={serial} dtmplConfig={dtmplConfig} doSubmit={this.doSubmit}  formRef={this.formRef}></SubmitButtonBar>
+                <CqueryButtonBar  serverKey={serverKey} dtmplConfig={dtmplConfig} mainCode={code}></CqueryButtonBar>
                 <PostResult
                     open={showPostResult}
                     addOrUpdate={addOrUpdate=='copy' ? 'add' : addOrUpdate}