@farris/jit-engine 1.3.227 → 1.3.229

package/README.md

@@ -1,8 +1,8 @@
-1.3.227
+1.3.228
 
     section、tab工具栏按钮支持下级显示
 
-1.3.225
+1.3.226
 
     支持基路径
 

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;
+        var _a, _b, _c, _d, _e, _f;
         const devkitValue = generateParam.value;
         const appIndexResourceGenerator = new vue_app_index_resource_generator_1.VueAppIndexResourceGenerator();
         const appIndexResourceContext = new file_generator_context_1.FileGeneratorContext();
@@ -52,6 +52,7 @@ class AppIndexVueManager {
         indexVueParameter.metaDataConfig = generateParam.metaDataConfig;
         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;
         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;QAE7I,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;AAtCD,gDAsCC"}
+{"version":3,"file":"app-indexvue-manager.js","sourceRoot":"","sources":["../../../../../src/mobileapp/vue/code-generator/devkit-manager/app-indexvue-manager.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AppServicesManager = void 0;
+const file_generator_context_1 = require("../file-generator/file-generator-context");
+const vue_app_services_1 = require("../file-generator/app-generator/vue-app-services");
+class AppServicesManager {
+    static generate(generateParam) {
+        const vueDevkit = generateParam.value;
+        const context = new file_generator_context_1.FileGeneratorContext();
+        context.basePath = generateParam.publishPath + "/" + "src/apps/" + generateParam.frm_code + "/services";
+        if (vueDevkit && vueDevkit.ui && vueDevkit.ui.options && vueDevkit.ui.options.controlStateExtend && vueDevkit.ui.options.controlStateExtend.enable
+            && vueDevkit.ui.options.controlStateExtend.interceptor) {
+            const interceptor = vueDevkit.ui.options.controlStateExtend.interceptor;
+            context.externalParameter = interceptor;
+            context.fileName = generateParam.frm_code + '_state_interceptor.ts';
+            const appServicesGenerator = new vue_app_services_1.VueAppServicesGenerator();
+            appServicesGenerator.generate(context);
+        }
+    }
+}
+exports.AppServicesManager = AppServicesManager;
+//# sourceMappingURL=app-services-manager.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"app-services-manager.js","sourceRoot":"","sources":["../../../../../src/mobileapp/vue/code-generator/devkit-manager/app-services-manager.ts"],"names":[],"mappings":";;;AAAA,qFAA+E;AAE/E,uFAA0F;AAE1F,MAAa,kBAAkB;IAC7B,MAAM,CAAC,QAAQ,CAAC,aAMf;QACC,MAAM,SAAS,GAAG,aAAa,CAAC,KAAK,CAAC;QACtC,MAAM,OAAO,GAAyB,IAAI,6CAAoB,EAAE,CAAA;QAChE,OAAO,CAAC,QAAQ,GAAG,aAAa,CAAC,WAAW,GAAG,GAAG,GAAG,WAAW,GAAG,aAAa,CAAC,QAAQ,GAAG,WAAW,CAAA;QAEvG,IAAG,SAAS,IAAI,SAAS,CAAC,EAAE,IAAI,SAAS,CAAC,EAAE,CAAC,OAAO,IAAI,SAAS,CAAC,EAAE,CAAC,OAAO,CAAC,kBAAkB,IAAI,SAAS,CAAC,EAAE,CAAC,OAAO,CAAC,kBAAkB,CAAC,MAAM;eAC5I,SAAS,CAAC,EAAE,CAAC,OAAO,CAAC,kBAAkB,CAAC,WAAW,EAAC;YACrD,MAAM,WAAW,GAAG,SAAS,CAAC,EAAE,CAAC,OAAO,CAAC,kBAAkB,CAAC,WAAW,CAAA;YACvE,OAAO,CAAC,iBAAiB,GAAG,WAAW,CAAC;YACxC,OAAO,CAAC,QAAQ,GAAG,aAAa,CAAC,QAAQ,GAAE,uBAAuB,CAAA;YAClE,MAAM,oBAAoB,GAA4B,IAAI,0CAAuB,EAAE,CAAA;YACnF,oBAAoB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;SAEzC;IAEH,CAAC;CACF;AAvBD,gDAuBC"}

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

@@ -40,13 +40,13 @@ class VueAppExpressionGenerator extends abstract_file_generator_1.AbstractFileGe
                     };
                 })
                 : [];
-            generateString += `
-{
-    "path": "${path.replace(/\./g, '/')}",
-    "ns": "",
-    "type": "Field",
-    "viewModelId":"${viewModelId}",
-    "expressions": ${JSON.stringify(_expressions)}
+            generateString += `
+{
+    "path": "${path.replace(/\./g, '/')}",
+    "ns": "",
+    "type": "Field",
+    "viewModelId":"${viewModelId}",
+    "expressions": ${JSON.stringify(_expressions)}
 }`;
         });
         generateString += ']';

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,71 +7,86 @@ 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, } = appIndexVueParameter;
+        const { formCode, metaDataConfig, imports, extraImportsString, resourceString, keepAlive, hasExpressions, controlStateExtend } = 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, '/') : ''}/${formCode}/`
+            ? `/${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;
+                const classNameList = interceptor.match(classExp);
+                if (classNameList && classNameList.length > 0) {
+                    className = classNameList[0];
+                }
+            }
+        }
+        const path = "./services/" + formCode + "_state_interceptor";
         let generateString = '';
-        generateString += `
-<template>
-  <router-view v-slot="{ Component }">
-    <transition :name="transitionName">
+        generateString += `
+<template>
+  <router-view v-slot="{ Component }">
+    <transition :name="transitionName">
       ${keepAlive
             ? '<keep-alive><component :is="Component" /></keep-alive>'
-            : '<component :is="Component" />'}
-    </transition>
-  </router-view>
-</template>
-
-<script>
-import { AppOptions, FORM_PATH_TOKEN, VALIDATION_RULE_TOKEN } 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 { ModelProviders } from './models/model.provider';
-import { validationRule } from './validation';
-${extraImportsString}
-${resourceString}
-
-
-export default{
-    name: '${formCode}',
-    components:{${_imports}},
-    data() {
-      return {
-        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 = '';
-        }
-      },
-    },
-    beforeCreate(){
-      const appOptions = {
-        id: '${formCode}',
-        providers: [
-          ...ModelProviders,
-          { provide: FrameworkSessionService, useClass: FrameworkSessionService, deps: []},
-          { provide: ROUTER_INSTANCE_TOKEN, useValue: this.$router },
-          
-          ${generateFormPathValueString ? `{ provide: FORM_PATH_TOKEN, useValue:'${generateFormPathValueString}'},` : ''}
-          { provide: VALIDATION_RULE_TOKEN, useValue: validationRule},
-          ...COMMAND_SERVICES_APP_PROVIDERS
-        ]
-      };
-      this.$createApp(appOptions);
-    }
-};
-</script>
+            : '<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 { 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 { ModelProviders } from './models/model.provider';
+import { validationRule } from './validation';
+${extraImportsString}
+${resourceString}
+${className ? `import { ${className} } from '${path}'` : ''}
+
+
+export default{
+    name: '${formCode}',
+    components:{${_imports}},
+    data() {
+      return {
+        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 = '';
+        }
+      },
+    },
+    beforeCreate(){
+      const appOptions = {
+        id: '${formCode}',
+        providers: [
+          ...ModelProviders,
+          { provide: FrameworkSessionService, useClass: FrameworkSessionService, deps: []},
+          { provide: ROUTER_INSTANCE_TOKEN, useValue: this.$router },
+          ${className ? `{ provide: CONTROL_STATE_INTERCEPTOR_TOKEN, useClass: ${className}, deps: [] ,multi: true },` : ''}
+          ${generateFormPathValueString ? `{ provide: FORM_PATH_TOKEN, useValue:'${generateFormPathValueString}'},` : ''}
+          { provide: VALIDATION_RULE_TOKEN, useValue: validationRule},
+          ...COMMAND_SERVICES_APP_PROVIDERS
+        ]
+      };
+      this.$createApp(appOptions);
+    }
+};
+</script>
 `;
         this.createFile(context.basePath, context.fileName, generateString);
         return response;

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,GACf,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,CAAA,CAAC,CAAC,EAAE,IAAI,QAAQ,GAAG;YAClJ,CAAC,CAAC,EAAE,CAAA;QAGN,IAAI,cAAc,GAAG,EAAE,CAAA;QACvB,cAAc,IAAI;;;;QAKd,SAAS;YACP,CAAC,CAAC,wDAAwD;YAC1D,CAAC,CAAC,+BACN;;;;;;;;;;;;EAYJ,kBAAkB;EAClB,cAAc;;;;aAIH,QAAQ;kBACH,QAAQ;;;;;;;;;;;;;;;;;;;eAmBX,QAAQ;;;;;;YAMV,2BAA2B,CAAC,CAAC,CAAC,yCAAyC,2BAA2B,KAAK,CAAC,CAAC,CAAC,EAAG;;;;;;;;;CASzH,CAAA;QAGG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAA;QACnE,OAAO,QAAQ,CAAA;IACjB,CAAC;CACF;AA9FD,0DA8FC"}
+{"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,SAAS,CAAC,CAAC,CAAC,yDAAyD,SAAS,4BAA4B,CAAA,CAAC,CAAC,EAAE;YAC9G,2BAA2B,CAAC,CAAC,CAAC,yCAAyC,2BAA2B,KAAK,CAAC,CAAC,CAAC,EAAG;;;;;;;;;CASzH,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"}

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

@@ -11,13 +11,13 @@ class VueAppModelEntityGenerator extends abstract_file_generator_1.AbstractFileG
         const variable = context.externalParameter.value;
         const externalPrefix = this.convertNullToEmpty(variable.externalPrefix);
         let generateString = "";
-        generateString += `
+        generateString += `
 import { Entity, EntityList, PrimitivePropMeta, ObjectPropMeta, ListPropMeta, DynamicPropMeta, EntityMeta } from '@farris/mobile-devkit';`;
         let entities = ",";
         if (toolhepler_1.ToolHelper.isArray(variable.ngLists, false)) {
             variable.ngLists.forEach((ngList) => {
                 if (entities.indexOf(',' + ngList.type + ',') < 0) {
-                    generateString += `
+                    generateString += `
 import { ${externalPrefix}${ngList.type} } from './${ngList.type.toLowerCase()}.entity';`;
                 }
                 entities += ngList.type + ',';
@@ -26,29 +26,29 @@ import { ${externalPrefix}${ngList.type} } from './${ngList.type.toLowerCase()}.
         if (toolhepler_1.ToolHelper.isArray(variable.ngObjects, false)) {
             variable.ngObjects.forEach((ngObject) => {
                 if (entities.indexOf(',' + ngObject.type + ',') < 0) {
-                    generateString += `
+                    generateString += `
 import { ${externalPrefix}${ngObject.type} } from './${ngObject.generatedType ? ngObject.generatedType.toLowerCase() : ngObject.type.toLowerCase()}.entity';`;
                 }
                 entities += ngObject.type + ',';
             });
         }
         generateString += this.getEol();
-        generateString += `
-@EntityMeta({
-    originalCode: "${variable.code}",
-    nodeCode: "${variable.label}"
-})
+        generateString += `
+@EntityMeta({
+    originalCode: "${variable.code}",
+    nodeCode: "${variable.label}"
+})
 export class ${externalPrefix}${variable.name} extends Entity {`;
         generateString += this.getEol();
         if (toolhepler_1.ToolHelper.isArray(variable.fields, false)) {
             variable.fields.forEach((field) => {
-                generateString += `
+                generateString += `
     @PrimitivePropMeta({`;
                 if (field.property) {
                     generateString += `property: '${field.property}',`;
                 }
                 if (field.code) {
-                    generateString += `
+                    generateString += `
         originalDataField: '${field.code}',`;
                 }
                 if (field.dataField) {
@@ -56,35 +56,35 @@ export class ${externalPrefix}${variable.name} extends Entity {`;
                     if (field.multiLanguage) {
                         dataField = dataField + "_" + jit_constant_1.JITConstant.MultiLanguageUpper;
                     }
-                    generateString += `
+                    generateString += `
         dataField: '${dataField}',`;
                 }
                 if (field.primary) {
-                    generateString += `
+                    generateString += `
         primary: ${field.primary},`;
                 }
                 if (field.foreign) {
-                    generateString += `
+                    generateString += `
         foreign: ${field.foreign},`;
                 }
                 if (field.originalDataFieldType) {
-                    generateString += `
+                    generateString += `
         originalDataFieldType: '${field.originalDataFieldType}',`;
                 }
                 if (field.multiLanguage) {
-                    generateString += `
+                    generateString += `
         enableMultiLangInput: true,`;
                 }
                 if (field.defaultValue) {
-                    generateString += `
+                    generateString += `
         defaultValue: ${field.defaultValue},`;
                 }
                 if (field.initValue || field.initValue == 0 || field.initValue == "0" || field.initValue == false || field.initValue == "false") {
-                    generateString += `
+                    generateString += `
         initValue: ${field.initValue},`;
                 }
                 if (field.path) {
-                    generateString += `
+                    generateString += `
         path: '${field.path}',`;
                 }
                 generateString += this.getEol();
@@ -101,69 +101,69 @@ export class ${externalPrefix}${variable.name} extends Entity {`;
         }
         if (toolhepler_1.ToolHelper.isArray(variable.ngLists, false)) {
             variable.ngLists.forEach((ngList) => {
-                generateString += `
-    @ListPropMeta({
-        dataField: '${ngList.dataField}',
+                generateString += `
+    @ListPropMeta({
+        dataField: '${ngList.dataField}',
         originalDataField: '${this.convertNullToEmpty(ngList.code)}',`;
                 if (ngList.tableName) {
-                    generateString += `
+                    generateString += `
         tableName: '${ngList.tableName}',`;
                 }
                 if (ngList.type) {
-                    generateString += `
+                    generateString += `
         type: ${externalPrefix}${ngList.type}`;
                 }
                 generateString += this.getEol();
-                generateString += `
+                generateString += `
     })`;
                 generateString += this.getEol();
-                generateString += `
+                generateString += `
     ${ngList.dataField}: EntityList<${externalPrefix}${ngList.type}>;`;
             });
         }
         if (toolhepler_1.ToolHelper.isArray(variable.ngObjects, false)) {
             variable.ngObjects.forEach((ngObject) => {
-                generateString += `
-    @ObjectPropMeta({
-        dataField: '${ngObject.dataField}',
+                generateString += `
+    @ObjectPropMeta({
+        dataField: '${ngObject.dataField}',
         originalDataField: '${ngObject.code}',`;
                 if (ngObject.tableName) {
-                    generateString += `
+                    generateString += `
         tableName: '${ngObject.tableName}',`;
                 }
                 if (ngObject.hierarchyType) {
-                    generateString += `
+                    generateString += `
         hierarchyType:'${ngObject.hierarchyType}',`;
                 }
                 if (ngObject.type) {
-                    generateString += `
+                    generateString += `
         type: ${externalPrefix}${ngObject.type}`;
                 }
-                generateString += `
+                generateString += `
     })`;
-                generateString += `
+                generateString += `
     ${ngObject.dataField}: ${externalPrefix}${ngObject.type};`;
             });
         }
         if (toolhepler_1.ToolHelper.isArray(variable.ngDynamicObjects, false)) {
             variable.ngDynamicObjects.forEach((ngDynamicObject) => {
-                generateString += `
-    @DynamicPropMeta({
-        dataField: '${ngDynamicObject.dataField}',
+                generateString += `
+    @DynamicPropMeta({
+        dataField: '${ngDynamicObject.dataField}',
         originalDataField: '${ngDynamicObject.code}',` + this.getEol();
                 if (ngDynamicObject.type) {
-                    generateString += `
+                    generateString += `
         type: ${ngDynamicObject.type}` + this.getEol();
                 }
                 generateString += this.getEol();
-                generateString += `
+                generateString += `
     })`;
                 generateString += this.getEol();
-                generateString += `
+                generateString += `
     ${ngDynamicObject.dataField}: ${ngDynamicObject.type};` + this.getEol();
             });
         }
-        generateString += `
+        generateString += `
 }`;
         this.createFile(context.basePath, context.fileName, generateString);
         return response;

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

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