aldehyde 0.2.196 → 0.2.198

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

@@ -1,165 +1,166 @@
-import React from "react";
-import { Empty } from "antd";
-import { CodeSource, RouterCompProps } from "../tmpl/interface";
-import DtmplEdit from "../detail/edit/dtmpl-edit";
-import ActDtmplView from "../detail/view/act-dtmpl-view";
-import HcserviceV3 from "../tmpl/hcservice-v3";
-import withRouter from "./withroute";
-
-export interface DtmplRouteProps extends RouterCompProps {
-  layoutRootPath?: string;
-}
-
-export interface DtmplRoutePropsStat {
-  codeSource?: CodeSource;
-  queriedCode?: string;
-}
-
-class DtmplRoute extends React.Component<DtmplRouteProps, DtmplRoutePropsStat> {
-  state = {
-    codeSource: undefined,
-    queriedCode: undefined,
-  };
-  static defaultProps = {
-    basePath: "",
-    codeSource: undefined,
-    queriedCode: undefined,
-  };
-  async componentDidMount() {
-    await 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 });
-    }
-    return true;
-  }
-
-  async componentDidUpdate(prevProps, prevState, snapshot) {
-    if (!prevProps || prevProps != this.props) {
-      await this.queryCode();
-    }
-  }
-
-  queryCode = async () => {
-    const { params } = this.props;
-    const { sourceId } = params;
-    let codeSource: CodeSource = this.getCodeSource();
-    let queriedCode = await HcserviceV3.queryCode(sourceId, codeSource);
-    this.setState({
-      codeSource,
-      queriedCode,
-    });
-  };
-
-  getMenuId = () => {
-    const { searchParams } = this.props;
-    //console.log("this.props.match.params",this.props);
-    // var searchParams = new URLSearchParams( location.search);
-    let menuId = searchParams.get("menuId");
-    return menuId;
-  };
-
-  getCodeSource = () => {
-    const { searchParams } = this.props;
-    // let params=Units.transQueryStrToParams(location.search);
-    //  if('codeSource' in params){
-    return searchParams.get("codeSource");
-    // }else{
-    //     return undefined;
-    // }
-  };
-
-  goBackToLtmpl = () => {
-    this.props.navigate(-1);
-  };
-
-  goDtmpl = (code: string) => {
-    const { sourceId } = this.props.params;
-    const { basePath } = this.props;
-    let url = `${basePath}${
-      this.computedLayoutPath
-    }/${sourceId}/detail-edit?menuId=${this.getMenuId()}`;
-    if (code) {
-      url = url + `&code=${code}`;
-    }
-    let mainCode = this.getMainCode();
-    if (mainCode) {
-      url = url + `&mainCode=${mainCode}`;
-    }
-    this.props.navigate(url);
-  };
-
-  getMainCode = () => {
-    const { searchParams } = this.props;
-    return searchParams.get("mainCode");
-  };
-
-  getCode = () => {
-    const { codeSource, queriedCode } = this.state;
-    const { searchParams } = this.props;
-    //let code;
-    if (codeSource) {
-      return queriedCode;
-    } else {
-      // let params=Units.transQueryStrToParams(location.search);
-      return searchParams.get("code");
-    }
-  };
-
-  getMode = () => {
-    const { searchParams } = this.props;
-    // let params=Units.transQueryStrToParams(location.search);
-    return this.getCode() ? searchParams.get("mode") : "add";
-  };
-
-  render() {
-    const { location, params, searchParams } = this.props;
-    const { sourceId } = params;
-
-    const { codeSource } = this.state;
-    if (!location) {
-      return <></>;
-    }
-    const code = this.getCode();
-    if (code && code == "bad-code") {
-      return <Empty />;
-    }
-    // let params=Units.transQueryStrToParams(location.search);
-    let versionId = params["versionId"];
-    if (location.pathname.endsWith("detail-view")) {
-      return (
-        <ActDtmplView
-          serverKey={null}
-          goDtmpl={this.goDtmpl}
-          sourceId={sourceId}
-          versionId={versionId}
-          code={code}
-          mainCode={this.getMainCode()}
-        />
-      );
-    } else {
-      return (
-        <DtmplEdit
-          addTmplId={searchParams.get("addTmplId")}
-          serverKey={null}
-          addOrUpdate={this.getMode()}
-          sourceId={sourceId}
-          code={code}
-          mainCode={this.getMainCode()}
-          goBackToLtmpl={codeSource ? undefined : this.goBackToLtmpl}
-          goDtmpl={this.goDtmpl}
-        ></DtmplEdit>
-      );
-    }
-  }
-}
-
-export default withRouter(DtmplRoute);
+import React from "react";
+import { Empty } from "antd";
+import { CodeSource, RouterCompProps } from "../tmpl/interface";
+import DtmplEdit from "../detail/edit/dtmpl-edit";
+import ActDtmplView from "../detail/view/act-dtmpl-view";
+import HcserviceV3 from "../tmpl/hcservice-v3";
+import withRouter from "./withroute";
+
+export interface DtmplRouteProps extends RouterCompProps {
+  layoutRootPath?: string;
+}
+
+export interface DtmplRoutePropsStat {
+  codeSource?: CodeSource;
+  queriedCode?: string;
+}
+
+class DtmplRoute extends React.Component<DtmplRouteProps, DtmplRoutePropsStat> {
+  state = {
+    codeSource: undefined,
+    queriedCode: undefined,
+  };
+  static defaultProps = {
+    basePath: "",
+    codeSource: undefined,
+    queriedCode: undefined,
+  };
+  async componentDidMount() {
+    await 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 });
+    }
+    return true;
+  }
+
+  async componentDidUpdate(prevProps, prevState, snapshot) {
+    if (!prevProps || prevProps != this.props) {
+      await this.queryCode();
+    }
+  }
+
+  queryCode = async () => {
+    const { params } = this.props;
+    const { sourceId } = params;
+    let codeSource: CodeSource = this.getCodeSource();
+    let queriedCode = await HcserviceV3.queryCode(sourceId, codeSource);
+    this.setState({
+      codeSource,
+      queriedCode,
+    });
+  };
+
+  getMenuId = () => {
+    const { searchParams } = this.props;
+    //console.log("this.props.match.params",this.props);
+    // var searchParams = new URLSearchParams( location.search);
+    let menuId = searchParams.get("menuId");
+    return menuId;
+  };
+
+  getCodeSource = () => {
+    const { searchParams } = this.props;
+    // let params=Units.transQueryStrToParams(location.search);
+    //  if('codeSource' in params){
+    return searchParams.get("codeSource");
+    // }else{
+    //     return undefined;
+    // }
+  };
+
+  goBackToLtmpl = () => {
+    this.props.navigate(-1);
+  };
+
+  goDtmpl = (code: string) => {
+    const { sourceId } = this.props.params;
+    const { basePath } = this.props;
+    let url = `${basePath}${
+      this.computedLayoutPath
+    }/${sourceId}/detail-edit?menuId=${this.getMenuId()}`;
+    if (code) {
+      url = url + `&code=${code}`;
+    }
+    let mainCode = this.getMainCode();
+    if (mainCode) {
+      url = url + `&mainCode=${mainCode}`;
+    }
+    this.props.navigate(url);
+  };
+
+  getMainCode = () => {
+    const { searchParams } = this.props;
+    return searchParams.get("mainCode");
+  };
+
+  getCode = () => {
+    const { codeSource, queriedCode } = this.state;
+    const { searchParams } = this.props;
+    //let code;
+    if (codeSource) {
+      return queriedCode;
+    } else {
+      // let params=Units.transQueryStrToParams(location.search);
+      return searchParams.get("code");
+    }
+  };
+
+  getMode = () => {
+    const { searchParams } = this.props;
+    // let params=Units.transQueryStrToParams(location.search);
+    return this.getCode() ? searchParams.get("mode") : "add";
+  };
+
+  render() {
+    const { location, params, searchParams } = this.props;
+    const { sourceId } = params;
+
+    const { codeSource } = this.state;
+    if (!location) {
+      return <></>;
+    }
+    const code = this.getCode();
+    if (code && code == "bad-code") {
+      return <Empty />;
+    }
+    // let params=Units.transQueryStrToParams(location.search);
+    let versionId = params["versionId"];
+    if (location.pathname.endsWith("detail-view")) {
+      return (
+        <ActDtmplView
+          serverKey={null}
+          goBackToLtmpl={codeSource ? undefined : this.goBackToLtmpl}
+          goDtmpl={this.goDtmpl}
+          sourceId={sourceId}
+          versionId={versionId}
+          code={code}
+          mainCode={this.getMainCode()}
+        />
+      );
+    } else {
+      return (
+        <DtmplEdit
+          addTmplId={searchParams.get("addTmplId")}
+          serverKey={null}
+          addOrUpdate={this.getMode()}
+          sourceId={sourceId}
+          code={code}
+          mainCode={this.getMainCode()}
+          goBackToLtmpl={codeSource ? undefined : this.goBackToLtmpl}
+          goDtmpl={this.goDtmpl}
+        ></DtmplEdit>
+      );
+    }
+  }
+}
+
+export default withRouter(DtmplRoute);

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

@@ -1,34 +1,34 @@
-import React from "react";
-import { RouterCompProps } from "../tmpl/interface";
-import ExcelImport from "../import/excel-import";
-import withRouter from "./withroute";
-
-export interface ImportRouteProps extends RouterCompProps {
-  serverKey?: string;
-  layoutRootPath?: string;
-}
-interface ImportRouteStat {}
-
-class ExcelImportRoute extends React.PureComponent<
-  ImportRouteProps,
-  ImportRouteStat
-> {
-  state = {};
-
-  async componentDidMount() {}
-
-  get computedLayoutPath() {
-    const { layoutRootPath } = this.props;
-    if (layoutRootPath !== undefined) return `/${layoutRootPath}`;
-    return "";
-  }
-
-  render() {
-    const { params, serverKey } = this.props;
-    const { sourceId } = params;
-    return (
-      <ExcelImport serverKey={serverKey} sourceId={sourceId}></ExcelImport>
-    );
-  }
-}
-export default withRouter(ExcelImportRoute);
+import React from "react";
+import { RouterCompProps } from "../tmpl/interface";
+import ExcelImport from "../import/excel-import";
+import withRouter from "./withroute";
+
+export interface ImportRouteProps extends RouterCompProps {
+  serverKey?: string;
+  layoutRootPath?: string;
+}
+interface ImportRouteStat {}
+
+class ExcelImportRoute extends React.PureComponent<
+  ImportRouteProps,
+  ImportRouteStat
+> {
+  state = {};
+
+  async componentDidMount() {}
+
+  get computedLayoutPath() {
+    const { layoutRootPath } = this.props;
+    if (layoutRootPath !== undefined) return `/${layoutRootPath}`;
+    return "";
+  }
+
+  render() {
+    const { params, serverKey } = this.props;
+    const { sourceId } = params;
+    return (
+      <ExcelImport serverKey={serverKey} sourceId={sourceId}></ExcelImport>
+    );
+  }
+}
+export default withRouter(ExcelImportRoute);