aldehyde 0.2.159 → 0.2.161

package/lib/module/ltmpl-table.js

@@ -33,6 +33,7 @@ class LtmplTable extends React.PureComponent {
             ractionId: undefined,
             collapse: false,
             addTmplId: undefined,
+            dtmplSourceId: undefined,
         };
         this.loadLtmplConfig = () => __awaiter(this, void 0, void 0, function* () {
             const { sourceId, serverKey } = this.props;
@@ -66,24 +67,25 @@ class LtmplTable extends React.PureComponent {
                 showDtmplView: true,
             });
         };
-        this.doEdit = (code, mode, toCustomPage) => {
-            const { doCustomEdit } = this.props;
-            if (toCustomPage) {
+        this.doEdit = (param) => {
+            const { doCustomEdit, sourceId } = this.props;
+            if (param.toCustomPage) {
                 if (doCustomEdit) {
-                    doCustomEdit(code, mode, () => {
+                    doCustomEdit(param.code, param.mode, () => {
                         this.doSearch(this.state.criteriaData);
                     });
                 }
                 else {
                     this.setState({
-                        selectedCode: code,
+                        selectedCode: param.code,
+                        dtmplSourceId: param.dtmplSourceId ? param.dtmplSourceId : sourceId,
                         showDtmplCustomEdit: true,
                     });
                 }
             }
             else {
                 this.setState({
-                    selectedCode: code,
+                    selectedCode: param.code,
                     showDtmplEdit: true,
                 });
             }
@@ -177,7 +179,7 @@ class LtmplTable extends React.PureComponent {
         });
     }
     render() {
-        const { ltmplConfigRes, criteriaData, pageSize, pageNo, showDtmplView, selectedCode, showDtmplEdit, showDtmplCustomEdit, ractionId, showDraw, collapse, addTmplId, } = this.state;
+        const { ltmplConfigRes, criteriaData, pageSize, pageNo, showDtmplView, selectedCode, showDtmplEdit, showDtmplCustomEdit, ractionId, showDraw, collapse, addTmplId, dtmplSourceId, } = this.state;
         const { sourceId, mainCode, showView, doSearch, doRAction, funcMode, tip, title, collapsible, initCollapse, doCustomEdit, doCustomCreate, serverKey, readOnly, } = this.props;
         const { translate } = this.context;
         if (!ltmplConfigRes) {
@@ -197,7 +199,7 @@ class LtmplTable extends React.PureComponent {
                         this.setState({
                             showDtmplEdit: false,
                         });
-                    }, sourceId: sourceId, mainCode: mainCode, code: selectedCode, onOk: this.handleDtmplEdit })) : (""),
+                    }, sourceId: dtmplSourceId ? dtmplSourceId : sourceId, mainCode: mainCode, code: selectedCode, onOk: this.handleDtmplEdit })) : (""),
                 showDtmplCustomEdit ? (React.createElement(DtmplCustomEditModalPage, { serverKey: serverKey, open: showDtmplCustomEdit, onOk: () => {
                         this.doSearch(this.state.criteriaData);
                         this.setState({

package/lib/module/ltmpl-table.js.map

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

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

@@ -1,6 +1,7 @@
-import React from 'react';
-import { CodeSource, RouterCompProps } from '../tmpl/interface';
+import React from "react";
+import { CodeSource, RouterCompProps } from "../tmpl/interface";
 export interface DtmplRouteProps extends RouterCompProps {
+    layoutRootPath?: string;
 }
 export interface DtmplRoutePropsStat {
     codeSource?: CodeSource;

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,OAAO,EAAC,UAAU,EAAE,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAO9D,MAAM,WAAW,eAAgB,SAAQ,eAAe;CAEvD;AAED,MAAM,WAAW,mBAAmB;IAChC,UAAU,CAAC,EAAC,UAAU,CAAC;IACvB,WAAW,CAAC,EAAC,MAAM,CAAC;CACvB;;AA+HD,wBAAsC"}
+{"version":3,"file":"dtmpl-route.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/routable/dtmpl-route.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAMhE,MAAM,WAAW,eAAgB,SAAQ,eAAe;IACtD,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,mBAAmB;IAClC,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;;AAqJD,wBAAsC"}

package/lib/routable/dtmpl-route.js

@@ -7,14 +7,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import React from 'react';
-import { Empty } from 'antd';
+import React from "react";
+import { Empty } from "antd";
 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";
 import withRouter from "./withroute";
-;
-;
 class DtmplRoute extends React.Component {
     constructor() {
         super(...arguments);
@@ -29,21 +27,21 @@ class DtmplRoute extends React.Component {
             let queriedCode = yield HcserviceV3.queryCode(sourceId, codeSource);
             this.setState({
                 codeSource,
-                queriedCode
+                queriedCode,
             });
         });
         this.getMenuId = () => {
             const { searchParams } = this.props;
             //console.log("this.props.match.params",this.props);
             // var searchParams = new URLSearchParams( location.search);
-            let menuId = searchParams.get('menuId');
+            let menuId = searchParams.get("menuId");
             return menuId;
         };
         this.getCodeSource = () => {
             const { searchParams } = this.props;
             // let params=Units.transQueryStrToParams(location.search);
             //  if('codeSource' in params){
-            return searchParams.get('codeSource');
+            return searchParams.get("codeSource");
             // }else{
             //     return undefined;
             // }
@@ -52,9 +50,9 @@ class DtmplRoute extends React.Component {
             this.props.navigate(-1);
         };
         this.goDtmpl = (code) => {
-            const { sourceId, } = this.props.params;
+            const { sourceId } = this.props.params;
             const { basePath } = this.props;
-            let url = `${basePath}/${sourceId}/detail-edit?menuId=${this.getMenuId()}`;
+            let url = `${basePath}${this.computedLayoutPath}/${sourceId}/detail-edit?menuId=${this.getMenuId()}`;
             if (code) {
                 url = url + `&code=${code}`;
             }
@@ -66,7 +64,7 @@ class DtmplRoute extends React.Component {
         };
         this.getMainCode = () => {
             const { searchParams } = this.props;
-            return searchParams.get('mainCode');
+            return searchParams.get("mainCode");
         };
         this.getCode = () => {
             const { codeSource, queriedCode } = this.state;
@@ -77,13 +75,13 @@ class DtmplRoute extends React.Component {
             }
             else {
                 // let params=Units.transQueryStrToParams(location.search);
-                return searchParams.get('code');
+                return searchParams.get("code");
             }
         };
         this.getMode = () => {
             const { searchParams } = this.props;
             // let params=Units.transQueryStrToParams(location.search);
-            return this.getCode() ? searchParams.get('mode') : "add";
+            return this.getCode() ? searchParams.get("mode") : "add";
         };
     }
     componentDidMount() {
@@ -91,6 +89,12 @@ class DtmplRoute extends React.Component {
             yield this.queryCode();
         });
     }
+    get computedLayoutPath() {
+        const { layoutRootPath } = this.props;
+        if (layoutRootPath !== undefined)
+            return `/${layoutRootPath}`;
+        return "";
+    }
     shouldComponentUpdate(prevProps, prevState) {
         if (!prevProps || prevProps != this.props) {
             this.setState({ codeSource: undefined, queriedCode: undefined });
@@ -112,16 +116,16 @@ class DtmplRoute extends React.Component {
             return React.createElement(React.Fragment, null);
         }
         const code = this.getCode();
-        if (code && code == 'bad-code') {
+        if (code && code == "bad-code") {
             return React.createElement(Empty, null);
         }
         // let params=Units.transQueryStrToParams(location.search);
-        let versionId = params['versionId'];
+        let versionId = params["versionId"];
         if (location.pathname.endsWith("detail-view")) {
             return (React.createElement(ActDtmplView, { serverKey: null, goDtmpl: this.goDtmpl, sourceId: sourceId, versionId: versionId, code: code, mainCode: this.getMainCode() }));
         }
         else {
-            return (React.createElement(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 }));
+            return (React.createElement(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 }));
         }
     }
 }

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/routable/import-route.d.ts

@@ -1,7 +1,8 @@
-import React from 'react';
-import { RouterCompProps } from '../tmpl/interface';
+import React from "react";
+import { RouterCompProps } from "../tmpl/interface";
 export interface ImportRouteProps extends RouterCompProps {
     serverKey?: string;
+    layoutRootPath?: string;
 }
 declare const _default: (props: any) => React.JSX.Element;
 export default _default;

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

@@ -1 +1 @@
-{"version":3,"file":"import-route.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/routable/import-route.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAIlD,MAAM,WAAW,gBAAiB,SAAQ,eAAe;IACrD,SAAS,CAAC,EAAC,MAAM,CAAC;CACrB;;AAoBD,wBAA4C"}
+{"version":3,"file":"import-route.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/routable/import-route.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAIpD,MAAM,WAAW,gBAAiB,SAAQ,eAAe;IACvD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;;AAyBD,wBAA4C"}

package/lib/routable/import-route.js

@@ -7,23 +7,27 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import React from 'react';
-import ExcelImport from '../import/excel-import';
+import React from "react";
+import ExcelImport from "../import/excel-import";
 import withRouter from "./withroute";
-;
 class ExcelImportRoute extends React.PureComponent {
     constructor() {
         super(...arguments);
         this.state = {};
     }
     componentDidMount() {
-        return __awaiter(this, void 0, void 0, function* () {
-        });
+        return __awaiter(this, void 0, void 0, function* () { });
+    }
+    get computedLayoutPath() {
+        const { layoutRootPath } = this.props;
+        if (layoutRootPath !== undefined)
+            return `/${layoutRootPath}`;
+        return "";
     }
     render() {
         const { params, serverKey } = this.props;
         const { sourceId } = params;
-        return React.createElement(ExcelImport, { serverKey: serverKey, sourceId: sourceId });
+        return (React.createElement(ExcelImport, { serverKey: serverKey, sourceId: sourceId }));
     }
 }
 export default withRouter(ExcelImportRoute);

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

@@ -1 +1 @@
-{"version":3,"file":"import-route.js","sourceRoot":"","sources":["../../../../src/aldehyde/routable/import-route.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,WAAW,MAAM,wBAAwB,CAAA;AAChD,OAAO,UAAU,MAAM,aAAa,CAAC;AAIpC,CAAC;AAKF,MAAM,gBAAiB,SAAQ,KAAK,CAAC,aAAgD;IAArF;;QAEI,UAAK,GAAG,EAAE,CAAA;IAYd,CAAC;IAVS,iBAAiB;;QAEvB,CAAC;KAAA;IAGD,MAAM;QACF,MAAM,EAAE,MAAM,EAAE,SAAS,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QACxC,MAAM,EAAE,QAAQ,EAAC,GAAG,MAAM,CAAC;QAC5B,OAAO,oBAAC,WAAW,IAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,GAAgB,CAAA;IAC/E,CAAC;CACJ;AACD,eAAe,UAAU,CAAC,gBAAgB,CAAC,CAAC"}
+{"version":3,"file":"import-route.js","sourceRoot":"","sources":["../../../../src/aldehyde/routable/import-route.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,WAAW,MAAM,wBAAwB,CAAC;AACjD,OAAO,UAAU,MAAM,aAAa,CAAC;AAQrC,MAAM,gBAAiB,SAAQ,KAAK,CAAC,aAGpC;IAHD;;QAIE,UAAK,GAAG,EAAE,CAAC;IAiBb,CAAC;IAfO,iBAAiB;8DAAI,CAAC;KAAA;IAE5B,IAAI,kBAAkB;QACpB,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACtC,IAAI,cAAc,KAAK,SAAS;YAAE,OAAO,IAAI,cAAc,EAAE,CAAC;QAC9D,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM;QACJ,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACzC,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;QAC5B,OAAO,CACL,oBAAC,WAAW,IAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,GAAgB,CACtE,CAAC;IACJ,CAAC;CACF;AACD,eAAe,UAAU,CAAC,gBAAgB,CAAC,CAAC"}

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

@@ -1,6 +1,7 @@
 import React from "react";
 import { LtmplConfigRes, RouterCompProps } from "../tmpl/interface";
 export interface LtmplRouteProps extends RouterCompProps {
+    layoutRootPath?: string;
 }
 export interface LtmplRouteState {
     ltmplConfigRes?: LtmplConfigRes;

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

@@ -1 +1 @@
-{"version":3,"file":"ltmpl-route.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/routable/ltmpl-route.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAO,OAAO,CAAC;AAC1C,OAAO,EAEL,cAAc,EACd,eAAe,EAChB,MAAM,mBAAmB,CAAC;AAU3B,MAAM,WAAW,eAAgB,SAAQ,eAAe;CAAG;AAE3D,MAAM,WAAW,eAAe;IAC9B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAC,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAC,OAAO,CAAC;IAClB,SAAS,CAAC,EAAC,MAAM,CAAC;CACnB;;AAmQD,wBAAsC"}
+{"version":3,"file":"ltmpl-route.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/routable/ltmpl-route.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AACzC,OAAO,EAGL,cAAc,EACd,eAAe,EAChB,MAAM,mBAAmB,CAAC;AAU3B,MAAM,WAAW,eAAgB,SAAQ,eAAe;IACtD,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,eAAe;IAC9B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;;AA0RD,wBAAsC"}

package/lib/routable/ltmpl-route.js

@@ -47,20 +47,21 @@ class LtmplRoute extends React.PureComponent {
             const { basePath } = this.props;
             const { sourceId } = this.props.params;
             const { ltmplConfigRes } = this.state;
-            let path = `${basePath}/${sourceId}/detail-view?code=${code}&menuId=${this.getMenuId()}`;
+            let path = `${basePath}${this.computedLayoutPath}/${sourceId}/detail-view?code=${code}&menuId=${this.getMenuId()}`;
             if (toCustomPage && ltmplConfigRes.ltmplConfig.customViewPagePath) {
-                path = `${basePath}${ltmplConfigRes.ltmplConfig.customViewPagePath}?menuId=${this.getMenuId()}&sourceId=${sourceId}`;
+                path = `${basePath}${this.computedLayoutPath}${ltmplConfigRes.ltmplConfig.customViewPagePath}?menuId=${this.getMenuId()}&sourceId=${sourceId}`;
             }
             this.onRoute(path);
         };
-        this.doEdit = (code, mode, toCustomPage = false) => {
+        this.doEdit = (param) => {
             const { basePath } = this.props;
             const { sourceId } = this.props.params;
             const { ltmplConfigRes } = this.state;
             let mainCode = this.getMainCode();
-            let path = `${basePath}/${sourceId}/detail-edit?code=${code}&menuId=${this.getMenuId()}&mode=${mode}`;
-            if (toCustomPage && ltmplConfigRes.ltmplConfig.customEditPagePath) {
-                path = `${basePath}/page/${sourceId}${ltmplConfigRes.ltmplConfig.customEditPagePath}?code=${code}&menuId=${this.getMenuId()}`;
+            let dtmplSourceId = param.dtmplSourceId ? param.dtmplSourceId : sourceId;
+            let path = `${basePath}${this.computedLayoutPath}/${dtmplSourceId}/detail-edit?code=${param.code}&menuId=${this.getMenuId()}&mode=${param.mode}`;
+            if (param.toCustomPage && ltmplConfigRes.ltmplConfig.customEditPagePath) {
+                path = `${basePath}${this.computedLayoutPath}/page/${dtmplSourceId}${ltmplConfigRes.ltmplConfig.customEditPagePath}?code=${param.code}&menuId=${this.getMenuId()}`;
             }
             if (mainCode) {
                 path = path + `&mainCode=${mainCode}`;
@@ -82,9 +83,9 @@ class LtmplRoute extends React.PureComponent {
             const { basePath } = this.props;
             const { sourceId } = this.props.params;
             const { ltmplConfigRes } = this.state;
-            let path = `${basePath}/${sourceId}/detail-edit?menuId=${this.getMenuId()}&addTmplId=${addTmplId ? addTmplId : ""}`;
+            let path = `${basePath}${this.computedLayoutPath}/${sourceId}/detail-edit?menuId=${this.getMenuId()}&addTmplId=${addTmplId ? addTmplId : ""}`;
             if (toCustomPage && ltmplConfigRes.ltmplConfig.customEditPagePath) {
-                path = `${basePath}/page/${sourceId}${ltmplConfigRes.ltmplConfig.customEditPagePath}?menuId=${this.getMenuId()}`;
+                path = `${basePath}${this.computedLayoutPath}/page/${sourceId}${ltmplConfigRes.ltmplConfig.customEditPagePath}?menuId=${this.getMenuId()}`;
             }
             let mainCode = this.getMainCode();
             if (mainCode) {
@@ -95,7 +96,7 @@ class LtmplRoute extends React.PureComponent {
         this.doRAction = (ractionId, mainCode) => {
             if (false) {
                 const { basePath } = this.props;
-                let path = `${basePath}/${ractionId}/act-table?mainCode=${mainCode}&menuId=${this.getMenuId()}`;
+                let path = `${basePath}${this.computedLayoutPath}/${ractionId}/act-table?mainCode=${mainCode}&menuId=${this.getMenuId()}`;
                 this.onRoute(path);
             }
             else {
@@ -117,7 +118,7 @@ class LtmplRoute extends React.PureComponent {
             let params = Object.assign({}, params_);
             //params['sourceId'] = sourceId;
             const newfliter = Units.transQueryParamsToStr(params);
-            this.props.navigate(`${basePath}/${sourceId}/act-table?${newfliter}`, {
+            this.props.navigate(`${basePath}${this.computedLayoutPath}/${sourceId}/act-table?${newfliter}`, {
                 replace: true,
             });
         };
@@ -158,6 +159,12 @@ class LtmplRoute extends React.PureComponent {
             this.loadData();
         });
     }
+    get computedLayoutPath() {
+        const { layoutRootPath } = this.props;
+        if (layoutRootPath !== undefined)
+            return `/${layoutRootPath}`;
+        return "";
+    }
     componentDidUpdate(prevProps) {
         return __awaiter(this, void 0, void 0, function* () {
             const { location, params } = this.props;
@@ -194,11 +201,10 @@ class LtmplRoute extends React.PureComponent {
         else {
             return (React.createElement(React.Fragment, null,
                 React.createElement(ActTable, { serverKey: null, pageSize: pageSize, pageNo: pageNo, onChangePage: this.onChangePage, menuId: this.getMenuId(), mainCode: mainCode, showView: this.showView, doSearch: this.onChangeSearch, doEdit: this.doEdit, doCreate: this.doCreate, sourceId: sourceId, criteriaData: criteriaData, ltmplConfig: ltmplConfigRes ? ltmplConfigRes.ltmplConfig : null, doRAction: this.doRAction }),
-                showDraw ?
-                    React.createElement(Drawer, { placement: "left", title: translate("${关联查询}"), closable: true, mask: false, onClose: this.closeDrawer, open: showDraw, width: "calc(100% - 280px)", style: {
-                            maxWidth: 1960,
-                        }, extra: React.createElement(Space, null,
-                            React.createElement(Button, { onClick: this.closeDrawer }, translate("${关闭}"))) }, React.createElement(LtmplTable, { serverKey: null, sourceId: ractionId, mainCode: selectedCode })) : null));
+                showDraw ? (React.createElement(Drawer, { placement: "left", title: translate("${关联查询}"), closable: true, mask: false, onClose: this.closeDrawer, open: showDraw, width: "calc(100% - 280px)", style: {
+                        maxWidth: 1960,
+                    }, extra: React.createElement(Space, null,
+                        React.createElement(Button, { onClick: this.closeDrawer }, translate("${关闭}"))) }, React.createElement(LtmplTable, { serverKey: null, sourceId: ractionId, mainCode: selectedCode }))) : null));
         }
     }
 }

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

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

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

@@ -1,6 +1,7 @@
-import React from 'react';
-import { RouterCompProps, TtmplConfig } from '../tmpl/interface';
+import React from "react";
+import { RouterCompProps, TtmplConfig } from "../tmpl/interface";
 export interface TtmplRouteProps extends RouterCompProps {
+    layoutRootPath?: string;
 }
 export interface TtmplRouteState {
     ttmplConfig?: TtmplConfig;

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

@@ -1 +1 @@
-{"version":3,"file":"ttmpl-route.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/routable/ttmpl-route.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAA8B,eAAe,EAAE,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAM5F,MAAM,WAAW,eAAgB,SAAQ,eAAe;CAEvD;AAED,MAAM,WAAW,eAAe;IAC5B,WAAW,CAAC,EAAE,WAAW,CAAC;CAC7B;;AA8DD,wBAAsC"}
+{"version":3,"file":"ttmpl-route.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/routable/ttmpl-route.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAGL,eAAe,EACf,WAAW,EACZ,MAAM,mBAAmB,CAAC;AAM3B,MAAM,WAAW,eAAgB,SAAQ,eAAe;IACtD,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,eAAe;IAC9B,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;;AA4ED,wBAAsC"}

package/lib/routable/ttmpl-route.js

@@ -7,13 +7,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import React from 'react';
+import React from "react";
 import HCDataSource from "../tmpl/hc-data-source";
 import withRouter from "../routable/withroute";
 import ActTree from "../tree/act-tree";
 import { Card } from "antd";
-;
-;
 class TtmplRoute extends React.PureComponent {
     constructor() {
         super(...arguments);
@@ -25,16 +23,16 @@ class TtmplRoute extends React.PureComponent {
         };
         this.getMenuId = () => {
             const { searchParams } = this.props;
-            let menuId = searchParams.get('menuId');
+            let menuId = searchParams.get("menuId");
             return menuId;
         };
         this.loadData = () => __awaiter(this, void 0, void 0, function* () {
             const { params } = this.props;
             const { sourceId } = params;
             let ttmplConfig = yield HCDataSource.requestTtmplConfig(null, sourceId);
-            //debugger
-            if (ttmplConfig.type == '1M') {
-                this.props.navigate(`/${ttmplConfig.id}/act-table`);
+            // debugger;
+            if (ttmplConfig.type == "1M") {
+                this.props.navigate(`${this.computedLayoutPath}/${ttmplConfig.id}/act-table`);
             }
             else {
                 this.setState({
@@ -48,6 +46,12 @@ class TtmplRoute extends React.PureComponent {
             this.loadData();
         });
     }
+    get computedLayoutPath() {
+        const { layoutRootPath } = this.props;
+        if (layoutRootPath !== undefined)
+            return `/${layoutRootPath}`;
+        return "";
+    }
     componentDidUpdate(prevProps) {
         return __awaiter(this, void 0, void 0, function* () {
             const { location, params } = this.props;
@@ -67,8 +71,8 @@ class TtmplRoute extends React.PureComponent {
             return React.createElement(Card, { loading: true });
         }
         else {
-            return React.createElement(React.Fragment, null,
-                React.createElement(ActTree, { ttmplConfig: ttmplConfig }));
+            return (React.createElement(React.Fragment, null,
+                React.createElement(ActTree, { ttmplConfig: ttmplConfig })));
         }
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"ttmpl-route.js","sourceRoot":"","sources":["../../../../src/aldehyde/routable/ttmpl-route.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,YAAY,MAAM,wBAAwB,CAAC;AAClD,OAAO,UAAU,MAAM,uBAAuB,CAAC;AAC/C,OAAO,OAAO,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAC,IAAI,EAAC,MAAM,MAAM,CAAC;AAGzB,CAAC;AAID,CAAC;AAEF,MAAM,UAAW,SAAQ,KAAK,CAAC,aAA+C;IAA9E;;QAII,UAAK,GAAG;YACJ,WAAW,EAAE,SAAS;SACzB,CAAA;QAMD,YAAO,GAAG,CAAC,IAAI,EAAE,EAAE;YACf,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC9B,CAAC,CAAA;QAED,cAAS,GAAG,GAAG,EAAE;YACb,MAAM,EAAC,YAAY,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YAClC,IAAI,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACxC,OAAO,MAAM,CAAC;QAClB,CAAC,CAAA;QAED,aAAQ,GAAG,GAAS,EAAE;YAClB,MAAM,EAAC,MAAM,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YAC5B,MAAM,EAAC,QAAQ,EAAC,GAAG,MAAM,CAAC;YACzB,IAAI,WAAW,GAAe,MAAM,YAAY,CAAC,kBAAkB,CAAC,IAAI,EAAC,QAAQ,CAAC,CAAC;YACnF,UAAU;YACV,IAAG,WAAW,CAAC,IAAI,IAAE,IAAI,EAAC,CAAC;gBACvB,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,WAAW,CAAC,EAAE,YAAY,CAAC,CAAC;YACxD,CAAC;iBAAI,CAAC;gBACF,IAAI,CAAC,QAAQ,CAAC;oBACV,WAAW,oBAAK,WAAW,CAAC;iBAC/B,CAAC,CAAA;YACN,CAAC;QACN,CAAC,CAAA,CAAA;IAwBL,CAAC;IAlDS,iBAAiB;;YACnB,IAAI,CAAC,QAAQ,EAAE,CAAC;QACpB,CAAC;KAAA;IA0BK,kBAAkB,CAAC,SAAS;;YAC9B,MAAM,EAAC,QAAQ,EAAC,MAAM,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YACrC,MAAM,EAAC,QAAQ,EAAC,GAAG,MAAM,CAAC;YAC1B,IAAI,EAAC,QAAQ,EAAE,WAAW,EAAC,GAAG,SAAS,CAAC,MAAM,CAAC;YAC/C,IAAI,EAAC,QAAQ,EAAE,WAAW,EAAC,GAAG,SAAS,CAAC;YAExC,IAAI,QAAQ,IAAI,WAAW,IAAI,QAAQ,IAAE,WAAW,EAAE,CAAC;gBACnD,OAAO;YACX,CAAC;YACD,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC1B,CAAC;KAAA;IAED,MAAM;QACF,MAAM,EAAG,GAAG,IAAI,CAAC,KAAK,CAAC;QACvB,MAAM,EAAC,WAAW,EAAC,GAAC,IAAI,CAAC,KAAK,CAAC;QAC/B,IAAG,CAAC,WAAW,EAAC,CAAC;YACb,OAAO,oBAAC,IAAI,IAAC,OAAO,EAAE,IAAI,GAAS,CAAA;QACvC,CAAC;aAAI,CAAC;YACF,OAAO;gBAAE,oBAAC,OAAO,IAAC,WAAW,EAAE,WAAW,GAAY,CAAG,CAAC;QAC9D,CAAC;IAEL,CAAC;;AAxDM,uBAAY,GAAG;IAClB,QAAQ,EAAE,EAAE;CACf,AAFkB,CAElB;AAyDL,eAAe,UAAU,CAAC,UAAU,CAAC,CAAC"}
+{"version":3,"file":"ttmpl-route.js","sourceRoot":"","sources":["../../../../src/aldehyde/routable/ttmpl-route.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAQ1B,OAAO,YAAY,MAAM,wBAAwB,CAAC;AAClD,OAAO,UAAU,MAAM,uBAAuB,CAAC;AAC/C,OAAO,OAAO,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAS5B,MAAM,UAAW,SAAQ,KAAK,CAAC,aAA+C;IAA9E;;QAIE,UAAK,GAAG;YACN,WAAW,EAAE,SAAS;SACvB,CAAC;QAYF,YAAO,GAAG,CAAC,IAAI,EAAE,EAAE;YACjB,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;QAEF,cAAS,GAAG,GAAG,EAAE;YACf,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YACpC,IAAI,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACxC,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC;QAEF,aAAQ,GAAG,GAAS,EAAE;YACpB,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YAC9B,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;YAC5B,IAAI,WAAW,GAAgB,MAAM,YAAY,CAAC,kBAAkB,CAClE,IAAI,EACJ,QAAQ,CACT,CAAC;YACF,YAAY;YACZ,IAAI,WAAW,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;gBAC7B,IAAI,CAAC,KAAK,CAAC,QAAQ,CACjB,GAAG,IAAI,CAAC,kBAAkB,IAAI,WAAW,CAAC,EAAE,YAAY,CACzD,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,QAAQ,CAAC;oBACZ,WAAW,oBAAO,WAAW,CAAE;iBAChC,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAA,CAAC;IA2BJ,CAAC;IAhEO,iBAAiB;;YACrB,IAAI,CAAC,QAAQ,EAAE,CAAC;QAClB,CAAC;KAAA;IAED,IAAI,kBAAkB;QACpB,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACtC,IAAI,cAAc,KAAK,SAAS;YAAE,OAAO,IAAI,cAAc,EAAE,CAAC;QAC9D,OAAO,EAAE,CAAC;IACZ,CAAC;IA+BK,kBAAkB,CAAC,SAAS;;YAChC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YACxC,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;YAC5B,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC;YACjD,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,SAAS,CAAC;YAE1C,IAAI,QAAQ,IAAI,WAAW,IAAI,QAAQ,IAAI,WAAW,EAAE,CAAC;gBACvD,OAAO;YACT,CAAC;YACD,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACxB,CAAC;KAAA;IAED,MAAM;QACJ,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACtB,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACnC,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO,oBAAC,IAAI,IAAC,OAAO,EAAE,IAAI,GAAS,CAAC;QACtC,CAAC;aAAM,CAAC;YACN,OAAO,CACL;gBACE,oBAAC,OAAO,IAAC,WAAW,EAAE,WAAW,GAAY,CAC5C,CACJ,CAAC;QACJ,CAAC;IACH,CAAC;;AAtEM,uBAAY,GAAG;IACpB,QAAQ,EAAE,EAAE;CACb,AAFkB,CAEjB;AAuEJ,eAAe,UAAU,CAAC,UAAU,CAAC,CAAC"}

package/lib/routable/withroute.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+import React from "react";
 declare const withRouter: (Comp: any) => (props: any) => React.JSX.Element;
 export default withRouter;
 //# sourceMappingURL=withroute.d.ts.map

package/lib/routable/withroute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withroute.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/routable/withroute.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,QAAA,MAAM,UAAU,kDAcf,CAAC;AAGF,eAAe,UAAU,CAAC"}
+{"version":3,"file":"withroute.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/routable/withroute.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAQ1B,QAAA,MAAM,UAAU,kDAcf,CAAC;AAEF,eAAe,UAAU,CAAC"}

package/lib/routable/withroute.js

@@ -1,6 +1,6 @@
-import React from 'react';
-import { useLocation, useNavigate, useParams, useSearchParams } from "react-router-dom";
-const withRouter = Comp => props => {
+import React from "react";
+import { useLocation, useNavigate, useParams, useSearchParams, } from "react-router-dom";
+const withRouter = (Comp) => (props) => {
     const location = useLocation();
     const navigate = useNavigate();
     const params = useParams();

package/lib/routable/withroute.js.map

@@ -1 +1 @@
-{"version":3,"file":"withroute.js","sourceRoot":"","sources":["../../../../src/aldehyde/routable/withroute.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAC,WAAW,EAAE,WAAW,EAAE,SAAS,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AAErF,MAAM,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE;IAC/B,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,MAAM,CAAC,YAAY,EAAC,eAAe,CAAC,GAAC,eAAe,EAAE,CAAC;IACvD,OAAO,CACH,oBAAC,IAAI,oBACG,KAAK,IACT,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,YAAY,IAC5B,CACL,CAAC;AACN,CAAC,CAAC;AAGF,eAAe,UAAU,CAAC"}
+{"version":3,"file":"withroute.js","sourceRoot":"","sources":["../../../../src/aldehyde/routable/withroute.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EACL,WAAW,EACX,WAAW,EACX,SAAS,EACT,eAAe,GAChB,MAAM,kBAAkB,CAAC;AAE1B,MAAM,UAAU,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE;IACrC,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,eAAe,EAAE,CAAC;IAC1D,OAAO,CACL,oBAAC,IAAI,oBACC,KAAK,IACT,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,YAAY,IAC1B,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,UAAU,CAAC"}