aldehyde 0.2.5 → 0.2.7

package/src/aldehyde/custom-page/dtmpl-custom-edit-modal-page.tsx

@@ -0,0 +1,72 @@
+import React, {ReactNode} from 'react';
+import {Button, Drawer, Modal, Popconfirm, Space} from 'antd'
+import DefCustomPage from "./def-custom-page";
+import {ProgramConfig} from "../index";
+
+interface DtmplCustomEditModalPageProps {
+    height?: any,
+    width?: number,
+    open: boolean,
+    onOk: () => void,
+    title?: ReactNode,
+    code?: string,//详情模板code，添加时code为null
+    mainCode?: string,//模块名称
+    sourceId: string,
+    customPath: string,
+}
+
+interface DtmplCustomEditModalPageState {
+
+}
+
+export default class DtmplCustomEditModalPage extends React.PureComponent<DtmplCustomEditModalPageProps, DtmplCustomEditModalPageState> {
+    state = {}
+
+    static defaultProps = {
+        height: 500,
+        width:1250,
+        forceRender: true,
+        style: {maxWidth: 'calc(100vw - 60px)', maxHeight: 'calc(100vh - 50px)'},
+    }
+
+    getFooter=()=>{
+        const {onOk}=this.props;
+        const footerButtons = [];
+        footerButtons.unshift(
+            <Button onClick={onOk}  type={'primary'} >
+                关 闭
+            </Button>)
+        return footerButtons;
+    }
+
+    customPage = () => {
+        const {code, sourceId, open, mainCode, customPath} = this.props
+        if (open) {
+            let Page = ProgramConfig.getCustomPage(customPath) || DefCustomPage;
+            return React.createElement(Page, {code, sourceId, mainCode,pageName:customPath});
+        }
+    }
+
+    render() {
+        const {height, onOk, open,  width, title} = this.props
+
+        return (<Modal
+                open={open}
+                width={width}
+                title={title}
+                bodyStyle={{height: height, overflow: 'auto'}}
+                destroyOnClose={true}
+                centered
+                onCancel={onOk}
+                footer={null
+                }
+            >
+                {
+                    this.customPage()
+                }
+            </Modal>
+        )
+
+    }
+
+}

package/src/aldehyde/exportor/export-frame.tsx

@@ -134,7 +134,7 @@ export default class ExportFrame extends React.PureComponent<ExportFrameProps, E
     download=()=>{
         const {title}=this.props;
         const {exportId}=this.state;
-        const hydrocarbonToken=Units.getLocalStorge("hydrocarbonToken")
+        const hydrocarbonToken=Units.hydrocarbonToken();
         Units.downloadFile(Units.joinPath(Units.api(),`/v3/exporter/excel?exportId=${exportId}&@token=${hydrocarbonToken}&@programToken=${Units.programCode()}`),title)
     }
 

package/src/aldehyde/index.tsx

@@ -23,6 +23,7 @@ import React from "react";
 
 import L2MenuMessageBar from './layout/menu/l2menu-message-bar';
 import L2MenuQuickBar  from './layout/menu/l2menu-quick-bar';
+import Axios from "axios";
 
 const Loading = <Spin tip="Loading...">
     {/*<Alert*/}
@@ -60,8 +61,10 @@ const DtmplEditCard = loadable(() =>
 const DtmplEdit = loadable(() =>
     import("./detail/edit/dtmpl-edit"), {fallback: Loading});
 // import LtmplPage from './module/ltmpl-page';
-const LtmplPage = loadable(() =>
-    import("./module/ltmpl-page"), {fallback: Loading});
+const LtmplTable = loadable(() =>
+    import("./module/ltmpl-table"), {fallback: Loading});
+const LtmplDrawPage = loadable(() =>
+    import("./module/ltmpl-draw-page"), {fallback: Loading});
 
 //import Menu2layers from './layout/menu/menu-2layers';
 const Menu2layers = loadable(() =>
@@ -89,9 +92,33 @@ const HCCustomPageRouter = loadable(() =>
 const DtmplEditPage = loadable(() =>
     import("./detail/edit/dtmpl-edit-page"), {fallback: Loading});
 
+//加载本地配置
+Axios.create().get('programConfig.json').then((result) => {
 
+    ProgramConfig.setHydrocarbonServer(result.data.hydrocarbonServer);
+    if(result.data.programCode){
+        ProgramConfig.setProgramCode(result.data.programCode);
+    }
 
-export {ActTable,SelectTable,Loginit,DtmplRoute,ImportRoute,LtmplRoute,DtmplViewCard,LtmplPage,Menu2layers,Block,UserBar,
+    window.localStorage.setItem('programName', result.data.programName);
+    window.localStorage.setItem('programName_NavLeft', result.data.programName_NavLeft);
+    window.localStorage.setItem('programName_sub', result.data.programName_sub);
+    window.localStorage.setItem('programName_Logo', result.data.programName_Logo);
+
+    // window.sessionStorage.setItem('programName', result.data.programName);
+    // //window.sessionStorage.setItem('hydrocarbonServer', result.data.hydrocarbonServer);
+    // window.sessionStorage.setItem('programName_NavLeft', result.data.programName_NavLeft);
+    // window.sessionStorage.setItem('programName_sub', result.data.programName_sub);
+    // window.sessionStorage.setItem('programName_Logo', result.data.programName_Logo);
+    // window.sessionStorage.setItem('programCode', result.data.programCode);
+
+}).catch((error) => {
+    console.log(error)
+});
+
+
+
+export {ActTable,SelectTable,Loginit,DtmplRoute,ImportRoute,LtmplRoute,DtmplViewCard,LtmplDrawPage,LtmplTable,Menu2layers,Block,UserBar,
     ResetPassword,Footer,EntryControl,ViewControl,ProgramConfig,HydrocarbonService,QuickEntrance,Workbench,PopoverEntitySelect,DtmplEditCard
 ,DatePicker,DtmplEditPage,TmplInterface,TmplDataSource,Superagent,DtmplEdit,HCWelcome,MainPage,ExcelImportRoute,CustomPageRouter,HCCustomPageRouter,L2MenuMessageBar,L2MenuQuickBar,ContextSetter,}
 

package/src/aldehyde/layout/menu/l2menu-quick-bar.tsx

@@ -5,7 +5,7 @@ import 'antd/dist/reset.css';
 import {Level2Menu} from "../../tmpl/interface";
 // import HcserviceV3 from '../../tmpl/hcservice-v3'
 import HCDataSource from '../../tmpl/hc-data-source'
-import LtmplPage from "../../module/ltmpl-page";
+import LtmplTable from "../../module/ltmpl-table";
 
 interface L2MenuQuickBarProps {
 
@@ -122,7 +122,7 @@ class L2MenuQuickBar extends React.PureComponent<L2MenuQuickBarProps, L2MenuQuic
                         </Space>
                     }
                 >
-                   <LtmplPage  sourceId={currentId}></LtmplPage>
+                   <LtmplTable sourceId={currentId}></LtmplTable>
                 </Drawer>
             </>
         );

package/src/aldehyde/login/login.js

@@ -3,6 +3,7 @@ import './index.css'
 import {Button, Col, Form, Input, Row} from 'antd'
 import {LockOutlined, SafetyCertificateOutlined, UserOutlined} from '@ant-design/icons';
 import HCserviceV3 from "../tmpl/hcservice-v3"
+import Units from "../units";
 
 export default class Loginit extends React.Component {
     state = {
@@ -19,7 +20,7 @@ export default class Loginit extends React.Component {
         if (this.props && this.props.match && this.props.match.params) {
             const {programCode} = this.props.match.params;
             if (programCode) {
-                window.localStorage['programCode'] = programCode;
+                Units.setProgramCode(programCode);
             }
         }
         let pubkey = await HCserviceV3.getRasPubkey();

package/src/aldehyde/module/ltmpl-draw-page.tsx

@@ -0,0 +1,60 @@
+import React, {ReactNode} from 'react';
+import {Drawer} from 'antd'
+import LtmplTable, {LtmplTableProps} from "./ltmpl-table";
+
+
+interface LtmplDrawPageProps extends LtmplTableProps {
+    onCancel: () => void,
+    placement?:'top' | 'right' | 'bottom' | 'left',
+    title?:ReactNode,
+    width?:number,
+    open:boolean,
+}
+
+interface LtmplDrawPageState {
+
+}
+
+export default class LtmplDrawPage extends React.PureComponent<LtmplDrawPageProps, LtmplDrawPageState> {
+
+    static defaultProps = {
+        showConfirm: true,
+        height: 500,
+        width:1250,
+        forceRender: true,
+        style: {maxWidth: 'calc(100vw - 60px)', maxHeight: 'calc(100vh - 50px)'},
+        okText: "确定",
+        cancelText: "取消",
+        pageType:'modal',
+        placement:'left',
+    }
+    state = {
+
+    }
+
+
+    render() {
+        const {title,placement,width,onCancel,open,...other} = this.props
+
+        return (<Drawer
+                title={title}
+                placement={placement}
+                closable={true}
+                mask={false}
+                onClose={onCancel}
+                open={open}
+                width={width}
+                style={{
+                    maxWidth: 1960,
+                }}
+                // extra={
+                //     <Space>{this.getFooter()}</Space>
+                // }
+            >
+                <LtmplTable {...other}></LtmplTable>
+        </Drawer>
+    )
+
+    }
+
+}

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

@@ -0,0 +1,262 @@
+import React, {ReactNode} from 'react'
+import {AddOrUpdate, LtmplConfigRes} from '../tmpl/interface';
+import Units from "../units";
+import ActTable, {Mode} from '../table/act-table'
+// import StatActTable from '../table/stat-act-table'
+import HCDataSource from "../tmpl/hc-data-source";
+import ModalDtmplView from "../detail/view/modal-dtmpl-view";
+import DtmplEditPage from "../detail/edit/dtmpl-edit-page";
+import {Button, Drawer, Space} from "antd";
+import DtmplCustomEditModalPage from "../custom-page/dtmpl-custom-edit-modal-page";
+
+//以列表为入口的，页面内列表，基本原则是所有交互在页面内完成，不会触发路由。
+
+export interface LtmplTableProps {
+    sourceId: string,
+    mainCode?: string;
+    showView?: (code: string, toCustomPage?: boolean) => void,
+    doCustomCreate?: (handleOk: () => void) => void,
+    doCustomEdit?: (code: string, mode: AddOrUpdate, handleOk: () => void) => void,
+    doSearch?: (params: object) => void,
+    doRAction?: (ractionId: string, mainCode: string) => void,
+    funcMode?: Mode,
+    title?: ReactNode,
+    collapsible?: boolean,
+    initCollapse?: boolean,
+};
+
+export interface LtmplTableState {
+    ltmplConfigRes: LtmplConfigRes;
+    criteriaData: object;
+    showDtmplView: boolean;
+    selectedCode: string;
+    showDtmplEdit: boolean;
+    showDraw: boolean;
+    showDtmplCustomEdit: boolean;
+    ractionId: string,
+    collapse: boolean,
+};
+
+class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
+
+    state = {
+        ltmplConfigRes: undefined,
+        criteriaData: undefined,
+        showDtmplView: false,
+        showDtmplEdit: false,
+        showDtmplCustomEdit: false,
+        selectedCode: undefined,
+        showDraw: false,
+        ractionId: undefined,
+        collapse: false,
+    }
+
+    static defaultProps = {
+        collapsible: false,
+        initCollapse: false,
+    }
+
+    async componentDidMount() {
+        this.loadLtmplConfig();
+        const {collapsible, initCollapse} = this.props;
+        if (collapsible) {
+            this.setState({
+                collapse: initCollapse
+            })
+        }
+    }
+
+    async componentDidUpdate(prevProps) {
+        const {sourceId, mainCode} = this.props;
+        if (!prevProps || prevProps.sourceId != sourceId) {
+            this.loadLtmplConfig();
+        } else if (mainCode && prevProps.mainCode != mainCode) {//此处处理有效，但不高效
+            this.loadLtmplConfig();
+        }
+    }
+
+    loadLtmplConfig = async () => {
+        const {sourceId} = this.props;
+        let ltmplConfigRes: LtmplConfigRes = await HCDataSource.requestLtmplConfig(sourceId);
+        let criteriaData;
+        //提取 过滤条件的默认值
+        if (ltmplConfigRes) {
+            let defaultCriteriaValue = ltmplConfigRes.ltmplConfig.defaultCriteriaValue;
+            if (defaultCriteriaValue) {
+                criteriaData = this.toCriteriaData(defaultCriteriaValue);
+            }
+        }
+        this.setState({
+            ltmplConfigRes, criteriaData
+        })
+    }
+    toCriteriaData = (values: object) => {
+        let criteriaData = {};
+        if (values) {
+            for (let key in values) {
+                criteriaData[key] = Units.configParamTrans(values[key]);
+            }
+        }
+        criteriaData['sequence'] = Units.getRandomNum(6);
+        return criteriaData;
+    }
+
+    showView = (code: string) => {
+        this.setState({
+            selectedCode: code,
+            showDtmplView: true,
+        })
+    }
+
+    doEdit = (code: string, mode: AddOrUpdate, toCustomPage?: boolean) => {
+        const {doCustomEdit} = this.props
+        if (toCustomPage) {
+            if (doCustomEdit) {
+                doCustomEdit(code, mode, () => {
+                    this.doSearch(this.state.criteriaData);
+                });
+            } else {
+                this.setState({
+                    selectedCode: code,
+                    showDtmplCustomEdit: true,
+                })
+            }
+        } else {
+            this.setState({
+                selectedCode: code,
+                showDtmplEdit: true,
+            })
+        }
+    }
+    doRAction = (ractionId: string, mainCode: string) => {
+        this.setState({
+            selectedCode: mainCode,
+            showDraw: true,
+            ractionId
+        })
+    }
+    doCreate = (toCustomPage) => {
+        const {doCustomCreate} = this.props
+        if (toCustomPage) {
+            if (doCustomCreate) {
+                doCustomCreate(() => {
+                    this.doSearch(this.state.criteriaData);
+                });
+            } else {
+                this.setState({
+                    selectedCode: null,
+                    showDtmplCustomEdit: true,
+                })
+            }
+        } else {
+            this.setState({
+                selectedCode: null,
+                showDtmplEdit: true,
+            })
+        }
+    }
+    closeDrawer = () => {
+        this.setState({
+            showDraw: false,
+        })
+    }
+
+    doSearch = (params_) => {
+        const {sourceId, mainCode, collapsible} = this.props;
+        let params = {...params_}
+        //追加过滤条件，hiddenColIds，innerQueryKey
+        if (mainCode) {
+            params['mainCode'] = mainCode;
+        }
+        params['sourceId'] = sourceId;
+        if (collapsible) {
+            this.setState({
+                collapse: false,
+            });
+        }
+        this.setState({
+            criteriaData: this.toCriteriaData(params)
+        });
+    }
+
+    handleDtmplEdit = (code: string) => {
+        this.doSearch(this.state.criteriaData);
+        this.setState({
+            showDtmplEdit: false,
+        })
+    }
+
+
+    render() {
+        const {ltmplConfigRes, criteriaData, showDtmplView, selectedCode, showDtmplEdit, showDtmplCustomEdit, ractionId, showDraw, collapse} = this.state;
+        const {sourceId, mainCode, showView, doSearch, doRAction, funcMode, title, collapsible, initCollapse} = this.props;
+
+        if (!ltmplConfigRes) {
+            return <></>;
+        } else {
+            const {buttons,customEditPagePath} = ltmplConfigRes.ltmplConfig
+            return <>
+                <ActTable collapsible={collapsible} initCollapse={initCollapse && collapse} title={title}
+                          funcMode={funcMode} mainCode={mainCode} showView={showView ? showView : this.showView}
+                          doRAction={doRAction ? doRAction : this.doRAction}
+                          doSearch={doSearch ? doSearch : this.doSearch} doEdit={this.doEdit} doCreate={this.doCreate}
+                          sourceId={sourceId} criteriaData={criteriaData}
+                          ltmplConfig={ltmplConfigRes.ltmplConfig}/>
+                {buttons.includes('detail') && showDtmplView ?
+                    <ModalDtmplView open={showDtmplView} onCancel={() => {
+                        this.setState({
+                            showDtmplView: false,
+                        })
+                    }
+                    } mainCode={mainCode}
+                                    sourceId={sourceId}
+                                    code={selectedCode}> </ModalDtmplView> : ""}
+                {(buttons.includes('dtmplEdit') || buttons.includes('dtmplAdd')) && showDtmplEdit ?
+                    <DtmplEditPage open={showDtmplEdit} onCancel={() => {
+                        this.setState({
+                            showDtmplEdit: false,
+                        })
+                    }}
+                                   sourceId={sourceId}
+                                   mainCode={mainCode}
+                                   code={selectedCode}
+                                   onOk={this.handleDtmplEdit}/>
+                    : ""}
+                {showDtmplCustomEdit ?
+                    <DtmplCustomEditModalPage open={showDtmplCustomEdit} onOk={() => {
+                        this.doSearch(this.state.criteriaData)
+                        this.setState({
+                            showDtmplCustomEdit: false,
+                        })
+                    }} customPath={customEditPagePath} sourceId={sourceId} mainCode={mainCode}
+                     code={selectedCode}/>
+                    : ""}
+                <Drawer
+                    placement={'left'}
+                    title="关联查询"
+                    closable={true}
+                    mask={false}
+                    onClose={this.closeDrawer}
+                    open={showDraw}
+                    width={'calc(100% - 280px)'}
+                    style={{
+                        maxWidth: 1960,
+                    }}
+                    extra={
+                        <Space>
+                            <Button onClick={this.closeDrawer}>关闭</Button>
+                        </Space>
+                    }
+                >
+                    {
+                        <LtmplTable sourceId={ractionId} mainCode={selectedCode}></LtmplTable>
+                    }
+                </Drawer>
+            </>
+        }
+
+    }
+}
+
+export default LtmplTable;
+

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

@@ -493,8 +493,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         let result = await HcserviceV3.postJumps(jumpId, code);
 
         if (result.status === "success") {
-            let hydrocarbonToken = Units.getLocalStorge("hydrocarbonToken");
-            let url = result.url + "hydrocarbon_token=" + Units.getLocalStorge("hydrocarbonToken");
+            let hydrocarbonToken = Units.hydrocarbonToken();
+            let url = result.url + "hydrocarbon_token=" + Units.hydrocarbonToken();
             // console.log(url);
             window.open(url);
         }

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

@@ -470,7 +470,7 @@ export default class HcserviceV3 {
     }
 
     static downloadDetailExcel(sourceId, entityCode) {
-        const hydrocarbonToken = Units.getLocalStorge("hydrocarbonToken")
+        const hydrocarbonToken = Units.hydrocarbonToken();
         let url = Units.api() + `/v3/dtmpl/excel?sourceId=${sourceId}&code=${entityCode}&@token=${hydrocarbonToken}&@programToken=${Units.programCode()}`
         Units.downloadFile(url, "详情");
     }
@@ -488,13 +488,13 @@ export default class HcserviceV3 {
     }
 
     static getFileUrl(path) {
-        const hydrocarbonToken = Units.getLocalStorge("hydrocarbonToken")
+        const hydrocarbonToken = Units.hydrocarbonToken();
         let url = Units.api() + Units.joinPath("/v3/files", path) + `?@token=${hydrocarbonToken}&@programToken=${Units.programCode()}`;
         return url;
     }
 
     static getFileTxtUrl(path) {
-        const hydrocarbonToken = Units.getLocalStorge("hydrocarbonToken")
+        const hydrocarbonToken = Units.hydrocarbonToken();
         let url = Units.api() + "/v3/files/text" + path + `?@token=${hydrocarbonToken}&@programToken=${Units.programCode()}`;
         return url;
     }
@@ -601,7 +601,7 @@ export default class HcserviceV3 {
             //window.location.hash = "#/home";
             HCDataSource.clear();
             window.location.hash = "#/context-setter";
-            Units.setLocalStorge("hydrocarbonToken", res.token)
+            Units.setHydrocarbonToken( res.token);
         }
         return res;
     }

package/src/aldehyde/tmpl/interface.tsx

@@ -127,7 +127,7 @@ export interface DtmplConfig extends TmplBase {
 
 export type Comparator = 'equal' | 'unequal' | 'includeOne' |  'exclude' | 'noLess' | 'noGreater';
 
-export type FieldAction = 'add' | 'delete' | 'edit' | 'detail';
+export type FieldAction = 'add' | 'delete' | 'edit' | 'detail'|'table';
 
 export interface FieldConfig extends FieldBase {
     disabled?: boolean;

package/src/aldehyde/tmpl/superagent.js

@@ -4,7 +4,7 @@ import Units from '../units';
 
 export default class Superagent {
     static super(options, type, load) {
-        const hydrocarbonToken = Units.getLocalStorge("hydrocarbonToken") ? Units.getLocalStorge("hydrocarbonToken")
+        const hydrocarbonToken = Units.hydrocarbonToken()? Units.hydrocarbonToken()
             : options.header && options.header.hydrocarbonToken ?
                 options.header.hydrocarbonToken : Units.getAnoHydrocarbonToken();
         const programCode = Units.programCode();
@@ -41,14 +41,14 @@ export default class Superagent {
                             loading.style.display = "none"
                         }
                         if (res.status === 200) {
-                            Units.setLocalStorge("hydrocarbonToken", hydrocarbonToken)
+                            //Units.setHydrocarbonToken("hydrocarbonToken", hydrocarbonToken)
                             let result = res.body;
                             if (result && result.status === 'error') {
                                 message.error("错误消息：" + result.message)
                             }
                             resolve(result)
                         } else if (res.status === 201) {
-                            Units.setLocalStorge("hydrocarbonToken", hydrocarbonToken)
+                            //Units.setLocalStorge("hydrocarbonToken", hydrocarbonToken)
                             resolve(res)
                         } else if (res.status === 403) {
                             //message.info("请求权限不足,可能是token已经超时")
@@ -108,7 +108,7 @@ export default class Superagent {
 
     static getHeaderObj() {
         return {
-            'hydrocarbon-token': Units.getLocalStorge("hydrocarbonToken") ? Units.getLocalStorge("hydrocarbonToken") : Units.getAnoHydrocarbonToken(),
+            'hydrocarbon-token': Units.hydrocarbonToken() ?Units.hydrocarbonToken() : Units.getAnoHydrocarbonToken(),
             'hydrocarbon-program-token': Units.programCode()
         }
 

package/src/aldehyde/units/config-loader.tsx

@@ -0,0 +1,6 @@
+import React from 'react'
+import Axios from "axios";
+import Units from './index'
+
+
+