aldehyde 0.2.92 → 0.2.94

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

@@ -1,4 +1,4 @@
-import {ActionConfig, Comparator, DtmplData,DtmplConfig,FieldConfig} from "../../tmpl/interface";
+import {ActionConfig, Comparator, DtmplConfig, DtmplData, FieldConfig} from "../../tmpl/interface";
 import {RefObject} from "react";
 import {FormInstance} from "antd/lib/form/hooks/useForm";
 import {message} from "antd";
@@ -6,77 +6,94 @@ import TmplConfigAnalysis from "../../tmpl/tmpl-config-analysis";
 
 
 export default class ActionUtils {
-    static  isShow(actionConfig:ActionConfig, data:DtmplData[] |object[], formRef:RefObject<FormInstance>){
+    static isShow(actionConfig: ActionConfig, data: DtmplData[] | object[], formRef: RefObject<FormInstance>) {
         let preFieldConfigs = actionConfig.preposes;
         if (!preFieldConfigs || preFieldConfigs.length <= 0) {
             return true;
         }
-        return this.isMatch(preFieldConfigs,data,formRef?.current,null);
+        return this.isMatch(preFieldConfigs, data, formRef?.current, null);
     }
 
-    static  isMatch(fieldConfigs:FieldConfig[], data:DtmplData[] |object[], formInstance:FormInstance,dtmplConfig:DtmplConfig){
+    static isMatch(fieldConfigs: FieldConfig[], data: DtmplData[] | object[], formInstance: FormInstance, dtmplConfig: DtmplConfig) {
 
         //所有data都必须满足条件才能显示
         //let comparator=actionConfig.comparator;
         //debugger
         let isMatch = true;
         if (formInstance) {
+            let tempConfigs:FieldConfig[]=[];
             for (let fieldConfig of fieldConfigs) {
                 if (!fieldConfig) {
                     continue;
                 }
-                let fieldId =dtmplConfig? TmplConfigAnalysis.getFieldId(dtmplConfig, fieldConfig.mstrucId):fieldConfig.id;
-                let value = this.getFormRefValue(formInstance, fieldId);
-                // if (value) {
+                let fieldId = dtmplConfig ? TmplConfigAnalysis.getFieldId(dtmplConfig, fieldConfig.mstrucId) : fieldConfig.id;
+                if(this.containsField(formInstance, fieldId)){
+                    let value = this.getFormRefValue(formInstance, fieldId);
                     if (!this.comparator(fieldConfig.comparator, value, fieldConfig.defaultValue)) {
                         isMatch = false;
                         break;
-                    }
 
+                    }
+                }else{
+                    tempConfigs.push(fieldConfig);
+                }
+            }
+            if(isMatch && tempConfigs.length>0){//若果之前判断成功，则继续判断
+                isMatch = this.matchDtmplData(tempConfigs, data);
             }
         } else if (data) {
-                for (let d of data) {
-                    if (!isMatch) {
+            isMatch = this.matchDtmplData(fieldConfigs, data);
+        } else {
+            isMatch = false;
+        }
+        return isMatch;
+    }
+
+    static matchDtmplData(fieldConfigs: FieldConfig[], data: DtmplData[] | object[]) {
+        let isMatch = true;
+        if(!data){
+            return false;
+        }
+        for (let d of data) {
+            // if (!isMatch) {
+            //     break;
+            // }
+            if (!d) {
+                isMatch = false;
+                break;
+            }
+
+            for (let fieldConfig of fieldConfigs) {
+                if (d['fieldMap']) {
+                    if (!this.comparator(fieldConfig.comparator, d['fieldMap'][fieldConfig.id], fieldConfig.defaultValue)) {
+                        isMatch = false;
                         break;
                     }
-                    if (!d ) {
+                } else {
+                    // debugger
+                    if (!this.comparator(fieldConfig.comparator, d[fieldConfig.id], fieldConfig.defaultValue)) {
                         isMatch = false;
                         break;
                     }
-
-                    for (let fieldConfig of fieldConfigs) {
-                        if(d['fieldMap']){
-                            if (!this.comparator(fieldConfig.comparator, d['fieldMap'][fieldConfig.id], fieldConfig.defaultValue)) {
-                                isMatch = false;
-                                break;
-                            }
-                        }else{
-                           // debugger
-                            if (!this.comparator(fieldConfig.comparator, d[fieldConfig.id], fieldConfig.defaultValue)) {
-                                isMatch = false;
-                                break;
-                            }
-                        }
-
-                    }
                 }
-        } else {
-            isMatch = false;
+
+            }
         }
         return isMatch;
     }
-    static comparator(comparator: Comparator, value: string, defaultValue: string){
+
+    static comparator(comparator: Comparator, value: string, defaultValue: string) {
         let dvs: string[];
 
-        if(!comparator ){
-            comparator='equals';
+        if (!comparator) {
+            comparator = 'equals';
         }
 
-        if ( !defaultValue) {
+        if (!defaultValue) {
             return true;
         }
 
-        if(!value && value!='0' ){
+        if (!value && value != '0') {
             return false;
         }
 
@@ -103,16 +120,26 @@ export default class ActionUtils {
             case "unequals":
                 return value != defaultValue;
             default:
-                message.error("暂不支持的比较关系："+comparator+";请联系管理员添加。");
-                   return
+                message.error("暂不支持的比较关系：" + comparator + ";请联系管理员添加。");
+                return
+        }
+    }
+
+    static getFormRefValue(formInstance: FormInstance, key) {
+
+        if (formInstance) {
+            // console.log("formRef.current.getFieldsValue",formRef.current.getFieldValue(key));
+            return formInstance.getFieldValue(key);
+        } else {
+            return false;
         }
     }
 
-    static getFormRefValue(formInstance:FormInstance, key){
+    static containsField(formInstance: FormInstance, key) {
 
         if (formInstance) {
-           // console.log("formRef.current.getFieldsValue",formRef.current.getFieldValue(key));
-            return formInstance.getFieldValue(key) ;
+            // console.log("formRef.current.getFieldsValue",formRef.current.getFieldValue(key));
+            return formInstance.getFieldInstance(key)?true:false;
         } else {
             return false;
         }

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

@@ -133,7 +133,7 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
         const {ltmplConfig} = this.state;
         let ltmplConfig_ = ltmplConfig;
         if (!ltmplConfig_) {
-            ltmplConfig_ = (await HCDataSource.requestLtmplConfig(fieldConfig.serverKey ? fieldConfig.serverKey : serverKey, fieldConfig.sourceId)).ltmplConfig;
+            ltmplConfig_ = (await HCDataSource.requestLtmplConfig(fieldConfig.serverKey ? fieldConfig.serverKey : serverKey, fieldConfig.sourceId?fieldConfig.sourceId:fieldConfig.id)).ltmplConfig;
         }
         this.setState({
             ltmplConfig: ltmplConfig_

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

@@ -58,7 +58,7 @@ function getOptions(mstrucId) {
     const items = HCDataSource.getEnums(mstrucId);
     if (items) {
         items.map((item) => {
-            options.push({label: (item.order ? item.order + "." : "") + item.title, value: item.value})
+            options.push({label: (item.order && parseInt(item.order)>0 && parseInt(item.order)<10000 ? item.order + "." : "") + item.title, value: item.value})
         })
     }
     return options;

package/src/aldehyde/controls/input-number/index.tsx

@@ -53,7 +53,7 @@ const InputNumber: React.FC<InputNumberProps> = (props) => {
 
     switch (itemType) {
         case 'int':
-            entryControl = <AntdInputNumber   style={{...style}} min={min} max={max} stringMode
+            entryControl = <AntdInputNumber   style={{...style}} min={min} max={max} stringMode precision={0}
                                             {...antdControlProps} value={valueSingle}
                                              onChange={changeValue}
             />
@@ -71,11 +71,11 @@ const InputNumber: React.FC<InputNumberProps> = (props) => {
             entryControl =
                 <Space>
                 <AntdInputNumber  min={min} max={max}
-                                            placeholder={`开始`} value={valueBegin}
+                                            placeholder={`开始`} value={valueBegin} precision={0}
                                             onKeyUp={changeInt} onChange={changeBeginValue}
             />~
             <AntdInputNumber min={min} max={max}
-                             placeholder={`结束`} value={valueEnd}
+                             placeholder={`结束`} value={valueEnd} precision={0}
                              onKeyUp={changeInt} onChange={changeEndValue}
             />
                     </Space>;

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

@@ -23,7 +23,7 @@ class BottomSubmitButtonBar extends React.PureComponent<BottomSubmitButtonBarPro
 
     render() {
         const {} = this.state;
-        const {dtmplConfig,position, doSubmit, formRef, serial, serverKey} = this.props
+        const {dtmplConfig,position, doSubmit, formRef, serial, serverKey,dtmplData} = this.props
         const {buttons, actions} = dtmplConfig;
 
         return (<Card bordered={false}>
@@ -39,12 +39,11 @@ class BottomSubmitButtonBar extends React.PureComponent<BottomSubmitButtonBarPro
                                     key="btn" block
                                 >保 存</Button></Col> : null}
                             {actions ? actions.map((item, index) => {
-                                    return <Col ><Action serverKey={serverKey}  serial={serial} key={item.id}
+                                    return <Col ><Action serverKey={serverKey}  serial={serial} key={item.id} data={[dtmplData]}
                                                          formRef={formRef} actionConfig={item} doAction={doSubmit}></Action></Col>
                                 }
                             ) : ""}
                         </Space>
-
                 </Row>
             </Card>
         )

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

@@ -40,7 +40,7 @@ class FixRightSubmitButtonBar extends React.PureComponent<FixRightSubmitButtonPr
 
     render() {
        const {}=this.state;
-        const {dtmplConfig, doSubmit,formRef,serial,serverKey} = this.props
+        const {dtmplConfig, doSubmit,formRef,serial,serverKey,dtmplData} = this.props
         const {buttons, actions} = dtmplConfig;
         const cardList: TmplBase[] = [];
 
@@ -71,7 +71,7 @@ class FixRightSubmitButtonBar extends React.PureComponent<FixRightSubmitButtonPr
                             //     type="primary"
                             // >{item.title}</Button>
                             // </Popconfirm>
-                           return <Action serverKey={serverKey} iconType={'icon-title'} hiddenType={'disabled'} buttonType={'primary'} serial={serial} key={item.id}   formRef={formRef} actionConfig={item}  doAction={doSubmit}></Action>
+                           return <Action serverKey={serverKey} data={[dtmplData]} iconType={'icon-title'} hiddenType={'disabled'} buttonType={'primary'} serial={serial} key={item.id}   formRef={formRef} actionConfig={item}  doAction={doSubmit}></Action>
                         }
                     })
                     }
@@ -105,7 +105,7 @@ class FixRightSubmitButtonBar extends React.PureComponent<FixRightSubmitButtonPr
                                             {/*<Button  block*/}
                                             {/*        type={'primary'}>{item.title}</Button>*/}
                                             {/*</Popconfirm>*/}
-                                            <Action serverKey={serverKey} hiddenType={'disabled'} buttonType={'primary-block'} serial={serial}  key={item.id}  formRef={formRef} actionConfig={item}  doAction={doSubmit}></Action>
+                                            <Action data={[dtmplData]} serverKey={serverKey} hiddenType={'disabled'} buttonType={'primary-block'} serial={serial}  key={item.id}  formRef={formRef} actionConfig={item}  doAction={doSubmit}></Action>
                                         </li>
                                     }
                                 }

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

@@ -1,6 +1,13 @@
 import React, {RefObject} from 'react'
 import './index.css'
-import {ActionConfig, ButtonName, ButtonPosition, DtmplConfig, TmplBase} from "../../../aldehyde/tmpl/interface";
+import {
+    ActionConfig,
+    ButtonName,
+    ButtonPosition,
+    DtmplConfig,
+    DtmplData,
+    TmplBase
+} from "../../../aldehyde/tmpl/interface";
 import {Affix, Button, Popconfirm, Popover} from "antd";
 import {LeftOutlined, SaveOutlined} from '@ant-design/icons';
 import Action from "../../controls/action";
@@ -11,6 +18,7 @@ import BottomSubmitButtonBar from "./bottom-submit-button-bar";
 export  interface SubmitButtonProps {
     serverKey?:string,
     dtmplConfig: DtmplConfig,
+    dtmplData:DtmplData,
     position?:ButtonPosition,
     doSubmit: (actionId?: string,codes?:string[],params?:object) => void;
     formRef: RefObject<FormInstance>,
@@ -34,12 +42,12 @@ class SubmitButtonBar extends React.PureComponent<SubmitButtonProps, SubmitButto
     }
 
     render() {
-        const {position, doSubmit, serial, dtmplConfig, formRef} = this.props;
+        const {position, doSubmit, serial, dtmplConfig, formRef,dtmplData} = this.props;
         let posi = position ? position : dtmplConfig.buttonPosition ? dtmplConfig.buttonPosition : undefined
 
         return <>{!posi || posi == 'fixedBottomRight' ?
-            <FixRightSubmitButtonBar doSubmit={doSubmit} serial={serial} dtmplConfig={dtmplConfig} formRef={formRef}/>
-            : <BottomSubmitButtonBar position={posi} doSubmit={doSubmit} serial={serial} dtmplConfig={dtmplConfig} formRef={formRef}/>
+            <FixRightSubmitButtonBar doSubmit={doSubmit} serial={serial} dtmplConfig={dtmplConfig} formRef={formRef} dtmplData={dtmplData}/>
+            : <BottomSubmitButtonBar position={posi} doSubmit={doSubmit} serial={serial} dtmplConfig={dtmplConfig} formRef={formRef} dtmplData={dtmplData}/>
         }</>
     }
 }

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

@@ -66,7 +66,7 @@ export default class DtmplEdit extends React.PureComponent<DtmplEditProps, Dtmpl
     }
 
     loadConfigData = async () => {
-        const { sourceId,code,serverKey} = this.props;
+        const { sourceId,code,serverKey,addTmplId} = this.props;
         this.setState({
             loading: true,
         })
@@ -74,7 +74,7 @@ export default class DtmplEdit extends React.PureComponent<DtmplEditProps, Dtmpl
         if(code){
             dtmplConfig = await HCDataSource.requestDtmplConfig(serverKey,sourceId,code);
         }else{
-            dtmplConfig = await HCDataSource.requestAddDtmplConfig(serverKey,sourceId);
+            dtmplConfig = await HCDataSource.requestAddDtmplConfig(serverKey,sourceId,addTmplId);
         }
 
 
@@ -95,12 +95,12 @@ export default class DtmplEdit extends React.PureComponent<DtmplEditProps, Dtmpl
             code=await HcserviceV3.queryCode(sourceId,codeSource,serverKey);
         }
 
-        if(dtmplConfig.authSaveInterval && dtmplConfig.authSaveInterval>0){
+        if(dtmplConfig.autoSaveInterval && dtmplConfig.autoSaveInterval>0){
             if(this.autoSaveInterval){
                 clearInterval(this.autoSaveInterval);
             }
             this.autoSaveInterval = setInterval(() => {
-                if(this.autoSaveTimer>=dtmplConfig.authSaveInterval){
+                if(this.autoSaveTimer>=dtmplConfig.autoSaveInterval){
                     //console.log('执行自动保存');
                     this.autoSaveTimer=-1000000000000000;
                     this.doSubmit(undefined);
@@ -231,7 +231,8 @@ export default class DtmplEdit extends React.PureComponent<DtmplEditProps, Dtmpl
                 {showRightNav ?
                     <RightBar  parentId={id} dtmplConfig={dtmplConfig}/> : ""
                 }
-                <SubmitButtonBar serverKey={serverKey} serial={serial} dtmplConfig={dtmplConfig} doSubmit={this.doSubmit} formRef={this.formRef}></SubmitButtonBar>
+
+                <SubmitButtonBar dtmplData={dtmplData} serverKey={serverKey} serial={serial} dtmplConfig={dtmplConfig} doSubmit={this.doSubmit} formRef={this.formRef}></SubmitButtonBar>
                 <CqueryButtonBar  serverKey={serverKey} dtmplConfig={dtmplConfig} mainCode={code}></CqueryButtonBar>
                 <PostResult
                     open={showPostResult}

package/src/aldehyde/layout/MainPage.tsx

@@ -59,10 +59,10 @@ class MainPage extends React.PureComponent<MainPageProps, MainPageState> {
         let blockRes = await HCDataSource.requestBlocks(l2MenuId ? l2MenuId : undefined, blockId ? blockId : undefined);
         this.setState((state) => ({
             isImporter: currentURL.hash.indexOf('/importer') > 0,
-            blocks: blockRes.blocks ? blockRes.blocks : [],
-            currentL2MenuId: blockRes.l2MenuId,
-            currentBlockId: blockRes.blockId,
-            sideBartitle: blockRes.programName,
+            blocks:blockRes && blockRes.blocks ? blockRes.blocks : [],
+            currentL2MenuId: blockRes? blockRes.l2MenuId:null,
+            currentBlockId: blockRes? blockRes.blockId:null,
+            sideBartitle: blockRes ?blockRes.programName:null,
         }));
 
     }

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

@@ -102,6 +102,7 @@ class ContextSetter extends React.PureComponent<ContextSetterProps, ContextSette
                                                   controlType: 'entity-select',
                                                   max: "1",
                                                   required: true,
+                                                  sourceId:c.groupId,
                                                   suppleOptions: c.canNotSet ? [{code: 'all', title: '不设置'}] : undefined
                                               }}
                                 />

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

@@ -63,7 +63,7 @@ export default class DtmplEditCard extends React.PureComponent<DtmplEditCardProp
     }
 
     loadConfigData = async () => {
-        const { sourceId,code,serverKey} = this.props;
+        const { sourceId,code,serverKey,addTmplId} = this.props;
         this.setState({
             loading: true,
         })
@@ -71,7 +71,7 @@ export default class DtmplEditCard extends React.PureComponent<DtmplEditCardProp
         if(code){
             dtmplConfig = await HCDataSource.requestDtmplConfig(serverKey,sourceId,code);
         }else{
-            dtmplConfig = await HCDataSource.requestAddDtmplConfig(serverKey,sourceId);
+            dtmplConfig = await HCDataSource.requestAddDtmplConfig(serverKey,sourceId,addTmplId);
         }
         await this.loadData(dtmplConfig);
         this.setState({
@@ -88,12 +88,12 @@ export default class DtmplEditCard extends React.PureComponent<DtmplEditCardProp
         }
 
         //重设定时器
-        if(dtmplConfig.authSaveInterval && dtmplConfig.authSaveInterval>0){
+        if(dtmplConfig.autoSaveInterval && dtmplConfig.autoSaveInterval>0){
             if(this.autoSaveInterval){
                 clearInterval( this.autoSaveInterval);
             }
             this.autoSaveInterval = setInterval(() => {
-                if(this.autoSaveTimer>=dtmplConfig.authSaveInterval){
+                if(this.autoSaveTimer>=dtmplConfig.autoSaveInterval){
                     // console.log('执行自动保存');
                     this.autoSaveTimer=-1000000000000000;
                     this.doSubmit(undefined);

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

@@ -67,7 +67,7 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
     async componentDidUpdate(prevProps) {
         const { dtmplConfig} = this.state;
         if(prevProps && prevProps!=this.props){
-            if(prevProps.sourceId!=this.props.sourceId || dtmplConfig==null){
+            if(prevProps.sourceId != this.props.sourceId || prevProps.code!=this.props.code || prevProps.addTmplId!= this.props.addTmplId  || dtmplConfig==null){
                 await this.loadConfigData();
             }else{
                 await this.loadData(dtmplConfig);
@@ -82,7 +82,7 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
     }
 
     loadConfigData = async () => {
-        const { sourceId,open,code,serverKey} = this.props;
+        const { sourceId,open,code,serverKey,addTmplId} = this.props;
         this.setState({
             loading: true,
         })
@@ -90,7 +90,7 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
         if(code){
             dtmplConfig = await HCDataSource.requestDtmplConfig(serverKey,sourceId,code);
         }else{
-            dtmplConfig = await HCDataSource.requestAddDtmplConfig(serverKey,sourceId);
+            dtmplConfig = await HCDataSource.requestAddDtmplConfig(serverKey,sourceId,addTmplId);
         }
 
         await this.loadData(dtmplConfig);
@@ -107,12 +107,12 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
             return;
         }
 
-        if(dtmplConfig.authSaveInterval && dtmplConfig.authSaveInterval>0){
+        if(dtmplConfig.autoSaveInterval && dtmplConfig.autoSaveInterval>0){
             if(this.autoSaveInterval){
                 clearInterval( this.autoSaveInterval);
             }
             this.autoSaveInterval = setInterval(() => {
-                if(this.autoSaveTimer>=dtmplConfig.authSaveInterval){
+                if(this.autoSaveTimer>=dtmplConfig.autoSaveInterval){
                     //console.log('执行自动保存');
                     this.autoSaveTimer=-1000000000000000;
                     this.doSubmit(undefined);

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

@@ -62,7 +62,7 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
     }
 
     loadConfigData = async () => {
-        const { sourceId,open,code,serverKey} = this.props;
+        const { sourceId,open,code,serverKey,addTmplId} = this.props;
         this.setState({
             loading: true,
         })
@@ -70,7 +70,7 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
         if(code){
             dtmplConfig = await HCDataSource.requestDtmplConfig(serverKey,sourceId,code);
         }else{
-            dtmplConfig = await HCDataSource.requestAddDtmplConfig(serverKey,sourceId);
+            dtmplConfig = await HCDataSource.requestAddDtmplConfig(serverKey,sourceId,addTmplId);
         }
 
 
@@ -87,12 +87,12 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
             return;
         }
 
-        if(dtmplConfig.authSaveInterval && dtmplConfig.authSaveInterval>0){
+        if(dtmplConfig.autoSaveInterval && dtmplConfig.autoSaveInterval>0){
             if(this.autoSaveInterval){
                 clearInterval( this.autoSaveInterval);
             }
             this.autoSaveInterval = setInterval(() => {
-                if(this.autoSaveTimer>=dtmplConfig.authSaveInterval){
+                if(this.autoSaveTimer>=dtmplConfig.autoSaveInterval){
                     //console.log('执行自动保存');
                     this.autoSaveTimer=-1000000000000000;
                     this.doSubmit(undefined);

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

@@ -9,6 +9,7 @@ export interface DtmplViewCardProps  {
     title?:any,
     serverKey?:string,
     sourceId?:string,
+    addTmplId?:string,
     code?:string;
     mainCode?:string;
     editable?:boolean;
@@ -54,10 +55,10 @@ class DtmplViewCard extends React.PureComponent<DtmplViewCardProps, DtmplViewCar
 
     render() {
         const {showDtmplEdit} = this.state;
-        const { sourceId,code,mainCode,editable,serverKey,codeSource,title,showHeader} = this.props;
+        const { sourceId,code,mainCode,editable,serverKey,codeSource,title,showHeader,addTmplId} = this.props;
             return <>
                 <ActDtmplView showHeader={showHeader} title={title} codeSource={codeSource} serverKey={serverKey} goDtmpl={editable?this.goDtmpl:null}  sourceId={sourceId} code={code} mainCode={mainCode}></ActDtmplView>
-                {showDtmplEdit? <DtmplEditModal  codeSource={codeSource} serverKey={serverKey} open={showDtmplEdit} onCancel={()=>{
+                {showDtmplEdit? <DtmplEditModal  addTmplId={addTmplId} codeSource={codeSource} serverKey={serverKey} open={showDtmplEdit} onCancel={()=>{
                         this.setState({
                             showDtmplEdit:false,
                         })}}

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

@@ -15,6 +15,7 @@ interface EmbedDtmplEditPageProps  {
     codeSource?:CodeSource,
     onFinish: (code:string) => void,
     defaultDtmplData?:DtmplData,
+    addTmplId?:string,
 }
 
 interface EmbedDtmplEditPageState {
@@ -67,7 +68,7 @@ export default class EmbedDtmplEditPage extends React.PureComponent<EmbedDtmplEd
     }
 
     loadConfigData = async () => {
-        const {code,sourceId,serverKey,group} = this.props;
+        const {code,sourceId,serverKey,group,addTmplId} = this.props;
         this.setState({
             loading: true,
         })
@@ -75,7 +76,7 @@ export default class EmbedDtmplEditPage extends React.PureComponent<EmbedDtmplEd
         if(code){
             dtmplConfig = await HCDataSource.requestDtmplConfig(serverKey,sourceId,code);
         }else{
-            dtmplConfig = await HCDataSource.requestAddDtmplConfig(serverKey,sourceId);
+            dtmplConfig = await HCDataSource.requestAddDtmplConfig(serverKey,sourceId,addTmplId);
         }
         await this.loadData(dtmplConfig);
         this.setState({

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

@@ -40,6 +40,7 @@ export interface LtmplTableState {
     showDtmplCustomEdit?: boolean;
     ractionId?: string,
     collapse?: boolean,
+    addTmplId?:string,
 };
 
 class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
@@ -56,6 +57,7 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
         showDraw: false,
         ractionId: undefined,
         collapse: false,
+        addTmplId:undefined,
     }
 
     static defaultProps = {
@@ -143,7 +145,7 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
             ractionId
         })
     }
-    doCreate = (toCustomPage) => {
+    doCreate = (addTmplId:string,toCustomPage?:boolean,) => {
         const {doCustomCreate} = this.props
         if (toCustomPage) {
             if (doCustomCreate) {
@@ -160,6 +162,7 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
             this.setState({
                 selectedCode: null,
                 showDtmplEdit: true,
+                addTmplId,
             })
         }
     }
@@ -203,7 +206,7 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
 
 
     render() {
-        const {ltmplConfigRes, criteriaData,pageSize,pageNo, showDtmplView, selectedCode, showDtmplEdit, showDtmplCustomEdit, ractionId, showDraw, collapse} = this.state;
+        const {ltmplConfigRes, criteriaData,pageSize,pageNo, showDtmplView, selectedCode, showDtmplEdit, showDtmplCustomEdit, ractionId, showDraw, collapse,addTmplId} = this.state;
         const {sourceId, mainCode, showView, doSearch, doRAction, funcMode, tip,title, collapsible, initCollapse,doCustomEdit,doCustomCreate,serverKey,readOnly} = this.props;
 
         if (!ltmplConfigRes) {
@@ -227,7 +230,7 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
                                     sourceId={sourceId}
                                     code={selectedCode}> </ModalDtmplView> : ""}
                 {(buttons.includes('dtmplEdit') || buttons.includes('dtmplAdd')) && showDtmplEdit ?
-                    <DtmplEditPage serverKey={serverKey} open={showDtmplEdit} onCancel={() => {
+                    <DtmplEditPage addTmplId={addTmplId} serverKey={serverKey} open={showDtmplEdit} onCancel={() => {
                         this.setState({
                             showDtmplEdit: false,
                         })

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

@@ -114,8 +114,10 @@ class DtmplRoute extends React.Component<DtmplRouteProps, DtmplRoutePropsStat> {
     }
 
     render() {
-        const {location,params}=this.props;
-        const {sourceId,} = params;
+
+        const {location,params,searchParams}=this.props;
+        const {sourceId} = params;
+
         const {codeSource}=this.state;
         if(!location){
             return <></>;
@@ -132,7 +134,7 @@ class DtmplRoute extends React.Component<DtmplRouteProps, DtmplRoutePropsStat> {
             );
         }else{
             return (
-                <DtmplEdit serverKey={null} addOrUpdate={this.getMode()} sourceId={sourceId} code={code} mainCode={this.getMainCode()} goBackToLtmpl={codeSource?undefined:this.goBackToLtmpl} goDtmpl={this.goDtmpl}></DtmplEdit>
+                <DtmplEdit addTmplId={searchParams.get('addTmplId')} serverKey={null} addOrUpdate={this.getMode()} sourceId={sourceId} code={code} mainCode={this.getMainCode()} goBackToLtmpl={codeSource?undefined:this.goBackToLtmpl} goDtmpl={this.goDtmpl}></DtmplEdit>
             );
         }
 

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

@@ -101,11 +101,11 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
         return mainCode;
     }
 
-    doCreate = (toCustomPage: boolean = false) => {
+    doCreate = (addTmplId:string,toCustomPage: boolean = false) => {
         const {basePath} = this.props;
         const {sourceId} = this.props.params;
         const {ltmplConfigRes} = this.state;
-        let path = `${basePath}/${sourceId}/detail-edit?menuId=${this.getMenuId()}`;
+        let path = `${basePath}/${sourceId}/detail-edit?menuId=${this.getMenuId()}&addTmplId=${addTmplId?addTmplId:""}`;
         if (toCustomPage && ltmplConfigRes.ltmplConfig.customEditPagePath) {
             path = `${basePath}/page/${sourceId}${ltmplConfigRes.ltmplConfig.customEditPagePath}?menuId=${this.getMenuId()}`;
         }