@farris/jit-engine 1.3.232 → 1.3.235

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;

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

@@ -11,117 +11,117 @@ class PageComponentGenerator extends abstract_file_generator_1.AbstractFileGener
         const componentId = parameter.componentId;
         const providerName = page_provider_manager_1.PageProviderManager.generateProviderName(componentId);
         const componentConfig = parameter.componentConfig;
-        const generateString = `
-<template>
-${parameter.templateHtml}
-</template>
-<script>
-import {
-    recomputable,
-    mapBindingStates,
-    mapCommandMethods,
-    bindListviewExtenderDir,
-    bindAttachmentExtenderDir,
-    mapProviders,
-    LookupMappingService,
-    filterData,
-    filterMapData,
-    beforeCreateByVueAdapter,
-    createdByVueAdapter,
-    mountedByVueAdapter,
-    updatedByVueAdapter,
-    beforeUnmountByVueAdapter,
-    scrollActivated,
-    scrollDeactivated
-  } from '@farris/mobile-vue-adapter';
-import {${providerName}} from "./${componentId.toLowerCase()}.provider";
-
-${parameter.componentRef}
-${parameter.externalImport.import}
-
-export default
-{
-    name : '${parameter.componentClassName}',
-    provide: mapProviders(),
-    data(){
-        return {
-            url:'',
-            lang: localStorage.getItem('languageCode') || "zh-CHS"
-        };
-    },
-    computed: {
-        ...mapBindingStates(),
-    },
-    methods:{
+        const generateString = `
+<template>
+${parameter.templateHtml}
+</template>
+<script>
+import {
+    recomputable,
+    mapBindingStates,
+    mapCommandMethods,
+    bindListviewExtenderDir,
+    bindAttachmentExtenderDir,
+    mapProviders,
+    LookupMappingService,
+    filterData,
+    filterMapData,
+    beforeCreateByVueAdapter,
+    createdByVueAdapter,
+    mountedByVueAdapter,
+    updatedByVueAdapter,
+    beforeUnmountByVueAdapter,
+    scrollActivated,
+    scrollDeactivated
+  } from '@farris/mobile-vue-adapter';
+import {${providerName}} from "./${componentId.toLowerCase()}.provider";
+
+${parameter.componentRef}
+${parameter.externalImport.import}
+
+export default
+{
+    name : '${parameter.componentClassName}',
+    provide: mapProviders(),
+    data(){
+        return {
+            url:'',
+            lang: localStorage.getItem('languageCode') || "zh-CHS"
+        };
+    },
+    computed: {
+        ...mapBindingStates(),
+    },
+    methods:{
         ${this.getOnInitCommand(componentConfig)
             ? 'pageLoad(){' + this.getOnInitCommand(componentConfig) + '},'
-            : ''}
-        ...mapCommandMethods([${this.generateCommands(parameter.commands)}]),
+            : ''}
+        ...mapCommandMethods([${this.generateCommands(parameter.commands)}]),
         ${this.getGobackCommand(componentConfig)
             ? 'goBack() { this.url === document.URL && this.$viewModel.' +
                 this.getGobackCommand(componentConfig) +
                 '();},'
-            : ''}
-        ${parameter.templateHtml.includes('fm-swipecell') ? `beforeShow() {
-          return new Promise((resolve )=>{
-            setTimeout(()=>{
-              resolve()
-            }, 100)
-          })
-        },` : ''}
-        
-    },
-    components:{
-        ${parameter.childComponents}
-        ${parameter.externalImport.register}
-    },
-    beforeCreate(){
-        ${this.generateInitPage(componentConfig)}
+            : ''}
+        ${parameter.templateHtml.includes('fm-swipecell') ? `beforeShow() {
+          return new Promise((resolve )=>{
+            setTimeout(()=>{
+              resolve()
+            }, 100)
+          })
+        },` : ''}
+        
+    },
+    components:{
+        ${parameter.childComponents}
+        ${parameter.externalImport.register}
+    },
+    beforeCreate(){
+        ${this.generateInitPage(componentConfig)}
         ${this.getOnLoadDataCommand(componentConfig)
             ? 'this.$app.context.eventBus.subscribe("' +
                 componentId +
                 "\",(event) => {if(event['type'] === 'LoadData'){" +
                 this.getOnLoadDataCommand(componentConfig) +
                 '}});'
-            : ''}
-        ${this.getOnBeforeInitCommand(componentConfig)}
-        beforeCreateByVueAdapter && beforeCreateByVueAdapter(this);
-        // 初始加载数据
-        //this.pageLoad();
-        //this.$viewModel.load();
-    },
-    created(){
-        ${this.getOnInitCommand(componentConfig) ? 'this.pageLoad();' : ''}
-        createdByVueAdapter && createdByVueAdapter(this);
-    },
-    mounted() {
-        ${componentConfig.keepAlive ? '' : this.getGobackCommandCode(componentConfig)}
-        ${componentConfig.keepAlive ? '' : this.getGobackCommandForWF(componentConfig)}
-        this.$nextTick(function () {
-            this.$bindComponentExtenders(this.$refs);
-        });
-        mountedByVueAdapter && mountedByVueAdapter(this);
-    },
-    updated() {
-        this.$bindComponentExtenders(this.$refs);
-        updatedByVueAdapter && updatedByVueAdapter(this);
-    },
-    ${this.generateActivated(componentConfig)}
-    beforeUnmount() {
+            : ''}
+        ${this.getOnBeforeInitCommand(componentConfig)}
+        beforeCreateByVueAdapter && beforeCreateByVueAdapter(this);
+        // 初始加载数据
+        //this.pageLoad();
+        //this.$viewModel.load();
+    },
+    created(){
+        ${this.getOnInitCommand(componentConfig) ? 'this.pageLoad();' : ''}
+        createdByVueAdapter && createdByVueAdapter(this);
+    },
+    mounted() {
+        ${componentConfig.keepAlive ? '' : this.getGobackCommandCode(componentConfig)}
+        ${componentConfig.keepAlive ? '' : this.getGobackCommandForWF(componentConfig)}
+        this.$nextTick(function () {
+            this.$bindComponentExtenders(this.$refs);
+        });
+        mountedByVueAdapter && mountedByVueAdapter(this);
+    },
+    updated() {
+        this.$bindComponentExtenders(this.$refs);
+        updatedByVueAdapter && updatedByVueAdapter(this);
+    },
+    ${this.generateActivated(componentConfig)}
+    beforeUnmount() {
         ${this.getOnLoadDataCommand(componentConfig)
             ? 'this.$app.context.eventBus.unsubscribe("' + componentId + '"),'
-            : ''}
+            : ''}
         ${componentConfig.goBack && !componentConfig.keepAlive
             ? 'window.removeEventListener("popstate", this.goBack, false); //false阻止默认事件'
-            : ''}
-        this.$unbindComponentExtenders(this.$refs);
-        beforeUnmountByVueAdapter && beforeUnmountByVueAdapter(this);
-    }
-}
-</script>
-<style>
-${componentConfig.customClass ? componentConfig.customClass : ''}
-</style>
+            : ''}
+        this.$unbindComponentExtenders(this.$refs);
+        beforeUnmountByVueAdapter && beforeUnmountByVueAdapter(this);
+    }
+}
+</script>
+<style>
+${componentConfig.customClass ? componentConfig.customClass : ''}
+</style>
 `;
         this.createFile(context.basePath, context.fileName, generateString);
         return response;
@@ -165,36 +165,36 @@ ${componentConfig.customClass ? componentConfig.customClass : ''}
     }
     generateInitPage(componentConfig, from) {
         const providerName = page_provider_manager_1.PageProviderManager.generateProviderName(componentConfig.id);
-        return `
-    // 创建ViewModel
-    const viewModelOptions = {
-      id: '${componentConfig.id}',
-      ${from === 'activated' ? 'keepAlive: true,' : ''}
-      providers: ${providerName}
-    };
+        return `
+    // 创建ViewModel
+    const viewModelOptions = {
+      id: '${componentConfig.id}',
+      ${from === 'activated' ? 'keepAlive: true,' : ''}
+      providers: ${providerName}
+    };
     this.$initPage(viewModelOptions);`;
     }
     generateActivated(componentConfig) {
         if (componentConfig.keepAlive) {
-            return `activated() {
-        ${this.generateInitPage(componentConfig, 'activated')}
-        ${this.getGobackCommandCode(componentConfig)}
-        ${this.getGobackCommandForWF(componentConfig)}
-        ${this.getOnActivedCommand(componentConfig)}
-        scrollActivated && scrollActivated(this);
-    },
-    deactivated() {
+            return `activated() {
+        ${this.generateInitPage(componentConfig, 'activated')}
+        ${this.getGobackCommandCode(componentConfig)}
+        ${this.getGobackCommandForWF(componentConfig)}
+        ${this.getOnActivedCommand(componentConfig)}
+        scrollActivated && scrollActivated(this);
+    },
+    deactivated() {
         ${componentConfig.goBack
                 ? 'window.removeEventListener("popstate", this.goBack, false); //false阻止默认事件'
-                : ''}
-        scrollDeactivated && scrollDeactivated(this);
+                : ''}
+        scrollDeactivated && scrollDeactivated(this);
     },`;
         }
         return '';
     }
     getGobackCommandForWF(componentConfig) {
         if (componentConfig.goBackForWF) {
-            return `
+            return `
         window.top['detailBackBtnClickHandler'] = this.${componentConfig.goBackForWF};`;
         }
         return '';
@@ -207,11 +207,11 @@ ${componentConfig.customClass ? componentConfig.customClass : ''}
     }
     getGobackCommandCode(componentConfig) {
         if (componentConfig.goBack) {
-            return `
-        if (window.history && window.history.pushState) {
-            this.url = document.URL
-            history.pushState(null, null, document.URL);
-            window.addEventListener("popstate", this.goBack, false); //false阻止默认事件
+            return `
+        if (window.history && window.history.pushState) {
+            this.url = document.URL
+            history.pushState(null, null, document.URL);
+            window.addEventListener("popstate", this.goBack, false); //false阻止默认事件
         }`;
         }
         return '';