@farris/jit-engine 1.3.322 → 1.3.324

package/lib/utility/template-generator/devkit/lang-template-generator.js

@@ -1,149 +1,157 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LangTemplateGenerator = void 0;
-const abstract_template_generator_1 = require("../abstract-template-generator");
-const jit_constant_1 = require("../../jit-constant");
-const toolhepler_1 = require("../../toolhepler");
-class LangTemplateGenerator extends abstract_template_generator_1.AbstractTemplateGenerator {
-    generate(generateParams) {
-        const variable = generateParams.devkit;
-        const projectName = generateParams.metaDataConfig.projectName;
-        const useDefaultValueWithI18n = generateParams.metaDataConfig.useDefaultValueWithI18n;
-        const moduleCode = generateParams.frm_code;
-        const serviceUnitPath = generateParams.metaDataConfig.serviceUnitPath ? generateParams.metaDataConfig.serviceUnitPath : "";
-        const isGroupForm = variable.isGroupForm;
-        const externalPrefix = this.convertNullToEmpty(variable.externalPrefix);
-        let generateString = "";
-        generateString += `
-import { Pipe, PipeTransform, Injectable } from '@angular/core';
-import { TranslateService } from '@ngx-translate/core';
-import { TranslateHttpLoader } from '@ngx-translate/http-loader';
-import { Resolve, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
-import { Observable, of } from 'rxjs';
-import { catchError, switchMap } from "rxjs/operators";
-import { HttpClient } from '@angular/common/http';
-import { DomSanitizer} from '@angular/platform-browser';
-import { BasePathService } from '@farris/rtf';`;
-        if (isGroupForm == false) {
-            generateString += `
-export function createTranslateLoader(http: HttpClient,version:string) {
-  let versionSuffix = "";
-  if (version) {
-    versionSuffix = "?v=" + version;
-  }
-  return new TranslateHttpLoader(http, BasePathService.convertPath('/${toolhepler_1.ToolHelper.replaceFanXieXianToXieXian(serviceUnitPath.toLowerCase())}/web/${projectName.toLowerCase()}/${moduleCode.toLowerCase()}/i18n/'), '.json'+ versionSuffix);
-}
-`;
-        }
-        generateString += `
-export let lang = ${JSON.stringify(variable.config)};
-
-@Pipe({ name: 'lang' })
-export class ${externalPrefix}LangPipe implements PipeTransform {
-  constructor(private translate: TranslateService, private http: HttpClient) { }
-  transform(key: string, langCode: string, defaultValue?: string) {
-      ${this.generateTranslateTs(generateParams)}
-  }
-}`;
-        generateString += `
-@Pipe({ name: 'safeHtml' })
-export class ${externalPrefix}SafeHtmlPipe implements PipeTransform {
-  constructor(private sanitizer: DomSanitizer) { }
-  transform(url) {
-    if (!url) {
-      url = "";
-    }
-    return this.sanitizer.bypassSecurityTrustResourceUrl(url);
-  }
-}`;
-        generateString += `
-@Injectable()
-export class ${externalPrefix}LangService {
-  constructor(private translate: TranslateService) { }
-  transform(key: string, langCode: string, defaultValue?: string) {
-    ${this.generateTranslateTs(generateParams)}
-  }
-
-  getCurrentLanguage() {
-    return this.translate.currentLang;
-  }
-
-}
-
-@Injectable()
-export class ${externalPrefix}TranslateResolveService implements Resolve<any>{
-
-  constructor(private translate: TranslateService, private http: HttpClient) {
-    translate.defaultLang = 'zh-CHS';
-    translate.setTranslation('zh-CHS', lang['zh-CHS']);
-  }
-
-  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<any> {
-    let langCode = localStorage.getItem('languageCode');
-    if (!langCode) {
-      langCode = "zh-CHS";
-    }`;
-        if (isGroupForm == false) {
-            generateString += `
-    if (langCode == "zh-CHS" || (this.translate.defaultLang === langCode && this.translate.currentLoader == createTranslateLoader(this.http,null))) {`;
-        }
-        else {
-            generateString += `
-    if (this.translate.defaultLang === langCode) {`;
-        }
-        generateString += `
-      this.translate.setTranslation('zh-CHS', lang['zh-CHS']);
-      return of(this.translate[langCode]);
-    } else {
-      const httpOb = this.http.get(BasePathService.getBasePath() + "/${toolhepler_1.ToolHelper.replaceFanXieXianToXieXian(serviceUnitPath.toLowerCase())}/web/${projectName.toLowerCase()}/version.json?v=" + new Date().getTime()).pipe(switchMap((data)=>{
-        let currentVersion = null;
-        if (data instanceof Array) {
-          const versionKey = "${moduleCode.toLowerCase()}/" + langCode + ".json";
-          data.forEach((item) => {
-            if (item.category == "i18n" && item.key == versionKey) {
-              currentVersion = item.value;
-            }
-          });
-        }
-
-        this.translate.defaultLang = langCode;
-        this.translate.currentLang = langCode;`;
-        if (isGroupForm == false) {
-            generateString += `
-        this.translate.currentLoader = createTranslateLoader(this.http, currentVersion);
-`;
-        }
-        generateString += `
-    let tran = this.translate.getTranslation(langCode).pipe(catchError(err => {
-      console.error("read resource file failed,please check!!! "+ err);
-      return of(err);
-    }));
-    return tran;
-      }));
-      return httpOb;
-    }
-  }
-}
-`;
-        return generateString;
-    }
-    generateTranslateTs(generateParams) {
-        let generateString = `
-    const translateValue = this.translate.instant(key);`;
-        if (generateParams.metaDataConfig.useDefaultValueWithI18n) {
-            generateString += `
-    if (translateValue == "${jit_constant_1.JITConstant.I18nDefaultValue}") {
-      return defaultValue ? defaultValue : "";
-    }
-`;
-        }
-        generateString += `
-    return translateValue;`;
-        return generateString;
-    }
-    generateFormVersionKey(formCode) {
-        return `form_${formCode.toLowerCase()}`;
-    }
-}
-exports.LangTemplateGenerator = LangTemplateGenerator;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LangTemplateGenerator = void 0;
+const abstract_template_generator_1 = require("../abstract-template-generator");
+const jit_constant_1 = require("../../jit-constant");
+const toolhepler_1 = require("../../toolhepler");
+class LangTemplateGenerator extends abstract_template_generator_1.AbstractTemplateGenerator {
+    generate(generateParams) {
+        const variable = generateParams.devkit;
+        const projectName = generateParams.metaDataConfig.projectName;
+        const useDefaultValueWithI18n = generateParams.metaDataConfig.useDefaultValueWithI18n;
+        const moduleCode = generateParams.frm_code;
+        const serviceUnitPath = generateParams.metaDataConfig.serviceUnitPath ? generateParams.metaDataConfig.serviceUnitPath : "";
+        const isGroupForm = variable.isGroupForm;
+        const externalPrefix = this.convertNullToEmpty(variable.externalPrefix);
+        const scope = generateParams.i18nResourcePrefix ? generateParams.i18nResourcePrefix : "";
+        let generateString = "";
+        generateString += `
+import { Pipe, PipeTransform, Injectable } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import { TranslateHttpLoader } from '@ngx-translate/http-loader';
+import { Resolve, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
+import { Observable, of } from 'rxjs';
+import { catchError, switchMap } from "rxjs/operators";
+import { HttpClient } from '@angular/common/http';
+import { DomSanitizer} from '@angular/platform-browser';
+import { BasePathService } from '@farris/rtf';`;
+        if (isGroupForm == false) {
+            generateString += `
+export function createTranslateLoader(http: HttpClient,version:string) {
+  let versionSuffix = "";
+  if (version) {
+    versionSuffix = "?v=" + version;
+  }
+  return new TranslateHttpLoader(http, BasePathService.convertPath('/${toolhepler_1.ToolHelper.replaceFanXieXianToXieXian(serviceUnitPath.toLowerCase())}/web/${projectName.toLowerCase()}/${moduleCode.toLowerCase()}/i18n/'), '.json'+ versionSuffix);
+}
+`;
+        }
+        generateString += `
+export let lang = ${JSON.stringify(variable.config)};
+export const scope = "${scope}";
+
+@Pipe({ name: 'lang' })
+export class ${externalPrefix}LangPipe implements PipeTransform {
+  constructor(private translate: TranslateService, private http: HttpClient) { }
+  transform(key: string, langCode: string, defaultValue?: string, useScope?: boolean) {
+    if(useScope === true && scope) {
+      key = scope + "_" + key;
+    }
+    ${this.generateTranslateTs(generateParams)}
+  }
+}`;
+        generateString += `
+@Pipe({ name: 'safeHtml' })
+export class ${externalPrefix}SafeHtmlPipe implements PipeTransform {
+  constructor(private sanitizer: DomSanitizer) { }
+  transform(url) {
+    if (!url) {
+      url = "";
+    }
+    return this.sanitizer.bypassSecurityTrustResourceUrl(url);
+  }
+}`;
+        generateString += `
+@Injectable()
+export class ${externalPrefix}LangService {
+  constructor(private translate: TranslateService) { }
+  transform(key: string, langCode: string, defaultValue?: string, useScope?: boolean) {
+    if(useScope === true && scope) {
+      key = scope + "_" + key;
+    }
+    ${this.generateTranslateTs(generateParams)}
+  }
+
+  getCurrentLanguage() {
+    return this.translate.currentLang;
+  }
+
+}
+
+@Injectable()
+export class ${externalPrefix}TranslateResolveService implements Resolve<any>{
+
+  constructor(private translate: TranslateService, private http: HttpClient) {
+    translate.defaultLang = 'zh-CHS';
+    translate.setTranslation('zh-CHS', lang['zh-CHS']);
+  }
+
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<any> {
+    let langCode = localStorage.getItem('languageCode');
+    if (!langCode) {
+      langCode = "zh-CHS";
+    }`;
+        if (isGroupForm == false) {
+            generateString += `
+    if (langCode == "zh-CHS" || (this.translate.defaultLang === langCode && this.translate.currentLoader == createTranslateLoader(this.http,null))) {`;
+        }
+        else {
+            generateString += `
+    if (this.translate.defaultLang === langCode) {`;
+        }
+        generateString += `
+      this.translate.setTranslation('zh-CHS', lang['zh-CHS']);
+      return of(this.translate[langCode]);
+    } else {
+      const httpOb = this.http.get(BasePathService.getBasePath() + "/${toolhepler_1.ToolHelper.replaceFanXieXianToXieXian(serviceUnitPath.toLowerCase())}/web/${projectName.toLowerCase()}/version.json?v=" + new Date().getTime()).pipe(switchMap((data)=>{
+        let currentVersion = null;
+        if (data instanceof Array) {
+          const versionKey = "${moduleCode.toLowerCase()}/" + langCode + ".json";
+          data.forEach((item) => {
+            if (item.category == "i18n" && item.key == versionKey) {
+              currentVersion = item.value;
+            }
+          });
+        }
+
+        this.translate.defaultLang = langCode;
+        this.translate.currentLang = langCode;`;
+        if (isGroupForm == false) {
+            generateString += `
+        this.translate.currentLoader = createTranslateLoader(this.http, currentVersion);
+`;
+        }
+        generateString += `
+    let tran = this.translate.getTranslation(langCode).pipe(catchError(err => {
+      console.error("read resource file failed,please check!!! "+ err);
+      return of(err);
+    }));
+    return tran;
+      }));
+      return httpOb;
+    }
+  }
+}
+`;
+        return generateString;
+    }
+    generateTranslateTs(generateParams) {
+        let generateString = `
+    const translateValue = this.translate.instant(key);`;
+        if (generateParams.metaDataConfig.useDefaultValueWithI18n) {
+            generateString += `
+    if (translateValue == "${jit_constant_1.JITConstant.I18nDefaultValue}") {
+      return defaultValue ? defaultValue : "";
+    }
+`;
+        }
+        generateString += `
+    return translateValue;`;
+        return generateString;
+    }
+    generateFormVersionKey(formCode) {
+        return `form_${formCode.toLowerCase()}`;
+    }
+}
+exports.LangTemplateGenerator = LangTemplateGenerator;
 //# sourceMappingURL=lang-template-generator.js.map

package/lib/utility/template-generator/devkit/lang-template-generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"lang-template-generator.js","sourceRoot":"","sources":["../../../../src/utility/template-generator/devkit/lang-template-generator.ts"],"names":[],"mappings":";;;AAAA,gFAA2E;AAC3E,qDAAiD;AACjD,iDAA8C;AAS9C,MAAa,qBAAsB,SAAQ,uDAAyB;IAClE,QAAQ,CAAC,cAAmB;QAC1B,MAAM,QAAQ,GAAG,cAAc,CAAC,MAAM,CAAC;QACvC,MAAM,WAAW,GAAG,cAAc,CAAC,cAAc,CAAC,WAAW,CAAC;QAE9D,MAAM,uBAAuB,GAAG,cAAc,CAAC,cAAc,CAAC,uBAAuB,CAAC;QACtF,MAAM,UAAU,GAAG,cAAc,CAAC,QAAQ,CAAC;QAC3C,MAAM,eAAe,GAAG,cAAc,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC,CAAC,cAAc,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3H,MAAM,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC;QACzC,MAAM,cAAc,GAAG,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;QACxE,IAAI,cAAc,GAAG,EAAE,CAAC;QACxB,cAAc,IAAI;;;;;;;;;+CASyB,CAAC;QAG5C,IAAI,WAAW,IAAI,KAAK,EAAE;YACxB,cAAc,IAAI;;;;;;uEAM+C,uBAAU,CAAC,0BAA0B,CAAC,eAAe,CAAC,WAAW,EAAE,CAAC,QAAQ,WAAW,CAAC,WAAW,EAAE,IAAI,UAAU,CAAC,WAAW,EAAE;;CAEvM,CAAC;SACG;QAGD,cAAc,IAAI;oBACF,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC;;;eAGpC,cAAc;;;QAGrB,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC;;EAE9C,CAAC;QAEC,cAAc,IAAI;;eAEP,cAAc;;;;;;;;EAQ3B,CAAC;QAGC,cAAc,IAAI;;eAEP,cAAc;;;MAGvB,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC;;;;;;;;;;eAU/B,cAAc;;;;;;;;;;;MAWvB,CAAC;QACH,IAAI,WAAW,IAAI,KAAK,EAAE;YACxB,cAAc,IAAI;sJAC8H,CAAC;SAClJ;aAAM;YACL,cAAc,IAAI;mDAC2B,CAAC;SAC/C;QACD,cAAc,IAAI;;;;uEAIiD,uBAAU,CAAC,0BAA0B,CAAC,eAAe,CAAC,WAAW,EAAE,CAAC,QAAQ,WAAW,CAAC,WAAW,EAAE;;;gCAG5I,UAAU,CAAC,WAAW,EAAE;;;;;;;;;+CAST,CAAC;QAE5C,IAAI,WAAW,IAAI,KAAK,EAAE;YACxB,cAAc,IAAI;;CAEvB,CAAC;SACG;QAED,cAAc,IAAI;;;;;;;;;;;CAWrB,CAAC;QACE,OAAO,cAAc,CAAC;IACxB,CAAC;IAEO,mBAAmB,CAAC,cAAmB;QAC7C,IAAI,cAAc,GAAG;wDAC+B,CAAC;QAErD,IAAI,cAAc,CAAC,cAAc,CAAC,uBAAuB,EAAE;YACzD,cAAc,IAAI;6BACK,0BAAW,CAAC,gBAAgB;;;CAGxD,CAAC;SACG;QACD,cAAc,IAAI;2BACK,CAAC;QAExB,OAAO,cAAc,CAAC;IACxB,CAAC;IAWO,sBAAsB,CAAC,QAAgB;QAC7C,OAAO,QAAQ,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC;IAC1C,CAAC;CACF;AAlKD,sDAkKC"}
+{"version":3,"file":"lang-template-generator.js","sourceRoot":"","sources":["../../../../src/utility/template-generator/devkit/lang-template-generator.ts"],"names":[],"mappings":";;;AAAA,gFAA2E;AAC3E,qDAAiD;AACjD,iDAA8C;AAS9C,MAAa,qBAAsB,SAAQ,uDAAyB;IAClE,QAAQ,CAAC,cAAmB;QAC1B,MAAM,QAAQ,GAAG,cAAc,CAAC,MAAM,CAAC;QACvC,MAAM,WAAW,GAAG,cAAc,CAAC,cAAc,CAAC,WAAW,CAAC;QAE9D,MAAM,uBAAuB,GAAG,cAAc,CAAC,cAAc,CAAC,uBAAuB,CAAC;QACtF,MAAM,UAAU,GAAG,cAAc,CAAC,QAAQ,CAAC;QAC3C,MAAM,eAAe,GAAG,cAAc,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC,CAAC,cAAc,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3H,MAAM,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC;QACzC,MAAM,cAAc,GAAG,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;QACxE,MAAM,KAAK,GAAG,cAAc,CAAC,kBAAkB,CAAA,CAAC,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,CAAC;QACxF,IAAI,cAAc,GAAG,EAAE,CAAC;QACxB,cAAc,IAAI;;;;;;;;;+CASyB,CAAC;QAG5C,IAAI,WAAW,IAAI,KAAK,EAAE;YACxB,cAAc,IAAI;;;;;;uEAM+C,uBAAU,CAAC,0BAA0B,CAAC,eAAe,CAAC,WAAW,EAAE,CAAC,QAAQ,WAAW,CAAC,WAAW,EAAE,IAAI,UAAU,CAAC,WAAW,EAAE;;CAEvM,CAAC;SACG;QAGD,cAAc,IAAI;oBACF,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC;wBAC3B,KAAK;;;eAGd,cAAc;;;;;;MAMvB,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC;;EAE5C,CAAC;QAEC,cAAc,IAAI;;eAEP,cAAc;;;;;;;;EAQ3B,CAAC;QAGC,cAAc,IAAI;;eAEP,cAAc;;;;;;MAMvB,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC;;;;;;;;;;eAU/B,cAAc;;;;;;;;;;;MAWvB,CAAC;QACH,IAAI,WAAW,IAAI,KAAK,EAAE;YACxB,cAAc,IAAI;sJAC8H,CAAC;SAClJ;aAAM;YACL,cAAc,IAAI;mDAC2B,CAAC;SAC/C;QACD,cAAc,IAAI;;;;uEAIiD,uBAAU,CAAC,0BAA0B,CAAC,eAAe,CAAC,WAAW,EAAE,CAAC,QAAQ,WAAW,CAAC,WAAW,EAAE;;;gCAG5I,UAAU,CAAC,WAAW,EAAE;;;;;;;;;+CAST,CAAC;QAE5C,IAAI,WAAW,IAAI,KAAK,EAAE;YACxB,cAAc,IAAI;;CAEvB,CAAC;SACG;QAED,cAAc,IAAI;;;;;;;;;;;CAWrB,CAAC;QACE,OAAO,cAAc,CAAC;IACxB,CAAC;IAEO,mBAAmB,CAAC,cAAmB;QAC7C,IAAI,cAAc,GAAG;wDAC+B,CAAC;QAErD,IAAI,cAAc,CAAC,cAAc,CAAC,uBAAuB,EAAE;YACzD,cAAc,IAAI;6BACK,0BAAW,CAAC,gBAAgB;;;CAGxD,CAAC;SACG;QACD,cAAc,IAAI;2BACK,CAAC;QAExB,OAAO,cAAc,CAAC;IACxB,CAAC;IAWO,sBAAsB,CAAC,QAAgB;QAC7C,OAAO,QAAQ,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC;IAC1C,CAAC;CACF;AA1KD,sDA0KC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@farris/jit-engine",
-  "version": "1.3.322",
+  "version": "1.3.324",
   "description": "",
   "main": "./lib/index.js",
   "bin": {