aldehyde 0.1.39 → 0.1.40

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.
@@ -1,6 +1,6 @@
1
1
  /// <reference types="lodash" />
2
2
  import * as React from 'react';
3
- import { EControlProps, PageInfo, QueryKey, SelectConfig } from "../../tmpl/interface";
3
+ import { EControlProps, PageInfo, SelectConfig } from "../../tmpl/interface";
4
4
  import './index.css';
5
5
  interface InnerEntitySelectProps extends EControlProps {
6
6
  maxSelected?: number;
@@ -12,14 +12,9 @@ interface InnerEntitySelectState {
12
12
  optionCacheKey: string;
13
13
  pageNo: number;
14
14
  loading: boolean;
15
+ optionsCache: object;
16
+ selectConfig: SelectConfig;
15
17
  }
16
- declare type OptionCache = {
17
- queryKey: QueryKey;
18
- pageInfo: PageInfo;
19
- touchEnd: boolean;
20
- options: any;
21
- searchValue: string;
22
- };
23
18
  declare type LoadDataSource = {
24
19
  options: any[];
25
20
  touchEnd: boolean;
@@ -33,9 +28,10 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
33
28
  optionCacheKey: any;
34
29
  pageNo: number;
35
30
  loading: boolean;
31
+ optionsCache: {};
32
+ selectConfig: any;
36
33
  };
37
- optionsCache: Map<string, OptionCache>;
38
- selectConfig: SelectConfig;
34
+ componentDidUpdate(prevProps: any): void;
39
35
  toOption: (code: string, title: string, onEntityClick: any) => {
40
36
  value: string;
41
37
  showlabel: string | JSX.Element;
@@ -1 +1 @@
1
- {"version":3,"file":"entity-select.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/entity-select/entity-select.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,OAAO,EAAC,aAAa,EAAE,QAAQ,EAAa,QAAQ,EAAE,YAAY,EAAa,MAAM,sBAAsB,CAAC;AAG5G,OAAO,aAAa,CAAC;AAIrB,UAAU,sBAAuB,SAAQ,aAAa;IAClD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACvC,gBAAgB,EAAC,MAAM,CAAC;CAC3B;AAED,UAAU,sBAAsB;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAC,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;CACpB;AAED,aAAK,WAAW,GAAG;IACf,QAAQ,EAAE,QAAQ,CAAC;IACnB,QAAQ,EAAE,QAAQ,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,EAAE,GAAG,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;CACvB,CAAA;AAED,aAAK,cAAc,GAAG;IAClB,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;CAErB,CAAA;AAED,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,KAAK,CAAC,aAAa,CAAC,sBAAsB,EAAE,sBAAsB,CAAC;IAEzG,MAAM,CAAC,YAAY;;MAElB;IAED,KAAK;;;;;MAKJ;IAGD,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IACnD,YAAY,EAAE,YAAY,CAAa;IAEvC,QAAQ,SAAU,MAAM,SAAS,MAAM;;;;MAYtC;IAED,YAAY,2BAYX;IAED,SAAS,+CAeR;IAED,aAAa,sBAgBZ;IAED,YAAY,qCA2EX;IAED,QAAQ,WAAY,GAAG,EAAE,UASxB;IAGD,QAAQ,aAAoB,MAAM,YAAY,QAAQ,WAAW,MAAM,KAAG,QAAQ,cAAc,CAAC,CAgBhG;IAED,eAAe,2DAKb;IAEF,qBAAqB,aAQpB;IAGD,MAAM;CAgDT"}
1
+ {"version":3,"file":"entity-select.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/entity-select/entity-select.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,OAAO,EAAC,aAAa,EAAE,QAAQ,EAAuB,YAAY,EAAa,MAAM,sBAAsB,CAAC;AAG5G,OAAO,aAAa,CAAC;AAIrB,UAAU,sBAAuB,SAAQ,aAAa;IAClD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACvC,gBAAgB,EAAC,MAAM,CAAC;CAC3B;AAED,UAAU,sBAAsB;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAC,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,MAAM,CAAE;IACtB,YAAY,EAAE,YAAY,CAAA;CAC7B;AAUD,aAAK,cAAc,GAAG;IAClB,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;CAErB,CAAA;AAED,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,KAAK,CAAC,aAAa,CAAC,sBAAsB,EAAE,sBAAsB,CAAC;IAEzG,MAAM,CAAC,YAAY;;MAElB;IAED,KAAK;;;;;;;MAOJ;IAED,kBAAkB,CAAC,SAAS,KAAA;IAkB5B,QAAQ,SAAU,MAAM,SAAS,MAAM;;;;MAYtC;IAED,YAAY,2BAYX;IAED,SAAS,+CAeR;IAED,aAAa,sBAeZ;IAED,YAAY,qCA6EX;IAED,QAAQ,WAAY,GAAG,EAAE,UASxB;IAGD,QAAQ,aAAoB,MAAM,YAAY,QAAQ,WAAW,MAAM,KAAG,QAAQ,cAAc,CAAC,CAgBhG;IAED,eAAe,2DAKb;IAEF,qBAAqB,aAQpB;IAGD,MAAM;CAgDT"}
@@ -24,10 +24,14 @@ export default class EntitySelect extends React.PureComponent {
24
24
  optionCacheKey: undefined,
25
25
  pageNo: 1,
26
26
  loading: false,
27
+ optionsCache: {},
28
+ selectConfig: undefined,
27
29
  };
28
- //没有过滤值的
29
- this.optionsCache = new Map();
30
- this.selectConfig = undefined;
30
+ // componentWillUnmount(): void {
31
+ // this.setState=(state,callback)=>{
32
+ // return
33
+ // }
34
+ // }
31
35
  this.toOption = (code, title, onEntityClick) => {
32
36
  let option = {
33
37
  value: code + '@R@' + title,
@@ -68,8 +72,8 @@ export default class EntitySelect extends React.PureComponent {
68
72
  return options;
69
73
  };
70
74
  this.fetchNextPage = () => __awaiter(this, void 0, void 0, function* () {
71
- const { optionCacheKey, titleId } = this.state;
72
- let optionCache = this.optionsCache.get(optionCacheKey);
75
+ const { optionCacheKey, titleId, optionsCache } = this.state;
76
+ let optionCache = optionsCache[optionCacheKey];
73
77
  let pageInfo = optionCache.pageInfo;
74
78
  if (!optionCache.touchEnd) {
75
79
  pageInfo.pageNo = pageInfo.pageNo + 1;
@@ -85,34 +89,35 @@ export default class EntitySelect extends React.PureComponent {
85
89
  });
86
90
  this.fetchOptions = (searchText) => __awaiter(this, void 0, void 0, function* () {
87
91
  const { fieldConfig, mainCode, baseCriteriaData } = this.props;
88
- this.setState({
89
- loading: true,
90
- });
92
+ const { optionsCache, selectConfig } = this.state;
91
93
  let optionCacheKey = "withoutValue";
92
94
  //先从缓存里拿
93
95
  if (searchText) {
94
96
  optionCacheKey = searchText;
95
97
  }
96
98
  let titleId = this.state.titleId;
97
- let optionCache = this.optionsCache.get(optionCacheKey);
99
+ let optionCache = optionsCache[optionCacheKey];
98
100
  if (!optionCache) {
99
- if (!this.selectConfig) {
100
- this.selectConfig = yield HCDataSource.requestSelectConfig(fieldConfig.id);
101
+ this.setState({
102
+ loading: true,
103
+ });
104
+ let selectConfig_ = selectConfig;
105
+ if (!selectConfig_) {
106
+ selectConfig_ = yield HCDataSource.requestSelectConfig(fieldConfig.id);
101
107
  }
102
108
  let pageInfo = {
103
109
  pageNo: 1,
104
110
  pageSize: 4,
105
111
  virtualEndPageNo: undefined,
106
112
  };
107
- let selectConfig = this.selectConfig;
108
- titleId = selectConfig.characteristicColumn.id;
113
+ titleId = selectConfig_.characteristicColumn.id;
109
114
  //得到第一个过滤条件
110
- let firstCriteria = selectConfig.primaryCriteria;
115
+ let firstCriteria = selectConfig_.primaryCriteria;
111
116
  let formItemName = 'undefinedCriteria';
112
117
  if (firstCriteria) {
113
118
  formItemName = 'c_' + firstCriteria.id;
114
119
  }
115
- const { defaultPageSize } = selectConfig;
120
+ const { defaultPageSize } = selectConfig_;
116
121
  if (defaultPageSize) {
117
122
  pageInfo.pageSize = defaultPageSize;
118
123
  }
@@ -132,10 +137,12 @@ export default class EntitySelect extends React.PureComponent {
132
137
  searchValue: searchText,
133
138
  touchEnd: sourceData.touchEnd
134
139
  };
135
- this.optionsCache.set(optionCacheKey, optionCache);
140
+ optionsCache[optionCacheKey] = optionCache;
136
141
  this.setState({
137
142
  optionCacheKey,
138
143
  titleId,
144
+ optionsCache: Object.assign({}, optionsCache),
145
+ selectConfig: selectConfig_,
139
146
  loading: false,
140
147
  });
141
148
  }
@@ -199,14 +206,24 @@ export default class EntitySelect extends React.PureComponent {
199
206
  // })
200
207
  };
201
208
  }
209
+ componentDidUpdate(prevProps) {
210
+ const { baseCriteriaData, mainCode, fieldConfig } = this.props;
211
+ let { baseCriteriaData: preBaseCriteriaData, mainCode: preMainCode, fieldConfig: preFieldConfig } = prevProps;
212
+ if ((baseCriteriaData && JSON.stringify(baseCriteriaData) != JSON.stringify(preBaseCriteriaData)) || (mainCode && mainCode != preMainCode)
213
+ || (fieldConfig && preFieldConfig && fieldConfig.id != preFieldConfig.id)) {
214
+ this.setState({
215
+ optionsCache: {}
216
+ });
217
+ }
218
+ }
202
219
  render() {
203
220
  const { id, value, fieldConfig, onChange, disabled, style, maxSelected, onEntityClick } = this.props;
204
- const { optionCacheKey, loading } = this.state;
221
+ const { optionCacheKey, loading, optionsCache } = this.state;
205
222
  let initOptions = this.toOptions(value, onEntityClick);
206
223
  let exists;
207
224
  let properOptions = [...initOptions];
208
- if (optionCacheKey) {
209
- for (let option of this.optionsCache.get(optionCacheKey).options) {
225
+ if (optionCacheKey && optionsCache[optionCacheKey]) {
226
+ for (let option of optionsCache[optionCacheKey].options) {
210
227
  exists = false;
211
228
  for (let init of initOptions) {
212
229
  if (init['value'] == option['value']) {
@@ -1 +1 @@
1
- {"version":3,"file":"entity-select.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/entity-select/entity-select.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"entity-select.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/entity-select/entity-select.tsx"],"names":[],"mappings":"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"}
@@ -6,6 +6,7 @@ interface EntryControlProps {
6
6
  fieldConfig: FieldConfig;
7
7
  onChange?: any;
8
8
  id?: any;
9
+ baseCriteriaData?: object;
9
10
  }
10
11
  declare const EntryControl: React.FC<EntryControlProps>;
11
12
  export default EntryControl;
@@ -1 +1 @@
1
- {"version":3,"file":"entry-control.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/controls/entry-control.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAC,WAAW,EAAa,MAAM,mBAAmB,CAAC;AAwC1D,UAAU,iBAAiB;IACvB,QAAQ,CAAC,EAAC,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,WAAW,EAAE,WAAW,CAAC;IACzB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,EAAE,CAAC,EAAC,GAAG,CAAC;CACX;AAoND,QAAA,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAG7C,CAAA;AAED,eAAe,YAAY,CAAC"}
1
+ {"version":3,"file":"entry-control.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/controls/entry-control.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAC,WAAW,EAAa,MAAM,mBAAmB,CAAC;AAwC1D,UAAU,iBAAiB;IACvB,QAAQ,CAAC,EAAC,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,WAAW,EAAE,WAAW,CAAC;IACzB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,EAAE,CAAC,EAAC,GAAG,CAAC;IACR,gBAAgB,CAAC,EAAC,MAAM,CAAC;CAC5B;AAoND,QAAA,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAG7C,CAAA;AAED,eAAe,YAAY,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"entry-control.js","sourceRoot":"","sources":["../../../../src/aldehyde/controls/entry-control.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"entry-control.js","sourceRoot":"","sources":["../../../../src/aldehyde/controls/entry-control.tsx"],"names":[],"mappings":"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"}
@@ -14,6 +14,9 @@ export interface CustomPageRouterStat {
14
14
  * 自定义页面的路径映射
15
15
  */
16
16
  declare class CustomPageRouter extends React.PureComponent<CustomPageRouterProps, CustomPageRouterStat> {
17
+ goBackToLtmpl: () => void;
18
+ getMainCode: () => any;
19
+ getMenuId: () => string;
17
20
  render(): React.CElement<any, React.Component<any, any, any>>;
18
21
  }
19
22
  export default CustomPageRouter;
@@ -1 +1 @@
1
- {"version":3,"file":"custom-page-router.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/custom-page/custom-page-router.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAC,aAAa,EAAe,MAAM,UAAU,CAAC;AAGrD,MAAM,WAAW,qBAAsB,SAAQ,aAAa,CAAC,eAAe;CAE3E;AAED,MAAM,WAAW,oBAAoB;CAEpC;AAED;;;;;GAKG;AAQH;;GAEG;AACF,cAAM,gBAAiB,SAAQ,KAAK,CAAC,aAAa,CAAC,qBAAqB,EAAE,oBAAoB,CAAC;IAE5F,MAAM;CAST;AAED,eAAe,gBAAgB,CAAC"}
1
+ {"version":3,"file":"custom-page-router.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/custom-page/custom-page-router.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAC,aAAa,EAAe,MAAM,UAAU,CAAC;AAGrD,MAAM,WAAW,qBAAsB,SAAQ,aAAa,CAAC,eAAe;CAE3E;AAED,MAAM,WAAW,oBAAoB;CAEpC;AAED;;;;;GAKG;AAQH;;GAEG;AACF,cAAM,gBAAiB,SAAQ,KAAK,CAAC,aAAa,CAAC,qBAAqB,EAAE,oBAAoB,CAAC;IAE5F,aAAa,aASZ;IAED,WAAW,YAUV;IAED,SAAS,eAMR;IAED,MAAM;CAST;AAED,eAAe,gBAAgB,CAAC"}
@@ -20,6 +20,37 @@ import Units from "../units";
20
20
  * 自定义页面的路径映射
21
21
  */
22
22
  class CustomPageRouter extends React.PureComponent {
23
+ constructor() {
24
+ super(...arguments);
25
+ this.goBackToLtmpl = () => {
26
+ const { sourceId, } = this.props.match.params;
27
+ const { basePath } = this.props;
28
+ let url = `${basePath ? basePath + '/' : ""}/${sourceId}/act-table?menuId=${this.getMenuId()}`;
29
+ let mainCode = this.getMainCode();
30
+ if (mainCode) {
31
+ url = url + `&mainCode=${mainCode}`;
32
+ }
33
+ this.props.history.push(url);
34
+ };
35
+ this.getMainCode = () => {
36
+ const { location } = this.props;
37
+ let search = location.search;
38
+ let mainCode = undefined;
39
+ let criteriaData = Units.transQueryStrToParams(search);
40
+ if (search.indexOf('mainCode') > 0) {
41
+ criteriaData = Units.transQueryStrToParams(search);
42
+ mainCode = criteriaData['mainCode'];
43
+ }
44
+ return mainCode;
45
+ };
46
+ this.getMenuId = () => {
47
+ const { location } = this.props;
48
+ console.log("this.props.match.params", this.props);
49
+ var searchParams = new URLSearchParams(location.search);
50
+ let menuId = searchParams.get('menuId');
51
+ return menuId;
52
+ };
53
+ }
23
54
  render() {
24
55
  // console.log("CustomPageRouter",this.props);
25
56
  let pageName = this.props.match.params.pageName;
@@ -27,7 +58,7 @@ class CustomPageRouter extends React.PureComponent {
27
58
  let criteriaData = Units.transQueryStrToParams(search);
28
59
  let Page = ProgramConfig.getCustomPage("/" + pageName) || DefCustomPage;
29
60
  console.log("CustomPageRouter", Object.assign(Object.assign({}, this.props.match.params), criteriaData));
30
- return React.createElement(Page, Object.assign(Object.assign({}, this.props.match.params), criteriaData));
61
+ return React.createElement(Page, Object.assign(Object.assign(Object.assign({}, this.props.match.params), { goBack: this.goBackToLtmpl }), criteriaData));
31
62
  }
32
63
  }
33
64
  export default CustomPageRouter;
@@ -1 +1 @@
1
- {"version":3,"file":"custom-page-router.js","sourceRoot":"","sources":["../../../../src/aldehyde/custom-page/custom-page-router.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,aAAa,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAe,aAAa,EAAC,MAAM,UAAU,CAAC;AACrD,OAAO,KAAK,MAAM,UAAU,CAAC;AAI5B,CAAC;AAID,CAAC;AAEF;;;;;GAKG;AACH,mCAAmC;AACnC,+BAA+B;AAC/B,oCAAoC;AACpC,kCAAkC;AAClC,+BAA+B;AAC/B,IAAI;AAEJ;;GAEG;AACF,MAAM,gBAAiB,SAAQ,KAAK,CAAC,aAA0D;IAE5F,MAAM;QACF,8CAA8C;QAC9C,IAAI,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC;QAChD,IAAI,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC;QACxC,IAAI,YAAY,GAAG,KAAK,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;QACvD,IAAI,IAAI,GAAG,aAAa,CAAC,aAAa,CAAC,GAAG,GAAG,QAAQ,CAAC,IAAI,aAAa,CAAC;QACxE,OAAO,CAAC,GAAG,CAAC,kBAAkB,kCAAK,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,GAAK,YAAY,EAAE,CAAC;QAC9E,OAAO,KAAK,CAAC,aAAa,CAAC,IAAI,kCAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,GAAK,YAAY,EAAE,CAAC;IACpF,CAAC;CACJ;AAED,eAAe,gBAAgB,CAAC"}
1
+ {"version":3,"file":"custom-page-router.js","sourceRoot":"","sources":["../../../../src/aldehyde/custom-page/custom-page-router.tsx"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"menu-2layers.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-2layers.tsx"],"names":[],"mappings":";AAqGA,wBAAuC"}
1
+ {"version":3,"file":"menu-2layers.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-2layers.tsx"],"names":[],"mappings":";AAgFA,wBAAuC"}
@@ -54,32 +54,12 @@ class Menu2layers extends React.PureComponent {
54
54
  else {
55
55
  let openKey = blockMenu ? MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId) : undefined;
56
56
  let preOpenKey = blockMenu ? MenuRender.findOpenId(preBlockMenu.l1Menus, preMenuId) : undefined;
57
- if (openKey && openKey != preOpenKey) {
57
+ if ((!preOpenKey && openKey) || (openKey && openKey != preOpenKey)) {
58
58
  this.setState({
59
59
  openKeys: [openKey],
60
60
  });
61
61
  }
62
62
  }
63
- // let openKey = blockMenu?MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId):undefined;
64
- // if(openKey && openKeys.length<1){
65
- // this.setState({
66
- // openKeys:[openKey.toString()]
67
- // })
68
- // }else if(preMenuId!=currentL2MenuId){
69
- // console.log('currentL2MenuId:',currentL2MenuId);
70
- // if (openKey) {
71
- // if(openKeys.length==1){
72
- // openKeys.push(openKey.toString())
73
- // if (openKeys && openKeys.length > 1) {
74
- // openKeys.splice(0, 1);
75
- // }
76
- // }
77
- // this.setState({
78
- // openKeys,
79
- // })
80
- // }
81
- // }
82
- //}
83
63
  }
84
64
  render() {
85
65
  const _a = this.props, { blockMenu, collapsed, currentL2MenuId, basePath } = _a, other = __rest(_a, ["blockMenu", "collapsed", "currentL2MenuId", "basePath"]);
@@ -1 +1 @@
1
- {"version":3,"file":"menu-2layers.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-2layers.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"menu-2layers.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-2layers.tsx"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"ltmpl-route.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/routable/ltmpl-route.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAC,WAAW,EAAE,cAAc,EAAE,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAM/E,MAAM,WAAW,eAAgB,SAAQ,eAAe;CAEvD;AAED,MAAM,WAAW,eAAe;IAE5B,cAAc,EAAE,cAAc,CAAC;CAClC;AAED,cAAM,UAAW,SAAQ,KAAK,CAAC,aAAa,CAAC,eAAe,EAAE,eAAe,CAAC;IAC1E,MAAM,CAAE,YAAY;;MAEnB;IAED,KAAK;;MAEJ;IAEK,iBAAiB;IAIvB,OAAO,sBAEN;IAED,SAAS,eAMR;IAED,QAAQ,sBASP;IAEK,kBAAkB,CAAC,SAAS,KAAA;IAelC,QAAQ,SAAU,MAAM,iBAAc,OAAO,UAS5C;IAED,MAAM,SAAU,MAAM,QAAM,WAAW,iBAAc,OAAO,UAa3D;IAED,WAAW,YAUV;IAED,QAAQ,kBAAiB,OAAO,UAa/B;IAED,SAAS,cAAc,MAAM,YAAU,MAAM,UAI5C;IAED,QAAQ,yBAsBP;IAGD,MAAM;CA8BT;AAED,eAAe,UAAU,CAAC"}
1
+ {"version":3,"file":"ltmpl-route.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/routable/ltmpl-route.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAC,WAAW,EAAE,cAAc,EAAE,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAM/E,MAAM,WAAW,eAAgB,SAAQ,eAAe;CAEvD;AAED,MAAM,WAAW,eAAe;IAE5B,cAAc,EAAE,cAAc,CAAC;CAClC;AAED,cAAM,UAAW,SAAQ,KAAK,CAAC,aAAa,CAAC,eAAe,EAAE,eAAe,CAAC;IAC1E,MAAM,CAAE,YAAY;;MAEnB;IAED,KAAK;;MAEJ;IAEK,iBAAiB;IAIvB,OAAO,sBAEN;IAED,SAAS,eAMR;IAED,QAAQ,sBASP;IAEK,kBAAkB,CAAC,SAAS,KAAA;IAelC,QAAQ,SAAU,MAAM,iBAAc,OAAO,UAS5C;IAED,MAAM,SAAU,MAAM,QAAM,WAAW,iBAAc,OAAO,UAc3D;IAED,WAAW,YAUV;IAED,QAAQ,kBAAiB,OAAO,UAa/B;IAED,SAAS,cAAc,MAAM,YAAU,MAAM,UAI5C;IAED,QAAQ,yBAsBP;IAGD,MAAM;CA8BT;AAED,eAAe,UAAU,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"ltmpl-route.js","sourceRoot":"","sources":["../../../../src/aldehyde/routable/ltmpl-route.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,MAAM,UAAU,CAAC;AAC7B,OAAO,QAAQ,MAAM,oBAAoB,CAAA;AACzC,qDAAqD;AACrD,OAAO,YAAY,MAAM,wBAAwB,CAAC;AAIjD,CAAC;AAKD,CAAC;AAEF,MAAM,UAAW,SAAQ,KAAK,CAAC,aAA+C;IAA9E;;QAKI,UAAK,GAAG;YACJ,cAAc,EAAE,SAAS;SAC5B,CAAA;QAMD,YAAO,GAAG,CAAC,IAAI,EAAE,EAAE;YACf,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClC,CAAC,CAAA;QAED,cAAS,GAAC,GAAE,EAAE;YACV,MAAM,EAAC,QAAQ,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YAC9B,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAClD,IAAI,YAAY,GAAG,IAAI,eAAe,CAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;YACzD,IAAI,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACxC,OAAO,MAAM,CAAC;QAClB,CAAC,CAAA;QAED,aAAQ,GAAG,GAAS,EAAE;YAClB,MAAM,EAAC,QAAQ,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YAC9B,MAAM,EAAE,QAAQ,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC;YAC5C,IAAI,YAAY,GAAG,KAAK,CAAC,qBAAqB,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAC3E,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YACrE,IAAI,cAAc,GAAG,MAAM,YAAY,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;YACrE,IAAI,CAAC,QAAQ,CAAC;gBACV,cAAc;aACjB,CAAC,CAAA;QACN,CAAC,CAAA,CAAA;QAiBD,aAAQ,GAAG,CAAC,IAAY,EAAC,eAAqB,KAAK,EAAE,EAAE;YACnD,MAAM,EAAC,QAAQ,EAAC,GAAC,IAAI,CAAC,KAAK,CAAC;YAC5B,MAAM,EAAE,QAAQ,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC;YAC5C,MAAM,EAAC,cAAc,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YACpC,IAAI,IAAI,GAAG,GAAG,QAAQ,IAAI,QAAQ,qBAAqB,IAAI,WAAW,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;YACzF,IAAG,YAAY,IAAI,cAAc,CAAC,WAAW,CAAC,kBAAkB,EAAC;gBAC7D,IAAI,GAAC,GAAG,QAAQ,GAAG,cAAc,CAAC,WAAW,CAAC,kBAAkB,WAAW,IAAI,CAAC,SAAS,EAAE,aAAa,QAAQ,EAAE,CAAC;aACtH;YACD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC,CAAA;QAED,WAAM,GAAG,CAAC,IAAY,EAAC,IAAgB,EAAC,eAAqB,KAAK,EAAE,EAAE;YAClE,MAAM,EAAC,QAAQ,EAAC,GAAC,IAAI,CAAC,KAAK,CAAC;YAC5B,MAAM,EAAE,QAAQ,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC;YAC5C,MAAM,EAAC,cAAc,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YACpC,IAAI,QAAQ,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;YAClC,IAAI,IAAI,GAAG,GAAG,QAAQ,IAAI,QAAQ,qBAAqB,IAAI,WAAW,IAAI,CAAC,SAAS,EAAE,SAAS,IAAI,EAAE,CAAC;YACtG,IAAG,YAAY,IAAI,cAAc,CAAC,WAAW,CAAC,kBAAkB,EAAC;gBAC7D,IAAI,GAAC,GAAG,QAAQ,SAAS,QAAQ,GAAG,cAAc,CAAC,WAAW,CAAC,kBAAkB,SAAS,IAAI,WAAW,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;aAC/H;YACD,IAAI,QAAQ,EAAE;gBACV,IAAI,GAAG,IAAI,GAAG,aAAa,QAAQ,EAAE,CAAC;aACzC;YACD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC,CAAA;QAED,gBAAW,GAAG,GAAG,EAAE;YACf,MAAM,EAAC,QAAQ,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YAC9B,IAAI,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;YAC7B,IAAI,QAAQ,GAAG,SAAS,CAAC;YACzB,IAAI,YAAY,GAAG,KAAK,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;YACvD,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;gBAChC,YAAY,GAAG,KAAK,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;gBACnD,QAAQ,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC;aACvC;YACD,OAAO,QAAQ,CAAC;QACpB,CAAC,CAAA;QAED,aAAQ,GAAG,CAAC,eAAqB,KAAK,EAAE,EAAE;YACtC,MAAM,EAAC,QAAQ,EAAC,GAAC,IAAI,CAAC,KAAK,CAAC;YAC5B,MAAM,EAAE,QAAQ,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC;YAC5C,MAAM,EAAC,cAAc,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YACpC,IAAI,IAAI,GAAG,GAAG,QAAQ,IAAI,QAAQ,uBAAuB,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;YAC5E,IAAG,YAAY,IAAI,cAAc,CAAC,WAAW,CAAC,kBAAkB,EAAC;gBAC7D,IAAI,GAAC,GAAG,QAAQ,SAAS,QAAQ,GAAG,cAAc,CAAC,WAAW,CAAC,kBAAkB,WAAW,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;aAClH;YACD,IAAI,QAAQ,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;YAClC,IAAI,QAAQ,EAAE;gBACV,IAAI,GAAG,IAAI,GAAG,aAAa,QAAQ,EAAE,CAAC;aACzC;YACD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC,CAAA;QAED,cAAS,GAAG,CAAC,SAAgB,EAAC,QAAe,EAAE,EAAE;YAC7C,MAAM,EAAC,QAAQ,EAAC,GAAC,IAAI,CAAC,KAAK,CAAC;YAC5B,IAAI,IAAI,GAAG,GAAG,QAAQ,IAAI,SAAS,uBAAuB,QAAQ,WAAW,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;YAChG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC,CAAA;QAED,aAAQ,GAAG,CAAC,OAAO,EAAE,EAAE;YACnB,MAAM,EAAC,QAAQ,EAAC,GAAC,IAAI,CAAC,KAAK,CAAC;YAC5B,MAAM,EAAE,QAAQ,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC;YAC5C,qDAAqD;YAErD,IAAI,MAAM,qBAAO,OAAO,CAAC,CAAA;YACzB,mCAAmC;YACnC,IAAI,QAAQ,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;YAClC,IAAI,QAAQ,EAAE;gBACV,MAAM,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAC;aACjC;YACD,MAAM,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAC;YAC9B,MAAM,SAAS,GAAG,KAAK,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;YACvD,mBAAmB;YAClB,sDAAsD;YACtD,IAAI,CAAC,OAAO,CAAC,GAAG,QAAQ,IAAI,QAAQ,qBAAqB,IAAI,CAAC,SAAS,EAAE,IAAI,SAAS,EAAE,CAAC,CAAA;YACzF,SAAS;YACT,8CAA8C;YAC9C,IAAI;YACJ,SAAS;YACT,qEAAqE;YACrE,IAAI;QACR,CAAC,CAAA;IAiCL,CAAC;IA5JS,iBAAiB;;YACnB,IAAI,CAAC,QAAQ,EAAE,CAAC;QACpB,CAAC;KAAA;IAyBK,kBAAkB,CAAC,SAAS;;YAC9B,MAAM,EAAC,QAAQ,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YAC9B,MAAM,EAAE,QAAQ,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC;YAC5C,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAC,GAAG,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC;YACtD,IAAI,EAAC,QAAQ,EAAE,WAAW,EAAC,GAAG,SAAS,CAAC;YAExC,IAAK,CAAC,QAAQ;gBACV,CAAE,CAAC,WAAW,IAAI,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC;mBACzC,CAAC,QAAQ,CAAC,QAAQ,IAAI,WAAW,CAAC,QAAQ,IAAI,QAAQ,CAAC,MAAM,IAAI,WAAW,CAAC,MAAM,CAAC,EACzF;gBACE,OAAO;aACV;YACD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACpB,CAAC;KAAA;IAsFD,MAAM;QACF,MAAM,EAAC,cAAc,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QACpC,MAAM,EAAC,QAAQ,EAAE,KAAK,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QACrC,MAAM,EAAE,QAAQ,EAAC,GAAG,KAAK,CAAC,MAAM,CAAC;QACjC,IAAI,MAAM,GAAG,SAAS,CAAC;QACvB,IAAI,QAAQ,GAAG,SAAS,CAAC;QACzB,IAAI,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;QAC7B,IAAI,YAAY,GAAG,KAAK,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;QACvD,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YAC9B,MAAM,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;YAChC,YAAY,CAAC,QAAQ,CAAC,GAAC,SAAS,CAAC;SACpC;aAAO;YACJ,MAAM,GAAG,QAAQ,CAAC;SACrB;QACD,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;YAChC,YAAY,GAAG,KAAK,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;YACnD,QAAQ,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC;SACvC;QACD,IAAI,CAAC,cAAc,EAAE;YACjB,OAAO,yCAAK,CAAC;SAChB;aAAM;YACH,OAAO,oBAAC,QAAQ,IAAC,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EACrE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EACrE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,YAAY,EAC9C,WAAW,EAAE,cAAc,CAAC,WAAW,EACvC,SAAS,EAAE,IAAI,CAAC,SAAS,GACxC,CAAA;SACL;IAEL,CAAC;;AAnKO,uBAAY,GAAC;IACjB,QAAQ,EAAC,EAAE;CACd,CAAA;AAoKL,eAAe,UAAU,CAAC"}
1
+ {"version":3,"file":"ltmpl-route.js","sourceRoot":"","sources":["../../../../src/aldehyde/routable/ltmpl-route.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.39",
3
+ "version": "0.1.40",
4
4
  "author": "cosmicparticle",
5
5
  "main": "lib/index.js",
6
6
  "module": "src/aldehyde/index.txs",
@@ -18,6 +18,8 @@ interface InnerEntitySelectState {
18
18
  optionCacheKey: string,
19
19
  pageNo:number,
20
20
  loading: boolean,
21
+ optionsCache: object ;
22
+ selectConfig: SelectConfig
21
23
  };
22
24
 
23
25
  type OptionCache = {
@@ -45,11 +47,27 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
45
47
  optionCacheKey: undefined,
46
48
  pageNo:1,
47
49
  loading: false,
50
+ optionsCache: {},
51
+ selectConfig:undefined,
48
52
  }
49
53
 
50
- //没有过滤值的
51
- optionsCache: Map<string, OptionCache> = new Map();
52
- selectConfig: SelectConfig = undefined;
54
+ componentDidUpdate(prevProps) {
55
+ const {baseCriteriaData,mainCode,fieldConfig} = this.props;
56
+ let {baseCriteriaData:preBaseCriteriaData,mainCode:preMainCode,fieldConfig:preFieldConfig}=prevProps;
57
+ if((baseCriteriaData && JSON.stringify(baseCriteriaData) != JSON.stringify(preBaseCriteriaData) )||(mainCode && mainCode != preMainCode)
58
+ ||(fieldConfig && preFieldConfig && fieldConfig.id != preFieldConfig.id)){
59
+ this.setState({
60
+ optionsCache:{}
61
+ })
62
+ }
63
+ }
64
+
65
+ // componentWillUnmount(): void {
66
+ // this.setState=(state,callback)=>{
67
+ // return
68
+ // }
69
+ // }
70
+
53
71
 
54
72
  toOption = (code: string, title: string, onEntityClick) => {
55
73
  let option = {
@@ -97,9 +115,8 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
97
115
  }
98
116
 
99
117
  fetchNextPage = async () => {
100
-
101
- const {optionCacheKey, titleId} = this.state;
102
- let optionCache = this.optionsCache.get(optionCacheKey);
118
+ const {optionCacheKey, titleId,optionsCache} = this.state;
119
+ let optionCache = optionsCache[optionCacheKey];
103
120
  let pageInfo = optionCache.pageInfo;
104
121
  if (!optionCache.touchEnd) {
105
122
  pageInfo.pageNo = pageInfo.pageNo + 1;
@@ -116,35 +133,35 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
116
133
 
117
134
  fetchOptions = async (searchText) => {
118
135
  const { fieldConfig,mainCode,baseCriteriaData} = this.props;
119
-
120
- this.setState({
121
- loading: true,
122
- })
123
- let optionCacheKey = "withoutValue";
136
+ const {optionsCache,selectConfig}=this.state;
137
+ let optionCacheKey="withoutValue";
124
138
  //先从缓存里拿
125
139
  if (searchText) {
126
140
  optionCacheKey = searchText;
127
141
  }
128
142
  let titleId = this.state.titleId;
129
- let optionCache = this.optionsCache.get(optionCacheKey);
143
+ let optionCache = optionsCache[optionCacheKey];
130
144
  if (!optionCache) {
131
- if (!this.selectConfig) {
132
- this.selectConfig = await HCDataSource.requestSelectConfig( fieldConfig.id);
145
+ this.setState({
146
+ loading: true,
147
+ })
148
+ let selectConfig_=selectConfig;
149
+ if (!selectConfig_) {
150
+ selectConfig_ = await HCDataSource.requestSelectConfig( fieldConfig.id);
133
151
  }
134
152
  let pageInfo = {
135
153
  pageNo: 1,
136
154
  pageSize: 4,
137
155
  virtualEndPageNo: undefined,
138
156
  };
139
- let selectConfig = this.selectConfig;
140
- titleId = selectConfig.characteristicColumn.id;
157
+ titleId = selectConfig_.characteristicColumn.id;
141
158
  //得到第一个过滤条件
142
- let firstCriteria = selectConfig.primaryCriteria;
159
+ let firstCriteria = selectConfig_.primaryCriteria;
143
160
  let formItemName = 'undefinedCriteria';
144
161
  if (firstCriteria) {
145
162
  formItemName = 'c_' + firstCriteria.id;
146
163
  }
147
- const {defaultPageSize} = selectConfig;
164
+ const {defaultPageSize} = selectConfig_;
148
165
  if (defaultPageSize) {
149
166
  pageInfo.pageSize = defaultPageSize;
150
167
  }
@@ -166,10 +183,12 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
166
183
  searchValue: searchText,
167
184
  touchEnd: sourceData.touchEnd
168
185
  };
169
- this.optionsCache.set(optionCacheKey, optionCache);
186
+ optionsCache[optionCacheKey]=optionCache;
170
187
  this.setState({
171
188
  optionCacheKey,
172
189
  titleId,
190
+ optionsCache:{...optionsCache},
191
+ selectConfig:selectConfig_,
173
192
  loading: false,
174
193
  })
175
194
  } else {
@@ -241,12 +260,12 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
241
260
 
242
261
  render() {
243
262
  const {id,value, fieldConfig, onChange,disabled, style, maxSelected, onEntityClick} = this.props;
244
- const {optionCacheKey, loading} = this.state;
263
+ const {optionCacheKey, loading,optionsCache} = this.state;
245
264
  let initOptions = this.toOptions(value, onEntityClick);
246
265
  let exists;
247
266
  let properOptions = [...initOptions];
248
- if (optionCacheKey) {
249
- for (let option of this.optionsCache.get(optionCacheKey).options) {
267
+ if (optionCacheKey && optionsCache[optionCacheKey]) {
268
+ for (let option of optionsCache[optionCacheKey].options) {
250
269
  exists = false;
251
270
  for (let init of initOptions) {
252
271
  if (init['value'] == option['value']) {
@@ -45,6 +45,7 @@ interface EntryControlProps {
45
45
  fieldConfig: FieldConfig;
46
46
  onChange?: any;
47
47
  id?:any;
48
+ baseCriteriaData?:object,
48
49
  }
49
50
 
50
51
  function getOptions(mstrucId) {
@@ -29,6 +29,37 @@ export interface CustomPageRouterStat {
29
29
  */
30
30
  class CustomPageRouter extends React.PureComponent<CustomPageRouterProps, CustomPageRouterStat> {
31
31
 
32
+ goBackToLtmpl=()=>{
33
+ const { sourceId,} = this.props.match.params;
34
+ const {basePath}=this.props;
35
+ let url=`${basePath?basePath+'/':""}/${sourceId}/act-table?menuId=${this.getMenuId()}`;
36
+ let mainCode=this.getMainCode();
37
+ if(mainCode){
38
+ url=url+`&mainCode=${mainCode}`;
39
+ }
40
+ this.props.history.push(url);
41
+ }
42
+
43
+ getMainCode = () => {
44
+ const {location} = this.props;
45
+ let search = location.search;
46
+ let mainCode = undefined;
47
+ let criteriaData = Units.transQueryStrToParams(search);
48
+ if (search.indexOf('mainCode') > 0) {
49
+ criteriaData = Units.transQueryStrToParams(search);
50
+ mainCode = criteriaData['mainCode'];
51
+ }
52
+ return mainCode;
53
+ }
54
+
55
+ getMenuId=()=>{
56
+ const {location} = this.props;
57
+ console.log("this.props.match.params",this.props);
58
+ var searchParams = new URLSearchParams( location.search);
59
+ let menuId = searchParams.get('menuId');
60
+ return menuId;
61
+ }
62
+
32
63
  render() {
33
64
  // console.log("CustomPageRouter",this.props);
34
65
  let pageName = this.props.match.params.pageName;
@@ -36,7 +67,7 @@ export interface CustomPageRouterStat {
36
67
  let criteriaData = Units.transQueryStrToParams(search);
37
68
  let Page = ProgramConfig.getCustomPage("/" + pageName) || DefCustomPage;
38
69
  console.log("CustomPageRouter",{...this.props.match.params, ...criteriaData});
39
- return React.createElement(Page, {...this.props.match.params, ...criteriaData});
70
+ return React.createElement(Page, {...this.props.match.params,goBack:this.goBackToLtmpl, ...criteriaData});
40
71
  }
41
72
  }
42
73
 
@@ -33,7 +33,7 @@ class Menu2layers extends React.PureComponent<Menu2layersProps, Menu2layersState
33
33
  let {currentL2MenuId:preMenuId,blockMenu:preBlockMenu}=prevProps;
34
34
  const {openKeys} = this.state;
35
35
 
36
- if(!preBlockMenu || !blockMenu || blockMenu.id!=preBlockMenu.id){
36
+ if(!preBlockMenu || !blockMenu || blockMenu.id!=preBlockMenu.id ){
37
37
  //console.log('currentL2MenuId:',currentL2MenuId);
38
38
  let openKey = blockMenu?MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId):undefined;
39
39
  if (openKey) {
@@ -44,33 +44,12 @@ class Menu2layers extends React.PureComponent<Menu2layersProps, Menu2layersState
44
44
  }else {
45
45
  let openKey = blockMenu?MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId):undefined;
46
46
  let preOpenKey = blockMenu?MenuRender.findOpenId(preBlockMenu.l1Menus, preMenuId):undefined;
47
- if(openKey && openKey!=preOpenKey){
47
+ if((!preOpenKey && openKey) || (openKey && openKey!=preOpenKey)){
48
48
  this.setState({
49
49
  openKeys:[openKey],
50
50
  })
51
51
  }
52
52
  }
53
-
54
- // let openKey = blockMenu?MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId):undefined;
55
- // if(openKey && openKeys.length<1){
56
- // this.setState({
57
- // openKeys:[openKey.toString()]
58
- // })
59
- // }else if(preMenuId!=currentL2MenuId){
60
- // console.log('currentL2MenuId:',currentL2MenuId);
61
- // if (openKey) {
62
- // if(openKeys.length==1){
63
- // openKeys.push(openKey.toString())
64
- // if (openKeys && openKeys.length > 1) {
65
- // openKeys.splice(0, 1);
66
- // }
67
- // }
68
- // this.setState({
69
- // openKeys,
70
- // })
71
- // }
72
- // }
73
- //}
74
53
  }
75
54
 
76
55
  handleOpen = (openKeys) => {
@@ -81,6 +81,7 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
81
81
  const { sourceId} = this.props.match.params;
82
82
  const {ltmplConfigRes} = this.state;
83
83
  let mainCode = this.getMainCode();
84
+
84
85
  let path = `${basePath}/${sourceId}/detail-edit?code=${code}&menuId=${this.getMenuId()}&mode=${mode}`;
85
86
  if(toCustomPage && ltmplConfigRes.ltmplConfig.customEditPagePath){
86
87
  path=`${basePath}/page-${sourceId}${ltmplConfigRes.ltmplConfig.customEditPagePath}?code=${code}&menuId=${this.getMenuId()}`;