@farris/jit-engine 1.4.24 → 1.4.26

package/README.md

@@ -1,11 +1,7 @@
-1.4.24
+1.4.26
 
     零代码审批意见更新
     
-1.4.23
-
-    移动端表单支持新版路由策略
-
 1.4.22
 
     属性编辑器自定义值为空场景兼容

package/lib/mobileapp/vue/code-generator/devkit-manager/app-indexvue-manager.js

@@ -14,7 +14,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };

package/lib/mobileapp/vue/code-generator/devkit-manager/app-indexvue-manager.js.map

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

package/lib/mobileapp/vue/code-generator/devkit-manager/index.js

@@ -7,7 +7,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./devkit-file-manager"), exports);

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

@@ -7,7 +7,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./vue-app-index-vue-generator"), exports);

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

@@ -1 +1 @@
-{"version":3,"file":"vue-app-expression.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-expression.ts"],"names":[],"mappings":";;;AAAA,wEAAkE;AAGlE,wEAAkE;AAUlE,MAAa,yBAA0B,SAAQ,+CAAqB;IAApE;;QACE,aAAQ,GAAqB,IAAI,GAAG,EAAE,CAAA;IAgFxC,CAAC;IAxEC,QAAQ,CAAC,OAA6B;QACpC,MAAM,QAAQ,GAA0B,+CAAqB,CAAC,mBAAmB,EAAE,CAAA;QACnF,IAAI,cAAc,GAAG,GAAG,CAAA;QAExB,MAAM,WAAW,GAAU,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAA;QAC5E,IAAG,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,IAAI,CAAC,EAAE;YAC1C,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;YACnC,OAAO,QAAQ,CAAA;SAChB;QAED,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAA;QAE5C,WAAW,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;YAClC,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YAC7C,IAAG,CAAC,KAAK,EAAE;gBACT,OAAO,IAAI,CAAA;aACZ;YAED,IAAI,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAChC,cAAc,IAAI,GAAG,CAAA;aACtB;YAED,MAAM,IAAI,GAAU,KAAK,CAAC,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,GAAG,GAAG,KAAK,CAAC,OAAO,CAAA;YAC7F,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAA;YAC5D,MAAM,YAAY,GAAQ,IAAI,CAAC,UAAU;gBACvC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EAAO,EAAE,EAAE;;oBAC9B,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,EAAE,CAAA;oBACpD,OAAO;wBACL,EAAE;wBACF,IAAI;wBACJ,KAAK,EAAE,KAAK,KAAI,MAAA,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,0CAAE,IAAI,CAAA,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;wBACrE,OAAO;wBACP,WAAW;qBACZ,CAAA;gBACH,CAAC,CAAC;gBACJ,CAAC,CAAC,EAAE,CAAC;YAEP,cAAc,IAAI;;eAET,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;;;qBAGlB,WAAW;qBACX,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC;EAC/C,CAAA;QACE,CAAC,CAAC,CAAA;QACF,cAAc,IAAI,GAAG,CAAA;QAErB,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAA;QACnE,IAAI,CAAC,UAAU,CACb,OAAO,CAAC,QAAQ,EAChB,oBAAoB,EACpB,8BAA8B,OAAO,CAAC,QAAQ,cAAc,CAC7D,CAAA;QACD,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED,YAAY,CAAC,MAAW;QACtB,MAAM,UAAU,GAAU,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,UAAU,EAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAA;QACrE,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YAC/B,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAA;YAC/B,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAA;YACxC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAA4B,EAAE,EAAE;gBAChD,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAA;gBACzB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,IAAI,KAAK,CAAC,EAAE,kCAAM,KAAK,KAAE,MAAM,IAAE,CAAA;YAC1D,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,cAAc,CAAC,GAAQ;;QACrB,OAAO,CAAA,MAAA,GAAG,CAAC,MAAM,0CAAE,WAAW,EAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAA;IAC9D,CAAC;CACF;AAjFD,8DAiFC"}
+{"version":3,"file":"vue-app-expression.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-expression.ts"],"names":[],"mappings":"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"}

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

@@ -7,14 +7,14 @@ class VueAppFilterGenerator extends abstract_file_generator_1.AbstractFileGenera
     generate(context) {
         let generateString = "";
         generateString +=
-            `
-// Vue.filter("lang", function(value, langCode, defaultValue) {
-//     const translatedValue = lang["zh-CHS"][value];
-//     if (!translatedValue && translatedValue != "") {
-//         return defaultValue;
-//     }
-//     return translatedValue;
-// });
+            `
+// Vue.filter("lang", function(value, langCode, defaultValue) {
+//     const translatedValue = lang["zh-CHS"][value];
+//     if (!translatedValue && translatedValue != "") {
+//         return defaultValue;
+//     }
+//     return translatedValue;
+// });
 `;
         const response = file_generator_response_1.FileGeneratorResponse.getNewEmptyInstance();
         response.fileContent = generateString;

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

@@ -9,8 +9,8 @@ class VueAppIndexResourceGenerator extends abstract_file_generator_1.AbstractFil
         const response = file_generator_response_1.FileGeneratorResponse.getNewEmptyInstance();
         let generateString = "";
         generateString +=
-            `
-const lang = { "zh-CHS": ${JSON.stringify(ctrlLangs.config["zh-CHS"])}};
+            `
+const lang = { "zh-CHS": ${JSON.stringify(ctrlLangs.config["zh-CHS"])}};
 `;
         response.fileContent = generateString;
         return response;

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/app-generator/vue-app-validation-rule.js.map

@@ -1 +1 @@
-{"version":3,"file":"vue-app-validation-rule.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-validation-rule.ts"],"names":[],"mappings":";;;AAAA,wEAAkE;AAGlE,wEAAkE;AAUlE,MAAa,6BAA8B,SAAQ,+CAAqB;IAAxE;;QACE,aAAQ,GAAqB,IAAI,GAAG,EAAE,CAAA;IAgCxC,CAAC;IAxBC,QAAQ,CAAC,OAA6B;QACpC,MAAM,QAAQ,GAA0B,+CAAqB,CAAC,mBAAmB,EAAE,CAAA;QACnF,MAAM,KAAK,GAAG,OAAO,CAAC,iBAAiB,CAAA;QACvC,IAAI,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;QAC7D,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAA;QACnE,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED,iBAAiB,CAAC,UAAe;QAC/B,IAAI,IAAI,GAAG,iCAAiC,CAAA;QAC5C,UAAU,CAAC,OAAO,CAAC,CAAC,SAAc,EAAE,EAAE;;YACpC,CAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,0CAAE,QAAQ,KAAI,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE;gBAC5E,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,IAAI,SAAS,CAAC,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,GAAG,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,GAAG,OAAO,CAAC,OAAO,CAAA;gBAC9H,MAAM,WAAW,GAAO,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAA;gBAC3D,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,SAAc,EAAE,EAAE;oBAClE,WAAW,CAAC,UAAU,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;gBACxG,CAAC,CAAC,CAAA;gBACF,IAAI,GAAI,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,CAAA;YAC/G,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,IAAI,GAAG,IAAI,GAAG,GAAG,CAAA;QACjB,OAAO,IAAI,CAAA;IACb,CAAC;CAEF;AAjCD,sEAiCC"}
+{"version":3,"file":"vue-app-validation-rule.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-validation-rule.ts"],"names":[],"mappings":";;;AAAA,wEAAkE;AAGlE,wEAAkE;AAUlE,MAAa,6BAA8B,SAAQ,+CAAqB;IAAxE;;QACE,aAAQ,GAAqB,IAAI,GAAG,EAAE,CAAA;IAgCxC,CAAC;IAxBC,QAAQ,CAAC,OAA6B;QACpC,MAAM,QAAQ,GAA0B,+CAAqB,CAAC,mBAAmB,EAAE,CAAA;QACnF,MAAM,KAAK,GAAG,OAAO,CAAC,iBAAiB,CAAA;QACvC,IAAI,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;QAC7D,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAA;QACnE,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED,iBAAiB,CAAC,UAAe;QAC/B,IAAI,IAAI,GAAG,iCAAiC,CAAA;QAC5C,UAAU,CAAC,OAAO,CAAC,CAAC,SAAc,EAAE,EAAE;;YACpC,OAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,0CAAE,QAAQ,KAAI,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE;gBAC5E,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,IAAI,SAAS,CAAC,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,GAAG,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,GAAG,OAAO,CAAC,OAAO,CAAA;gBAC9H,MAAM,WAAW,GAAO,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAA;gBAC3D,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,SAAc,EAAE,EAAE;oBAClE,WAAW,CAAC,UAAU,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;gBACxG,CAAC,CAAC,CAAA;gBACF,IAAI,GAAI,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,CAAA;YAC/G,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,IAAI,GAAG,IAAI,GAAG,GAAG,CAAA;QACjB,OAAO,IAAI,CAAA;IACb,CAAC;CAEF;AAjCD,sEAiCC"}

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

@@ -7,7 +7,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./file-generator-type"), exports);

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.keepAlive
-            ? this.getPageLevelRouteLeaveCode(componentConfig, useNewRouteStrategy)
+        ${componentConfig.goBack && !componentConfig.keepAlive
+            ? '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,17 +174,19 @@ ${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() {
-        ${this.getPageLevelRouteLeaveCode(componentConfig, useNewRouteStrategy)}
+        ${componentConfig.goBack
+                ? 'window.removeEventListener("popstate", this.goBack, false); //false阻止默认事件'
+                : ''}
         scrollDeactivated && scrollDeactivated(this);
     },`;
         }
@@ -224,31 +205,16 @@ ${componentConfig.customClass ? componentConfig.customClass : ''}
         }
         return '';
     }
-    getGobackCommandCode(componentConfig, useNewRouteStrategy) {
-        const isPageComponent = !!componentConfig.goBack || componentConfig.componentType === 'Page';
-        if (useNewRouteStrategy) {
-            return isPageComponent ? `handlePageLevelRouteEnter(this, this.goBack);` : '';
-        }
-        else {
-            if (componentConfig.goBack) {
-                return `\n` +
-                    `\t\tif (window.history && window.history.pushState) {\n` +
-                    `\t\t    this.url = document.URL;\n` +
-                    `\t\t    history.pushState(null, null, document.URL);\n` +
-                    `\t\t    window.addEventListener("popstate", this.goBack, false);\n` +
-                    `\t\t}`;
-            }
-            return '';
-        }
-    }
-    getPageLevelRouteLeaveCode(componentConfig, useNewRouteStrategy) {
-        const isPageComponent = !!componentConfig.goBack || componentConfig.componentType === 'Page';
-        if (useNewRouteStrategy) {
-            return isPageComponent ? `handlePageLevelRouteLeave(this, this.goBack);` : '';
-        }
-        else {
-            return componentConfig.goBack ? `window.removeEventListener("popstate", this.goBack, false);` : ``;
+    getGobackCommandCode(componentConfig) {
+        if (componentConfig.goBack) {
+            return `
+        if (window.history && window.history.pushState) {
+            this.url = document.URL
+            history.pushState(null, null, document.URL);
+            window.addEventListener("popstate", this.goBack, false); //false阻止默认事件
+        }`;
         }
+        return '';
     }
 }
 exports.PageComponentGenerator = PageComponentGenerator;

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":";;;AAAA,wEAAmE;AAGnE,wEAAmE;AAEnE,oFAA+E;AAc/E,MAAa,sBAAuB,SAAQ,+CAAqB;IAE/D,QAAQ,CAAC,OAA6B;QACpC,MAAM,QAAQ,GAA0B,+CAAqB,CAAC,mBAAmB,EAAE,CAAC;QACpF,MAAM,SAAS,GAAsC,OAAO,CAAC,iBAAiB,CAAC;QAC/E,MAAM,WAAW,GAAW,SAAS,CAAC,WAAW,CAAC;QAClD,MAAM,YAAY,GAAG,2CAAmB,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;QAC3E,MAAM,eAAe,GAAuB,SAAS,CAAC,eAAe,CAAC;QACtE,MAAM,mBAAmB,GAAG,IAAI,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;QAErE,MAAM,cAAc,GAAG;;EAEzB,SAAS,CAAC,YAAY;;;;;;;;;;;;;;;;;;;;;;;UAuBd,YAAY,aAAa,WAAW,CAAC,WAAW,EAAE;;EAE1D,SAAS,CAAC,YAAY;EACtB,SAAS,CAAC,cAAc,CAAC,MAAM;;;;cAInB,SAAS,CAAC,kBAAkB;;;;;;;;;;;;UAahC,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC;YACpC,CAAC,CAAC,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,GAAG,IAAI;YAC/D,CAAC,CAAC,EACN;gCACwB,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,QAAQ,CAAC;UAE/D,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC;YACpC,CAAC,CAAC,cAAc,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,+BAA+B,kBAAkB;gBAC1F,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC;gBACtC,OAAO;YACT,CAAC,CAAC,EACN;UACE,SAAS,CAAC,YAAY,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAE;;;;;;WAMlD,CAAA,CAAC,CAAC,EAAE;;;;UAIL,SAAS,CAAC,eAAe;UACzB,SAAS,CAAC,cAAc,CAAC,QAAQ;;;UAGjC,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC;UAEtC,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC;YACxC,CAAC,CAAC,wCAAwC;gBACxC,WAAW;gBACX,kDAAkD;gBAClD,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC;gBAC1C,MAAM;YACR,CAAC,CAAC,EACN;UACE,IAAI,CAAC,sBAAsB,CAAC,eAAe,CAAC;;;;UAI5C,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE;;;;UAIhE,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,eAAe,EAAE,mBAAmB,CAAC;UAChG,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,eAAe,CAAC;;;;;;;;;;MAUhF,IAAI,CAAC,iBAAiB,CAAC,eAAe,EAAE,mBAAmB,CAAC;;UAGxD,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC;YACxC,CAAC,CAAC,0CAA0C,GAAG,WAAW,GAAG,KAAK;YAClE,CAAC,CAAC,EACN;UAEE,CAAC,eAAe,CAAC,SAAS;YACxB,CAAC,CAAC,IAAI,CAAC,0BAA0B,CAAC,eAAe,EAAE,mBAAmB,CAAC;YACvE,CAAC,CAAC,EACN;;;;;;;EAON,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE;;CAE/D,CAAA;QAEG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAA;QAEnE,OAAO,QAAQ,CAAA;IACjB,CAAC;IAEO,kBAAkB,CAAC,eAAmC;;QAC5D,MAAM,gBAAgB,GAAG,CAAC,UAAU,CAAC,CAAC;QACtC,MAAM,uBAAuB,GAA0C,eAAe,CAAC,QAAQ,CAAC;QAChG,IAAI,qBAAuC,CAAC;QAC5C,IAAI,KAAK,CAAC,OAAO,CAAC,uBAAuB,CAAC,EAAE;YAC1C,qBAAqB,GAAG,uBAAuB,CAAC,CAAC,CAAC,CAAC;SACpD;aAAM;YACL,qBAAqB,GAAG,uBAAuB,CAAC;SACjD;QACD,IAAI,CAAC,qBAAqB,EAAE;YAC1B,OAAO,KAAK,CAAC;SACd;QACD,MAAM,cAAc,GAAG,MAAA,qBAAqB,CAAC,UAAU,EAAE,0CAAE,iBAAiB,EAAE,CAAC;QAC/E,MAAM,gBAAgB,GAAwB,cAAc,IAAI,cAAc,CAAC,gBAAgB,CAAC;QAChG,IAAI,CAAC,gBAAgB,EAAE;YACrB,OAAO,KAAK,CAAC;SACd;QACD,MAAM,aAAa,GAAG,MAAA,MAAA,gBAAgB,CAAC,gBAAgB,EAAE,0CAAE,UAAU,EAAE,0CAAE,aAAa,CAAC;QACvF,OAAO,gBAAgB,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;IAClD,CAAC;IAUO,gBAAgB,CAAC,eAAmC;QAC1D,IAAI,eAAe,CAAC,MAAM,EAAE;YAC1B,OAAO,eAAe,CAAC,MAAM,CAAA;SAC9B;QACD,OAAO,EAAE,CAAA;IACX,CAAC;IAEO,sBAAsB,CAAC,eAAmC;QAChE,IAAI,eAAe,CAAC,YAAY,EAAE;YAChC,OAAO,eAAe,CAAC,YAAY,CAAA;SACpC;QACD,OAAO,EAAE,CAAA;IACX,CAAC;IAEO,mBAAmB,CAAC,eAAmC;QAC7D,IAAI,eAAe,CAAC,SAAS,EAAE;YAC7B,OAAO,eAAe,CAAC,SAAS,CAAA;SACjC;QACD,OAAO,EAAE,CAAA;IACX,CAAC;IAEO,oBAAoB,CAAC,eAAmC;QAC9D,IAAI,eAAe,CAAC,UAAU,EAAE;YAC9B,OAAO,eAAe,CAAC,UAAU,CAAA;SAClC;QACD,OAAO,EAAE,CAAA;IACX,CAAC;IAEO,gBAAgB,CAAC,QAA4B;QACnD,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO,EAAE,CAAA;SACV;QACD,IAAI,cAAc,GAAG,EAAE,CAAA;QACvB,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAsB,EAAE,KAAa,EAAE,EAAE;YACzD,cAAc,IAAI,GAAG,GAAG,IAAI,CAAC,IAAI,GAAG,GAAG,CAAA;YACvC,IAAI,KAAK,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC/B,cAAc,IAAI,GAAG,CAAA;aACtB;QACH,CAAC,CAAC,CAAA;QACF,OAAO,cAAc,CAAA;IACvB,CAAC;IAEO,gBAAgB,CAAC,eAAmC,EAAE,IAAa;QACzE,MAAM,YAAY,GAAG,2CAAmB,CAAC,oBAAoB,CAAC,eAAe,CAAC,EAAE,CAAC,CAAA;QACjF,OAAO;;aAEE,eAAe,CAAC,EAAE;QACvB,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE;mBACnC,YAAY;;sCAEO,CAAA;IACpC,CAAC;IAEO,iBAAiB,CAAC,eAAmC,EAAE,mBAA4B;QACzF,IAAI,eAAe,CAAC,SAAS,EAAE;YAC7B,OAAO;UACH,IAAI,CAAC,gBAAgB,CAAC,eAAe,EAAE,WAAW,CAAC;UACnD,IAAI,CAAC,oBAAoB,CAAC,eAAe,EAAE,mBAAmB,CAAC;UAC/D,IAAI,CAAC,qBAAqB,CAAC,eAAe,CAAC;UAC3C,IAAI,CAAC,mBAAmB,CAAC,eAAe,CAAC;;;;UAIzC,IAAI,CAAC,0BAA0B,CAAC,eAAe,EAAE,mBAAmB,CAAC;;OAExE,CAAA;SACF;QACD,OAAO,EAAE,CAAA;IACX,CAAC;IAEO,qBAAqB,CAAC,eAAmC;QAC/D,IAAI,eAAe,CAAC,WAAW,EAAE;YAC/B,OAAO;yDAC4C,eAAe,CAAC,WAAW,GAAG,CAAA;SAClF;QACD,OAAO,EAAE,CAAA;IACX,CAAC;IAEO,gBAAgB,CAAC,eAAmC;QAC1D,IAAI,eAAe,CAAC,MAAM,EAAE;YAC1B,OAAO,eAAe,CAAC,MAAM,CAAA;SAC9B;QACD,OAAO,EAAE,CAAA;IACX,CAAC;IAEO,oBAAoB,CAAC,eAAmC,EAAE,mBAA4B;QAC5F,MAAM,eAAe,GAAG,CAAC,CAAC,eAAe,CAAC,MAAM,IAAI,eAAe,CAAC,aAAa,KAAK,MAAM,CAAC;QAC7F,IAAI,mBAAmB,EAAE;YACvB,OAAO,eAAe,CAAC,CAAC,CAAC,+CAA+C,CAAC,CAAC,CAAC,EAAE,CAAC;SAC/E;aAAM;YACL,IAAI,eAAe,CAAC,MAAM,EAAE;gBAC1B,OAAO,IAAI;oBACT,yDAAyD;oBACzD,oCAAoC;oBACpC,wDAAwD;oBACxD,oEAAoE;oBACpE,OAAO,CAAC;aACX;YACD,OAAO,EAAE,CAAC;SACX;IACH,CAAC;IAEO,0BAA0B,CAAC,eAAmC,EAAE,mBAA4B;QAClG,MAAM,eAAe,GAAG,CAAC,CAAC,eAAe,CAAC,MAAM,IAAI,eAAe,CAAC,aAAa,KAAK,MAAM,CAAC;QAC7F,IAAI,mBAAmB,EAAE;YACvB,OAAO,eAAe,CAAC,CAAC,CAAC,+CAA+C,CAAC,CAAC,CAAC,EAAE,CAAC;SAC/E;aAAM;YACL,OAAO,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,6DAA6D,CAAC,CAAC,CAAC,EAAE,CAAC;SACpG;IACH,CAAC;CAEF;AArRD,wDAqRC"}
+{"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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"}