@farris/jit-engine 1.4.8 → 1.4.10

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

@@ -11,7 +11,6 @@ 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 useNewRouteStrategy = this.isNewRouteStrategy(componentConfig);
         const generateString = `
 <template>
 ${parameter.templateHtml}
@@ -33,9 +32,7 @@ import {
     updatedByVueAdapter,
     beforeUnmountByVueAdapter,
     scrollActivated,
-    scrollDeactivated,
-    handlePageLevelRouteEnter,
-    handlePageLevelRouteLeave,
+    scrollDeactivated
   } from '@farris/mobile-vue-adapter';
 import {${providerName}} from "./${componentId.toLowerCase()}.provider";
 
@@ -61,7 +58,7 @@ export default
             : ''}
         ...mapCommandMethods([${this.generateCommands(parameter.commands)}]),
         ${this.getGobackCommand(componentConfig)
-            ? `goBack() { ${useNewRouteStrategy ? '' : 'this.url === document.URL && '}this.$viewModel.` +
+            ? 'goBack() { this.url === document.URL && this.$viewModel.' +
                 this.getGobackCommand(componentConfig) +
                 '();},'
             : ''}
@@ -89,13 +86,16 @@ export default
             : ''}
         ${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, useNewRouteStrategy)}
+        ${componentConfig.keepAlive ? '' : this.getGobackCommandCode(componentConfig)}
         ${componentConfig.keepAlive ? '' : this.getGobackCommandForWF(componentConfig)}
         this.$nextTick(function () {
             this.$bindComponentExtenders(this.$refs);
@@ -106,13 +106,13 @@ export default
         this.$bindComponentExtenders(this.$refs);
         updatedByVueAdapter && updatedByVueAdapter(this);
     },
-    ${this.generateActivated(componentConfig, useNewRouteStrategy)}
+    ${this.generateActivated(componentConfig)}
     beforeUnmount() {
         ${this.getOnLoadDataCommand(componentConfig)
             ? 'this.$app.context.eventBus.unsubscribe("' + componentId + '"),'
             : ''}
-        ${!componentConfig.keepAlive
-            ? this.getPageLevelRouteLeaveCode(componentConfig, useNewRouteStrategy)
+        ${componentConfig.goBack && !componentConfig.keepAlive
+            ? 'window.removeEventListener("popstate", this.goBack, false); //false阻止默认事件'
             : ''}
         this.$unbindComponentExtenders(this.$refs);
         beforeUnmountByVueAdapter && beforeUnmountByVueAdapter(this);
@@ -126,28 +126,6 @@ ${componentConfig.customClass ? componentConfig.customClass : ''}
         this.createFile(context.basePath, context.fileName, generateString);
         return response;
     }
-    isNewRouteStrategy(componentConfig) {
-        var _a, _b, _c;
-        const newRouteStrategy = ['standard'];
-        const componentConfigTemplate = componentConfig.template;
-        let firstContentComponent;
-        if (Array.isArray(componentConfigTemplate)) {
-            firstContentComponent = componentConfigTemplate[0];
-        }
-        else {
-            firstContentComponent = componentConfigTemplate;
-        }
-        if (!firstContentComponent) {
-            return false;
-        }
-        const parentInstance = (_a = firstContentComponent.getContext()) === null || _a === void 0 ? void 0 : _a.getParentInstance();
-        const componentContext = parentInstance && parentInstance.componentContext;
-        if (!componentContext) {
-            return false;
-        }
-        const routeStrategy = (_c = (_b = componentContext.getModuleContext()) === null || _b === void 0 ? void 0 : _b.getOptions()) === null || _c === void 0 ? void 0 : _c.routeStrategy;
-        return newRouteStrategy.includes(routeStrategy);
-    }
     getOnInitCommand(componentConfig) {
         if (componentConfig.onInit) {
             return componentConfig.onInit;
@@ -188,6 +166,7 @@ ${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,' : ''}
@@ -195,17 +174,19 @@ ${componentConfig.customClass ? componentConfig.customClass : ''}
     };
     this.$initPage(viewModelOptions);`;
     }
-    generateActivated(componentConfig, useNewRouteStrategy) {
+    generateActivated(componentConfig) {
         if (componentConfig.keepAlive) {
             return `activated() {
         ${this.generateInitPage(componentConfig, 'activated')}
-        ${this.getGobackCommandCode(componentConfig, useNewRouteStrategy)}
+        ${this.getGobackCommandCode(componentConfig)}
         ${this.getGobackCommandForWF(componentConfig)}
         ${this.getOnActivedCommand(componentConfig)}
         scrollActivated && scrollActivated(this);
     },
     deactivated() {
-        ${this.getPageLevelRouteLeaveCode(componentConfig, useNewRouteStrategy)}
+        ${componentConfig.goBack
+                ? 'window.removeEventListener("popstate", this.goBack, false); //false阻止默认事件'
+                : ''}
         scrollDeactivated && scrollDeactivated(this);
     },`;
         }
@@ -224,29 +205,16 @@ ${componentConfig.customClass ? componentConfig.customClass : ''}
         }
         return '';
     }
-    getGobackCommandCode(componentConfig, useNewRouteStrategy) {
-        if (useNewRouteStrategy) {
-            return `handlePageLevelRouteEnter(this, this.goBack);`;
-        }
-        else {
-            if (componentConfig.goBack) {
-                return `\n` +
-                    `\t\tif (window.history && window.history.pushState) {\n` +
-                    `\t\t    this.url = document.URL;\n` +
-                    `\t\t    history.pushState(null, null, document.URL);\n` +
-                    `\t\t    window.addEventListener("popstate", this.goBack, false);\n` +
-                    `\t\t}`;
-            }
-            return '';
-        }
-    }
-    getPageLevelRouteLeaveCode(componentConfig, useNewRouteStrategy) {
-        if (useNewRouteStrategy) {
-            return `handlePageLevelRouteLeave(this, this.goBack);`;
-        }
-        else {
-            return componentConfig.goBack ? `window.removeEventListener("popstate", this.goBack, false);` : ``;
+    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 '';
     }
 }
 exports.PageComponentGenerator = PageComponentGenerator;

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

@@ -1 +1 @@
-{"version":3,"file":"page-component-generator.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/code-generator/file-generator/page-generator/page-component-generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"page-component-generator.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/code-generator/file-generator/page-generator/page-component-generator.ts"],"names":[],"mappings":"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"}

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-viewmodel-generator.js

@@ -14,79 +14,79 @@ class PageViewModelGenerator extends abstract_file_generator_1.AbstractFileGener
         let generateString = "";
         const eol = this.getEol();
         const externalPrefix = this.convertNullToEmpty(variable.externalPrefix);
-        generateString += `
-import { Injector, ViewModel, CommandMethodMeta } from '@farris/mobile-devkit';
-import { Observable } from 'rxjs';
+        generateString += `
+import { Injector, ViewModel, CommandMethodMeta } from '@farris/mobile-devkit';
+import { Observable } from 'rxjs';
 `;
-        generateString += `
-
+        generateString += `
+
 export class ${viewModelName} extends ViewModel {`;
         if (variable.bindTo) {
-            generateString += `
+            generateString += `
     public bindingPath = '${variable.bindTo}';`;
         }
         if (variable.component && variable.component.id) {
-            generateString += `
+            generateString += `
     public id = '${variable.component.id}';`;
         }
-        generateString += `
-
-    constructor(injector: Injector){
-        super(injector, "${variable.component && variable.component.id ? variable.component.id : ''}");
-    }
+        generateString += `
+
+    constructor(injector: Injector){
+        super(injector, "${variable.component && variable.component.id ? variable.component.id : ''}");
+    }
 `;
         if (toolhepler_1.ToolHelper.isArray(variable.commands, false)) {
             variable.commands.forEach((command) => {
-                generateString += `
-    @CommandMethodMeta({
+                generateString += `
+    @CommandMethodMeta({
         name: '${command.code}'`;
                 generateString += ",";
-                generateString += `
+                generateString += `
         params: {`;
                 if (toolhepler_1.ToolHelper.isArray(command.params, false)) {
                     command.params.forEach((param, index) => {
-                        generateString += `
+                        generateString += `
             ${param.name}: '${param.value}'`;
                         if (index < (command.params.length - 1)) {
                             generateString += `,`;
                         }
                     });
                 }
-                generateString += `
+                generateString += `
         }`;
                 if (toolhepler_1.ToolHelper.isArray(command.paramDescriptions, false)) {
                     generateString += ",";
-                    generateString += `
+                    generateString += `
         paramDescriptions: {`;
                     command.paramDescriptions.forEach((paramDesc, index) => {
-                        generateString += `
+                        generateString += `
             ${paramDesc.name}: { type: '${paramDesc.type ? paramDesc.type : ""}' }`;
                         if (index < (command.paramDescriptions.length - 1)) {
                             generateString += ",";
                         }
                     });
-                    generateString += `
+                    generateString += `
         }`;
                 }
                 if (command.shortcut) {
-                    generateString += `
-                    |  ,
-                    |  keyBinding:{
-                    |  ctrlKey:${command.shortcut.ctrl},
-                    |  altKey:${command.shortcut.alt},
-                    |  shiftKey:${command.shortcut.shift},
-                    |  key:'${command.shortcut.key}'
-                    }
+                    generateString += `
+                    |  ,
+                    |  keyBinding:{
+                    |  ctrlKey:${command.shortcut.ctrl},
+                    |  altKey:${command.shortcut.alt},
+                    |  shiftKey:${command.shortcut.shift},
+                    |  key:'${command.shortcut.key}'
+                    }
                     `;
                 }
-                generateString += `
+                generateString += `
     })`;
-                generateString += `
+                generateString += `
     public ${command.code}(commandParam?: any): Observable<any> { return; }`;
                 generateString += this.getEol();
             });
         }
-        generateString += `
+        generateString += `
 }`;
         this.createFile(context.basePath, context.fileName, generateString);
         return response;

package/lib/mobileapp/vue/code-generator/file-generator/project-generator/babel-config-js-generator.js

@@ -6,12 +6,12 @@ const abstract_file_generator_1 = require("../abstract-file-generator");
 class BabelConfigJsGenerator extends abstract_file_generator_1.AbstractFileGenerator {
     generate(context) {
         const response = file_generator_response_1.FileGeneratorResponse.getNewEmptyInstance();
-        const initContent = `
-module.exports = {
-    presets: [
-        '@vue/cli-plugin-babel/preset'
-    ]
-}
+        const initContent = `
+module.exports = {
+    presets: [
+        '@vue/cli-plugin-babel/preset'
+    ]
+}
 `;
         this.createFile(context.basePath, context.fileName, initContent);
         return response;