aldehyde 0.2.161 → 0.2.164

package/src/aldehyde/detail/button/edit-button.tsx

@@ -1,51 +1,62 @@
 import React from "react";
 import { Button } from "antd";
-import { DoEditParam, DtmplData, LtmplConfig} from "../../tmpl/interface";
-import {EditOutlined} from "@ant-design/icons";
+import { DoEditParam, DtmplData, LtmplConfig } from "../../tmpl/interface";
+import { EditOutlined } from "@ant-design/icons";
 import ActionUtils from "../../controls/action/utils";
 
-
 interface EditButtonProps {
   serverKey?: string;
-  doEdit: (doEditParam:DoEditParam) => void;
+  doEdit: (doEditParam: DoEditParam) => void;
   data: DtmplData;
-  ltmplConfig:LtmplConfig
+  ltmplConfig: LtmplConfig;
 }
 
 const EditButton: React.FC<EditButtonProps> = (props) => {
- const {doEdit,data,ltmplConfig}=props;
- let button=undefined;
+  const { doEdit, data, ltmplConfig } = props;
+  let button = undefined;
   if (ltmplConfig.classEditConfigs) {
-      ltmplConfig.classEditConfigs.forEach(classEditConfig => {
-          if (!button && ActionUtils.isShow(
-              classEditConfig.preposes,
-              [data],
-              undefined
-          )) {
-              button = <Button
-                  size="small"
-                  type="dashed"
-                  icon={<EditOutlined/>}
-                  onClick={() => doEdit({code: data.code, mode: "update", dtmplSourceId: classEditConfig.id})}
-              ></Button>
-          }
-      })
+    ltmplConfig.classEditConfigs.forEach((classEditConfig) => {
+      if (
+        !button &&
+        ActionUtils.isShow(classEditConfig.preposes, [data], undefined)
+      ) {
+        button = (
+          <Button
+            size="small"
+            type="dashed"
+            icon={<EditOutlined />}
+            onClick={() =>
+              doEdit({
+                code: data.code,
+                mode: "update",
+                dtmplSourceId: classEditConfig.id,
+              })
+            }
+          ></Button>
+        );
+      }
+    });
   }
 
-  debugger
-  if(!button && ActionUtils.isShow(
-          ltmplConfig.buttonEditAction?.preposes,
-          [data],
-          undefined
-      ) ){
-          button = <Button
-              size="small"
-              type="dashed"
-              icon={<EditOutlined/>}
-              onClick={() => doEdit({code: data.code, mode: "update"})}
-          ></Button>;
-      }
+  //   debugger
+  if (
+    !button &&
+    ActionUtils.isShow(
+      ltmplConfig.buttonEditAction?.preposes,
+      [data],
+      undefined
+    )
+  ) {
+    button = (
+      <Button
+        size="small"
+        type="dashed"
+        icon={<EditOutlined />}
+        onClick={() => doEdit({ code: data.code, mode: "update" })}
+      ></Button>
+    );
+  }
 
-  return button?button:<></>
-}
-export default EditButton;
+  return button ? button : <></>;
+};
+export default EditButton;

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

@@ -0,0 +1,62 @@
+import React from "react";
+import { Button } from "antd";
+import {DtmplData, LtmplConfig, ShowViewParam} from "../../tmpl/interface";
+import { AlignCenterOutlined } from "@ant-design/icons";
+import ActionUtils from "../../controls/action/utils";
+
+interface ViewButtonProps {
+  serverKey?: string;
+  showView: (showViewParam: ShowViewParam) => void;
+  data: DtmplData;
+  ltmplConfig: LtmplConfig;
+}
+
+const ViewButton: React.FC<ViewButtonProps> = (props) => {
+  const { showView, data, ltmplConfig } = props;
+  let button = undefined;
+  if (ltmplConfig.classViewConfigs) {
+    debugger
+    ltmplConfig.classViewConfigs.forEach((classViewConfig) => {
+      if (
+        !button &&
+        ActionUtils.isShow(classViewConfig.preposes, [data], undefined)
+      ) {
+        button = (
+          <Button
+            size="small"
+            type="primary"
+            icon={<AlignCenterOutlined />}
+            onClick={() =>
+                showView({
+                code: data.code,
+                dtmplSourceId: classViewConfig.id,
+              })
+            }
+          ></Button>
+        );
+      }
+    });
+  }
+
+  //   debugger
+  if (
+    !button &&
+    ActionUtils.isShow(
+      ltmplConfig.buttonViewAction?.preposes,
+      [data],
+      undefined
+    )
+  ) {
+    button = (
+      <Button
+        size="small"
+        type="primary"
+        icon={<AlignCenterOutlined />}
+        onClick={() => showView({ code: data.code})}
+      ></Button>
+    );
+  }
+
+  return button ? button : <></>;
+};
+export default ViewButton;

package/src/aldehyde/layout/menu/user-bar.tsx

@@ -7,6 +7,7 @@ import HCDataSource from "../../tmpl/hc-data-source";
 import UserInfoBar from "./userinfo-bar";
 import ResetPassword from "./reset-password";
 import { LocaleContext } from "../../locale/LocaleProvider";
+import { LocaleType } from "../../locale/langMp";
 
 //const confirm = Modal.confirm;
 
@@ -128,30 +129,14 @@ class UserBar extends React.PureComponent<UserBarProps, UserBarState> {
 
     const items: MenuProps["items"] = [];
 
-    const langItems = [
-      {
-        label: (
-          <span
-            onClick={() => changeLocale("fr")}
-            style={locale === "fr" ? { color: backgroudColor } : {}}
-          >
-            fr
-          </span>
-        ),
-        key: "fr",
-      },
-      {
-        label: (
-          <span
-            onClick={() => changeLocale("en")}
-            style={locale === "en" ? { color: backgroudColor } : {}}
-          >
-            en
-          </span>
-        ),
-        key: "en",
-      },
-    ].filter(({ key }) => availableLang.findIndex((i) => key === i) > -1);
+    const langItems = availableLang.map((lang) => ({
+      label: (
+        <span onClick={() => changeLocale(lang as LocaleType)} style={locale === lang ? { color: backgroudColor } : {}}>
+          { lang }
+        </span>
+      ),
+      key: lang,
+    }))
 
     langItems.unshift({
       label: (

package/src/aldehyde/layout2/header.tsx

@@ -1,4 +1,12 @@
-import { ConfigProvider, Flex, Layout, Menu, MenuProps, theme } from "antd";
+import {
+  ConfigProvider,
+  Flex,
+  Layout,
+  Menu,
+  MenuProps,
+  theme,
+  Tooltip,
+} from "antd";
 import React, { useEffect, useState } from "react";
 import "./css/header.css";
 import L2MenuQuickBar from "../layout/menu/l2menu-quick-bar";
@@ -7,12 +15,6 @@ import LocaleButton from "../locale/LocaleButton";
 import UserBar from "../layout/menu/user-bar";
 import UserButton from "./components/userButton";
 import homePng from "./imgs/home.png";
-import png1 from "./imgs/1.png";
-import png2 from "./imgs/2.png";
-import png3 from "./imgs/3.png";
-import png4 from "./imgs/4.png";
-import png5 from "./imgs/5.png";
-import png6 from "./imgs/6.png";
 import { MenuType } from "./type/layout.type";
 import { NavLink, useParams } from "react-router-dom";
 import {
@@ -221,7 +223,19 @@ const Header: React.FC<HeaderPropsType> = ({ systemName, menuList, style }) => {
             marginRight: 5,
           }}
         />
-        {systemName}
+        <Tooltip title={systemName}>
+          <span
+            style={{
+              width: "100%",
+              height: "100%",
+              overflow: "hidden",
+              textOverflow: "ellipsis",
+              whiteSpace: "nowrap",
+            }}
+          >
+            {systemName}
+          </span>
+        </Tooltip>
       </NavLink>
       <div
         style={{

package/src/aldehyde/locale/LocaleButton.tsx

@@ -15,24 +15,15 @@ const LocaleButton = (props: ButtonProps) => {
   };
 
   console.log(availableLang);
-  const items: MenuProps["items"] = [
-    {
-      label: (
-        <span style={getLocale() === "en" ? { color: token.colorPrimary } : {}}>
-          en
-        </span>
-      ),
-      key: "en",
-    },
-    {
-      label: (
-        <span style={getLocale() === "fr" ? { color: token.colorPrimary } : {}}>
-          fr
-        </span>
-      ),
-      key: "fr",
-    },
-  ].filter(({ key }) => availableLang.findIndex((i) => key === i) > -1);
+  const items: MenuProps["items"] = availableLang.map((lang) => ({
+    label: (
+      <span style={getLocale() === lang ? { color: token.colorPrimary } : {}}>
+        { lang }
+      </span>
+    ),
+    key: lang,
+  }))
+
   items.unshift({
     label: (
       <span style={getLocale() === "zh" ? { color: token.colorPrimary } : {}}>

package/src/aldehyde/locale/langMp.ts

@@ -1,19 +1,25 @@
 import frFr from "antd/locale/fr_FR";
 import zhCN from "antd/locale/zh_CN";
 import enUS from "antd/locale/en_US";
+import ptPT from 'antd/locale/pt_PT';
+import ruRU from 'antd/locale/ru_RU';
 
-export type LocaleType = "zh" | "en" | "fr";
+export type LocaleType = "zh" | "en" | "fr" | "pt" | "ru";
 
 export const langMp = {
   fr: ["fra", "fr-FR"],
   zh: ["zh", "zh-CN"],
   en: ["en"],
+  pt: ["pt"],
+  ru: ["ru"],
 };
 
 export const langApiMp = {
   fra: ["fr", "fr-FR"],
   zh: ["zh", "zh-CN"],
   en: ["en"],
+  pt: ["pt"],
+  ru: ["ru"],
 };
 
 export const getLangWithLangMp: (lang: any) => LocaleType = (lang) => {
@@ -34,4 +40,6 @@ export const antdLangMp = {
   zh: zhCN,
   fr: frFr,
   en: enUS,
+  pt: ptPT,
+  ru: ruRU
 };

package/src/aldehyde/login/login.tsx

@@ -9,6 +9,7 @@ import {
 import HCserviceV3 from "../tmpl/hcservice-v3";
 import { LocaleContext } from "../locale/LocaleProvider";
 import Vertify from "./vertify/index";
+import Units from "../units";
 
 interface LoginProps {
   onFinish: (token: string) => void;
@@ -47,6 +48,7 @@ class Login extends React.PureComponent<LoginProps, LoginState> {
 
   componentDidMount = async () => {
     const { programCode } = this.props;
+    if (programCode) Units.setProgramCode(programCode);
     window.removeEventListener("keydown", this.handleKeyDown);
     let pubkey = await HCserviceV3.getRasPubkey(null, programCode);
     this.setState({

package/src/aldehyde/login2/Login.tsx

@@ -1,7 +1,9 @@
 import { Button, Form, Input } from "antd";
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
 import HCserviceV3 from "../tmpl/hcservice-v3";
 import { useLocale } from "../locale/useLocale";
+import { useParams } from "react-router-dom";
+import Units from "../units";
 
 type LoginPropType = {
   onFinish?: (token: string) => void;
@@ -19,6 +21,13 @@ const Login = (props: LoginPropType) => {
   // locale
   const { translate } = useLocale();
 
+  const { programCode: routeProgramCode } = useParams();
+  useEffect(() => {
+    if (routeProgramCode === undefined) return;
+
+    Units.setProgramCode(routeProgramCode);
+  }, [routeProgramCode]);
+
   // form
   const [form] = Form.useForm<FormType>();
   const submit = async () => {
@@ -27,13 +36,16 @@ const Login = (props: LoginPropType) => {
 
       setLoading(true);
       const { programCode, onFinish } = props;
-      const pubkey = await HCserviceV3.getRasPubkey(null, programCode);
+      const pubkey = await HCserviceV3.getRasPubkey(
+        null,
+        programCode ? programCode : routeProgramCode
+      );
       const res = await HCserviceV3.login(
         { username, password },
         "",
         "",
         pubkey,
-        programCode
+        programCode ? programCode : routeProgramCode
       );
       if (res.status === "success") {
         onFinish(res.token);

package/src/aldehyde/login2/LoginPage.tsx

@@ -13,7 +13,7 @@ const LoginPage = () => {
       style={{
         width: "100%",
         height: "100%",
-        minWidth: "1600px",
+        // minWidth: "1600px",
         position: "absolute",
         background: `url(${LoginBgPng})`,
         backgroundSize: "cover",
@@ -26,11 +26,12 @@ const LoginPage = () => {
       <div
         style={{
           width: "500px",
-          height: "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",
+          aspectRatio: "1/1",
         }}
       >
         <div

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

@@ -1,5 +1,5 @@
 import React, { ReactNode } from "react";
-import {AddOrUpdate, LtmplConfigRes, ActTableMode, DoEditParam} from "../tmpl/interface";
+import {AddOrUpdate, LtmplConfigRes, ActTableMode, DoEditParam, ShowViewParam} from "../tmpl/interface";
 import Units from "../units";
 import ActTable from "../table/act-table";
 // import StatActTable from '../table/stat-act-table'
@@ -16,7 +16,7 @@ export interface LtmplTableProps {
   serverKey?: string;
   sourceId: string;
   mainCode?: string;
-  showView?: (code: string, toCustomPage?: boolean) => void;
+  showView?: (showViewParam: ShowViewParam) => void;
   doCustomCreate?: (handleOk: () => void) => void;
   doCustomEdit?: (
     code: string,
@@ -125,9 +125,11 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
     return criteriaData;
   };
 
-  showView = (code: string) => {
+  showView = (showViewParam: ShowViewParam) => {
+    const {sourceId } = this.props;
     this.setState({
-      selectedCode: code,
+      selectedCode: showViewParam.code,
+      dtmplSourceId:showViewParam.dtmplSourceId?showViewParam.dtmplSourceId:sourceId,
       showDtmplView: true,
     });
   };
@@ -291,7 +293,7 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
                 });
               }}
               mainCode={mainCode}
-              sourceId={sourceId}
+              sourceId={dtmplSourceId?dtmplSourceId:sourceId}
               code={selectedCode}
             >
               {" "}

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

@@ -3,7 +3,7 @@ import {
   AddOrUpdate,
   DoEditParam,
   LtmplConfigRes,
-  RouterCompProps,
+  RouterCompProps, ShowViewParam,
 } from "../tmpl/interface";
 import Units from "../units";
 import ActTable from "../table/act-table";
@@ -92,14 +92,17 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
     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;
+    debugger
+    let dtmplSourceId = showViewParam.dtmplSourceId ? showViewParam.dtmplSourceId : sourceId;
+
     let path = `${basePath}${
       this.computedLayoutPath
-    }/${sourceId}/detail-view?code=${code}&menuId=${this.getMenuId()}`;
-    if (toCustomPage && ltmplConfigRes.ltmplConfig.customViewPagePath) {
+    }/${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}`;

package/src/aldehyde/table/act-table.tsx

@@ -47,7 +47,7 @@ import {
   JumpConfig,
   LtmplConfig,
   QueryKey,
-  SelectedRow,
+  SelectedRow, ShowViewParam,
   TmplBaseProps,
 } from "../tmpl/interface";
 import TableUnits from "./table-util";
@@ -71,6 +71,7 @@ import ToolTipBar from "../detail/tooltipbar";
 import { LocaleContext } from "../locale/LocaleProvider";
 import BlockMenuTreeDrawer from "../module/block-menu-tree-drawer";
 import EditButton from "../detail/button/edit-button";
+import ViewButton from "../detail/button/view-button";
 
 const DragHandle = SortableHandle(() => (
   <MenuOutlined style={{ cursor: "grab", color: "#999" }} />
@@ -88,7 +89,7 @@ interface ActTableProps extends TmplBaseProps {
   onChangePage: (pageNo: number, pageSize: number) => void;
   ltmplConfig: LtmplConfig;
   menuId?: string;
-  showView?: (code: string, toCustomPage?: boolean) => void;
+  showView?: (showVievParam:ShowViewParam) => void;
   doCreate?: (addtmplId: string, toCustomPage: boolean) => void;
   customCreatable?: boolean;
   doEdit?: (doEditParam:DoEditParam) => void;
@@ -362,13 +363,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                 ltmplConfig.buttonViewAction?.preposes,
                 [record],
                 undefined
-            ))  ? (
-              <Button
-                size="small"
-                type="primary"
-                icon={<AlignLeftOutlined />}
-                onClick={() => showView(record.code)}
-              ></Button>
+            ))  ? (<ViewButton showView={showView} data={record} ltmplConfig={ltmplConfig} ></ViewButton>
             ) : (
               ""
             )}
@@ -377,16 +372,14 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                     ltmplConfig.buttonViewAction?.preposes,
                     [record],
                     undefined
-                )) ? (
-              <Button
-                size="small"
-                type="primary"
-                icon={<AlignCenterOutlined />}
-                onClick={() => showView(record.code, true)}
-              ></Button>
-            ) : (
-              ""
-            )}
+                )) ?
+                 <Button
+                    size="small"
+                    type="primary"
+                    icon={<AlignLeftOutlined />}
+                    onClick={() => showView({code:record.code})}
+                ></Button> :
+                ""}
             {buttons.includes("dtmplEdit") &&
             doEdit &&
             !readOnly ?

package/src/aldehyde/tmpl/control-type-supportor.tsx

@@ -73,6 +73,7 @@ SupportInputTypes.add('color');
 SupportInputTypes.add('url');
 SupportInputTypes.add('hidden');
 SupportInputTypes.add('lab-tree-select');
+SupportInputTypes.add('field-history');
 function ControlTypeSupportor(){
 
 }

package/src/aldehyde/tmpl/interface.tsx

@@ -64,9 +64,14 @@ export interface ActionConfig extends ButtonConfig {
   writes: FieldConfig[];
 }
 
-export interface DoEditParam  {
-  code: string;
+export interface DoEditParam extends ShowViewParam {
+
   mode: AddOrUpdate;
+
+}
+
+export interface ShowViewParam  {
+  code: string;
   toCustomPage?: boolean;
   dtmplSourceId?:string;
 }
@@ -102,6 +107,10 @@ export interface ClassEditConfig extends OrderableTmplBase {
   preposes: FieldConfig[],
 }
 
+export interface ClassViewConfig extends ClassEditConfig {
+
+}
+
 export interface ProgramAuth extends OrderableTmplBase {}
 
 export interface Level2Menu extends MenuBase {
@@ -356,6 +365,7 @@ export interface LtmplConfig extends SelectConfig {
   customViewPagePath?: string;
   classAddConfigs?: ClassAddConfig[];
   classEditConfigs?: ClassEditConfig[];
+  classViewConfigs?: ClassViewConfig[];
   drillingParams?: CriteriaConfig[];
   footer?: string;
   header?: string;

package/src/aldehyde/units/index.tsx

@@ -230,11 +230,14 @@ export default {
     },
     setHydrocarbonToken(token:string,serverkey?:string){
         let programCode=this.programCode(serverkey);
+        this.setLocalHydrocarbonToken(token,programCode);
+        this.setSessionHydrocarbonToken(token,programCode);
+    },
+    setLocalHydrocarbonToken(token:string,programCode_?:string){
+        let programCode=programCode_?programCode_:this.programCode();
         if(programCode){
-            window.sessionStorage.setItem(programCode+'hydrocarbonToken',token) ;
             window.localStorage.setItem(programCode+'hydrocarbonToken',token);
         }else{
-            window.sessionStorage.setItem('hydrocarbonToken',token) ;
             window.localStorage.setItem('hydrocarbonToken',token);
         }
     },
@@ -242,6 +245,10 @@ export default {
         let programCode=programCode_?programCode_:this.programCode();
         if(programCode){
             window.sessionStorage.setItem(programCode+'hydrocarbonToken',token) ;
+            //初次设为默认
+            if(!window.sessionStorage.getItem('hydrocarbonToken')){
+                window.sessionStorage.setItem('hydrocarbonToken',token) ;
+            }
         }else{
             window.sessionStorage.setItem('hydrocarbonToken',token) ;
         }