@farris/jit-engine 1.3.283 → 1.3.285

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