aldehyde 0.2.4 → 0.2.6

package/src/aldehyde/controls/entity-select/entity-select.tsx

@@ -14,7 +14,7 @@ interface InnerEntitySelectProps extends EControlProps {
     maxSelected?: number,
     onEntityClick?: (code: string) => void,
     baseCriteria: object,
-    actions: Array<FieldAction>,
+
 };
 
 interface InnerEntitySelectState {
@@ -22,7 +22,8 @@ interface InnerEntitySelectState {
     optionCacheKey: string,
     pageNo: number,
     loading: boolean,
-    optionsCache: object;
+    optionsCache:object;
+    codeLabel:object;
     selectConfig: SelectConfig,
     showView: boolean,
     drawCode: string,
@@ -30,11 +31,12 @@ interface InnerEntitySelectState {
 };
 
 type OptionCache = {
-    queryKey: QueryKey,
-    pageInfo: PageInfo,
-    touchEnd: boolean,
-    options: any,
-    searchValue: string,
+    queryKey?: QueryKey,
+    pageInfo?: PageInfo,
+    touchEnd?: boolean,
+    options?: any,
+    searchValue?: string,
+    optionCacheKey?:string,
 }
 
 type LoadDataSource = {
@@ -55,17 +57,19 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
         pageNo: 1,
         loading: false,
         optionsCache: {},
+        codeLabel:{},
         selectConfig: undefined,
         showView: false,
         showEdit: false,
         drawCode: undefined,
     }
     dropdownRender = (menu) => {
-        const {fieldConfig, actions} = this.props;
+        const {fieldConfig}= this.props;
+        const {actions}=fieldConfig;
         // console.log("menu",menu);
         return <>
             {menu}
-            {actions && actions.indexOf('add') ?
+            {actions && actions.indexOf('add')>=0 ?
                 <>
                     <Divider style={{margin: '8px 0'}}/>
                     <Row justify="end">
@@ -102,7 +106,8 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
         if ((baseCriteria && JSON.stringify(baseCriteria) != JSON.stringify(preBaseCriteria)) || (mainCode && mainCode != preMainCode)
             || (fieldConfig && preFieldConfig && fieldConfig.id != preFieldConfig.id)) {
             this.setState({
-                optionsCache: {}
+                optionsCache: {},
+                codeLabel:{}
             })
         }
     }
@@ -115,30 +120,26 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
 
 
     toOption = (code: string, title: string, onEntityClick) => {
-        const {actions}=this.props;
+        const {fieldConfig}=this.props;
+        const {actions}=fieldConfig;
+        const {codeLabel}=this.state;
+        codeLabel[code]=title;
         let option = {
-            code: code,
-            value: code + '@R@' + title,
-            // showlabel: onEntityClick ? <Button size={'small'} style={{padding: '0px'}} type="link" title=""
-            //                                    onClick={(e) => {
-            //                                        e.stopPropagation();
-            //                                        onEntityClick(code);
-            //                                    }}>{title}
-            // </Button> : title,
+            value: code,
             label: <>
                 {title}
-                {actions && actions.indexOf("detail")  ?
+                {actions && actions.indexOf("detail")>=0  ?
                 <Button size={'small'} type={'text'}><AlignLeftOutlined style={{color: '#0958d9'}} onClick={(event) => {
                     event.stopPropagation();
                     this.showItem(code);
                 }}/></Button>:null}
 
-                {actions && actions.indexOf("edit")  ?
+                {actions && actions.indexOf("edit")>=0  ?
                 <Button size={'small'} type={'text'}><EditOutlined style={{color: '#0958d9'}} onClick={(event) => {
                     event.stopPropagation();
                     this.editItem(code);
-                }}/></Button>:null}
-
+                }}/></Button>
+                :null}
             </>,
         };
         return option;
@@ -154,10 +155,28 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
     }
 
     drawSubmited = () => {
+        this.setState({
+            optionsCache: {},
+            codeLabel:{},
+        })
         this.doClose();
     }
 
     toValueArray = (value) => {
+        let result=[];
+        let valueArray =this.toArray(value);
+        for (let v of valueArray) {
+            if (v) {
+                let vs = v.split("@R@");
+                if (vs[1] != 'null') {
+                    result.push(vs[0]);
+                }
+            }
+        }
+        return result;
+    }
+
+    toArray = (value) => {
         let valueArray: string[] = [];
         if (value instanceof Array) {
             valueArray = value;
@@ -168,16 +187,8 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
                 valueArray = [];
             }
         }
-        let result = [];
-        for (let v of valueArray) {
-            if (v) {
-                let vs = v.split("@R@");
-                if (vs[1] != 'null') {
-                    result.push(v);
-                }
-            }
-        }
-        return result;
+
+        return valueArray;
     }
 
     toOptions = (value, onEntityClick) => {
@@ -185,7 +196,7 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
         let options: object[] = [];
         //console.log('options value', value);
 
-        let valueArray: string[] = this.toValueArray(value);
+        let valueArray: string[] = this.toArray(value);
         for (let v of valueArray) {
             if (v) {
                 let vs = v.split("@R@");
@@ -200,7 +211,7 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
             fieldConfig.suppleOptions.forEach((o) => {
                 let had = false;
                 options.forEach((s) => {
-                    if (s['code'] == o.code) {
+                    if (s['value'] == o.code) {
                         had = true;
                         return;
                     }
@@ -251,7 +262,7 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
             }
             let pageInfo = {
                 pageNo: 1,
-                pageSize: 4,
+                pageSize: 6,
                 virtualEndPageNo: undefined,
             };
             titleId = selectConfig_.primaryColumn.id;
@@ -318,14 +329,20 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
     }
 
     onChange = (values: any[]) => {
+        const {codeLabel}=this.state;
+        let newValues:Array<string>=[...values];
         if (values && values.length > this.props.maxSelected) {
-            //console.log('selected value:', values);
-            let newValues = [...values];
             newValues.shift();
-            this.onChange(newValues);
-        } else {
-            this.props.onChange(values);
         }
+        let formValues:Array<string>=[];
+        newValues.forEach((c)=>{
+            if(c.indexOf("@R@")>0){
+                formValues.push(c);
+            }else{
+                formValues.push(c+"@R@"+codeLabel[c]);
+            }
+        })
+        this.props.onChange(formValues);
     }
 
     tagRender = (props: CustomTagProps) => {
@@ -388,17 +405,25 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
     }
 
     render() {
-        const {id, value, fieldConfig, onChange, disabled, style, maxSelected, onEntityClick, actions} = this.props;
+        const {id, value, fieldConfig, onChange, disabled, style, maxSelected, onEntityClick} = this.props;
+        const {actions}=fieldConfig;
         const {optionCacheKey, loading, optionsCache, drawCode, showEdit, showView} = this.state;
         let initOptions = this.toOptions(value, onEntityClick);
         let exists;
         let properOptions = [...initOptions];
+        let listHeight=256;
         if (optionCacheKey && optionsCache[optionCacheKey]) {
-            for (let option of optionsCache[optionCacheKey].options) {
+            let optionCache=optionsCache[optionCacheKey];
+            if(optionCache['pageInfo'] && optionCache.pageInfo.pageSize<8){
+                listHeight=32*(optionCache['pageInfo'].pageSize)-10;
+            }
+            for (let option of optionCache.options) {
                 exists = false;
                 for (let init of initOptions) {
                     if (init['value'] == option['value']) {
                         exists = true;
+                        //用查询的覆盖之前的
+                        init['label']=option['label'];
                     }
                 }
                 if (!exists) {
@@ -410,6 +435,7 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
         return <><Select
             disabled={disabled}
             id={id}
+            listHeight={listHeight}
             style={{...style}}
             onChange={this.onChange}
             value={this.toValueArray(value)}
@@ -420,7 +446,7 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
             showArrow={true}
             suffixIcon={<SearchOutlined/>}
             dropdownRender={this.dropdownRender}
-            tagRender={actions && (actions.indexOf("detail") || actions.indexOf("edit")) ? this.tagRender : undefined}
+            tagRender={actions && (actions.indexOf("detail")>=0 || actions.indexOf("edit")>=0) ? this.tagRender : undefined}
             onSearch={this.debounceFetcher()}
             onClick={() => {
                 debounce(this.fetchOptions, 100)(undefined)

package/src/aldehyde/controls/entry-control.tsx

@@ -18,6 +18,7 @@ import ColorPicker from './color-picker'
 import LabTreeSelect from './entity-select/lab-tree-select'
 import Units from "../units";
 import {ProgramConfig} from "../index";
+import {LockOutlined,} from '@ant-design/icons';
 
 const  CheckboxGroup=Checkbox.Group;
 const RadioGroup=Radio.Group;
@@ -203,7 +204,10 @@ function  renderControl(id:any,mainCode:string|Promise<string>,fieldConfig: Fiel
             entryControl = <Steps {...controlProps}/>
             break;
         case 'password':
-            entryControl = unSupportControl;
+            entryControl =  <Input.Password
+                {...antdControlProps}
+                prefix={<LockOutlined className="site-form-item-icon"/>}
+            />
             break;
         case 'preselect':
             entryControl = <AutoComplete {...controlProps} />
@@ -230,7 +234,7 @@ function  renderControl(id:any,mainCode:string|Promise<string>,fieldConfig: Fiel
         case 'relselect':
         case 'refselect':
         case 'entity-select':
-            entryControl=<EntitySelect maxSelected={max?parseInt(max):undefined}  actions={fieldConfig.actions} {...controlProps} />
+            entryControl=<EntitySelect maxSelected={max?parseInt(max):undefined} {...controlProps} />
             break;
         case 'table-entity-select':
             entryControl=<PopoverEntitySelect maxSelected={max?parseInt(max):undefined} {...controlProps}  />

package/src/aldehyde/controls/upload/index.tsx

@@ -86,7 +86,7 @@ export default class Upload extends React.PureComponent<UploadProps, UploadState
                     uid: '-1',
                     name: value_1.base.fileName,
                     status: 'done',
-                    url: Units.api()+'/v3/files'+value_1.base.path+`?@token=${Units.getLocalStorge("hydrocarbonToken")}&@programToken=${Units.programCode()}&disposition=attachment`,
+                    url: Units.api()+'/v3/files'+value_1.base.path+`?@token=${Units.hydrocarbonToken()}&@programToken=${Units.programCode()}&disposition=attachment`,
                 })
             }else if(value_1.valid=='new'){
                 fileList.push({

package/src/aldehyde/controls/view-control.tsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import {Alert, Badge, Input, Spin, Tag} from "antd";
+import {Alert, Badge, Input, Spin, Tag,Tooltip} from "antd";
 import loadable from "@loadable/component";
 import {ControlHolderType, EnumItem, FieldConfig, ViewOrEdit} from "../tmpl/interface";
 import ControlTypeSupportor from '../tmpl/control-type-supportor';
@@ -135,7 +135,13 @@ function renderControl(fieldConfig: FieldConfig, fieldValue: any,pHolderType:Con
             viewControl = <Steps {...controlProps}/>
             break;
         case 'password':
-            viewControl = unSupportControl;
+            if(value){
+                viewControl = <Tooltip title={value} color={'#fff1b8'} {...controlProps}>
+                    <span className="infoStyle">********</span>
+                </Tooltip>
+            }else{
+                viewControl=null;
+            }
             break;
         case 'caselect':
             viewControl = <span className="infoStyle">{value}</span>;

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/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/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/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,28 @@
+import React from 'react'
+import Axios from "axios";
+import Units from './index'
+
+//加载本地配置
+Axios.create().get('programConfig.json').then((result) => {
+
+    Units.setHydrocarbonServer(result.data.hydrocarbonServer);
+    if(result.data.programCode){
+        Units.setProgramCode(result.data.programCode);
+    }
+
+    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)
+});
+

package/src/aldehyde/units/index.tsx

@@ -1,16 +1,16 @@
 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";
 
 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 +25,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 {
 
     //静态补充
@@ -75,13 +63,13 @@ export default {
         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 +80,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 +188,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 +202,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 +310,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;