@farris/jit-engine 1.3.342 → 1.3.344

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 (71) hide show
  1. package/README.md +1 -5
  2. package/lib/.DS_Store +0 -0
  3. package/lib/mobileapp/vue/code-generator/devkit-manager/app-indexvue-manager.js +1 -3
  4. package/lib/mobileapp/vue/code-generator/devkit-manager/app-indexvue-manager.js.map +1 -1
  5. package/lib/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-filter-generator.js +8 -8
  6. package/lib/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-index-resource-generator.js +2 -2
  7. package/lib/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-index-vue-generator.js +9 -9
  8. package/lib/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-index-vue-generator.js.map +1 -1
  9. package/lib/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-model-provider-generator.js +9 -9
  10. package/lib/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-model-proxy-generator.js +34 -34
  11. package/lib/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-router-generator.js +17 -17
  12. package/lib/mobileapp/vue/code-generator/file-generator/page-generator/page-bindingdata-generator.js +11 -11
  13. package/lib/mobileapp/vue/code-generator/file-generator/page-generator/page-component-generator.js +14 -43
  14. package/lib/mobileapp/vue/code-generator/file-generator/page-generator/page-component-generator.js.map +1 -1
  15. package/lib/mobileapp/vue/code-generator/file-generator/page-generator/page-handler-generator.js +25 -25
  16. package/lib/mobileapp/vue/code-generator/file-generator/page-generator/page-provider-generator.js +51 -51
  17. package/lib/mobileapp/vue/code-generator/file-generator/page-generator/page-statemachine-generator.js +19 -19
  18. package/lib/mobileapp/vue/code-generator/file-generator/page-generator/page-viewmodel-generator.js +31 -31
  19. package/lib/mobileapp/vue/code-generator/file-generator/project-generator/babel-config-js-generator.js +6 -6
  20. package/lib/mobileapp/vue/code-generator/file-generator/project-generator/gitignore-generator.js +23 -23
  21. package/lib/mobileapp/vue/code-generator/file-generator/project-generator/main-ts-generator.js +11 -11
  22. package/lib/mobileapp/vue/code-generator/file-generator/project-generator/package-json-generator.js +47 -47
  23. package/lib/mobileapp/vue/code-generator/file-generator/project-generator/readme-md-generator.js +20 -20
  24. package/lib/mobileapp/vue/code-generator/file-generator/project-generator/shims-tsx-d-ts-generator.js +15 -15
  25. package/lib/mobileapp/vue/code-generator/file-generator/project-generator/shimx-vue-d-ts-generator.js +31 -31
  26. package/lib/mobileapp/vue/code-generator/file-generator/project-generator/tsconfig-json-generator.js +38 -38
  27. package/lib/mobileapp/vue/code-generator/file-generator/project-generator/vue-config-js-generator.js +20 -20
  28. package/lib/mobileapp/vue/domstructure/devkit/befproxy/vue-bef-proxy-content.js +11 -11
  29. package/lib/mobileapp/vue/domstructure/devkit/befproxy/vue-bef-proxy-operation-parameter.js +18 -18
  30. package/lib/mobileapp/vue/domstructure/devkit/befproxy/vue-bef-proxy-operation.js +13 -13
  31. package/lib/mobileapp/vue/domstructure/devkit/befproxy/vue-bef-proxy-service.js +9 -9
  32. package/lib/mobileapp/vue/domstructure/devkit/befproxy/vue-bef-proxy.js +2 -2
  33. package/lib/mobileapp/vue/domstructure/internal-entity/page-flow/vue-page-flow-entity.js +2 -2
  34. package/lib/mobileapp/vue/domstructure/internal-entity/page-flow/vue-page-flow-page.js +2 -2
  35. package/lib/mobileapp/vue/domstructure/internal-entity/page-flow/vue-page-flow-project.js +2 -2
  36. package/lib/mobileapp/vue/domstructure/internal-entity/vue-app-index-vue-parameter.js.map +1 -1
  37. package/lib/mobileapp/vue/static/.editorconfig +9 -9
  38. package/lib/mobileapp/vue/static/.npmignore +13 -0
  39. package/lib/mobileapp/vue/static/.prettierrc +6 -6
  40. package/lib/mobileapp/vue/static/README.md +18 -18
  41. package/lib/mobileapp/vue/static/babel.config.js +13 -13
  42. package/lib/mobileapp/vue/static/src/main.ts +9 -9
  43. package/lib/mobileapp/vue/static/src/shims-vue.d.ts +32 -32
  44. package/lib/mobileapp/vue/static/tsconfig.json +20 -20
  45. package/lib/mobileapp/vue/utility/parameter-collector/page-component-collector/page-component-ref-parameter.js +2 -2
  46. package/lib/mobileapp/vue/utility/template-generator/page-component-control-generator.js +2 -2
  47. package/lib/mobileapp/vue/utility/template-generator/page-component-ref-generator.js +1 -1
  48. package/lib/mobileapp/vue/utility/template-generator/page-statemachine-generator.js +21 -21
  49. package/lib/template/.DS_Store +0 -0
  50. package/lib/template/ui/.DS_Store +0 -0
  51. package/lib/template/ui/kendo/discussion-editor.pug +1 -27
  52. package/lib/template/ui/kendo/discussion-list.pug +1 -8
  53. package/lib/template/ui/kendo/farris-file-upload-preview.pug +1 -2
  54. package/lib/template/ui/kendo/farris-list-view.pug +27 -28
  55. package/lib/template/ui/kendo/farris-progress-step.pug +13 -24
  56. package/lib/template/ui/kendo/list-nav.pug +12 -29
  57. package/lib/template/ui/kendo/multi-select.pug +1 -16
  58. package/lib/template/ui/kendo/table/farris-table.pug +1 -5
  59. package/lib/template/ui/kendo/table/multi-select.pug +17 -37
  60. package/lib/template/ui/mobilevue/action-bar.pug +10 -10
  61. package/lib/template/ui/mobilevue/banner.pug +4 -4
  62. package/lib/template/ui/mobilevue/component-ref.pug +3 -3
  63. package/lib/template/ui/mobilevue/field-set.pug +1 -3
  64. package/lib/template/ui/mobilevue/image-uploader.pug +15 -15
  65. package/lib/template/ui/mobilevue/sidebar-item.pug +9 -9
  66. package/lib/template/ui/mobilevue/sidebar.pug +11 -11
  67. package/lib/template/ui/mobilevue/static-text.pug +1 -1
  68. package/lib/template/ui/mobilevue/steps.pug +8 -8
  69. package/lib/template/ui/mobilevue/toolbar.pug +5 -5
  70. package/lib/utility/declaration-trigger.js +0 -3
  71. package/package.json +1 -1
package/README.md CHANGED
@@ -1,8 +1,4 @@
1
- 1.3.342
2
-
3
- 补充部分控件的可见属性
4
-
5
- 1.3.341
1
+ 1.3.344
6
2
 
7
3
  智能输入框只读流程规则问题修复
8
4
 
package/lib/.DS_Store ADDED
Binary file
@@ -30,7 +30,7 @@ const mobileapp_vue_constant_1 = require("../../utility/mobileapp-vue-constant")
30
30
  const vue_app_index_extraImports_generator_1 = require("../file-generator/app-generator/vue-app-index-extraImports-generator");
31
31
  class AppIndexVueManager {
32
32
  static generate(generateParam) {
33
- var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
33
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
34
34
  const devkitValue = generateParam.value;
35
35
  const appIndexResourceGenerator = new vue_app_index_resource_generator_1.VueAppIndexResourceGenerator();
36
36
  const appIndexResourceContext = new file_generator_context_1.FileGeneratorContext();
@@ -54,8 +54,6 @@ class AppIndexVueManager {
54
54
  indexVueParameter.hasExpressions = ((_d = (_c = generateParam.value.ui) === null || _c === void 0 ? void 0 : _c.module) === null || _d === void 0 ? void 0 : _d.expressions) ? generateParam.value.ui.module.expressions.length > 0 : false;
55
55
  indexVueParameter.controlStateExtend = ((_f = (_e = generateParam.value.ui) === null || _e === void 0 ? void 0 : _e.options) === null || _f === void 0 ? void 0 : _f.controlStateExtend) ? generateParam.value.ui.options.controlStateExtend : null;
56
56
  indexVueParameter.enableI18n = ((_h = (_g = generateParam.value.ui) === null || _g === void 0 ? void 0 : _g.options) === null || _h === void 0 ? void 0 : _h.enableI18n) ? (_k = (_j = generateParam.value.ui) === null || _j === void 0 ? void 0 : _j.options) === null || _k === void 0 ? void 0 : _k.enableI18n : false;
57
- const routeStrategy = (_m = (_l = generateParam.value.ui) === null || _l === void 0 ? void 0 : _l.options) === null || _m === void 0 ? void 0 : _m.routeStrategy;
58
- indexVueParameter.routeStrategy = routeStrategy === 'standard' ? 'standard' : null;
59
57
  const indexVueContext = new file_generator_context_1.FileGeneratorContext();
60
58
  indexVueContext.basePath = path.normalize(path.join(generateParam.metaDataConfig.publishPath, mobileapp_vue_constant_1.MobileAppVueConstant.SrcPathName, mobileapp_vue_constant_1.MobileAppVueConstant.AppsPathName, generateParam.frm_code));
61
59
  indexVueContext.fileName = "index.vue";
@@ -1 +1 @@
1
- {"version":3,"file":"app-indexvue-manager.js","sourceRoot":"","sources":["../../../../../src/mobileapp/vue/code-generator/devkit-manager/app-indexvue-manager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA6B;AAG7B,uHAAgH;AAChH,qFAAgF;AAChF,uGAAiG;AAEjG,6GAAsG;AACtG,gHAAyG;AACzG,iFAA4E;AAC5E,+HAAwH;AAExH,MAAa,kBAAkB;IAC3B,MAAM,CAAC,QAAQ,CAAC,aAGf;;QACG,MAAM,WAAW,GAAc,aAAa,CAAC,KAAK,CAAC;QACnD,MAAM,yBAAyB,GAAiC,IAAI,+DAA4B,EAAE,CAAC;QACnG,MAAM,uBAAuB,GAAyB,IAAI,6CAAoB,EAAE,CAAC;QACjF,uBAAuB,CAAC,iBAAiB,GAAG,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC;QACzE,MAAM,sBAAsB,GAAG,yBAAyB,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC;QAE3F,MAAM,6BAA6B,GAAiC,IAAI,uEAAgC,EAAE,CAAC;QAC3G,MAAM,2BAA2B,GAAyB,IAAI,6CAAoB,EAAE,CAAC;QACrF,2BAA2B,CAAC,iBAAiB,GAAG,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC;QAC3E,MAAM,4BAA4B,GAAG,6BAA6B,CAAC,QAAQ,CAAC,2BAA2B,CAAC,CAAC;QAEzG,MAAM,qBAAqB,GAA0B,IAAI,gDAAqB,EAAE,CAAC;QACjF,MAAM,gBAAgB,GAAyB,IAAI,6CAAoB,EAAE,CAAC;QAC1E,MAAM,iBAAiB,GAA0B,qBAAqB,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;QAGlG,MAAM,iBAAiB,GAA4B,IAAI,qDAAuB,EAAE,CAAC;QACjF,iBAAiB,CAAC,cAAc,GAAG,sBAAsB,CAAC,WAAW,CAAC;QACtE,iBAAiB,CAAC,kBAAkB,GAAG,4BAA4B,CAAC,WAAW,CAAC;QAChF,iBAAiB,CAAC,aAAa,GAAG,iBAAiB,CAAC,WAAW,CAAC;QAChE,iBAAiB,CAAC,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAC;QACpD,iBAAiB,CAAC,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC;QACvD,iBAAiB,CAAC,cAAc,GAAG,aAAa,CAAC,cAAc,CAAC;QAChE,iBAAiB,CAAC,SAAS,GAAG,MAAA,MAAA,aAAa,CAAC,KAAK,CAAC,EAAE,0CAAE,OAAO,0CAAE,SAAS,CAAC;QACzE,iBAAiB,CAAC,cAAc,GAAG,CAAA,MAAA,MAAA,aAAa,CAAC,KAAK,CAAC,EAAE,0CAAE,MAAM,0CAAE,WAAW,EAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;QAC7I,iBAAiB,CAAC,kBAAkB,GAAG,CAAA,MAAA,MAAA,aAAa,CAAC,KAAK,CAAC,EAAE,0CAAE,OAAO,0CAAE,kBAAkB,EAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC;QACtJ,iBAAiB,CAAC,UAAU,GAAG,CAAA,MAAA,MAAA,aAAa,CAAC,KAAK,CAAC,EAAE,0CAAE,OAAO,0CAAE,UAAU,EAAC,CAAC,CAAC,MAAA,MAAA,aAAa,CAAC,KAAK,CAAC,EAAE,0CAAE,OAAO,0CAAE,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC;QACjI,MAAM,aAAa,GAAG,MAAA,MAAA,aAAa,CAAC,KAAK,CAAC,EAAE,0CAAE,OAAO,0CAAE,aAAa,CAAC;QACrE,iBAAiB,CAAC,aAAa,GAAG,aAAa,KAAK,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC;QAEnF,MAAM,eAAe,GAAyB,IAAI,6CAAoB,EAAE,CAAC;QACzE,eAAe,CAAC,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,WAAW,EAAE,6CAAoB,CAAC,WAAW,EAAE,6CAAoB,CAAC,YAAY,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC5L,eAAe,CAAC,QAAQ,GAAG,WAAW,CAAC;QACvC,eAAe,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QACtD,MAAM,oBAAoB,GAA4B,IAAI,qDAAuB,EAAE,CAAC;QACpF,oBAAoB,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IACnD,CAAC;CACJ;AA1CD,gDA0CC"}
1
+ {"version":3,"file":"app-indexvue-manager.js","sourceRoot":"","sources":["../../../../../src/mobileapp/vue/code-generator/devkit-manager/app-indexvue-manager.ts"],"names":[],"mappings":"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"}
@@ -7,14 +7,14 @@ class VueAppFilterGenerator extends abstract_file_generator_1.AbstractFileGenera
7
7
  generate(context) {
8
8
  let generateString = "";
9
9
  generateString +=
10
- `
11
- // Vue.filter("lang", function(value, langCode, defaultValue) {
12
- // const translatedValue = lang["zh-CHS"][value];
13
- // if (!translatedValue && translatedValue != "") {
14
- // return defaultValue;
15
- // }
16
- // return translatedValue;
17
- // });
10
+ `
11
+ // Vue.filter("lang", function(value, langCode, defaultValue) {
12
+ // const translatedValue = lang["zh-CHS"][value];
13
+ // if (!translatedValue && translatedValue != "") {
14
+ // return defaultValue;
15
+ // }
16
+ // return translatedValue;
17
+ // });
18
18
  `;
19
19
  const response = file_generator_response_1.FileGeneratorResponse.getNewEmptyInstance();
20
20
  response.fileContent = generateString;
@@ -9,8 +9,8 @@ class VueAppIndexResourceGenerator extends abstract_file_generator_1.AbstractFil
9
9
  const response = file_generator_response_1.FileGeneratorResponse.getNewEmptyInstance();
10
10
  let generateString = "";
11
11
  generateString +=
12
- `
13
- const lang = { "zh-CHS": ${JSON.stringify(ctrlLangs.config["zh-CHS"])}};
12
+ `
13
+ const lang = { "zh-CHS": ${JSON.stringify(ctrlLangs.config["zh-CHS"])}};
14
14
  `;
15
15
  response.fileContent = generateString;
16
16
  return response;
@@ -7,7 +7,7 @@ class VueAppIndexVueGenerator extends abstract_file_generator_1.AbstractFileGene
7
7
  generate(context) {
8
8
  const response = file_generator_response_1.FileGeneratorResponse.getNewEmptyInstance();
9
9
  const appIndexVueParameter = context.externalParameter;
10
- const { formCode, metaDataConfig, imports, extraImportsString, resourceString, keepAlive, hasExpressions, controlStateExtend, enableI18n, routeStrategy, } = appIndexVueParameter;
10
+ const { formCode, metaDataConfig, imports, extraImportsString, resourceString, keepAlive, hasExpressions, controlStateExtend, enableI18n } = appIndexVueParameter;
11
11
  const { serviceUnitPath, projectName, isRuntime, runTimeDimPath } = metaDataConfig;
12
12
  const _imports = imports.map((item) => `${item.name}:${item.name},`);
13
13
  const generateFormPathValueString = hasExpressions && serviceUnitPath
@@ -40,22 +40,22 @@ class VueAppIndexVueGenerator extends abstract_file_generator_1.AbstractFileGene
40
40
  </template>
41
41
 
42
42
  <script>
43
- import { AppOptions, FORM_PATH_TOKEN, VALIDATION_RULE_TOKEN, CONTROL_STATE_INTERCEPTOR_TOKEN, TranslateService } from '@farris/mobile-devkit';
43
+ import { AppOptions, FORM_PATH_TOKEN, VALIDATION_RULE_TOKEN, CONTROL_STATE_INTERCEPTOR_TOKEN, TranslateService} from '@farris/mobile-devkit';
44
44
  import { FrameworkSessionService } from '@farris/mobile-bef';
45
- import { COMMAND_SERVICES_APP_PROVIDERS, ROUTER_INSTANCE_TOKEN, LangService } from '@farris/mobile-command-services';
46
- import { DevkitPlugin, beforeRouteEnterByVueAdapter, initdataOptions, setRouteStrategy } from '@farris/mobile-vue-adapter';
45
+ import { COMMAND_SERVICES_APP_PROVIDERS, ROUTER_INSTANCE_TOKEN,LangService} from '@farris/mobile-command-services';
46
+ import { DevkitPlugin,beforeRouteEnterByVueAdapter,initdataOptions } from '@farris/mobile-vue-adapter';
47
47
  import { ModelProviders } from './models/model.provider';
48
48
  import { validationRule } from './validation';
49
49
  ${extraImportsString}
50
50
  ${resourceString}
51
51
  ${className ? `import { ${className} } from '${path}'` : ''}
52
52
 
53
- const dataOptions = {
53
+ const dataOptions = {
54
54
  ${enableI18n ? `langPath:${langPath}` : ''}
55
55
  }
56
56
  initdataOptions(dataOptions);
57
57
 
58
- export default {
58
+ export default{
59
59
  name: '${formCode}',
60
60
  components:{${_imports}},
61
61
  data() {
@@ -64,10 +64,10 @@ export default {
64
64
  };
65
65
  },
66
66
  beforeRouteEnter(to, from, next) {
67
- beforeRouteEnterByVueAdapter(to, from, next, dataOptions);
67
+ beforeRouteEnterByVueAdapter(to, from, next,dataOptions);
68
+
68
69
  },
69
- beforeCreate() {
70
- setRouteStrategy("${routeStrategy || ''}");
70
+ beforeCreate(){
71
71
  const appOptions = {
72
72
  id: '${formCode}',
73
73
  providers: [
@@ -1 +1 @@
1
- {"version":3,"file":"vue-app-index-vue-generator.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-index-vue-generator.ts"],"names":[],"mappings":";;;AAAA,wEAAkE;AAGlE,wEAAkE;AAWlE,MAAa,uBAAwB,SAAQ,+CAAqB;IAQhE,QAAQ,CAAC,OAA6B;QACpC,MAAM,QAAQ,GAA0B,+CAAqB,CAAC,mBAAmB,EAAE,CAAC;QACpF,MAAM,oBAAoB,GAA4B,OAAO,CAAC,iBAAiB,CAAC;QAChF,MAAM,EACJ,QAAQ,EACR,cAAc,EACd,OAAO,EACP,kBAAkB,EAClB,cAAc,EACd,SAAS,EACT,cAAc,EACd,kBAAkB,EAClB,UAAU,EACV,aAAa,GACd,GAAG,oBAAoB,CAAC;QACzB,MAAM,EAAE,eAAe,EAAE,WAAW,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG,cAAc,CAAC;QACnF,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;QAC1E,MAAM,2BAA2B,GAAG,cAAc,IAAI,eAAe;YACnE,CAAC,CAAC,IAAI,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,QAAQ,WAAW,GAAG,SAAS,IAAI,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,QAAQ,GAAG;YACjK,CAAC,CAAC,EAAE,CAAC;QAEP,IAAI,SAAc,CAAC;QAEnB,IAAI,kBAAkB,IAAI,kBAAkB,CAAC,MAAM,EAAE;YACnD,IAAI,kBAAkB,CAAC,WAAW,EAAE;gBAClC,MAAM,WAAW,GAAG,kBAAkB,CAAC,WAAW,CAAA;gBAClD,MAAM,QAAQ,GAAG,4BAA4B,CAAC;gBAC9C,MAAM,aAAa,GAAG,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;gBACjD,IAAI,aAAa,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC7C,SAAS,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;iBAC9B;aACF;SACF;QACD,MAAM,IAAI,GAAG,aAAa,GAAG,QAAQ,GAAG,oBAAoB,CAAA;QAC5D,IAAI,QAAQ,GAAG,EAAE,CAAC;QAClB,IAAI,UAAU,EAAE;YACd,QAAQ,GAAG,KAAK,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,QAAQ,WAAW,CAAC,WAAW,EAAE,IAAI,QAAQ,SAAS,CAAC;SAC3G;QAGD,IAAI,cAAc,GAAG,EAAE,CAAA;QACvB,cAAc,IAAI;;;MAGhB,SAAS;YACP,CAAC,CAAC,wDAAwD;YAC1D,CAAC,CAAC,+BACJ;;;;;;;;;;;EAWJ,kBAAkB;EAClB,cAAc;EACd,SAAS,CAAC,CAAC,CAAC,YAAY,SAAS,YAAY,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE;;;IAGvD,UAAU,CAAC,CAAC,CAAC,YAAY,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE;;;;;aAK/B,QAAQ;kBACH,QAAQ;;;;;;;;;;0BAUA,aAAa,IAAI,EAAE;;eAE9B,QAAQ;;;YAGX,UAAU,CAAC,CAAC,CAAC,wEAAwE,CAAC,CAAC,CAAC,EAAE;;;YAG1F,2BAA2B,CAAC,CAAC,CAAC,yCAAyC,2BAA2B,KAAK,CAAC,CAAC,CAAC,EAAE;;;YAG5G,SAAS,CAAC,CAAC,CAAC,yDAAyD,SAAS,4BAA4B,CAAC,CAAC,CAAC,EAAE;;;;;;;CAO1H,CAAC;QAEE,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAA;QACnE,OAAO,QAAQ,CAAA;IACjB,CAAC;CACF;AA9GD,0DA8GC"}
1
+ {"version":3,"file":"vue-app-index-vue-generator.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-index-vue-generator.ts"],"names":[],"mappings":";;;AAAA,wEAAkE;AAGlE,wEAAkE;AAWlE,MAAa,uBAAwB,SAAQ,+CAAqB;IAQhE,QAAQ,CAAC,OAA6B;QACpC,MAAM,QAAQ,GAA0B,+CAAqB,CAAC,mBAAmB,EAAE,CAAA;QACnF,MAAM,oBAAoB,GAA4B,OAAO,CAAC,iBAAiB,CAAA;QAC/E,MAAM,EACJ,QAAQ,EACR,cAAc,EACd,OAAO,EACP,kBAAkB,EAClB,cAAc,EACd,SAAS,EACT,cAAc,EACd,kBAAkB,EAClB,UAAU,EACX,GAAG,oBAAoB,CAAA;QACxB,MAAM,EAAE,eAAe,EAAE,WAAW,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG,cAAc,CAAA;QAClF,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,GAAG,CAAC,CAAA;QACzE,MAAM,2BAA2B,GAAG,cAAc,IAAI,eAAe;YACnE,CAAC,CAAC,IAAI,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,QAAQ,WAAW,GAAG,SAAS,IAAI,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAA,CAAC,CAAC,EAAE,IAAI,QAAQ,GAAG;YAChK,CAAC,CAAC,EAAE,CAAA;QAEJ,IAAI,SAAa,CAAE;QAEnB,IAAG,kBAAkB,IAAK,kBAAkB,CAAC,MAAM,EAAC;YAClD,IAAG,kBAAkB,CAAC,WAAW,EAAC;gBAChC,MAAM,WAAW,GAAG,kBAAkB,CAAC,WAAW,CAAA;gBAClD,MAAM,QAAQ,GAAG,4BAA4B,CAAC;gBAC9C,MAAM,aAAa,GAAG,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;gBACjD,IAAG,aAAa,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAC;oBAC3C,SAAS,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;iBAC9B;aACF;SACF;QACD,MAAM,IAAI,GAAI,aAAa,GAAC,QAAQ,GAAC,oBAAoB,CAAA;QACzD,IAAI,QAAQ,GAAG,EAAE,CAAC;QAClB,IAAG,UAAU,EAAC;YACZ,QAAQ,GAAG,KAAK,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,QAAQ,WAAW,CAAC,WAAW,EAAE,IAAI,QAAQ,SAAS,CAAC;SAC3G;QAGH,IAAI,cAAc,GAAG,EAAE,CAAA;QACvB,cAAc,IAAI;;;MAIhB,SAAS;YACP,CAAC,CAAC,wDAAwD;YAC1D,CAAC,CAAC,+BACN;;;;;;;;;;;EAWF,kBAAkB;EAClB,cAAc;EACd,SAAS,CAAA,CAAC,CAAA,YAAY,SAAS,YAAY,IAAI,GAAG,CAAA,CAAC,CAAA,EAAE;;;IAGnD,UAAU,CAAA,CAAC,CAAC,YAAY,QAAQ,EAAE,CAAA,CAAC,CAAA,EAAE;;;;;aAK5B,QAAQ;kBACH,QAAQ;;;;;;;;;;;;eAYX,QAAQ;;;YAGV,UAAU,CAAC,CAAC,CAAA,wEAAwE,CAAA,CAAC,CAAA,EAAE;;;YAGvF,2BAA2B,CAAC,CAAC,CAAC,yCAAyC,2BAA2B,KAAK,CAAC,CAAC,CAAC,EAAG;;;YAG7G,SAAS,CAAC,CAAC,CAAC,yDAAyD,SAAS,4BAA4B,CAAA,CAAC,CAAC,EAAE;;;;;;;CAO1H,CAAA;QAGG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAA;QACnE,OAAO,QAAQ,CAAA;IACjB,CAAC;CACF;AA/GD,0DA+GC"}
@@ -8,27 +8,27 @@ class VueAppModelProviderGenerator extends abstract_file_generator_1.AbstractFil
8
8
  const response = file_generator_response_1.FileGeneratorResponse.getNewEmptyInstance();
9
9
  const vueRepository = context.externalParameter.value;
10
10
  let generateString = "";
11
- generateString += `
11
+ generateString += `
12
12
  import { Injector, StaticProvider, HttpClient } from '@farris/mobile-devkit';`;
13
13
  if (vueRepository.includeProxyReference) {
14
- generateString += `
14
+ generateString += `
15
15
  import { ${vueRepository.originalEntity}Proxy } from './model.proxy';`;
16
16
  }
17
- generateString += `
17
+ generateString += `
18
18
  import { ModelRepository } from "./model.repository";`;
19
- generateString += `
20
-
19
+ generateString += `
20
+
21
21
  const ModelProviders: StaticProvider[] = [`;
22
22
  if (vueRepository.includeProxyReference) {
23
- generateString += `
23
+ generateString += `
24
24
  { provide: ${vueRepository.originalEntity}Proxy, useClass: ${vueRepository.originalEntity}Proxy, deps: [HttpClient] },`;
25
25
  }
26
- generateString += `
26
+ generateString += `
27
27
  { provide: ModelRepository, useClass: ModelRepository, deps: [Injector] }`;
28
28
  generateString +=
29
- `
29
+ `
30
30
  ]`;
31
- generateString += `
31
+ generateString += `
32
32
  export { ModelProviders };`;
33
33
  this.createFile(context.basePath, context.fileName, generateString);
34
34
  return response;
@@ -9,36 +9,36 @@ class VueAppModelProxyGenerator extends abstract_file_generator_1.AbstractFileGe
9
9
  const response = file_generator_response_1.FileGeneratorResponse.getNewEmptyInstance();
10
10
  const variable = context.externalParameter.value;
11
11
  let generateString = "";
12
- generateString += `
13
- import { HttpClient } from '@farris/mobile-devkit';
14
- import { BefProxy} from '@farris/mobile-bef';
12
+ generateString += `
13
+ import { HttpClient } from '@farris/mobile-devkit';
14
+ import { BefProxy} from '@farris/mobile-bef';
15
15
  import { switchMap, map, catchError } from 'rxjs/operators';`;
16
- generateString += `
17
-
16
+ generateString += `
17
+
18
18
  export class ${this.convertNullToEmpty(variable.externalPrefix)}${this.convertNullToEmpty(variable.proxyName)} extends BefProxy {` + this.getEol();
19
19
  if (variable.restUri) {
20
- generateString += `
20
+ generateString += `
21
21
  public baseUrl = '/${variable.restUri.toLowerCase()}';`;
22
22
  }
23
23
  else {
24
- generateString += `
24
+ generateString += `
25
25
  public baseUrl = '';`;
26
26
  }
27
27
  generateString += this.getEol();
28
- generateString += `
29
- constructor(
30
- httpClient: HttpClient) {
31
- super(httpClient);
28
+ generateString += `
29
+ constructor(
30
+ httpClient: HttpClient) {
31
+ super(httpClient);
32
32
  }`;
33
33
  if (variable.Content && variable.Content.Service && toolhepler_1.ToolHelper.isArray(variable.Content.Service.Operations, false)) {
34
34
  variable.Content.Service.Operations.forEach((item) => {
35
35
  if (item.Extend1 === "Custom") {
36
- generateString += `
36
+ generateString += `
37
37
  ${item.Code}(`;
38
38
  if (toolhepler_1.ToolHelper.isArray(item.Parameters, false)) {
39
39
  item.Parameters.forEach((itemParameter, itemParameterIndex) => {
40
40
  if (itemParameter.In && itemParameter.Code != "requestInfo" && itemParameter.Code != "sessionId") {
41
- generateString += `
41
+ generateString += `
42
42
  ${itemParameter.Code}: any`;
43
43
  if (itemParameterIndex < (item.Parameters.length - 1)) {
44
44
  generateString += `,`;
@@ -47,77 +47,77 @@ export class ${this.convertNullToEmpty(variable.externalPrefix)}${this.convertNu
47
47
  });
48
48
  }
49
49
  generateString += `)`;
50
- generateString += `{
50
+ generateString += `{
51
51
  const uri = new Uri(this.uriService.extendUri(this.apiUrl) + '${item.Template}',{`;
52
52
  if (toolhepler_1.ToolHelper.isArray(item.Parameters, false)) {
53
53
  item.Parameters.forEach((itemParameter, itemParameterIndex) => {
54
54
  if (itemParameter.In === "Path") {
55
- generateString += `
55
+ generateString += `
56
56
  ${itemParameter.Code}: ${itemParameter.Code},`;
57
57
  }
58
58
  });
59
59
  }
60
- generateString += `
60
+ generateString += `
61
61
  });`;
62
- generateString += `
63
- const url = uri.toString();
64
- const method = '${item.HttpMethod}';
65
- const options = {
62
+ generateString += `
63
+ const url = uri.toString();
64
+ const method = '${item.HttpMethod}';
65
+ const options = {
66
66
  params: {`;
67
67
  if (toolhepler_1.ToolHelper.isArray(item.Parameters, false)) {
68
68
  item.Parameters.forEach((itemParameter, itemParameterIndex) => {
69
69
  if (itemParameter.In == "Query") {
70
- generateString += `
70
+ generateString += `
71
71
  ${itemParameter.Code}: ${itemParameter.Code},`;
72
72
  }
73
73
  });
74
74
  }
75
- generateString += `
75
+ generateString += `
76
76
  },`;
77
- generateString += `
77
+ generateString += `
78
78
  headers: {`;
79
79
  if (toolhepler_1.ToolHelper.isArray(item.Parameters, false)) {
80
80
  item.Parameters.forEach((itemParameter) => {
81
81
  if (itemParameter.In == "Header") {
82
82
  if (itemParameter.Code != "sessionId") {
83
- generateString += `
83
+ generateString += `
84
84
  ${itemParameter.Code}: ${itemParameter.Code},`;
85
85
  }
86
86
  else {
87
- generateString += `
87
+ generateString += `
88
88
  sessionId: null,`;
89
89
  }
90
90
  generateString += this.getEol();
91
91
  }
92
92
  });
93
93
  }
94
- generateString += `
94
+ generateString += `
95
95
  },`;
96
- generateString += `
96
+ generateString += `
97
97
  body: {`;
98
98
  if (toolhepler_1.ToolHelper.isArray(item.Parameters, false)) {
99
99
  item.Parameters.forEach((itemParameter) => {
100
100
  if (itemParameter.In == "Body") {
101
101
  if (itemParameter.Code != "requestInfo") {
102
- generateString += `
102
+ generateString += `
103
103
  ${itemParameter.Code}: ${itemParameter.Code},`;
104
104
  }
105
105
  else {
106
- generateString += `
106
+ generateString += `
107
107
  requestInfo: null,`;
108
108
  }
109
109
  }
110
110
  });
111
111
  }
112
- generateString += `
113
- }
114
- };
115
- return this.invoke(url, method, options);
112
+ generateString += `
113
+ }
114
+ };
115
+ return this.invoke(url, method, options);
116
116
  }`;
117
117
  }
118
118
  });
119
119
  }
120
- generateString += `
120
+ generateString += `
121
121
  }`;
122
122
  this.createFile(context.basePath, context.fileName, generateString);
123
123
  return response;
@@ -14,38 +14,38 @@ class VueAppRouterGenerator extends abstract_file_generator_1.AbstractFileGenera
14
14
  }
15
15
  if (toolhepler_1.ToolHelper.isArray(appRouterEntity.pages)) {
16
16
  appRouterEntity.pages.forEach((item) => {
17
- generateString += `
17
+ generateString += `
18
18
  import ${this.generateComponentName(item.pageName)} from '${item.pageImportPath.toLowerCase()}';`;
19
19
  });
20
20
  }
21
- generateString += `
22
-
23
- const routerConfig =
21
+ generateString += `
22
+
23
+ const routerConfig =
24
24
  [`;
25
25
  if (toolhepler_1.ToolHelper.isArray(appRouterEntity.pages)) {
26
26
  appRouterEntity.pages.forEach((item, index) => {
27
27
  if (index === 0) {
28
- generateString += `
29
- {
30
- path: '',
31
- component: ${this.generateComponentName(item.pageName)}
28
+ generateString += `
29
+ {
30
+ path: '',
31
+ component: ${this.generateComponentName(item.pageName)}
32
32
  },`;
33
33
  }
34
- generateString += `
35
- {
36
- path: '${item.pagePath}',
37
- component: ${this.generateComponentName(item.pageName)},
38
- meta: {}
34
+ generateString += `
35
+ {
36
+ path: '${item.pagePath}',
37
+ component: ${this.generateComponentName(item.pageName)},
38
+ meta: {}
39
39
  }`;
40
40
  if (index < appRouterEntity.pages.length - 1) {
41
41
  generateString += ",";
42
42
  }
43
43
  });
44
44
  }
45
- generateString += `
46
- ];
47
-
48
- export { routerConfig };
45
+ generateString += `
46
+ ];
47
+
48
+ export { routerConfig };
49
49
  `;
50
50
  this.createFile(context.basePath, context.fileName, generateString);
51
51
  return response;
@@ -10,18 +10,18 @@ class PageBindingDataGenerator extends abstract_file_generator_1.AbstractFileGen
10
10
  const vueComponent = context.externalParameter.value;
11
11
  let generateString = "";
12
12
  const componentId = vueComponent.id;
13
- generateString += `
13
+ generateString += `
14
14
  import { BindingData } from '@farris/mobile-devkit';`;
15
- generateString += `
16
- export class ${page_binding_data_manager_1.PageBindingDataManager.generateBindingName(componentId)} extends BindingData {
17
-
18
- constructor() {
19
- super();
20
- }
21
- /**
22
- * 绑定路径
23
- */
24
-
15
+ generateString += `
16
+ export class ${page_binding_data_manager_1.PageBindingDataManager.generateBindingName(componentId)} extends BindingData {
17
+
18
+ constructor() {
19
+ super();
20
+ }
21
+ /**
22
+ * 绑定路径
23
+ */
24
+
25
25
  }`;
26
26
  this.createFile(context.basePath, context.fileName, generateString);
27
27
  return response;
@@ -11,7 +11,6 @@ class PageComponentGenerator extends abstract_file_generator_1.AbstractFileGener
11
11
  const componentId = parameter.componentId;
12
12
  const providerName = page_provider_manager_1.PageProviderManager.generateProviderName(componentId);
13
13
  const componentConfig = parameter.componentConfig;
14
- const useNewRouteStrategy = this.isNewRouteStrategy(componentConfig);
15
14
  const generateString = `
16
15
  <template>
17
16
  ${parameter.templateHtml}
@@ -33,9 +32,7 @@ import {
33
32
  updatedByVueAdapter,
34
33
  beforeUnmountByVueAdapter,
35
34
  scrollActivated,
36
- scrollDeactivated,
37
- handlePageLevelRouteEnter,
38
- handlePageLevelRouteLeave,
35
+ scrollDeactivated
39
36
  } from '@farris/mobile-vue-adapter';
40
37
  import {${providerName}} from "./${componentId.toLowerCase()}.provider";
41
38
 
@@ -61,7 +58,7 @@ export default
61
58
  : ''}
62
59
  ...mapCommandMethods([${this.generateCommands(parameter.commands)}]),
63
60
  ${this.getGobackCommand(componentConfig)
64
- ? `goBack() { ${useNewRouteStrategy ? '' : 'this.url === document.URL && '}this.$viewModel.` +
61
+ ? 'goBack() { this.url === document.URL && this.$viewModel.' +
65
62
  this.getGobackCommand(componentConfig) +
66
63
  '();},'
67
64
  : ''}
@@ -89,13 +86,16 @@ export default
89
86
  : ''}
90
87
  ${this.getOnBeforeInitCommand(componentConfig)}
91
88
  beforeCreateByVueAdapter && beforeCreateByVueAdapter(this);
89
+ // 初始加载数据
90
+ //this.pageLoad();
91
+ //this.$viewModel.load();
92
92
  },
93
93
  created(){
94
94
  ${this.getOnInitCommand(componentConfig) ? 'this.pageLoad();' : ''}
95
95
  createdByVueAdapter && createdByVueAdapter(this);
96
96
  },
97
97
  mounted() {
98
- ${componentConfig.keepAlive ? '' : this.getGobackCommandCode(componentConfig, useNewRouteStrategy)}
98
+ ${componentConfig.keepAlive ? '' : this.getGobackCommandCode(componentConfig)}
99
99
  ${componentConfig.keepAlive ? '' : this.getGobackCommandForWF(componentConfig)}
100
100
  this.$nextTick(function () {
101
101
  this.$bindComponentExtenders(this.$refs);
@@ -106,13 +106,13 @@ export default
106
106
  this.$bindComponentExtenders(this.$refs);
107
107
  updatedByVueAdapter && updatedByVueAdapter(this);
108
108
  },
109
- ${this.generateActivated(componentConfig, useNewRouteStrategy)}
109
+ ${this.generateActivated(componentConfig)}
110
110
  beforeUnmount() {
111
111
  ${this.getOnLoadDataCommand(componentConfig)
112
112
  ? 'this.$app.context.eventBus.unsubscribe("' + componentId + '"),'
113
113
  : ''}
114
114
  ${componentConfig.goBack && !componentConfig.keepAlive
115
- ? this.getPageLevelRouteLeaveCode(useNewRouteStrategy)
115
+ ? 'window.removeEventListener("popstate", this.goBack, false); //false阻止默认事件'
116
116
  : ''}
117
117
  this.$unbindComponentExtenders(this.$refs);
118
118
  beforeUnmountByVueAdapter && beforeUnmountByVueAdapter(this);
@@ -126,28 +126,6 @@ ${componentConfig.customClass ? componentConfig.customClass : ''}
126
126
  this.createFile(context.basePath, context.fileName, generateString);
127
127
  return response;
128
128
  }
129
- isNewRouteStrategy(componentConfig) {
130
- var _a, _b, _c;
131
- const newRouteStrategy = ['standard'];
132
- const componentConfigTemplate = componentConfig.template;
133
- let firstContentComponent;
134
- if (Array.isArray(componentConfigTemplate)) {
135
- firstContentComponent = componentConfigTemplate[0];
136
- }
137
- else {
138
- firstContentComponent = componentConfigTemplate;
139
- }
140
- if (!firstContentComponent) {
141
- return false;
142
- }
143
- const parentInstance = (_a = firstContentComponent.getContext()) === null || _a === void 0 ? void 0 : _a.getParentInstance();
144
- const componentContext = parentInstance && parentInstance.componentContext;
145
- if (!componentContext) {
146
- return false;
147
- }
148
- const routeStrategy = (_c = (_b = componentContext.getModuleContext()) === null || _b === void 0 ? void 0 : _b.getOptions()) === null || _c === void 0 ? void 0 : _c.routeStrategy;
149
- return newRouteStrategy.includes(routeStrategy);
150
- }
151
129
  getOnInitCommand(componentConfig) {
152
130
  if (componentConfig.onInit) {
153
131
  return componentConfig.onInit;
@@ -188,6 +166,7 @@ ${componentConfig.customClass ? componentConfig.customClass : ''}
188
166
  generateInitPage(componentConfig, from) {
189
167
  const providerName = page_provider_manager_1.PageProviderManager.generateProviderName(componentConfig.id);
190
168
  return `
169
+ // 创建ViewModel
191
170
  const viewModelOptions = {
192
171
  id: '${componentConfig.id}',
193
172
  ${from === 'activated' ? 'keepAlive: true,' : ''}
@@ -195,18 +174,18 @@ ${componentConfig.customClass ? componentConfig.customClass : ''}
195
174
  };
196
175
  this.$initPage(viewModelOptions);`;
197
176
  }
198
- generateActivated(componentConfig, useNewRouteStrategy) {
177
+ generateActivated(componentConfig) {
199
178
  if (componentConfig.keepAlive) {
200
179
  return `activated() {
201
180
  ${this.generateInitPage(componentConfig, 'activated')}
202
- ${this.getGobackCommandCode(componentConfig, useNewRouteStrategy)}
181
+ ${this.getGobackCommandCode(componentConfig)}
203
182
  ${this.getGobackCommandForWF(componentConfig)}
204
183
  ${this.getOnActivedCommand(componentConfig)}
205
184
  scrollActivated && scrollActivated(this);
206
185
  },
207
186
  deactivated() {
208
187
  ${componentConfig.goBack
209
- ? this.getPageLevelRouteLeaveCode(useNewRouteStrategy)
188
+ ? 'window.removeEventListener("popstate", this.goBack, false); //false阻止默认事件'
210
189
  : ''}
211
190
  scrollDeactivated && scrollDeactivated(this);
212
191
  },`;
@@ -226,25 +205,17 @@ ${componentConfig.customClass ? componentConfig.customClass : ''}
226
205
  }
227
206
  return '';
228
207
  }
229
- getGobackCommandCode(componentConfig, useNewRouteStrategy) {
208
+ getGobackCommandCode(componentConfig) {
230
209
  if (componentConfig.goBack) {
231
- if (useNewRouteStrategy) {
232
- return `handlePageLevelRouteEnter(this, this.goBack);`;
233
- }
234
210
  return `
235
211
  if (window.history && window.history.pushState) {
236
212
  this.url = document.URL
237
213
  history.pushState(null, null, document.URL);
238
- window.addEventListener("popstate", this.goBack, false);
214
+ window.addEventListener("popstate", this.goBack, false); //false阻止默认事件
239
215
  }`;
240
216
  }
241
217
  return '';
242
218
  }
243
- getPageLevelRouteLeaveCode(useNewRouteStrategy) {
244
- return useNewRouteStrategy
245
- ? 'handlePageLevelRouteLeave(this, this.goBack);'
246
- : 'window.removeEventListener("popstate", this.goBack, false);';
247
- }
248
219
  }
249
220
  exports.PageComponentGenerator = PageComponentGenerator;
250
221
  //# sourceMappingURL=page-component-generator.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"page-component-generator.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/code-generator/file-generator/page-generator/page-component-generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"page-component-generator.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/code-generator/file-generator/page-generator/page-component-generator.ts"],"names":[],"mappings":"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"}