@farris/jit-engine 1.3.283 → 1.3.285

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,13 @@ 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/>
+</template>
+
+<style>
+</style>
 `;
         this.createFile(context.basePath, context.fileName, initContent);
         return result;

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;

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

@@ -43,9 +43,7 @@ const router = createRouter({
     routes:asyncRoutes,
 })
 
-BeforeEachOfRouter && router.beforeEach((to, from ,next)=>{
-    BeforeEachOfRouter(to, from ,next,{asyncRoutes})
-})
+BeforeEachOfRouter && router.beforeEach(BeforeEachOfRouter)
 
 export default router
 `;

package/lib/mobileapp/vue/code-generator/file-generator/project-generator/shims-tsx-d-ts-generator.js

@@ -5,21 +5,21 @@ const abstract_file_generator_1 = require("../abstract-file-generator");
 class ShimxTsxDTsGenerator extends abstract_file_generator_1.AbstractFileGenerator {
     generate(context) {
         const response = this.getDefaultFileGeneratorResponse();
-        const initJson = `
-import Vue, { VNode } from 'vue'
-
-declare global {
-  namespace JSX {
-    // tslint:disable no-empty-interface
-    interface Element extends VNode {}
-    // tslint:disable no-empty-interface
-    interface ElementClass extends Vue {}
-    interface IntrinsicElements {
-      [elem: string]: any;
-    }
-  }
-}
-
+        const initJson = `
+import Vue, { VNode } from 'vue'
+
+declare global {
+  namespace JSX {
+    // tslint:disable no-empty-interface
+    interface Element extends VNode {}
+    // tslint:disable no-empty-interface
+    interface ElementClass extends Vue {}
+    interface IntrinsicElements {
+      [elem: string]: any;
+    }
+  }
+}
+
 `;
         this.createFile(context.basePath, context.fileName, initJson);
         return response;

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

@@ -5,37 +5,37 @@ const abstract_file_generator_1 = require("../abstract-file-generator");
 class ShimxVueDTsGenerator extends abstract_file_generator_1.AbstractFileGenerator {
     generate(context) {
         const response = this.getDefaultFileGeneratorResponse();
-        const initJson = `
-import Vue from 'vue';
-import { App, AppOptions, ViewModel, ViewModelOptions } from '@farris/mobile-devkit';
-
-declare module '*.vue' {
-  export default Vue
-}
-
-declare module 'vue/types/vue' {
-
-  interface Vue {
-
-    $app: App;
-
-    $viewModel: ViewModel;
-
-    $createApp(options: AppOptions): void;
-
-    $getApp(): App;
-
-    $createViewModel(options: ViewModelOptions): void;
-
-    $getViewModel(): ViewModel;
-
-    [key: string]:any;
-
-  }
-
-}
-
-
+        const initJson = `
+import Vue from 'vue';
+import { App, AppOptions, ViewModel, ViewModelOptions } from '@farris/mobile-devkit';
+
+declare module '*.vue' {
+  export default Vue
+}
+
+declare module 'vue/types/vue' {
+
+  interface Vue {
+
+    $app: App;
+
+    $viewModel: ViewModel;
+
+    $createApp(options: AppOptions): void;
+
+    $getApp(): App;
+
+    $createViewModel(options: ViewModelOptions): void;
+
+    $getViewModel(): ViewModel;
+
+    [key: string]:any;
+
+  }
+
+}
+
+
 `;
         this.createFile(context.basePath, context.fileName, initJson);
         return response;

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

@@ -6,44 +6,44 @@ const abstract_file_generator_1 = require("../abstract-file-generator");
 class TsConfigJsonGenerator extends abstract_file_generator_1.AbstractFileGenerator {
     generate(context) {
         const response = file_generator_response_1.FileGeneratorResponse.getNewEmptyInstance();
-        const initTsConfigJson = `{
-    "compilerOptions": {
-        "target": "esnext",
-        "module": "esnext",
-        "strict": false,
-        "jsx": "preserve",
-        "importHelpers": true,
-        "moduleResolution": "node",
-        "esModuleInterop": true,
-        "allowSyntheticDefaultImports": true,
-        "experimentalDecorators": true,
-        "sourceMap": true,
-        "baseUrl": ".",
-        "types": [
-            "webpack-env"
-        ],
-        "paths": {
-            "@/*": [
-                "src/*"
-            ]
-        },
-        "lib": [
-            "esnext",
-            "dom",
-            "dom.iterable",
-            "scripthost"
-        ]
-    },
-    "include": [
-        "src/**/*.ts",
-        "src/**/*.tsx",
-        "src/**/*.vue",
-        "tests/**/*.ts",
-        "tests/**/*.tsx"
-    ],
-    "exclude": [
-        "node_modules"
-    ]
+        const initTsConfigJson = `{
+    "compilerOptions": {
+        "target": "esnext",
+        "module": "esnext",
+        "strict": false,
+        "jsx": "preserve",
+        "importHelpers": true,
+        "moduleResolution": "node",
+        "esModuleInterop": true,
+        "allowSyntheticDefaultImports": true,
+        "experimentalDecorators": true,
+        "sourceMap": true,
+        "baseUrl": ".",
+        "types": [
+            "webpack-env"
+        ],
+        "paths": {
+            "@/*": [
+                "src/*"
+            ]
+        },
+        "lib": [
+            "esnext",
+            "dom",
+            "dom.iterable",
+            "scripthost"
+        ]
+    },
+    "include": [
+        "src/**/*.ts",
+        "src/**/*.tsx",
+        "src/**/*.vue",
+        "tests/**/*.ts",
+        "tests/**/*.tsx"
+    ],
+    "exclude": [
+        "node_modules"
+    ]
 }`;
         this.createFile(context.basePath, context.fileName, initTsConfigJson);
         return response;

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

@@ -6,26 +6,26 @@ const abstract_file_generator_1 = require("../abstract-file-generator");
 class VueConfigJsGenerator extends abstract_file_generator_1.AbstractFileGenerator {
     generate(context) {
         const response = file_generator_response_1.FileGeneratorResponse.getNewEmptyInstance();
-        const initTsConfigJson = `
-module.exports = {
-    publicPath: './',
-    outputDir: 'dist-rollup/${context.metaDataConfig.projectName.toLowerCase()}',
-    assetsDir: 'static',
-    indexPath: "index.html",
-    runtimeCompiler: false,
-    productionSourceMap: false,
-    configureWebpack: {
-        devtool: 'source-map'
-    }
-    /**
-     * 打包检测打包内容
-     */
-    // chainWebpack: config => {
-    //     config
-    //         .plugin('webpack-bundle-analyzer')
-    //         .use(require('webpack-bundle-analyzer').BundleAnalyzerPlugin)
-    // }
-}
+        const initTsConfigJson = `
+module.exports = {
+    publicPath: './',
+    outputDir: 'dist-rollup/${context.metaDataConfig.projectName.toLowerCase()}',
+    assetsDir: 'static',
+    indexPath: "index.html",
+    runtimeCompiler: false,
+    productionSourceMap: false,
+    configureWebpack: {
+        devtool: 'source-map'
+    }
+    /**
+     * 打包检测打包内容
+     */
+    // chainWebpack: config => {
+    //     config
+    //         .plugin('webpack-bundle-analyzer')
+    //         .use(require('webpack-bundle-analyzer').BundleAnalyzerPlugin)
+    // }
+}
 `;
         this.createFile(context.basePath, context.fileName, initTsConfigJson);
         return response;

package/lib/mobileapp/vue/domstructure/devkit/befproxy/vue-bef-proxy-content.js

@@ -15,17 +15,17 @@ class VueBefProxyContent {
         if (!obj) {
             return;
         }
-        const keys = `
-        Id,
-        Code,
-        Name,
-        Version,
-        Description,
-        BizObject,
-        CriticalApplication,
-        ServiceUnit,
-        RouteUrl,
-        Service
+        const keys = `
+        Id,
+        Code,
+        Name,
+        Version,
+        Description,
+        BizObject,
+        CriticalApplication,
+        ServiceUnit,
+        RouteUrl,
+        Service
         `;
         Object.keys(obj).forEach(key => {
             if (keys.includes(key)) {