aldehyde 0.2.5 → 0.2.7

package/src/aldehyde/units/index.tsx

@@ -1,16 +1,17 @@
 import React from 'react'
 import {Radio, Select} from 'antd'
-import Axios from "axios";
 import Logo from "./logo.png";
 import {DtmplConfig, DtmplData, EnumItem} from "../tmpl/interface";
 import HCDataSource from "../tmpl/hc-data-source";
 import dayjs from "dayjs";
 import TmplConfigAnalysis from "../tmpl/tmpl-config-analysis";
+import ProgramConfigJson from "../../../public/programConfig.json";
+import Axios from "axios";
 
 const Option = Select.Option;
 
-let api = undefined;
-let programCode = undefined;
+// let api = undefined;
+// let programCode = undefined;
 let programName = undefined;
 let programName_sub = undefined;
 let programName_NavLeft = undefined;
@@ -25,18 +26,6 @@ const AppDtmplConfigFuncMap = {}
 
 const CUSTOM_EDIT_CONTROL_MAP = {}
 
-//加载本地配置
-Axios.create().get('programConfig.json').then((result) => {
-    window.localStorage['programName'] = result.data.programName
-    window.localStorage['hydrocarbonServer'] = result.data.hydrocarbonServer
-    window.localStorage['programName_NavLeft'] = result.data.programName_NavLeft
-    window.localStorage['programName_sub'] = result.data.programName_sub
-    window.localStorage['programName_Logo'] = result.data.programName_Logo
-    window.localStorage['programCode'] = result.data.programCode
-}).catch((error) => {
-    console.log(error)
-});
-
 export default {
 
     //静态补充
@@ -57,31 +46,61 @@ export default {
         return false;
     },
 
-    setCustomPage(key: string, name: object) {
+    setCustomPage(key_: string, name: object) {
+        let key=key_;
+        if(!key.startsWith("/")){
+            key="/"+key;
+        }
         CUSTOM_PAGE_MAP[key] = name;
     },
-    setCustomControl(key: string, view: object, edit: object) {
+    setCustomControl(key_: string, view: object, edit: object) {
+        let key=key_;
+        if(!key.startsWith("/")){
+            key="/"+key;
+        }
         CUSTOM_VIEW_CONTROL_MAP[key] = view;
         CUSTOM_EDIT_CONTROL_MAP[key] = edit;
     },
     getCustomViewControl(key: string) {
-        return CUSTOM_VIEW_CONTROL_MAP[key];
+        if(!key){
+            return null;
+        }
+        if(!key.startsWith("/")){
+            return CUSTOM_VIEW_CONTROL_MAP["/"+key];
+        }else{
+            return CUSTOM_VIEW_CONTROL_MAP[key];
+        }
 
     },
     getCustomEditControl(key: string) {
-        return CUSTOM_EDIT_CONTROL_MAP[key];
+        if(!key){
+            return null;
+        }
+        if(!key.startsWith("/")){
+            return CUSTOM_EDIT_CONTROL_MAP["/"+key];
+        }else {
+            return CUSTOM_EDIT_CONTROL_MAP[key];
+        }
     },
     getCustomPage(key: string) {
-        return CUSTOM_PAGE_MAP[key];
+        if(!key){
+            return null;
+        }
+        if(!key.startsWith("/")){
+            return CUSTOM_PAGE_MAP["/"+key];
+        }else{
+            return CUSTOM_PAGE_MAP[key];
+        }
+
     },
     setHydrocarbonServer(url: string) {
-        api = url;
+        window.localStorage.setItem('hydrocarbonServer', url);
     },
     setProgramName_Logo(logo1: String) {
         logo = logo1;
     },
     api() {
-        let appi: string = window.localStorage['hydrocarbonServer'] ? window.localStorage['hydrocarbonServer'] : api;
+        let appi: string = window.localStorage.getItem('hydrocarbonServer');
         if (!appi) {
             appi = new URL(window.location.href).origin;
             //console.log('Hydrcarbon API:',api);
@@ -92,10 +111,34 @@ export default {
         return appi;
     },
     setProgramCode(programCode_: string) {
-        programCode = programCode_;
+        window.localStorage.setItem('programCode',programCode_);
+        window.sessionStorage.setItem('programCode',programCode_);
+    },
+    setSessionProgramCode(programCode_: string) {
+        window.sessionStorage.setItem('programCode',programCode_);
     },
     programCode() {
-        return window.localStorage['programCode'] ? window.localStorage['programCode'] : programCode
+        let programCode=window.sessionStorage.getItem('programCode');
+        if(!programCode){
+             programCode=window.localStorage.getItem('programCode');
+             this.setSessionProgramCode(programCode);
+        }
+        return programCode;
+    },
+    hydrocarbonToken(){
+        let hydrocarbonToken=window.sessionStorage.getItem('hydrocarbonToken');
+        if(!hydrocarbonToken){
+            hydrocarbonToken=window.localStorage.getItem('hydrocarbonToken');
+            this.setSessionHydrocarbonToken(hydrocarbonToken);
+        }
+        return hydrocarbonToken;
+    },
+    setHydrocarbonToken(token:string){
+         window.sessionStorage.setItem('hydrocarbonToken',token) ;
+         window.localStorage.setItem('hydrocarbonToken',token);
+    },
+    setSessionHydrocarbonToken(token:string){
+        window.sessionStorage.setItem('hydrocarbonToken',token) ;
     },
     setProgramName(programName_: string) {
         programName = programName_;
@@ -176,10 +219,10 @@ export default {
     //         message.error(e)
     //     }
     // },
-    openFile(url, fileName,toolbar) {
+    openFile(url, fileName, toolbar) {
         try {
             let a = document.createElement("a");
-            a.href = url+toolbar;
+            a.href = url + toolbar;
             a.target = "_blank";
             document.body.appendChild(a);
             a.click();
@@ -190,7 +233,7 @@ export default {
     },
     toLogin() {
         let programCode = this.programCode();
-        if (programCode) {
+        if (programCode && programCode!="null" && programCode!="undefined" ) {
             window.location.hash = "#/login/" + programCode;
         } else {
             window.location.hash = "#/login";
@@ -298,7 +341,7 @@ export default {
     getAnoHydrocarbonToken() {
         let token = this.getLocalStorge("anoHydrocarbonToken");
         if (!token) {
-            token="tmpl" + this.getRandomNum(6);
+            token = "tmpl" + this.getRandomNum(6);
             this.setLocalStorge("anoHydrocarbonToken", token);
         }
         return token;

package/src/aldehyde/welcome/HCWelcome.js

@@ -8,8 +8,6 @@ import TimePrograss from './img/time-prograss.png';
 import PainPoint from './img/pain-point.png';
 import Target from './img/target.png';
 import Development from './img/development.png';
-import LtmplPage from "../module/ltmpl-page";
-import { UnorderedListOutlined } from '@ant-design/icons';
 
 export default class HCWelcome extends React.Component {
     state = {}

package/lib/module/ltmpl-page.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ltmpl-page.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/module/ltmpl-page.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,EAAC,SAAS,EAAC,MAAM,OAAO,CAAA;AACrC,OAAO,EAAC,WAAW,EAAa,cAAc,EAAC,MAAM,mBAAmB,CAAC;AAEzE,OAAgB,EAAC,IAAI,EAAC,MAAM,oBAAoB,CAAA;AAShD,MAAM,WAAW,cAAc;IAC3B,QAAQ,EAAC,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAC,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAC,YAAY,CAAC,EAAC,OAAO,KAAK,IAAI,CAAC;IACxD,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAC,MAAI,IAAI,KAAK,IAAI,CAAC;IACvC,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAC,IAAI,EAAC,WAAW,EAAC,QAAQ,EAAC,MAAI,IAAI,KAAK,IAAI,CAAC;IACnE,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,SAAS,CAAC,EAAC,CAAC,SAAS,EAAC,MAAM,EAAC,QAAQ,EAAC,MAAM,KAAG,IAAI,CAAC;IACpD,QAAQ,CAAC,EAAC,IAAI,CAAC;IACf,KAAK,CAAC,EAAC,SAAS,CAAC;IACjB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAC,OAAO,CAAC;CACzB;AAED,MAAM,WAAW,cAAc;IAC3B,cAAc,EAAC,cAAc,CAAC;IAC9B,YAAY,EAAC,MAAM,CAAC;IACpB,aAAa,EAAC,OAAO,CAAC;IACtB,YAAY,EAAC,MAAM,CAAC;IACpB,aAAa,EAAC,OAAO,CAAC;IACtB,QAAQ,EAAC,OAAO,CAAC;IACjB,SAAS,EAAC,MAAM,CAAC;IACjB,QAAQ,EAAC,OAAO,CAAC;CACpB;AAED,cAAM,SAAU,SAAQ,KAAK,CAAC,aAAa,CAAC,cAAc,EAAE,cAAc,CAAC;IAEvE,KAAK;;;;;;;;;MASJ;IAED,MAAM,CAAC,YAAY;;;MAGlB;IAEK,iBAAiB;IAWjB,kBAAkB,CAAC,SAAS,KAAA;IASlC,eAAe,sBAcd;IACD,cAAc,WAAY,MAAM,QAS/B;IAED,QAAQ,SAAU,MAAM,UAKvB;IAED,MAAM,SAAU,MAAM,QAAM,WAAW,iBAAe,OAAO,UAY5D;IACD,SAAS,cAAc,MAAM,YAAU,MAAM,UAM5C;IACD,QAAQ,8BAYP;IACD,WAAW,aAIV;IAED,QAAQ,yBAgBP;IAED,eAAe,SAAW,MAAM,UAK/B;IAGD,MAAM;CAwDT;AAED,eAAe,SAAS,CAAC"}

package/lib/module/ltmpl-page.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ltmpl-page.js","sourceRoot":"","sources":["../../../../src/aldehyde/module/ltmpl-page.tsx"],"names":[],"mappings":"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"}

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

@@ -1,233 +0,0 @@
-import React,{ReactNode} from 'react'
-import {AddOrUpdate, DtmplData, 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";
-
-//以列表为入口的，页面内列表，基本原则是所有交互在页面内完成，不会触发路由。
-
-export interface LtmplPageProps  {
-    sourceId:string,
-    mainCode?:string;
-    showView?: (code: string,toCustomPage?:boolean) => void,
-    doCreate?: (handleOk:()=>void) => void,
-    doEdit?: (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 LtmplPageState  {
-    ltmplConfigRes:LtmplConfigRes;
-    criteriaData:object;
-    showDtmplView:boolean;
-    selectedCode:string;
-    showDtmplEdit:boolean;
-    showDraw:boolean;
-    ractionId:string,
-    collapse:boolean,
-};
-
-class LtmplPage extends React.PureComponent<LtmplPageProps, LtmplPageState> {
-
-    state = {
-        ltmplConfigRes: undefined,
-        criteriaData:undefined,
-        showDtmplView:false,
-        showDtmplEdit: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 {doEdit}=this.props
-        if(toCustomPage && doEdit){
-            doEdit(code,mode,()=>{
-                this.doSearch(this.state.criteriaData);
-            });
-        }else{
-            this.setState({
-                selectedCode:code,
-                showDtmplEdit:true,
-            })
-        }
-    }
-    doRAction = (ractionId:string,mainCode:string) => {
-        this.setState({
-            selectedCode:mainCode,
-            showDraw:true,
-            ractionId
-        })
-    }
-    doCreate = (toCustomPage) => {
-        const {doCreate}=this.props
-        if(toCustomPage && doCreate){
-            doCreate(()=>{
-                this.doSearch(this.state.criteriaData);
-            });
-        }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,ractionId,showDraw,collapse} = this.state;
-        const { sourceId,mainCode,showView,doSearch,doRAction,funcMode,title,collapsible,initCollapse} = this.props;
-
-        if (!ltmplConfigRes) {
-            return <></>;
-        } else {
-            const {buttons}=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') ?
-                    <ModalDtmplView open={showDtmplView} onCancel={()=>{
-                    this.setState({
-                        showDtmplView:false,
-                    })}
-                    }                mainCode={mainCode}
-                                    sourceId={sourceId}
-                                    code={selectedCode}> </ModalDtmplView> : ""}
-                {buttons.includes('dtmplEdit') || buttons.includes('dtmplAdd') ?
-                    <DtmplEditPage open={showDtmplEdit} onCancel={()=>{
-                        this.setState({
-                            showDtmplEdit:false,
-                        })}}
-                                   sourceId={sourceId}
-                                   mainCode={mainCode}
-                                   code={selectedCode}
-                                   onOk={this.handleDtmplEdit}  />
-                    : ""}
-                <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>
-                    }
-                >
-                    {
-                        <LtmplPage  sourceId={ractionId} mainCode={selectedCode}></LtmplPage>
-                    }
-                </Drawer>
-              </>
-        }
-
-    }
-}
-
-export default LtmplPage;
-