@farris/jit-engine 1.3.232 → 1.3.235

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;

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

@@ -12,58 +12,58 @@ class PageStateMachineGenerator extends abstract_file_generator_1.AbstractFileGe
         const variable = externalParameter.value;
         let generateString = "";
         const eol = this.getEol();
-        generateString += `
-import { StateMachine, State, StatePropMeta, RenderState, RenderStatePropMeta, Action, ActionMethodMeta } from '@farris/mobile-devkit';
+        generateString += `
+import { StateMachine, State, StatePropMeta, RenderState, RenderStatePropMeta, Action, ActionMethodMeta } from '@farris/mobile-devkit';
 `;
-        generateString += `
-export class  ${page_statemachine_manager_1.PageStateMachineManager.generateStateMachineName(variable.componentId)} extends StateMachine {
+        generateString += `
+export class  ${page_statemachine_manager_1.PageStateMachineManager.generateStateMachineName(variable.componentId)} extends StateMachine {
 `;
         if (toolhepler_1.ToolHelper.isArray(variable.ngStates, false)) {
             variable.ngStates.forEach((ngState) => {
                 if (ngState.initialState) {
-                    generateString += `
-    @StatePropMeta({
-        initialState: true
+                    generateString += `
+    @StatePropMeta({
+        initialState: true
     })`;
                 }
                 else {
-                    generateString += `
+                    generateString += `
     @StatePropMeta()`;
                 }
-                generateString += `
+                generateString += `
     ${ngState.name}: State;`;
                 generateString += eol;
             });
         }
         if (toolhepler_1.ToolHelper.isArray(variable.ngRenderStates, false)) {
             variable.ngRenderStates.forEach((ngRenderState) => {
-                generateString += `
-    @RenderStatePropMeta({
-        render: ${ngRenderState.render}
-    })
+                generateString += `
+    @RenderStatePropMeta({
+        render: ${ngRenderState.render}
+    })
     ${ngRenderState.name}: RenderState;`;
                 generateString += this.getEol();
             });
         }
         if (toolhepler_1.ToolHelper.isArray(variable.ngActions, false)) {
             variable.ngActions.forEach((ngAction) => {
-                generateString += `
+                generateString += `
     @ActionMethodMeta({`;
                 if (ngAction.precondition) {
-                    generateString += `
+                    generateString += `
         precondition: ${ngAction.precondition},`;
                 }
                 if (ngAction.transitTo) {
-                    generateString += `
+                    generateString += `
         transitTo: '${ngAction.transitTo}'`;
                 }
-                generateString += `
-    })
+                generateString += `
+    })
     ${ngAction.name}: Action;`;
                 generateString += this.getEol();
             });
         }
-        generateString += `
+        generateString += `
 }`;
         this.createFile(context.basePath, context.fileName, generateString);
         return response;

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

@@ -11,30 +11,30 @@ class PageUIStateGenerator extends abstract_file_generator_1.AbstractFileGenerat
     generate(context) {
         const response = file_generator_response_1.FileGeneratorResponse.getNewEmptyInstance();
         const vueStates = context.externalParameter;
-        let generateString = `
-import { UIState, UIStatePropMeta, ControlStatePropMeta } from '@farris/mobile-devkit';
-
-/**
- * 表单UIState
- */
+        let generateString = `
+import { UIState, UIStatePropMeta, ControlStatePropMeta } from '@farris/mobile-devkit';
+
+/**
+ * 表单UIState
+ */
 export class ${page_uistate_manager_1.PageUIStateManager.generateUIStateName(vueStates.componentId)} extends  UIState {`;
-        generateString += `
-
-    @UIStatePropMeta({
-        stateName: 'listaviewState'
-    })
-    public listaviewState: any = { refreshLoading: false, loadMoreLoading: false, loadMoreFinished: false };
-    @UIStatePropMeta({
-        stateName: 'searchState'
-    })
-    public searchState: any = { keyword: '' };
-    @UIStatePropMeta({
-        stateName: 'filterState'
-    })
-    public filterState : any = { filters: '' };
-    @UIStatePropMeta({
-        stateName: 'tabState'
-    })
+        generateString += `
+
+    @UIStatePropMeta({
+        stateName: 'listaviewState'
+    })
+    public listaviewState: any = { refreshLoading: false, loadMoreLoading: false, loadMoreFinished: false };
+    @UIStatePropMeta({
+        stateName: 'searchState'
+    })
+    public searchState: any = { keyword: '' };
+    @UIStatePropMeta({
+        stateName: 'filterState'
+    })
+    public filterState : any = { filters: '' };
+    @UIStatePropMeta({
+        stateName: 'tabState'
+    })
     public tabState: any = { currentTab: '' };`;
         if (toolhepler_1.ToolHelper.isArray(vueStates.stateList, false)) {
             generateString += this.getEol();
@@ -42,16 +42,16 @@ export class ${page_uistate_manager_1.PageUIStateManager.generateUIStateName(vue
                 if (s.category.includes('control')) {
                     return;
                 }
-                generateString += `
-    @UIStatePropMeta({
-        stateName: '${s.code}'
+                generateString += `
+    @UIStatePropMeta({
+        stateName: '${s.code}'
     })`;
                 if (s.value) {
-                    generateString += `
+                    generateString += `
     public ${s.code}: ${s.type} = ${s.value};`;
                 }
                 else {
-                    generateString += `
+                    generateString += `
     public ${s.code}: ${s.type};`;
                 }
                 generateString += this.getEol();
@@ -63,13 +63,13 @@ export class ${page_uistate_manager_1.PageUIStateManager.generateUIStateName(vue
                 if (!s.category.includes('control')) {
                     return;
                 }
-                generateString += `
-    @ControlStatePropMeta({
-        stateName: '${s.code}',
-        controlInfo: ${JSON.stringify(s.controlInfo)},
+                generateString += `
+    @ControlStatePropMeta({
+        stateName: '${s.code}',
+        controlInfo: ${JSON.stringify(s.controlInfo)},
         `;
                 generateString +=
-                    `originalValue: {
+                    `originalValue: {
         `;
                 if (s.originalValue) {
                     Object.keys(s.originalValue).forEach((property) => {
@@ -88,25 +88,25 @@ export class ${page_uistate_manager_1.PageUIStateManager.generateUIStateName(vue
                             }
                         }
                         generateString +=
-                            `    ${property}:{ type: '${type}', value: ${JSON.stringify(value)} },
+                            `    ${property}:{ type: '${type}', value: ${JSON.stringify(value)} },
         `;
                     });
                 }
                 generateString +=
-                    `}
+                    `}
     })`;
                 if (s.value) {
-                    generateString += `
+                    generateString += `
     public ${s.code}: ${s.type} = ${s.value};`;
                 }
                 else {
-                    generateString += `
+                    generateString += `
     public ${s.code}: ${s.type};`;
                 }
                 generateString += this.getEol();
             });
         }
-        generateString += `}
+        generateString += `}
 `;
         this.createFile(context.basePath, context.fileName, generateString);
         return response;