@farris/jit-engine 1.3.348 → 1.3.350

package/README.md

@@ -1,22 +1,26 @@
+1.3.350
+
+    筛选方案支持滚动事件
+    
+1.3.349
+
+    移动端支持新版路由策略
+
 1.3.348
 
     支持轻量帮助
-    
+
 1.3.347
 
     支持界面规则值类型
-    
+
 1.3.346
 
     部分控件增加可见属性支持
-    
+
 1.3.345
 
     智能输入框只读流程规则问题修复
-    
-1.3.340
-
-    移动端支持新版路由策略
 
 1.3.338
 

package/lib/domstructure/ui/queryScheme/query-scheme.js

@@ -35,6 +35,9 @@ class QueryScheme extends common_1.BaseComponent {
                 }
                 else if (key == "expanded") {
                     this.expanded = utility_1.ToolHelper.createBinding(obj[key], true, this.externalComponentNameSpace, this.id);
+                    if (utility_1.ToolHelper.isObject(obj[key])) {
+                        this.isFoldChange = this.expanded.value + "=!$event";
+                    }
                 }
                 else if (key == "showCompleteLabel") {
                     this[key] = utility_1.ToolHelper.createBinding(obj[key], false, this.externalComponentNameSpace, this.id);

package/lib/domstructure/ui/queryScheme/query-scheme.js.map

@@ -1 +1 @@
-{"version":3,"file":"query-scheme.js","sourceRoot":"","sources":["../../../../src/domstructure/ui/queryScheme/query-scheme.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"query-scheme.js","sourceRoot":"","sources":["../../../../src/domstructure/ui/queryScheme/query-scheme.ts"],"names":[],"mappings":"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"}

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

@@ -30,7 +30,7 @@ const mobileapp_vue_constant_1 = require("../../utility/mobileapp-vue-constant")
 const vue_app_index_extraImports_generator_1 = require("../file-generator/app-generator/vue-app-index-extraImports-generator");
 class AppIndexVueManager {
     static generate(generateParam) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         const devkitValue = generateParam.value;
         const appIndexResourceGenerator = new vue_app_index_resource_generator_1.VueAppIndexResourceGenerator();
         const appIndexResourceContext = new file_generator_context_1.FileGeneratorContext();
@@ -54,6 +54,8 @@ class AppIndexVueManager {
         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;
         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;
         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;
+        const routeStrategy = (_m = (_l = generateParam.value.ui) === null || _l === void 0 ? void 0 : _l.options) === null || _m === void 0 ? void 0 : _m.routeStrategy;
+        indexVueParameter.routeStrategy = routeStrategy === 'standard' ? 'standard' : null;
         const indexVueContext = new file_generator_context_1.FileGeneratorContext();
         indexVueContext.basePath = path.normalize(path.join(generateParam.metaDataConfig.publishPath, mobileapp_vue_constant_1.MobileAppVueConstant.SrcPathName, mobileapp_vue_constant_1.MobileAppVueConstant.AppsPathName, generateParam.frm_code));
         indexVueContext.fileName = "index.vue";

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":";;;;;;;;;;;;;;;;;;;;;;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,CAAA,CAAC,CAAC,IAAI,CAAC;QACrJ,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,CAAA,KAAK,CAAC;QAEhI,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;AAxCD,gDAwCC"}
+{"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"}

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-index-vue-generator.js

@@ -7,7 +7,7 @@ class VueAppIndexVueGenerator extends abstract_file_generator_1.AbstractFileGene
     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 { formCode, metaDataConfig, imports, extraImportsString, resourceString, keepAlive, hasExpressions, controlStateExtend, enableI18n, routeStrategy, } = appIndexVueParameter;
         const { serviceUnitPath, projectName, isRuntime, runTimeDimPath } = metaDataConfig;
         const _imports = imports.map((item) => `${item.name}:${item.name},`);
         const generateFormPathValueString = hasExpressions && serviceUnitPath
@@ -40,22 +40,22 @@ class VueAppIndexVueGenerator extends abstract_file_generator_1.AbstractFileGene
 </template>
 
 <script>
-import { AppOptions, FORM_PATH_TOKEN, VALIDATION_RULE_TOKEN, CONTROL_STATE_INTERCEPTOR_TOKEN, TranslateService} from '@farris/mobile-devkit';
+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 { COMMAND_SERVICES_APP_PROVIDERS, ROUTER_INSTANCE_TOKEN, LangService } from '@farris/mobile-command-services';
+import { DevkitPlugin, beforeRouteEnterByVueAdapter, initdataOptions, setRouteStrategy } from '@farris/mobile-vue-adapter';
 import { ModelProviders } from './models/model.provider';
 import { validationRule } from './validation';
 ${extraImportsString}
 ${resourceString}
 ${className ? `import { ${className} } from '${path}'` : ''}
 
-const dataOptions  = { 
+const dataOptions  = {
   ${enableI18n ? `langPath:${langPath}` : ''}
 }
 initdataOptions(dataOptions);
 
-export default{
+export default {
     name: '${formCode}',
     components:{${_imports}},
     data() {
@@ -64,10 +64,10 @@ export default{
       };
     },
     beforeRouteEnter(to, from, next) {
-      beforeRouteEnterByVueAdapter(to, from, next,dataOptions);
-
+      beforeRouteEnterByVueAdapter(to, from, next, dataOptions);
     },
-    beforeCreate(){
+    beforeCreate() {
+      setRouteStrategy("${routeStrategy || ''}");
       const appOptions = {
         id: '${formCode}',
         providers: [

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

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,6 +11,7 @@ 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}
@@ -32,7 +33,9 @@ import {
     updatedByVueAdapter,
     beforeUnmountByVueAdapter,
     scrollActivated,
-    scrollDeactivated
+    scrollDeactivated,
+    handlePageLevelRouteEnter,
+    handlePageLevelRouteLeave,
   } from '@farris/mobile-vue-adapter';
 import {${providerName}} from "./${componentId.toLowerCase()}.provider";
 
@@ -58,7 +61,7 @@ export default
             : ''}
         ...mapCommandMethods([${this.generateCommands(parameter.commands)}]),
         ${this.getGobackCommand(componentConfig)
-            ? 'goBack() { this.url === document.URL && this.$viewModel.' +
+            ? `goBack() { ${useNewRouteStrategy ? '' : 'this.url === document.URL && '}this.$viewModel.` +
                 this.getGobackCommand(componentConfig) +
                 '();},'
             : ''}
@@ -86,16 +89,13 @@ 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)}
+        ${componentConfig.keepAlive ? '' : this.getGobackCommandCode(componentConfig, useNewRouteStrategy)}
         ${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)}
+    ${this.generateActivated(componentConfig, useNewRouteStrategy)}
     beforeUnmount() {
         ${this.getOnLoadDataCommand(componentConfig)
             ? 'this.$app.context.eventBus.unsubscribe("' + componentId + '"),'
             : ''}
         ${componentConfig.goBack && !componentConfig.keepAlive
-            ? 'window.removeEventListener("popstate", this.goBack, false); //false阻止默认事件'
+            ? this.getPageLevelRouteLeaveCode(useNewRouteStrategy)
             : ''}
         this.$unbindComponentExtenders(this.$refs);
         beforeUnmountByVueAdapter && beforeUnmountByVueAdapter(this);
@@ -126,6 +126,28 @@ ${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;
@@ -166,7 +188,6 @@ ${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,' : ''}
@@ -174,18 +195,18 @@ ${componentConfig.customClass ? componentConfig.customClass : ''}
     };
     this.$initPage(viewModelOptions);`;
     }
-    generateActivated(componentConfig) {
+    generateActivated(componentConfig, useNewRouteStrategy) {
         if (componentConfig.keepAlive) {
             return `activated() {
         ${this.generateInitPage(componentConfig, 'activated')}
-        ${this.getGobackCommandCode(componentConfig)}
+        ${this.getGobackCommandCode(componentConfig, useNewRouteStrategy)}
         ${this.getGobackCommandForWF(componentConfig)}
         ${this.getOnActivedCommand(componentConfig)}
         scrollActivated && scrollActivated(this);
     },
     deactivated() {
         ${componentConfig.goBack
-                ? 'window.removeEventListener("popstate", this.goBack, false); //false阻止默认事件'
+                ? this.getPageLevelRouteLeaveCode(useNewRouteStrategy)
                 : ''}
         scrollDeactivated && scrollDeactivated(this);
     },`;
@@ -205,17 +226,25 @@ ${componentConfig.customClass ? componentConfig.customClass : ''}
         }
         return '';
     }
-    getGobackCommandCode(componentConfig) {
+    getGobackCommandCode(componentConfig, useNewRouteStrategy) {
         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); //false阻止默认事件
+            window.addEventListener("popstate", this.goBack, 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