aldehyde 0.1.37 → 0.1.40

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

@@ -553,11 +553,11 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
                         </div>
                     </CollapseCard>
                     {buttons.includes('detail') ?
-                        <ModalDtmplView visible={showDtmplView} onCancel={this.hiddenEntityView}
+                        <ModalDtmplView mainCode={mainCode?mainCode:parentId}  visible={showDtmplView} onCancel={this.hiddenEntityView}
                                         sourceId={fieldGroupConfig.id}
                                         code={selectedCode}> </ModalDtmplView> : ""}
                     {buttons.includes('dtmplEdit') || buttons.includes('dtmplAdd') ?
-                        <DtmplEditPage visible={showDtmplEdit} onCancel={this.hiddenEntityEdit}
+                        <DtmplEditPage mainCode={mainCode?mainCode:parentId} visible={showDtmplEdit} onCancel={this.hiddenEntityEdit}
                                        sourceId={fieldGroupConfig.id}
                                        code={selectedCode}
                                        onOk={selectedCode ? this.handleDtmplEdit : this.handleDtmplAdd} />
@@ -571,7 +571,7 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
                         <ModelSelectTable maxSelectedRows={fieldGroupConfig.max} visible={showSelectTable}
                                           onOK={this.select} onCancel={() => {
                             this.setState({showSelectTable: false})
-                        }} exceptCodes={exceptCodes} mainCode={mainCode}
+                        }} exceptCodes={exceptCodes} mainCode={mainCode?mainCode:parentId}
                                           sourceId={fieldGroupConfig.id}></ModelSelectTable> : ""}
 
                 </>

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

@@ -20,7 +20,7 @@ const ltmplConfigMap: Map<string, LtmplConfigRes> = new Map<string, LtmplConfigR
 const l2LtmplConfigMap: Map<string, LtmplConfigRes> = new Map<string, LtmplConfigRes>();
 const dtmplConfigMap: Map<string, DtmplConfig> = new Map<string, DtmplConfig>();
 const viewDtmplConfigMap: Map<string, DtmplConfig> = new Map<string, DtmplConfig>();
-
+const addDtmplConfigMap: Map<string, DtmplConfig> = new Map<string, DtmplConfig>();
 
 function findUnloadEnumMstrucIdOfFields(fields:FieldBase[]) {
     const mstrucIdArray = [];
@@ -182,6 +182,15 @@ HCDataSource.requestViewDtmplConfig = async function ( sourceId: string) {
     return viewDtmplConfigMap.get(sourceId);
 };
 
+HCDataSource.requestAddDtmplConfig = async function ( sourceId: string) {
+    if (!addDtmplConfigMap.has(sourceId)) {
+        addDtmplConfigMap.set(sourceId, await HcserviceV3.requestAddDtmplConfig(sourceId));
+        //加载枚举
+        await loadEnumOfDtmplConfig(addDtmplConfigMap.get(sourceId));
+    }
+    return addDtmplConfigMap.get(sourceId);
+};
+
 HCDataSource.getEnums = function (mstrucId:string): EnumItem[] {
     //这里是不是后续可以考虑防止串改
    return enumMap.get(mstrucId);
@@ -279,6 +288,7 @@ HCDataSource.clearOnly =async function () {
     ltmplConfigMap.clear();
     dtmplConfigMap.clear();
     viewDtmplConfigMap.clear();
+    addDtmplConfigMap.clear();
     selectConfigMap.clear();
     l2LtmplConfigMap.clear();
     optionsMap.clear();

package/src/aldehyde/tmpl/hcservice-v3.tsx

@@ -77,6 +77,17 @@ export default class HcserviceV3 {
         return res.dtmplConfig;
     }
 
+    static async requestAddDtmplConfig(sourceId:string) {
+
+        let url = `/v3/add-dtmpl/config`
+        let res = await Super.super({
+            url,
+            method: "GET",
+            query:{sourceId}
+        });
+        return res.dtmplConfig;
+    }
+
     // static async requestUserDtmplConfig() {
     //     let url = `/v3/user/dtmpl/config`
     //     let res = await Super.super({