@farris/jit-engine 1.4.85 → 1.4.86

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -1,3 +1,7 @@
1
+ 1.4.86
2
+
3
+ 修复组合表单组件通迅问题
4
+
1
5
  1.4.85
2
6
 
3
7
  校验提示信息支持组件名称国际化
@@ -62,10 +62,11 @@ class ComponentEventsParameterGenerator {
62
62
  generateString += `
63
63
 
64
64
  @NgSubscription({`;
65
+ const token = toolhepler_1.ToolHelper.isNullOrUndefinedOrEmpty(subscriptionItem.token) == false ? subscriptionItem.token : event_token_generator_1.EventTokenGenerator.generateToken("", "random");
65
66
  generateString += `
66
- name: '${subscriptionItem.subscribeOn}',`;
67
+ name: '${subscriptionItem.subscribeOn}From${toolhepler_1.ToolHelper.tf(token, toolhepler_1.TfTypeEnum.Pascal)}',`;
67
68
  generateString += `
68
- token: '${toolhepler_1.ToolHelper.isNullOrUndefinedOrEmpty(subscriptionItem.token) == false ? subscriptionItem.token : event_token_generator_1.EventTokenGenerator.generateToken("", "random")}',`;
69
+ token: '${token}',`;
69
70
  if (toolhepler_1.ToolHelper.isArray(subscriptionItem.paramMapCollection, false)) {
70
71
  generateString += `
71
72
  paramMapCollection: [`;
@@ -98,7 +99,7 @@ class ComponentEventsParameterGenerator {
98
99
  generateString += `
99
100
  })`;
100
101
  generateString += `
101
- public ${subscriptionItem.subscribeOn}(currentComponent: ${externalPrefix}${variable.name}, eventArgs: any) {`;
102
+ public ${subscriptionItem.subscribeOn}From${toolhepler_1.ToolHelper.tf(token, toolhepler_1.TfTypeEnum.Pascal)}(currentComponent: ${externalPrefix}${variable.name}, eventArgs: any) {`;
102
103
  if (subscriptionItem.command) {
103
104
  generateString += `
104
105
  currentComponent.viewModel${subscriptionItem.command.viewModelCommandPath}.call(this, eventArgs);`;
@@ -1 +1 @@
1
- {"version":3,"file":"component-events-parameter-generator.js","sourceRoot":"","sources":["../../../../../src/utility/template-generator/devkit/component-generator/component-events-parameter-generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"component-events-parameter-generator.js","sourceRoot":"","sources":["../../../../../src/utility/template-generator/devkit/component-generator/component-events-parameter-generator.ts"],"names":[],"mappings":"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"}
@@ -20,7 +20,7 @@ export class ${this.convertNullToEmpty(variable.externalPrefix)}EventDeclaration
20
20
  generateString += ` /* ${eventItem.name} */`;
21
21
  generateString += `
22
22
  @NgDeclaration({
23
- name: '${eventItem.code}',
23
+ name: '${eventItem.code}From${toolhepler_1.ToolHelper.tf(eventItem.token, toolhepler_1.TfTypeEnum.Pascal)}',
24
24
  token: '${eventItem.token}',
25
25
  params: {`;
26
26
  if (toolhepler_1.ToolHelper.isArray(eventItem.params, false)) {
@@ -1 +1 @@
1
- {"version":3,"file":"event-template-generator.js","sourceRoot":"","sources":["../../../../src/utility/template-generator/devkit/event-template-generator.ts"],"names":[],"mappings":";;;AAAA,iDAA8C;AAC9C,gFAA2E;AAS3E,MAAa,sBAAuB,SAAQ,uDAAyB;IACjE,QAAQ,CAAC,cAAmB;QACxB,MAAM,QAAQ,GAAG,cAAc,CAAC,MAAM,CAAC;QACvC,IAAI,cAAc,GAAG,EAAE,CAAC;QACxB,cAAc,IAAI;;6DAEmC,CAAC;QACtD,cAAc,IAAI,IAAI,CAAC,GAAG,CAAC;QAE3B,cAAc,IAAI;;eAEX,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,cAAc,CAAC,wCAAwC,CAAC;QAEhG,IAAI,uBAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE;YAC5C,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,SAAc,EAAE,EAAE;gBACvC,cAAc,IAAI,IAAI,CAAC,GAAG,CAAC;gBAC3B,cAAc,IAAI,UAAU,SAAS,CAAC,IAAI,KAAK,CAAC;gBAChD,cAAc,IAAI;;iBAEjB,SAAS,CAAC,IAAI;kBACb,SAAS,CAAC,KAAK;kBACf,CAAC;gBAEH,IAAI,uBAAU,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE;oBAC7C,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAU,EAAE,KAAa,EAAE,EAAE;wBACnD,cAAc,IAAI;eAC3B,KAAK,CAAC,IAAI,OAAO,KAAK,CAAC,KAAK,GAAG,CAAC;wBACvB,IAAI,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;4BACrC,cAAc,IAAI,GAAG,CAAC;yBACzB;oBACL,CAAC,CAAC,CAAC;iBACN;gBAED,cAAc,IAAI;;;aAGrB,SAAS,CAAC,IAAI,SAAS,CAAC;YAEzB,CAAC,CAAC,CAAC;SACN;QACD,cAAc,IAAI,IAAI,CAAC,GAAG,CAAC;QAC3B,cAAc,IAAI,GAAG,CAAC;QACtB,OAAO,cAAc,CAAC;IAC1B,CAAC;CACJ;AA5CD,wDA4CC"}
1
+ {"version":3,"file":"event-template-generator.js","sourceRoot":"","sources":["../../../../src/utility/template-generator/devkit/event-template-generator.ts"],"names":[],"mappings":";;;AAAA,iDAA0D;AAC1D,gFAA2E;AAS3E,MAAa,sBAAuB,SAAQ,uDAAyB;IACjE,QAAQ,CAAC,cAAmB;QACxB,MAAM,QAAQ,GAAG,cAAc,CAAC,MAAM,CAAC;QACvC,IAAI,cAAc,GAAG,EAAE,CAAC;QACxB,cAAc,IAAI;;6DAEmC,CAAC;QACtD,cAAc,IAAI,IAAI,CAAC,GAAG,CAAC;QAE3B,cAAc,IAAI;;eAEX,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,cAAc,CAAC,wCAAwC,CAAC;QAEhG,IAAI,uBAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE;YAC5C,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,SAAc,EAAE,EAAE;gBACvC,cAAc,IAAI,IAAI,CAAC,GAAG,CAAC;gBAC3B,cAAc,IAAI,UAAU,SAAS,CAAC,IAAI,KAAK,CAAC;gBAChD,cAAc,IAAI;;iBAEjB,SAAS,CAAC,IAAI,OAAO,uBAAU,CAAC,EAAE,CAAC,SAAS,CAAC,KAAK,EAAE,uBAAU,CAAC,MAAM,CAAC;kBACrE,SAAS,CAAC,KAAK;kBACf,CAAC;gBAEH,IAAI,uBAAU,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE;oBAC7C,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAU,EAAE,KAAa,EAAE,EAAE;wBACnD,cAAc,IAAI;eAC3B,KAAK,CAAC,IAAI,OAAO,KAAK,CAAC,KAAK,GAAG,CAAC;wBACvB,IAAI,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;4BACrC,cAAc,IAAI,GAAG,CAAC;yBACzB;oBACL,CAAC,CAAC,CAAC;iBACN;gBAED,cAAc,IAAI;;;aAGrB,SAAS,CAAC,IAAI,SAAS,CAAC;YAEzB,CAAC,CAAC,CAAC;SACN;QACD,cAAc,IAAI,IAAI,CAAC,GAAG,CAAC;QAC3B,cAAc,IAAI,GAAG,CAAC;QACtB,OAAO,cAAc,CAAC;IAC1B,CAAC;CACJ;AA5CD,wDA4CC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@farris/jit-engine",
3
- "version": "1.4.85",
3
+ "version": "1.4.86",
4
4
  "description": "",
5
5
  "main": "./lib/index.js",
6
6
  "bin": {