ps-toolkit-ui 1.4.8 → 1.4.9
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.
- package/bundles/ps-toolkit-ui.umd.js +2 -5
- package/bundles/ps-toolkit-ui.umd.js.map +1 -1
- package/bundles/ps-toolkit-ui.umd.min.js +1 -1
- package/bundles/ps-toolkit-ui.umd.min.js.map +1 -1
- package/esm2015/lib/classes/lang.class.js +3 -6
- package/fesm2015/ps-toolkit-ui.js +2 -5
- package/fesm2015/ps-toolkit-ui.js.map +1 -1
- package/package.json +1 -1
|
@@ -7,18 +7,16 @@ export class LangClass {
|
|
|
7
7
|
}
|
|
8
8
|
get(area, c, k, v = null) {
|
|
9
9
|
if (k != null && (/^-?\d+$/.test(k) || /^\d+\.\d+$/.test(k))) {
|
|
10
|
-
console.log(area, c, k, v, '=>', k);
|
|
11
10
|
return k;
|
|
12
11
|
}
|
|
13
12
|
let cv = _.get(this.lang, area ? `${area}.${c}.${k}` : `${c}.${k}`);
|
|
14
13
|
if (!cv) {
|
|
15
|
-
cv = _.get(this.lang, `
|
|
14
|
+
cv = _.get(this.lang, `Public.${c}.${k}`);
|
|
16
15
|
}
|
|
17
16
|
if (!cv) {
|
|
18
|
-
cv = _.get(this.lang, `
|
|
17
|
+
cv = _.get(this.lang, `Public.${k}`);
|
|
19
18
|
}
|
|
20
19
|
if (!cv) {
|
|
21
|
-
console.log(area, c, k, v, '=>', k);
|
|
22
20
|
return k;
|
|
23
21
|
}
|
|
24
22
|
if (v !== null) {
|
|
@@ -31,8 +29,7 @@ export class LangClass {
|
|
|
31
29
|
cv = cv.replace('{}', this.get(area, c, v, null));
|
|
32
30
|
}
|
|
33
31
|
}
|
|
34
|
-
console.log(area, c, k, v, '=>', cv);
|
|
35
32
|
return cv;
|
|
36
33
|
}
|
|
37
34
|
}
|
|
38
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
35
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGFuZy5jbGFzcy5qcyIsInNvdXJjZVJvb3QiOiJEOi9Qcm9qZWN0cy9Qc1Rvb2xraXQvVUkvcHJvamVjdHMvcHMtdG9vbGtpdC11aS9zcmMvIiwic291cmNlcyI6WyJsaWIvY2xhc3Nlcy9sYW5nLmNsYXNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxDQUFDLE1BQU0sUUFBUSxDQUFDO0FBQzVCLE9BQU8sRUFBQyxPQUFPLElBQUksYUFBYSxFQUFDLE1BQU0sZ0JBQWdCLENBQUM7QUFFeEQsV0FBVztBQUNYLE1BQU0sT0FBTyxTQUFTO0lBRXBCLFlBQVksQ0FBUyxFQUFFLE9BQVc7UUFDaEMsSUFBSSxDQUFDLElBQUksR0FBRyxDQUFDLENBQUMsS0FBSyxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUMsRUFBRSxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNwRCxDQUFDO0lBQ0QsR0FBRyxDQUFDLElBQUksRUFBRSxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsR0FBRyxJQUFJO1FBQ3RCLElBQUksQ0FBQyxJQUFJLElBQUksSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUksWUFBWSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFDO1lBQzNELE9BQU8sQ0FBQyxDQUFDO1NBQ1Y7UUFDRCxJQUFJLEVBQUUsR0FBRyxDQUFDLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQyxHQUFHLElBQUksSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUM7UUFDcEUsSUFBSSxDQUFDLEVBQUUsRUFBQztZQUNOLEVBQUUsR0FBRyxDQUFDLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsVUFBVSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztTQUMzQztRQUNELElBQUksQ0FBQyxFQUFFLEVBQUM7WUFDTixFQUFFLEdBQUcsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLFVBQVUsQ0FBQyxFQUFFLENBQUMsQ0FBQztTQUN0QztRQUNELElBQUksQ0FBQyxFQUFFLEVBQUM7WUFDTixPQUFPLENBQUMsQ0FBQztTQUNWO1FBQ0QsSUFBSSxDQUFDLEtBQUssSUFBSSxFQUFFO1lBQ2QsSUFBSSxDQUFDLENBQUMsV0FBVyxLQUFLLEtBQUssRUFBRTtnQkFDM0IsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFO29CQUNkLEVBQUUsR0FBRyxFQUFFLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsR0FBRyxDQUFDLElBQUksRUFBRSxDQUFDLEVBQUUsQ0FBQyxFQUFFLElBQUksQ0FBQyxDQUFDLENBQUM7Z0JBQ3BELENBQUMsQ0FBQyxDQUFDO2FBQ0o7aUJBQU07Z0JBQ0wsRUFBRSxHQUFHLEVBQUUsQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxFQUFFLENBQUMsRUFBRSxDQUFDLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQzthQUNuRDtTQUNGO1FBQ0QsT0FBTyxFQUFFLENBQUM7SUFDWixDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgKiBhcyBfIGZyb20gJ2xvZGFzaCc7XHJcbmltcG9ydCB7c3RyaW5ncyBhcyBwdWJsaWNTdHJpbmdzfSBmcm9tICcuL3N0cmluZy5jbGFzcyc7XHJcblxyXG4vLyBAZHluYW1pY1xyXG5leHBvcnQgY2xhc3MgTGFuZ0NsYXNzIHtcclxuICBsYW5nOiB7fTtcclxuICBjb25zdHJ1Y3RvcihkOiBzdHJpbmcsIHN0cmluZ3M6IHt9KSB7XHJcbiAgICB0aGlzLmxhbmcgPSBfLm1lcmdlKHB1YmxpY1N0cmluZ3NbZF0sIHN0cmluZ3NbZF0pO1xyXG4gIH1cclxuICBnZXQoYXJlYSwgYywgaywgdiA9IG51bGwpOiBzdHJpbmcge1xyXG4gICAgaWYgKGsgIT0gbnVsbCAmJiAoL14tP1xcZCskLy50ZXN0KGspIHx8IC9eXFxkK1xcLlxcZCskLy50ZXN0KGspKSl7XHJcbiAgICAgIHJldHVybiBrO1xyXG4gICAgfVxyXG4gICAgbGV0IGN2ID0gXy5nZXQodGhpcy5sYW5nLCBhcmVhID8gYCR7YXJlYX0uJHtjfS4ke2t9YCA6IGAke2N9LiR7a31gKTtcclxuICAgIGlmICghY3Ype1xyXG4gICAgICBjdiA9IF8uZ2V0KHRoaXMubGFuZywgYFB1YmxpYy4ke2N9LiR7a31gKTtcclxuICAgIH1cclxuICAgIGlmICghY3Ype1xyXG4gICAgICBjdiA9IF8uZ2V0KHRoaXMubGFuZywgYFB1YmxpYy4ke2t9YCk7XHJcbiAgICB9XHJcbiAgICBpZiAoIWN2KXtcclxuICAgICAgcmV0dXJuIGs7XHJcbiAgICB9XHJcbiAgICBpZiAodiAhPT0gbnVsbCkge1xyXG4gICAgICBpZiAodi5jb25zdHJ1Y3RvciA9PT0gQXJyYXkpIHtcclxuICAgICAgICB2LmZvckVhY2goKHgpID0+IHtcclxuICAgICAgICAgIGN2ID0gY3YucmVwbGFjZSgne30nLCB0aGlzLmdldChhcmVhLCBjLCB4LCBudWxsKSk7XHJcbiAgICAgICAgfSk7XHJcbiAgICAgIH0gZWxzZSB7XHJcbiAgICAgICAgY3YgPSBjdi5yZXBsYWNlKCd7fScsIHRoaXMuZ2V0KGFyZWEsIGMsIHYsIG51bGwpKTtcclxuICAgICAgfVxyXG4gICAgfVxyXG4gICAgcmV0dXJuIGN2O1xyXG4gIH1cclxufVxyXG4iXX0=
|
|
@@ -300,18 +300,16 @@ class LangClass {
|
|
|
300
300
|
}
|
|
301
301
|
get(area, c, k, v = null) {
|
|
302
302
|
if (k != null && (/^-?\d+$/.test(k) || /^\d+\.\d+$/.test(k))) {
|
|
303
|
-
console.log(area, c, k, v, '=>', k);
|
|
304
303
|
return k;
|
|
305
304
|
}
|
|
306
305
|
let cv = get(this.lang, area ? `${area}.${c}.${k}` : `${c}.${k}`);
|
|
307
306
|
if (!cv) {
|
|
308
|
-
cv = get(this.lang, `
|
|
307
|
+
cv = get(this.lang, `Public.${c}.${k}`);
|
|
309
308
|
}
|
|
310
309
|
if (!cv) {
|
|
311
|
-
cv = get(this.lang, `
|
|
310
|
+
cv = get(this.lang, `Public.${k}`);
|
|
312
311
|
}
|
|
313
312
|
if (!cv) {
|
|
314
|
-
console.log(area, c, k, v, '=>', k);
|
|
315
313
|
return k;
|
|
316
314
|
}
|
|
317
315
|
if (v !== null) {
|
|
@@ -324,7 +322,6 @@ class LangClass {
|
|
|
324
322
|
cv = cv.replace('{}', this.get(area, c, v, null));
|
|
325
323
|
}
|
|
326
324
|
}
|
|
327
|
-
console.log(area, c, k, v, '=>', cv);
|
|
328
325
|
return cv;
|
|
329
326
|
}
|
|
330
327
|
}
|