aldehyde 0.2.160 → 0.2.163

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

@@ -1,27 +1,30 @@
-import React, { ReactNode }  from "react";
+import React, { ReactNode } from "react";
 import {
   AddOrUpdate,
+  DoEditParam,
   LtmplConfigRes,
-  RouterCompProps,
+  RouterCompProps, ShowViewParam,
 } from "../tmpl/interface";
 import Units from "../units";
 import ActTable from "../table/act-table";
 // import StatActTable from '../table/stat-act-table'
 import HCDataSource from "../tmpl/hc-data-source";
 import withRouter from "../routable/withroute";
-import {Button, Drawer, Space} from "antd";
+import { Button, Drawer, Space } from "antd";
 import { LocaleContext } from "../locale/LocaleProvider";
-import LtmplTable from "../module/ltmpl-table"
+import LtmplTable from "../module/ltmpl-table";
 
-export interface LtmplRouteProps extends RouterCompProps {}
+export interface LtmplRouteProps extends RouterCompProps {
+  layoutRootPath?: string;
+}
 
 export interface LtmplRouteState {
   ltmplConfigRes?: LtmplConfigRes;
   pageNo?: number;
   pageSize?: number;
-  selectedCode?:string;
-  showDraw?:boolean;
-  ractionId?:string;
+  selectedCode?: string;
+  showDraw?: boolean;
+  ractionId?: string;
 }
 
 class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
@@ -35,15 +38,21 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
     ltmplConfigRes: undefined,
     pageNo: undefined,
     pageSize: undefined,
-    selectedCode:undefined,
-    showDraw:false,
-    ractionId:undefined,
+    selectedCode: undefined,
+    showDraw: false,
+    ractionId: undefined,
   };
 
   async componentDidMount() {
     this.loadData();
   }
 
+  get computedLayoutPath() {
+    const { layoutRootPath } = this.props;
+    if (layoutRootPath !== undefined) return `/${layoutRootPath}`;
+    return "";
+  }
+
   onRoute = (path) => {
     this.props.navigate(path);
   };
@@ -80,33 +89,41 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
     ) {
       return;
     }
-   await this.loadData();
+    await this.loadData();
   }
 
-  showView = (code: string, toCustomPage: boolean = false) => {
+  showView = (showViewParam: ShowViewParam) => {
     const { basePath } = this.props;
     const { sourceId } = this.props.params;
     const { ltmplConfigRes } = this.state;
-    let path = `${basePath}/${sourceId}/detail-view?code=${code}&menuId=${this.getMenuId()}`;
-    if (toCustomPage && ltmplConfigRes.ltmplConfig.customViewPagePath) {
-      path = `${basePath}${
+    let dtmplSourceId = showViewParam.dtmplSourceId ? showViewParam.dtmplSourceId : sourceId;
+    let path = `${basePath}${
+      this.computedLayoutPath
+    }/${dtmplSourceId}/detail-view?code=${showViewParam.code}&menuId=${this.getMenuId()}`;
+    if (showViewParam.toCustomPage && ltmplConfigRes.ltmplConfig.customViewPagePath) {
+      path = `${basePath}${this.computedLayoutPath}${
         ltmplConfigRes.ltmplConfig.customViewPagePath
       }?menuId=${this.getMenuId()}&sourceId=${sourceId}`;
     }
     this.onRoute(path);
   };
 
-  doEdit = (code: string, mode: AddOrUpdate, toCustomPage: boolean = false) => {
+  doEdit = (param: DoEditParam) => {
     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}${
+    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=${code}&menuId=${this.getMenuId()}`;
+      }?code=${param.code}&menuId=${this.getMenuId()}`;
     }
     if (mainCode) {
       path = path + `&mainCode=${mainCode}`;
@@ -130,11 +147,13 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
     const { basePath } = this.props;
     const { sourceId } = this.props.params;
     const { ltmplConfigRes } = this.state;
-    let path = `${basePath}/${sourceId}/detail-edit?menuId=${this.getMenuId()}&addTmplId=${
+    let path = `${basePath}${
+      this.computedLayoutPath
+    }/${sourceId}/detail-edit?menuId=${this.getMenuId()}&addTmplId=${
       addTmplId ? addTmplId : ""
     }`;
     if (toCustomPage && ltmplConfigRes.ltmplConfig.customEditPagePath) {
-      path = `${basePath}/page/${sourceId}${
+      path = `${basePath}${this.computedLayoutPath}/page/${sourceId}${
         ltmplConfigRes.ltmplConfig.customEditPagePath
       }?menuId=${this.getMenuId()}`;
     }
@@ -146,18 +165,19 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
   };
 
   doRAction = (ractionId: string, mainCode: string) => {
-    if(false){
+    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{
+    } else {
       this.setState({
         selectedCode: mainCode,
         showDraw: true,
         ractionId,
       });
     }
-
   };
 
   closeDrawer = () => {
@@ -172,9 +192,12 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
     let params = { ...params_ };
     //params['sourceId'] = sourceId;
     const newfliter = Units.transQueryParamsToStr(params);
-    this.props.navigate(`${basePath}/${sourceId}/act-table?${newfliter}`, {
-      replace: true,
-    });
+    this.props.navigate(
+      `${basePath}${this.computedLayoutPath}/${sourceId}/act-table?${newfliter}`,
+      {
+        replace: true,
+      }
+    );
   };
   onChangeSearch = (params_) => {
     let params = { ...params_ };
@@ -199,7 +222,7 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
   onChangePage = (pageNo: number, pageSize: number) => {
     const { location } = this.props;
     let search = location.search;
-    let params = Units.transQueryStrToParams(search,null);
+    let params = Units.transQueryStrToParams(search, null);
     params["pageNo"] = pageNo;
     params["pageSize"] = pageSize;
     this.doSearch(params);
@@ -211,14 +234,17 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
   };
 
   render() {
-    const { ltmplConfigRes,showDraw,ractionId,selectedCode } = this.state;
+    const { ltmplConfigRes, showDraw, ractionId, selectedCode } = this.state;
     const { location, params } = this.props;
     const { sourceId } = params;
     const { translate } = this.context;
     //let menuId = undefined;
     let mainCode = undefined;
     let search = location.search;
-    let criteriaData = Units.transQueryStrToParams(search,ltmplConfigRes?.ltmplConfig);
+    let criteriaData = Units.transQueryStrToParams(
+      search,
+      ltmplConfigRes?.ltmplConfig
+    );
     let pageSize = criteriaData["pageSize"];
     let pageNo = criteriaData["pageNo"];
 
@@ -230,25 +256,25 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
       return <></>;
     } else {
       return (
-          <>
-        <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?
-          <Drawer
+        <>
+          <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 ? (
+            <Drawer
               placement={"left"}
               title={translate("${关联查询}")}
               closable={true}
@@ -266,16 +292,17 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
                   </Button>
                 </Space>
               }
-          >
-            {
-              <LtmplTable
+            >
+              {
+                <LtmplTable
                   serverKey={null}
                   sourceId={ractionId}
                   mainCode={selectedCode}
-              ></LtmplTable>
-            }
-          </Drawer>:null}
-          </>
+                ></LtmplTable>
+              }
+            </Drawer>
+          ) : null}
+        </>
       );
     }
   }

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

@@ -1,77 +1,95 @@
-import React from 'react'
-import {AddOrUpdate, LtmplConfigRes, RouterCompProps, TtmplConfig} from '../tmpl/interface';
+import React from "react";
+import {
+  AddOrUpdate,
+  LtmplConfigRes,
+  RouterCompProps,
+  TtmplConfig,
+} from "../tmpl/interface";
 
 import HCDataSource from "../tmpl/hc-data-source";
 import withRouter from "../routable/withroute";
 import ActTree from "../tree/act-tree";
-import {Card} from "antd";
+import { Card } from "antd";
 export interface TtmplRouteProps extends RouterCompProps {
-
-};
+  layoutRootPath?: string;
+}
 
 export interface TtmplRouteState {
-    ttmplConfig?: TtmplConfig,
-};
+  ttmplConfig?: TtmplConfig;
+}
 
 class TtmplRoute extends React.PureComponent<TtmplRouteProps, TtmplRouteState> {
-    static defaultProps = {
-        basePath: "",
-    }
-    state = {
-        ttmplConfig: undefined,
-    }
+  static defaultProps = {
+    basePath: "",
+  };
+  state = {
+    ttmplConfig: undefined,
+  };
 
-    async componentDidMount() {
-        this.loadData();
-    }
+  async componentDidMount() {
+    this.loadData();
+  }
 
-    onRoute = (path) => {
-        this.props.navigate(path);
-    }
+  get computedLayoutPath() {
+    const { layoutRootPath } = this.props;
+    if (layoutRootPath !== undefined) return `/${layoutRootPath}`;
+    return "";
+  }
 
-    getMenuId = () => {
-        const {searchParams} = this.props;
-        let menuId = searchParams.get('menuId');
-        return menuId;
-    }
+  onRoute = (path) => {
+    this.props.navigate(path);
+  };
+
+  getMenuId = () => {
+    const { searchParams } = this.props;
+    let menuId = searchParams.get("menuId");
+    return menuId;
+  };
 
-    loadData = async () => {
-        const {params} = this.props;
-        const {sourceId} = params;
-         let ttmplConfig:TtmplConfig = await HCDataSource.requestTtmplConfig(null,sourceId);
-         //debugger
-         if(ttmplConfig.type=='1M'){
-             this.props.navigate(`/${ttmplConfig.id}/act-table`);
-         }else{
-             this.setState({
-                 ttmplConfig:{...ttmplConfig},
-             })
-         }
+  loadData = async () => {
+    const { params } = this.props;
+    const { sourceId } = params;
+    let ttmplConfig: TtmplConfig = await HCDataSource.requestTtmplConfig(
+      null,
+      sourceId
+    );
+    // debugger;
+    if (ttmplConfig.type == "1M") {
+      this.props.navigate(
+        `${this.computedLayoutPath}/${ttmplConfig.id}/act-table`
+      );
+    } else {
+      this.setState({
+        ttmplConfig: { ...ttmplConfig },
+      });
     }
+  };
 
-    async componentDidUpdate(prevProps) {
-        const {location,params} = this.props;
-        const {sourceId} = params;
-        let {sourceId: preSourceId} = prevProps.params;
-        let {location: preLocation} = prevProps;
+  async componentDidUpdate(prevProps) {
+    const { location, params } = this.props;
+    const { sourceId } = params;
+    let { sourceId: preSourceId } = prevProps.params;
+    let { location: preLocation } = prevProps;
 
-        if (sourceId && preSourceId && sourceId==preSourceId) {
-            return;
-        }
-        await this.loadData();
+    if (sourceId && preSourceId && sourceId == preSourceId) {
+      return;
     }
+    await this.loadData();
+  }
 
-    render() {
-        const { } = this.props;
-        const {ttmplConfig}=this.state;
-        if(!ttmplConfig){
-            return <Card loading={true}></Card>
-        }else{
-            return <><ActTree ttmplConfig={ttmplConfig}></ActTree></>;
-        }
-
+  render() {
+    const {} = this.props;
+    const { ttmplConfig } = this.state;
+    if (!ttmplConfig) {
+      return <Card loading={true}></Card>;
+    } else {
+      return (
+        <>
+          <ActTree ttmplConfig={ttmplConfig}></ActTree>
+        </>
+      );
     }
+  }
 }
 
 export default withRouter(TtmplRoute);
-

package/src/aldehyde/routable/withroute.tsx

@@ -1,22 +1,25 @@
-import React from 'react'
-import {useLocation, useNavigate, useParams,useSearchParams} from "react-router-dom";
+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();
-    const [searchParams,setSearchParams]=useSearchParams();
-    return (
-        <Comp
-            {...props}
-            location={location}
-            navigate={navigate}
-            params={params}
-            searchParams={searchParams}
-        />
-    );
+const withRouter = (Comp) => (props) => {
+  const location = useLocation();
+  const navigate = useNavigate();
+  const params = useParams();
+  const [searchParams, setSearchParams] = useSearchParams();
+  return (
+    <Comp
+      {...props}
+      location={location}
+      navigate={navigate}
+      params={params}
+      searchParams={searchParams}
+    />
+  );
 };
 
-
 export default withRouter;
-