@flexem/fc-gui 3.0.0-alpha.157 → 3.0.0-alpha.158

package/communication/variable/variable-state-enum.d.ts

@@ -3,5 +3,6 @@ export declare enum VariableStateEnum {
     Offline = 1,
     Unbind = 3,
     DataNormal = 9,
+    InvalidMonitor = 10,
     Abnormal = 99
 }

package/communication/variable/variable-state-enum.js

@@ -4,5 +4,6 @@ export var VariableStateEnum;
     VariableStateEnum[VariableStateEnum["Offline"] = 1] = "Offline";
     VariableStateEnum[VariableStateEnum["Unbind"] = 3] = "Unbind";
     VariableStateEnum[VariableStateEnum["DataNormal"] = 9] = "DataNormal";
+    VariableStateEnum[VariableStateEnum["InvalidMonitor"] = 10] = "InvalidMonitor";
     VariableStateEnum[VariableStateEnum["Abnormal"] = 99] = "Abnormal";
 })(VariableStateEnum || (VariableStateEnum = {}));

package/communication/variable/variable-state-enum.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"VariableStateEnum":{"Normal":0,"Offline":1,"Unbind":3,"DataNormal":9,"Abnormal":99}}}]
+[{"__symbolic":"module","version":4,"metadata":{"VariableStateEnum":{"Normal":0,"Offline":1,"Unbind":3,"DataNormal":9,"InvalidMonitor":10,"Abnormal":99}}}]

package/config/variable/variable-store.d.ts

@@ -4,4 +4,5 @@ export interface VariableStore {
      * 老数据转换
      */
     getVariableName(input: GetVariableNameArgs): string;
+    getAllVariableNames?(): string[];
 }

package/elements/base/state-control-element.js

@@ -65,26 +65,34 @@ export class StateControlElement extends ConditionalDynamicDisplayElement {
             case VariableStateEnum.Abnormal:
                 currentState = State.Abnormal;
                 break;
+            case VariableStateEnum.InvalidMonitor:
+                currentState = State.InvalidMonitor;
+                break;
         }
         return currentState;
     }
     changeState(state) {
         switch (state) {
+            case State.InvalidMonitor:
+                this.state = State.InvalidMonitor;
+                break;
             case State.Unbind:
-                this.state = State.Unbind;
+                if (this.state !== State.InvalidMonitor) {
+                    this.state = State.Unbind;
+                }
                 break;
             case State.Offline:
-                if (this.state !== State.Unbind) {
+                if (this.state !== State.Unbind && this.state !== State.InvalidMonitor) {
                     this.state = State.Offline;
                 }
                 break;
             case State.Loading:
-                if (this.state !== State.Unbind && this.state !== State.Offline) {
+                if (this.state !== State.Unbind && this.state !== State.Offline && this.state !== State.InvalidMonitor) {
                     this.state = State.Loading;
                 }
                 break;
             case State.Abnormal:
-                if (this.state !== State.Unbind && this.state !== State.Offline && this.state !== State.Loading) {
+                if (this.state !== State.Unbind && this.state !== State.Offline && this.state !== State.Loading && this.state !== State.InvalidMonitor) {
                     this.state = State.Abnormal;
                 }
                 break;
@@ -123,6 +131,11 @@ export class StateControlElement extends ConditionalDynamicDisplayElement {
                 title = this.localization.disable;
                 stroke = '#ff4444';
                 break;
+            case State.InvalidMonitor:
+                url = 'assets/img/loading.svg';
+                title = this.localization.invalidMonitor;
+                stroke = '#226abc';
+                break;
             default:
                 url = 'assets/img/loading.svg';
                 title = this.localization.loading;

package/elements/switch-indicator-light/switch-indicator-light-element.js

@@ -2,7 +2,7 @@ import { LOGGER_SERVICE_TOKEN } from '../../logger';
 import * as d3 from 'd3-selection';
 import { isUndefined } from 'lodash';
 import { IndicatorLightType, SwitchType, State, BitSwitchOperation } from '../../model';
-import { VariableState } from '../../communication';
+import { VariableState, VariableStateEnum } from '../../communication';
 import { ConditionalEnableElement } from '../base/conditional-enable-element';
 import { GraphStateElement } from '../shared/graph/graph-state-element';
 import { TextStateElement } from '../shared/text/text-state-element';
@@ -195,11 +195,18 @@ export class SwitchIndicatorLightElement extends ConditionalEnableElement {
         }
     }
     initIndictorLightOperator() {
+        var _a, _b, _c, _d;
         const settings = this.model.indicatorLightSettings;
         if (settings.settings.variableName) {
             const variable = new VariableDefinition(settings.settings.variableName, settings.settings.variableGroupName, settings.settings.dataSourceCode, settings.settings.variableVersion);
-            this.addElementState(new VariableState(VariableUtil.getConvertedVariableName(this.variableStore, variable), undefined));
+            const convertedName = VariableUtil.getConvertedVariableName(this.variableStore, variable);
+            this.addElementState(new VariableState(convertedName, undefined));
             this.initState();
+            const validNames = (_d = (_c = (_b = (_a = this.guiContext) === null || _a === void 0 ? void 0 : _a.configStore) === null || _b === void 0 ? void 0 : _b.variableStore) === null || _c === void 0 ? void 0 : _c.getAllVariableNames) === null || _d === void 0 ? void 0 : _d.call(_c);
+            if (validNames && !validNames.includes(convertedName)) {
+                this.updateElementStates([new VariableState(convertedName, VariableStateEnum.InvalidMonitor)]);
+                return;
+            }
         }
         switch (settings.type) {
             case IndicatorLightType.Bit:

package/gui/gui-view.js

@@ -2,7 +2,7 @@ import { LOGGER_SERVICE_TOKEN } from '../logger';
 import * as d3 from 'd3-selection';
 import { each, forEach } from 'lodash';
 import { map } from 'rxjs/operators';
-import { VariableStateEnum } from '../communication';
+import { VariableStateEnum, VariableState } from '../communication';
 import { MainElement } from '../elements/main-element';
 import { PerViewVariableCommunicator } from '../elements/per-view-variable-communicator';
 import { ViewPopupBackdropType, ViewPopupLocationType } from '../model';
@@ -64,6 +64,7 @@ export class GuiView {
         this.logger.debug('[GUI] View loaded.');
     }
     loadElementState() {
+        var _a, _b;
         if (!this.mainElement) {
             return;
         }
@@ -108,6 +109,20 @@ export class GuiView {
                 });
             normalVariablesForState.splice(normalVariablesForState.indexOf('设备状态'), 1);
         }
+        const validVariableNames = (_b = (_a = this.context.configStore.variableStore).getAllVariableNames) === null || _b === void 0 ? void 0 : _b.call(_a);
+        if (validVariableNames) {
+            const invalidVariables = normalVariablesForState.filter(name => !validVariableNames.includes(name));
+            if (invalidVariables.length > 0) {
+                const unbindStates = invalidVariables.map(name => new VariableState(name, VariableStateEnum.InvalidMonitor));
+                this.mainElement.reportVariableStates(unbindStates);
+                invalidVariables.forEach(name => {
+                    const idx = normalVariablesForState.indexOf(name);
+                    if (idx !== -1) {
+                        normalVariablesForState.splice(idx, 1);
+                    }
+                });
+            }
+        }
         if (normalVariablesForState.length === 0) {
             return;
         }

package/localization/localization.service.d.ts

@@ -29,6 +29,7 @@ export interface Localization {
     offline: any;
     abnormal: any;
     disable: any;
+    invalidMonitor: any;
     permissiontip: any;
     conditionIsNotMetTip: any;
     chartNoData: any;

package/localization/localization.service.js

@@ -29,6 +29,7 @@ export const DefaultLocalization = {
     offline: 'Offline',
     abnormal: 'Data abnormal',
     disable: 'Disable',
+    invalidMonitor: 'Element binding monitor point is invalid',
     permissiontip: 'You have no permission to operate.',
     conditionIsNotMetTip: 'Operation conditions not met or variable anomalies.',
     chartNoData: 'No Data Available',

package/localization/localization.service.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"LOCALIZATION":{"__symbolic":"new","expression":{"__symbolic":"reference","module":"@angular/core","name":"InjectionToken","line":2,"character":32},"arguments":["fc.gui.loc"]},"Localization":{"__symbolic":"interface"},"DefaultLocalization":{"loadFailed":"Load failed.","setting":"Setting","submit":"Submit","submitting":"Submitting···","numericalValueRequired":"Numerical value can't be emtpy","invalidNumericalValue":"Numerical value is not valid","writeValueTimeout":"Write value error: Timeout","binaryType":"Binary","decimalType":"Decimal","hexadecimalType":"Hexadecimal","stringType":"String","numericalValueTooLong":"Numerical value too long","fractionDigitsMustLessThan":"Fraction digits must be less than ","canNotBeNegative":"Can not be negative","valueOutOfRange":"Numerical value is out of range","timeout":"timeout","confirmOperationPrompt":"Are you sure you want to perform this operation?","confirm":"Yes","cancel":"Cancel","characterInputRequired":"Character input can't be empty","character":"(Character)","characterOutofRange":"Character length is out of range","writeValueRange":"Write value range","loading":"Loading","unbind":"Unbind","offline":"Offline","abnormal":"Data abnormal","disable":"Disable","permissiontip":"You have no permission to operate.","conditionIsNotMetTip":"Operation conditions not met or variable anomalies.","chartNoData":"No Data Available","lastThirtyMinutes":"Last thirty minutes","lastOneHour":"Last one hour","lastEightHour":"Last eight hours","lastTwentyFourHours":"Last 24 hours","lastSevenDays":"Last 7 days","lastThirtyDays":"Last 30 days","lastOneYear":"Last 1 year","grouped":"Grouped","stacked":"Stacked","passwordVerify":"Password verifiers","passwordError":"Password error","password":"Password","passwordToolTip":"Password error, please re-enter","passwordRequired":"Password can't be empty","invalidVideoAddress":"Invalid video address","unconfiguredVideoAddress":"Unconfigured Video Address","weatherNotSupport":"Location not supported","weatherNotAddress":"Address not configured","weatherNotAvailable":"Address not yet available","airQualityNotSupport":"Location not supported","airQualityNotAddress":"Address not configured","airQualityNotAvailable":"Address not yet available"}}}]
+[{"__symbolic":"module","version":4,"metadata":{"LOCALIZATION":{"__symbolic":"new","expression":{"__symbolic":"reference","module":"@angular/core","name":"InjectionToken","line":2,"character":32},"arguments":["fc.gui.loc"]},"Localization":{"__symbolic":"interface"},"DefaultLocalization":{"loadFailed":"Load failed.","setting":"Setting","submit":"Submit","submitting":"Submitting···","numericalValueRequired":"Numerical value can't be emtpy","invalidNumericalValue":"Numerical value is not valid","writeValueTimeout":"Write value error: Timeout","binaryType":"Binary","decimalType":"Decimal","hexadecimalType":"Hexadecimal","stringType":"String","numericalValueTooLong":"Numerical value too long","fractionDigitsMustLessThan":"Fraction digits must be less than ","canNotBeNegative":"Can not be negative","valueOutOfRange":"Numerical value is out of range","timeout":"timeout","confirmOperationPrompt":"Are you sure you want to perform this operation?","confirm":"Yes","cancel":"Cancel","characterInputRequired":"Character input can't be empty","character":"(Character)","characterOutofRange":"Character length is out of range","writeValueRange":"Write value range","loading":"Loading","unbind":"Unbind","offline":"Offline","abnormal":"Data abnormal","disable":"Disable","invalidMonitor":"Element binding monitor point is invalid","permissiontip":"You have no permission to operate.","conditionIsNotMetTip":"Operation conditions not met or variable anomalies.","chartNoData":"No Data Available","lastThirtyMinutes":"Last thirty minutes","lastOneHour":"Last one hour","lastEightHour":"Last eight hours","lastTwentyFourHours":"Last 24 hours","lastSevenDays":"Last 7 days","lastThirtyDays":"Last 30 days","lastOneYear":"Last 1 year","grouped":"Grouped","stacked":"Stacked","passwordVerify":"Password verifiers","passwordError":"Password error","password":"Password","passwordToolTip":"Password error, please re-enter","passwordRequired":"Password can't be empty","invalidVideoAddress":"Invalid video address","unconfiguredVideoAddress":"Unconfigured Video Address","weatherNotSupport":"Location not supported","weatherNotAddress":"Address not configured","weatherNotAvailable":"Address not yet available","airQualityNotSupport":"Location not supported","airQualityNotAddress":"Address not configured","airQualityNotAvailable":"Address not yet available"}}}]

package/localization/localization.service.zh_CN.js

@@ -27,6 +27,7 @@ export const Localization_zh_CN = {
     offline: '离线',
     abnormal: '数据异常',
     disable: '禁用',
+    invalidMonitor: '元件绑定的监控点无效',
     permissiontip: '您无权限执行此操作',
     conditionIsNotMetTip: '操作条件不满足或逻辑控制变量异常',
     chartNoData: '无数据',

package/localization/localization.service.zh_CN.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"Localization_zh_CN":{"loadFailed":"加载失败.","setting":"设置","submit":"提交","submitting":"提交中···","numericalValueRequired":"数值不能为空","invalidNumericalValue":"数值格式不正确","writeValueTimeout":"写值错误：超时","binaryType":"二进制","decimalType":"十进制","hexadecimalType":"十六进制","stringType":"字符串","numericalValueTooLong":"数值超长","fractionDigitsMustLessThan":"小数位不能超过","canNotBeNegative":"不能为负数","valueOutOfRange":"数值超出范围","timeout":"超时","confirmOperationPrompt":"是否确认要执行此操作？","confirm":"确定","cancel":"取消","characterInputRequired":"请输入至少一个字符","character":"(字符串)","characterOutofRange":"字符长度超限","writeValueRange":"写值范围","loading":"加载中","unbind":"未绑定","offline":"离线","abnormal":"数据异常","disable":"禁用","permissiontip":"您无权限执行此操作","conditionIsNotMetTip":"操作条件不满足或逻辑控制变量异常","chartNoData":"无数据","lastThirtyMinutes":"最近30分钟","lastOneHour":"最近1小时","lastEightHour":"最近8小时","lastTwentyFourHours":"最近24小时","lastSevenDays":"最近7天","lastThirtyDays":"最近30天","lastOneYear":"最近1年","grouped":"分组","stacked":"叠加","passwordVerify":"密码校验","passwordError":"密码错误","password":"密码","passwordToolTip":"密码错误，请重新输入","passwordRequired":"密码不能为空","invalidVideoAddress":"无效的视频地址","unconfiguredVideoAddress":"未配置视频地址","weatherNotSupport":"当前位置暂不支持","weatherNotAddress":"当前设备未设置地址","weatherNotAvailable":"暂未获取设备地址","airQualityNotSupport":"当前位置暂不支持","airQualityNotAddress":"当前设备未设置地址","airQualityNotAvailable":"暂未获取设备地址"}}}]
+[{"__symbolic":"module","version":4,"metadata":{"Localization_zh_CN":{"loadFailed":"加载失败.","setting":"设置","submit":"提交","submitting":"提交中···","numericalValueRequired":"数值不能为空","invalidNumericalValue":"数值格式不正确","writeValueTimeout":"写值错误：超时","binaryType":"二进制","decimalType":"十进制","hexadecimalType":"十六进制","stringType":"字符串","numericalValueTooLong":"数值超长","fractionDigitsMustLessThan":"小数位不能超过","canNotBeNegative":"不能为负数","valueOutOfRange":"数值超出范围","timeout":"超时","confirmOperationPrompt":"是否确认要执行此操作？","confirm":"确定","cancel":"取消","characterInputRequired":"请输入至少一个字符","character":"(字符串)","characterOutofRange":"字符长度超限","writeValueRange":"写值范围","loading":"加载中","unbind":"未绑定","offline":"离线","abnormal":"数据异常","disable":"禁用","invalidMonitor":"元件绑定的监控点无效","permissiontip":"您无权限执行此操作","conditionIsNotMetTip":"操作条件不满足或逻辑控制变量异常","chartNoData":"无数据","lastThirtyMinutes":"最近30分钟","lastOneHour":"最近1小时","lastEightHour":"最近8小时","lastTwentyFourHours":"最近24小时","lastSevenDays":"最近7天","lastThirtyDays":"最近30天","lastOneYear":"最近1年","grouped":"分组","stacked":"叠加","passwordVerify":"密码校验","passwordError":"密码错误","password":"密码","passwordToolTip":"密码错误，请重新输入","passwordRequired":"密码不能为空","invalidVideoAddress":"无效的视频地址","unconfiguredVideoAddress":"未配置视频地址","weatherNotSupport":"当前位置暂不支持","weatherNotAddress":"当前设备未设置地址","weatherNotAvailable":"暂未获取设备地址","airQualityNotSupport":"当前位置暂不支持","airQualityNotAddress":"当前设备未设置地址","airQualityNotAvailable":"暂未获取设备地址"}}}]

package/model/shared/state/state.d.ts

@@ -4,5 +4,6 @@ export declare enum State {
     Unbind = 2,
     Abnormal = 3,
     Loading = 4,
+    InvalidMonitor = 5,
     Disable = 9
 }

package/model/shared/state/state.js

@@ -5,5 +5,6 @@ export var State;
     State[State["Unbind"] = 2] = "Unbind";
     State[State["Abnormal"] = 3] = "Abnormal";
     State[State["Loading"] = 4] = "Loading";
+    State[State["InvalidMonitor"] = 5] = "InvalidMonitor";
     State[State["Disable"] = 9] = "Disable";
 })(State || (State = {}));

package/model/shared/state/state.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"State":{"Normal":0,"Offline":1,"Unbind":2,"Abnormal":3,"Loading":4,"Disable":9}}}]
+[{"__symbolic":"module","version":4,"metadata":{"State":{"Normal":0,"Offline":1,"Unbind":2,"Abnormal":3,"Loading":4,"InvalidMonitor":5,"Disable":9}}}]

package/package.json

@@ -1,6 +1,6 @@
 {
 	"main": "bundles/fc-gui.umd.js",
-	"version": "3.0.0-alpha.157",
+	"version": "3.0.0-alpha.158",
 	"module": "public_api.js",
 	"typings": "public_api.d.ts",
 	"license": "UNLICENSED",