@farris/jit-engine 1.3.311 → 1.3.313

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/app-vue-generator.js

@@ -6,13 +6,39 @@ const abstract_file_generator_1 = require("../abstract-file-generator");
 class AppVueGenerator extends abstract_file_generator_1.AbstractFileGenerator {
     generate(context) {
         const result = file_generator_response_1.FileGeneratorResponse.getNewEmptyInstance();
-        const initContent = `
-<template>
-    <router-view/>
-</template>
-
-<style>
-</style>
+        const initContent = `
+
+<template>
+    <router-view v-slot="{ Component }">
+        <transition :name="transitionName">
+            <component :is="Component" />
+        </transition>
+    </router-view>
+</template>
+
+<script>
+export default{
+    data() {
+        return {
+        transitionName: '',
+        };
+    },
+    watch: {
+        $route(to, from) {
+        if (to.query.FmRouterType === 'back') {
+            this.transitionName = 'fm-slide-out';
+        } else if (to.query.routeType === 'Forward') {
+            this.transitionName = 'fm-slide-in';
+        } else {
+            this.transitionName = '';
+        }
+        },
+    }
+};
+</script>
+
+<style>
+</style>
 `;
         this.createFile(context.basePath, context.fileName, initContent);
         return result;

package/lib/mobileapp/vue/code-generator/file-generator/project-generator/app-vue-generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-vue-generator.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/code-generator/file-generator/project-generator/app-vue-generator.ts"],"names":[],"mappings":";;;AAEA,wEAAmE;AAEnE,wEAAmE;AAUnE,MAAa,eAAgB,SAAQ,+CAAqB;IAStD,QAAQ,CAAC,OAA6B;QAClC,MAAM,MAAM,GAA0B,+CAAqB,CAAC,mBAAmB,EAAE,CAAC;QAClF,MAAM,WAAW,GACb;;;;;;;CAOX,CAAC;QAEM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QACjE,OAAO,MAAM,CAAC;IAClB,CAAC;CAEJ;AAzBD,0CAyBC"}
+{"version":3,"file":"app-vue-generator.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/code-generator/file-generator/project-generator/app-vue-generator.ts"],"names":[],"mappings":";;;AAEA,wEAAmE;AAEnE,wEAAmE;AAUnE,MAAa,eAAgB,SAAQ,+CAAqB;IAStD,QAAQ,CAAC,OAA6B;QAClC,MAAM,MAAM,GAA0B,+CAAqB,CAAC,mBAAmB,EAAE,CAAC;QAClF,MAAM,WAAW,GACb;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiCX,CAAC;QAEM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QACjE,OAAO,MAAM,CAAC;IAClB,CAAC;CAEJ;AAnDD,0CAmDC"}

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;

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

@@ -6,29 +6,29 @@ const abstract_file_generator_1 = require("../abstract-file-generator");
 class GitIgnoreGenerator extends abstract_file_generator_1.AbstractFileGenerator {
     generate(context) {
         const response = file_generator_response_1.FileGeneratorResponse.getNewEmptyInstance();
-        const initContent = `
-.DS_Store
-node_modules
-/dist
-
-# local env files
-.env.local
-.env.*.local
-
-# Log files
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-
-# Editor directories and files
-.idea
-.vscode
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?
+        const initContent = `
+.DS_Store
+node_modules
+/dist
+
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
 `;
         this.createFile(context.basePath, context.fileName, initContent);
         return response;

package/lib/mobileapp/vue/code-generator/file-generator/project-generator/main-ts-generator.js

@@ -6,17 +6,17 @@ const abstract_file_generator_1 = require("../abstract-file-generator");
 class MainTsGenerator extends abstract_file_generator_1.AbstractFileGenerator {
     generate(context) {
         const response = file_generator_response_1.FileGeneratorResponse.getNewEmptyInstance();
-        const initContent = `
-import Vue from 'vue';
-import App from './app.vue';
-import router from './router';
-
-Vue.config.productionTip = false;
-
-new Vue({
-    router,
-    render: h => h(App)
-}).$mount('#app');
+        const initContent = `
+import Vue from 'vue';
+import App from './app.vue';
+import router from './router';
+
+Vue.config.productionTip = false;
+
+new Vue({
+    router,
+    render: h => h(App)
+}).$mount('#app');
 `;
         this.createFile(context.basePath, context.fileName, initContent);
         return response;

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

@@ -9,53 +9,53 @@ class PackageJsonGenerator extends abstract_file_generator_1.AbstractFileGenerat
         const response = file_generator_response_1.FileGeneratorResponse.getNewEmptyInstance();
         const project = context.pageFlowEntity.project;
         const isRuntime = (_a = context.metaDataConfig) === null || _a === void 0 ? void 0 : _a.isRuntime;
-        const initJson = `
-{
-    "name": "${project.name ? project.name.toLowerCase() : "farris-mobile-vue-project"}",
-    "description": "A Vue.js project",
-    "version": "1.0.0",
-    "author": "tsing",
-    "license": "MIT",
-    "private": true,
-    "scripts": {
-        "build": "cross-env NODE_ENV=production ${isRuntime ? 'RUNTIME=true ' : ''}fm -b project",
-        "dev": "cross-env NODE_ENV=development ${isRuntime ? 'RUNTIME=true ' : ''}fm -b project"
-    },
-    "dependencies": {
-        "@farris/mobile-bef": "latest",
-        "@farris/mobile-business-ui": "latest",
-        "@farris/mobile-command-services": "latest",
-        "@farris/mobile-devkit": "latest",
-        "@farris/mobile-ui": "latest",
-        "@farris/mobile-vue-adapter": "latest",
-        "@vue/compiler-core": "3.0.5",
-        "axios": "0.21.1",
-        "date-fns": "2.16.1",
-        "dayjs": "1.10.3",
-        "reflect-metadata": "0.1.13",
-        "rxjs": "6.6.3",
-        "vant": "3.0.3",
-        "vue": "3.0.5",
-        "vue-router": "4.0.3"
-    },
-    "devDependencies": {
-        "@babel/core": "^7.12.9",
-        "@babel/preset-env": "^7.12.7",
-        "@babel/preset-typescript": "^7.12.7",
-        "@farris/mobile-cli": "latest",
-        "@typescript-eslint/eslint-plugin": "^4.9.1",
-        "@typescript-eslint/parser": "^4.9.1",
-        "cross-env": "^7.0.3",
-        "eslint": "^7.15.0",
-        "typescript": "^4.1.2"
-    },
-    "linkedNodeModules":"",
-    "browserslist": [
-        "> 1%",
-        "last 2 versions",
-        "not ie <= 8"
-    ]
-}
+        const initJson = `
+{
+    "name": "${project.name ? project.name.toLowerCase() : "farris-mobile-vue-project"}",
+    "description": "A Vue.js project",
+    "version": "1.0.0",
+    "author": "tsing",
+    "license": "MIT",
+    "private": true,
+    "scripts": {
+        "build": "cross-env NODE_ENV=production ${isRuntime ? 'RUNTIME=true ' : ''}fm -b project",
+        "dev": "cross-env NODE_ENV=development ${isRuntime ? 'RUNTIME=true ' : ''}fm -b project"
+    },
+    "dependencies": {
+        "@farris/mobile-bef": "latest",
+        "@farris/mobile-business-ui": "latest",
+        "@farris/mobile-command-services": "latest",
+        "@farris/mobile-devkit": "latest",
+        "@farris/mobile-ui": "latest",
+        "@farris/mobile-vue-adapter": "latest",
+        "@vue/compiler-core": "3.0.5",
+        "axios": "0.21.1",
+        "date-fns": "2.16.1",
+        "dayjs": "1.10.3",
+        "reflect-metadata": "0.1.13",
+        "rxjs": "6.6.3",
+        "vant": "3.0.3",
+        "vue": "3.0.5",
+        "vue-router": "4.0.3"
+    },
+    "devDependencies": {
+        "@babel/core": "^7.12.9",
+        "@babel/preset-env": "^7.12.7",
+        "@babel/preset-typescript": "^7.12.7",
+        "@farris/mobile-cli": "latest",
+        "@typescript-eslint/eslint-plugin": "^4.9.1",
+        "@typescript-eslint/parser": "^4.9.1",
+        "cross-env": "^7.0.3",
+        "eslint": "^7.15.0",
+        "typescript": "^4.1.2"
+    },
+    "linkedNodeModules":"",
+    "browserslist": [
+        "> 1%",
+        "last 2 versions",
+        "not ie <= 8"
+    ]
+}
 `;
         this.createFile(context.basePath, context.fileName, initJson);
         return response;

package/lib/mobileapp/vue/code-generator/file-generator/project-generator/readme-md-generator.js

@@ -5,26 +5,26 @@ const abstract_file_generator_1 = require("../abstract-file-generator");
 class ReadMeMdGenerator extends abstract_file_generator_1.AbstractFileGenerator {
     generate(context) {
         const response = this.getDefaultFileGeneratorResponse();
-        const initJson = `
-# farris-mobile-vue-demos
-
-## Project setup
-\`\`\`
-npm install
-\`\`\`
-
-### Compiles and hot-reloads for development
-\`\`\`
-npm run serve
-\`\`\`
-
-### Compiles and minifies for production
-\`\`\`
-npm run build
-\`\`\`
-
-### Customize configuration
-See [Configuration Reference](https://cli.vuejs.org/config/).
+        const initJson = `
+# farris-mobile-vue-demos
+
+## Project setup
+\`\`\`
+npm install
+\`\`\`
+
+### Compiles and hot-reloads for development
+\`\`\`
+npm run serve
+\`\`\`
+
+### Compiles and minifies for production
+\`\`\`
+npm run build
+\`\`\`
+
+### Customize configuration
+See [Configuration Reference](https://cli.vuejs.org/config/).
 `;
         this.createFile(context.basePath, context.fileName, initJson);
         return response;