aldehyde 0.1.34 → 0.1.35

package/lib/detail/view/act-dtmpl-view.js

@@ -69,7 +69,7 @@ class ActDtmplView extends React.PureComponent {
     componentDidMount() {
         return __awaiter(this, void 0, void 0, function* () {
             const { sourceId, code, versionId } = this.props;
-            let dtmplConfig = yield HCDataSource.requestDtmplConfig(sourceId);
+            let dtmplConfig = yield HCDataSource.requestViewDtmplConfig(sourceId);
             this.setState({
                 dtmplConfig,
             });

package/lib/detail/view/act-dtmpl-view.js.map

@@ -1 +1 @@
-{"version":3,"file":"act-dtmpl-view.js","sourceRoot":"","sources":["../../../../../src/aldehyde/detail/view/act-dtmpl-view.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"act-dtmpl-view.js","sourceRoot":"","sources":["../../../../../src/aldehyde/detail/view/act-dtmpl-view.tsx"],"names":[],"mappings":"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"}

package/lib/detail/view/dtmpl-view.js

@@ -38,7 +38,7 @@ class DtmplView extends React.PureComponent {
                 this.setState({
                     loading: true,
                 });
-                const dtmplData = yield HcserviceV3.requestDtmplData(sourceId, code, versionId);
+                const dtmplData = yield HcserviceV3.requestViewDtmplData(sourceId, code, versionId);
                 this.setState({
                     dtmplData, loading: false,
                 });

package/lib/detail/view/dtmpl-view.js.map

@@ -1 +1 @@
-{"version":3,"file":"dtmpl-view.js","sourceRoot":"","sources":["../../../../../src/aldehyde/detail/view/dtmpl-view.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"dtmpl-view.js","sourceRoot":"","sources":["../../../../../src/aldehyde/detail/view/dtmpl-view.tsx"],"names":[],"mappings":"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"}

package/lib/layout/menu/menu-2layers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"menu-2layers.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-2layers.tsx"],"names":[],"mappings":";AAmFA,wBAAuC"}
+{"version":3,"file":"menu-2layers.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-2layers.tsx"],"names":[],"mappings":";AAqGA,wBAAuC"}

package/lib/layout/menu/menu-2layers.js

@@ -28,40 +28,57 @@ class Menu2layers extends React.PureComponent {
             openKeys: [],
         };
     }
-    // componentDidMount() {
-    //
-    // }
-    componentDidUpdate(prevProps) {
+    componentDidMount() {
         const { currentL2MenuId, blockMenu, collapsed } = this.props;
-        let { currentL2MenuId: preMenuId } = prevProps;
         const { openKeys } = this.state;
-        // if(collapsed){
-        //     if(openKeys.length>0){
-        //         this.setState({
-        //             openKeys:[]
-        //         })
-        //     }
-        // }else{
         let openKey = blockMenu ? MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId) : undefined;
         if (openKey && openKeys.length < 1) {
             this.setState({
                 openKeys: [openKey.toString()]
             });
         }
-        else if (preMenuId != currentL2MenuId) {
-            console.log('currentL2MenuId:', currentL2MenuId);
+    }
+    componentDidUpdate(prevProps) {
+        const { currentL2MenuId, blockMenu, collapsed } = this.props;
+        let { currentL2MenuId: preMenuId, blockMenu: preBlockMenu } = prevProps;
+        const { openKeys } = this.state;
+        if (!preBlockMenu || !blockMenu || blockMenu.id != preBlockMenu.id) {
+            //console.log('currentL2MenuId:',currentL2MenuId);
+            let openKey = blockMenu ? MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId) : undefined;
             if (openKey) {
-                if (openKeys.length == 1) {
-                    openKeys.push(openKey.toString());
-                    if (openKeys && openKeys.length > 1) {
-                        openKeys.splice(0, 1);
-                    }
-                }
                 this.setState({
-                    openKeys,
+                    openKeys: [openKey],
                 });
             }
         }
+        else {
+            let openKey = blockMenu ? MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId) : undefined;
+            let preOpenKey = blockMenu ? MenuRender.findOpenId(preBlockMenu.l1Menus, preMenuId) : undefined;
+            if (openKey && openKey != preOpenKey) {
+                this.setState({
+                    openKeys: [openKey],
+                });
+            }
+        }
+        // let openKey = blockMenu?MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId):undefined;
+        // if(openKey && openKeys.length<1){
+        //     this.setState({
+        //         openKeys:[openKey.toString()]
+        //     })
+        // }else if(preMenuId!=currentL2MenuId){
+        //     console.log('currentL2MenuId:',currentL2MenuId);
+        //     if (openKey) {
+        //         if(openKeys.length==1){
+        //             openKeys.push(openKey.toString())
+        //             if (openKeys && openKeys.length > 1) {
+        //                 openKeys.splice(0, 1);
+        //             }
+        //         }
+        //         this.setState({
+        //             openKeys,
+        //         })
+        //     }
+        // }
         //}
     }
     render() {

package/lib/layout/menu/menu-2layers.js.map

@@ -1 +1 @@
-{"version":3,"file":"menu-2layers.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-2layers.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"menu-2layers.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-2layers.tsx"],"names":[],"mappings":"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"}

package/lib/layout/menu/menu-render.d.ts

@@ -1,6 +1,7 @@
 import { Level1Menu, Level2Menu } from "../../tmpl/interface";
 declare const _default: {
     renderL1Menu(menus: Level1Menu[], target: any, basePath?: string): JSX.Element[];
+    getRoutePath(menu: Level2Menu, basePath: any, defaultCriteriaData: any): string;
     renderL2Menu(menus: Level2Menu[], target: any, basePath?: string): JSX.Element[];
     findOpenId(l1Menus: Level1Menu[], currentL2MenuId: string): string;
 };

package/lib/layout/menu/menu-render.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"menu-render.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-render.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,UAAU,EAAC,MAAM,sBAAsB,CAAC;;wBAQrC,UAAU,EAAE;wBASZ,UAAU,EAAE;wBAmBZ,UAAU,EAAE,mBAAiB,MAAM;;AA7B1D,wBAyCC"}
+{"version":3,"file":"menu-render.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-render.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,UAAU,EAAC,MAAM,sBAAsB,CAAC;;wBAQrC,UAAU,EAAE;uBASb,UAAU;wBA8BT,UAAU,EAAE;wBAqBZ,UAAU,EAAE,mBAAiB,MAAM;;AA7D1D,wBAyEC"}

package/lib/layout/menu/menu-render.js

@@ -11,6 +11,32 @@ export default {
             }
         });
     },
+    getRoutePath(menu, basePath, defaultCriteriaData) {
+        if (menu) {
+            let pageType = menu.pageType;
+            let routePath = 'act-table';
+            let codeSource = '';
+            switch (pageType) {
+                case "列表":
+                    routePath = 'act-table';
+                    break;
+                case "添加":
+                    routePath = 'detail-edit';
+                    codeSource = '&codeSource=new';
+                    break;
+                case "编辑":
+                    routePath = 'detail-edit';
+                    codeSource = '&codeSource=listTop';
+                    break;
+                case "详情":
+                    routePath = 'detail-view';
+                    codeSource = '&codeSource=listTop';
+                    break;
+            }
+            return `${basePath}/${menu.id}/${routePath}?menuId=${menu.id}${codeSource}${defaultCriteriaData}`;
+        }
+        return null;
+    },
     renderL2Menu(menus, target, basePath = "") {
         return menus.map((item) => {
             let delimiter = "/";
@@ -24,8 +50,9 @@ export default {
             if (item.defaultCriteriaValue) {
                 defaultCriteriaData = '&' + Units.transQueryParamsToStr(item.defaultCriteriaValue);
             }
+            let path = customPath ? `${basePath}/page-${item.id}${delimiter}${customPath}?menuId=${item.id}` : this.getRoutePath(item, basePath, defaultCriteriaData);
             return React.createElement(Menu.Item, { key: item.id },
-                React.createElement(NavLink, { to: customPath ? `${basePath}/page-${item.id}${delimiter}${customPath}?menuId=${item.id}` : `${basePath}/${item.id}/act-table?menuId=${item.id}${defaultCriteriaData}`, target: target }, item.title));
+                React.createElement(NavLink, { to: path, target: target }, item.title));
         });
     },
     findOpenId(l1Menus, currentL2MenuId) {

package/lib/layout/menu/menu-render.js.map

@@ -1 +1 @@
-{"version":3,"file":"menu-render.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-render.tsx"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAC,MAAM,MAAM,CAAC;AAC1B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,OAAO,EAAC,MAAM,kBAAkB,CAAC;AACzC,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,MAAM,EAAC,OAAO,EAAC,GAAG,IAAI,CAAC;AAEvB,eAAe;IACX,YAAY,CAAC,KAAkB,EAAC,MAAM,EAAC,QAAQ,GAAC,EAAE;QAC9C,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACtB,IAAI,IAAI,CAAC,OAAO,EAAE;gBACd,OAAO,oBAAC,OAAO,IAAC,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,IAC1C,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,EAAC,MAAM,EAAC,QAAQ,CAAC,CAC1C,CAAA;aACb;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IACD,YAAY,CAAC,KAAkB,EAAC,MAAM,EAAC,QAAQ,GAAC,EAAE;QAC9C,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACtB,IAAI,SAAS,GAAC,GAAG,CAAC;YAClB,IAAI,UAAU,GAAC,IAAI,CAAC,UAAU,CAAC;YAC/B,IAAG,UAAU,EAAC;gBACV,IAAG,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,EAAC;oBACzD,SAAS,GAAC,EAAE,CAAC;iBAChB;aACJ;YACD,IAAI,mBAAmB,GAAC,EAAE,CAAC;YAC3B,IAAG,IAAI,CAAC,oBAAoB,EAAC;gBACzB,mBAAmB,GAAC,GAAG,GAAE,KAAK,CAAC,qBAAqB,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;aACnF;YAED,OAAO,oBAAC,IAAI,CAAC,IAAI,IAAC,GAAG,EAAE,IAAI,CAAC,EAAE;gBAC1B,oBAAC,OAAO,IAAC,EAAE,EAAE,UAAU,CAAC,CAAC,CAAA,GAAG,QAAQ,SAAS,IAAI,CAAC,EAAE,GAAG,SAAS,GAAG,UAAU,WAAW,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA,GAAG,QAAQ,IAAI,IAAI,CAAC,EAAE,qBAAqB,IAAI,CAAC,EAAE,GAAG,mBAAmB,EAAE,EAAE,MAAM,EAAE,MAAM,IAAI,IAAI,CAAC,KAAK,CAAW,CAC9M,CAAA;QAChB,CAAC,CAAC,CAAA;IACN,CAAC;IACD,UAAU,CAAC,OAAoB,EAAC,eAAsB;QAClD,IAAI,YAAY,GAAQ,SAAS,CAAC;QAClC,KAAI,MAAM,MAAM,IAAI,OAAO,EAAC;YACxB,KAAI,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAC;gBAC/B,IAAG,MAAM,CAAC,EAAE,IAAE,eAAe,EAAC;oBAC1B,YAAY,GAAC,MAAM,CAAC,EAAE,CAAC;oBACvB,OAAO,YAAY,CAAC;iBACvB;aACJ;SACJ;QACD,OAAO,YAAY,CAAC;IACxB,CAAC;CACJ,CAAA"}
+{"version":3,"file":"menu-render.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-render.tsx"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAC,MAAM,MAAM,CAAC;AAC1B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,OAAO,EAAC,MAAM,kBAAkB,CAAC;AACzC,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,MAAM,EAAC,OAAO,EAAC,GAAG,IAAI,CAAC;AAEvB,eAAe;IACX,YAAY,CAAC,KAAkB,EAAC,MAAM,EAAC,QAAQ,GAAC,EAAE;QAC9C,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACtB,IAAI,IAAI,CAAC,OAAO,EAAE;gBACd,OAAO,oBAAC,OAAO,IAAC,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,IAC1C,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,EAAC,MAAM,EAAC,QAAQ,CAAC,CAC1C,CAAA;aACb;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IACD,YAAY,CAAC,IAAe,EAAC,QAAQ,EAAC,mBAAmB;QACrD,IAAG,IAAI,EAAC;YACJ,IAAI,QAAQ,GAAC,IAAI,CAAC,QAAQ,CAAC;YAE3B,IAAI,SAAS,GAAC,WAAW,CAAC;YAE1B,IAAI,UAAU,GAAC,EAAE,CAAC;YAClB,QAAQ,QAAQ,EAAE;gBACd,KAAK,IAAI;oBACL,SAAS,GAAC,WAAW,CAAC;oBACtB,MAAM;gBACV,KAAK,IAAI;oBACL,SAAS,GAAC,aAAa,CAAC;oBACxB,UAAU,GAAC,iBAAiB,CAAC;oBAC7B,MAAM;gBACV,KAAK,IAAI;oBACL,SAAS,GAAC,aAAa,CAAC;oBACxB,UAAU,GAAC,qBAAqB,CAAC;oBACjC,MAAM;gBACV,KAAK,IAAI;oBACL,SAAS,GAAC,aAAa,CAAC;oBACxB,UAAU,GAAC,qBAAqB,CAAC;oBACjC,MAAM;aACb;YAED,OAAO,GAAG,QAAQ,IAAI,IAAI,CAAC,EAAE,IAAI,SAAS,WAAW,IAAI,CAAC,EAAE,GAAG,UAAU,GAAG,mBAAmB,EAAE,CAAC;SAErG;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,YAAY,CAAC,KAAkB,EAAC,MAAM,EAAC,QAAQ,GAAC,EAAE;QAC9C,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACtB,IAAI,SAAS,GAAC,GAAG,CAAC;YAClB,IAAI,UAAU,GAAC,IAAI,CAAC,UAAU,CAAC;YAC/B,IAAG,UAAU,EAAC;gBACV,IAAG,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,EAAC;oBACzD,SAAS,GAAC,EAAE,CAAC;iBAChB;aACJ;YACD,IAAI,mBAAmB,GAAC,EAAE,CAAC;YAC3B,IAAG,IAAI,CAAC,oBAAoB,EAAC;gBACzB,mBAAmB,GAAC,GAAG,GAAE,KAAK,CAAC,qBAAqB,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;aACnF;YAED,IAAI,IAAI,GAAC,UAAU,CAAC,CAAC,CAAA,GAAG,QAAQ,SAAS,IAAI,CAAC,EAAE,GAAG,SAAS,GAAG,UAAU,WAAW,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA,IAAI,CAAC,YAAY,CAAC,IAAI,EAAC,QAAQ,EAAC,mBAAmB,CAAC,CAAC;YAEpJ,OAAO,oBAAC,IAAI,CAAC,IAAI,IAAC,GAAG,EAAE,IAAI,CAAC,EAAE;gBAC1B,oBAAC,OAAO,IAAC,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,IAAI,IAAI,CAAC,KAAK,CAAW,CAClD,CAAA;QAChB,CAAC,CAAC,CAAA;IACN,CAAC;IACD,UAAU,CAAC,OAAoB,EAAC,eAAsB;QAClD,IAAI,YAAY,GAAQ,SAAS,CAAC;QAClC,KAAI,MAAM,MAAM,IAAI,OAAO,EAAC;YACxB,KAAI,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAC;gBAC/B,IAAG,MAAM,CAAC,EAAE,IAAE,eAAe,EAAC;oBAC1B,YAAY,GAAC,MAAM,CAAC,EAAE,CAAC;oBACvB,OAAO,YAAY,CAAC;iBACvB;aACJ;SACJ;QACD,OAAO,YAAY,CAAC;IACxB,CAAC;CACJ,CAAA"}

package/lib/routable/dtmpl-route.d.ts

@@ -3,12 +3,22 @@ import { RouterCompProps } from '../tmpl/interface';
 export interface DtmplRouteProps extends RouterCompProps {
 }
 export interface DtmplRoutePropsStat {
+    codeSource: 'new' | 'listTop' | undefined;
+    queriedCode: string;
 }
 declare class DtmplRoute extends React.PureComponent<DtmplRouteProps, DtmplRoutePropsStat> {
+    state: {
+        codeSource: any;
+        queriedCode: any;
+    };
     static defaultProps: {
         basePath: string;
+        codeSource: any;
+        queriedCode: any;
     };
+    componentDidMount(): Promise<void>;
     getMenuId: () => string;
+    getCodeSource: () => any;
     goBackToLtmpl: () => void;
     goDtmpl: (code: string) => void;
     getMainCode: () => any;

package/lib/routable/dtmpl-route.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dtmpl-route.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/routable/dtmpl-route.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAQ,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAMnD,MAAM,WAAW,eAAgB,SAAQ,eAAe;CAEvD;AAED,MAAM,WAAW,mBAAmB;CAEnC;AAED,cAAM,UAAW,SAAQ,KAAK,CAAC,aAAa,CAAC,eAAe,EAAE,mBAAmB,CAAC;IAC9E,MAAM,CAAE,YAAY;;MAEnB;IACD,SAAS,eAMR;IAED,aAAa,aASZ;IAED,OAAO,SAAO,MAAM,UAYnB;IAED,WAAW,YAQV;IAED,OAAO,YAIN;IAED,OAAO,YAIN;IAED,MAAM;CAoBT;AAED,eAAe,UAAU,CAAC"}
+{"version":3,"file":"dtmpl-route.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/routable/dtmpl-route.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAQ,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAOnD,MAAM,WAAW,eAAgB,SAAQ,eAAe;CAEvD;AAED,MAAM,WAAW,mBAAmB;IAChC,UAAU,EAAC,KAAK,GAAC,SAAS,GAAC,SAAS,CAAC;IACrC,WAAW,EAAC,MAAM,CAAC;CACtB;AAED,cAAM,UAAW,SAAQ,KAAK,CAAC,aAAa,CAAC,eAAe,EAAE,mBAAmB,CAAC;IAC9E,KAAK;;;MAGJ;IACD,MAAM,CAAE,YAAY;;;;MAInB;IACK,iBAAiB;IAiBvB,SAAS,eAMR;IAED,aAAa,YAQZ;IAED,aAAa,aASZ;IAED,OAAO,SAAO,MAAM,UAYnB;IAED,WAAW,YASV;IAED,OAAO,YAUN;IAED,OAAO,YAIN;IAED,MAAM;CAqBT;AAED,eAAe,UAAU,CAAC"}

package/lib/routable/dtmpl-route.js

@@ -1,12 +1,26 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 import React from 'react';
 import Units from "../units";
 import DtmplEdit from "../detail/edit/dtmpl-edit";
 import ActDtmplView from '../detail/view/act-dtmpl-view';
+import HcserviceV3 from "../tmpl/hcservice-v3";
 ;
 ;
 class DtmplRoute extends React.PureComponent {
     constructor() {
         super(...arguments);
+        this.state = {
+            codeSource: undefined,
+            queriedCode: undefined,
+        };
         this.getMenuId = () => {
             const { location } = this.props;
             console.log("this.props.match.params", this.props);
@@ -14,6 +28,16 @@ class DtmplRoute extends React.PureComponent {
             let menuId = searchParams.get('menuId');
             return menuId;
         };
+        this.getCodeSource = () => {
+            const { location } = this.props;
+            let params = Units.transQueryStrToParams(location.search);
+            if ('codeSource' in params) {
+                return params['codeSource'];
+            }
+            else {
+                return undefined;
+            }
+        };
         this.goBackToLtmpl = () => {
             const { sourceId, } = this.props.match.params;
             const { basePath } = this.props;
@@ -48,9 +72,16 @@ class DtmplRoute extends React.PureComponent {
             }
         };
         this.getCode = () => {
+            const { codeSource, queriedCode } = this.state;
             const { location } = this.props;
-            let params = Units.transQueryStrToParams(location.search);
-            return params['code'];
+            //let code;
+            if (codeSource == 'listTop') {
+                return queriedCode;
+            }
+            else {
+                let params = Units.transQueryStrToParams(location.search);
+                return params['code'];
+            }
         };
         this.getMode = () => {
             const { location } = this.props;
@@ -58,10 +89,29 @@ class DtmplRoute extends React.PureComponent {
             return this.getCode() ? params['mode'] : "add";
         };
     }
+    componentDidMount() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { location, match } = this.props;
+            const { sourceId, } = match.params;
+            let codeSource = this.getCodeSource();
+            let queriedCode = undefined;
+            if (codeSource && codeSource == 'listTop') {
+                //查询
+                let data = yield HcserviceV3.requestMstrucLtmplQueryTop(sourceId, { top: 1 });
+                if (data && data.entities && data.entities[0]) {
+                    queriedCode = data.entities[0].code;
+                }
+            }
+            this.setState({
+                codeSource, queriedCode
+            });
+        });
+    }
     render() {
         const { location, match } = this.props;
         const { sourceId, } = match.params;
-        // console.log("this.props.match.params",match);
+        const { codeSource } = this.state;
+        console.log("this.props.match.params", match);
         if (!location) {
             return React.createElement(React.Fragment, null);
         }
@@ -71,12 +121,14 @@ class DtmplRoute extends React.PureComponent {
             return (React.createElement(ActDtmplView, { goDtmpl: this.goDtmpl, sourceId: sourceId, versionId: versionId, code: this.getCode(), mainCode: this.getMainCode() }));
         }
         else {
-            return (React.createElement(DtmplEdit, { addOrUpdate: this.getMode(), sourceId: sourceId, code: this.getCode(), mainCode: this.getMainCode(), goBackToLtmpl: this.goBackToLtmpl, goDtmpl: this.goDtmpl }));
+            return (React.createElement(DtmplEdit, { addOrUpdate: this.getMode(), sourceId: sourceId, code: this.getCode(), mainCode: this.getMainCode(), goBackToLtmpl: codeSource ? undefined : this.goBackToLtmpl, goDtmpl: this.goDtmpl }));
         }
     }
 }
 DtmplRoute.defaultProps = {
     basePath: "",
+    codeSource: undefined,
+    queriedCode: undefined,
 };
 export default DtmplRoute;
 //# sourceMappingURL=dtmpl-route.js.map

package/lib/routable/dtmpl-route.js.map

@@ -1 +1 @@
-{"version":3,"file":"dtmpl-route.js","sourceRoot":"","sources":["../../../../src/aldehyde/routable/dtmpl-route.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"dtmpl-route.js","sourceRoot":"","sources":["../../../../src/aldehyde/routable/dtmpl-route.tsx"],"names":[],"mappings":"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"}

package/lib/tmpl/hc-data-source.d.ts

@@ -6,6 +6,7 @@ declare namespace HCDataSource {
     var requestL2LtmplConfig: (sourceId: string) => Promise<LtmplConfigRes>;
     var requestSelectConfig: (sourceId: string) => Promise<SelectConfig>;
     var requestDtmplConfig: (sourceId: string) => Promise<DtmplConfig>;
+    var requestViewDtmplConfig: (sourceId: string) => Promise<DtmplConfig>;
     var getEnums: (mstrucId: string) => EnumItem[];
     var getEnumOption: (mstrucId: string, enumValue: string) => EnumItem;
     var getEnumValueColor: (mstrucId: string, enumValue: string) => string;

package/lib/tmpl/hc-data-source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hc-data-source.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/tmpl/hc-data-source.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEH,WAAW,EACX,QAAQ,EACG,cAAc,EACzB,YAAY,EAAE,UAAU,EAC3B,MAAM,aAAa,CAAC;AA8GrB,iBAAS,YAAY,SAEpB;kBAFQ,YAAY;;;;;;;;;;;;;;;;AAmKrB,eAAe,YAAY,CAAC"}
+{"version":3,"file":"hc-data-source.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/tmpl/hc-data-source.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEH,WAAW,EACX,QAAQ,EACG,cAAc,EACzB,YAAY,EAAE,UAAU,EAC3B,MAAM,aAAa,CAAC;AA+GrB,iBAAS,YAAY,SAEpB;kBAFQ,YAAY;;;;;;;;;;;;;;;;;AA6KrB,eAAe,YAAY,CAAC"}

package/lib/tmpl/hc-data-source.js

@@ -20,6 +20,7 @@ const selectConfigMap = new Map();
 const ltmplConfigMap = new Map();
 const l2LtmplConfigMap = new Map();
 const dtmplConfigMap = new Map();
+const viewDtmplConfigMap = new Map();
 function findUnloadEnumMstrucIdOfFields(fields) {
     const mstrucIdArray = [];
     if (fields) {
@@ -173,6 +174,16 @@ HCDataSource.requestDtmplConfig = function (sourceId) {
         return dtmplConfigMap.get(sourceId);
     });
 };
+HCDataSource.requestViewDtmplConfig = function (sourceId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!viewDtmplConfigMap.has(sourceId)) {
+            viewDtmplConfigMap.set(sourceId, yield HcserviceV3.requestViewDtmplConfig(sourceId));
+            //加载枚举
+            yield loadEnumOfDtmplConfig(viewDtmplConfigMap.get(sourceId));
+        }
+        return viewDtmplConfigMap.get(sourceId);
+    });
+};
 HCDataSource.getEnums = function (mstrucId) {
     //这里是不是后续可以考虑防止串改
     return enumMap.get(mstrucId);
@@ -268,6 +279,7 @@ HCDataSource.clearOnly = function () {
         enumMap.clear();
         ltmplConfigMap.clear();
         dtmplConfigMap.clear();
+        viewDtmplConfigMap.clear();
         selectConfigMap.clear();
         l2LtmplConfigMap.clear();
         optionsMap.clear();

package/lib/tmpl/hc-data-source.js.map

@@ -1 +1 @@
-{"version":3,"file":"hc-data-source.js","sourceRoot":"","sources":["../../../../src/aldehyde/tmpl/hc-data-source.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"hc-data-source.js","sourceRoot":"","sources":["../../../../src/aldehyde/tmpl/hc-data-source.tsx"],"names":[],"mappings":"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"}

package/lib/tmpl/hcservice-v3.d.ts

@@ -3,6 +3,7 @@ export default class HcserviceV3 {
     static requestEnum(mstrucIds: any): Promise<any>;
     static requestOptions(mstrucId: any): Promise<any>;
     static requestDtmplConfig(sourceId: string): Promise<any>;
+    static requestViewDtmplConfig(sourceId: string): Promise<any>;
     static requestSelectConfig(sourceId: any): Promise<any>;
     static requestLtmplConfig(sourceId: any): Promise<any>;
     static requestL2LtmplConfig(sourceId: any): Promise<any>;
@@ -15,6 +16,8 @@ export default class HcserviceV3 {
     static requestCommonDtmplData(sourceId: any, code: any, versionId: any, url: any): Promise<any>;
     static requestDtmplData(sourceId: any, code: any, versionId: any): Promise<any>;
     static requestMstrucDtmplData(sourceId: any, code: any, versionId: any): Promise<any>;
+    static requestViewDtmplData(sourceId: any, code: any, versionId: any): Promise<any>;
+    static requestMstrucViewDtmplData(sourceId: any, code: any, versionId: any): Promise<any>;
     static postCommonDtmplData(sourceId: string, formDataObj: any, message: any, url: any): Promise<{
         code: any;
         status: any;

package/lib/tmpl/hcservice-v3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hcservice-v3.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/tmpl/hcservice-v3.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"hcservice-v3.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/tmpl/hcservice-v3.tsx"],"names":[],"mappings":"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"}

package/lib/tmpl/hcservice-v3.js

@@ -66,9 +66,6 @@ export default class HcserviceV3 {
     // }
     static requestDtmplConfig(sourceId) {
         return __awaiter(this, void 0, void 0, function* () {
-            // if(sourceId=='user'){
-            //     return this.requestUserDtmplConfig();
-            // }
             let url = `/v3/dtmpl/config`;
             let res = yield Super.super({
                 url,
@@ -78,6 +75,17 @@ export default class HcserviceV3 {
             return res.dtmplConfig;
         });
     }
+    static requestViewDtmplConfig(sourceId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let url = `/v3/view-dtmpl/config`;
+            let res = yield Super.super({
+                url,
+                method: "GET",
+                query: { sourceId }
+            });
+            return res.dtmplConfig;
+        });
+    }
     // static async requestUserDtmplConfig() {
     //     let url = `/v3/user/dtmpl/config`
     //     let res = await Super.super({
@@ -235,6 +243,18 @@ export default class HcserviceV3 {
             return yield this.requestCommonDtmplData(sourceId, code, versionId, url);
         });
     }
+    static requestViewDtmplData(sourceId, code, versionId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let url = `/v3/view-dtmpl/data`;
+            return yield this.requestCommonDtmplData(sourceId, code, versionId, url);
+        });
+    }
+    static requestMstrucViewDtmplData(sourceId, code, versionId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let url = `/v3/mstruc/view-dtmpl/data`;
+            return yield this.requestCommonDtmplData(sourceId, code, versionId, url);
+        });
+    }
     // static async requestUserDtmplData() {
     //     let url = `/v3/user/dtmpl/data`;
     //     let res = await Super.super({

package/lib/tmpl/hcservice-v3.js.map

@@ -1 +1 @@
-{"version":3,"file":"hcservice-v3.js","sourceRoot":"","sources":["../../../../src/aldehyde/tmpl/hcservice-v3.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"hcservice-v3.js","sourceRoot":"","sources":["../../../../src/aldehyde/tmpl/hcservice-v3.tsx"],"names":[],"mappings":"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"}

package/lib/tmpl/interface.d.ts

@@ -45,6 +45,7 @@ export interface Level2Menu extends MenuBase {
     displayTotal?: boolean;
     count?: number;
     defaultCriteriaValue?: object;
+    pageType: '列表' | '详情' | '编辑' | '添加';
 }
 export interface Level1Menu extends MenuBase {
     l2Menus: Level2Menu[];

package/lib/tmpl/interface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/tmpl/interface.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/tmpl/interface.tsx"],"names":[],"mappings":"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"}

package/lib/tmpl/interface.js.map

@@ -1 +1 @@
-{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../../../src/aldehyde/tmpl/interface.tsx"],"names":[],"mappings":"AA+QC,CAAC;AAWD,CAAC"}
+{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../../../src/aldehyde/tmpl/interface.tsx"],"names":[],"mappings":"AAgRC,CAAC;AAWD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aldehyde",
-  "version": "0.1.34",
+  "version": "0.1.35",
   "author": "cosmicparticle",
   "main": "lib/index.js",
   "module": "src/aldehyde/index.txs",

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

@@ -44,7 +44,7 @@ class ActDtmplView extends React.PureComponent<ActDtmplViewProps, ActDtmplViewSt
 
     async componentDidMount() {
         const { sourceId, code, versionId} = this.props;
-        let dtmplConfig = await HCDataSource.requestDtmplConfig(sourceId);
+        let dtmplConfig = await HCDataSource.requestViewDtmplConfig(sourceId);
         this.setState({
             dtmplConfig,
         })

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

@@ -60,7 +60,7 @@ class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
             this.setState({
                 loading: true,
             })
-            const dtmplData = await HcserviceV3.requestDtmplData( sourceId, code, versionId);
+            const dtmplData = await HcserviceV3.requestViewDtmplData( sourceId, code, versionId);
             this.setState({
                 dtmplData, loading:false,
             })

package/src/aldehyde/layout/menu/menu-2layers.tsx

@@ -18,45 +18,63 @@ class Menu2layers extends React.PureComponent<Menu2layersProps, Menu2layersState
         }
     }
 
-    // componentDidMount() {
-    //
-    // }
+    componentDidMount() {
+        const {currentL2MenuId, blockMenu,collapsed} = this.props;
+        const {openKeys} = this.state;
+        let openKey = blockMenu?MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId):undefined;
+        if(openKey && openKeys.length<1){
+            this.setState({
+                openKeys:[openKey.toString()]
+            })
+        }
+    }
     componentDidUpdate(prevProps) {
         const {currentL2MenuId, blockMenu,collapsed} = this.props;
-        let {currentL2MenuId:preMenuId}=prevProps;
+        let {currentL2MenuId:preMenuId,blockMenu:preBlockMenu}=prevProps;
         const {openKeys} = this.state;
-        // if(collapsed){
-        //     if(openKeys.length>0){
-        //         this.setState({
-        //             openKeys:[]
-        //         })
-        //     }
-        // }else{
 
+        if(!preBlockMenu || !blockMenu  || blockMenu.id!=preBlockMenu.id){
+                //console.log('currentL2MenuId:',currentL2MenuId);
             let openKey = blockMenu?MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId):undefined;
-            if(openKey && openKeys.length<1){
-                this.setState({
-                    openKeys:[openKey.toString()]
-                })
-            }else if(preMenuId!=currentL2MenuId){
-                console.log('currentL2MenuId:',currentL2MenuId);
                 if (openKey) {
-                    if(openKeys.length==1){
-                        openKeys.push(openKey.toString())
-                        if (openKeys && openKeys.length > 1) {
-                            openKeys.splice(0, 1);
-                        }
-                    }
                     this.setState({
-                        openKeys,
+                        openKeys:[openKey],
                     })
                 }
+        }else {
+            let openKey = blockMenu?MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId):undefined;
+            let preOpenKey = blockMenu?MenuRender.findOpenId(preBlockMenu.l1Menus, preMenuId):undefined;
+            if(openKey && openKey!=preOpenKey){
+                this.setState({
+                    openKeys:[openKey],
+                })
             }
+        }
+
+            // let openKey = blockMenu?MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId):undefined;
+            // if(openKey && openKeys.length<1){
+            //     this.setState({
+            //         openKeys:[openKey.toString()]
+            //     })
+            // }else if(preMenuId!=currentL2MenuId){
+            //     console.log('currentL2MenuId:',currentL2MenuId);
+            //     if (openKey) {
+            //         if(openKeys.length==1){
+            //             openKeys.push(openKey.toString())
+            //             if (openKeys && openKeys.length > 1) {
+            //                 openKeys.splice(0, 1);
+            //             }
+            //         }
+            //         this.setState({
+            //             openKeys,
+            //         })
+            //     }
+            // }
         //}
     }
 
     handleOpen = (openKeys) => {
-        if (openKeys && openKeys.length > 1) {
+        if (openKeys && openKeys.length>1) {
             openKeys.splice(0, 1);
         }
         this.setState({

package/src/aldehyde/layout/menu/menu-render.tsx

@@ -15,6 +15,36 @@ export default {
             }
         })
     },
+    getRoutePath(menu:Level2Menu,basePath,defaultCriteriaData){
+        if(menu){
+            let pageType=menu.pageType;
+
+            let routePath='act-table';
+
+            let codeSource='';
+            switch (pageType) {
+                case "列表":
+                    routePath='act-table';
+                    break;
+                case "添加":
+                    routePath='detail-edit';
+                    codeSource='&codeSource=new';
+                    break;
+                case "编辑":
+                    routePath='detail-edit';
+                    codeSource='&codeSource=listTop';
+                    break;
+                case "详情":
+                    routePath='detail-view';
+                    codeSource='&codeSource=listTop';
+                    break;
+            }
+
+            return `${basePath}/${menu.id}/${routePath}?menuId=${menu.id}${codeSource}${defaultCriteriaData}`;
+
+        }
+        return null;
+    },
     renderL2Menu(menus:Level2Menu[],target,basePath=""){
         return menus.map((item) => {
             let delimiter="/";
@@ -29,8 +59,10 @@ export default {
                 defaultCriteriaData='&'+ Units.transQueryParamsToStr(item.defaultCriteriaValue);
             }
 
+            let path=customPath ?`${basePath}/page-${item.id}${delimiter}${customPath}?menuId=${item.id}` :this.getRoutePath(item,basePath,defaultCriteriaData);
+
             return <Menu.Item key={item.id}>
-                <NavLink to={customPath ?`${basePath}/page-${item.id}${delimiter}${customPath}?menuId=${item.id}` :`${basePath}/${item.id}/act-table?menuId=${item.id}${defaultCriteriaData}`} target={target} >{item.title}</NavLink>
+                <NavLink to={path} target={target} >{item.title}</NavLink>
             </Menu.Item>
         })
     },

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

@@ -3,7 +3,8 @@ import {Button, Card, Form as AntdForm, Modal} from 'antd';
 import  {RouterCompProps} from '../tmpl/interface';
 import Units from "../units";
 import DtmplEdit from "../detail/edit/dtmpl-edit";
-import ActDtmplView from '../detail/view/act-dtmpl-view'
+import ActDtmplView from '../detail/view/act-dtmpl-view';
+import HcserviceV3 from "../tmpl/hcservice-v3";
 
 
 export interface DtmplRouteProps extends RouterCompProps {
@@ -11,13 +12,37 @@ export interface DtmplRouteProps extends RouterCompProps {
 };
 
 export interface DtmplRoutePropsStat {
-
+    codeSource:'new'|'listTop'|undefined,
+    queriedCode:string,
 };
 
 class DtmplRoute extends React.PureComponent<DtmplRouteProps, DtmplRoutePropsStat> {
+    state={
+        codeSource:undefined,
+        queriedCode:undefined,
+    }
     static  defaultProps={
         basePath:"",
+        codeSource:undefined,
+        queriedCode:undefined,
     }
+    async componentDidMount() {
+        const {location,match}=this.props;
+        const {sourceId,} = match.params;
+        let codeSource:'new'|'listTop'|undefined=this.getCodeSource();
+        let queriedCode=undefined;
+        if(codeSource && codeSource=='listTop'){
+            //查询
+          let data= await HcserviceV3.requestMstrucLtmplQueryTop(sourceId,{top:1});
+          if(data && data.entities && data.entities[0]){
+              queriedCode=data.entities[0].code;
+          }
+        }
+        this.setState({
+            codeSource,queriedCode
+        })
+    }
+
     getMenuId=()=>{
         const {location} = this.props;
         console.log("this.props.match.params",this.props);
@@ -26,6 +51,16 @@ class DtmplRoute extends React.PureComponent<DtmplRouteProps, DtmplRoutePropsSta
         return menuId;
     }
 
+    getCodeSource=()=>{
+        const {location}=this.props;
+        let params=Units.transQueryStrToParams(location.search);
+        if('codeSource' in params){
+            return params['codeSource'];
+        }else{
+            return undefined;
+        }
+    }
+
     goBackToLtmpl=()=>{
         const { sourceId,} = this.props.match.params;
         const {basePath}=this.props;
@@ -53,6 +88,7 @@ class DtmplRoute extends React.PureComponent<DtmplRouteProps, DtmplRoutePropsSta
 
     getMainCode=()=>{
         const {location}=this.props;
+
         let params=Units.transQueryStrToParams(location.search);
         if('mainCode' in params){
             return params['mainCode'];
@@ -61,10 +97,16 @@ class DtmplRoute extends React.PureComponent<DtmplRouteProps, DtmplRoutePropsSta
         }
     }
 
-    getCode=()=>{
+    getCode= ()=>{
+        const {codeSource,queriedCode}=this.state;
         const {location}=this.props;
-        let params=Units.transQueryStrToParams(location.search);
-        return params['code'];
+        //let code;
+        if(codeSource=='listTop'){
+            return queriedCode;
+        }else{
+            let params=Units.transQueryStrToParams(location.search);
+            return params['code'];
+        }
     }
 
     getMode=()=>{
@@ -76,7 +118,8 @@ class DtmplRoute extends React.PureComponent<DtmplRouteProps, DtmplRoutePropsSta
     render() {
         const {location,match}=this.props;
         const {sourceId,} = match.params;
-        // console.log("this.props.match.params",match);
+        const {codeSource}=this.state;
+        console.log("this.props.match.params",match);
         if(!location){
             return <></>;
         }
@@ -88,7 +131,7 @@ class DtmplRoute extends React.PureComponent<DtmplRouteProps, DtmplRoutePropsSta
             );
         }else{
             return (
-                <DtmplEdit addOrUpdate={this.getMode()} sourceId={sourceId} code={this.getCode()} mainCode={this.getMainCode()} goBackToLtmpl={this.goBackToLtmpl} goDtmpl={this.goDtmpl}></DtmplEdit>
+                <DtmplEdit addOrUpdate={this.getMode()} sourceId={sourceId} code={this.getCode()} mainCode={this.getMainCode()} goBackToLtmpl={codeSource?undefined:this.goBackToLtmpl} goDtmpl={this.goDtmpl}></DtmplEdit>
             );
         }
 

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

@@ -19,6 +19,7 @@ const selectConfigMap: Map<string, SelectConfig> = new Map<string, SelectConfig>
 const ltmplConfigMap: Map<string, LtmplConfigRes> = new Map<string, LtmplConfigRes>();
 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>();
 
 
 function findUnloadEnumMstrucIdOfFields(fields:FieldBase[]) {
@@ -167,11 +168,20 @@ HCDataSource.requestDtmplConfig = async function ( sourceId: string) {
     if (!dtmplConfigMap.has(sourceId)) {
         dtmplConfigMap.set(sourceId, await HcserviceV3.requestDtmplConfig(sourceId));
         //加载枚举
-       await loadEnumOfDtmplConfig(dtmplConfigMap.get(sourceId));
+        await loadEnumOfDtmplConfig(dtmplConfigMap.get(sourceId));
     }
     return dtmplConfigMap.get(sourceId);
 };
 
+HCDataSource.requestViewDtmplConfig = async function ( sourceId: string) {
+    if (!viewDtmplConfigMap.has(sourceId)) {
+        viewDtmplConfigMap.set(sourceId, await HcserviceV3.requestViewDtmplConfig(sourceId));
+        //加载枚举
+        await loadEnumOfDtmplConfig(viewDtmplConfigMap.get(sourceId));
+    }
+    return viewDtmplConfigMap.get(sourceId);
+};
+
 HCDataSource.getEnums = function (mstrucId:string): EnumItem[] {
     //这里是不是后续可以考虑防止串改
    return enumMap.get(mstrucId);
@@ -268,6 +278,7 @@ HCDataSource.clearOnly =async function () {
     enumMap.clear();
     ltmplConfigMap.clear();
     dtmplConfigMap.clear();
+    viewDtmplConfigMap.clear();
     selectConfigMap.clear();
     l2LtmplConfigMap.clear();
     optionsMap.clear();

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

@@ -57,10 +57,6 @@ export default class HcserviceV3 {
 
     static async requestDtmplConfig(sourceId:string) {
 
-        // if(sourceId=='user'){
-        //     return this.requestUserDtmplConfig();
-        // }
-
         let url = `/v3/dtmpl/config`
         let res = await Super.super({
             url,
@@ -70,6 +66,17 @@ export default class HcserviceV3 {
         return res.dtmplConfig;
     }
 
+    static async requestViewDtmplConfig(sourceId:string) {
+
+        let url = `/v3/view-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({
@@ -220,6 +227,16 @@ export default class HcserviceV3 {
         return await this.requestCommonDtmplData(sourceId, code,versionId,url)
     }
 
+    static async requestViewDtmplData(sourceId, code,versionId) {
+        let url = `/v3/view-dtmpl/data`;
+        return await this.requestCommonDtmplData(sourceId, code,versionId,url)
+    }
+
+    static async requestMstrucViewDtmplData(sourceId, code,versionId) {
+        let url = `/v3/mstruc/view-dtmpl/data`;
+        return await this.requestCommonDtmplData(sourceId, code,versionId,url)
+    }
+
     // static async requestUserDtmplData() {
     //     let url = `/v3/user/dtmpl/data`;
     //     let res = await Super.super({

package/src/aldehyde/tmpl/interface.tsx

@@ -58,7 +58,8 @@ export interface Level2Menu extends MenuBase {
     customPath?: string;
     displayTotal?: boolean;
     count?:number;
-    defaultCriteriaValue?:object
+    defaultCriteriaValue?:object,
+    pageType:'列表'|'详情'|'编辑'|'添加'
 }
 
 export interface Level1Menu extends MenuBase {