aldehyde 0.1.32 → 0.1.35

package/src/aldehyde/layout/menu/menu-2layers.tsx

@@ -1,17 +1,8 @@
 import React from "react";
 import {Menu} from 'antd';
-import {BlockMenu} from "../../tmpl/interface";
+import {BlockMenu,Menu2layersProps} from "../../tmpl/interface";
 import MenuRender from './menu-render';
 import {withRouter} from 'react-router-dom';
-import {MenuProps} from "antd/lib/menu";
-
-
-export interface Menu2layersProps extends MenuProps{
-    blockMenu: BlockMenu;
-    collapsed?: boolean;
-    currentL2MenuId?: string;
-    basePath?:string;
-}
 
 interface Menu2layersState {
     openKeys: string[];
@@ -27,45 +18,63 @@ class Menu2layers extends React.PureComponent<Menu2layersProps, Menu2layersState
         }
     }
 
-    // componentDidMount() {
-    //
-    // }
+    componentDidMount() {
+        const {currentL2MenuId, blockMenu,collapsed} = this.props;
+        const {openKeys} = this.state;
+        let openKey = blockMenu?MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId):undefined;
+        if(openKey && openKeys.length<1){
+            this.setState({
+                openKeys:[openKey.toString()]
+            })
+        }
+    }
     componentDidUpdate(prevProps) {
         const {currentL2MenuId, blockMenu,collapsed} = this.props;
-        let {currentL2MenuId:preMenuId}=prevProps;
+        let {currentL2MenuId:preMenuId,blockMenu:preBlockMenu}=prevProps;
         const {openKeys} = this.state;
-        // if(collapsed){
-        //     if(openKeys.length>0){
-        //         this.setState({
-        //             openKeys:[]
-        //         })
-        //     }
-        // }else{
 
+        if(!preBlockMenu || !blockMenu  || blockMenu.id!=preBlockMenu.id){
+                //console.log('currentL2MenuId:',currentL2MenuId);
             let openKey = blockMenu?MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId):undefined;
-            if(openKey && openKeys.length<1){
-                this.setState({
-                    openKeys:[openKey.toString()]
-                })
-            }else if(preMenuId!=currentL2MenuId){
-                console.log('currentL2MenuId:',currentL2MenuId);
                 if (openKey) {
-                    if(openKeys.length==1){
-                        openKeys.push(openKey.toString())
-                        if (openKeys && openKeys.length > 1) {
-                            openKeys.splice(0, 1);
-                        }
-                    }
                     this.setState({
-                        openKeys,
+                        openKeys:[openKey],
                     })
                 }
+        }else {
+            let openKey = blockMenu?MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId):undefined;
+            let preOpenKey = blockMenu?MenuRender.findOpenId(preBlockMenu.l1Menus, preMenuId):undefined;
+            if(openKey && openKey!=preOpenKey){
+                this.setState({
+                    openKeys:[openKey],
+                })
             }
+        }
+
+            // let openKey = blockMenu?MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId):undefined;
+            // if(openKey && openKeys.length<1){
+            //     this.setState({
+            //         openKeys:[openKey.toString()]
+            //     })
+            // }else if(preMenuId!=currentL2MenuId){
+            //     console.log('currentL2MenuId:',currentL2MenuId);
+            //     if (openKey) {
+            //         if(openKeys.length==1){
+            //             openKeys.push(openKey.toString())
+            //             if (openKeys && openKeys.length > 1) {
+            //                 openKeys.splice(0, 1);
+            //             }
+            //         }
+            //         this.setState({
+            //             openKeys,
+            //         })
+            //     }
+            // }
         //}
     }
 
     handleOpen = (openKeys) => {
-        if (openKeys && openKeys.length > 1) {
+        if (openKeys && openKeys.length>1) {
             openKeys.splice(0, 1);
         }
         this.setState({

package/src/aldehyde/layout/menu/menu-render.tsx

@@ -15,6 +15,36 @@ export default {
             }
         })
     },
+    getRoutePath(menu:Level2Menu,basePath,defaultCriteriaData){
+        if(menu){
+            let pageType=menu.pageType;
+
+            let routePath='act-table';
+
+            let codeSource='';
+            switch (pageType) {
+                case "列表":
+                    routePath='act-table';
+                    break;
+                case "添加":
+                    routePath='detail-edit';
+                    codeSource='&codeSource=new';
+                    break;
+                case "编辑":
+                    routePath='detail-edit';
+                    codeSource='&codeSource=listTop';
+                    break;
+                case "详情":
+                    routePath='detail-view';
+                    codeSource='&codeSource=listTop';
+                    break;
+            }
+
+            return `${basePath}/${menu.id}/${routePath}?menuId=${menu.id}${codeSource}${defaultCriteriaData}`;
+
+        }
+        return null;
+    },
     renderL2Menu(menus:Level2Menu[],target,basePath=""){
         return menus.map((item) => {
             let delimiter="/";
@@ -29,8 +59,10 @@ export default {
                 defaultCriteriaData='&'+ Units.transQueryParamsToStr(item.defaultCriteriaValue);
             }
 
+            let path=customPath ?`${basePath}/page-${item.id}${delimiter}${customPath}?menuId=${item.id}` :this.getRoutePath(item,basePath,defaultCriteriaData);
+
             return <Menu.Item key={item.id}>
-                <NavLink to={customPath ?`${basePath}/page-${item.id}${delimiter}${customPath}?menuId=${item.id}` :`${basePath}/${item.id}/act-table?menuId=${item.id}${defaultCriteriaData}`} target={target} >{item.title}</NavLink>
+                <NavLink to={path} target={target} >{item.title}</NavLink>
             </Menu.Item>
         })
     },

package/src/aldehyde/layout/sidebar/index.tsx

@@ -1,7 +1,8 @@
 import React from 'react'
 import './index.css'
 import Units from '../../units';
-import Menu2layers, {Menu2layersProps} from "../menu/menu-2layers";
+import Menu2layers from "../menu/menu-2layers";
+import {Menu2layersProps} from "../../tmpl/interface";
 import Scrollbars from 'react-custom-scrollbars';
 import {Image, Layout, Menu} from 'antd';
 import logo from './logo.png';

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

@@ -3,7 +3,8 @@ import {Button, Card, Form as AntdForm, Modal} from 'antd';
 import  {RouterCompProps} from '../tmpl/interface';
 import Units from "../units";
 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";
 
 
 export interface DtmplRouteProps extends RouterCompProps {
@@ -11,13 +12,37 @@ export interface DtmplRouteProps extends RouterCompProps {
 };
 
 export interface DtmplRoutePropsStat {
-
+    codeSource:'new'|'listTop'|undefined,
+    queriedCode:string,
 };
 
 class DtmplRoute extends React.PureComponent<DtmplRouteProps, DtmplRoutePropsStat> {
+    state={
+        codeSource:undefined,
+        queriedCode:undefined,
+    }
     static  defaultProps={
         basePath:"",
+        codeSource:undefined,
+        queriedCode:undefined,
     }
+    async componentDidMount() {
+        const {location,match}=this.props;
+        const {sourceId,} = match.params;
+        let codeSource:'new'|'listTop'|undefined=this.getCodeSource();
+        let queriedCode=undefined;
+        if(codeSource && codeSource=='listTop'){
+            //查询
+          let data= await HcserviceV3.requestMstrucLtmplQueryTop(sourceId,{top:1});
+          if(data && data.entities && data.entities[0]){
+              queriedCode=data.entities[0].code;
+          }
+        }
+        this.setState({
+            codeSource,queriedCode
+        })
+    }
+
     getMenuId=()=>{
         const {location} = this.props;
         console.log("this.props.match.params",this.props);
@@ -26,6 +51,16 @@ class DtmplRoute extends React.PureComponent<DtmplRouteProps, DtmplRoutePropsSta
         return menuId;
     }
 
+    getCodeSource=()=>{
+        const {location}=this.props;
+        let params=Units.transQueryStrToParams(location.search);
+        if('codeSource' in params){
+            return params['codeSource'];
+        }else{
+            return undefined;
+        }
+    }
+
     goBackToLtmpl=()=>{
         const { sourceId,} = this.props.match.params;
         const {basePath}=this.props;
@@ -53,6 +88,7 @@ class DtmplRoute extends React.PureComponent<DtmplRouteProps, DtmplRoutePropsSta
 
     getMainCode=()=>{
         const {location}=this.props;
+
         let params=Units.transQueryStrToParams(location.search);
         if('mainCode' in params){
             return params['mainCode'];
@@ -61,10 +97,16 @@ class DtmplRoute extends React.PureComponent<DtmplRouteProps, DtmplRoutePropsSta
         }
     }
 
-    getCode=()=>{
+    getCode= ()=>{
+        const {codeSource,queriedCode}=this.state;
         const {location}=this.props;
-        let params=Units.transQueryStrToParams(location.search);
-        return params['code'];
+        //let code;
+        if(codeSource=='listTop'){
+            return queriedCode;
+        }else{
+            let params=Units.transQueryStrToParams(location.search);
+            return params['code'];
+        }
     }
 
     getMode=()=>{
@@ -76,7 +118,8 @@ class DtmplRoute extends React.PureComponent<DtmplRouteProps, DtmplRoutePropsSta
     render() {
         const {location,match}=this.props;
         const {sourceId,} = match.params;
-        // console.log("this.props.match.params",match);
+        const {codeSource}=this.state;
+        console.log("this.props.match.params",match);
         if(!location){
             return <></>;
         }
@@ -88,7 +131,7 @@ class DtmplRoute extends React.PureComponent<DtmplRouteProps, DtmplRoutePropsSta
             );
         }else{
             return (
-                <DtmplEdit addOrUpdate={this.getMode()} sourceId={sourceId} code={this.getCode()} mainCode={this.getMainCode()} goBackToLtmpl={this.goBackToLtmpl} goDtmpl={this.goDtmpl}></DtmplEdit>
+                <DtmplEdit addOrUpdate={this.getMode()} sourceId={sourceId} code={this.getCode()} mainCode={this.getMainCode()} goBackToLtmpl={codeSource?undefined:this.goBackToLtmpl} goDtmpl={this.goDtmpl}></DtmplEdit>
             );
         }
 

package/src/aldehyde/tmpl/hc-data-source.tsx

@@ -19,6 +19,7 @@ const selectConfigMap: Map<string, SelectConfig> = new Map<string, SelectConfig>
 const ltmplConfigMap: Map<string, LtmplConfigRes> = new Map<string, LtmplConfigRes>();
 const l2LtmplConfigMap: Map<string, LtmplConfigRes> = new Map<string, LtmplConfigRes>();
 const dtmplConfigMap: Map<string, DtmplConfig> = new Map<string, DtmplConfig>();
+const viewDtmplConfigMap: Map<string, DtmplConfig> = new Map<string, DtmplConfig>();
 
 
 function findUnloadEnumMstrucIdOfFields(fields:FieldBase[]) {
@@ -167,11 +168,20 @@ HCDataSource.requestDtmplConfig = async function ( sourceId: string) {
     if (!dtmplConfigMap.has(sourceId)) {
         dtmplConfigMap.set(sourceId, await HcserviceV3.requestDtmplConfig(sourceId));
         //加载枚举
-       await loadEnumOfDtmplConfig(dtmplConfigMap.get(sourceId));
+        await loadEnumOfDtmplConfig(dtmplConfigMap.get(sourceId));
     }
     return dtmplConfigMap.get(sourceId);
 };
 
+HCDataSource.requestViewDtmplConfig = async function ( sourceId: string) {
+    if (!viewDtmplConfigMap.has(sourceId)) {
+        viewDtmplConfigMap.set(sourceId, await HcserviceV3.requestViewDtmplConfig(sourceId));
+        //加载枚举
+        await loadEnumOfDtmplConfig(viewDtmplConfigMap.get(sourceId));
+    }
+    return viewDtmplConfigMap.get(sourceId);
+};
+
 HCDataSource.getEnums = function (mstrucId:string): EnumItem[] {
     //这里是不是后续可以考虑防止串改
    return enumMap.get(mstrucId);
@@ -268,6 +278,7 @@ HCDataSource.clearOnly =async function () {
     enumMap.clear();
     ltmplConfigMap.clear();
     dtmplConfigMap.clear();
+    viewDtmplConfigMap.clear();
     selectConfigMap.clear();
     l2LtmplConfigMap.clear();
     optionsMap.clear();

package/src/aldehyde/tmpl/hcservice-v3.tsx

@@ -57,10 +57,6 @@ export default class HcserviceV3 {
 
     static async requestDtmplConfig(sourceId:string) {
 
-        // if(sourceId=='user'){
-        //     return this.requestUserDtmplConfig();
-        // }
-
         let url = `/v3/dtmpl/config`
         let res = await Super.super({
             url,
@@ -70,6 +66,17 @@ export default class HcserviceV3 {
         return res.dtmplConfig;
     }
 
+    static async requestViewDtmplConfig(sourceId:string) {
+
+        let url = `/v3/view-dtmpl/config`
+        let res = await Super.super({
+            url,
+            method: "GET",
+            query:{sourceId}
+        });
+        return res.dtmplConfig;
+    }
+
     // static async requestUserDtmplConfig() {
     //     let url = `/v3/user/dtmpl/config`
     //     let res = await Super.super({
@@ -220,6 +227,16 @@ export default class HcserviceV3 {
         return await this.requestCommonDtmplData(sourceId, code,versionId,url)
     }
 
+    static async requestViewDtmplData(sourceId, code,versionId) {
+        let url = `/v3/view-dtmpl/data`;
+        return await this.requestCommonDtmplData(sourceId, code,versionId,url)
+    }
+
+    static async requestMstrucViewDtmplData(sourceId, code,versionId) {
+        let url = `/v3/mstruc/view-dtmpl/data`;
+        return await this.requestCommonDtmplData(sourceId, code,versionId,url)
+    }
+
     // static async requestUserDtmplData() {
     //     let url = `/v3/user/dtmpl/data`;
     //     let res = await Super.super({

package/src/aldehyde/tmpl/interface.tsx

@@ -1,3 +1,5 @@
+import {MenuProps} from "antd/lib/menu";
+
 export type ViewOrEdit = 'view' | 'edit' ;
 
 export type AddOrUpdate = 'add' | 'update'| 'copy' ;
@@ -56,7 +58,8 @@ export interface Level2Menu extends MenuBase {
     customPath?: string;
     displayTotal?: boolean;
     count?:number;
-    defaultCriteriaValue?:object
+    defaultCriteriaValue?:object,
+    pageType:'列表'|'详情'|'编辑'|'添加'
 }
 
 export interface Level1Menu extends MenuBase {
@@ -277,6 +280,7 @@ export interface DtmplBaseProps extends TmplBaseProps {
     rightBarPositionRight?: number,
     serialNumber?: number,
     goDtmpl?: (code?:string) => void,
+    maxColsOnRow?:1|2,
 };
 
 export interface ChartConfig {
@@ -311,6 +315,11 @@ export interface FileValue {
     thn?: FileLoadInfo,
     base?: FileLoadInfo,
 }
-
+export interface Menu2layersProps extends MenuProps{
+    blockMenu: BlockMenu;
+    collapsed?: boolean;
+    currentL2MenuId?: string;
+    basePath?:string;
+}
 
 

package/lib/custom-page/DefCustomPage.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DefCustomPage.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/custom-page/DefCustomPage.js"],"names":[],"mappings":"AAEA;IAMopnB,wBAA8C;IAAA,sCAAyJ;IALv1nB,sBAIC;CACJ"}

package/lib/custom-page/DefCustomPage.js

@@ -1,7 +0,0 @@
-import React from 'react';
-export default class DefCustomPage extends React.Component {
-    render() {
-        return (React.createElement("div", null, "\u9ED8\u8BA4\u81EA\u5B9A\u4E49\u9875\u9762"));
-    }
-}
-//# sourceMappingURL=DefCustomPage.js.map

package/lib/custom-page/DefCustomPage.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"DefCustomPage.js","sourceRoot":"","sources":["../../../../src/aldehyde/custom-page/DefCustomPage.js"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,KAAK,CAAC,SAAS;IACtD,MAAM;QACF,OAAO,CACL,8EAAkB,CACnB,CAAC;IACN,CAAC;CACJ"}

package/src/aldehyde/custom-page/DefCustomPage.js

@@ -1,9 +0,0 @@
-import React from 'react';
-
-export default class DefCustomPage extends React.Component{
-    render(){
-        return (
-          <div>默认自定义页面</div>
-        );
-    }
-}