@farris/jit-engine 1.4.88 → 1.4.89

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/README.md +1 -1
  2. package/lib/utility/template-generator/devkit/lang-template-generator.js +10 -1
  3. package/lib/utility/template-generator/devkit/lang-template-generator.js.map +1 -1
  4. package/package.json +1 -1
package/README.md CHANGED
@@ -1,4 +1,4 @@
1
- 1.4.88
1
+ 1.4.89
2
2
 
3
3
  支持新版国际化
4
4
 
package/lib/utility/template-generator/devkit/lang-template-generator.js CHANGED
@@ -102,6 +102,7 @@ export class ${externalPrefix}TranslateResolveService implements Resolve<any>{
102
102
 
103
103
  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<any> {
104
104
  let langCode = localStorage.getItem('languageCode');
105
+ let displayLangCode = localStorage.getItem('DisplayLanguage');
105
106
  if (!langCode) {
106
107
  langCode = "zh-CHS";
107
108
  }`;
@@ -120,11 +121,15 @@ export class ${externalPrefix}TranslateResolveService implements Resolve<any>{
120
121
  } else {
121
122
  const httpOb = this.http.get(BasePathService.getBasePath() + "/${toolhepler_1.ToolHelper.replaceFanXieXianToXieXian(serviceUnitPath.toLowerCase())}/web/${projectName.toLowerCase()}/${moduleCode.toLowerCase()}/${runTimeDimPath.toLowerCase()}version.json?v=" + new Date().getTime()).pipe(switchMap((data)=>{
122
123
  let currentVersion = null;
124
+ let currentDisplayLanguageVersion = null;
123
125
  if (data instanceof Array) {
124
126
  const versionKey = "${moduleCode.toLowerCase()}/" + langCode + ".json";
127
+ const displayLanguageVersionKey = "${moduleCode.toLowerCase()}/" + displayLangCode + ".json";
125
128
  data.forEach((item) => {
126
129
  if (item.category == "i18n" && item.key == versionKey) {
127
130
  currentVersion = item.value;
131
+ } else if (item.category == "i18n" && item.key == displayLanguageVersionKey) {
132
+ currentDisplayLanguageVersion = item.value;
128
133
  }
129
134
  });
130
135
  }
@@ -139,11 +144,15 @@ export class ${externalPrefix}TranslateResolveService implements Resolve<any>{
139
144
  } else {
140
145
  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)=>{
141
146
  let currentVersion = null;
147
+ let currentDisplayLanguageVersion = null;
142
148
  if (data instanceof Array) {
143
149
  const versionKey = "${moduleCode.toLowerCase()}/" + langCode + ".json";
150
+ const displayLanguageVersionKey = "${moduleCode.toLowerCase()}/" + displayLangCode + ".json";
144
151
  data.forEach((item) => {
145
152
  if (item.category == "i18n" && item.key == versionKey) {
146
153
  currentVersion = item.value;
154
+ } else if (item.category == "i18n" && item.key == displayLanguageVersionKey) {
155
+ currentDisplayLanguageVersion = item.value;
147
156
  }
148
157
  });
149
158
  }
@@ -153,7 +162,7 @@ export class ${externalPrefix}TranslateResolveService implements Resolve<any>{
153
162
  }
154
163
  if (isGroupForm == false) {
155
164
  generateString += `
156
- this.translate.currentLoader = createTranslateLoader(this.http, currentVersion);
165
+ this.translate.currentLoader = createTranslateLoader(this.http, currentDisplayLanguageVersion || currentVersion);
157
166
  `;
158
167
  }
159
168
  generateString += `
package/lib/utility/template-generator/devkit/lang-template-generator.js.map CHANGED
@@ -1 +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;AAC9C,yDAA6D;AAS7D,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,CAAC,CAAC,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,CAAC;QACzF,IAAI,cAAc,GAAG,EAAE,CAAC;QACxB,cAAc,IAAI;;;;;;;;;+CASyB,CAAC;QAE5C,IAAI,cAAc,GAAG,EAAE,CAAC;QACxB,IAAI,cAAc,CAAC,cAAc,CAAC,SAAS,EAAE;YAE3C,cAAc,GAAG,0CAAuB,CAAC,qBAAqB,CAAC,cAAc,EAAE,cAAc,CAAC,cAAc,CAAC,CAAC;YAC9G,cAAc,IAAI;;;;;;oFAM4D,uBAAU,CAAC,0BAA0B,CAAC,eAAe,CAAC,WAAW,EAAE,CAAC,QAAQ,WAAW,CAAC,WAAW,EAAE,IAAI,UAAU,CAAC,WAAW,EAAE,IAAI,cAAc,CAAC,WAAW,EAAE;;CAEpP,CAAC;SACG;aAAM,IAAI,WAAW,IAAI,KAAK,EAAE;YAE/B,cAAc,IAAI;;;;;;oFAM4D,uBAAU,CAAC,0BAA0B,CAAC,eAAe,CAAC,WAAW,EAAE,CAAC,QAAQ,WAAW,CAAC,WAAW,EAAE,IAAI,UAAU,CAAC,WAAW,EAAE;;CAEpN,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,IAAI,cAAc,CAAC,cAAc,CAAC,SAAS,IAAI,cAAc,EAAE;YAC7D,cAAc,IAAI;;;;uEAI+C,uBAAU,CAAC,0BAA0B,CAAC,eAAe,CAAC,WAAW,EAAE,CAAC,QAAQ,WAAW,CAAC,WAAW,EAAE,IAAI,UAAU,CAAC,WAAW,EAAE,IAAI,cAAc,CAAC,WAAW,EAAE;;;gCAGxM,UAAU,CAAC,WAAW,EAAE;;;;;;;;;+CAST,CAAC;SAC3C;aAAM;YACL,cAAc,IAAI;;;;uEAI+C,uBAAU,CAAC,0BAA0B,CAAC,eAAe,CAAC,WAAW,EAAE,CAAC,QAAQ,WAAW,CAAC,WAAW,EAAE;;;gCAG5I,UAAU,CAAC,WAAW,EAAE;;;;;;;;;+CAST,CAAC;SAC3C;QAGD,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;AA5MD,sDA4MC"}
1
+ {"version":3,"file":"lang-template-generator.js","sourceRoot":"","sources":["../../../../src/utility/template-generator/devkit/lang-template-generator.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@farris/jit-engine",
3
- "version": "1.4.88",
3
+ "version": "1.4.89",
4
4
  "description": "",
5
5
  "main": "./lib/index.js",
6
6
  "bin": {