@farris/jit-engine 1.3.232 → 1.3.233

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 '';

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

@@ -12,60 +12,60 @@ class PageFormConfigGenerator extends abstract_file_generator_1.AbstractFileGene
         const variable = externalParameter.value;
         const componentId = variable.componentCode;
         let generateString = "";
-        generateString += `
-import { ViewModelContext,  FormControl, Form, FormControlPropMeta, BindingType  } from '@farris/mobile-devkit';
+        generateString += `
+import { ViewModelContext,  FormControl, Form, FormControlPropMeta, BindingType  } from '@farris/mobile-devkit';
 import { DateConverter } from "@farris/mobile-vue-adapter";`;
         if (toolhepler_1.ToolHelper.isArray(variable.controls, false)) {
             generateString += this.generateConvertImport(variable);
         }
         generateString += this.getEol();
-        generateString += `
-
-export class ${page_form_manager_1.PageFormManager.generatePageFormName(componentId)} extends Form {
-  constructor(viewModelContext: ViewModelContext) {
-    super(viewModelContext);
+        generateString += `
+
+export class ${page_form_manager_1.PageFormManager.generatePageFormName(componentId)} extends Form {
+  constructor(viewModelContext: ViewModelContext) {
+    super(viewModelContext);
   }`;
-        generateString += `
-  @FormControlPropMeta({
-    bindingType: BindingType.UIState,
-    bindingPath: 'searchState/keyword',
-  })
-  searchState_keyword: FormControl;
-  @FormControlPropMeta({
-    bindingType: BindingType.UIState,
-    bindingPath: 'listaviewState/refreshLoading',
-  })
-  listaviewState_refreshLoading: FormControl;
+        generateString += `
+  @FormControlPropMeta({
+    bindingType: BindingType.UIState,
+    bindingPath: 'searchState/keyword',
+  })
+  searchState_keyword: FormControl;
+  @FormControlPropMeta({
+    bindingType: BindingType.UIState,
+    bindingPath: 'listaviewState/refreshLoading',
+  })
+  listaviewState_refreshLoading: FormControl;
 `;
         if (toolhepler_1.ToolHelper.isArray(variable.controls, false)) {
             variable.controls.forEach((ctl) => {
                 if (ctl.type == 'FormContrl') {
-                    generateString += `
+                    generateString += `
   @FormControlPropMeta({`;
-                    generateString += `
+                    generateString += `
       bindingType: BindingType.${ctl.bindingType},`;
                     if (ctl.binding) {
-                        generateString += `
+                        generateString += `
       bindingPath: '${ctl.binding}'` + ",";
                     }
                     if (ctl.valueChanged) {
-                        generateString += `
+                        generateString += `
       valueChanged: '${ctl.valueChanged}'` + ",";
                     }
                     if (ctl.converter) {
-                        generateString += `
+                        generateString += `
       valueConverter: ${ctl.converter}` + ",";
                     }
-                    generateString += `
-      ${this.genValidRules(ctl.validRules)}
+                    generateString += `
+      ${this.genValidRules(ctl.validRules)}
     })`;
-                    generateString += `
+                    generateString += `
     ${ctl.name}: FormControl;`;
                     generateString += this.getEol();
                 }
             });
         }
-        generateString += `
+        generateString += `
 }`;
         this.createFile(context.basePath, context.fileName, generateString);
         return response;
@@ -85,7 +85,7 @@ export class ${page_form_manager_1.PageFormManager.generatePageFormName(componen
             });
         }
         if (toolhepler_1.ToolHelper.isArray(arrCanImportConverter, false)) {
-            generateString += `
+            generateString += `
 import { ${arrCanImportConverter.join(", ")} } from "@farris/kendo-binding";`;
         }
         return generateString;

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

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

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

@@ -20,97 +20,97 @@ class PageProviderGenerator extends abstract_file_generator_1.AbstractFileGenera
         const lowerCaseComponentId = componentId.toLowerCase();
         const serviceRefs = vueViewModel.serviceRefs.filter(item => item.isCommon ? false : true);
         let generateString = "";
-        generateString += `
-import {
-    StaticProvider, Injector, Repository,
-    ViewModel, BindingData, UIState, StateMachine, Form, ViewModelContext, COMMAND_HANDLERS_TOKEN
-} from '@farris/mobile-devkit';
-import { BEF_VIEWMODEL_PROVIDERS } from '@farris/mobile-bef';
-import {
-    LoadDataService,
-    RemoveDataService,
-    RouterService,
-    CreateDataService,
-    COMMAND_SERVICES_VIEWMODEL_PROVIDERS,
-    CommandService,SaveDataService,
-    CancelDataService,
-    ApproveService,
-    StateMachineService,
-    AttachmentService,
-    EditDataService,
-    UpdateDataService,
-    CcWorkService,
-    ValidatorServices,
-    BusinessAttachmentService,
-    CheckDataService,
-    DiscussionGroupService,
-    DialogService,
-    LoadingService,
-    NotifyService,
-    ToastService,
-    JsBridgeService,
-    VoVariableService,
-    UIDataService
-} from '@farris/mobile-command-services';
-import { ModelRepository } from '../../models/model.repository'
-${serviceRefs.map(item => 'import { ' + item.name + ' as ' + item.alias + ' } from "../../services/' + item.fileName.toLowerCase() + '";').join('')}
+        generateString += `
+import {
+    StaticProvider, Injector, Repository,
+    ViewModel, BindingData, UIState, StateMachine, Form, ViewModelContext, COMMAND_HANDLERS_TOKEN
+} from '@farris/mobile-devkit';
+import { BEF_VIEWMODEL_PROVIDERS } from '@farris/mobile-bef';
+import {
+    LoadDataService,
+    RemoveDataService,
+    RouterService,
+    CreateDataService,
+    COMMAND_SERVICES_VIEWMODEL_PROVIDERS,
+    CommandService,SaveDataService,
+    CancelDataService,
+    ApproveService,
+    StateMachineService,
+    AttachmentService,
+    EditDataService,
+    UpdateDataService,
+    CcWorkService,
+    ValidatorServices,
+    BusinessAttachmentService,
+    CheckDataService,
+    DiscussionGroupService,
+    DialogService,
+    LoadingService,
+    NotifyService,
+    ToastService,
+    JsBridgeService,
+    VoVariableService,
+    UIDataService
+} from '@farris/mobile-command-services';
+import { ModelRepository } from '../../models/model.repository'
+${serviceRefs.map(item => 'import { ' + item.name + ' as ' + item.alias + ' } from "../../services/' + item.fileName.toLowerCase() + '";').join('')}
 `;
         if (vueViewModel.form) {
-            generateString += `
+            generateString += `
 import { ${page_form_manager_1.PageFormManager.generatePageFormName(componentId)} } from "./${lowerCaseComponentId}.form";`;
         }
         if (vueViewModel.states) {
-            generateString += `
+            generateString += `
 import { ${page_uistate_manager_1.PageUIStateManager.generateUIStateName(componentId)} } from "./${lowerCaseComponentId}.uistate";`;
         }
         if (vueViewModel.stateMachine) {
-            generateString += `
+            generateString += `
 import { ${page_statemachine_manager_1.PageStateMachineManager.generateStateMachineName(componentId)} } from "./${lowerCaseComponentId}.statemachine";`;
         }
-        generateString += `
+        generateString += `
 import { ${page_viewmodel_manager_1.PageViewModelManager.generateViewModelName(componentId)} } from "./${lowerCaseComponentId}.viewmodel";`;
         if (utility_1.ToolHelper.isArray(vueViewModel.commands, false)) {
             vueViewModel.commands.forEach((item) => {
-                generateString += `
+                generateString += `
 import { ${page_command_handler_manager_1.PageCommandHandlerManager.generateCommandHandlerName(item.code)} } from "./handlers/${item.code.toLowerCase()}.handler";`;
             });
         }
-        generateString += `
+        generateString += `
 import {${page_binding_data_manager_1.PageBindingDataManager.generateBindingName(componentId)}} from "./${lowerCaseComponentId}.bindingdata";`;
-        generateString += `
-
+        generateString += `
+
 export const ${providerName}: StaticProvider[] = [`;
-        generateString += `
+        generateString += `
     { provide: Repository, useExisting: ModelRepository, deps: []},`;
-        generateString += `
+        generateString += `
     { provide: BindingData, useClass: ${page_binding_data_manager_1.PageBindingDataManager.generateBindingName(componentId)}, deps: []},`;
         if (vueViewModel.states) {
-            generateString += `
+            generateString += `
     { provide: UIState, useClass: ${page_uistate_manager_1.PageUIStateManager.generateUIStateName(componentId)}, deps: []},`;
         }
         if (vueViewModel.stateMachine) {
-            generateString += `
+            generateString += `
     { provide: StateMachine, useClass: ${page_statemachine_manager_1.PageStateMachineManager.generateStateMachineName(componentId)}, deps: []},`;
         }
         if (vueViewModel.form) {
-            generateString += `
+            generateString += `
     { provide: Form, useClass: ${page_form_manager_1.PageFormManager.generatePageFormName(componentId)}, deps: [ViewModelContext ] },`;
         }
-        generateString += `
+        generateString += `
     { provide: ViewModel, useClass: ${page_viewmodel_manager_1.PageViewModelManager.generateViewModelName(componentId)}, deps: [Injector] },`;
         if (utility_1.ToolHelper.isArray(vueViewModel.commands, false)) {
             vueViewModel.commands.forEach((itemCommand) => {
-                generateString += `
+                generateString += `
     { provide: COMMAND_HANDLERS_TOKEN, useClass: ${page_command_handler_manager_1.PageCommandHandlerManager.generateCommandHandlerName(itemCommand.code)}, deps: [${this.generateHandlerService(itemCommand, serviceRefs)}], multi: true},`;
             });
         }
         if (utility_1.ToolHelper.isArray(serviceRefs, false)) {
             serviceRefs.forEach((service) => {
-                generateString += `
+                generateString += `
     { provide: ${service.alias}, useClass: ${service.alias}, deps: [ViewModelContext]},`;
             });
         }
-        generateString += `
+        generateString += `
 ].concat(COMMAND_SERVICES_VIEWMODEL_PROVIDERS).concat(BEF_VIEWMODEL_PROVIDERS);`;
         this.createFile(context.basePath, context.fileName, generateString);
         return response;