aldehyde 0.2.73 → 0.2.74

package/src/aldehyde/detail/view/act-dtmpl-view.tsx

@@ -11,6 +11,7 @@ import ToolTipBar from "../tooltipbar";
 
 export interface ActDtmplViewProps extends DtmplBaseProps {
     versionId?: number;
+    title?:any,
 };
 
 export interface ActDtmplViewStat {
@@ -81,7 +82,7 @@ class ActDtmplView extends React.PureComponent<ActDtmplViewProps, ActDtmplViewSt
     }
 
     render() {
-        const {showRightNav, rightBarPositionRight, code,  sourceId,goDtmpl,serverKey,codeSource} = this.props;
+        const {showRightNav, rightBarPositionRight, code,  sourceId,goDtmpl,serverKey,codeSource,title} = this.props;
         const {dtmplConfig, premisesTitle, loading, layout, snapshotOpen,refreshCode} = this.state;
         const buttons = dtmplConfig ? dtmplConfig.buttons : undefined;
         const premises = dtmplConfig ? dtmplConfig.premises : undefined;
@@ -96,7 +97,7 @@ class ActDtmplView extends React.PureComponent<ActDtmplViewProps, ActDtmplViewSt
                       className="hoverable pageHeader"
                 >
                     <h3>
-                        {'详情'}{dtmplConfig?<ToolTipBar content={dtmplConfig.tip} />:null}
+                        {title?title:'详情'}{dtmplConfig?<ToolTipBar content={dtmplConfig.tip} />:null}
                         <div className="fr">
                             {buttons && buttons.includes("dtmplEdit") && goDtmpl && !dtmplConfig.editAction ?
                                     <Button

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

@@ -2,9 +2,11 @@ import React from 'react';
 import {Modal, ModalProps as AntdModalProps,Form,Button} from 'antd'
 import ActDtmplView, {ActDtmplViewProps} from "./act-dtmpl-view";
 import Scrollbars from 'react-custom-scrollbars';
-interface ModalDtmplViewProps extends AntdModalProps, ActDtmplViewProps{
-    height:any,
+interface ModalDtmplViewProps extends  ActDtmplViewProps{
+    height?:any,
     onCancel:()=>any,
+    open?:boolean,
+    children?:any,
 }
 
 interface ModalDtmplViewState {
@@ -33,13 +35,11 @@ export default class ModalDtmplView extends React.PureComponent<ModalDtmplViewPr
 
     render() {
         // console.log('antdModalProps:',this.antdModalProps);
-        const {height,onOk,onCancel,code,style,sourceId,open,serverKey} = this.props
-        //console.log('antdModalProps code :',code);
-        //const {code} = this.state;o
+        const {code,sourceId,serverKey,open,onCancel,height} = this.props
+
         return <Modal
             open={open}
             title={"查看"}
-            // style={style}
             width={"82vw"}
             centered
             wrapClassName={'aaa'}

package/src/aldehyde/index.tsx

@@ -52,6 +52,7 @@ import ImportRoute from './routable/import-route';
 // const ImportRoute = loadable(() =>
 //     import("./routable/import-route"), {fallback: Loading});
 import LtmplRoute from "./routable/ltmpl-route";
+import TtmplRoute from "./routable/ttmpl-route";
 // const LtmplRoute = loadable(() =>
 //     import("./routable/ltmpl-route"), {fallback: Loading});
 import DtmplViewCard from './module/dtmpl-view-card';
@@ -115,7 +116,7 @@ import DatePicker from './controls/date-picker';
 
 import ModelStrucV3 from './tmpl/model-struc-v3';
 
-export {ActTable,SelectTable,Login,DtmplRoute,ImportRoute,LtmplRoute,DtmplViewCard,DtmplEditDrawer,DtmplEditModal,LtmplModal,LtmplDrawer,LtmplTable,Menu2layers,Block,UserBar,
+export {ActTable,SelectTable,Login,DtmplRoute,ImportRoute,LtmplRoute,TtmplRoute,DtmplViewCard,DtmplEditDrawer,DtmplEditModal,LtmplModal,LtmplDrawer,LtmplTable,Menu2layers,Block,UserBar,
     ResetPassword,Footer,EntryControl,ViewControl,ProgramConfig,HydrocarbonService,QuickEntrance,Workbench,PopoverEntitySelect,DtmplEditCard,RouterLogin
 ,DatePicker,DtmplEditPage,TmplInterface,TmplDataSource,Superagent,DtmplEdit,HCWelcome,MainPage,ExcelImportRoute,CustomPageRouter,HCCustomPageRouter,L2MenuMessageBar,L2MenuQuickBar,ContextSetter,withRouter,ModelStrucV3}
 

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

@@ -64,6 +64,9 @@ export default {
                 case "列表":
                     routePath = 'act-table';
                     break;
+                case "树":
+                    routePath = 'act-tree';
+                    break;
                 case "添加":
                     routePath = 'detail-edit';
                     codeSource = '&codeSource=new';

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

@@ -43,7 +43,7 @@ class UserInfoBar extends React.PureComponent<UserInfoBarProps, UserInfoBarState
             <>{userCode?
                 <>
                 <span onClick={this.showDraw}>个人信息</span>
-                {showDraw  ?<DtmplViewDrawer serverKey={null} editable={editable} title={'个人信息'} width={'calc(100% - 280px)'}  sourceId={gtmplSourceId} open={showDraw} code={userCode} onClose={this.closeDrawer}></DtmplViewDrawer>:null}
+                {showDraw  ?<DtmplViewDrawer serverKey={null} editable={editable} title={'个人信息'}   sourceId={gtmplSourceId} open={showDraw} code={userCode} onClose={this.closeDrawer}></DtmplViewDrawer>:null}
            </>:null } </>
         );
     }

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

@@ -6,6 +6,7 @@ import {CodeSource} from "../tmpl/interface";
 //以列表为入口的，页面内列表，基本原则是所有交互在页面内完成，不会触发路由。
 
 export interface DtmplViewCardProps  {
+    title?:any,
     serverKey?:string,
     sourceId?:string,
     code?:string;
@@ -51,7 +52,7 @@ class DtmplViewCard extends React.PureComponent<DtmplViewCardProps, DtmplViewCar
 
     render() {
         const {showDtmplEdit} = this.state;
-        const { sourceId,code,mainCode,editable,serverKey,codeSource} = this.props;
+        const { sourceId,code,mainCode,editable,serverKey,codeSource,title} = this.props;
             return <>
                 <ActDtmplView codeSource={codeSource} serverKey={serverKey} goDtmpl={editable?this.goDtmpl:null}  sourceId={sourceId} code={code} mainCode={mainCode}></ActDtmplView>
                 {showDtmplEdit? <DtmplEditModal  codeSource={codeSource} serverKey={serverKey} open={showDtmplEdit} onCancel={()=>{

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

@@ -49,7 +49,7 @@ class DtmplViewDrawer extends React.PureComponent<DtmplViewDrawerProps, DtmplVie
                     open={open}
                     width={width}
                     style={{
-                        maxWidth: "92vh",
+                        maxWidth: "92vw",
                     }}
                     extra={
                         <Space>
@@ -57,7 +57,7 @@ class DtmplViewDrawer extends React.PureComponent<DtmplViewDrawerProps, DtmplVie
                         </Space>
                     }
                 >
-                   <DtmplViewCard codeSource={codeSource} serverKey={serverKey} editable={editable} sourceId={sourceId} code={code}></DtmplViewCard>
+                   <DtmplViewCard  codeSource={codeSource} serverKey={serverKey} editable={editable} sourceId={sourceId} code={code}></DtmplViewCard>
              </Drawer>)
     }
 }

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

@@ -0,0 +1,207 @@
+import React from 'react'
+import {AddOrUpdate, LtmplConfigRes, RouterCompProps} from '../tmpl/interface';
+import Units from "../units";
+import ActTable from '../table/act-table'
+// import StatActTable from '../table/stat-act-table'
+import HCDataSource from "../tmpl/hc-data-source";
+import withRouter from "../routable/withroute";
+export interface TtmplRouteProps extends RouterCompProps {
+
+};
+
+export interface TtmplRouteState {
+    ltmplConfigRes?: LtmplConfigRes,
+    pageNo?: number,
+    pageSize?: number,
+};
+
+class TtmplRoute extends React.PureComponent<TtmplRouteProps, TtmplRouteState> {
+    static defaultProps = {
+        basePath: "",
+    }
+    state = {
+        ltmplConfigRes: undefined,
+        pageNo: undefined,
+        pageSize: undefined,
+    }
+
+    async componentDidMount() {
+        this.loadData();
+    }
+
+    onRoute = (path) => {
+        this.props.navigate(path);
+    }
+
+    getMenuId = () => {
+        const {searchParams} = this.props;
+        let menuId = searchParams.get('menuId');
+        return menuId;
+    }
+
+    loadData = async () => {
+        const {params} = this.props;
+        const {sourceId} = params;
+        let ltmplConfigRes:LtmplConfigRes = await HCDataSource.requestLtmplConfig(null,sourceId);
+        this.setState({
+            ltmplConfigRes:ltmplConfigRes,
+        })
+    }
+
+    async componentDidUpdate(prevProps) {
+        const {location,params} = this.props;
+        const {sourceId} = params;
+        let {sourceId: preSourceId} = prevProps.params;
+        let {location: preLocation} = prevProps;
+        if (!sourceId ||
+            (!preSourceId && this.state.ltmplConfigRes)
+            || (location.pathname == preLocation.pathname && location.search == preLocation.search)
+        ) {
+            return;
+        }
+        this.loadData();
+    }
+
+    showView = (code: string, toCustomPage: boolean = false) => {
+        const {basePath} = this.props;
+        const {sourceId} = this.props.params;
+        const {ltmplConfigRes} = this.state;
+        let path = `${basePath}/${sourceId}/detail-view?code=${code}&menuId=${this.getMenuId()}`;
+        if (toCustomPage && ltmplConfigRes.ltmplConfig.customViewPagePath) {
+            path = `${basePath}${ltmplConfigRes.ltmplConfig.customViewPagePath}?menuId=${this.getMenuId()}&sourceId=${sourceId}`;
+        }
+        this.onRoute(path);
+    }
+
+    doEdit = (code: string, mode: AddOrUpdate, toCustomPage: boolean = false) => {
+        const {basePath} = this.props;
+        const {sourceId} = this.props.params;
+        const {ltmplConfigRes} = this.state;
+        let mainCode = this.getMainCode();
+
+        let path = `${basePath}/${sourceId}/detail-edit?code=${code}&menuId=${this.getMenuId()}&mode=${mode}`;
+        if (toCustomPage && ltmplConfigRes.ltmplConfig.customEditPagePath) {
+            path = `${basePath}/page/${sourceId}${ltmplConfigRes.ltmplConfig.customEditPagePath}?code=${code}&menuId=${this.getMenuId()}`;
+        }
+        if (mainCode) {
+            path = path + `&mainCode=${mainCode}`;
+        }
+        this.onRoute(path);
+    }
+
+    getMainCode = () => {
+        const {searchParams} = this.props;
+        let mainCode = undefined;
+       // let criteriaData = Units.transQueryStrToParams(search);
+        let mcode=searchParams.get('mainCode');
+        if (mcode) {
+            // criteriaData = Units.transQueryStrToParams(search);
+            mainCode = mcode;
+        }
+        return mainCode;
+    }
+
+    doCreate = (toCustomPage: boolean = false) => {
+        const {basePath} = this.props;
+        const {sourceId} = this.props.params;
+        const {ltmplConfigRes} = this.state;
+        let path = `${basePath}/${sourceId}/detail-edit?menuId=${this.getMenuId()}`;
+        if (toCustomPage && ltmplConfigRes.ltmplConfig.customEditPagePath) {
+            path = `${basePath}/page/${sourceId}${ltmplConfigRes.ltmplConfig.customEditPagePath}?menuId=${this.getMenuId()}`;
+        }
+        let mainCode = this.getMainCode();
+        if (mainCode) {
+            path = path + `&mainCode=${mainCode}`;
+        }
+        this.onRoute(path);
+    }
+
+    doRAction = (ractionId: string, mainCode: String) => {
+        const {basePath} = this.props;
+        let path = `${basePath}/${ractionId}/act-table?mainCode=${mainCode}&menuId=${this.getMenuId()}`;
+        this.onRoute(path);
+    }
+
+    doSearch = (params_) => {
+        const {basePath} = this.props;
+        const {sourceId} = this.props.params;
+        let params = {...params_}
+        //params['sourceId'] = sourceId;
+        const newfliter = Units.transQueryParamsToStr(params);
+        this.props.navigate(`${basePath}/${sourceId}/act-table?${newfliter}`,{replace:true})
+
+    }
+    onChangeSearch = (params_) => {
+        let params = {...params_}
+        //追加过滤条件，hiddenColIds，innerQueryKey
+        const {searchParams} = this.props;
+        let mcode=searchParams.get("mainCode");
+        if (mcode) {
+            params['mainCode'] = mcode;
+        }
+        const {pageSize,pageNo} = this.state;
+        if(pageSize){
+            params['pageNo'] = pageNo;
+        }
+       if(pageNo){
+           params['pageSize'] = pageSize;
+       }
+        params['menuId']=this.getMenuId();
+        params['sourceId']=this.getMenuId();
+        this.doSearch(params);
+    }
+
+    onChangePage = (pageNo: number, pageSize: number) => {
+        const {location} = this.props;
+        let search = location.search;
+        let params = Units.transQueryStrToParams(search);
+        params['pageNo'] = pageNo;
+        params['pageSize'] = pageSize;
+        this.doSearch(params);
+
+        // this.setState({
+        //     pageNo,
+        //         pageSize
+        // })
+    }
+
+
+    render() {
+        const {ltmplConfigRes} = this.state;
+        const {location, params} = this.props;
+        const {sourceId} = params;
+        //let menuId = undefined;
+        let mainCode = undefined;
+
+        let search = location.search;
+        let criteriaData = Units.transQueryStrToParams(search);
+        // if (search.indexOf('menuId') > 0) {
+        //     menuId = criteriaData['menuId'];
+        //     criteriaData['menuId'] = undefined;
+        // } else {
+        //     menuId = sourceId;
+        // }
+        let pageSize = criteriaData['pageSize'];
+        let pageNo = criteriaData['pageNo'];
+
+        if (search.indexOf('mainCode') > 0) {
+            //criteriaData = Units.transQueryStrToParams(search);
+            mainCode = criteriaData['mainCode'];
+        }
+        if (!ltmplConfigRes) {
+            return <></>;
+        } else {
+            return <ActTable serverKey={null} pageSize={pageSize} pageNo={pageNo} onChangePage={this.onChangePage}
+                             menuId={this.getMenuId()} mainCode={mainCode} showView={this.showView}
+                             doSearch={this.onChangeSearch} doEdit={this.doEdit} doCreate={this.doCreate}
+                             sourceId={sourceId} criteriaData={criteriaData}
+                             ltmplConfig={ltmplConfigRes?ltmplConfigRes.ltmplConfig:null}
+                             doRAction={this.doRAction}
+            />
+        }
+
+    }
+}
+
+export default withRouter(TtmplRoute);
+

package/src/aldehyde/tmpl/interface.tsx

@@ -84,7 +84,7 @@ export interface Level2Menu extends MenuBase {
     displayTotal?: boolean;
     count?:number;
     defaultCriteriaValue?:object,
-    pageType:'列表'|'详情'|'编辑'|'添加'|'编辑或添加'
+    pageType:'列表'|'详情'|'编辑'|'添加'|'编辑或添加'|'树'
 }
 
 export interface Level1Menu extends MenuBase {
@@ -200,6 +200,12 @@ export interface LtmplConfigRes {
     ltmplConfig?: LtmplConfig;
 }
 
+export interface TtmplConfigRes {
+    sourceId: string;
+    ltmplConfig?: LtmplConfig;
+    parentLtmplConfig?: LtmplConfig;
+}
+
 // export interface StatViewConfig extends SelectConfig {
 //
 //     // reStat query analysis

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

@@ -0,0 +1,111 @@
+// import React from 'react'
+// import {Col, Empty, Layout, Row, Tabs, Button, Affix, Space, Card, Typography} from 'antd';
+// import ModelService from "../utils/modelService";
+// import {DndProvider} from 'react-dnd';
+// import {HTML5Backend} from 'react-dnd-html5-backend';
+// import TmplTree from "../tree/module-group-tree";
+// import './index.css';
+// import {DtmplEditCard, DtmplEditPage} from "aldehyde";
+// import HydrogenConstant from "../hydrogen-constant";
+// const {Content, Sider} = Layout;
+// const {Text, Title} = Typography
+// interface PageConfigProps {
+//
+// }
+//
+// interface PageConfigState {
+//     pageCode: string,
+//     moduleCode:string,
+//     moduleType: string,
+//     moduleName:string,
+//     titleClickedKey: string | number,
+//     activeKey: string,
+//     pageSearchValue:string,
+//     menuSearchValue:string,
+// }
+//
+// export default class ActTree extends React.PureComponent<PageConfigProps, PageConfigState> {
+//
+//     static defaultProps = {}
+//     state = {
+//         pageCode: undefined,
+//         moduleCode:undefined,
+//         moduleType: undefined,
+//         moduleName:undefined,
+//         currentPage: "workbench",
+//         titleClickedKey: undefined,
+//         activeKey: "menu-config",
+//         pageSearchValue:undefined,
+//         menuSearchValue:undefined,
+//
+//     }
+//
+//     refGtmplTree:any=React.createRef();
+//
+//     async componentDidMount() {
+//     }
+//
+//     onChangeModule=(moduleCode:string,pageCode:string)=>{
+//         this.setState({moduleCode,pageCode})
+//     }
+//
+//
+//     componentDidUpdate(preProps){
+//
+//     }
+//
+//     getGtmplRatmplSourceId=(moduleType:string)=>{
+//         return  moduleType=='SQL统计模型'?HydrogenConstant.moduleGstmplRatmpl.sourceId:moduleType=='SQL查询模型'?HydrogenConstant.moduleGqtmplRatmpl.sourceId: HydrogenConstant.moduleGtmplRatmpl.sourceId;
+//     }
+//
+//     render() {
+//         const {} = this.props;
+//         const {titleClickedKey,pageSearchValue,menuSearchValue,moduleType,moduleCode,pageCode,moduleName} = this.state;
+//         return (<Layout hasSider style={{backgroundColor: '#fff'}}>
+//             <DndProvider backend={HTML5Backend}>
+//                 <Sider width={360} theme={'light'}
+//                        style={{
+//                            height: '100vh',
+//                            position: 'fixed',
+//                            left: 0,
+//                            top: 0,
+//                            bottom: 0,
+//                            marginLeft:184
+//                        }}
+//                 >
+//                     <div style={{height: 30, margin: 16, background: 'rgba(0, 0, 0, 0.2)'}}/>
+//                     <TmplTree
+//                         onChangeSearchValue={(pageSearchValue)=>this.setState({pageSearchValue})}
+//                         searchValue={pageSearchValue}
+//                         onEditPage={(moduleCode,moduleName,moduleType,pageCode)=>this.setState({
+//                         moduleCode,moduleType,pageCode,moduleName
+//                     })}
+//                                      ref={this.refGtmplTree}
+//                                      draggable={false}></TmplTree>
+//                 </Sider>
+//                 <Layout style={{marginLeft:382, backgroundColor: '#fff'}}>
+//                     <Content style={{overflow: 'initial'}}>
+//                         {moduleType? <DtmplEditCard title={<>{pageCode?"编辑 页面":"添加 页面"} - {'当前模块：'+moduleName}</>}
+//                                        mainCode={moduleCode}
+//                                        sourceId={this.getGtmplRatmplSourceId(moduleType)}
+//                                        code={pageCode} onOk={(pageCode)=>{this.refGtmplTree?.current?.refresh();
+//                                             this.setState({pageCode})
+//                                        }}
+//                                        />:
+//                         <Card style={{marginTop:14}} bodyStyle={{padding: '12px 6px 6px 6px'}}>
+//                             <Space direction="vertical">
+//                                 <Title level={5}>【页面定义】使用说明</Title>
+//                                 <span><Text
+//                                     type="danger">1.模型生成页面：</Text><Text>鼠标悬停在【模型节点】的【名称】上，点击气泡卡片的【同步默认页面】按钮。</Text></span>
+//                                 <span><Text
+//                                     type="danger">2.创建页面：</Text><Text>鼠标悬停在【模型节点】的【名称】上，点击气泡卡片的【+创建页面】按钮,填写并保存右边弹出的抽屉页面。</Text></span>
+//                                 <span><Text
+//                                     type="danger">3.复制页面：</Text><Text>鼠标悬停在【页面节点】的【名称】上，点击气泡卡片的【复制】按钮。</Text></span>
+//                             </Space>
+//                         </Card>}
+//                     </Content>
+//                 </Layout>
+//             </DndProvider>
+//         </Layout>)
+//     }
+// }