@flexem/fc-designer 3.0.1-alpha.6 → 3.0.1-alpha.7

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/CHANGELOG.md CHANGED
@@ -397,4 +397,10 @@
397
397
  ## 3.0.1-alpha.06(2023-03-09)
398
398
  ### Web端
399
399
  #### Bug Fix
400
- 1. FLEXCLOUD-2517 告警表配置历史告警、历史告警无法切换时间段
400
+ 1. FLEXCLOUD-2517 告警表配置历史告警、历史告警无法切换时间段
401
+
402
+ ## 3.0.1-alpha.07(2023-03-10)
403
+ ### Web端
404
+ #### Bug Fix
405
+ 1. FLEXCLOUD-2520 刷新周期未生效
406
+ 2. FLEXCLOUD-2521【云组态】告警表修改告警名称、告警分组、删除告警后,再次配置告警表时,应提示用户“至少选择一个告警”
@@ -3,9 +3,9 @@ import { HistoryCurveDisplayPeriodEnum } from '../../history-curve/general/histo
3
3
  import { HistoryCurveRefreshCycleEnum } from '../../history-curve/general/history-curve-refresh-cycle-enum';
4
4
  export interface AlarmFilterData {
5
5
  alarmType: AlarmType;
6
- selectedGroupId: number[];
6
+ selectedGroup: string[];
7
7
  selectedLevel: number[];
8
8
  refreshCycle?: HistoryCurveRefreshCycleEnum;
9
9
  displayPeriod?: HistoryCurveDisplayPeriodEnum;
10
- detailsData: string[];
10
+ detailsData: any[];
11
11
  }
@@ -83,7 +83,7 @@ var AlarmSettingComponent = /** @class */ (function (_super) {
83
83
  if (!this.allSettings || !this.allSettings.filterSetting) {
84
84
  this._filterSetting = {
85
85
  alarmType: AlarmType.CurrentAlarm,
86
- selectedGroupId: [],
86
+ selectedGroup: [],
87
87
  selectedLevel: [],
88
88
  refreshCycle: HistoryCurveRefreshCycleEnum.ThirtyMinutes,
89
89
  displayPeriod: HistoryCurveDisplayPeriodEnum.RecentThirtyMinutes,
@@ -26,8 +26,8 @@
26
26
  <div class="fe-half-line float-left">
27
27
  <label class="fe-vertical-title">{{lc("AlarmGroup")}}:</label>
28
28
  <div class="fe-vertical-component">
29
- <nz-select nzMode="multiple" nzAllowClear nzPlaceHolder="{{lc('PleaseSelectGroup')}}" [(ngModel)]="selectedGroupId" (ngModelChange)="groupChange()">
30
- <nz-option *ngFor="let item of groupList" [nzLabel]="item.name" [nzValue]="item.id"></nz-option>
29
+ <nz-select nzMode="multiple" nzAllowClear nzPlaceHolder="{{lc('PleaseSelectGroup')}}" [(ngModel)]="selectedGroup" (ngModelChange)="groupChange()">
30
+ <nz-option *ngFor="let item of groupList" [nzLabel]="item.name" [nzValue]="item.name"></nz-option>
31
31
  </nz-select>
32
32
  </div>
33
33
  </div>
@@ -51,17 +51,21 @@
51
51
  </thead>
52
52
  <tbody>
53
53
  <tr *ngFor="let detail of details;index as i;">
54
- <td width="10%">
55
- <label>
56
- <input type="checkBox" [(ngModel)]="detail.isEnabled" (change)="alarmEnabledChange(i, $event)" name="isEnabled" />
57
- </label>
58
- </td>
59
- <td width="45%">{{detail.alarmName}}</td>
60
- <td width="45%">
61
- <div class="alarm-color-div" [ngStyle]="{ 'background': getLevelColor(detail.alarmLevel), width: '100px', 'height': '26px', 'margin': 'auto', 'text-align': 'center', 'border-radius': '5px' }">
62
- {{lc(getLevelText(detail.alarmLevel))}}
63
- </div>
64
- </td>
54
+ <ng-container *ngIf="detail.isShow">
55
+ <td width="10%">
56
+ <label>
57
+ <input type="checkBox" [(ngModel)]="detail.isEnabled"
58
+ (change)="alarmEnabledChange(i, $event)" name="isEnabled" />
59
+ </label>
60
+ </td>
61
+ <td width="45%">{{detail.alarmName}}</td>
62
+ <td width="45%">
63
+ <div class="alarm-color-div"
64
+ [ngStyle]="{ 'background': getLevelColor(detail.alarmLevel), width: '100px', 'height': '26px', 'margin': 'auto', 'text-align': 'center', 'border-radius': '5px' }">
65
+ {{lc(getLevelText(detail.alarmLevel))}}
66
+ </div>
67
+ </td>
68
+ </ng-container>
65
69
  </tr>
66
70
  </tbody>
67
71
  </table>
@@ -13,7 +13,6 @@ export declare class AlarmFilterSettingComponent extends ConfigureComponentBase
13
13
  private readonly alarmRegistrationsService;
14
14
  data: AlarmFilterData;
15
15
  configureId: number;
16
- detailsData: any[];
17
16
  enumAlarmType: typeof AlarmType;
18
17
  groupList: AlarmGroupListDto[];
19
18
  alarmLevelList: any[];
@@ -25,8 +24,8 @@ export declare class AlarmFilterSettingComponent extends ConfigureComponentBase
25
24
  displayPeriods: HistoryCurveDisplayPeriod;
26
25
  get alarmType(): AlarmType;
27
26
  set alarmType(value: AlarmType);
28
- get selectedGroupId(): number[];
29
- set selectedGroupId(value: number[]);
27
+ get selectedGroup(): string[];
28
+ set selectedGroup(value: string[]);
30
29
  get selectedLevel(): number[];
31
30
  set selectedLevel(value: number[]);
32
31
  get refreshCycle(): HistoryCurveRefreshCycleEnum;
@@ -37,7 +36,8 @@ export declare class AlarmFilterSettingComponent extends ConfigureComponentBase
37
36
  ngOnInit(): void;
38
37
  validate(): boolean;
39
38
  loadGroups(): void;
40
- getAlarmNames(callback?: any): void;
39
+ getAlarmNames(): void;
40
+ alarmIsShow(alarm: any): boolean;
41
41
  getLevelColor(alarmLevel: any): string;
42
42
  getLevelText(alarmLevel: any): string;
43
43
  clearSelect(): void;
@@ -34,7 +34,6 @@ var AlarmFilterSettingComponent = /** @class */ (function (_super) {
34
34
  var _this = _super.call(this, injector) || this;
35
35
  _this.alarmGroupService = alarmGroupService;
36
36
  _this.alarmRegistrationsService = alarmRegistrationsService;
37
- _this.detailsData = [];
38
37
  _this.enumAlarmType = AlarmType;
39
38
  _this.alarmLevelList = [];
40
39
  _this.levelColors = ['#3695FF', '#FFE900', '#FFA800', '#E84F4F'];
@@ -54,12 +53,12 @@ var AlarmFilterSettingComponent = /** @class */ (function (_super) {
54
53
  enumerable: true,
55
54
  configurable: true
56
55
  });
57
- Object.defineProperty(AlarmFilterSettingComponent.prototype, "selectedGroupId", {
56
+ Object.defineProperty(AlarmFilterSettingComponent.prototype, "selectedGroup", {
58
57
  get: function () {
59
- return this.data.selectedGroupId;
58
+ return this.data.selectedGroup;
60
59
  },
61
60
  set: function (value) {
62
- this.data.selectedGroupId = value;
61
+ this.data.selectedGroup = value;
63
62
  },
64
63
  enumerable: true,
65
64
  configurable: true
@@ -95,11 +94,9 @@ var AlarmFilterSettingComponent = /** @class */ (function (_super) {
95
94
  configurable: true
96
95
  });
97
96
  AlarmFilterSettingComponent.prototype.ngOnInit = function () {
98
- var _a;
99
- this.detailsData = ((_a = this.data) === null || _a === void 0 ? void 0 : _a.detailsData) || [];
100
97
  this.alarmLevelList = [];
101
- for (var _i = 0, _b = Object.entries(EnumAlarmLevel); _i < _b.length; _i++) {
102
- var _c = _b[_i], propertyKey = _c[0], propertyValue = _c[1];
98
+ for (var _i = 0, _a = Object.entries(EnumAlarmLevel); _i < _a.length; _i++) {
99
+ var _b = _a[_i], propertyKey = _b[0], propertyValue = _b[1];
103
100
  if (Number.isNaN(Number(propertyValue))) {
104
101
  continue;
105
102
  }
@@ -110,7 +107,6 @@ var AlarmFilterSettingComponent = /** @class */ (function (_super) {
110
107
  };
111
108
  AlarmFilterSettingComponent.prototype.validate = function () {
112
109
  this.setDetailsData();
113
- this.data.detailsData = this.detailsData;
114
110
  if (this.data.detailsData.length === 0) {
115
111
  this.message.error(this.lc('AtLeastSelectOneAlarm'));
116
112
  return false;
@@ -124,25 +120,29 @@ var AlarmFilterSettingComponent = /** @class */ (function (_super) {
124
120
  _this.groupList = result;
125
121
  });
126
122
  };
127
- AlarmFilterSettingComponent.prototype.getAlarmNames = function (callback) {
123
+ AlarmFilterSettingComponent.prototype.getAlarmNames = function () {
128
124
  var _this = this;
129
125
  this.loading = true;
130
- this.alarmRegistrationsService.getConfigureAlarms(this.configureId, undefined, undefined, this.selectedLevel, undefined, this.selectedGroupId, undefined, undefined, 1000, 0)
126
+ this.alarmRegistrationsService.getConfigureAlarms(this.configureId, undefined, undefined, undefined, undefined, undefined, undefined, undefined, 1000, 0)
131
127
  .pipe(finalize(function () { return _this.loading = false; }))
132
128
  .subscribe(function (response) {
133
- if (callback)
134
- callback();
135
129
  var details = [];
136
- details = response.items.map(function (item) {
137
- return {
138
- isEnabled: !!_this.detailsData.find(function (alarm) { return alarm === item.name; }),
130
+ response.items.forEach(function (item) {
131
+ details.push({
132
+ id: item.id,
133
+ isShow: _this.alarmIsShow(item),
134
+ isEnabled: !!_this.data.detailsData.find(function (alarm) { return alarm.id === item.id; }),
139
135
  alarmName: item.name,
140
- alarmLevel: item.alarmLevel
141
- };
136
+ alarmLevel: item.alarmLevel,
137
+ groupName: item.groupName
138
+ });
142
139
  });
143
140
  _this.details = details;
144
141
  });
145
142
  };
143
+ AlarmFilterSettingComponent.prototype.alarmIsShow = function (alarm) {
144
+ return (this.selectedGroup.length === 0 || this.selectedGroup.includes(alarm.groupName)) && (this.selectedLevel.length === 0 || this.selectedLevel.includes(alarm.alarmLevel));
145
+ };
146
146
  AlarmFilterSettingComponent.prototype.getLevelColor = function (alarmLevel) {
147
147
  return this.levelColors[alarmLevel];
148
148
  };
@@ -150,7 +150,6 @@ var AlarmFilterSettingComponent = /** @class */ (function (_super) {
150
150
  return this.levelText[alarmLevel];
151
151
  };
152
152
  AlarmFilterSettingComponent.prototype.clearSelect = function () {
153
- this.detailsData = [];
154
153
  this.details.forEach(function (item) {
155
154
  item.isEnabled = false;
156
155
  });
@@ -160,25 +159,18 @@ var AlarmFilterSettingComponent = /** @class */ (function (_super) {
160
159
  };
161
160
  AlarmFilterSettingComponent.prototype.groupChange = function () {
162
161
  var _this = this;
163
- this.setDetailsData();
164
- this.getAlarmNames(function () {
165
- var _a;
166
- if ((_a = _this.selectedGroupId) === null || _a === void 0 ? void 0 : _a.length) {
167
- var alarmNames_1 = _this.details.map(function (item) { return item.alarmName; });
168
- _this.detailsData = _this.detailsData.filter(function (alarmName) {
169
- if (alarmNames_1.includes(alarmName)) {
170
- return alarmName;
171
- }
172
- });
173
- }
174
- else {
175
- _this.detailsData = [];
162
+ this.details.forEach(function (item) {
163
+ item.isShow = _this.alarmIsShow(item);
164
+ if (item.isEnabled && !_this.selectedGroup.includes(item.groupName)) {
165
+ item.isEnabled = false;
176
166
  }
177
167
  });
178
168
  };
179
169
  AlarmFilterSettingComponent.prototype.levelChange = function () {
180
- this.setDetailsData();
181
- this.getAlarmNames();
170
+ var _this = this;
171
+ this.details.forEach(function (item) {
172
+ item.isShow = _this.alarmIsShow(item);
173
+ });
182
174
  };
183
175
  AlarmFilterSettingComponent.prototype.alarmEnabledChange = function (index, event) {
184
176
  if (event.target.checked) {
@@ -190,18 +182,16 @@ var AlarmFilterSettingComponent = /** @class */ (function (_super) {
190
182
  }
191
183
  };
192
184
  AlarmFilterSettingComponent.prototype.setDetailsData = function () {
193
- var _this = this;
185
+ var detailsData = [];
194
186
  this.details.forEach(function (item) {
195
- if (item.isEnabled && !_this.detailsData.includes(item.alarmName)) {
196
- _this.detailsData.push(item.alarmName);
197
- }
198
- else if (!item.isEnabled) {
199
- var index = _this.detailsData.indexOf(item.alarmName);
200
- if (index !== -1) {
201
- _this.detailsData.splice(index, 1);
202
- }
187
+ if (item.isEnabled) {
188
+ detailsData.push({
189
+ id: item.id,
190
+ name: item.alarmName
191
+ });
203
192
  }
204
193
  });
194
+ this.data.detailsData = detailsData;
205
195
  };
206
196
  __decorate([
207
197
  Input(),
@@ -215,7 +205,7 @@ var AlarmFilterSettingComponent = /** @class */ (function (_super) {
215
205
  Component({
216
206
  selector: 'alarm-filter',
217
207
  styles: [".alarm-color-div { width: 100px; height: 26px; margin: auto; display: flex; justify-content: center; align-items: center; color: #ffffff; }"],
218
- template: "<div class=\"fe-modal-content\"> <div class=\"clearfix\"> <div class=\"fe-vertical-label fe-one-third-line float-left\"> <label class=\"fe-vertical-title\">{{lc('AlarmType')}}:</label> <select name=\"alarmType\" class=\"fe-vertical-input\" [(ngModel)]=\"alarmType\" (change)=\"alarmTypeChange()\"> <option [ngValue]=\"enumAlarmType.CurrentAlarm\">{{lc('CurrentAlarm')}}</option> <option [ngValue]=\"enumAlarmType.HistoryAlarm\">{{lc('HistoryAlarm')}}</option> </select> </div> <div *ngIf=\"alarmType === enumAlarmType.HistoryAlarm\" class=\"fe-vertical-label fe-one-third-line float-left\"> <label class=\"fe-vertical-title\">{{lc('RefreshCycle')}}:</label> <select name=\"refreshCycle\" class=\"fe-vertical-input\" [(ngModel)]=\"refreshCycle\"> <option *ngFor=\"let cycle of refreshCycles\" [ngValue]=\"cycle.value\">{{lc(cycle.displayName)}} </option> </select> </div> <div *ngIf=\"alarmType === enumAlarmType.HistoryAlarm\" class=\"fe-vertical-label fe-one-third-line float-left\"> <label class=\"fe-vertical-title\">{{lc('DisplayPeriod')}}:</label> <select name=\"displayPeriod\" class=\"fe-vertical-input\" [(ngModel)]=\"displayPeriod\"> <option *ngFor=\"let period of displayPeriods\" [ngValue]=\"period.value\">{{lc(period.displayName)}} </option> </select> </div> </div> <div class=\"fe-transverse-label clearfix\"> <div class=\"fe-half-line float-left\"> <label class=\"fe-vertical-title\">{{lc(\"AlarmGroup\")}}:</label> <div class=\"fe-vertical-component\"> <nz-select nzMode=\"multiple\" nzAllowClear nzPlaceHolder=\"{{lc('PleaseSelectGroup')}}\" [(ngModel)]=\"selectedGroupId\" (ngModelChange)=\"groupChange()\"> <nz-option *ngFor=\"let item of groupList\" [nzLabel]=\"item.name\" [nzValue]=\"item.id\"></nz-option> </nz-select> </div> </div> <div class=\"fe-half-line float-left\"> <label class=\"fe-vertical-title\">{{lc(\"AlarmLevel\")}}:</label> <div class=\"fe-vertical-component\"> <nz-select nzMode=\"multiple\" nzAllowClear nzPlaceHolder=\"{{lc('AlarmLevel')}}\" [(ngModel)]=\"selectedLevel\" (ngModelChange)=\"levelChange()\"> <nz-option *ngFor=\"let item of alarmLevelList\" [nzLabel]=\"item.name\" [nzValue]=\"item.id\"></nz-option> </nz-select> </div> </div> </div> <div class=\"history-table margin-top-10\"> <table> <thead> <tr> <th width=\"10%\">{{l(\"On\")}}</th> <th width=\"45%\">{{lc(\"AlarmNameG\")}}</th> <th width=\"45%\">{{lc(\"AlarmLevel\")}}</th> </tr> </thead> <tbody> <tr *ngFor=\"let detail of details;index as i;\"> <td width=\"10%\"> <label> <input type=\"checkBox\" [(ngModel)]=\"detail.isEnabled\" (change)=\"alarmEnabledChange(i, $event)\" name=\"isEnabled\" /> </label> </td> <td width=\"45%\">{{detail.alarmName}}</td> <td width=\"45%\"> <div class=\"alarm-color-div\" [ngStyle]=\"{ 'background': getLevelColor(detail.alarmLevel), width: '100px', 'height': '26px', 'margin': 'auto', 'text-align': 'center', 'border-radius': '5px' }\"> {{lc(getLevelText(detail.alarmLevel))}} </div> </td> </tr> </tbody> </table> </div> </div> "
208
+ template: "<div class=\"fe-modal-content\"> <div class=\"clearfix\"> <div class=\"fe-vertical-label fe-one-third-line float-left\"> <label class=\"fe-vertical-title\">{{lc('AlarmType')}}:</label> <select name=\"alarmType\" class=\"fe-vertical-input\" [(ngModel)]=\"alarmType\" (change)=\"alarmTypeChange()\"> <option [ngValue]=\"enumAlarmType.CurrentAlarm\">{{lc('CurrentAlarm')}}</option> <option [ngValue]=\"enumAlarmType.HistoryAlarm\">{{lc('HistoryAlarm')}}</option> </select> </div> <div *ngIf=\"alarmType === enumAlarmType.HistoryAlarm\" class=\"fe-vertical-label fe-one-third-line float-left\"> <label class=\"fe-vertical-title\">{{lc('RefreshCycle')}}:</label> <select name=\"refreshCycle\" class=\"fe-vertical-input\" [(ngModel)]=\"refreshCycle\"> <option *ngFor=\"let cycle of refreshCycles\" [ngValue]=\"cycle.value\">{{lc(cycle.displayName)}} </option> </select> </div> <div *ngIf=\"alarmType === enumAlarmType.HistoryAlarm\" class=\"fe-vertical-label fe-one-third-line float-left\"> <label class=\"fe-vertical-title\">{{lc('DisplayPeriod')}}:</label> <select name=\"displayPeriod\" class=\"fe-vertical-input\" [(ngModel)]=\"displayPeriod\"> <option *ngFor=\"let period of displayPeriods\" [ngValue]=\"period.value\">{{lc(period.displayName)}} </option> </select> </div> </div> <div class=\"fe-transverse-label clearfix\"> <div class=\"fe-half-line float-left\"> <label class=\"fe-vertical-title\">{{lc(\"AlarmGroup\")}}:</label> <div class=\"fe-vertical-component\"> <nz-select nzMode=\"multiple\" nzAllowClear nzPlaceHolder=\"{{lc('PleaseSelectGroup')}}\" [(ngModel)]=\"selectedGroup\" (ngModelChange)=\"groupChange()\"> <nz-option *ngFor=\"let item of groupList\" [nzLabel]=\"item.name\" [nzValue]=\"item.name\"></nz-option> </nz-select> </div> </div> <div class=\"fe-half-line float-left\"> <label class=\"fe-vertical-title\">{{lc(\"AlarmLevel\")}}:</label> <div class=\"fe-vertical-component\"> <nz-select nzMode=\"multiple\" nzAllowClear nzPlaceHolder=\"{{lc('AlarmLevel')}}\" [(ngModel)]=\"selectedLevel\" (ngModelChange)=\"levelChange()\"> <nz-option *ngFor=\"let item of alarmLevelList\" [nzLabel]=\"item.name\" [nzValue]=\"item.id\"></nz-option> </nz-select> </div> </div> </div> <div class=\"history-table margin-top-10\"> <table> <thead> <tr> <th width=\"10%\">{{l(\"On\")}}</th> <th width=\"45%\">{{lc(\"AlarmNameG\")}}</th> <th width=\"45%\">{{lc(\"AlarmLevel\")}}</th> </tr> </thead> <tbody> <tr *ngFor=\"let detail of details;index as i;\"> <ng-container *ngIf=\"detail.isShow\"> <td width=\"10%\"> <label> <input type=\"checkBox\" [(ngModel)]=\"detail.isEnabled\" (change)=\"alarmEnabledChange(i, $event)\" name=\"isEnabled\" /> </label> </td> <td width=\"45%\">{{detail.alarmName}}</td> <td width=\"45%\"> <div class=\"alarm-color-div\" [ngStyle]=\"{ 'background': getLevelColor(detail.alarmLevel), width: '100px', 'height': '26px', 'margin': 'auto', 'text-align': 'center', 'border-radius': '5px' }\"> {{lc(getLevelText(detail.alarmLevel))}} </div> </td> </ng-container> </tr> </tbody> </table> </div> </div> "
219
209
  }),
220
210
  __metadata("design:paramtypes", [Injector,
221
211
  AlarmGroupServiceProxy,
@@ -1 +1 @@
1
- [{"__symbolic":"module","version":4,"metadata":{"AlarmFilterSettingComponent":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../../../../../shared/configure-component-base","name":"ConfigureComponentBase","line":19,"character":49},"decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Component","line":14,"character":1},"arguments":[{"selector":"alarm-filter","styles":[".alarm-color-div { width: 100px; height: 26px; margin: auto; display: flex; justify-content: center; align-items: center; color: #ffffff; }"],"template":"<div class=\"fe-modal-content\"> <div class=\"clearfix\"> <div class=\"fe-vertical-label fe-one-third-line float-left\"> <label class=\"fe-vertical-title\">{{lc('AlarmType')}}:</label> <select name=\"alarmType\" class=\"fe-vertical-input\" [(ngModel)]=\"alarmType\" (change)=\"alarmTypeChange()\"> <option [ngValue]=\"enumAlarmType.CurrentAlarm\">{{lc('CurrentAlarm')}}</option> <option [ngValue]=\"enumAlarmType.HistoryAlarm\">{{lc('HistoryAlarm')}}</option> </select> </div> <div *ngIf=\"alarmType === enumAlarmType.HistoryAlarm\" class=\"fe-vertical-label fe-one-third-line float-left\"> <label class=\"fe-vertical-title\">{{lc('RefreshCycle')}}:</label> <select name=\"refreshCycle\" class=\"fe-vertical-input\" [(ngModel)]=\"refreshCycle\"> <option *ngFor=\"let cycle of refreshCycles\" [ngValue]=\"cycle.value\">{{lc(cycle.displayName)}} </option> </select> </div> <div *ngIf=\"alarmType === enumAlarmType.HistoryAlarm\" class=\"fe-vertical-label fe-one-third-line float-left\"> <label class=\"fe-vertical-title\">{{lc('DisplayPeriod')}}:</label> <select name=\"displayPeriod\" class=\"fe-vertical-input\" [(ngModel)]=\"displayPeriod\"> <option *ngFor=\"let period of displayPeriods\" [ngValue]=\"period.value\">{{lc(period.displayName)}} </option> </select> </div> </div> <div class=\"fe-transverse-label clearfix\"> <div class=\"fe-half-line float-left\"> <label class=\"fe-vertical-title\">{{lc(\"AlarmGroup\")}}:</label> <div class=\"fe-vertical-component\"> <nz-select nzMode=\"multiple\" nzAllowClear nzPlaceHolder=\"{{lc('PleaseSelectGroup')}}\" [(ngModel)]=\"selectedGroupId\" (ngModelChange)=\"groupChange()\"> <nz-option *ngFor=\"let item of groupList\" [nzLabel]=\"item.name\" [nzValue]=\"item.id\"></nz-option> </nz-select> </div> </div> <div class=\"fe-half-line float-left\"> <label class=\"fe-vertical-title\">{{lc(\"AlarmLevel\")}}:</label> <div class=\"fe-vertical-component\"> <nz-select nzMode=\"multiple\" nzAllowClear nzPlaceHolder=\"{{lc('AlarmLevel')}}\" [(ngModel)]=\"selectedLevel\" (ngModelChange)=\"levelChange()\"> <nz-option *ngFor=\"let item of alarmLevelList\" [nzLabel]=\"item.name\" [nzValue]=\"item.id\"></nz-option> </nz-select> </div> </div> </div> <div class=\"history-table margin-top-10\"> <table> <thead> <tr> <th width=\"10%\">{{l(\"On\")}}</th> <th width=\"45%\">{{lc(\"AlarmNameG\")}}</th> <th width=\"45%\">{{lc(\"AlarmLevel\")}}</th> </tr> </thead> <tbody> <tr *ngFor=\"let detail of details;index as i;\"> <td width=\"10%\"> <label> <input type=\"checkBox\" [(ngModel)]=\"detail.isEnabled\" (change)=\"alarmEnabledChange(i, $event)\" name=\"isEnabled\" /> </label> </td> <td width=\"45%\">{{detail.alarmName}}</td> <td width=\"45%\"> <div class=\"alarm-color-div\" [ngStyle]=\"{ 'background': getLevelColor(detail.alarmLevel), width: '100px', 'height': '26px', 'margin': 'auto', 'text-align': 'center', 'border-radius': '5px' }\"> {{lc(getLevelText(detail.alarmLevel))}} </div> </td> </tr> </tbody> </table> </div> </div> "}]}],"members":{"data":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Input","line":21,"character":5}}]}],"configureId":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Input","line":23,"character":5}}]}],"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":77,"character":26},{"__symbolic":"reference","module":"../../../../../shared/service-proxies/service-proxies","name":"AlarmGroupServiceProxy","line":78,"character":44},{"__symbolic":"reference","module":"../../../../../shared/service-proxies/service-proxies","name":"AlarmRegistrationsServiceProxy","line":79,"character":52}]}],"ngOnInit":[{"__symbolic":"method"}],"validate":[{"__symbolic":"method"}],"loadGroups":[{"__symbolic":"method"}],"getAlarmNames":[{"__symbolic":"method"}],"getLevelColor":[{"__symbolic":"method"}],"getLevelText":[{"__symbolic":"method"}],"clearSelect":[{"__symbolic":"method"}],"alarmTypeChange":[{"__symbolic":"method"}],"groupChange":[{"__symbolic":"method"}],"levelChange":[{"__symbolic":"method"}],"alarmEnabledChange":[{"__symbolic":"method"}],"setDetailsData":[{"__symbolic":"method"}]}}}}]
1
+ [{"__symbolic":"module","version":4,"metadata":{"AlarmFilterSettingComponent":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../../../../../shared/configure-component-base","name":"ConfigureComponentBase","line":19,"character":49},"decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Component","line":14,"character":1},"arguments":[{"selector":"alarm-filter","styles":[".alarm-color-div { width: 100px; height: 26px; margin: auto; display: flex; justify-content: center; align-items: center; color: #ffffff; }"],"template":"<div class=\"fe-modal-content\"> <div class=\"clearfix\"> <div class=\"fe-vertical-label fe-one-third-line float-left\"> <label class=\"fe-vertical-title\">{{lc('AlarmType')}}:</label> <select name=\"alarmType\" class=\"fe-vertical-input\" [(ngModel)]=\"alarmType\" (change)=\"alarmTypeChange()\"> <option [ngValue]=\"enumAlarmType.CurrentAlarm\">{{lc('CurrentAlarm')}}</option> <option [ngValue]=\"enumAlarmType.HistoryAlarm\">{{lc('HistoryAlarm')}}</option> </select> </div> <div *ngIf=\"alarmType === enumAlarmType.HistoryAlarm\" class=\"fe-vertical-label fe-one-third-line float-left\"> <label class=\"fe-vertical-title\">{{lc('RefreshCycle')}}:</label> <select name=\"refreshCycle\" class=\"fe-vertical-input\" [(ngModel)]=\"refreshCycle\"> <option *ngFor=\"let cycle of refreshCycles\" [ngValue]=\"cycle.value\">{{lc(cycle.displayName)}} </option> </select> </div> <div *ngIf=\"alarmType === enumAlarmType.HistoryAlarm\" class=\"fe-vertical-label fe-one-third-line float-left\"> <label class=\"fe-vertical-title\">{{lc('DisplayPeriod')}}:</label> <select name=\"displayPeriod\" class=\"fe-vertical-input\" [(ngModel)]=\"displayPeriod\"> <option *ngFor=\"let period of displayPeriods\" [ngValue]=\"period.value\">{{lc(period.displayName)}} </option> </select> </div> </div> <div class=\"fe-transverse-label clearfix\"> <div class=\"fe-half-line float-left\"> <label class=\"fe-vertical-title\">{{lc(\"AlarmGroup\")}}:</label> <div class=\"fe-vertical-component\"> <nz-select nzMode=\"multiple\" nzAllowClear nzPlaceHolder=\"{{lc('PleaseSelectGroup')}}\" [(ngModel)]=\"selectedGroup\" (ngModelChange)=\"groupChange()\"> <nz-option *ngFor=\"let item of groupList\" [nzLabel]=\"item.name\" [nzValue]=\"item.name\"></nz-option> </nz-select> </div> </div> <div class=\"fe-half-line float-left\"> <label class=\"fe-vertical-title\">{{lc(\"AlarmLevel\")}}:</label> <div class=\"fe-vertical-component\"> <nz-select nzMode=\"multiple\" nzAllowClear nzPlaceHolder=\"{{lc('AlarmLevel')}}\" [(ngModel)]=\"selectedLevel\" (ngModelChange)=\"levelChange()\"> <nz-option *ngFor=\"let item of alarmLevelList\" [nzLabel]=\"item.name\" [nzValue]=\"item.id\"></nz-option> </nz-select> </div> </div> </div> <div class=\"history-table margin-top-10\"> <table> <thead> <tr> <th width=\"10%\">{{l(\"On\")}}</th> <th width=\"45%\">{{lc(\"AlarmNameG\")}}</th> <th width=\"45%\">{{lc(\"AlarmLevel\")}}</th> </tr> </thead> <tbody> <tr *ngFor=\"let detail of details;index as i;\"> <ng-container *ngIf=\"detail.isShow\"> <td width=\"10%\"> <label> <input type=\"checkBox\" [(ngModel)]=\"detail.isEnabled\" (change)=\"alarmEnabledChange(i, $event)\" name=\"isEnabled\" /> </label> </td> <td width=\"45%\">{{detail.alarmName}}</td> <td width=\"45%\"> <div class=\"alarm-color-div\" [ngStyle]=\"{ 'background': getLevelColor(detail.alarmLevel), width: '100px', 'height': '26px', 'margin': 'auto', 'text-align': 'center', 'border-radius': '5px' }\"> {{lc(getLevelText(detail.alarmLevel))}} </div> </td> </ng-container> </tr> </tbody> </table> </div> </div> "}]}],"members":{"data":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Input","line":21,"character":5}}]}],"configureId":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Input","line":23,"character":5}}]}],"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":76,"character":26},{"__symbolic":"reference","module":"../../../../../shared/service-proxies/service-proxies","name":"AlarmGroupServiceProxy","line":77,"character":44},{"__symbolic":"reference","module":"../../../../../shared/service-proxies/service-proxies","name":"AlarmRegistrationsServiceProxy","line":78,"character":52}]}],"ngOnInit":[{"__symbolic":"method"}],"validate":[{"__symbolic":"method"}],"loadGroups":[{"__symbolic":"method"}],"getAlarmNames":[{"__symbolic":"method"}],"alarmIsShow":[{"__symbolic":"method"}],"getLevelColor":[{"__symbolic":"method"}],"getLevelText":[{"__symbolic":"method"}],"clearSelect":[{"__symbolic":"method"}],"alarmTypeChange":[{"__symbolic":"method"}],"groupChange":[{"__symbolic":"method"}],"levelChange":[{"__symbolic":"method"}],"alarmEnabledChange":[{"__symbolic":"method"}],"setDetailsData":[{"__symbolic":"method"}]}}}}]
@@ -1,5 +1,8 @@
1
1
  export declare class DetailsModel {
2
+ id: number;
3
+ isShow: boolean;
2
4
  isEnabled: boolean;
3
5
  alarmName: string;
4
6
  alarmLevel: number;
7
+ groupName: string;
5
8
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "main": "bundles/fc-designer.umd.js",
3
- "version": "3.0.1-alpha.6",
3
+ "version": "3.0.1-alpha.7",
4
4
  "module": "public_api.js",
5
5
  "typings": "public_api.d.ts",
6
6
  "license": "UNLICENSED",