@farris/jit-engine 1.3.232 → 1.3.233

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;

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-model-repository-generator.js

@@ -9,52 +9,52 @@ class VueAppModelRepositoryGenerator extends abstract_file_generator_1.AbstractF
         let generateString = "";
         const variable = context.externalParameter.value;
         const externalPrefix = this.convertNullToEmpty(variable.externalPrefix);
-        generateString += `
-import { Injector } from '@farris/mobile-devkit';
-import { BefRepository, VariablePropMeta } from '@farris/mobile-bef';
-import { ${externalPrefix}${variable.entity} } from './entities/${variable.entity.toLowerCase()}.entity';
+        generateString += `
+import { Injector } from '@farris/mobile-devkit';
+import { BefRepository, VariablePropMeta } from '@farris/mobile-bef';
+import { ${externalPrefix}${variable.entity} } from './entities/${variable.entity.toLowerCase()}.entity';
 `;
         if (variable.includeProxyReference) {
-            generateString += `
+            generateString += `
 import { ${externalPrefix}${variable.originalEntity}Proxy } from './model.proxy';`;
         }
-        generateString += `
-
-export class ModelRepository extends BefRepository<${externalPrefix}${variable.entity}> {
-    public name = '${externalPrefix}${variable.name}';
+        generateString += `
+
+export class ModelRepository extends BefRepository<${externalPrefix}${variable.entity}> {
+    public name = '${externalPrefix}${variable.name}';
 `;
         if (variable.includeProxyReference) {
-            generateString += `
+            generateString += `
     public apiProxyType = ${externalPrefix}${variable.originalEntity}Proxy;`;
         }
-        generateString += `
+        generateString += `
     public entityType = ${externalPrefix}${variable.entity};`;
         if (variable.paginations && variable.paginations.length > 0 && variable.paginations[0].pagination) {
-            generateString += `
-    public paginationInfo = {
-        pageSize: ${variable.paginations[0].pagination.pageSize}
+            generateString += `
+    public paginationInfo = {
+        pageSize: ${variable.paginations[0].pagination.pageSize}
     };`;
         }
         else {
-            generateString += `
-    public paginationInfo = {
-        pageSize: 0
+            generateString += `
+    public paginationInfo = {
+        pageSize: 0
     };`;
         }
         variable.states.forEach(state => {
-            generateString += `
-    @VariablePropMeta({
-        mapping: '${state.code}'
-    })
-    public ${state.code}: ${state.type};
+            generateString += `
+    @VariablePropMeta({
+        mapping: '${state.code}'
+    })
+    public ${state.code}: ${state.type};
     `;
         });
-        generateString += `
-    constructor(injector: Injector) {
-        super(injector);
+        generateString += `
+    constructor(injector: Injector) {
+        super(injector);
         this.init();`;
-        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;