@farris/jit-engine 1.3.302 → 1.3.304

package/README.md

@@ -1,3 +1,7 @@
+1.3.303
+
+    支持版本校验功能
+
 1.3.302
 
     移动页面标题、tab过滤条件修复

package/bin/index.js

@@ -1,19 +1,22 @@
 #!/usr/bin/env node
+
 "use strict";
 
 const yargs = require("yargs");
 const path = require("path");
 const jitEngine = require('../lib/index');
+const versionCheck = require("../lib/command/check")
 
 const FILE_PATH = 'file path';
 const METADATA_CONFIG = 'metadata config';
-
+const jsonPath = "allowempty";
+const projectName = "bo-featurenoah-front";
 
 yargs.options({
     'metaDataPath': {
         alias: 'mp',
         demand: true,
-        default: path.resolve(__dirname, '../lib/config/sagi_object'),
+        default: path.resolve(__dirname, '../lib/config/' + jsonPath),
         describe: '元数据存放路径',
         type: 'string',
         group: FILE_PATH
@@ -21,28 +24,28 @@ yargs.options({
     'publishPath': {
         alias: 'pp',
         demand: true,
-        default: path.resolve(__dirname, '../lib/publish/sagi_object'),
+        default: path.resolve(__dirname, '../lib/publish/' + jsonPath),
         describe: '代码生成目录',
         type: 'string',
         group: FILE_PATH
     },
-    'formFileName':{
+    'formFileName': {
         alias: 'fn',
-        default: 'Form_SagiObject.frm',
+        default: 't.frm',
         describe: '表单名称',
         type: 'string',
         group: METADATA_CONFIG
     },
     'cmd': {
         alias: 'cmd',
-        default: 'Form_SagiObject.frm.command.json',
+        default: 't.frm.command',
         describe: 'Command 配置文件名',
         type: 'string',
         group: METADATA_CONFIG
     },
     'sm': {
         alias: 'sm',
-        default: 'Form_SagiObject.frm.sm.json',
+        default: 't.frm.sm',
         describe: 'StateMachine 配置文件名',
         type: 'string',
         group: METADATA_CONFIG
@@ -67,8 +70,69 @@ yargs.options({
         describe: '端口号',
         type: 'string',
         group: METADATA_CONFIG
+    },
+    "ngVersion": {
+        alias: 'nv',
+        default: 'ng7',
+        describe: '编译的ng版本',
+        type: 'string',
+        group: METADATA_CONFIG
+    },
+    "projectName": {
+        alias: 'pn',
+        default: projectName,
+        describe: '工程名称',
+        type: 'string',
+        group: METADATA_CONFIG
+    },
+    "entryProject": {
+        alias: 'ep',
+        default: projectName,
+        describe: '默认的工程',
+        type: 'string',
+        group: METADATA_CONFIG
+    },
+    "projectRoute": {
+        alias: 'pr',
+        default: projectName + '.route.json',
+        describe: '默认的工程',
+        type: 'string',
+        group: METADATA_CONFIG
+    },
+    "linkedNodeModules": {
+        alias: 'lnm',
+        default: 'c:/projects/node_modules',
+        describe: '引用的node_modules路径',
+        type: 'string',
+        group: METADATA_CONFIG
+    },
+    "formatCode": {
+        alias: 'FYBXD',
+        default: 'true',
+        type: 'string',
+        group: METADATA_CONFIG
+    },
+    "eapiPath": {
+        alias: 'eapip',
+        default: 'D:/工作目录/ng7-jit-engine/farris-jit-engine/lib/config/eapifilename/',
+        type: 'string',
+        group: METADATA_CONFIG
+    },
+    "serviceUnitPath": {
+        default: 'TM/CM',
+        type: 'string',
+        group: METADATA_CONFIG
+    },
+    "isMobileApprove":{
+        default: false,
+        type: 'string',
+        group: METADATA_CONFIG
+    },
+    "mobileApproveFormCode":{
+        default: 'idpform',
+        type: 'string',
+        group: METADATA_CONFIG
     }
-
 });
 
 yargs.parse(process.argv.slice(2), (err, argv, output) => {
@@ -82,13 +146,28 @@ yargs.parse(process.argv.slice(2), (err, argv, output) => {
         return;
     }
 
-    try {
-
-            jitEngine.jit(argv);
+    const command = process.argv.slice(2)[0];
+    if (command === 'check') {
+        if (argv.path) {
+            let result;
+            return versionCheck.checkVersion(argv.path, (result) => {
+                if (result.needUpdate) {
+                    process.exit(1);
+                } else {
+                    process.exit(0);
+                }
+            })
+        } else {
+            console.log('node_modules目录为空。');
+            process.exit(-1);
+        }
+    }
 
+    try {
+        jitEngine.jit(argv);
     } catch (e) {
         console.log(e);
         throw e;
     }
 
-});
+})

package/lib/command/check.js

@@ -0,0 +1,102 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkVersion = void 0;
+function checkVersion(dir, callback) {
+    let output = {
+        needUpdate: false,
+        updateList: []
+    };
+    const readPackageTree = require('read-package-tree');
+    readPackageTree(dir, (_err, physicalTree) => {
+        try {
+            const nodes = physicalTree.children;
+            let map = new Map();
+            for (const key in nodes) {
+                if (nodes.hasOwnProperty(key)) {
+                    const element = nodes[key];
+                    const packageData = element.package || {};
+                    const id = packageData['_id'];
+                    if (id) {
+                        const atIndex = id.lastIndexOf('@');
+                        const prefix = id.slice(0, atIndex);
+                        const suffix = id.slice(atIndex + 1);
+                        map.set(prefix, suffix);
+                    }
+                }
+            }
+            const packageJson = physicalTree.package;
+            if (packageJson) {
+                const dependencies = packageJson.dependencies;
+                Object.keys(dependencies).forEach((key) => {
+                    if (key.startsWith('@farris') || key.startsWith('@gsp')) {
+                        if (dependencies.hasOwnProperty(key)) {
+                            const packageJsonVersion = dependencies[key];
+                            const nodeModulesVersion = map.get(key);
+                            if (nodeModulesVersion) {
+                                if (packageJsonVersion !== nodeModulesVersion && !isValidVersion(nodeModulesVersion, packageJsonVersion)) {
+                                    const info = {
+                                        name: key,
+                                        nodeModulesVersion: nodeModulesVersion,
+                                        packageJsonVersion: packageJsonVersion
+                                    };
+                                    output.needUpdate = true;
+                                    output.updateList.push(info);
+                                }
+                            }
+                            else {
+                                const info = {
+                                    name: key,
+                                    nodeModulesVersion: "",
+                                    packageJsonVersion: packageJsonVersion
+                                };
+                                output.needUpdate = true;
+                                output.updateList.push(info);
+                            }
+                        }
+                    }
+                });
+                if (output && output.needUpdate) {
+                    console.log('The node_modules need to be updated, with the following update list:');
+                    const updateList = output.updateList;
+                    updateList.forEach((item) => {
+                        console.log(item.name + '@' + item.packageJsonVersion);
+                    });
+                }
+                callback(output);
+            }
+        }
+        catch (error) {
+            output.needUpdate = false;
+        }
+    });
+}
+exports.checkVersion = checkVersion;
+function isValidVersion(versionToCheck, rangeSpecifier) {
+    let minVersion, maxMajor;
+    if (rangeSpecifier.startsWith('^')) {
+        const [major, minor, patch] = rangeSpecifier.slice(1).split('.').map(Number);
+        minVersion = `${major}.${minor}.${patch}`;
+        maxMajor = major + 1;
+    }
+    else {
+        return false;
+    }
+    function parseVersion(v) {
+        return v.split('.').map(Number);
+    }
+    const parsedVersionToCheck = parseVersion(versionToCheck);
+    const parsedMinVersion = parseVersion(minVersion);
+    for (let i = 0; i < parsedMinVersion.length; i++) {
+        if (parsedVersionToCheck[i] < parsedMinVersion[i])
+            return false;
+        if (parsedVersionToCheck[i] > parsedMinVersion[i])
+            break;
+    }
+    if (parsedVersionToCheck[0] === parsedMinVersion[0]) {
+    }
+    else if (parsedVersionToCheck[0] >= maxMajor) {
+        return false;
+    }
+    return true;
+}
+//# sourceMappingURL=check.js.map

package/lib/command/check.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"check.js","sourceRoot":"","sources":["../../src/command/check.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;
+        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":"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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-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,6 +25,10 @@ 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>
@@ -40,16 +42,20 @@ class VueAppIndexVueGenerator extends abstract_file_generator_1.AbstractFileGene
 </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}',
@@ -70,11 +76,16 @@ export default{
         }
       },
     },
+    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;;;;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;;;IAGnD,UAAU,CAAA,CAAC,CAAC,YAAY,QAAQ,EAAE,CAAA,CAAC,CAAA,EAAE;;;;;aAK5B,QAAQ;kBACH,QAAQ;;;;;;;;;;;;;;;;;;;;;;;eAuBX,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;AA5HD,0DA4HC"}

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;