@farris/jit-engine 1.3.360 → 1.3.361

package/lib/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-index-vue-generator.js

@@ -1,94 +1,94 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.VueAppIndexVueGenerator = void 0;
-const abstract_file_generator_1 = require("../abstract-file-generator");
-const file_generator_response_1 = require("../file-generator-response");
-class VueAppIndexVueGenerator extends abstract_file_generator_1.AbstractFileGenerator {
-    generate(context) {
-        const response = file_generator_response_1.FileGeneratorResponse.getNewEmptyInstance();
-        const appIndexVueParameter = context.externalParameter;
-        const { formCode, metaDataConfig, imports, extraImportsString, resourceString, keepAlive, hasExpressions, controlStateExtend, enableI18n } = appIndexVueParameter;
-        const { serviceUnitPath, projectName, isRuntime, runTimeDimPath } = metaDataConfig;
-        const _imports = imports.map((item) => `${item.name}:${item.name},`);
-        const generateFormPathValueString = hasExpressions && serviceUnitPath
-            ? `/${serviceUnitPath.replace(/\\/g, '/')}/mob/${projectName}${isRuntime && runTimeDimPath ? runTimeDimPath.replace(/\\/g, '/').toLowerCase() : ''}/${formCode}/`
-            : '';
-        let className;
-        if (controlStateExtend && controlStateExtend.enable) {
-            if (controlStateExtend.interceptor) {
-                const interceptor = controlStateExtend.interceptor;
-                const classExp = /(?<=class\s*)(\w+)(?=\s*)/g;
-                const classNameList = interceptor.match(classExp);
-                if (classNameList && classNameList.length > 0) {
-                    className = classNameList[0];
-                }
-            }
-        }
-        const path = "./services/" + formCode + "_state_interceptor";
-        let langPath = '';
-        if (enableI18n) {
-            langPath = `'/${serviceUnitPath.replace(/\\/g, '/')}/mob/${projectName}${isRuntime && runTimeDimPath ? runTimeDimPath.replace(/\\/g, '/').toLowerCase() : ''}/${formCode}/i18n/'`;
-        }
-        let generateString = '';
-        generateString += `
-<template>
-  <router-view v-slot="{ Component }">
-    ${keepAlive
-            ? '<keep-alive><component :is="Component" /></keep-alive>'
-            : '<component :is="Component" />'}
-  </router-view>
-</template>
-
-<script>
-import { AppOptions, FORM_PATH_TOKEN, VALIDATION_RULE_TOKEN, CONTROL_STATE_INTERCEPTOR_TOKEN, TranslateService} from '@farris/mobile-devkit';
-import { FrameworkSessionService } from '@farris/mobile-bef';
-import { COMMAND_SERVICES_APP_PROVIDERS, ROUTER_INSTANCE_TOKEN,LangService} from '@farris/mobile-command-services';
-import { DevkitPlugin,beforeRouteEnterByVueAdapter,initdataOptions } from '@farris/mobile-vue-adapter';
-import { ModelProviders } from './models/model.provider';
-import { validationRule } from './validation';
-${extraImportsString}
-${resourceString}
-${className ? `import { ${className} } from '${path}'` : ''}
-
-const dataOptions  = { 
-  ${enableI18n ? `langPath:${langPath}` : ''}
-}
-initdataOptions(dataOptions);
-
-export default{
-    name: '${formCode}',
-    components:{${_imports}},
-    data() {
-      return {
-        transitionName: '',
-      };
-    },
-    beforeRouteEnter(to, from, next) {
-      beforeRouteEnterByVueAdapter(to, from, next,dataOptions);
-
-    },
-    beforeCreate(){
-      const appOptions = {
-        id: '${formCode}',
-        providers: [
-          ...ModelProviders,
-          ${enableI18n ? `{ provide: TranslateService, useValue: dataOptions.translateService },` : ''}
-          { provide: FrameworkSessionService, useClass: FrameworkSessionService, deps: []},
-          { provide: ROUTER_INSTANCE_TOKEN, useValue: this.$router },
-          ${generateFormPathValueString ? `{ provide: FORM_PATH_TOKEN, useValue:'${generateFormPathValueString}'},` : ''}
-          { provide: VALIDATION_RULE_TOKEN, useValue: validationRule},
-          ...COMMAND_SERVICES_APP_PROVIDERS,
-          ${className ? `{ provide: CONTROL_STATE_INTERCEPTOR_TOKEN, useClass: ${className}, deps: [] ,multi: true },` : ''}
-        ]
-      };
-      this.$createApp(appOptions);
-    }
-};
-</script>
-`;
-        this.createFile(context.basePath, context.fileName, generateString);
-        return response;
-    }
-}
-exports.VueAppIndexVueGenerator = VueAppIndexVueGenerator;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VueAppIndexVueGenerator = void 0;
+const abstract_file_generator_1 = require("../abstract-file-generator");
+const file_generator_response_1 = require("../file-generator-response");
+class VueAppIndexVueGenerator extends abstract_file_generator_1.AbstractFileGenerator {
+    generate(context) {
+        const response = file_generator_response_1.FileGeneratorResponse.getNewEmptyInstance();
+        const appIndexVueParameter = context.externalParameter;
+        const { formCode, metaDataConfig, imports, extraImportsString, resourceString, keepAlive, hasExpressions, controlStateExtend, enableI18n } = appIndexVueParameter;
+        const { serviceUnitPath, projectName, isRuntime, runTimeDimPath } = metaDataConfig;
+        const _imports = imports.map((item) => `${item.name}:${item.name},`);
+        const generateFormPathValueString = hasExpressions && serviceUnitPath
+            ? `/${serviceUnitPath.replace(/\\/g, '/')}/mob/${projectName}${isRuntime && runTimeDimPath ? runTimeDimPath.replace(/\\/g, '/').toLowerCase() : ''}/${formCode}/`
+            : '';
+        let className;
+        if (controlStateExtend && controlStateExtend.enable) {
+            if (controlStateExtend.interceptor) {
+                const interceptor = controlStateExtend.interceptor;
+                const classExp = /(?<=class\s*)(\w+)(?=\s*)/g;
+                const classNameList = interceptor.match(classExp);
+                if (classNameList && classNameList.length > 0) {
+                    className = classNameList[0];
+                }
+            }
+        }
+        const path = "./services/" + formCode + "_state_interceptor";
+        let langPath = '';
+        if (enableI18n) {
+            langPath = `'/${serviceUnitPath.replace(/\\/g, '/')}/mob/${projectName.toLowerCase()}/${formCode}/i18n/'`;
+        }
+        let generateString = '';
+        generateString += `
+<template>
+  <router-view v-slot="{ Component }">
+    ${keepAlive
+            ? '<keep-alive><component :is="Component" /></keep-alive>'
+            : '<component :is="Component" />'}
+  </router-view>
+</template>
+
+<script>
+import { AppOptions, FORM_PATH_TOKEN, VALIDATION_RULE_TOKEN, CONTROL_STATE_INTERCEPTOR_TOKEN, TranslateService} from '@farris/mobile-devkit';
+import { FrameworkSessionService } from '@farris/mobile-bef';
+import { COMMAND_SERVICES_APP_PROVIDERS, ROUTER_INSTANCE_TOKEN,LangService} from '@farris/mobile-command-services';
+import { DevkitPlugin,beforeRouteEnterByVueAdapter,initdataOptions } from '@farris/mobile-vue-adapter';
+import { ModelProviders } from './models/model.provider';
+import { validationRule } from './validation';
+${extraImportsString}
+${resourceString}
+${className ? `import { ${className} } from '${path}'` : ''}
+
+const dataOptions  = { 
+  ${enableI18n ? `langPath:${langPath}` : ''}
+}
+initdataOptions(dataOptions);
+
+export default{
+    name: '${formCode}',
+    components:{${_imports}},
+    data() {
+      return {
+        transitionName: '',
+      };
+    },
+    beforeRouteEnter(to, from, next) {
+      beforeRouteEnterByVueAdapter(to, from, next,dataOptions);
+
+    },
+    beforeCreate(){
+      const appOptions = {
+        id: '${formCode}',
+        providers: [
+          ...ModelProviders,
+          ${enableI18n ? `{ provide: TranslateService, useValue: dataOptions.translateService },` : ''}
+          { provide: FrameworkSessionService, useClass: FrameworkSessionService, deps: []},
+          { provide: ROUTER_INSTANCE_TOKEN, useValue: this.$router },
+          ${generateFormPathValueString ? `{ provide: FORM_PATH_TOKEN, useValue:'${generateFormPathValueString}'},` : ''}
+          { provide: VALIDATION_RULE_TOKEN, useValue: validationRule},
+          ...COMMAND_SERVICES_APP_PROVIDERS,
+          ${className ? `{ provide: CONTROL_STATE_INTERCEPTOR_TOKEN, useClass: ${className}, deps: [] ,multi: true },` : ''}
+        ]
+      };
+      this.$createApp(appOptions);
+    }
+};
+</script>
+`;
+        this.createFile(context.basePath, context.fileName, generateString);
+        return response;
+    }
+}
+exports.VueAppIndexVueGenerator = VueAppIndexVueGenerator;
 //# sourceMappingURL=vue-app-index-vue-generator.js.map

package/lib/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-index-vue-generator.js.map

@@ -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,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,GAAG,SAAS,IAAI,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAA,CAAC,CAAC,EAAE,IAAI,QAAQ,SAAS,CAAC;SAClL;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"}
+{"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"}

package/lib/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-model-provider-generator.js

@@ -8,27 +8,27 @@ class VueAppModelProviderGenerator extends abstract_file_generator_1.AbstractFil
         const response = file_generator_response_1.FileGeneratorResponse.getNewEmptyInstance();
         const vueRepository = context.externalParameter.value;
         let generateString = "";
-        generateString += `
+        generateString += `
 import { Injector, StaticProvider, HttpClient  } from '@farris/mobile-devkit';`;
         if (vueRepository.includeProxyReference) {
-            generateString += `
+            generateString += `
 import { ${vueRepository.originalEntity}Proxy } from './model.proxy';`;
         }
-        generateString += `
+        generateString += `
 import { ModelRepository } from "./model.repository";`;
-        generateString += `
-
+        generateString += `
+
 const ModelProviders: StaticProvider[] = [`;
         if (vueRepository.includeProxyReference) {
-            generateString += `
+            generateString += `
         { provide: ${vueRepository.originalEntity}Proxy, useClass: ${vueRepository.originalEntity}Proxy, deps: [HttpClient] },`;
         }
-        generateString += `
+        generateString += `
         { provide: ModelRepository, useClass: ModelRepository, deps: [Injector] }`;
         generateString +=
-            `
+            `
 ]`;
-        generateString += `
+        generateString += `
 export { ModelProviders };`;
         this.createFile(context.basePath, context.fileName, generateString);
         return response;

package/lib/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-model-proxy-generator.js

@@ -9,36 +9,36 @@ class VueAppModelProxyGenerator extends abstract_file_generator_1.AbstractFileGe
         const response = file_generator_response_1.FileGeneratorResponse.getNewEmptyInstance();
         const variable = context.externalParameter.value;
         let generateString = "";
-        generateString += `
-import { HttpClient } from '@farris/mobile-devkit';
-import { BefProxy} from '@farris/mobile-bef';
+        generateString += `
+import { HttpClient } from '@farris/mobile-devkit';
+import { BefProxy} from '@farris/mobile-bef';
 import { switchMap, map, catchError } from 'rxjs/operators';`;
-        generateString += `
-
+        generateString += `
+
 export class ${this.convertNullToEmpty(variable.externalPrefix)}${this.convertNullToEmpty(variable.proxyName)} extends BefProxy {` + this.getEol();
         if (variable.restUri) {
-            generateString += `
+            generateString += `
     public baseUrl = '/${variable.restUri.toLowerCase()}';`;
         }
         else {
-            generateString += `
+            generateString += `
     public baseUrl = '';`;
         }
         generateString += this.getEol();
-        generateString += `
-    constructor(
-        httpClient: HttpClient) {
-        super(httpClient);
+        generateString += `
+    constructor(
+        httpClient: HttpClient) {
+        super(httpClient);
     }`;
         if (variable.Content && variable.Content.Service && toolhepler_1.ToolHelper.isArray(variable.Content.Service.Operations, false)) {
             variable.Content.Service.Operations.forEach((item) => {
                 if (item.Extend1 === "Custom") {
-                    generateString += `
+                    generateString += `
     ${item.Code}(`;
                     if (toolhepler_1.ToolHelper.isArray(item.Parameters, false)) {
                         item.Parameters.forEach((itemParameter, itemParameterIndex) => {
                             if (itemParameter.In && itemParameter.Code != "requestInfo" && itemParameter.Code != "sessionId") {
-                                generateString += `
+                                generateString += `
         ${itemParameter.Code}: any`;
                                 if (itemParameterIndex < (item.Parameters.length - 1)) {
                                     generateString += `,`;
@@ -47,77 +47,77 @@ export class ${this.convertNullToEmpty(variable.externalPrefix)}${this.convertNu
                         });
                     }
                     generateString += `)`;
-                    generateString += `{
+                    generateString += `{
         const uri = new Uri(this.uriService.extendUri(this.apiUrl) + '${item.Template}',{`;
                     if (toolhepler_1.ToolHelper.isArray(item.Parameters, false)) {
                         item.Parameters.forEach((itemParameter, itemParameterIndex) => {
                             if (itemParameter.In === "Path") {
-                                generateString += `
+                                generateString += `
         ${itemParameter.Code}: ${itemParameter.Code},`;
                             }
                         });
                     }
-                    generateString += `
+                    generateString += `
         });`;
-                    generateString += `
-        const url = uri.toString();
-        const method = '${item.HttpMethod}';
-        const options = {
+                    generateString += `
+        const url = uri.toString();
+        const method = '${item.HttpMethod}';
+        const options = {
             params: {`;
                     if (toolhepler_1.ToolHelper.isArray(item.Parameters, false)) {
                         item.Parameters.forEach((itemParameter, itemParameterIndex) => {
                             if (itemParameter.In == "Query") {
-                                generateString += `
+                                generateString += `
                 ${itemParameter.Code}: ${itemParameter.Code},`;
                             }
                         });
                     }
-                    generateString += `
+                    generateString += `
             },`;
-                    generateString += `
+                    generateString += `
             headers: {`;
                     if (toolhepler_1.ToolHelper.isArray(item.Parameters, false)) {
                         item.Parameters.forEach((itemParameter) => {
                             if (itemParameter.In == "Header") {
                                 if (itemParameter.Code != "sessionId") {
-                                    generateString += `
+                                    generateString += `
                 ${itemParameter.Code}: ${itemParameter.Code},`;
                                 }
                                 else {
-                                    generateString += `
+                                    generateString += `
                 sessionId: null,`;
                                 }
                                 generateString += this.getEol();
                             }
                         });
                     }
-                    generateString += `
+                    generateString += `
             },`;
-                    generateString += `
+                    generateString += `
             body: {`;
                     if (toolhepler_1.ToolHelper.isArray(item.Parameters, false)) {
                         item.Parameters.forEach((itemParameter) => {
                             if (itemParameter.In == "Body") {
                                 if (itemParameter.Code != "requestInfo") {
-                                    generateString += `
+                                    generateString += `
                 ${itemParameter.Code}: ${itemParameter.Code},`;
                                 }
                                 else {
-                                    generateString += `
+                                    generateString += `
                 requestInfo: null,`;
                                 }
                             }
                         });
                     }
-                    generateString += `
-            }
-        };
-        return this.invoke(url, method, options);
+                    generateString += `
+            }
+        };
+        return this.invoke(url, method, options);
     }`;
                 }
             });
         }
-        generateString += `
+        generateString += `
 }`;
         this.createFile(context.basePath, context.fileName, generateString);
         return response;

package/lib/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-router-generator.js

@@ -14,38 +14,38 @@ class VueAppRouterGenerator extends abstract_file_generator_1.AbstractFileGenera
         }
         if (toolhepler_1.ToolHelper.isArray(appRouterEntity.pages)) {
             appRouterEntity.pages.forEach((item) => {
-                generateString += `
+                generateString += `
 import ${this.generateComponentName(item.pageName)} from '${item.pageImportPath.toLowerCase()}';`;
             });
         }
-        generateString += `
-
-const routerConfig =
+        generateString += `
+
+const routerConfig =
     [`;
         if (toolhepler_1.ToolHelper.isArray(appRouterEntity.pages)) {
             appRouterEntity.pages.forEach((item, index) => {
                 if (index === 0) {
-                    generateString += `
-        {
-            path: '',
-            component: ${this.generateComponentName(item.pageName)}
+                    generateString += `
+        {
+            path: '',
+            component: ${this.generateComponentName(item.pageName)}
         },`;
                 }
-                generateString += `
-        {
-            path: '${item.pagePath}',
-            component: ${this.generateComponentName(item.pageName)},
-            meta: {}
+                generateString += `
+        {
+            path: '${item.pagePath}',
+            component: ${this.generateComponentName(item.pageName)},
+            meta: {}
         }`;
                 if (index < appRouterEntity.pages.length - 1) {
                     generateString += ",";
                 }
             });
         }
-        generateString += `
-    ];
-
-export { routerConfig };
+        generateString += `
+    ];
+
+export { routerConfig };
 `;
         this.createFile(context.basePath, context.fileName, generateString);
         return response;

package/lib/mobileapp/vue/code-generator/file-generator/page-generator/page-bindingdata-generator.js

@@ -10,18 +10,18 @@ class PageBindingDataGenerator extends abstract_file_generator_1.AbstractFileGen
         const vueComponent = context.externalParameter.value;
         let generateString = "";
         const componentId = vueComponent.id;
-        generateString += `
+        generateString += `
 import { BindingData } from '@farris/mobile-devkit';`;
-        generateString += `
-export class ${page_binding_data_manager_1.PageBindingDataManager.generateBindingName(componentId)} extends  BindingData {
-
-    constructor() {
-        super();
-    }
-    /**
-     * 绑定路径
-     */
-
+        generateString += `
+export class ${page_binding_data_manager_1.PageBindingDataManager.generateBindingName(componentId)} extends  BindingData {
+
+    constructor() {
+        super();
+    }
+    /**
+     * 绑定路径
+     */
+
 }`;
         this.createFile(context.basePath, context.fileName, generateString);
         return response;

package/lib/mobileapp/vue/code-generator/file-generator/page-generator/page-component-generator.js

@@ -11,7 +11,6 @@ class PageComponentGenerator extends abstract_file_generator_1.AbstractFileGener
         const componentId = parameter.componentId;
         const providerName = page_provider_manager_1.PageProviderManager.generateProviderName(componentId);
         const componentConfig = parameter.componentConfig;
-        const useNewRouteStrategy = this.isNewRouteStrategy(componentConfig);
         const generateString = `
 <template>
 ${parameter.templateHtml}
@@ -33,9 +32,7 @@ import {
     updatedByVueAdapter,
     beforeUnmountByVueAdapter,
     scrollActivated,
-    scrollDeactivated,
-    handlePageLevelRouteEnter,
-    handlePageLevelRouteLeave,
+    scrollDeactivated
   } from '@farris/mobile-vue-adapter';
 import {${providerName}} from "./${componentId.toLowerCase()}.provider";
 
@@ -61,7 +58,7 @@ export default
             : ''}
         ...mapCommandMethods([${this.generateCommands(parameter.commands)}]),
         ${this.getGobackCommand(componentConfig)
-            ? `goBack() { ${useNewRouteStrategy ? '' : 'this.url === document.URL && '}this.$viewModel.` +
+            ? 'goBack() { this.url === document.URL && this.$viewModel.' +
                 this.getGobackCommand(componentConfig) +
                 '();},'
             : ''}
@@ -89,13 +86,16 @@ export default
             : ''}
         ${this.getOnBeforeInitCommand(componentConfig)}
         beforeCreateByVueAdapter && beforeCreateByVueAdapter(this);
+        // 初始加载数据
+        //this.pageLoad();
+        //this.$viewModel.load();
     },
     created(){
         ${this.getOnInitCommand(componentConfig) ? 'this.pageLoad();' : ''}
         createdByVueAdapter && createdByVueAdapter(this);
     },
     mounted() {
-        ${componentConfig.keepAlive ? '' : this.getGobackCommandCode(componentConfig, useNewRouteStrategy)}
+        ${componentConfig.keepAlive ? '' : this.getGobackCommandCode(componentConfig)}
         ${componentConfig.keepAlive ? '' : this.getGobackCommandForWF(componentConfig)}
         this.$nextTick(function () {
             this.$bindComponentExtenders(this.$refs);
@@ -106,13 +106,13 @@ export default
         this.$bindComponentExtenders(this.$refs);
         updatedByVueAdapter && updatedByVueAdapter(this);
     },
-    ${this.generateActivated(componentConfig, useNewRouteStrategy)}
+    ${this.generateActivated(componentConfig)}
     beforeUnmount() {
         ${this.getOnLoadDataCommand(componentConfig)
             ? 'this.$app.context.eventBus.unsubscribe("' + componentId + '"),'
             : ''}
         ${componentConfig.goBack && !componentConfig.keepAlive
-            ? this.getPageLevelRouteLeaveCode(useNewRouteStrategy)
+            ? 'window.removeEventListener("popstate", this.goBack, false); //false阻止默认事件'
             : ''}
         this.$unbindComponentExtenders(this.$refs);
         beforeUnmountByVueAdapter && beforeUnmountByVueAdapter(this);
@@ -126,28 +126,6 @@ ${componentConfig.customClass ? componentConfig.customClass : ''}
         this.createFile(context.basePath, context.fileName, generateString);
         return response;
     }
-    isNewRouteStrategy(componentConfig) {
-        var _a, _b, _c;
-        const newRouteStrategy = ['standard'];
-        const componentConfigTemplate = componentConfig.template;
-        let firstContentComponent;
-        if (Array.isArray(componentConfigTemplate)) {
-            firstContentComponent = componentConfigTemplate[0];
-        }
-        else {
-            firstContentComponent = componentConfigTemplate;
-        }
-        if (!firstContentComponent) {
-            return false;
-        }
-        const parentInstance = (_a = firstContentComponent.getContext()) === null || _a === void 0 ? void 0 : _a.getParentInstance();
-        const componentContext = parentInstance && parentInstance.componentContext;
-        if (!componentContext) {
-            return false;
-        }
-        const routeStrategy = (_c = (_b = componentContext.getModuleContext()) === null || _b === void 0 ? void 0 : _b.getOptions()) === null || _c === void 0 ? void 0 : _c.routeStrategy;
-        return newRouteStrategy.includes(routeStrategy);
-    }
     getOnInitCommand(componentConfig) {
         if (componentConfig.onInit) {
             return componentConfig.onInit;
@@ -188,6 +166,7 @@ ${componentConfig.customClass ? componentConfig.customClass : ''}
     generateInitPage(componentConfig, from) {
         const providerName = page_provider_manager_1.PageProviderManager.generateProviderName(componentConfig.id);
         return `
+    // 创建ViewModel
     const viewModelOptions = {
       id: '${componentConfig.id}',
       ${from === 'activated' ? 'keepAlive: true,' : ''}
@@ -195,18 +174,18 @@ ${componentConfig.customClass ? componentConfig.customClass : ''}
     };
     this.$initPage(viewModelOptions);`;
     }
-    generateActivated(componentConfig, useNewRouteStrategy) {
+    generateActivated(componentConfig) {
         if (componentConfig.keepAlive) {
             return `activated() {
         ${this.generateInitPage(componentConfig, 'activated')}
-        ${this.getGobackCommandCode(componentConfig, useNewRouteStrategy)}
+        ${this.getGobackCommandCode(componentConfig)}
         ${this.getGobackCommandForWF(componentConfig)}
         ${this.getOnActivedCommand(componentConfig)}
         scrollActivated && scrollActivated(this);
     },
     deactivated() {
         ${componentConfig.goBack
-                ? this.getPageLevelRouteLeaveCode(useNewRouteStrategy)
+                ? 'window.removeEventListener("popstate", this.goBack, false); //false阻止默认事件'
                 : ''}
         scrollDeactivated && scrollDeactivated(this);
     },`;
@@ -226,25 +205,17 @@ ${componentConfig.customClass ? componentConfig.customClass : ''}
         }
         return '';
     }
-    getGobackCommandCode(componentConfig, useNewRouteStrategy) {
+    getGobackCommandCode(componentConfig) {
         if (componentConfig.goBack) {
-            if (useNewRouteStrategy) {
-                return `handlePageLevelRouteEnter(this, this.goBack);`;
-            }
             return `
         if (window.history && window.history.pushState) {
             this.url = document.URL
             history.pushState(null, null, document.URL);
-            window.addEventListener("popstate", this.goBack, false);
+            window.addEventListener("popstate", this.goBack, false); //false阻止默认事件
         }`;
         }
         return '';
     }
-    getPageLevelRouteLeaveCode(useNewRouteStrategy) {
-        return useNewRouteStrategy
-            ? 'handlePageLevelRouteLeave(this, this.goBack);'
-            : 'window.removeEventListener("popstate", this.goBack, false);';
-    }
 }
 exports.PageComponentGenerator = PageComponentGenerator;
 //# sourceMappingURL=page-component-generator.js.map

package/lib/mobileapp/vue/code-generator/file-generator/page-generator/page-component-generator.js.map

@@ -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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"}
+{"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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"}