aldehyde 0.2.78 → 0.2.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.
Files changed (63) hide show
  1. package/lib/controls/action/index.js +1 -1
  2. package/lib/controls/action/index.js.map +1 -1
  3. package/lib/controls/action/utils.d.ts +3 -2
  4. package/lib/controls/action/utils.d.ts.map +1 -1
  5. package/lib/controls/action/utils.js +23 -17
  6. package/lib/controls/action/utils.js.map +1 -1
  7. package/lib/form/form-Item-group.d.ts.map +1 -1
  8. package/lib/form/form-Item-group.js +0 -7
  9. package/lib/form/form-Item-group.js.map +1 -1
  10. package/lib/layout/menu/l2menu-message-bar.d.ts.map +1 -1
  11. package/lib/layout/menu/l2menu-message-bar.js +4 -1
  12. package/lib/layout/menu/l2menu-message-bar.js.map +1 -1
  13. package/lib/layout/menu/l2menu-quick-bar.d.ts.map +1 -1
  14. package/lib/layout/menu/l2menu-quick-bar.js +4 -1
  15. package/lib/layout/menu/l2menu-quick-bar.js.map +1 -1
  16. package/lib/layout/menu/menu-render.d.ts.map +1 -1
  17. package/lib/layout/menu/menu-render.js +21 -2
  18. package/lib/layout/menu/menu-render.js.map +1 -1
  19. package/lib/tmpl/hc-data-source.d.ts +2 -3
  20. package/lib/tmpl/hc-data-source.d.ts.map +1 -1
  21. package/lib/tmpl/hc-data-source.js +52 -31
  22. package/lib/tmpl/hc-data-source.js.map +1 -1
  23. package/lib/tmpl/hcservice-v3.d.ts +1 -4
  24. package/lib/tmpl/hcservice-v3.d.ts.map +1 -1
  25. package/lib/tmpl/hcservice-v3.js +34 -75
  26. package/lib/tmpl/hcservice-v3.js.map +1 -1
  27. package/lib/tmpl/interface.d.ts +5 -0
  28. package/lib/tmpl/interface.d.ts.map +1 -1
  29. package/lib/tmpl/interface.js.map +1 -1
  30. package/lib/tmpl/superagent.d.ts.map +1 -1
  31. package/lib/tmpl/superagent.js +3 -2
  32. package/lib/tmpl/superagent.js.map +1 -1
  33. package/lib/tmpl/tmpl-config-analysis.d.ts +2 -1
  34. package/lib/tmpl/tmpl-config-analysis.d.ts.map +1 -1
  35. package/lib/tmpl/tmpl-config-analysis.js +48 -0
  36. package/lib/tmpl/tmpl-config-analysis.js.map +1 -1
  37. package/lib/units/index.d.ts.map +1 -1
  38. package/lib/units/index.js +7 -2
  39. package/lib/units/index.js.map +1 -1
  40. package/lib/welcome/HCWelcome.js +1 -2
  41. package/lib/welcome/HCWelcome.js.map +1 -1
  42. package/lib/welcome/quick-entrance.d.ts.map +1 -1
  43. package/lib/welcome/quick-entrance.js +7 -1
  44. package/lib/welcome/quick-entrance.js.map +1 -1
  45. package/lib/welcome/workbench.d.ts.map +1 -1
  46. package/lib/welcome/workbench.js +7 -1
  47. package/lib/welcome/workbench.js.map +1 -1
  48. package/package.json +1 -1
  49. package/src/aldehyde/controls/action/index.tsx +1 -1
  50. package/src/aldehyde/controls/action/utils.tsx +25 -20
  51. package/src/aldehyde/form/form-Item-group.tsx +1 -7
  52. package/src/aldehyde/layout/menu/l2menu-message-bar.tsx +5 -1
  53. package/src/aldehyde/layout/menu/l2menu-quick-bar.tsx +4 -1
  54. package/src/aldehyde/layout/menu/menu-render.tsx +22 -3
  55. package/src/aldehyde/tmpl/hc-data-source.tsx +96 -69
  56. package/src/aldehyde/tmpl/hcservice-v3.tsx +32 -69
  57. package/src/aldehyde/tmpl/interface.tsx +5 -1
  58. package/src/aldehyde/tmpl/superagent.js +4 -2
  59. package/src/aldehyde/tmpl/tmpl-config-analysis.tsx +54 -1
  60. package/src/aldehyde/units/index.tsx +7 -2
  61. package/src/aldehyde/welcome/HCWelcome.js +1 -1
  62. package/src/aldehyde/welcome/quick-entrance.tsx +7 -1
  63. package/src/aldehyde/welcome/workbench.tsx +7 -1
@@ -8,7 +8,8 @@ import {
8
8
  Level2Menu,
9
9
  LtmplConfig,
10
10
  LtmplConfigRes,
11
- SelectConfig, TtmplConfig
11
+ SelectConfig,
12
+ TtmplConfig
12
13
  } from "./interface";
13
14
  import HcserviceV3 from './hcservice-v3';
14
15
  import ControlTypeSupportor from './control-type-supportor'
@@ -16,9 +17,10 @@ import {message} from "antd";
16
17
 
17
18
  const blocksCache: BlockMenu[] = [];
18
19
  let programName;
19
- const quickEntranceCache: Level2Menu[] = [];
20
- const messageCache: Level2Menu[] = [];
21
- const workbenchCache: Level2Menu[] = [];
20
+ // const quickEntranceCache: Level2Menu[] = [];
21
+ // const messageCache: Level2Menu[] = [];
22
+ // const workbenchCache: Level2Menu[] = [];
23
+ const fastMenuCache: Map<string, Level2Menu[]> = new Map<string, Level2Menu[]>();
22
24
  const enumMap: Map<string, EnumItem[]> = new Map<string, EnumItem[]>();//key mstrucId
23
25
  // const optionsMap: Map<string, EnumItem[]> = new Map<string, EnumItem[]>();//key mstrucId
24
26
  const selectConfigMap: Map<string, SelectConfig> = new Map<string, SelectConfig>();
@@ -59,7 +61,7 @@ function findUnloadEnumMstrucIdOfActions(actions: ActionConfig[]) {
59
61
  }
60
62
 
61
63
 
62
- async function loadEnumOfDtmplConfig(serverKey:string,selectConfig: DtmplConfig) {
64
+ async function loadEnumOfDtmplConfig(serverKey: string, selectConfig: DtmplConfig) {
63
65
  const mstrucIds = [];
64
66
  if (selectConfig.groups) {
65
67
  selectConfig.groups.forEach(group => {
@@ -69,7 +71,7 @@ async function loadEnumOfDtmplConfig(serverKey:string,selectConfig: DtmplConfig)
69
71
  }
70
72
  let subs = findUnloadEnumMstrucIdOfActions(selectConfig.actions);
71
73
  concat(mstrucIds, subs);
72
- await loadEnum(serverKey,mstrucIds);
74
+ await loadEnum(serverKey, mstrucIds);
73
75
  }
74
76
 
75
77
  function concat(mstrucIds, sub) {
@@ -83,16 +85,16 @@ function concat(mstrucIds, sub) {
83
85
  return mstrucIds;
84
86
  }
85
87
 
86
- async function loadEnumOfSelectConfig(serverKey:string,selectConfig: SelectConfig) {
88
+ async function loadEnumOfSelectConfig(serverKey: string, selectConfig: SelectConfig) {
87
89
  const mstrucIds = [];
88
90
  let subs = findUnloadEnumMstrucIdOfFields(selectConfig.columns);
89
91
  concat(mstrucIds, subs);
90
92
  subs = findUnloadEnumMstrucIdOfFields(selectConfig.criterias);
91
93
  concat(mstrucIds, subs);
92
- await loadEnum(serverKey,mstrucIds);
94
+ await loadEnum(serverKey, mstrucIds);
93
95
  }
94
96
 
95
- async function loadEnumOfLtmplConfig(serverKey:string,selectConfig: LtmplConfig) {
97
+ async function loadEnumOfLtmplConfig(serverKey: string, selectConfig: LtmplConfig) {
96
98
  const mstrucIds = [];
97
99
  let subs = findUnloadEnumMstrucIdOfFields(selectConfig.columns);
98
100
  concat(mstrucIds, subs);
@@ -106,12 +108,12 @@ async function loadEnumOfLtmplConfig(serverKey:string,selectConfig: LtmplConfig)
106
108
  concat(mstrucIds, subs);
107
109
  subs = findUnloadEnumMstrucIdOfActions(selectConfig.rowActions);
108
110
  concat(mstrucIds, subs);
109
- await loadEnum(serverKey,mstrucIds);
111
+ await loadEnum(serverKey, mstrucIds);
110
112
  }
111
113
 
112
- async function loadEnum(serverKey:string,mstrucIds: string[], path?: string) {
114
+ async function loadEnum(serverKey: string, mstrucIds: string[], path?: string) {
113
115
  if (mstrucIds && mstrucIds.length > 0) {
114
- let reqEnum = await HcserviceV3.requestEnum(serverKey,mstrucIds, path);
116
+ let reqEnum = await HcserviceV3.requestEnum(serverKey, mstrucIds, path);
115
117
  for (let key in reqEnum) {
116
118
  let ems = reqEnum[key];
117
119
  for (let option of ems) {
@@ -129,22 +131,22 @@ function HCDataSource() {
129
131
 
130
132
  }
131
133
 
132
- HCDataSource.loadEnumOfFields = async function (serverKey:string,fields: FieldBase[]) {
134
+ HCDataSource.loadEnumOfFields = async function (serverKey: string, fields: FieldBase[]) {
133
135
  const mstrucIds = findUnloadEnumMstrucIdOfFields(fields);
134
- await loadEnum(serverKey,mstrucIds);
136
+ await loadEnum(serverKey, mstrucIds);
135
137
  }
136
138
 
137
- HCDataSource.loadEnumOfFieldsWithPath = async function (serverKey:string,fields: FieldBase[], path: string) {
139
+ HCDataSource.loadEnumOfFieldsWithPath = async function (serverKey: string, fields: FieldBase[], path: string) {
138
140
  const mstrucIds = findUnloadEnumMstrucIdOfFields(fields);
139
- await loadEnum(serverKey,mstrucIds, path);
141
+ await loadEnum(serverKey, mstrucIds, path);
140
142
  }
141
143
 
142
- HCDataSource.getOptions = async function (serverKey:string,mstrucId: string) {
144
+ HCDataSource.getOptions = async function (serverKey: string, mstrucId: string) {
143
145
  if (!mstrucId) {
144
146
  return null;
145
147
  }
146
148
  if (!enumMap.has(mstrucId)) {
147
- let reqOptions = await HcserviceV3.requestOptions(serverKey,mstrucId)[mstrucId];
149
+ let reqOptions = await HcserviceV3.requestOptions(serverKey, mstrucId)[mstrucId];
148
150
  if (reqOptions != null) {
149
151
  for (let option of reqOptions) {
150
152
  if (option['css']) {
@@ -159,66 +161,66 @@ HCDataSource.getOptions = async function (serverKey:string,mstrucId: string) {
159
161
  return enumMap.get(mstrucId);
160
162
  }
161
163
 
162
- HCDataSource.requestLtmplConfig = async function (serverKey:string,sourceId: string) {
164
+ HCDataSource.requestLtmplConfig = async function (serverKey: string, sourceId: string) {
163
165
  if (!ltmplConfigMap.has(sourceId)) {
164
- ltmplConfigMap.set(sourceId, await HcserviceV3.requestLtmplConfig(serverKey,sourceId));
166
+ ltmplConfigMap.set(sourceId, await HcserviceV3.requestLtmplConfig(serverKey, sourceId));
165
167
  //加载枚举
166
168
  let res: LtmplConfigRes = ltmplConfigMap.get(sourceId);
167
- await loadEnumOfLtmplConfig(serverKey,res.ltmplConfig);
169
+ await loadEnumOfLtmplConfig(serverKey, res.ltmplConfig);
168
170
  }
169
171
  return ltmplConfigMap.get(sourceId);
170
172
  };
171
- HCDataSource.requestL2LtmplConfig = async function (serverKey:string,sourceId: string) {
173
+ HCDataSource.requestL2LtmplConfig = async function (serverKey: string, sourceId: string) {
172
174
  if (!l2LtmplConfigMap.has(sourceId)) {
173
- l2LtmplConfigMap.set(sourceId, await HcserviceV3.requestL2LtmplConfig(serverKey,sourceId));
175
+ l2LtmplConfigMap.set(sourceId, await HcserviceV3.requestL2LtmplConfig(serverKey, sourceId));
174
176
  //加载枚举
175
177
  let res: LtmplConfigRes = l2LtmplConfigMap.get(sourceId);
176
- await loadEnumOfLtmplConfig(serverKey,res.ltmplConfig);
178
+ await loadEnumOfLtmplConfig(serverKey, res.ltmplConfig);
177
179
  }
178
180
  return l2LtmplConfigMap.get(sourceId);
179
181
  };
180
182
 
181
183
 
182
- HCDataSource.requestSelectConfig = async function (serverKey:string,sourceId: string) {
184
+ HCDataSource.requestSelectConfig = async function (serverKey: string, sourceId: string) {
183
185
  if (!selectConfigMap.has(sourceId)) {
184
- selectConfigMap.set(sourceId, await HcserviceV3.requestSelectConfig(serverKey,sourceId));
186
+ selectConfigMap.set(sourceId, await HcserviceV3.requestSelectConfig(serverKey, sourceId));
185
187
  //加载枚举
186
- await loadEnumOfSelectConfig(serverKey,selectConfigMap.get(sourceId));
188
+ await loadEnumOfSelectConfig(serverKey, selectConfigMap.get(sourceId));
187
189
  }
188
190
  return selectConfigMap.get(sourceId);
189
191
  };
190
- HCDataSource.requestDtmplConfig = async function (serverKey:string,sourceId: string) {
192
+ HCDataSource.requestDtmplConfig = async function (serverKey: string, sourceId: string) {
191
193
  if (!dtmplConfigMap.has(sourceId)) {
192
- dtmplConfigMap.set(sourceId, await HcserviceV3.requestDtmplConfig(serverKey,sourceId));
194
+ dtmplConfigMap.set(sourceId, await HcserviceV3.requestDtmplConfig(serverKey, sourceId));
193
195
  //加载枚举
194
- await loadEnumOfDtmplConfig(serverKey,dtmplConfigMap.get(sourceId));
196
+ await loadEnumOfDtmplConfig(serverKey, dtmplConfigMap.get(sourceId));
195
197
  }
196
198
  return dtmplConfigMap.get(sourceId);
197
199
  };
198
200
 
199
- HCDataSource.requestTtmplConfig = async function (serverKey:string,sourceId: string) {
201
+ HCDataSource.requestTtmplConfig = async function (serverKey: string, sourceId: string) {
200
202
  if (!ttmplConfigMap.has(sourceId)) {
201
- let res= await HcserviceV3.requestTtmplConfig(serverKey,sourceId);
203
+ let res = await HcserviceV3.requestTtmplConfig(serverKey, sourceId);
202
204
  ttmplConfigMap.set(sourceId, res);
203
205
  ttmplConfigMap.set(res.id, res);
204
206
  }
205
207
  return ttmplConfigMap.get(sourceId);
206
208
  };
207
209
 
208
- HCDataSource.requestViewDtmplConfig = async function (serverKey:string,sourceId: string) {
210
+ HCDataSource.requestViewDtmplConfig = async function (serverKey: string, sourceId: string) {
209
211
  if (!viewDtmplConfigMap.has(sourceId)) {
210
- viewDtmplConfigMap.set(sourceId, await HcserviceV3.requestViewDtmplConfig(serverKey,sourceId));
212
+ viewDtmplConfigMap.set(sourceId, await HcserviceV3.requestViewDtmplConfig(serverKey, sourceId));
211
213
  //加载枚举
212
- await loadEnumOfDtmplConfig(serverKey,viewDtmplConfigMap.get(sourceId));
214
+ await loadEnumOfDtmplConfig(serverKey, viewDtmplConfigMap.get(sourceId));
213
215
  }
214
216
  return viewDtmplConfigMap.get(sourceId);
215
217
  };
216
218
 
217
- HCDataSource.requestAddDtmplConfig = async function (serverKey:string,sourceId: string) {
219
+ HCDataSource.requestAddDtmplConfig = async function (serverKey: string, sourceId: string) {
218
220
  if (!addDtmplConfigMap.has(sourceId)) {
219
- addDtmplConfigMap.set(sourceId, await HcserviceV3.requestAddDtmplConfig(serverKey,sourceId));
221
+ addDtmplConfigMap.set(sourceId, await HcserviceV3.requestAddDtmplConfig(serverKey, sourceId));
220
222
  //加载枚举
221
- await loadEnumOfDtmplConfig(serverKey,addDtmplConfigMap.get(sourceId));
223
+ await loadEnumOfDtmplConfig(serverKey, addDtmplConfigMap.get(sourceId));
222
224
  }
223
225
  return addDtmplConfigMap.get(sourceId);
224
226
  };
@@ -260,56 +262,80 @@ HCDataSource.requestBlocks = async (l2MenuId: string, blockId: string) => {
260
262
  for (let block of blockRes.blocks) {
261
263
  blocksCache.push(block);
262
264
  }
263
- programName=blockRes.programName;
265
+ programName = blockRes.programName;
264
266
  result = {
265
267
  blocks: blockRes.blocks,
266
268
  l2MenuId: blockRes.l2MenuId,
267
269
  blockId: blockRes.blockId,
268
- programName:blockRes.programName,
270
+ programName: blockRes.programName,
269
271
  };
270
272
  } else {
271
273
  result = {
272
274
  blocks: blocksCache,
273
- blockId, l2MenuId,programName
275
+ blockId, l2MenuId, programName
274
276
  };
275
277
  }
276
278
 
277
279
  return result;
278
280
  }
279
281
 
280
- HCDataSource.quickEntranceMenus = async () => {
281
- let result: Level2Menu[];
282
- if (quickEntranceCache.length < 1) {
283
- let quicks = await HcserviceV3.requestFaceplate_menu();
284
- if (quicks) {
285
- quickEntranceCache.splice(0, quickEntranceCache.length);
286
- quickEntranceCache.push(...quicks);
287
- }
288
- }
289
- return [...quickEntranceCache];
290
- }
282
+ HCDataSource.initfastMenu = async () => {
283
+ // let result:Map<string,Level2Menu[]> ;
284
+ if (fastMenuCache.size < 1) {
285
+ let re = await HcserviceV3.requestFastMenu();
291
286
 
292
- HCDataSource.messageMenus = async () => {
293
- let result: Level2Menu[];
294
- if (messageCache.length < 1) {
295
- let bars = await HcserviceV3.requestMessagebar();
296
- if (bars) {
297
- messageCache.push(...bars);
287
+ if (re) {
288
+ for (let e in re) {
289
+ fastMenuCache.set(e, re[e]);
290
+ }
298
291
  }
299
292
  }
300
- return [...messageCache];
301
293
  }
302
294
 
303
- HCDataSource.workbenchMenus = async () => {
304
- if (workbenchCache.length < 1) {
305
- let sm= await HcserviceV3.requestFaceplateStatistic_menu();
306
- if(sm){
307
- workbenchCache.push(...sm);
308
- }
295
+ HCDataSource.fastMenu = async (key: string) => {
296
+ // let result:Map<string,Level2Menu[]> ;
297
+ if (fastMenuCache.size < 1) {
298
+ await HCDataSource.initfastMenu()
309
299
  }
310
- return [...workbenchCache];
300
+
301
+ return fastMenuCache.get(key);
302
+
311
303
  }
312
304
 
305
+
306
+ // HCDataSource.quickEntranceMenus = async () => {
307
+ // let result: Level2Menu[];
308
+ // if (quickEntranceCache.length < 1) {
309
+ // let quicks = await HcserviceV3.requestFaceplate_menu();
310
+ // if (quicks) {
311
+ // quickEntranceCache.splice(0, quickEntranceCache.length);
312
+ // quickEntranceCache.push(...quicks);
313
+ // }
314
+ // }
315
+ // return [...quickEntranceCache];
316
+ // }
317
+
318
+ // HCDataSource.messageMenus = async () => {
319
+ // let result: Level2Menu[];
320
+ // if (messageCache.length < 1) {
321
+ // let bars = await HcserviceV3.requestMessagebar();
322
+ // if (bars) {
323
+ // messageCache.push(...bars);
324
+ // }
325
+ // }
326
+ // return [...messageCache];
327
+ // }
328
+ //
329
+ // HCDataSource.workbenchMenus = async () => {
330
+ // if (workbenchCache.length < 1) {
331
+ // let sm= await HcserviceV3.requestFaceplateStatistic_menu();
332
+ // if(sm){
333
+ // workbenchCache.push(...sm);
334
+ // }
335
+ // }
336
+ // return [...workbenchCache];
337
+ // }
338
+
313
339
  HCDataSource.reload = async function (roles: string[]) {
314
340
  // if(roles.includes("admin")){
315
341
  let res = await HcserviceV3.reload();
@@ -339,6 +365,7 @@ HCDataSource.getFromCache = function (code: string) {
339
365
 
340
366
 
341
367
  HCDataSource.clear = async function () {
368
+ fastMenuCache.clear();
342
369
  enumMap.clear();
343
370
  ltmplConfigMap.clear();
344
371
  dtmplConfigMap.clear();
@@ -348,9 +375,9 @@ HCDataSource.clear = async function () {
348
375
  l2LtmplConfigMap.clear();
349
376
  // optionsMap.clear();
350
377
  blocksCache.splice(0, blocksCache.length);
351
- quickEntranceCache.splice(0, quickEntranceCache.length);
352
- messageCache.splice(0, quickEntranceCache.length);
353
- workbenchCache.splice(0, workbenchCache.length);
378
+ // quickEntranceCache.splice(0, quickEntranceCache.length);
379
+ // messageCache.splice(0, quickEntranceCache.length);
380
+ // workbenchCache.splice(0, workbenchCache.length);
354
381
  objctCacheMap.clear();
355
382
  };
356
383
 
@@ -565,23 +565,23 @@ export default class HcserviceV3 {
565
565
  return res.text;
566
566
  }
567
567
 
568
- static async requestFaceplate_menu() {
569
- let url = `/v3/menu/faceplate`
570
- let res = await Super.super({
571
- url: url,
572
- method: "GET",
573
- });
574
- return res.l2Menus;
575
- }
568
+ // static async requestFaceplate_menu() {
569
+ // let url = `/v3/menu/faceplate`
570
+ // let res = await Super.super({
571
+ // url: url,
572
+ // method: "GET",
573
+ // });
574
+ // return res.l2Menus;
575
+ // }
576
576
 
577
- static async requestFaceplateStatistic_menu() {
578
- let url = `/v3/menu/faceplate-statistic`
579
- let res = await Super.super({
580
- url: url,
581
- method: "GET",
582
- });
583
- return res.l2Menus;
584
- }
577
+ // static async requestFaceplateStatistic_menu() {
578
+ // let url = `/v3/menu/faceplate-statistic`
579
+ // let res = await Super.super({
580
+ // url: url,
581
+ // method: "GET",
582
+ // });
583
+ // return res.l2Menus;
584
+ // }
585
585
 
586
586
  static async requestBlocks(l2MenuId: string, blockId: string) {
587
587
  let url = `/v3/menu/blocks`
@@ -712,69 +712,32 @@ export default class HcserviceV3 {
712
712
  return res.user;
713
713
  }
714
714
 
715
- static async requestMessagebar() {
716
- let url = `/v3/menu/messagebar`
717
- let res = await Super.super({
718
- url: url,
719
- method: "GET",
720
- })
721
- return res.l2Menus;
722
- }
723
-
724
- static async requestSimpleCharts() {
725
- let url = `/v3/menu/simple-charts`
726
- let res = await Super.super({
727
- url: url,
728
- method: "GET",
729
- })
730
- return res.l2Menus;
731
- }
732
-
733
- // static async requestKsList(path, params, depth = 1, pageinfo = {pageNo: 1, pageSize: 100}) {
734
- // let url = Units.joinPath("/v3/ks/list", path)
715
+ // static async requestMessagebar() {
716
+ // let url = `/v3/menu/messagebar`
735
717
  // let res = await Super.super({
736
718
  // url: url,
737
719
  // method: "GET",
738
- // query: {
739
- // depth,
740
- // ...params,
741
- // pageNo: pageinfo.pageNo,
742
- // pageSize: pageinfo.pageSize
743
- // }
744
- // });
745
- // //console.log("ks list:", res);
746
- // if (res.status == 'error') {
747
- // return null;
748
- // } else {
749
- // return res.result;
750
- // }
751
- //
720
+ // })
721
+ // return res.l2Menus;
752
722
  // }
753
723
 
754
- // static async requestKsListTopPage(queryKey, pageNo, pageSize) {
755
- // let url = `/v3/ks/query/data`
724
+ // static async requestSimpleCharts() {
725
+ // let url = `/v3/menu/simple-charts`
756
726
  // let res = await Super.super({
757
727
  // url: url,
758
728
  // method: "GET",
759
- // query: {
760
- // pageNo,
761
- // pageSize, queryKey
762
- // }
763
- // });
764
- // //console.log("requestKsListToPage:", res);
765
- // return res.result;
729
+ // })
730
+ // return res.l2Menus;
766
731
  // }
767
732
 
768
- // static async requestKsUnique(path: string, depth = 1) {
769
- // let url = Units.joinPath("/v3/ks/unique", path)
770
- // let res = await Super.super({
771
- // url: url,
772
- // depth,
773
- // method: "GET",
774
- // });
775
- // //console.log("ks unique:", res);
776
- // return res.result;
777
- // }
733
+ static async requestFastMenu() {
734
+ let url = `/v3/menu/fast-menu`
735
+ let res = await Super.super({
736
+ url: url,
737
+ method: "GET",
738
+ })
739
+ return res.fastMenu;
740
+ }
778
741
 
779
742
  static async reload() {
780
743
  let url = `/v3/tmpl/reload`
@@ -83,6 +83,8 @@ export interface Level2Menu extends MenuBase {
83
83
  customPath?: string;
84
84
  displayTotal?: boolean;
85
85
  count?:number;
86
+ disabled?:boolean;
87
+ hiddenOnDisabled?:boolean;
86
88
  defaultCriteriaValue?:object,
87
89
  pageType:'列表'|'详情'|'编辑'|'添加'|'编辑或添加'|'树'
88
90
  }
@@ -151,6 +153,7 @@ export interface DtmplConfig extends TmplBase {
151
153
  premises: FieldConfig[];
152
154
  groups: FieldGroupConfig[];
153
155
  buttonPosition:ButtonPosition;
156
+ buildInFuncFields:FieldConfig[];
154
157
  onValuesChange:(changedValues,allValues:DtmplData,formInstance:FormInstance)=>void
155
158
  }
156
159
 
@@ -169,7 +172,8 @@ export interface FieldConfig extends FieldBase {
169
172
  updateSelf?:(form:FormInstance)=>FieldConfig,
170
173
  suppleOptions?:any[],
171
174
  actions?:FieldAction[],
172
-
175
+ requiredRuleCriterias?:FieldConfig[],
176
+ usableRuleCriterias?:FieldConfig[]
173
177
  }
174
178
 
175
179
  export interface FileRule {
@@ -75,8 +75,10 @@ export default class Superagent {
75
75
  //message.error("没找到服务(" + options.url + ")")
76
76
  resolve(res);
77
77
  } else if (res.status === 500) {
78
- if(res.text){
79
- message.error("后台处理错误(" + res.text + ")",5)
78
+
79
+ if(res.body){
80
+ message.error("后台处理错误(" + res.body.message + ")",5)
81
+ console.log(res.text);
80
82
  }
81
83
  resolve(res);
82
84
  } else {
@@ -1,7 +1,9 @@
1
1
  // import moment, {DurationInputArg2} from "moment";
2
2
 
3
3
  import dayjs, {ManipulateType} from "dayjs";
4
- import {DtmplConfig, LtmplConfig} from "./interface";
4
+ import {DtmplConfig, DtmplData, DtmplFormProps, FieldConfig, FieldGroupConfig, LtmplConfig} from "./interface";
5
+ import {FormInstance} from "antd";
6
+ import ActionUtils from "../controls/action/utils";
5
7
 
6
8
  function TmplConfigAnalysis() {
7
9
 
@@ -191,5 +193,56 @@ TmplConfigAnalysis.getRelMstrucFieldId = (dtmplConfig: DtmplConfig, fieldMap: ob
191
193
  return rmstrucId;
192
194
  }
193
195
 
196
+ TmplConfigAnalysis.buildInDtmplConfig=(dtmplConfig: DtmplConfig, dtmplData:DtmplData, props:DtmplFormProps)=>{
197
+
198
+ if(!dtmplConfig.buildInFuncFields){//先找到有业务的
199
+ let buildInFuncFields=[];
200
+ for(let group of dtmplConfig.groups){
201
+ for(let field of group.fields){
202
+ if((field.requiredRuleCriterias && field.requiredRuleCriterias.length>0) ||
203
+ (field.usableRuleCriterias && field.usableRuleCriterias.length>0)){
204
+ field.shouldUpdate=true;
205
+ buildInFuncFields.push(field);
206
+ }
207
+ }
208
+ }
209
+ dtmplConfig.buildInFuncFields=buildInFuncFields;
210
+ }
211
+ if(dtmplConfig.buildInFuncFields.length>0){
212
+
213
+ function setConfig(changedValues,allValues:DtmplData,formInstance:FormInstance) {
214
+
215
+ for(let field of dtmplConfig.buildInFuncFields){
216
+ if(field.requiredRuleCriterias!=null && field.requiredRuleCriterias.length>0){
217
+ if(ActionUtils.isMatch(field.requiredRuleCriterias,[allValues],formInstance,dtmplConfig)) {
218
+ field.required = true;
219
+ }else{
220
+ field.required = false;
221
+ }
222
+ }
223
+ if(field.usableRuleCriterias!=null && field.usableRuleCriterias.length>0){
224
+ if(ActionUtils.isMatch(field.usableRuleCriterias,[allValues],formInstance,dtmplConfig)) {
225
+ field.disabled = false;
226
+ }else{
227
+ field.disabled = true;
228
+ }
229
+ }
230
+ }
231
+ }
232
+ debugger
233
+ setConfig(null,dtmplData,null);
234
+
235
+ dtmplConfig.onValuesChange=(changedValues,allValues,formInstance)=>{
236
+ debugger
237
+ setConfig(changedValues,allValues, formInstance);
238
+ }
239
+ return dtmplConfig;
240
+ }else{
241
+ return dtmplConfig;
242
+ }
243
+
244
+ }
245
+
246
+
194
247
 
195
248
  export default TmplConfigAnalysis;
@@ -30,11 +30,16 @@ export default {
30
30
  },
31
31
 
32
32
  getAppDtmplConfig(dtmplConfig: DtmplConfig, dtmplData: DtmplData,props:DtmplFormProps) {
33
- if (dtmplConfig && AppDtmplConfigFuncMap[dtmplConfig.id]) {
34
- return AppDtmplConfigFuncMap[dtmplConfig.id](dtmplConfig, dtmplData,props);
33
+ if (dtmplConfig){
34
+ if( AppDtmplConfigFuncMap[dtmplConfig.id]) {
35
+ return AppDtmplConfigFuncMap[dtmplConfig.id](dtmplConfig, dtmplData, props);
36
+ }else{//用内置的
37
+ return TmplConfigAnalysis.buildInDtmplConfig(dtmplConfig, dtmplData, props)
38
+ }
35
39
  }
36
40
  return dtmplConfig;
37
41
  },
42
+
38
43
  isDynamicDtmplConfig(dtmplConfig: DtmplConfig) {
39
44
  if (dtmplConfig && AppDtmplConfigFuncMap[dtmplConfig.id]) {
40
45
  return true
@@ -158,7 +158,7 @@ import withRouter from "../routable/withroute";
158
158
  <Col span={24} >
159
159
  <Card className="hovercard">
160
160
  <Row gutter={{xs: 8, sm: 16, md: 24, lg: 32}}>
161
- <Col span={12}><Image src={PainPoint} ></Image>112ewqrewf</Col>
161
+ <Col span={12}><Image src={PainPoint} ></Image></Col>
162
162
  <Col span={12}> <Image src={Target} ></Image></Col>
163
163
  </Row>
164
164
  </Card>
@@ -19,8 +19,11 @@ class QuickEntrance extends React.PureComponent<QuickEntranceProps, QuickEntranc
19
19
  }
20
20
  intervals:any[]=[];
21
21
  async componentDidMount() {
22
- let l2Menus:Level2Menu[] = await HCDataSource.quickEntranceMenus();
22
+ let l2Menus:Level2Menu[] = await HCDataSource.fastMenu('QuickQueryBar');
23
23
  for (const item of l2Menus) {
24
+ if(item.disabled){
25
+ continue;
26
+ }
24
27
  if (item.displayTotal == true) {
25
28
  let i= setInterval(async () => {
26
29
  let count = await HcserviceV3.requestLtmplCount(null,item.id);
@@ -55,6 +58,9 @@ class QuickEntrance extends React.PureComponent<QuickEntranceProps, QuickEntranc
55
58
 
56
59
  let faceplateL2MenuComp = [];
57
60
  l2Menus && l2Menus.forEach((l2Menu) => {
61
+ if(l2Menu.disabled){
62
+ return null;
63
+ }
58
64
  let comp =
59
65
  <Badge key={l2Menu.id} count={l2Menu.count}>
60
66
  <Button shape="round" icon={<CodeTwoTone/>} href={`#/${l2Menu.id}/act-table?menuId=${l2Menu.id}`}
@@ -20,8 +20,11 @@ class Workbench extends React.PureComponent<WorkbenchProps, WorkbenchState> {
20
20
  intervals: any[] = [];
21
21
 
22
22
  async componentDidMount() {
23
- let l2Menus: Level2Menu[] = await HCDataSource.workbenchMenus();
23
+ let l2Menus: Level2Menu[] = await HCDataSource.fastMenu('QuickPanel');
24
24
  for (const item of l2Menus) {
25
+ if(item.disabled){
26
+ continue;
27
+ }
25
28
  let i = setInterval(async () => {
26
29
  let count = await HcserviceV3.requestLtmplCount(null, item.id);
27
30
  item.count = count;
@@ -54,6 +57,9 @@ class Workbench extends React.PureComponent<WorkbenchProps, WorkbenchState> {
54
57
 
55
58
  let faceplateStatisticL2MenusComp = [];
56
59
  l2Menus && l2Menus.forEach((l2Menu) => {
60
+ if(l2Menu.disabled){
61
+ return null;
62
+ }
57
63
  let comp =
58
64
  (<Card size={'small'} key={l2Menu.id}><Statistic prefix={<RocketTwoTone />} title={l2Menu.title} value={l2Menu.count}/>
59
65
  <Button style={{marginTop: 12}} href={`#/${l2Menu.id}/act-table?menuId=${l2Menu.id}`} >