@farris/jit-engine 1.3.316 → 1.3.318

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;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const devkitValue = generateParam.value;
         const appIndexResourceGenerator = new vue_app_index_resource_generator_1.VueAppIndexResourceGenerator();
         const appIndexResourceContext = new file_generator_context_1.FileGeneratorContext();
@@ -53,6 +53,7 @@ class AppIndexVueManager {
         indexVueParameter.keepAlive = (_b = (_a = generateParam.value.ui) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.keepAlive;
         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 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":"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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/file-generator/app-generator/vue-app-expression.js

@@ -61,7 +61,7 @@ class VueAppExpressionGenerator extends abstract_file_generator_1.AbstractFileGe
             const controls = viewmodel.form.controls;
             controls.forEach((control) => {
                 const { field } = control;
-                this.fieldMap.set(field.id, Object.assign(Object.assign({}, field), { bindTo }));
+                this.fieldMap.set(field && field.id, Object.assign(Object.assign({}, field), { bindTo }));
             });
         });
     }

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

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,16 +7,14 @@ 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 } = appIndexVueParameter;
+        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;
-        let enableControlStateExtend = false;
         if (controlStateExtend && controlStateExtend.enable) {
-            enableControlStateExtend = true;
             if (controlStateExtend.interceptor) {
                 const interceptor = controlStateExtend.interceptor;
                 const classExp = /(?<=class\s*)(\w+)(?=\s*)/g;
@@ -27,29 +25,35 @@ class VueAppIndexVueGenerator extends abstract_file_generator_1.AbstractFileGene
             }
         }
         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 }">
-    <transition :name="transitionName">
-      ${keepAlive
+    ${keepAlive
             ? '<keep-alive><component :is="Component" /></keep-alive>'
             : '<component :is="Component" />'}
-    </transition>
   </router-view>
 </template>
 
 <script>
-import { AppOptions, FORM_PATH_TOKEN, VALIDATION_RULE_TOKEN, CONTROL_STATE_INTERCEPTOR_TOKEN} 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} from '@farris/mobile-command-services';
-import { DevkitPlugin } from '@farris/mobile-vue-adapter';
+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}',
@@ -59,22 +63,16 @@ export default{
         transitionName: '',
       };
     },
-    watch: {
-      $route(to, from) {
-        if (to.query.routeType === 'Back') {
-          this.transitionName = 'fm-slide-out';
-        } else if (to.query.routeType === 'Forward') {
-          this.transitionName = 'fm-slide-in';
-        } else {
-          this.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}'},` : ''}

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,EACnB,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;QACnB,IAAI,wBAAwB,GAAW,KAAK,CAAE;QAE9C,IAAG,kBAAkB,IAAK,kBAAkB,CAAC,MAAM,EAAC;YAClD,wBAAwB,GAAG,IAAI,CAAC;YAChC,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;QAG3D,IAAI,cAAc,GAAG,EAAE,CAAA;QACvB,cAAc,IAAI;;;;QAKd,SAAS;YACP,CAAC,CAAC,wDAAwD;YAC1D,CAAC,CAAC,+BACN;;;;;;;;;;;;EAYJ,kBAAkB;EAClB,cAAc;EACd,SAAS,CAAA,CAAC,CAAA,YAAY,SAAS,YAAY,IAAI,GAAG,CAAA,CAAC,CAAA,EAAE;;;;aAI1C,QAAQ;kBACH,QAAQ;;;;;;;;;;;;;;;;;;;eAmBX,QAAQ;;;;;YAKV,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;AAhHD,0DAgHC"}
+{"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-form-generator.js

@@ -94,7 +94,7 @@ import { ${arrCanImportConverter.join(", ")} } from "@farris/kendo-binding";`;
         if (validRules && validRules.length > 0) {
             const result = [];
             validRules && validRules.forEach(rule => {
-                const { type, message, constraints } = rule;
+                const { type, message, constraints, messageI18nKey } = rule;
                 let constraintsStr = '';
                 if (rule.type.includes('Function')) {
                     constraintsStr = `constraints:[${constraints[0].replace("\\r\\n", "")}]`;
@@ -120,7 +120,7 @@ import { ${arrCanImportConverter.join(", ")} } from "@farris/kendo-binding";`;
                     });
                     constraintsStr = constraintsStr + ']';
                 }
-                const str = JSON.stringify({ type, message });
+                const str = JSON.stringify({ type, message, messageI18nKey });
                 result.push(`${str.slice(0, -1)}, ${constraintsStr} ${str.slice(-1)}`);
             });
             return `validRules: [${result.join(',')}]`;

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

@@ -1 +1 @@
-{"version":3,"file":"page-form-generator.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/code-generator/file-generator/page-generator/page-form-generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"page-form-generator.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/code-generator/file-generator/page-generator/page-form-generator.ts"],"names":[],"mappings":"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"}

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

@@ -11,72 +11,72 @@ class PageHandlerGenerator extends abstract_file_generator_1.AbstractFileGenerat
         const externalParameter = context.externalParameter;
         const variable = externalParameter.value;
         let generateString = "";
-        generateString += `
-import { CommandHandler, CommandHandlerMeta, CommandContext } from '@farris/mobile-devkit';
-import { StateMachineService } from '@farris/mobile-command-services';
+        generateString += `
+import { CommandHandler, CommandHandlerMeta, CommandContext } from '@farris/mobile-devkit';
+import { StateMachineService } from '@farris/mobile-command-services';
 import { CreateDataService } from '@farris/mobile-command-services';`;
         generateString += this.getEol();
         if (toolhepler_1.ToolHelper.isArray(variable.services, false)) {
             variable.services.forEach((service) => {
                 if (service.isCommon == "1" || service.isCommon == 1) {
-                    generateString += `
+                    generateString += `
 import { ${service.name} as ${service.alias} } from '${service.path}';`;
                 }
                 else {
-                    generateString += `
+                    generateString += `
 import { ${service.name} as ${service.alias} } from '../../../services/${service.fileName.toLowerCase()}';`;
                 }
             });
         }
         generateString += this.getEol();
-        generateString += `
-@CommandHandlerMeta({
-    commandName: '${variable.code}'
-})
+        generateString += `
+@CommandHandlerMeta({
+    commandName: '${variable.code}'
+})
 export class ${page_command_handler_manager_1.PageCommandHandlerManager.generateCommandHandlerName(variable.code)} extends CommandHandler {`;
-        generateString += `
+        generateString += `
     constructor(`;
         if (toolhepler_1.ToolHelper.isArray(variable.services, false)) {
             variable.services.forEach((service, index) => {
-                generateString += `
+                generateString += `
         public _${service.alias}: ${service.alias}`;
                 if (index < (variable.services.length - 1)) {
                     generateString += `,`;
                 }
             });
         }
-        generateString += `
-    ) {
-        super();
+        generateString += `
+    ) {
+        super();
     }`;
         generateString += this.getEol();
-        generateString += `
+        generateString += `
     schedule() {`;
         if (toolhepler_1.ToolHelper.isArray(variable.handlers, false)) {
             variable.handlers.forEach((task, index) => {
                 if (task.type == "executeNode") {
-                    generateString += `
+                    generateString += `
         this.addTask('${task.code}', (context: CommandContext) => {`;
                     if (toolhepler_1.ToolHelper.isArray(task.params, false)) {
-                        generateString += `
+                        generateString += `
             const args = [`;
                         task.params.forEach((param, index) => {
-                            generateString += `
+                            generateString += `
                 ${(param.value && param.value.toLowerCase() != "null") ? "'" + param.value + "'" : "''"}`;
                             if (index < (task.params.length - 1)) {
                                 generateString += `, `;
                             }
                         });
-                        generateString += `
+                        generateString += `
                     ];`;
                     }
                     else {
-                        generateString += `
+                        generateString += `
             const args = [];`;
                     }
-                    generateString += `
+                    generateString += `
             return this.invoke(this._${task.serviceName}, '${task.method}', args, context);`;
-                    generateString += `
+                    generateString += `
         });`;
                     generateString += this.getEol();
                 }
@@ -84,13 +84,13 @@ export class ${page_command_handler_manager_1.PageCommandHandlerManager.generate
         }
         if (toolhepler_1.ToolHelper.isArray(variable.links, false)) {
             variable.links.forEach((link, index) => {
-                generateString += `
+                generateString += `
         this.addLink('${link.from}', '${link.to}', \`${link.condition}\`);`;
             });
         }
-        generateString += `
+        generateString += `
     }`;
-        generateString += `
+        generateString += `
 }`;
         this.createFile(context.basePath, context.fileName, generateString);
         return response;