aldehyde 0.2.159 → 0.2.161

package/src/aldehyde/login2/Login.tsx

@@ -0,0 +1,110 @@
+import { Button, Form, Input } from "antd";
+import React, { useState } from "react";
+import HCserviceV3 from "../tmpl/hcservice-v3";
+import { useLocale } from "../locale/useLocale";
+
+type LoginPropType = {
+  onFinish?: (token: string) => void;
+  title?: any;
+  programCode?: string;
+  autoSaveUser?: boolean;
+};
+
+type FormType = {
+  username: string;
+  password: string;
+};
+
+const Login = (props: LoginPropType) => {
+  // locale
+  const { translate } = useLocale();
+
+  // form
+  const [form] = Form.useForm<FormType>();
+  const submit = async () => {
+    try {
+      const { username, password } = await form.validateFields();
+
+      setLoading(true);
+      const { programCode, onFinish } = props;
+      const pubkey = await HCserviceV3.getRasPubkey(null, programCode);
+      const res = await HCserviceV3.login(
+        { username, password },
+        "",
+        "",
+        pubkey,
+        programCode
+      );
+      if (res.status === "success") {
+        onFinish(res.token);
+      }
+      setLoading(false);
+    } catch (err) {
+      console.error(err);
+    }
+  };
+
+  // button
+  const [loading, setLoading] = useState<boolean>(false);
+
+  return (
+    <Form
+      name="login"
+      form={form}
+      wrapperCol={{ span: 24 }}
+      initialValues={{ remember: true }}
+      autoComplete="off"
+    >
+      <Form.Item
+        name="username"
+        rules={[{ required: true, message: translate("请输入用户名") }]}
+      >
+        <Input
+          placeholder={translate("请输入用户名")}
+          style={{
+            borderRadius: "50px",
+            background: "#EEF3FB",
+            height: "50px",
+            fontSize: "15px",
+            lineHeight: "15px",
+          }}
+        />
+      </Form.Item>
+
+      <Form.Item
+        name="password"
+        rules={[{ required: true, message: translate("请输入密码") }]}
+      >
+        <Input.Password
+          placeholder={translate("请输入密码")}
+          style={{
+            borderRadius: "50px",
+            background: "#EEF3FB",
+            height: "50px",
+            fontSize: "15px",
+            lineHeight: "15px",
+          }}
+        />
+      </Form.Item>
+
+      <Form.Item wrapperCol={{ span: 24 }}>
+        <Button
+          type="primary"
+          onClick={submit}
+          shape="round"
+          loading={loading}
+          style={{
+            width: "100%",
+            height: "50px",
+            fontSize: "15px",
+            lineHeight: "15px",
+          }}
+        >
+          登录
+        </Button>
+      </Form.Item>
+    </Form>
+  );
+};
+
+export default Login;

package/src/aldehyde/login2/LoginPage.tsx

@@ -0,0 +1,58 @@
+import React from "react";
+import Login from "./Login";
+import LoginBgPng from "./img/login-bg.png";
+import { useLocale } from "../locale/useLocale";
+import HCDataSource from "../tmpl/hc-data-source";
+import Units from "../units";
+
+const LoginPage = () => {
+  const { translate } = useLocale();
+
+  return (
+    <div
+      style={{
+        width: "100%",
+        height: "100%",
+        minWidth: "1600px",
+        position: "absolute",
+        background: `url(${LoginBgPng})`,
+        backgroundSize: "cover",
+        display: "flex",
+        flexDirection: "row-reverse",
+        justifyContent: "flex-start",
+        alignItems: "center",
+      }}
+    >
+      <div
+        style={{
+          width: "500px",
+          height: "500px",
+          background: "linear-gradient(0deg, #FFFFFF 65%, #DFEDFF)",
+          boxShadow: "0px 10px 15px -3px rgba(0,0,0,0.1)",
+          marginRight: "10%",
+          padding: "60px",
+        }}
+      >
+        <div
+          style={{
+            fontWeight: 600,
+            fontSize: "30px",
+            color: "#222222",
+            marginBottom: 60,
+          }}
+        >
+          {translate("欢迎, 登录")}
+        </div>
+        <Login
+          onFinish={(token) => {
+            HCDataSource.clear();
+            window.location.hash = "/v2";
+            Units.setHydrocarbonToken(token);
+          }}
+        ></Login>
+      </div>
+    </div>
+  );
+};
+
+export default LoginPage;

package/src/aldehyde/login2/index.tsx

@@ -0,0 +1,4 @@
+import Login from "./Login";
+import LoginPage from "./LoginPage";
+
+export { Login, LoginPage };

package/src/aldehyde/module/ltmpl-table.tsx

@@ -1,5 +1,5 @@
 import React, { ReactNode } from "react";
-import { AddOrUpdate, LtmplConfigRes, ActTableMode } from "../tmpl/interface";
+import {AddOrUpdate, LtmplConfigRes, ActTableMode, DoEditParam} from "../tmpl/interface";
 import Units from "../units";
 import ActTable from "../table/act-table";
 // import StatActTable from '../table/stat-act-table'
@@ -46,6 +46,7 @@ export interface LtmplTableState {
   ractionId?: string;
   collapse?: boolean;
   addTmplId?: string;
+  dtmplSourceId?:string;
 }
 
 class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
@@ -62,6 +63,7 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
     ractionId: undefined,
     collapse: false,
     addTmplId: undefined,
+    dtmplSourceId:undefined,
   };
   static contextType = LocaleContext;
   context: React.ContextType<typeof LocaleContext>;
@@ -130,22 +132,23 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
     });
   };
 
-  doEdit = (code: string, mode: AddOrUpdate, toCustomPage?: boolean) => {
-    const { doCustomEdit } = this.props;
-    if (toCustomPage) {
+  doEdit = (param:DoEditParam) => {
+    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,
       });
     }
@@ -229,7 +232,7 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
       ractionId,
       showDraw,
       collapse,
-      addTmplId,
+      addTmplId,dtmplSourceId,
     } = this.state;
     const {
       sourceId,
@@ -307,7 +310,7 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
                   showDtmplEdit: false,
                 });
               }}
-              sourceId={sourceId}
+              sourceId={dtmplSourceId?dtmplSourceId:sourceId}
               mainCode={mainCode}
               code={selectedCode}
               onOk={this.handleDtmplEdit}

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

@@ -1,145 +1,165 @@
-import React from 'react'
-import { Empty} from 'antd';
-import {CodeSource, RouterCompProps} from '../tmpl/interface';
+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 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,
-};
+  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();
+  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;
+  }
 
-     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();
     }
-
-    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}`;
     }
-
-    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
-        })
+    let mainCode = this.getMainCode();
+    if (mainCode) {
+      url = url + `&mainCode=${mainCode}`;
     }
-
-    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;
+    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");
     }
+  };
 
-    getCodeSource=()=>{
-        const {searchParams}=this.props;
-       // let params=Units.transQueryStrToParams(location.search);
-       //  if('codeSource' in params){
-            return searchParams.get('codeSource');
-        // }else{
-        //     return undefined;
-        // }
-    }
+  getMode = () => {
+    const { searchParams } = this.props;
+    // let params=Units.transQueryStrToParams(location.search);
+    return this.getCode() ? searchParams.get("mode") : "add";
+  };
 
-    goBackToLtmpl=()=>{
-       this.props.navigate(-1);
-    }
+  render() {
+    const { location, params, searchParams } = this.props;
+    const { sourceId } = params;
 
-    goDtmpl=(code:string)=>{
-        const { sourceId,} = this.props.params;
-        const {basePath}=this.props;
-        let url=`${basePath}/${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);
+    const { codeSource } = this.state;
+    if (!location) {
+      return <></>;
     }
-
-    getMainCode=()=>{
-        const {searchParams}=this.props;
-        return searchParams.get('mainCode');
+    const code = this.getCode();
+    if (code && code == "bad-code") {
+      return <Empty />;
     }
-
-    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>
-            );
-        }
-
+    // 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);
-

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

@@ -1,29 +1,34 @@
-import React from 'react'
-import {RouterCompProps} from '../tmpl/interface';
-import ExcelImport from '../import/excel-import'
+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,
-};
-interface ImportRouteStat{
-
+  serverKey?: string;
+  layoutRootPath?: string;
 }
-
-class ExcelImportRoute extends React.PureComponent<ImportRouteProps, ImportRouteStat> {
-
-    state = {}
-
-    async componentDidMount() {
-
-    }
-
-
-    render() {
-        const { params, serverKey} = this.props;
-        const { sourceId} = params;
-       return <ExcelImport serverKey={serverKey} sourceId={sourceId}></ExcelImport>
-    }
+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);
-