@lcap/nasl 0.3.10-beta.oom4 → 0.3.12-beta

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 (121) hide show
  1. package/out/service/app/api.js +17 -17
  2. package/out/service/app/api.js.map +1 -1
  3. package/out/service/create/errHandles.js +12 -0
  4. package/out/service/create/errHandles.js.map +1 -1
  5. package/out/service/create/index.js +5 -0
  6. package/out/service/create/index.js.map +1 -1
  7. package/out/service/logic/logic.d.ts +26 -17
  8. package/out/service/logic/logic.js +6 -0
  9. package/out/service/logic/logic.js.map +1 -1
  10. package/out/types/app/App.d.ts +9 -0
  11. package/out/types/app/App.js +25 -1
  12. package/out/types/app/App.js.map +1 -1
  13. package/out/types/app/History.js +3 -2
  14. package/out/types/app/History.js.map +1 -1
  15. package/out/types/app/Service.d.ts +3 -0
  16. package/out/types/app/Service.js +14 -6
  17. package/out/types/app/Service.js.map +1 -1
  18. package/out/types/cacheData.js.map +1 -1
  19. package/out/types/common/Vertex.js +2 -1
  20. package/out/types/common/Vertex.js.map +1 -1
  21. package/out/types/data/Entity.d.ts +4 -0
  22. package/out/types/data/Entity.js +8 -0
  23. package/out/types/data/Entity.js.map +1 -1
  24. package/out/types/data/EntityProperty.d.ts +5 -0
  25. package/out/types/data/EntityProperty.js +16 -0
  26. package/out/types/data/EntityProperty.js.map +1 -1
  27. package/out/types/data/GlobalLogicNode.js +8 -1
  28. package/out/types/data/GlobalLogicNode.js.map +1 -1
  29. package/out/types/data/dataTypes.js +1 -1
  30. package/out/types/data/dataTypes.js.map +1 -1
  31. package/out/types/data/genBlock/genCurdEditTableBlock.d.ts +3 -0
  32. package/out/types/data/genBlock/genCurdEditTableBlock.js +578 -0
  33. package/out/types/data/genBlock/genCurdEditTableBlock.js.map +1 -0
  34. package/out/types/data/genBlock/genEditTableBlock.d.ts +234 -0
  35. package/out/types/data/genBlock/genEditTableBlock.js +419 -0
  36. package/out/types/data/genBlock/genEditTableBlock.js.map +1 -0
  37. package/out/types/data/genBlock/genQueryComponent.d.ts +20 -0
  38. package/out/types/data/genBlock/genQueryComponent.js +57 -1
  39. package/out/types/data/genBlock/genQueryComponent.js.map +1 -1
  40. package/out/types/data/genBlock/genTableBlock.js +9 -5
  41. package/out/types/data/genBlock/genTableBlock.js.map +1 -1
  42. package/out/types/data/genBlock/index.d.ts +2 -0
  43. package/out/types/data/genBlock/index.js +2 -0
  44. package/out/types/data/genBlock/index.js.map +1 -1
  45. package/out/types/data/genBlock/utils.d.ts +7 -0
  46. package/out/types/data/genBlock/utils.js +38 -1
  47. package/out/types/data/genBlock/utils.js.map +1 -1
  48. package/out/types/logic/Logic.d.ts +4 -0
  49. package/out/types/logic/Logic.js +35 -10
  50. package/out/types/logic/Logic.js.map +1 -1
  51. package/out/types/logic/LogicItem.js +6 -8
  52. package/out/types/logic/LogicItem.js.map +1 -1
  53. package/out/types/logic/Param.js +5 -13
  54. package/out/types/logic/Param.js.map +1 -1
  55. package/out/types/logic/Return.js +3 -11
  56. package/out/types/logic/Return.js.map +1 -1
  57. package/out/types/logic/Variable.js +3 -6
  58. package/out/types/logic/Variable.js.map +1 -1
  59. package/out/types/logic/translator.js +39 -8
  60. package/out/types/logic/translator.js.map +1 -1
  61. package/out/types/page/Element.d.ts +21 -2
  62. package/out/types/page/Element.js +86 -5
  63. package/out/types/page/Element.js.map +1 -1
  64. package/out/types/page/Page.d.ts +4 -0
  65. package/out/types/page/Page.js +7 -0
  66. package/out/types/page/Page.js.map +1 -1
  67. package/out/types/page/View.d.ts +18 -0
  68. package/out/types/page/View.js +112 -7
  69. package/out/types/page/View.js.map +1 -1
  70. package/out/types/page/ViewVariable.js +0 -6
  71. package/out/types/page/ViewVariable.js.map +1 -1
  72. package/out/types/process/ProcessParam.js +3 -1
  73. package/out/types/process/ProcessParam.js.map +1 -1
  74. package/out/types/utils/index.d.ts +1 -0
  75. package/out/types/utils/index.js +16 -7
  76. package/out/types/utils/index.js.map +1 -1
  77. package/package.json +1 -1
  78. package/src/service/app/api.js +4 -4
  79. package/src/service/create/errHandles.js +12 -0
  80. package/src/service/create/index.js +6 -0
  81. package/src/service/logic/logic.js +6 -0
  82. package/src/types/app/App.ts +32 -9
  83. package/src/types/app/History.ts +3 -2
  84. package/src/types/app/Service.ts +18 -9
  85. package/src/types/cacheData.ts +7 -7
  86. package/src/types/common/Vertex.ts +2 -1
  87. package/src/types/data/Entity.ts +7 -0
  88. package/src/types/data/EntityProperty.ts +12 -0
  89. package/src/types/data/GlobalLogicNode.ts +8 -1
  90. package/src/types/data/dataTypes.ts +1 -1
  91. package/src/types/data/genBlock/genCurdEditTableBlock.ts +581 -0
  92. package/src/types/data/genBlock/genEditTableBlock.ts +470 -0
  93. package/src/types/data/genBlock/genQueryComponent.ts +56 -0
  94. package/src/types/data/genBlock/genTableBlock.ts +14 -10
  95. package/src/types/data/genBlock/index.ts +2 -0
  96. package/src/types/data/genBlock/utils.ts +38 -0
  97. package/src/types/logic/Logic.ts +45 -17
  98. package/src/types/logic/LogicItem.ts +8 -11
  99. package/src/types/logic/Param.ts +25 -35
  100. package/src/types/logic/Return.ts +18 -26
  101. package/src/types/logic/Variable.ts +18 -20
  102. package/src/types/logic/translator.js +41 -10
  103. package/src/types/page/Element.ts +157 -71
  104. package/src/types/page/Page.ts +7 -0
  105. package/src/types/page/View.ts +150 -41
  106. package/src/types/page/ViewVariable.ts +13 -19
  107. package/src/types/page/dist/View.js +727 -0
  108. package/src/types/process/ProcessParam.ts +4 -1
  109. package/src/types/utils/index.ts +16 -7
  110. package/out/service/debugger/debugger.d.ts +0 -3
  111. package/out/service/debugger/debugger.js +0 -95
  112. package/out/service/debugger/debugger.js.map +0 -1
  113. package/out/test/units/config.spec.d.ts +0 -1
  114. package/out/test/units/config.spec.js +0 -12
  115. package/out/test/units/config.spec.js.map +0 -1
  116. package/out/types/logic/BreakPoint.d.ts +0 -42
  117. package/out/types/logic/BreakPoint.js +0 -155
  118. package/out/types/logic/BreakPoint.js.map +0 -1
  119. package/out/types/logic/Debugger.d.ts +0 -156
  120. package/out/types/logic/Debugger.js +0 -912
  121. package/out/types/logic/Debugger.js.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"file":"ProcessParam.js","sourceRoot":"","sources":["../../../src/types/process/ProcessParam.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ProcessParam.js","sourceRoot":"","sources":["../../../src/types/process/ProcessParam.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,7 @@
1
1
  export * from './string';
2
2
  export * from './traverse';
3
3
  export * from './logger';
4
+ export declare function getGlobalEnv(): any;
4
5
  /**
5
6
  * 用 lodash 的 throttle 好像有点问题,先临时做个处理
6
7
  * @param func
@@ -10,12 +10,17 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
10
10
  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
11
11
  };
12
12
  Object.defineProperty(exports, "__esModule", { value: true });
13
- exports.resolveParameter = exports.waitPromise = exports.clearObjectDeep = exports.clearObject = exports.throttle = void 0;
13
+ exports.resolveParameter = exports.waitPromise = exports.clearObjectDeep = exports.clearObject = exports.throttle = exports.getGlobalEnv = void 0;
14
14
  __exportStar(require("./string"), exports);
15
15
  __exportStar(require("./traverse"), exports);
16
16
  __exportStar(require("./logger"), exports);
17
17
  const traverse_1 = require("./traverse");
18
18
  const __1 = require("../");
19
+ const lodash_1 = require("lodash");
20
+ function getGlobalEnv() {
21
+ return typeof window !== 'undefined' ? window.appInfo.env : global.appInfoEnv;
22
+ }
23
+ exports.getGlobalEnv = getGlobalEnv;
19
24
  /**
20
25
  * 用 lodash 的 throttle 好像有点问题,先临时做个处理
21
26
  * @param func
@@ -54,22 +59,26 @@ function resolveParameter(params) {
54
59
  let hasBody = false;
55
60
  let hasParam = false;
56
61
  params.forEach((p) => {
57
- if (p.in === 'body') {
62
+ const pcopy = lodash_1.cloneDeep(p);
63
+ if (pcopy.required) {
64
+ delete pcopy.defaultValue;
65
+ }
66
+ if (pcopy.in === 'body') {
58
67
  hasBody = true;
59
- requestBody.description.name = p.name;
60
- if (!__1.isBasicType(p.schema)) {
61
- requestBody.content['application/json'] = p;
68
+ requestBody.description.name = pcopy.name;
69
+ if (!__1.isBasicType(pcopy.schema)) {
70
+ requestBody.content['application/json'] = pcopy;
62
71
  }
63
72
  else {
64
73
  requestBody.content['application/json'] = {
65
- schema: p.schema,
74
+ schema: pcopy.schema,
66
75
  };
67
76
  }
68
77
  requestBody.required = true;
69
78
  }
70
79
  else {
71
80
  hasParam = true;
72
- parameters[p.name] = p;
81
+ parameters[pcopy.name] = pcopy;
73
82
  }
74
83
  });
75
84
  return {
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/types/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAyB;AACzB,6CAA2B;AAC3B,2CAAyB;AAEzB,yCAAsC;AACtC,2BAAkC;AAElC;;;;;GAKG;AACI,MAAM,QAAQ,GAAG,CAAC,IAAc,EAAE,IAAY,EAAE,OAAY,EAAE,EAAE,CAAC,IAAI,CAAC;AAAhE,QAAA,QAAQ,YAAwD;AAE7E,SAAgB,WAAW,CAAC,GAAQ;IAChC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC7B,IAAI,GAAG,CAAC,GAAG,CAAC,KAAK,SAAS,IAAI,GAAG,CAAC,GAAG,CAAC,KAAK,IAAI;YAC3C,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC;IACxB,CAAC,CAAC,CAAC;AACP,CAAC;AALD,kCAKC;AAED,SAAgB,eAAe,CAAC,GAAQ;IACpC,mBAAQ,CAAC,CAAC,OAAO,EAAE,EAAE;QACjB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACtC,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI;gBAC1B,OAAO,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;IACP,CAAC,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;AAC7C,CAAC;AAPD,0CAOC;AAEM,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;AAAxF,QAAA,WAAW,eAA6E;AAkBrG,SAAgB,gBAAgB,CAAC,MAA0B;IACvD,MAAM,UAAU,GAA0B,EAAE,CAAC;IAC7C,MAAM,WAAW,GAAG;QAChB,OAAO,EAAE;YACL,kBAAkB,EAAE,EAAE;SACzB;QACD,WAAW,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;QACzB,QAAQ,EAAE,KAAK;KAClB,CAAC;IACF,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACjB,IAAI,CAAC,CAAC,EAAE,KAAK,MAAM,EAAE;YACjB,OAAO,GAAG,IAAI,CAAC;YACf,WAAW,CAAC,WAAW,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC;YACtC,IAAI,CAAC,eAAW,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE;gBACxB,WAAW,CAAC,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;aAC/C;iBAAM;gBACH,WAAW,CAAC,OAAO,CAAC,kBAAkB,CAAC,GAAG;oBACtC,MAAM,EAAE,CAAC,CAAC,MAAM;iBACnB,CAAC;aACL;YACD,WAAW,CAAC,QAAQ,GAAG,IAAI,CAAC;SAC/B;aAAM;YACH,QAAQ,GAAG,IAAI,CAAC;YAChB,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAC1B;IACL,CAAC,CAAC,CAAC;IACH,OAAO;QACH,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE;QACtD,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE;KAC1D,CAAC;AACN,CAAC;AAhCD,4CAgCC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/types/utils/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@lcap/nasl",
3
3
  "description": "NetEase Application Specific Language",
4
- "version": "0.3.10-beta.oom4",
4
+ "version": "0.3.12-beta",
5
5
  "author": "Forrest <rainforest92@126.com>",
6
6
  "scripts": {
7
7
  "dev": "tsc -watch -p ./",
@@ -57,8 +57,8 @@ export default {
57
57
  method: 'get',
58
58
  path: '/api/v1/app/getAppById',
59
59
  },
60
- config: { postprocess: (result) => {
61
- return {
60
+ config: {
61
+ postprocess: (result) => ({
62
62
  id: result.id,
63
63
  appId: result.lcpAppId,
64
64
  name: result.name,
@@ -72,8 +72,8 @@ export default {
72
72
  createdBy: result.createdBy,
73
73
  updatedTime: result.updatedTime,
74
74
  updatedBy: result.updatedBy,
75
- };
76
- } },
75
+ }),
76
+ },
77
77
  },
78
78
  checkTemplateName: {
79
79
  url: {
@@ -1,3 +1,5 @@
1
+ import aslConfig from '../../types/config';
2
+
1
3
  function showError(message) {
2
4
  try {
3
5
  const Vue = require('vue').default || window?.Vue;
@@ -12,11 +14,21 @@ function showError(message) {
12
14
  }
13
15
  }
14
16
 
17
+ const versionStatus = {
18
+ 401010: 'version_saving',
19
+ 401011: 'version_checking',
20
+ 401012: 'version_checkout_failed',
21
+ 401013: 'version_inconsistent',
22
+ };
23
+
15
24
  export default {
16
25
  defaults({ config }, err = {}) {
17
26
  if (config.noErrorTip)
18
27
  return;
19
28
 
29
+ if (versionStatus[err.code])
30
+ aslConfig.defaultApp?.emit('updateVersionStatus', versionStatus[err.code], err.msg);
31
+
20
32
  showError(err.msg || '系统繁忙');
21
33
  },
22
34
  401({ config }, err = {}) {
@@ -27,6 +27,12 @@ const requester = function (requestInfo) {
27
27
  headers.Cookie = aslConfig.cookie;
28
28
  }
29
29
 
30
+ headers['request-lcpAppId'] = aslConfig.defaultApp?.id;
31
+ if (aslConfig.defaultApp?.baseVersion)
32
+ headers['request-appBaseVersion'] = aslConfig.defaultApp.baseVersion;
33
+ if (aslConfig.defaultApp?.versionChangedTime)
34
+ headers['request-versionChangedTime'] = aslConfig.defaultApp.versionChangedTime;
35
+
30
36
  let data;
31
37
  const method2 = method.toUpperCase();
32
38
  if (Object.keys(body).length || ['PUT', 'POST', 'PATCH'].includes(method2)) {
@@ -19,6 +19,12 @@ export default {
19
19
  method: 'post',
20
20
  },
21
21
  },
22
+ callLogicUpdate: {
23
+ url: {
24
+ path: '/proxy/graph/api/v1/graph/logic/callLogicUpdate',
25
+ method: 'post',
26
+ },
27
+ },
22
28
  delete: {
23
29
  url: {
24
30
  path: '/proxy/graph/api/v1/graph/logic/delete',
@@ -119,6 +119,13 @@ export class App extends Vertex {
119
119
  @immutable()
120
120
  @excludedInJSON()
121
121
  public readonly history: History = undefined;
122
+ /**
123
+ * 历史记录
124
+ * 用于处理撤销重做
125
+ */
126
+ @immutable()
127
+ @excludedInJSON()
128
+ public readonly webConfig?: string = undefined;
122
129
  /**
123
130
  * @param source 需要合并的部分参数
124
131
  */
@@ -128,6 +135,19 @@ export class App extends Vertex {
128
135
 
129
136
  this.history = new History({ app: this });
130
137
  }
138
+ /**
139
+ * 加载是否内置官方模板创建应用
140
+ */
141
+ loadWebConfig(appDetail: any) {
142
+ const { pages } = appDetail.services
143
+ .find((service: any) => service.type === 'app') || {};
144
+ let webConfig;
145
+ try {
146
+ const pagesConfig = JSON.parse(pages);
147
+ webConfig = pagesConfig.config;
148
+ } catch (error) {}
149
+ this.assign({ webConfig });
150
+ }
131
151
  /**
132
152
  * 加载详情并同步 envList 信息
133
153
  * @requires this.id
@@ -155,6 +175,7 @@ export class App extends Vertex {
155
175
  },
156
176
  });
157
177
  await this.loadEnvList(result);
178
+ this.loadWebConfig(result);
158
179
  delete result.services;
159
180
  this.assign(result);
160
181
  return this;
@@ -244,8 +265,8 @@ export class App extends Vertex {
244
265
  asyncLoadServicesDetail: false,
245
266
  asyncLoadViewsDetail: false,
246
267
  }) {
268
+ await this.load(); // 请求其它接口前,需要先查询到 app 上的 baseVersion
247
269
  await Promise.all([
248
- this.load(),
249
270
  this.loadServices(),
250
271
  updateGenericTypeList(),
251
272
  ]);
@@ -267,15 +288,17 @@ export class App extends Vertex {
267
288
  */
268
289
  clear() {
269
290
  function traverse(obj: any, callback: (obj: any) => void, ws = new WeakSet()) {
270
- if(typeof obj !== 'object' || obj === null) return;
271
- if(ws.has(obj)) return;
291
+ if (typeof obj !== 'object' || obj === null)
292
+ return;
293
+ if (ws.has(obj))
294
+ return;
272
295
 
273
296
  ws.add(obj);
274
-
275
- if(Array.isArray(obj))
297
+
298
+ if (Array.isArray(obj))
276
299
  obj.forEach((item) => {
277
300
  traverse(item, callback, ws);
278
- })
301
+ });
279
302
  else {
280
303
  callback(obj);
281
304
  Object.values(obj).forEach((item) => {
@@ -283,14 +306,14 @@ export class App extends Vertex {
283
306
  });
284
307
  }
285
308
  }
286
-
309
+
287
310
  traverse(this, (obj: any) => {
288
311
  vertexsMap.delete(obj?.id);
289
312
 
290
- if(obj instanceof Entity || obj instanceof Structure || obj instanceof Enum)
313
+ if (obj instanceof Entity || obj instanceof Structure || obj instanceof Enum)
291
314
  delete dataTypesMap[obj.schemaRef];
292
315
 
293
- if(obj instanceof BaseVariable)
316
+ if (obj instanceof BaseVariable)
294
317
  variablesMap.delete(obj.id);
295
318
  });
296
319
  updateDataTypeList();
@@ -294,8 +294,9 @@ export class History {
294
294
  appId: this.app.id,
295
295
  },
296
296
  });
297
- this.undoCount = result.undoNumber;
298
- this.redoCount = result.redoNumber;
297
+ const { undoNumber, redoNumber } = result || {};
298
+ this.undoCount = undoNumber;
299
+ this.redoCount = redoNumber;
299
300
  } catch (e) { }
300
301
  }
301
302
  async undo() {
@@ -1,5 +1,5 @@
1
1
  import { immutable, circular, action, excludedInJSON } from '../decorators';
2
- import { Logic, config, LEVEL_ENUM, Vertex, App, Page, DataNode, GlobalLogicNode, Schema, Entity, EntityProperty, Structure, Enum, EnumItem, Interface, dataTypesMap, generator, vertexsMap, Process, EntityIndex } from '..';
2
+ import { Logic, config, LEVEL_ENUM, Vertex, App, Page, DataNode, GlobalLogicNode, Schema, Entity, EntityProperty, Structure, Enum, EnumItem, Interface, dataTypesMap, generator, vertexsMap, Process, EntityIndex, utils } from '..';
3
3
  import appService from '../../service/app';
4
4
  import pageService from '../../service/page';
5
5
  import webFileService from '../../service/webFile';
@@ -231,6 +231,7 @@ export class WebService extends Service {
231
231
  template: { name: string, version: string },
232
232
  ui: { name: string, version: string },
233
233
  componentDependencies: { [name: string]: string },
234
+ templateConfig: { builtInTemplate: boolean },
234
235
  themeVariables: { [name: string]: string },
235
236
  } = undefined;
236
237
  /**
@@ -385,6 +386,10 @@ ${Object.keys(themeVariables).map((key) => ` ${key}: ${themeVariables[key]};`
385
386
  }
386
387
 
387
388
  async loadPages(enableCache = true) {
389
+ const isGONGHANG = utils.getGlobalEnv() === 'gonghang';
390
+ if (isGONGHANG) {
391
+ enableCache = false;
392
+ }
388
393
  this.pages.forEach((page) => {
389
394
  page.destroy();
390
395
  });
@@ -760,14 +765,14 @@ export class MicroService extends Service {
760
765
  microServiceId: this.id,
761
766
  },
762
767
  });
763
- entities.forEach((item, index) => {
768
+ entities.forEach((item) => {
764
769
  const tempEntity = <Entity>vertexsMap.get(item.id);
765
770
  if (tempEntity) {
766
771
  tempEntity.assign({ lastVersionDef: item.lastVersionDef });
767
772
  }
768
773
  const lastVersionRef = item.lastVersionDef && item.lastVersionDef.properties || {};
769
774
  const propertyList = tempEntity.propertyList as Array<EntityProperty>;
770
- propertyList.forEach((property, index) => {
775
+ propertyList.forEach((property) => {
771
776
  property = <EntityProperty>vertexsMap.get(property.id);
772
777
  if (property && lastVersionRef[property.name]) {
773
778
  property.assign({ lastVersion: convert2RefType(lastVersionRef[property.name]) });
@@ -779,6 +784,10 @@ export class MicroService extends Service {
779
784
  * 加载服务所有的接口列表
780
785
  */
781
786
  async loadInterfaces(enableCache = true) {
787
+ const isGONGHANG = utils.getGlobalEnv() === 'gonghang';
788
+ if (isGONGHANG) {
789
+ enableCache = false;
790
+ }
782
791
  const logicMap = new Map();
783
792
  // 旧接口列表中,可能存在已经被删掉的接口,需要从 vertexsMap 中删除
784
793
  this.interfaces.forEach((it) => {
@@ -797,14 +806,14 @@ export class MicroService extends Service {
797
806
  });
798
807
 
799
808
  interfaces = interfaces.map((item) => {
800
- if(logicMap.has(item.id)) {
809
+ if (logicMap.has(item.id)) {
801
810
  item.logic = logicMap.get(item.id);
802
811
  logicMap.delete(item.id);
803
812
  }
804
813
  return Interface.from(item, this);
805
814
  });
806
815
  // 清理掉已不存在的逻辑
807
- for(const logic of logicMap.values()) {
816
+ for (const logic of logicMap.values()) {
808
817
  logic.destroy();
809
818
  }
810
819
 
@@ -919,16 +928,16 @@ export class MicroService extends Service {
919
928
  }
920
929
 
921
930
  private async _onVertexIdToNameChange(id: string, name: string) {
922
- if (!config.webFileCache)
923
- return;
931
+ // if (!config.webFileCache)
932
+ // return;
924
933
 
925
934
  if (id && name) {
926
935
  if (!vertexIdToName) {
927
936
  vertexIdToName = await generator.loadVertexIdToName(this.app);
928
937
  vertexIdToName = vertexIdToName || {};
929
938
  }
930
- if (vertexIdToName[id] === name)
931
- return;
939
+ // if (vertexIdToName[id] === name)
940
+ // return;
932
941
  }
933
942
  // id 和 name 都没传时,跳过上一步的判断逻辑,直接更新
934
943
  if ((id && name) || (!id && !name)) {
@@ -4,20 +4,20 @@ export const vertexsMap: Map<string, Vertex> = new Map();
4
4
  export const entitiesMap: Map<string, Entity> = new Map();
5
5
 
6
6
  export function genFinalCode(code: string, finalCode = true) {
7
- if(!finalCode)
7
+ if (!finalCode)
8
8
  return code;
9
9
 
10
- if(typeof code !== 'string')
10
+ if (typeof code !== 'string')
11
11
  return code;
12
12
  // ID_ENUMVALUE_只需要返回ENUM的item的value值
13
- if(code.includes('ID_ENUMVALUE_')){
13
+ if (code.includes('ID_ENUMVALUE_')) {
14
14
  code = code.replace(/ID_([\w-]+).ID_ENUMVALUE_([\w-]+)/g, (m) => {
15
15
  const id = m.split('.').pop().replace('ID_ENUMVALUE_', '');
16
16
  const param = vertexsMap.get(id);
17
- return param && `'${(param as any).value}'` || `'${id}'`;
17
+ return param && `'${(param as any).value}'` || `'${id}'`;
18
18
  });
19
19
  }
20
- if(code.includes('ID_ENUM_LIST_')){
20
+ if (code.includes('ID_ENUM_LIST_')) {
21
21
  code = code.replace(/ID_ENUM_LIST_([\w-]+)/g, (m, id) => {
22
22
  const param = vertexsMap.get(id);
23
23
  return `$utils.EnumList('${param && param.name}')`;
@@ -27,7 +27,7 @@ export function genFinalCode(code: string, finalCode = true) {
27
27
  return code.replace(/ID_([\w-]+)/g, (m, id) => {
28
28
  const param = vertexsMap.get(id);
29
29
  return (param as any)?.name
30
- || (param as any)?.asName
30
+ || (param as any)?.asName
31
31
  || id;
32
32
  });
33
- }
33
+ }
@@ -155,7 +155,8 @@ export class Vertex extends EventEmitter {
155
155
  oldId && vertexsMap.delete(oldId);
156
156
  this.id && vertexsMap.set(this.id, this);
157
157
 
158
- this.emitVertexIdToNameChange();
158
+ if(oldId || this.id)
159
+ this.emitVertexIdToNameChange();
159
160
 
160
161
  this._mutable = false;
161
162
  }
@@ -28,6 +28,7 @@ export const systemProperty: { [name: string]: any, } = {
28
28
  format: 'long',
29
29
  editable: false,
30
30
  required: true,
31
+ propertyGenRule: 'platform',
31
32
  display: {
32
33
  inTable: false,
33
34
  inFilter: false,
@@ -172,6 +173,12 @@ export class Entity extends Vertex implements ObjectSchema {
172
173
  @circular()
173
174
  @immutable()
174
175
  public readonly dataNode: DataNode = undefined;
176
+
177
+ /**
178
+ * 数据来源名称,平台生成 默认ide
179
+ */
180
+ @immutable()
181
+ public readonly entityGenSource: string = undefined;
175
182
  /**
176
183
  * 周边存在的名称
177
184
  */
@@ -44,6 +44,11 @@ export class EntityProperty extends Vertex implements Schema {
44
44
  */
45
45
  @immutable()
46
46
  public readonly description: string = undefined;
47
+ /**
48
+ * 字段生成规则
49
+ */
50
+ @immutable()
51
+ public readonly propertyGenRule: string = undefined;
47
52
  /**
48
53
  * type
49
54
  */
@@ -401,6 +406,13 @@ export class EntityProperty extends Vertex implements Schema {
401
406
  actionDesc: `设置实体属性规则`,
402
407
  });
403
408
  }
409
+ @action('设置实体生成规则')
410
+ async setPropertyGenRule(propertyGenRule: string) {
411
+ this.assign({ propertyGenRule });
412
+ await this.update(undefined, {
413
+ actionDesc: `设置实体生成规则`,
414
+ });
415
+ }
404
416
  /**
405
417
  * 设置实体属性的默认值
406
418
  */
@@ -66,7 +66,14 @@ export class GlobalLogicNode extends Vertex {
66
66
  addCategoryInterface(iface: Interface) {
67
67
  const category = iface.category;
68
68
  const ciInstance = this.createOrGetCatogory(category);
69
- ciInstance.categoryInterfaces.unshift(iface);
69
+ const index = ciInstance.categoryInterfaces.findIndex((s) => s.name === iface.name);
70
+ if (index >= 0) {
71
+ const [oldiface] = ciInstance.categoryInterfaces.splice(index, 1, iface);
72
+ oldiface.destroy();
73
+ } else {
74
+ ciInstance.categoryInterfaces.unshift(iface);
75
+ }
76
+
70
77
  }
71
78
 
72
79
  addCategoryStructure(sturct: Structure) {
@@ -47,7 +47,7 @@ export function properties2PropertyList(definition: any) {
47
47
 
48
48
  export async function updateGenericTypeList() {
49
49
  const datatypes = await getGenericList();
50
- dataTypeList[2].children = datatypes.genericTypeList.concat(dataTypeList[2].children);
50
+ dataTypeList[2].children = datatypes.genericTypeList.concat(systemTypeList);
51
51
  Object.assign(dataTypesMap, datatypes.genericTypemap);
52
52
  }
53
53