@farris/jit-engine 1.4.2 → 1.4.3

package/README.md

@@ -1,3 +1,7 @@
+1.4.3
+
+    移动端附件组件支持自定义标题模板
+    
 1.4.2
 
     运行时定制支持资源项

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

@@ -7,14 +7,14 @@ class VueAppFilterGenerator extends abstract_file_generator_1.AbstractFileGenera
     generate(context) {
         let generateString = "";
         generateString +=
-            `
-// Vue.filter("lang", function(value, langCode, defaultValue) {
-//     const translatedValue = lang["zh-CHS"][value];
-//     if (!translatedValue && translatedValue != "") {
-//         return defaultValue;
-//     }
-//     return translatedValue;
-// });
+            `
+// Vue.filter("lang", function(value, langCode, defaultValue) {
+//     const translatedValue = lang["zh-CHS"][value];
+//     if (!translatedValue && translatedValue != "") {
+//         return defaultValue;
+//     }
+//     return translatedValue;
+// });
 `;
         const response = file_generator_response_1.FileGeneratorResponse.getNewEmptyInstance();
         response.fileContent = generateString;

package/lib/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-index-resource-generator.js

@@ -9,8 +9,8 @@ class VueAppIndexResourceGenerator extends abstract_file_generator_1.AbstractFil
         const response = file_generator_response_1.FileGeneratorResponse.getNewEmptyInstance();
         let generateString = "";
         generateString +=
-            `
-const lang = { "zh-CHS": ${JSON.stringify(ctrlLangs.config["zh-CHS"])}};
+            `
+const lang = { "zh-CHS": ${JSON.stringify(ctrlLangs.config["zh-CHS"])}};
 `;
         response.fileContent = generateString;
         return response;

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

@@ -1,94 +1,94 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.VueAppIndexVueGenerator = void 0;
-const abstract_file_generator_1 = require("../abstract-file-generator");
-const file_generator_response_1 = require("../file-generator-response");
-class VueAppIndexVueGenerator extends abstract_file_generator_1.AbstractFileGenerator {
-    generate(context) {
-        const response = file_generator_response_1.FileGeneratorResponse.getNewEmptyInstance();
-        const appIndexVueParameter = context.externalParameter;
-        const { formCode, metaDataConfig, imports, extraImportsString, resourceString, keepAlive, hasExpressions, controlStateExtend, enableI18n } = appIndexVueParameter;
-        const { serviceUnitPath, projectName, isRuntime, runTimeDimPath } = metaDataConfig;
-        const _imports = imports.map((item) => `${item.name}:${item.name},`);
-        const generateFormPathValueString = hasExpressions && serviceUnitPath
-            ? `/${serviceUnitPath.replace(/\\/g, '/')}/mob/${projectName}${isRuntime && runTimeDimPath ? runTimeDimPath.replace(/\\/g, '/').toLowerCase() : ''}/${formCode}/`
-            : '';
-        let className;
-        if (controlStateExtend && controlStateExtend.enable) {
-            if (controlStateExtend.interceptor) {
-                const interceptor = controlStateExtend.interceptor;
-                const classExp = /(?<=class\s*)(\w+)(?=\s*)/g;
-                const classNameList = interceptor.match(classExp);
-                if (classNameList && classNameList.length > 0) {
-                    className = classNameList[0];
-                }
-            }
-        }
-        const path = "./services/" + formCode + "_state_interceptor";
-        let langPath = '';
-        if (enableI18n) {
-            langPath = `'/${serviceUnitPath.replace(/\\/g, '/')}/mob/${projectName}${isRuntime && runTimeDimPath ? runTimeDimPath.replace(/\\/g, '/').toLowerCase() : ''}/${formCode}/i18n/'`;
-        }
-        let generateString = '';
-        generateString += `
-<template>
-  <router-view v-slot="{ Component }">
-    ${keepAlive
-            ? '<keep-alive><component :is="Component" /></keep-alive>'
-            : '<component :is="Component" />'}
-  </router-view>
-</template>
-
-<script>
-import { AppOptions, FORM_PATH_TOKEN, VALIDATION_RULE_TOKEN, CONTROL_STATE_INTERCEPTOR_TOKEN, TranslateService} from '@farris/mobile-devkit';
-import { FrameworkSessionService } from '@farris/mobile-bef';
-import { COMMAND_SERVICES_APP_PROVIDERS, ROUTER_INSTANCE_TOKEN,LangService} from '@farris/mobile-command-services';
-import { DevkitPlugin,beforeRouteEnterByVueAdapter,initdataOptions } from '@farris/mobile-vue-adapter';
-import { ModelProviders } from './models/model.provider';
-import { validationRule } from './validation';
-${extraImportsString}
-${resourceString}
-${className ? `import { ${className} } from '${path}'` : ''}
-
-const dataOptions  = { 
-  ${enableI18n ? `langPath:${langPath}` : ''}
-}
-initdataOptions(dataOptions);
-
-export default{
-    name: '${formCode}',
-    components:{${_imports}},
-    data() {
-      return {
-        transitionName: '',
-      };
-    },
-    beforeRouteEnter(to, from, next) {
-      beforeRouteEnterByVueAdapter(to, from, next,dataOptions);
-
-    },
-    beforeCreate(){
-      const appOptions = {
-        id: '${formCode}',
-        providers: [
-          ...ModelProviders,
-          ${enableI18n ? `{ provide: TranslateService, useValue: dataOptions.translateService },` : ''}
-          { provide: FrameworkSessionService, useClass: FrameworkSessionService, deps: []},
-          { provide: ROUTER_INSTANCE_TOKEN, useValue: this.$router },
-          ${generateFormPathValueString ? `{ provide: FORM_PATH_TOKEN, useValue:'${generateFormPathValueString}'},` : ''}
-          { provide: VALIDATION_RULE_TOKEN, useValue: validationRule},
-          ...COMMAND_SERVICES_APP_PROVIDERS,
-          ${className ? `{ provide: CONTROL_STATE_INTERCEPTOR_TOKEN, useClass: ${className}, deps: [] ,multi: true },` : ''}
-        ]
-      };
-      this.$createApp(appOptions);
-    }
-};
-</script>
-`;
-        this.createFile(context.basePath, context.fileName, generateString);
-        return response;
-    }
-}
-exports.VueAppIndexVueGenerator = VueAppIndexVueGenerator;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VueAppIndexVueGenerator = void 0;
+const abstract_file_generator_1 = require("../abstract-file-generator");
+const file_generator_response_1 = require("../file-generator-response");
+class VueAppIndexVueGenerator extends abstract_file_generator_1.AbstractFileGenerator {
+    generate(context) {
+        const response = file_generator_response_1.FileGeneratorResponse.getNewEmptyInstance();
+        const appIndexVueParameter = context.externalParameter;
+        const { formCode, metaDataConfig, imports, extraImportsString, resourceString, keepAlive, hasExpressions, controlStateExtend, enableI18n } = appIndexVueParameter;
+        const { serviceUnitPath, projectName, isRuntime, runTimeDimPath } = metaDataConfig;
+        const _imports = imports.map((item) => `${item.name}:${item.name},`);
+        const generateFormPathValueString = hasExpressions && serviceUnitPath
+            ? `/${serviceUnitPath.replace(/\\/g, '/')}/mob/${projectName}${isRuntime && runTimeDimPath ? runTimeDimPath.replace(/\\/g, '/').toLowerCase() : ''}/${formCode}/`
+            : '';
+        let className;
+        if (controlStateExtend && controlStateExtend.enable) {
+            if (controlStateExtend.interceptor) {
+                const interceptor = controlStateExtend.interceptor;
+                const classExp = /(?<=class\s*)(\w+)(?=\s*)/g;
+                const classNameList = interceptor.match(classExp);
+                if (classNameList && classNameList.length > 0) {
+                    className = classNameList[0];
+                }
+            }
+        }
+        const path = "./services/" + formCode + "_state_interceptor";
+        let langPath = '';
+        if (enableI18n) {
+            langPath = `'/${serviceUnitPath.replace(/\\/g, '/')}/mob/${projectName}${isRuntime && runTimeDimPath ? runTimeDimPath.replace(/\\/g, '/').toLowerCase() : ''}/${formCode}/i18n/'`;
+        }
+        let generateString = '';
+        generateString += `
+<template>
+  <router-view v-slot="{ Component }">
+    ${keepAlive
+            ? '<keep-alive><component :is="Component" /></keep-alive>'
+            : '<component :is="Component" />'}
+  </router-view>
+</template>
+
+<script>
+import { AppOptions, FORM_PATH_TOKEN, VALIDATION_RULE_TOKEN, CONTROL_STATE_INTERCEPTOR_TOKEN, TranslateService} from '@farris/mobile-devkit';
+import { FrameworkSessionService } from '@farris/mobile-bef';
+import { COMMAND_SERVICES_APP_PROVIDERS, ROUTER_INSTANCE_TOKEN,LangService} from '@farris/mobile-command-services';
+import { DevkitPlugin,beforeRouteEnterByVueAdapter,initdataOptions } from '@farris/mobile-vue-adapter';
+import { ModelProviders } from './models/model.provider';
+import { validationRule } from './validation';
+${extraImportsString}
+${resourceString}
+${className ? `import { ${className} } from '${path}'` : ''}
+
+const dataOptions  = { 
+  ${enableI18n ? `langPath:${langPath}` : ''}
+}
+initdataOptions(dataOptions);
+
+export default{
+    name: '${formCode}',
+    components:{${_imports}},
+    data() {
+      return {
+        transitionName: '',
+      };
+    },
+    beforeRouteEnter(to, from, next) {
+      beforeRouteEnterByVueAdapter(to, from, next,dataOptions);
+
+    },
+    beforeCreate(){
+      const appOptions = {
+        id: '${formCode}',
+        providers: [
+          ...ModelProviders,
+          ${enableI18n ? `{ provide: TranslateService, useValue: dataOptions.translateService },` : ''}
+          { provide: FrameworkSessionService, useClass: FrameworkSessionService, deps: []},
+          { provide: ROUTER_INSTANCE_TOKEN, useValue: this.$router },
+          ${generateFormPathValueString ? `{ provide: FORM_PATH_TOKEN, useValue:'${generateFormPathValueString}'},` : ''}
+          { provide: VALIDATION_RULE_TOKEN, useValue: validationRule},
+          ...COMMAND_SERVICES_APP_PROVIDERS,
+          ${className ? `{ provide: CONTROL_STATE_INTERCEPTOR_TOKEN, useClass: ${className}, deps: [] ,multi: true },` : ''}
+        ]
+      };
+      this.$createApp(appOptions);
+    }
+};
+</script>
+`;
+        this.createFile(context.basePath, context.fileName, generateString);
+        return response;
+    }
+}
+exports.VueAppIndexVueGenerator = VueAppIndexVueGenerator;
 //# sourceMappingURL=vue-app-index-vue-generator.js.map

package/lib/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-model-provider-generator.js

@@ -8,27 +8,27 @@ class VueAppModelProviderGenerator extends abstract_file_generator_1.AbstractFil
         const response = file_generator_response_1.FileGeneratorResponse.getNewEmptyInstance();
         const vueRepository = context.externalParameter.value;
         let generateString = "";
-        generateString += `
+        generateString += `
 import { Injector, StaticProvider, HttpClient  } from '@farris/mobile-devkit';`;
         if (vueRepository.includeProxyReference) {
-            generateString += `
+            generateString += `
 import { ${vueRepository.originalEntity}Proxy } from './model.proxy';`;
         }
-        generateString += `
+        generateString += `
 import { ModelRepository } from "./model.repository";`;
-        generateString += `
-
+        generateString += `
+
 const ModelProviders: StaticProvider[] = [`;
         if (vueRepository.includeProxyReference) {
-            generateString += `
+            generateString += `
         { provide: ${vueRepository.originalEntity}Proxy, useClass: ${vueRepository.originalEntity}Proxy, deps: [HttpClient] },`;
         }
-        generateString += `
+        generateString += `
         { provide: ModelRepository, useClass: ModelRepository, deps: [Injector] }`;
         generateString +=
-            `
+            `
 ]`;
-        generateString += `
+        generateString += `
 export { ModelProviders };`;
         this.createFile(context.basePath, context.fileName, generateString);
         return response;

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;