aldehyde 0.1.76 → 0.1.78

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.
Files changed (36) hide show
  1. package/lib/controls/chemstruc/graph.d.ts +0 -2
  2. package/lib/controls/chemstruc/graph.d.ts.map +1 -1
  3. package/lib/controls/chemstruc/graph.js +6 -9
  4. package/lib/controls/chemstruc/graph.js.map +1 -1
  5. package/lib/login/login.d.ts.map +1 -1
  6. package/lib/login/login.js +6 -0
  7. package/lib/login/login.js.map +1 -1
  8. package/lib/routable/dtmpl-route.d.ts.map +1 -1
  9. package/lib/routable/dtmpl-route.js +10 -8
  10. package/lib/routable/dtmpl-route.js.map +1 -1
  11. package/lib/table/relation-table.d.ts.map +1 -1
  12. package/lib/table/relation-table.js +5 -5
  13. package/lib/table/relation-table.js.map +1 -1
  14. package/lib/tmpl/hcservice-v3.d.ts.map +1 -1
  15. package/lib/tmpl/hcservice-v3.js +2 -1
  16. package/lib/tmpl/hcservice-v3.js.map +1 -1
  17. package/lib/tmpl/interface.d.ts +1 -0
  18. package/lib/tmpl/interface.d.ts.map +1 -1
  19. package/lib/tmpl/interface.js.map +1 -1
  20. package/lib/tmpl/superagent.d.ts +1 -1
  21. package/lib/tmpl/superagent.d.ts.map +1 -1
  22. package/lib/tmpl/superagent.js +57 -42
  23. package/lib/tmpl/superagent.js.map +1 -1
  24. package/lib/units/index.d.ts +1 -0
  25. package/lib/units/index.d.ts.map +1 -1
  26. package/lib/units/index.js +10 -0
  27. package/lib/units/index.js.map +1 -1
  28. package/package.json +4 -4
  29. package/src/aldehyde/controls/chemstruc/graph.tsx +8 -12
  30. package/src/aldehyde/login/login.js +6 -1
  31. package/src/aldehyde/routable/dtmpl-route.tsx +10 -8
  32. package/src/aldehyde/table/relation-table.tsx +6 -5
  33. package/src/aldehyde/tmpl/hcservice-v3.tsx +5 -3
  34. package/src/aldehyde/tmpl/interface.tsx +1 -0
  35. package/src/aldehyde/tmpl/superagent.js +84 -71
  36. package/src/aldehyde/units/index.tsx +80 -77
package/lib/tmpl/superagent.js CHANGED
@@ -6,6 +6,7 @@ export default class Superagent {
6
6
  const hydrocarbonToken = Units.getLocalStorge("hydrocarbonToken") ? Units.getLocalStorge("hydrocarbonToken")
7
7
  : options.header && options.header.hydrocarbonToken ?
8
8
  options.header.hydrocarbonToken : null;
9
+ const programCode = Units.programCode();
9
10
  let loading;
10
11
  if (options.data && options.data.isShowLoading !== false) {
11
12
  loading = document.getElementById('ajaxLoading');
@@ -24,39 +25,46 @@ export default class Superagent {
24
25
  superagent(method, Units.joinPath(server, options.url))
25
26
  .type(ty)
26
27
  .set("hydrocarbon-token", hydrocarbonToken)
27
- .set("program-token", hydrocarbonToken)
28
+ .set("hydrocarbon-program-token", programCode)
28
29
  .query(options.query || '')
29
30
  .send(options.data)
30
31
  .end((req, res) => {
31
- if (options.data && options.data.isShowLoading !== false) {
32
- loading = document.getElementById('ajaxLoading');
33
- loading.style.display = "none";
34
- }
35
- if (res.status === 200) {
36
- Units.setLocalStorge("hydrocarbonToken", hydrocarbonToken);
37
- let result = res.body;
38
- if (result && result.status === 'error') {
39
- message.error("错误消息：" + result.message);
40
- }
41
- resolve(result);
42
- }
43
- if (res.status === 201) {
44
- Units.setLocalStorge("hydrocarbonToken", hydrocarbonToken);
45
- resolve(res);
46
- }
47
- else if (res.status === 403) {
48
- //message.info("请求权限不足,可能是token已经超时")
49
- //console.log('权限不足或登录超时',options);
50
- window.location.hash = "/login";
51
- }
52
- else if (res.status === 404 || res.status === 504) {
53
- message.info("服务器连接失败!");
54
- }
55
- else if (res.status === 500) {
56
- message.info("后台处理错误。");
32
+ if (!res) {
33
+ message.error("服务器连接失败");
34
+ reject(res.body);
57
35
  }
58
36
  else {
59
- reject(res.body);
37
+ if (options.data && options.data.isShowLoading !== false) {
38
+ loading = document.getElementById('ajaxLoading');
39
+ loading.style.display = "none";
40
+ }
41
+ if (res.status === 200) {
42
+ Units.setLocalStorge("hydrocarbonToken", hydrocarbonToken);
43
+ let result = res.body;
44
+ if (result && result.status === 'error') {
45
+ message.error("错误消息：" + result.message);
46
+ }
47
+ resolve(result);
48
+ }
49
+ else if (res.status === 201) {
50
+ Units.setLocalStorge("hydrocarbonToken", hydrocarbonToken);
51
+ resolve(res);
52
+ }
53
+ else if (res.status === 403) {
54
+ //message.info("请求权限不足,可能是token已经超时")
55
+ //console.log('权限不足或登录超时',options);
56
+ Units.toLogin();
57
+ }
58
+ else if (res.status === 404 || res.status === 504) {
59
+ message.error("服务资源未找到(" + res.status + ")");
60
+ }
61
+ else if (res.status === 500) {
62
+ message.error("后台处理错误(" + res.status + ")");
63
+ }
64
+ else {
65
+ message.error("服务资源请求失败!");
66
+ reject(res.body);
67
+ }
60
68
  }
61
69
  });
62
70
  });
@@ -68,21 +76,28 @@ export default class Superagent {
68
76
  .get(Units.joinPath(server, options.url))
69
77
  .query(options.query || '')
70
78
  .end((req, res) => {
71
- if (res.status === 200) {
72
- resolve(res.body);
73
- }
74
- else if (res.status === 403) {
75
- //message.info("请求权限不足,可能是token已经超时")
76
- window.location.hash = "#/login";
77
- }
78
- else if (res.status === 404 || res.status === 504) {
79
- message.info("服务器连接失败!");
80
- }
81
- else if (res.status === 500) {
82
- message.info("后台处理错误。");
79
+ if (!res) {
80
+ message.error("服务器连接失败");
81
+ reject(res.body);
83
82
  }
84
83
  else {
85
- reject(res.body);
84
+ if (res.status === 200) {
85
+ resolve(res.body);
86
+ }
87
+ else if (res.status === 403) {
88
+ //message.info("请求权限不足,可能是token已经超时")
89
+ Units.toLogin();
90
+ }
91
+ else if (res.status === 404 || res.status === 504) {
92
+ message.error("服务资源未找到(" + res.status + ")");
93
+ }
94
+ else if (res.status === 500) {
95
+ message.error("后台处理错误(" + res.status + ")");
96
+ }
97
+ else {
98
+ message.error("服务资源请求失败!");
99
+ reject(res.body);
100
+ }
86
101
  }
87
102
  });
88
103
  });
@@ -90,7 +105,7 @@ export default class Superagent {
90
105
  static getHeaderObj() {
91
106
  return {
92
107
  'hydrocarbon-token': Units.getLocalStorge("hydrocarbonToken"),
93
- 'program-token': Units.getLocalStorge("hydrocarbonToken")
108
+ 'hydrocarbon-program-token': Units.getLocalStorge(Units.programCode())
94
109
  };
95
110
  }
96
111
  }
package/lib/tmpl/superagent.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"superagent.js","sourceRoot":"","sources":["../../../../src/aldehyde/tmpl/superagent.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"superagent.js","sourceRoot":"","sources":["../../../../src/aldehyde/tmpl/superagent.js"],"names":[],"mappings":"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"}
package/lib/units/index.d.ts CHANGED
@@ -32,6 +32,7 @@ declare const _default: {
32
32
  };
33
33
  getRadioList(data: any): any[];
34
34
  openFile(url: any, fileName: any): void;
35
+ toLogin(): void;
35
36
  downloadFile(url: any, fileName: any): void;
36
37
  downloadFile_old(url: any): void;
37
38
  getRandomNum(n: any): string;
package/lib/units/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/units/index.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAC,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAC,MAAM,mBAAmB,CAAC;;+BA4CrC,MAAM,sBAAmB,WAAW,aAAW,SAAS,KAAG,WAAW;mCAIlE,WAAW,aAAW,SAAS;sCAM5B,WAAW;uBAO1B,MAAM,QAAM,MAAM;0BAGf,MAAM,QAAM,MAAM,QAAM,MAAM;8BAI1B,MAAM;8BAIN,MAAM;uBAGb,MAAM;8BAGC,MAAM;+BAGL,MAAM;;iCAcJ,MAAM;;iCAMN,MAAM;;yCAME,MAAM;;iDAME,MAAM;;;;;;;;;;;;;;;;;;IA+GlD;;;;;OAKG;;;;;;;;4BA8HoB,MAAM;;;;;4BAqEL,QAAQ,EAAE;;;;;2BAqGX,QAAQ,EAAE;;yCAwBI,MAAM;;;;;;;;;AA5f/C,wBA2jBC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/units/index.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAC,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAC,MAAM,mBAAmB,CAAC;;+BAuCpC,MAAM,sBAAsB,WAAW,aAAa,SAAS,KAAK,WAAW;mCAIzE,WAAW,aAAa,SAAS;sCAM9B,WAAW;uBAO1B,MAAM,QAAQ,MAAM;0BAGjB,MAAM,QAAQ,MAAM,QAAQ,MAAM;8BAI9B,MAAM;8BAIN,MAAM;uBAGb,MAAM;8BAGC,MAAM;+BAGL,MAAM;;iCAcJ,MAAM;;iCAMN,MAAM;;yCAME,MAAM;;iDAME,MAAM;;;;;;;;;;;;;;;;;;;IAuHnD;;;;;OAKG;;;;;;;;4BA8HqB,MAAM;;;;;4BAqEN,QAAQ,EAAE;;;;;2BAqGX,QAAQ,EAAE;;yCAwBI,MAAM;;;;;;;;;AApgB/C,wBAmkBC"}
package/lib/units/index.js CHANGED
@@ -24,6 +24,7 @@ Axios.create().get('programConfig.json').then((result) => {
24
24
  window.localStorage['programName_NavLeft'] = result.data.programName_NavLeft;
25
25
  window.localStorage['programName_sub'] = result.data.programName_sub;
26
26
  window.localStorage['programName_Logo'] = result.data.programName_Logo;
27
+ debugger;
27
28
  window.localStorage['programCode'] = result.data.programCode;
28
29
  }).catch((error) => {
29
30
  console.log(error);
@@ -177,6 +178,15 @@ export default {
177
178
  console.log(e);
178
179
  }
179
180
  },
181
+ toLogin() {
182
+ let programCode = this.programCode();
183
+ if (programCode) {
184
+ window.location.hash = "#/login/" + programCode;
185
+ }
186
+ else {
187
+ window.location.hash = "#/login";
188
+ }
189
+ },
180
190
  downloadFile(url, fileName) {
181
191
  try {
182
192
  let a = document.createElement("a");
package/lib/units/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/aldehyde/units/index.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/aldehyde/units/index.tsx"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "aldehyde",
3
- "version": "0.1.76",
3
+ "version": "0.1.78",
4
4
  "author": "cosmicparticle",
5
5
  "main": "lib/index.js",
6
6
  "module": "src/aldehyde/index.txs",
@@ -26,7 +26,7 @@
26
26
  "@antv/g6": "^4.6.18",
27
27
  "@tinymce/tinymce-react": "^3.12.2",
28
28
  "add": "^2.0.6",
29
- "antd": "^4.24.1",
29
+ "antd": "^4.24.5",
30
30
  "array-move": "^4.0.0",
31
31
  "axios": "^0.18.0",
32
32
  "bfj": "^6.1.1",
@@ -55,8 +55,7 @@
55
55
  "jsencrypt": "^3.2.1",
56
56
  "jsonp": "^0.2.1",
57
57
  "jsonschema": "^1.4.0",
58
- "ketcher-core": "1.3.0",
59
- "ketcher-react": "2.4.2",
58
+ "ketcher-react": "2.6.4",
60
59
  "leaflet": "^1.6.0",
61
60
  "less": "^2.7.3",
62
61
  "loadable-components": "^2.2.3",
@@ -66,6 +65,7 @@
66
65
  "picomatch": "^2.3.1",
67
66
  "process": "^0.11.10",
68
67
  "prop-types": "^15.8.1",
68
+ "react-markdown": "^8.0.4",
69
69
  "reconnecting-websocket": "^4.4.0",
70
70
  "redux": "^4.0.1",
71
71
  "redux-devtools-extension": "^2.13.5",
package/src/aldehyde/controls/chemstruc/graph.tsx CHANGED
@@ -17,7 +17,6 @@ interface ChemStrucProps extends VEControlProps {
17
17
  interface ChemStrucState {
18
18
  modalVisible: boolean,
19
19
  molFileLoaded: boolean,
20
- molFile: any,
21
20
  }
22
21
 
23
22
  export default class ChemStruc extends React.PureComponent<ChemStrucProps, ChemStrucState> {
@@ -29,7 +28,6 @@ export default class ChemStruc extends React.PureComponent<ChemStrucProps, ChemS
29
28
  state = {
30
29
  modalVisible: false,
31
30
  molFileLoaded: false,
32
- molFile: undefined,
33
31
  }
34
32
 
35
33
  componentDidMount() {
@@ -54,17 +52,16 @@ export default class ChemStruc extends React.PureComponent<ChemStrucProps, ChemS
54
52
  let molFile
55
53
  if (val.valid == true) {//此处要优化
56
54
  molFile = await HcserviceV3.loadFileTxt(val.base.path);
55
+ debugger
57
56
  } else if (val.valid == 'new') {
57
+ debugger
58
58
  molFile = val.body;
59
59
  } else {
60
- molFile = undefined;
60
+ molFile = undefined;
61
61
  }
62
- //console.log('molFile:', molFile);
63
- // urilib.resolve('');
62
+ console.log('molFile:', molFile);
63
+ debugger
64
64
  global.ketcher.setMolecule(molFile);
65
- this.setState({
66
- molFile,
67
- })
68
65
  }
69
66
  }
70
67
 
@@ -79,6 +76,7 @@ export default class ChemStruc extends React.PureComponent<ChemStrucProps, ChemS
79
76
  }
80
77
 
81
78
  triggerChange = (changedValue) => {
79
+ debugger
82
80
  const {onChange} = this.props
83
81
  if (onChange) {
84
82
  onChange(JSON.stringify({valid: 'new', body: changedValue}));
@@ -99,8 +97,8 @@ export default class ChemStruc extends React.PureComponent<ChemStrucProps, ChemS
99
97
  }
100
98
 
101
99
  render() {
102
- const {disabled, viewOrEdit, value} = this.props
103
- const {molFile} = this.state
100
+ const {disabled, viewOrEdit} = this.props
101
+
104
102
  const structServiceProvider = new RemoteStructServiceProvider("")
105
103
  return (
106
104
  <>
@@ -137,10 +135,8 @@ export default class ChemStruc extends React.PureComponent<ChemStrucProps, ChemS
137
135
  <Col key={1} span={24} style={{height: '430px'}}>
138
136
  <Editor onInit={async (ketcher) => {
139
137
  global.ketcher = ketcher;
140
- //await ketcher.setMolecule(await HcserviceV3.loadFileTxt(value.base.path));
141
138
  }} staticResourcesUrl={"ketcher"} structServiceProvider={structServiceProvider}
142
139
  errorHandler={undefined}/>
143
- {/*<Editor staticResourcesUrl={"ketcher"} structServiceProvider={structServiceProvider} />*/}
144
140
  </Col>
145
141
  </Row>
146
142
  </Modal>
package/src/aldehyde/login/login.js CHANGED
@@ -16,7 +16,12 @@ export default class Loginit extends React.Component {
16
16
  formRef = React.createRef();
17
17
 
18
18
  componentDidMount=async ()=> {
19
-
19
+ if(this.props && this.props.match && this.props.match.params){
20
+ const {programCode} = this.props.match.params;
21
+ if(programCode){
22
+ window.localStorage['programCode']=programCode;
23
+ }
24
+ }
20
25
  let pubkey = await HCserviceV3.getRasPubkey();
21
26
  this.setState({
22
27
  pubkey,
package/src/aldehyde/routable/dtmpl-route.tsx CHANGED
@@ -62,14 +62,16 @@ class DtmplRoute extends React.PureComponent<DtmplRouteProps, DtmplRoutePropsSta
62
62
  }
63
63
 
64
64
  goBackToLtmpl=()=>{
65
- const { sourceId,} = this.props.match.params;
66
- const {basePath}=this.props;
67
- let url=`${basePath}/${sourceId}/act-table?menuId=${this.getMenuId()}`;
68
- let mainCode=this.getMainCode();
69
- if(mainCode){
70
- url=url+`&mainCode=${mainCode}`;
71
- }
72
- this.props.history.push(url);
65
+ // const { sourceId,} = this.props.match.params;
66
+ // const {basePath}=this.props;
67
+ //
68
+ // let url=`${basePath}/${sourceId}/act-table?menuId=${this.getMenuId()}`;
69
+ // let mainCode=this.getMainCode();
70
+ // if(mainCode){
71
+ // url=url+`&mainCode=${mainCode}`;
72
+ // }
73
+ //this.props.history.push(url);
74
+ this.props.history.goBack();
73
75
  }
74
76
 
75
77
  goDtmpl=(code:string)=>{
package/src/aldehyde/table/relation-table.tsx CHANGED
@@ -91,8 +91,8 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
91
91
  buildDataSource = () => {
92
92
 
93
93
  const {filterStr} = this.state;
94
- const {viewOrEdit, value, fieldGroupConfig} = this.props;
95
- const {title, buttons, fields, showRelationName, relationNames, showRowNum} = fieldGroupConfig;
94
+ const {value} = this.props;
95
+
96
96
 
97
97
  let dataSource = undefined;
98
98
 
@@ -513,6 +513,7 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
513
513
  const {pageSize,selectedCode, showDtmplView, showSelectTable, showDtmplEdit, tableLoading, showRowEdit, selectedDtmplData} = this.state;
514
514
 
515
515
  const {buttons} = fieldGroupConfig;
516
+ let mainCode1=fieldGroupConfig.mainCode?fieldGroupConfig.mainCode:mainCode?mainCode:parentId;
516
517
  let page = {
517
518
  pageSize: pageSize,
518
519
  hideOnSinglePage: true,
@@ -558,11 +559,11 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
558
559
  </div>
559
560
  </CollapseCard>
560
561
  {buttons.includes('detail') ?
561
- <ModalDtmplView mainCode={mainCode?mainCode:parentId} visible={showDtmplView} onCancel={this.hiddenEntityView}
562
+ <ModalDtmplView mainCode={mainCode1} visible={showDtmplView} onCancel={this.hiddenEntityView}
562
563
  sourceId={fieldGroupConfig.id}
563
564
  code={selectedCode}> </ModalDtmplView> : ""}
564
565
  {buttons.includes('dtmplEdit') || buttons.includes('dtmplAdd') ?
565
- <DtmplEditPage mainCode={mainCode?mainCode:parentId} visible={showDtmplEdit} onCancel={this.hiddenEntityEdit}
566
+ <DtmplEditPage mainCode={mainCode1} visible={showDtmplEdit} onCancel={this.hiddenEntityEdit}
566
567
  sourceId={fieldGroupConfig.id}
567
568
  code={selectedCode}
568
569
  onOk={selectedCode ? this.handleDtmplEdit : this.handleDtmplAdd} />
@@ -576,7 +577,7 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
576
577
  <ModelSelectTable maxSelectedRows={fieldGroupConfig.max} visible={showSelectTable}
577
578
  onOK={this.select} onCancel={() => {
578
579
  this.setState({showSelectTable: false})
579
- }} exceptCodes={exceptCodes} mainCode={mainCode?mainCode:parentId}
580
+ }} exceptCodes={exceptCodes} mainCode={mainCode1}
580
581
  sourceId={fieldGroupConfig.id}></ModelSelectTable> : ""}
581
582
 
582
583
  </>
package/src/aldehyde/tmpl/hcservice-v3.tsx CHANGED
@@ -558,10 +558,12 @@ export default class HcserviceV3 {
558
558
  url: '/v3/auth/token',
559
559
  method: 'DELETE'
560
560
  }).then((res) => {
561
- window.location.hash = "#/login";
561
+ Units.toLogin();
562
562
  })
563
563
  }
564
564
 
565
+
566
+
565
567
  static async resetPassword(oPassword, nPassword,pubkey){
566
568
  let oldPassword= EncryptUtils.rsaEncrypt(oPassword,pubkey);
567
569
  let newPassword= EncryptUtils.rsaEncrypt(nPassword,pubkey);
@@ -579,10 +581,10 @@ export default class HcserviceV3 {
579
581
  static async login(username, password,kaptchaToken,kaptchaText,pubkey) {
580
582
 
581
583
  let datetime= moment(new Date()).format("YYYY-MM-DD HH:mm:ss")
584
+ let programCode
582
585
  let json={username,password,datetime}
583
586
 
584
-
585
- let userInfo= EncryptUtils.rsaEncrypt(JSON.stringify(json),pubkey);
587
+ let userInfo= EncryptUtils.rsaEncrypt(JSON.stringify(json),pubkey);
586
588
 
587
589
  let res = await Super.super({
588
590
  url: '/v3/auth/hctoken',
package/src/aldehyde/tmpl/interface.tsx CHANGED
@@ -106,6 +106,7 @@ export interface FieldGroupConfig extends OrderableTmplBase {
106
106
  fields: FieldConfig[];
107
107
  rowActions:ActionConfig[];
108
108
  displayConfig:GroupDisplayConfig;
109
+ mainCode?:string,
109
110
  }
110
111
 
111
112
  export type SaveJumpType = 'list' | 'add' | 'edit';