@magic-xpa/angular 4.801.0-dev481.297 → 4.801.0-dev481.298
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/esm2020/src/services/magic-color.service.mjs +12 -4
- package/fesm2015/magic-xpa-angular.mjs +11 -3
- package/fesm2015/magic-xpa-angular.mjs.map +1 -1
- package/fesm2020/magic-xpa-angular.mjs +11 -3
- package/fesm2020/magic-xpa-angular.mjs.map +1 -1
- package/package.json +3 -3
- package/src/services/magic-color.service.d.ts +2 -1
|
@@ -8,6 +8,8 @@ export class MagicColorService {
|
|
|
8
8
|
constructor(http) {
|
|
9
9
|
this.http = http;
|
|
10
10
|
this.colorFilePath = 'assets/clr_rnt.eng';
|
|
11
|
+
}
|
|
12
|
+
getColorData() {
|
|
11
13
|
this.http.get(this.colorFilePath, { responseType: 'text' }).subscribe(resp => {
|
|
12
14
|
this.colorsData = resp.replace(/\n/g, '@').split('@');
|
|
13
15
|
});
|
|
@@ -27,24 +29,30 @@ export class MagicColorService {
|
|
|
27
29
|
return 'rgba(' + rgb.red + ',' + rgb.green + ',' + rgb.blue + ',' + rgb.alpha + ')';
|
|
28
30
|
}
|
|
29
31
|
getColor(colorIndex, colorType) {
|
|
30
|
-
if (this.colorsData
|
|
32
|
+
if (!this.colorsData)
|
|
33
|
+
this.getColorData();
|
|
34
|
+
if (this.colorsData && this.colorsData[colorIndex - 1]) {
|
|
31
35
|
let hex = '';
|
|
32
36
|
const grayHashCode = '00808080';
|
|
33
37
|
let color = this.colorsData[colorIndex].split(',');
|
|
34
38
|
if (+color[3] <= 1) {
|
|
35
39
|
switch (colorType) {
|
|
36
40
|
case MAGIC_FG_COLOR:
|
|
37
|
-
hex = (
|
|
41
|
+
hex = (color[1]);
|
|
38
42
|
break;
|
|
39
43
|
case MAGIC_BG_COLOR:
|
|
40
|
-
hex = (
|
|
44
|
+
hex = (color[2]);
|
|
41
45
|
break;
|
|
46
|
+
default:
|
|
47
|
+
console.log('Please enter valid color type : 1-FG, 2-BG ' + colorIndex);
|
|
48
|
+
return '';
|
|
42
49
|
}
|
|
43
50
|
}
|
|
44
51
|
else
|
|
45
52
|
hex = grayHashCode;
|
|
46
53
|
return this.hexToRgba('#' + hex);
|
|
47
54
|
}
|
|
55
|
+
console.log('Could not get color for number ' + colorIndex);
|
|
48
56
|
return '';
|
|
49
57
|
}
|
|
50
58
|
}
|
|
@@ -56,4 +64,4 @@ MagicColorService.ɵprov = i0.ɵɵdefineInjectable({ token: MagicColorService, f
|
|
|
56
64
|
providedIn: 'root'
|
|
57
65
|
}]
|
|
58
66
|
}], function () { return [{ type: i1.HttpClient }]; }, null); })();
|
|
59
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
67
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFnaWMtY29sb3Iuc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2FuZ3VsYXIvc3JjL3NlcnZpY2VzL21hZ2ljLWNvbG9yLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUMzQyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7OztBQUVsRCxNQUFNLENBQUMsTUFBTSxjQUFjLEdBQVcsQ0FBQyxDQUFDO0FBQ3hDLE1BQU0sQ0FBQyxNQUFNLGNBQWMsR0FBVyxDQUFDLENBQUM7QUFLeEMsTUFBTSxPQUFPLGlCQUFpQjtJQUs1QixZQUFvQixJQUFnQjtRQUFoQixTQUFJLEdBQUosSUFBSSxDQUFZO1FBSDdCLGtCQUFhLEdBQUcsb0JBQW9CLENBQUM7SUFJNUMsQ0FBQztJQUVPLFlBQVk7UUFDbEIsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLGFBQWEsRUFBRSxFQUFFLFlBQVksRUFBRSxNQUFNLEVBQUUsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUMzRSxJQUFJLENBQUMsVUFBVSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLEdBQUcsQ0FBQyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUN4RCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFTyxTQUFTLENBQUMsR0FBUTtRQUN4QixJQUFJLGNBQWMsR0FBRywyQ0FBMkMsQ0FBQztRQUVqRSxHQUFHLEdBQUcsR0FBRyxDQUFDLE9BQU8sQ0FBQyxjQUFjLEVBQUUsVUFBUyxDQUFNLEVBQUUsQ0FBTSxFQUFFLENBQU0sRUFBRSxDQUFNLEVBQUUsQ0FBTTtZQUMvRSxPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDdkMsQ0FBQyxDQUFDLENBQUM7UUFFSCxJQUFJLE1BQU0sR0FBRyx1REFBdUQsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7UUFFL0UsSUFBSSxHQUFHLEdBQUc7WUFDUixLQUFLLEVBQUUsUUFBUSxDQUFDLE1BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUM7WUFDL0IsT0FBTyxFQUFFLFFBQVEsQ0FBQyxNQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDO1lBQ2pDLE1BQU0sRUFBRSxRQUFRLENBQUMsTUFBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQztZQUNoQyxPQUFPLEVBQUUsQ0FBQyxHQUFHLEdBQUcsUUFBUSxDQUFDLE1BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxHQUFHLEdBQUc7U0FDaEQsQ0FBQztRQUVGLE9BQU8sT0FBTyxHQUFHLEdBQUcsQ0FBQyxHQUFHLEdBQUcsR0FBRyxHQUFHLEdBQUcsQ0FBQyxLQUFLLEdBQUcsR0FBRyxHQUFHLEdBQUcsQ0FBQyxJQUFJLEdBQUcsR0FBRyxHQUFHLEdBQUcsQ0FBQyxLQUFLLEdBQUcsR0FBRyxDQUFDO0lBQ3RGLENBQUM7SUFRTSxRQUFRLENBQUMsVUFBa0IsRUFBRSxTQUFpQjtRQUVuRCxJQUFHLENBQUMsSUFBSSxDQUFDLFVBQVU7WUFDakIsSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO1FBQ3RCLElBQUksSUFBSSxDQUFDLFVBQVUsSUFBSSxJQUFJLENBQUMsVUFBVSxDQUFDLFVBQVUsR0FBRSxDQUFDLENBQUMsRUFBRTtZQUNyRCxJQUFJLEdBQUcsR0FBRyxFQUFFLENBQUM7WUFDYixNQUFNLFlBQVksR0FBRyxVQUFVLENBQUM7WUFDaEMsSUFBSSxLQUFLLEdBQWEsSUFBSSxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7WUFHN0QsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLEVBQUU7Z0JBRWxCLFFBQVEsU0FBUyxFQUFFO29CQUNqQixLQUFLLGNBQWM7d0JBQ2pCLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO3dCQUNqQixNQUFNO29CQUNSLEtBQUssY0FBYzt3QkFDakIsR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7d0JBQ2pCLE1BQU07b0JBQ1I7d0JBQ0UsT0FBTyxDQUFDLEdBQUcsQ0FBQyw2Q0FBNkMsR0FBRyxVQUFVLENBQUMsQ0FBQzt3QkFDeEUsT0FBTyxFQUFFLENBQUM7aUJBQ2I7YUFDRjs7Z0JBQ0MsR0FBRyxHQUFHLFlBQVksQ0FBQztZQUNyQixPQUFPLElBQUksQ0FBQyxTQUFTLENBQUMsR0FBRyxHQUFHLEdBQUcsQ0FBQyxDQUFDO1NBQ2xDO1FBQ0QsT0FBTyxDQUFDLEdBQUcsQ0FBQyxpQ0FBaUMsR0FBRyxVQUFVLENBQUMsQ0FBQztRQUM1RCxPQUFPLEVBQUUsQ0FBQztJQUNaLENBQUM7O2tGQXBFVSxpQkFBaUI7eURBQWpCLGlCQUFpQixXQUFqQixpQkFBaUIsbUJBRmhCLE1BQU07dUZBRVAsaUJBQWlCO2NBSDdCLFVBQVU7ZUFBQztnQkFDVixVQUFVLEVBQUUsTUFBTTthQUNuQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IEh0dHBDbGllbnQgfSBmcm9tICdAYW5ndWxhci9jb21tb24vaHR0cCc7XG5cbmV4cG9ydCBjb25zdCBNQUdJQ19GR19DT0xPUjogbnVtYmVyID0gMTtcbmV4cG9ydCBjb25zdCBNQUdJQ19CR19DT0xPUjogbnVtYmVyID0gMjtcblxuQEluamVjdGFibGUoe1xuICBwcm92aWRlZEluOiAncm9vdCdcbn0pXG5leHBvcnQgY2xhc3MgTWFnaWNDb2xvclNlcnZpY2Uge1xuXG4gIHB1YmxpYyBjb2xvckZpbGVQYXRoID0gJ2Fzc2V0cy9jbHJfcm50LmVuZyc7XG4gIHByaXZhdGUgY29sb3JzRGF0YTtcblxuICBjb25zdHJ1Y3Rvcihwcml2YXRlIGh0dHA6IEh0dHBDbGllbnQpIHtcbiAgfVxuXG4gIHByaXZhdGUgZ2V0Q29sb3JEYXRhKCl7XG4gICAgdGhpcy5odHRwLmdldCh0aGlzLmNvbG9yRmlsZVBhdGgsIHsgcmVzcG9uc2VUeXBlOiAndGV4dCcgfSkuc3Vic2NyaWJlKHJlc3AgPT4ge1xuICAgICAgdGhpcy5jb2xvcnNEYXRhID0gcmVzcC5yZXBsYWNlKC9cXG4vZywgJ0AnKS5zcGxpdCgnQCcpO1xuICAgIH0pO1xuICB9XG5cbiAgcHJpdmF0ZSBoZXhUb1JnYmEoaGV4OiBhbnkpOiBhbnkge1xuICAgIGxldCBzaG9ydGhhbmRSZWdleCA9IC9eIz8oW2EtZlxcZF0pKFthLWZcXGRdKShbYS1mXFxkXSkoW2EtZlxcZF0pJC9pO1xuICAgIC8vIGNvbnZlcnQgaXQgdG8gZm9ybWF0IDogYWFycmdnYmJcbiAgICBoZXggPSBoZXgucmVwbGFjZShzaG9ydGhhbmRSZWdleCwgZnVuY3Rpb24obTogYW55LCByOiBhbnksIGc6IGFueSwgYjogYW55LCBhOiBhbnkpIHtcbiAgICAgIHJldHVybiBhICsgYSArIHIgKyByICsgZyArIGcgKyBiICsgYjtcbiAgICB9KTtcblxuICAgIGxldCByZXN1bHQgPSAvXiM/KFthLWZcXGRdezJ9KShbYS1mXFxkXXsyfSkoW2EtZlxcZF17Mn0pKFthLWZcXGRdezJ9KSQvaS5leGVjKGhleCk7XG5cbiAgICBsZXQgcmdiID0ge1xuICAgICAgJ3JlZCc6IHBhcnNlSW50KHJlc3VsdCFbNF0sIDE2KSxcbiAgICAgICdncmVlbic6IHBhcnNlSW50KHJlc3VsdCFbM10sIDE2KSxcbiAgICAgICdibHVlJzogcGFyc2VJbnQocmVzdWx0IVsyXSwgMTYpLFxuICAgICAgJ2FscGhhJzogKDI1NSAtIHBhcnNlSW50KHJlc3VsdCFbMV0sIDE2KSkgLyAyNTVcbiAgICB9O1xuXG4gICAgcmV0dXJuICdyZ2JhKCcgKyByZ2IucmVkICsgJywnICsgcmdiLmdyZWVuICsgJywnICsgcmdiLmJsdWUgKyAnLCcgKyByZ2IuYWxwaGEgKyAnKSc7XG4gIH1cblxuICAvKipcbiAgICogUmV0dXJucyB0aGUgcmdiYSB2YWx1ZSBvZiBzcGVjaWZpZWQgY29sb3JcbiAgICogQHJldHVybnMgOiB2YWx1ZSBpbiBmb3JtYXQgcmdiYSgxMjgsMTI4LDEyOCwxKVxuICAgKiBAcGFyYW0gOiBjb2xvck51bWJlciAtMCBiYXNlZCBpbmRleCBvZiBjb2xvciBmb3Igd2hpY2ggUkdCQSB2YWx1ZXMgYXJlIHJldHVybmVkXG4gICAqIEBwYXJhbTogY29sb3JUeXBlIDogMS1NQUdJQ19GR19DT0xPUiwgMi1NQUdJQ19CR19DT0xPUlxuICAgKi9cbiAgcHVibGljIGdldENvbG9yKGNvbG9ySW5kZXg6IG51bWJlciwgY29sb3JUeXBlOiBudW1iZXIpIHtcblxuICAgIGlmKCF0aGlzLmNvbG9yc0RhdGEpXG4gICAgICB0aGlzLmdldENvbG9yRGF0YSgpO1xuICAgIGlmICh0aGlzLmNvbG9yc0RhdGEgJiYgdGhpcy5jb2xvcnNEYXRhW2NvbG9ySW5kZXggLTFdKSB7IC8vIGNvbG9yIGV4aXN0c1xuICAgICAgbGV0IGhleCA9ICcnO1xuICAgICAgY29uc3QgZ3JheUhhc2hDb2RlID0gJzAwODA4MDgwJztcbiAgICAgIGxldCBjb2xvcjogc3RyaW5nW10gPSB0aGlzLmNvbG9yc0RhdGFbY29sb3JJbmRleF0uc3BsaXQoJywnKTsgLy8gZ2V0IHRoZSBjb2xvciBkZXRhaWxzXG4gICAgICAvLyBjb2xvclswXSAtIG5hbWUsIGNvbG9yWzFdIC0gRkcgY29sb3IsIGNvbG9yWzJdIC0gQkcgY29sb3JcbiAgICAgIC8vIGNvbG9yWzNdIC0gYXR0ciBmbGFncyAoMSAtIHRyYW5zcGVyZW50LCAyIC0gc3lzdGVtIEZHLCA0IC0gc3lzdGVtIGJnKVxuICAgICAgaWYgKCtjb2xvclszXSA8PSAxKSB7IC8vIGZvciBub24tc3lzdGVtIGNvbG9yIG9yIHRyYW5zcGVyZW50IGNvbG9yXG5cbiAgICAgICAgc3dpdGNoIChjb2xvclR5cGUpIHtcbiAgICAgICAgICBjYXNlIE1BR0lDX0ZHX0NPTE9SOlxuICAgICAgICAgICAgaGV4ID0gKGNvbG9yWzFdKTtcbiAgICAgICAgICAgIGJyZWFrO1xuICAgICAgICAgIGNhc2UgTUFHSUNfQkdfQ09MT1I6XG4gICAgICAgICAgICBoZXggPSAoY29sb3JbMl0pO1xuICAgICAgICAgICAgYnJlYWs7XG4gICAgICAgICAgZGVmYXVsdDpcbiAgICAgICAgICAgIGNvbnNvbGUubG9nKCdQbGVhc2UgZW50ZXIgdmFsaWQgY29sb3IgdHlwZSA6IDEtRkcsIDItQkcgJyArIGNvbG9ySW5kZXgpO1xuICAgICAgICAgICAgcmV0dXJuICcnO1xuICAgICAgICB9XG4gICAgICB9IGVsc2VcbiAgICAgICAgaGV4ID0gZ3JheUhhc2hDb2RlO1xuICAgICAgcmV0dXJuIHRoaXMuaGV4VG9SZ2JhKCcjJyArIGhleCk7XG4gICAgfVxuICAgIGNvbnNvbGUubG9nKCdDb3VsZCBub3QgZ2V0IGNvbG9yIGZvciBudW1iZXIgJyArIGNvbG9ySW5kZXgpO1xuICAgIHJldHVybiAnJztcbiAgfVxufVxuIl19
|
|
@@ -2318,6 +2318,8 @@ class MagicColorService {
|
|
|
2318
2318
|
constructor(http) {
|
|
2319
2319
|
this.http = http;
|
|
2320
2320
|
this.colorFilePath = 'assets/clr_rnt.eng';
|
|
2321
|
+
}
|
|
2322
|
+
getColorData() {
|
|
2321
2323
|
this.http.get(this.colorFilePath, { responseType: 'text' }).subscribe(resp => {
|
|
2322
2324
|
this.colorsData = resp.replace(/\n/g, '@').split('@');
|
|
2323
2325
|
});
|
|
@@ -2337,24 +2339,30 @@ class MagicColorService {
|
|
|
2337
2339
|
return 'rgba(' + rgb.red + ',' + rgb.green + ',' + rgb.blue + ',' + rgb.alpha + ')';
|
|
2338
2340
|
}
|
|
2339
2341
|
getColor(colorIndex, colorType) {
|
|
2340
|
-
if (this.colorsData
|
|
2342
|
+
if (!this.colorsData)
|
|
2343
|
+
this.getColorData();
|
|
2344
|
+
if (this.colorsData && this.colorsData[colorIndex - 1]) {
|
|
2341
2345
|
let hex = '';
|
|
2342
2346
|
const grayHashCode = '00808080';
|
|
2343
2347
|
let color = this.colorsData[colorIndex].split(',');
|
|
2344
2348
|
if (+color[3] <= 1) {
|
|
2345
2349
|
switch (colorType) {
|
|
2346
2350
|
case MAGIC_FG_COLOR:
|
|
2347
|
-
hex = (
|
|
2351
|
+
hex = (color[1]);
|
|
2348
2352
|
break;
|
|
2349
2353
|
case MAGIC_BG_COLOR:
|
|
2350
|
-
hex = (
|
|
2354
|
+
hex = (color[2]);
|
|
2351
2355
|
break;
|
|
2356
|
+
default:
|
|
2357
|
+
console.log('Please enter valid color type : 1-FG, 2-BG ' + colorIndex);
|
|
2358
|
+
return '';
|
|
2352
2359
|
}
|
|
2353
2360
|
}
|
|
2354
2361
|
else
|
|
2355
2362
|
hex = grayHashCode;
|
|
2356
2363
|
return this.hexToRgba('#' + hex);
|
|
2357
2364
|
}
|
|
2365
|
+
console.log('Could not get color for number ' + colorIndex);
|
|
2358
2366
|
return '';
|
|
2359
2367
|
}
|
|
2360
2368
|
}
|