aldehyde 0.2.244 → 0.2.245

package/src/aldehyde/layout2/page.tsx

@@ -123,8 +123,10 @@ const getMenuConfig = async (): Promise<{
 }> => {
 
   const res = await HcserviceV3.requestBlocks("", "");
-
-  const menuList: MenuType[] = handleMenuRes(res.blocks);
+  let menuList: MenuType[]=[];
+  if(res?.blocks){
+    menuList = handleMenuRes(res.blocks);
+  }
   let tmp={};
   menuList.forEach((menu: MenuType) => {
     getMenuMap(menu,tmp);
@@ -133,7 +135,7 @@ const getMenuConfig = async (): Promise<{
 
   return {
     menu: menuList,
-    systemName: res.programName,
+    systemName: res?.programName,
   };
 };
 

package/src/aldehyde/layout2/util/menu.util.tsx

@@ -1,6 +1,7 @@
 import { ReactNode } from "react";
 import { MenuProps } from "antd";
 import { MenuType } from "../type/layout.type";
+import {SettingOutlined} from "@ant-design/icons";
 
 type AntdMenuItemType = Required<MenuProps>["items"][number];
 
@@ -56,6 +57,7 @@ export const handlePropsMenuToAntdMenu = (
       const menu: AntdMenuItemType = {
         label: customLabelFn(item, floor),
         key: id,
+        // icon: <SettingOutlined />,
         disabled,
         className,
         children:

package/src/aldehyde/module/dtmpl-view-card.tsx

@@ -46,7 +46,9 @@ class DtmplViewCard extends React.PureComponent<DtmplViewCardProps, DtmplViewCar
         const {showDtmplEdit} = this.state;
         const { sourceId,code,mainCode,editable,serverKey,codeSource,title,showHeader,addTmplId} = this.props;
             return <>
-                <ActDtmplView showHeader={showHeader} title={title} codeSource={codeSource} serverKey={serverKey} goDtmpl={editable?this.goDtmpl:null}  sourceId={sourceId} code={code} mainCode={mainCode}></ActDtmplView>
+                <ActDtmplView showHeader={showHeader} title={title} codeSource={codeSource} serverKey={serverKey}
+                              goDtmpl={editable?this.goDtmpl:null}  sourceId={sourceId}
+                              code={code} mainCode={mainCode}></ActDtmplView>
                 {showDtmplEdit? <DtmplEditModal  addTmplId={addTmplId} codeSource={codeSource} serverKey={serverKey} open={showDtmplEdit} onCancel={()=>{
                         this.setState({
                             showDtmplEdit:false,

package/src/aldehyde/module/dtmpl-view-modal.tsx

@@ -39,8 +39,8 @@ class DtmplViewModal extends React.PureComponent<DtmplViewModalProps, DtmplViewM
                     open={open}
                     width={width}
                     title={title}
-                    bodyStyle={{height: height, overflow: 'auto'}}
-                    destroyOnClose={true}
+                    styles={{body:{height: height, overflow: 'auto'}}}
+                    destroyOnHidden={true}
                     centered
                     onCancel={onClose}
                 >

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

@@ -81,6 +81,13 @@ class DtmplRoute extends React.Component<DtmplRouteProps, DtmplRoutePropsStat> {
 
   goBackToLtmpl = () => {
     this.props.navigate(-1);
+    //this.props.navigate();
+  };
+
+  goNavigatel = () => {
+    this.props.navigate(window.location.hash);
+
+    //.reload();
   };
 
   goDtmpl = (code: string) => {
@@ -157,7 +164,7 @@ class DtmplRoute extends React.Component<DtmplRouteProps, DtmplRoutePropsStat> {
           sourceId={sourceId}
           code={code}
           mainCode={this.getMainCode()}
-          goBackToLtmpl={codeSource ? undefined : this.goBackToLtmpl}
+          goBackToLtmpl={codeSource ? this.goNavigatel : this.goBackToLtmpl}
           goDtmpl={this.goDtmpl}
         ></DtmplEdit>
       );

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

@@ -1,6 +1,5 @@
-import React, {ReactNode} from "react";
+import React from "react";
 import {
-    AddOrUpdate,
     DoEditParam, LtmplConfig,
     LtmplConfigRes, PageType,
     RouterCompProps,
@@ -18,7 +17,6 @@ import DtmplViewDrawer from "../module/dtmpl-view-drawer";
 import DtmplCustomEditModalPage from "../custom-page/dtmpl-custom-edit-modal-page";
 import DtmplEditPage from "../module/dtmpl-edit-page";
 import DtmplViewModal from "../module/dtmpl-view-modal";
-import {arrowsOptions} from "ketcher-react/dist/script/ui/views/toolbars/LeftToolbar/leftToolbarOptions";
 
 export interface LtmplRouteProps extends RouterCompProps {
     layoutRootPath?: string;
@@ -37,6 +35,8 @@ export interface LtmplRouteState {
     showViewModal?: boolean;
     showEdit?: boolean;
     showWindowType?: string;
+    viewSourceId?: string;
+    editSourceId?: string;
 }
 
 class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
@@ -60,12 +60,14 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
         showEdit: false,
         showWindowType: "modal",
         routeMode:'multiple',
+        viewSourceId: undefined,
+        editSourceId: undefined
     };
 
     async componentDidMount() {
         this.loadData();
     }
-
+Z
     get computedLayoutPath() {
         const {layoutRootPath} = this.props;
         if (layoutRootPath !== undefined) return `/${layoutRootPath}`;
@@ -156,7 +158,8 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
             this.setState({
                 showViewModal: showType=="modal",
                 showViewDrawer: showType=="drawer",
-                selectedCode: showViewParam.code
+                selectedCode: showViewParam.code,
+                viewSourceId:dtmplSourceId
             })
         }
     };
@@ -194,7 +197,8 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
             this.setState({
                 showEdit: true,
                 showWindowType,
-                selectedCode: param.code
+                selectedCode: param.code,
+                editSourceId:dtmplSourceId,
             })
         }
     };
@@ -268,7 +272,7 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
     }
 
     doSearch = (params_) => {
-        const {basePath,tableType} = this.props;
+        const {basePath} = this.props;
         const {sourceId} = this.props.params;
         let params = {
             ...Units.transQueryStrToParams(
@@ -305,7 +309,7 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
         this.doSearch(params);
     };
     doSubmited = () => {
-        this.onChangeSearch(null);
+        this.onChangeSearch({serial_number:Units.getReactKey()});
         this.doClose();
     }
 
@@ -322,7 +326,7 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
     render() {
         const {
             ltmplConfigRes, showDraw, showWindowType, ractionId, selectedCode,
-            showViewDrawer, showViewModal, showEdit
+            showViewDrawer, showViewModal, showEdit,editSourceId,viewSourceId
         } = this.state;
         const {location, params,tableType,rowOperatable} = this.props;
         const {sourceId} = params;
@@ -393,13 +397,14 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
                             width={ windowWidth}
                             onClose={this.doClose}
                             open={showViewDrawer}
-                            sourceId={sourceId}
+                            sourceId={viewSourceId?viewSourceId:sourceId}
                             code={selectedCode}
                         ></DtmplViewDrawer>
                     ) : null}
                     {showViewModal && selectedCode ? (
                         <DtmplViewModal
-                            serverKey={null} width={windowWidth} height={windowHeight} onClose={this.doClose} open={showViewModal} sourceId={sourceId}
+                            serverKey={null} width={windowWidth} height={windowHeight} onClose={this.doClose}
+                            open={showViewModal} sourceId={viewSourceId?viewSourceId:sourceId}
                             code={selectedCode}
                         ></DtmplViewModal>
                     ) : null}
@@ -425,7 +430,7 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
                                 height={windowEditHeight}
                                 onCancel={this.doClose}
                                 mainCode={mainCode}
-                                sourceId={sourceId}
+                                sourceId={editSourceId?editSourceId:sourceId}
                                 code={selectedCode}
                                 onOk={this.doSubmited}
                             />