aldehyde 0.1.77 → 0.1.79
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/controls/chemstruc/graph.d.ts +0 -2
- package/lib/controls/chemstruc/graph.d.ts.map +1 -1
- package/lib/controls/chemstruc/graph.js +6 -9
- package/lib/controls/chemstruc/graph.js.map +1 -1
- package/lib/login/login.d.ts.map +1 -1
- package/lib/login/login.js +6 -0
- package/lib/login/login.js.map +1 -1
- package/lib/routable/dtmpl-route.d.ts.map +1 -1
- package/lib/routable/dtmpl-route.js +10 -8
- package/lib/routable/dtmpl-route.js.map +1 -1
- package/lib/table/relation-table.d.ts.map +1 -1
- package/lib/table/relation-table.js +5 -5
- package/lib/table/relation-table.js.map +1 -1
- package/lib/tmpl/hcservice-v3.d.ts.map +1 -1
- package/lib/tmpl/hcservice-v3.js +2 -1
- package/lib/tmpl/hcservice-v3.js.map +1 -1
- package/lib/tmpl/interface.d.ts +3 -1
- package/lib/tmpl/interface.d.ts.map +1 -1
- package/lib/tmpl/interface.js.map +1 -1
- package/lib/tmpl/superagent.d.ts +1 -1
- package/lib/tmpl/superagent.d.ts.map +1 -1
- package/lib/tmpl/superagent.js +9 -8
- package/lib/tmpl/superagent.js.map +1 -1
- package/lib/units/index.d.ts +1 -0
- package/lib/units/index.d.ts.map +1 -1
- package/lib/units/index.js +10 -0
- package/lib/units/index.js.map +1 -1
- package/package.json +4 -4
- package/src/aldehyde/controls/chemstruc/graph.tsx +8 -12
- package/src/aldehyde/login/login.js +6 -1
- package/src/aldehyde/routable/dtmpl-route.tsx +10 -8
- package/src/aldehyde/table/relation-table.tsx +6 -5
- package/src/aldehyde/tmpl/hcservice-v3.tsx +5 -3
- package/src/aldehyde/tmpl/interface.tsx +3 -2
- package/src/aldehyde/tmpl/superagent.js +9 -8
- package/src/aldehyde/units/index.tsx +80 -77
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React from 'react'
|
|
2
|
-
import {
|
|
2
|
+
import {Radio, Select} from 'antd'
|
|
3
3
|
import Axios from "axios";
|
|
4
4
|
import Logo from "./logo.png";
|
|
5
5
|
import {DtmplConfig, DtmplData, EnumItem} from "../tmpl/interface";
|
|
@@ -10,26 +10,20 @@ import TmplConfigAnalysis from "../tmpl/tmpl-config-analysis";
|
|
|
10
10
|
const Option = Select.Option;
|
|
11
11
|
|
|
12
12
|
let api = undefined;
|
|
13
|
-
let programCode=undefined;
|
|
13
|
+
let programCode = undefined;
|
|
14
14
|
let programName = undefined;
|
|
15
15
|
let programName_sub = undefined;
|
|
16
16
|
let programName_NavLeft = undefined;
|
|
17
17
|
let storageKeyPrefix = undefined;
|
|
18
|
-
let logo=undefined;
|
|
18
|
+
let logo = undefined;
|
|
19
19
|
|
|
20
|
-
const CUSTOM_PAGE_MAP = {
|
|
20
|
+
const CUSTOM_PAGE_MAP = {}
|
|
21
21
|
|
|
22
|
-
}
|
|
23
|
-
|
|
24
|
-
const CUSTOM_VIEW_CONTROL_MAP = {
|
|
25
|
-
|
|
26
|
-
}
|
|
22
|
+
const CUSTOM_VIEW_CONTROL_MAP = {}
|
|
27
23
|
|
|
28
|
-
const AppDtmplConfigFuncMap={}
|
|
24
|
+
const AppDtmplConfigFuncMap = {}
|
|
29
25
|
|
|
30
|
-
const CUSTOM_EDIT_CONTROL_MAP = {
|
|
31
|
-
|
|
32
|
-
}
|
|
26
|
+
const CUSTOM_EDIT_CONTROL_MAP = {}
|
|
33
27
|
|
|
34
28
|
//加载本地配置
|
|
35
29
|
Axios.create().get('programConfig.json').then((result) => {
|
|
@@ -38,6 +32,7 @@ Axios.create().get('programConfig.json').then((result) => {
|
|
|
38
32
|
window.localStorage['programName_NavLeft'] = result.data.programName_NavLeft
|
|
39
33
|
window.localStorage['programName_sub'] = result.data.programName_sub
|
|
40
34
|
window.localStorage['programName_Logo'] = result.data.programName_Logo
|
|
35
|
+
debugger;
|
|
41
36
|
window.localStorage['programCode'] = result.data.programCode
|
|
42
37
|
}).catch((error) => {
|
|
43
38
|
console.log(error)
|
|
@@ -46,77 +41,77 @@ Axios.create().get('programConfig.json').then((result) => {
|
|
|
46
41
|
export default {
|
|
47
42
|
|
|
48
43
|
//静态补充
|
|
49
|
-
setAppDtmplConfigFunc(key:string,func:(dtmplConfig:DtmplConfig,dtmplData:DtmplData)=>DtmplConfig){
|
|
50
|
-
AppDtmplConfigFuncMap[key]=func;
|
|
44
|
+
setAppDtmplConfigFunc(key: string, func: (dtmplConfig: DtmplConfig, dtmplData: DtmplData) => DtmplConfig) {
|
|
45
|
+
AppDtmplConfigFuncMap[key] = func;
|
|
51
46
|
},
|
|
52
47
|
|
|
53
|
-
getAppDtmplConfig(dtmplConfig:DtmplConfig,dtmplData:DtmplData){
|
|
54
|
-
if(dtmplConfig && AppDtmplConfigFuncMap[dtmplConfig.id]){
|
|
55
|
-
return AppDtmplConfigFuncMap[dtmplConfig.id](dtmplConfig,dtmplData);
|
|
48
|
+
getAppDtmplConfig(dtmplConfig: DtmplConfig, dtmplData: DtmplData) {
|
|
49
|
+
if (dtmplConfig && AppDtmplConfigFuncMap[dtmplConfig.id]) {
|
|
50
|
+
return AppDtmplConfigFuncMap[dtmplConfig.id](dtmplConfig, dtmplData);
|
|
56
51
|
}
|
|
57
52
|
return dtmplConfig;
|
|
58
53
|
},
|
|
59
|
-
isDynamicDtmplConfig(dtmplConfig:DtmplConfig){
|
|
60
|
-
if(dtmplConfig && AppDtmplConfigFuncMap[dtmplConfig.id]){
|
|
54
|
+
isDynamicDtmplConfig(dtmplConfig: DtmplConfig) {
|
|
55
|
+
if (dtmplConfig && AppDtmplConfigFuncMap[dtmplConfig.id]) {
|
|
61
56
|
return true
|
|
62
57
|
}
|
|
63
58
|
return false;
|
|
64
59
|
},
|
|
65
60
|
|
|
66
|
-
setCustomPage(key:string,name:object){
|
|
67
|
-
CUSTOM_PAGE_MAP[key]=name;
|
|
61
|
+
setCustomPage(key: string, name: object) {
|
|
62
|
+
CUSTOM_PAGE_MAP[key] = name;
|
|
68
63
|
},
|
|
69
|
-
setCustomControl(key:string,view:object,edit:object){
|
|
70
|
-
CUSTOM_VIEW_CONTROL_MAP[key]=view;
|
|
71
|
-
CUSTOM_EDIT_CONTROL_MAP[key]=edit;
|
|
64
|
+
setCustomControl(key: string, view: object, edit: object) {
|
|
65
|
+
CUSTOM_VIEW_CONTROL_MAP[key] = view;
|
|
66
|
+
CUSTOM_EDIT_CONTROL_MAP[key] = edit;
|
|
72
67
|
},
|
|
73
|
-
getCustomViewControl(key:string){
|
|
74
|
-
|
|
68
|
+
getCustomViewControl(key: string) {
|
|
69
|
+
return CUSTOM_VIEW_CONTROL_MAP[key];
|
|
75
70
|
|
|
76
71
|
},
|
|
77
|
-
getCustomEditControl(key:string){
|
|
72
|
+
getCustomEditControl(key: string) {
|
|
78
73
|
return CUSTOM_EDIT_CONTROL_MAP[key];
|
|
79
74
|
},
|
|
80
|
-
getCustomPage(key:string){
|
|
81
|
-
|
|
75
|
+
getCustomPage(key: string) {
|
|
76
|
+
return CUSTOM_PAGE_MAP[key];
|
|
82
77
|
},
|
|
83
|
-
setHydrocarbonServer(url:string){
|
|
84
|
-
api=url;
|
|
78
|
+
setHydrocarbonServer(url: string) {
|
|
79
|
+
api = url;
|
|
85
80
|
},
|
|
86
|
-
setProgramName_Logo(logo1:String){
|
|
87
|
-
logo=logo1;
|
|
81
|
+
setProgramName_Logo(logo1: String) {
|
|
82
|
+
logo = logo1;
|
|
88
83
|
},
|
|
89
84
|
api() {
|
|
90
|
-
let appi:string = window.localStorage['hydrocarbonServer'] ? window.localStorage['hydrocarbonServer'] : api;
|
|
91
|
-
if(!appi){
|
|
92
|
-
appi=new URL(window.location.href).origin;
|
|
85
|
+
let appi: string = window.localStorage['hydrocarbonServer'] ? window.localStorage['hydrocarbonServer'] : api;
|
|
86
|
+
if (!appi) {
|
|
87
|
+
appi = new URL(window.location.href).origin;
|
|
93
88
|
//console.log('Hydrcarbon API:',api);
|
|
94
|
-
}else if(!appi.startsWith("http")){
|
|
95
|
-
appi=this.joinPath(new URL(window.location.href).origin,appi);
|
|
96
|
-
|
|
89
|
+
} else if (!appi.startsWith("http")) {
|
|
90
|
+
appi = this.joinPath(new URL(window.location.href).origin, appi);
|
|
91
|
+
// console.log('Hydrcarbon API:',api);
|
|
97
92
|
}
|
|
98
93
|
return appi;
|
|
99
94
|
},
|
|
100
|
-
setProgramCode(programCode_:string){
|
|
101
|
-
programCode=programCode_;
|
|
95
|
+
setProgramCode(programCode_: string) {
|
|
96
|
+
programCode = programCode_;
|
|
102
97
|
},
|
|
103
|
-
programCode(){
|
|
98
|
+
programCode() {
|
|
104
99
|
return window.localStorage['programCode'] ? window.localStorage['programCode'] : programCode
|
|
105
100
|
},
|
|
106
|
-
setProgramName(programName_:string){
|
|
107
|
-
programName=programName_;
|
|
101
|
+
setProgramName(programName_: string) {
|
|
102
|
+
programName = programName_;
|
|
108
103
|
},
|
|
109
104
|
programName() {
|
|
110
105
|
return window.localStorage['programName'] ? window.localStorage['programName'] : programName
|
|
111
106
|
},
|
|
112
|
-
setProgramName_sub(programName_sub_:string){
|
|
113
|
-
programName_sub=programName_sub_;
|
|
107
|
+
setProgramName_sub(programName_sub_: string) {
|
|
108
|
+
programName_sub = programName_sub_;
|
|
114
109
|
},
|
|
115
110
|
programName_sub() {
|
|
116
111
|
return window.localStorage['programName_sub'] ? window.localStorage['programName_sub'] : programName_sub
|
|
117
112
|
},
|
|
118
|
-
setProgramName_NavLeft(programName_NavLeft_:string){
|
|
119
|
-
programName_NavLeft=programName_NavLeft_;
|
|
113
|
+
setProgramName_NavLeft(programName_NavLeft_: string) {
|
|
114
|
+
programName_NavLeft = programName_NavLeft_;
|
|
120
115
|
},
|
|
121
116
|
programName_NavLeft() {
|
|
122
117
|
return window.localStorage['programName_NavLeft'] ? window.localStorage['programName_NavLeft'] : programName_NavLeft
|
|
@@ -186,7 +181,7 @@ export default {
|
|
|
186
181
|
try {
|
|
187
182
|
let a = document.createElement("a");
|
|
188
183
|
a.href = url;
|
|
189
|
-
a.target= "_blank";
|
|
184
|
+
a.target = "_blank";
|
|
190
185
|
document.body.appendChild(a);
|
|
191
186
|
a.click();
|
|
192
187
|
document.body.removeChild(a);
|
|
@@ -194,6 +189,14 @@ export default {
|
|
|
194
189
|
console.log(e);
|
|
195
190
|
}
|
|
196
191
|
},
|
|
192
|
+
toLogin() {
|
|
193
|
+
let programCode = this.programCode();
|
|
194
|
+
if (programCode) {
|
|
195
|
+
window.location.hash = "#/login/" + programCode;
|
|
196
|
+
} else {
|
|
197
|
+
window.location.hash = "#/login";
|
|
198
|
+
}
|
|
199
|
+
},
|
|
197
200
|
downloadFile(url, fileName) {
|
|
198
201
|
try {
|
|
199
202
|
let a = document.createElement("a");
|
|
@@ -204,7 +207,7 @@ export default {
|
|
|
204
207
|
a.click();
|
|
205
208
|
document.body.removeChild(a);
|
|
206
209
|
} catch (e) {
|
|
207
|
-
|
|
210
|
+
console.log(e);
|
|
208
211
|
}
|
|
209
212
|
},
|
|
210
213
|
downloadFile_old(url) {
|
|
@@ -343,7 +346,7 @@ export default {
|
|
|
343
346
|
} else {
|
|
344
347
|
const res = arr2[i].split("=");
|
|
345
348
|
const name = res[0];
|
|
346
|
-
if(name){
|
|
349
|
+
if (name) {
|
|
347
350
|
obj[name] = decodeURI(this.configParamTrans(res[1]));
|
|
348
351
|
}
|
|
349
352
|
}
|
|
@@ -351,14 +354,14 @@ export default {
|
|
|
351
354
|
}
|
|
352
355
|
return obj;
|
|
353
356
|
},
|
|
354
|
-
isConfigDefaultValue(defaultValue){
|
|
355
|
-
if(!defaultValue){
|
|
357
|
+
isConfigDefaultValue(defaultValue) {
|
|
358
|
+
if (!defaultValue) {
|
|
356
359
|
return false;
|
|
357
360
|
}
|
|
358
361
|
return defaultValue.startsWith("$$current");
|
|
359
362
|
},
|
|
360
|
-
configParamTrans(value:string){
|
|
361
|
-
if(value && value.startsWith &&
|
|
363
|
+
configParamTrans(value: string) {
|
|
364
|
+
if (value && value.startsWith && value.startsWith("$$current")) {
|
|
362
365
|
return TmplConfigAnalysis.current(value);
|
|
363
366
|
}
|
|
364
367
|
return value;
|
|
@@ -514,15 +517,15 @@ export default {
|
|
|
514
517
|
case 'timerange-mm':
|
|
515
518
|
case 'datetime-mm':
|
|
516
519
|
case 'datetimerange-mm':
|
|
517
|
-
|
|
520
|
+
return 'HH:mm';
|
|
518
521
|
case 'timestamp':
|
|
519
522
|
case 'time':
|
|
520
523
|
case 'timerange':
|
|
521
524
|
case 'datetime':
|
|
522
525
|
case 'datetimerange':
|
|
523
|
-
|
|
526
|
+
return 'HH:mm:ss';
|
|
524
527
|
default:
|
|
525
|
-
|
|
528
|
+
return "";
|
|
526
529
|
}
|
|
527
530
|
|
|
528
531
|
return format;
|
|
@@ -578,40 +581,40 @@ export default {
|
|
|
578
581
|
}
|
|
579
582
|
|
|
580
583
|
return {valueBegin, valueEnd};
|
|
581
|
-
},str2UTF8(str){
|
|
584
|
+
}, str2UTF8(str) {
|
|
582
585
|
var bytes = new Array();
|
|
583
|
-
var len,c;
|
|
586
|
+
var len, c;
|
|
584
587
|
len = str.length;
|
|
585
|
-
for(var i = 0; i < len; i++){
|
|
588
|
+
for (var i = 0; i < len; i++) {
|
|
586
589
|
c = str.charCodeAt(i);
|
|
587
|
-
if(c >= 0x010000 && c <= 0x10FFFF){
|
|
590
|
+
if (c >= 0x010000 && c <= 0x10FFFF) {
|
|
588
591
|
bytes.push(((c >> 18) & 0x07) | 0xF0);
|
|
589
592
|
bytes.push(((c >> 12) & 0x3F) | 0x80);
|
|
590
593
|
bytes.push(((c >> 6) & 0x3F) | 0x80);
|
|
591
594
|
bytes.push((c & 0x3F) | 0x80);
|
|
592
|
-
}else if(c >= 0x000800 && c <= 0x00FFFF){
|
|
595
|
+
} else if (c >= 0x000800 && c <= 0x00FFFF) {
|
|
593
596
|
bytes.push(((c >> 12) & 0x0F) | 0xE0);
|
|
594
597
|
bytes.push(((c >> 6) & 0x3F) | 0x80);
|
|
595
598
|
bytes.push((c & 0x3F) | 0x80);
|
|
596
|
-
}else if(c >= 0x000080 && c <= 0x0007FF){
|
|
599
|
+
} else if (c >= 0x000080 && c <= 0x0007FF) {
|
|
597
600
|
bytes.push(((c >> 6) & 0x1F) | 0xC0);
|
|
598
601
|
bytes.push((c & 0x3F) | 0x80);
|
|
599
|
-
}else{
|
|
602
|
+
} else {
|
|
600
603
|
bytes.push(c & 0xFF);
|
|
601
604
|
}
|
|
602
605
|
}
|
|
603
606
|
return bytes;
|
|
604
607
|
},
|
|
605
|
-
joinPath(path1,path2){
|
|
606
|
-
|
|
607
|
-
|
|
608
|
-
|
|
609
|
-
|
|
610
|
-
|
|
611
|
-
|
|
612
|
-
|
|
613
|
-
|
|
608
|
+
joinPath(path1, path2) {
|
|
609
|
+
let path = path1;
|
|
610
|
+
if (!path.endsWith('/') && !path.endsWith('\\')) {
|
|
611
|
+
path = path + "/";
|
|
612
|
+
}
|
|
613
|
+
if (path2.startsWith('/') || path.startsWith('\\')) {
|
|
614
|
+
path = path + path2.slice(1);
|
|
615
|
+
} else {
|
|
616
|
+
path = path + path2;
|
|
617
|
+
}
|
|
618
|
+
return path;
|
|
614
619
|
}
|
|
615
|
-
return path;
|
|
616
|
-
}
|
|
617
620
|
}
|