ps-toolkit-ui 0.0.32 → 0.0.33
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 +3 -6
- 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/components/base.component.js +4 -6
- package/fesm2015/ps-toolkit-ui.js +3 -5
- package/fesm2015/ps-toolkit-ui.js.map +1 -1
- package/lib/components/base.component.d.ts +1 -1
- package/package.json +1 -1
|
@@ -10,16 +10,14 @@ export class BaseComponent {
|
|
|
10
10
|
return app.getL(`${c}${(a ? `.${a}` : '')}`, key, v);
|
|
11
11
|
};
|
|
12
12
|
if (app.currentUser !== null) {
|
|
13
|
-
this.permissions = this.getPermission();
|
|
14
|
-
console.log(this.permissions);
|
|
13
|
+
this.permissions = this.getPermission(this.c, this.a);
|
|
15
14
|
if (this.permissions) {
|
|
16
15
|
this.permissions.Area = app.area;
|
|
17
16
|
}
|
|
18
17
|
}
|
|
19
18
|
}
|
|
20
|
-
getPermission() {
|
|
21
|
-
|
|
22
|
-
const p = this.app.currentUser.Permissions.filter(per => per.Controller === this.c && (this.a == null || per.Action === this.a) &&
|
|
19
|
+
getPermission(c, a) {
|
|
20
|
+
const p = this.app.currentUser.Permissions.filter(per => per.Controller === c && (a == null || per.Action === a) &&
|
|
23
21
|
per.Type === PermissionTypeEnum.Item);
|
|
24
22
|
return p.length > 0 ? this.getPermissionClass(p[0]) : null;
|
|
25
23
|
}
|
|
@@ -44,4 +42,4 @@ BaseComponent.ctorParameters = () => [
|
|
|
44
42
|
null,
|
|
45
43
|
null
|
|
46
44
|
];
|
|
47
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
45
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZS5jb21wb25lbnQuanMiLCJzb3VyY2VSb290IjoiRDovUHJvamVjdHMvUHNUb29sa2l0L1VJL3Byb2plY3RzL3BzLXRvb2xraXQtdWkvc3JjLyIsInNvdXJjZXMiOlsibGliL2NvbXBvbmVudHMvYmFzZS5jb21wb25lbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFDLFVBQVUsRUFBQyxNQUFNLGVBQWUsQ0FBQztBQUN6QyxPQUFPLEVBQUMsZUFBZSxFQUFDLE1BQU0sNkJBQTZCLENBQUM7QUFDNUQsT0FBTyxFQUFDLGtCQUFrQixFQUFDLE1BQU0sdUJBQXVCLENBQUM7QUFHekQsTUFBTSxPQUFnQixhQUFhO0lBR2pDLFlBQTZCLEdBQVEsRUFBUyxDQUFDLEVBQVMsSUFBSSxJQUFJO1FBQW5DLFFBQUcsR0FBSCxHQUFHLENBQUs7UUFBUyxNQUFDLEdBQUQsQ0FBQyxDQUFBO1FBQVMsTUFBQyxHQUFELENBQUMsQ0FBTztRQUM5RCxJQUFJLENBQUMsQ0FBQyxHQUFHLENBQUMsR0FBVyxFQUFFLENBQUMsR0FBRyxJQUFJLEVBQVUsRUFBRTtZQUN6QyxPQUFPLEdBQUcsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUUsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ3ZELENBQUMsQ0FBQztRQUNGLElBQUksR0FBRyxDQUFDLFdBQVcsS0FBSyxJQUFJLEVBQUM7WUFDM0IsSUFBSSxDQUFDLFdBQVcsR0FBRyxJQUFJLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxDQUFDLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQ3RELElBQUksSUFBSSxDQUFDLFdBQVcsRUFBQztnQkFDbkIsSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFJLEdBQUcsR0FBRyxDQUFDLElBQUksQ0FBQzthQUNsQztTQUNGO0lBQ0gsQ0FBQztJQUNELGFBQWEsQ0FBQyxDQUFDLEVBQUUsQ0FBQztRQUNoQixNQUFNLENBQUMsR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxDQUFDLFVBQVUsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDLElBQUksSUFBSSxJQUFJLEdBQUcsQ0FBQyxNQUFNLEtBQUssQ0FBQyxDQUFDO1lBQzlHLEdBQUcsQ0FBQyxJQUFJLEtBQUssa0JBQWtCLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDeEMsT0FBTyxDQUFDLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLGtCQUFrQixDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUM7SUFDN0QsQ0FBQztJQUNELGtCQUFrQixDQUFDLENBQU07UUFDdkIsT0FBTyxJQUFJLGVBQWUsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxVQUFVLEVBQUUsQ0FBQyxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsMEJBQTBCLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7SUFDNUgsQ0FBQztJQUNELDBCQUEwQixDQUFDLFFBQWdCO1FBQ3pDLE9BQU8sSUFBSSxDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxRQUFRLEtBQUssUUFBUSxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLGtCQUFrQixDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDcEgsQ0FBQztJQUNELFNBQVMsQ0FBQyxDQUFTO1FBQ2pCLE9BQU8sSUFBSSxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQztJQUNsRSxDQUFDO0lBQ0QsU0FBUyxDQUFDLENBQVM7UUFDakIsT0FBTyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDO0lBQ2xFLENBQUM7OztZQS9CRixVQUFVIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtJbmplY3RhYmxlfSBmcm9tICdAYW5ndWxhci9jb3JlJztcclxuaW1wb3J0IHtQZXJtaXNzaW9uQ2xhc3N9IGZyb20gJy4uL2NsYXNzZXMvcGVybWlzc2lvbi5jbGFzcyc7XHJcbmltcG9ydCB7UGVybWlzc2lvblR5cGVFbnVtfSBmcm9tICcuLi9jbGFzc2VzL2VudW0uY2xhc3MnO1xyXG5cclxuQEluamVjdGFibGUoKVxyXG5leHBvcnQgYWJzdHJhY3QgY2xhc3MgQmFzZUNvbXBvbmVudCB7XHJcbiAgbDogKGssIHY/KSA9PiBzdHJpbmc7XHJcbiAgcGVybWlzc2lvbnM6IFBlcm1pc3Npb25DbGFzcztcclxuICBwcm90ZWN0ZWQgY29uc3RydWN0b3IocHVibGljIGFwcDogYW55LCBwdWJsaWMgYywgcHVibGljIGEgPSBudWxsKXtcclxuICAgIHRoaXMubCA9IChrZXk6IHN0cmluZywgdiA9IG51bGwpOiBzdHJpbmcgPT4ge1xyXG4gICAgICByZXR1cm4gYXBwLmdldEwoYCR7Y30keyhhID8gYC4ke2F9YCA6ICcnKX1gLCBrZXksIHYpO1xyXG4gICAgfTtcclxuICAgIGlmIChhcHAuY3VycmVudFVzZXIgIT09IG51bGwpe1xyXG4gICAgICB0aGlzLnBlcm1pc3Npb25zID0gdGhpcy5nZXRQZXJtaXNzaW9uKHRoaXMuYywgdGhpcy5hKTtcclxuICAgICAgaWYgKHRoaXMucGVybWlzc2lvbnMpe1xyXG4gICAgICAgIHRoaXMucGVybWlzc2lvbnMuQXJlYSA9IGFwcC5hcmVhO1xyXG4gICAgICB9XHJcbiAgICB9XHJcbiAgfVxyXG4gIGdldFBlcm1pc3Npb24oYywgYSk6IGFueXtcclxuICAgIGNvbnN0IHAgPSB0aGlzLmFwcC5jdXJyZW50VXNlci5QZXJtaXNzaW9ucy5maWx0ZXIocGVyID0+IHBlci5Db250cm9sbGVyID09PSBjICYmIChhID09IG51bGwgfHwgcGVyLkFjdGlvbiA9PT0gYSkgJiZcclxuICAgICAgcGVyLlR5cGUgPT09IFBlcm1pc3Npb25UeXBlRW51bS5JdGVtKTtcclxuICAgIHJldHVybiBwLmxlbmd0aCA+IDAgPyB0aGlzLmdldFBlcm1pc3Npb25DbGFzcyhwWzBdKSA6IG51bGw7XHJcbiAgfVxyXG4gIGdldFBlcm1pc3Npb25DbGFzcyhwOiBhbnkpOiBQZXJtaXNzaW9uQ2xhc3N7XHJcbiAgICByZXR1cm4gbmV3IFBlcm1pc3Npb25DbGFzcyhwLk5hbWUsIHAuSWNvbiwgcC5UeXBlLCBwLkFyZWEsIHAuQ29udHJvbGxlciwgcC5BY3Rpb24sIHRoaXMuZ2V0UGVybWlzc2lvbkFjY2Vzc2VzQ2xhc3MocC5JZCkpO1xyXG4gIH1cclxuICBnZXRQZXJtaXNzaW9uQWNjZXNzZXNDbGFzcyhwYXJlbnRJZDogc3RyaW5nKTogUGVybWlzc2lvbkNsYXNzW117XHJcbiAgICByZXR1cm4gdGhpcy5hcHAuY3VycmVudFVzZXIuUGVybWlzc2lvbnMuZmlsdGVyKHggPT4geC5QYXJlbnRJZCA9PT0gcGFyZW50SWQpLm1hcCh4ID0+IHRoaXMuZ2V0UGVybWlzc2lvbkNsYXNzKHgpKTtcclxuICB9XHJcbiAgaGFzQWNjZXNzKGE6IHN0cmluZyk6IGJvb2xlYW57XHJcbiAgICByZXR1cm4gdGhpcy5wZXJtaXNzaW9ucyA/IHRoaXMucGVybWlzc2lvbnMuaGFzQWNjZXNzKGEpIDogZmFsc2U7XHJcbiAgfVxyXG4gIGhhc09wdGlvbihhOiBzdHJpbmcpOiBib29sZWFue1xyXG4gICAgcmV0dXJuIHRoaXMucGVybWlzc2lvbnMgPyB0aGlzLnBlcm1pc3Npb25zLmhhc09wdGlvbihhKSA6IGZhbHNlO1xyXG4gIH1cclxufVxyXG4iXX0=
|
|
@@ -5961,16 +5961,14 @@ class BaseComponent {
|
|
|
5961
5961
|
return app.getL(`${c}${(a ? `.${a}` : '')}`, key, v);
|
|
5962
5962
|
};
|
|
5963
5963
|
if (app.currentUser !== null) {
|
|
5964
|
-
this.permissions = this.getPermission();
|
|
5965
|
-
console.log(this.permissions);
|
|
5964
|
+
this.permissions = this.getPermission(this.c, this.a);
|
|
5966
5965
|
if (this.permissions) {
|
|
5967
5966
|
this.permissions.Area = app.area;
|
|
5968
5967
|
}
|
|
5969
5968
|
}
|
|
5970
5969
|
}
|
|
5971
|
-
getPermission() {
|
|
5972
|
-
|
|
5973
|
-
const p = this.app.currentUser.Permissions.filter(per => per.Controller === this.c && (this.a == null || per.Action === this.a) &&
|
|
5970
|
+
getPermission(c, a) {
|
|
5971
|
+
const p = this.app.currentUser.Permissions.filter(per => per.Controller === c && (a == null || per.Action === a) &&
|
|
5974
5972
|
per.Type === PermissionTypeEnum.Item);
|
|
5975
5973
|
return p.length > 0 ? this.getPermissionClass(p[0]) : null;
|
|
5976
5974
|
}
|