@flexem/fc-gui 3.0.0-alpha.12 → 3.0.0-alpha.121

package/elements/base/readable-element.js

@@ -36,6 +36,33 @@ export class ReadableElement extends ConditionalEnableElement {
             return VariableUtil.getConvertedVariableName(this.variableStore, variable);
         }
     }
+    get minVariableName() {
+        if (!this.model.minValueType) {
+            return undefined;
+        }
+        return this.getVariableName(this.model.minVariable);
+    }
+    get minValueType() {
+        return this.model.minValueType;
+    }
+    get maxVariableName() {
+        if (!this.model.maxValueType) {
+            return undefined;
+        }
+        return this.getVariableName(this.model.maxVariable);
+    }
+    get maxValueType() {
+        return this.model.maxValueType;
+    }
+    getVariableName(variable) {
+        if (!this.model) {
+            throw new Error('Model cannot be null');
+        }
+        if (!variable) {
+            return undefined;
+        }
+        return VariableUtil.getConvertedVariableName(this.variableStore, variable);
+    }
     reportStateChanged(variableState) {
         forEach(this.elementStates, elementState => {
             if (elementState.variableName === variableState.variableName) {
@@ -45,14 +72,40 @@ export class ReadableElement extends ConditionalEnableElement {
         });
     }
     reportValueChanged(value) {
+        var _a, _b, _c, _d;
         forEach(this.elementStates, elementState => {
             if (elementState.variableName === value.variableName) {
                 elementState.state = value.state;
                 this.changeStates();
             }
         });
-        if (this.state === State.Normal || this.state === State.Disable) {
-            this.updateVariableValue(value.value);
+        if (value.systemName !== '设备状态' && (this.state === State.Normal || this.state === State.Disable
+            || value.variableName === this.minVariableName
+            || value.variableName === this.maxVariableName)) {
+            this.updateVariableValue(value.value, value.variableName);
+        }
+        if (value.systemName === '设备状态') {
+            let name = value.customStatus;
+            const language = ((_b = (_a = window.abp.localization) === null || _a === void 0 ? void 0 : _a.currentLanguage) === null || _b === void 0 ? void 0 : _b.name) || ((_d = (_c = this.localization.localizationService) === null || _c === void 0 ? void 0 : _c.translate) === null || _d === void 0 ? void 0 : _d.currentLang);
+            const isChinese = language === 'zh-Hans' || language === 'zh';
+            if (!name) {
+                switch (value.state) {
+                    case 1:
+                        name = isChinese ? '在线' : 'Online';
+                        break;
+                    case 3:
+                        name = isChinese ? '离线' : 'Offline';
+                        break;
+                    case 4:
+                        name = isChinese ? '告警' : 'Alarming';
+                        break;
+                    case 5:
+                        name = isChinese ? '未绑定' : 'Unbound';
+                        break;
+                    default:
+                }
+            }
+            this.updateVariableValue(name, '设备状态');
         }
     }
 }

package/elements/base/readable-element.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"ReadableElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"./conditional-enable-element","name":"ConditionalEnableElement","line":9,"character":46},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":13,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":13,"character":57},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":13,"character":98},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":14,"character":23},{"__symbolic":"reference","module":"../../localization","name":"Localization","line":14,"character":52},{"__symbolic":"reference","name":"string"}]}],"init":[{"__symbolic":"method"}],"updateVariableValue":[{"__symbolic":"method"}],"reportStateChanged":[{"__symbolic":"method"}],"reportValueChanged":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"ReadableElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"./conditional-enable-element","name":"ConditionalEnableElement","line":9,"character":46},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":13,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":13,"character":57},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":13,"character":98},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":14,"character":23},{"__symbolic":"reference","module":"../../localization","name":"Localization","line":14,"character":52},{"__symbolic":"reference","name":"string"}]}],"init":[{"__symbolic":"method"}],"getVariableName":[{"__symbolic":"method"}],"updateVariableValue":[{"__symbolic":"method"}],"reportStateChanged":[{"__symbolic":"method"}],"reportValueChanged":[{"__symbolic":"method"}]}}}}]

package/elements/base/state-control-element.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="jquery" />
+/// <reference types="jqueryui" />
 import { PermissionChecker } from '../../service';
 import { Localization } from '../../localization';
 import { VariableCommunicator, VariableState } from '../../communication';
@@ -9,7 +11,7 @@ export declare abstract class StateControlElement extends ConditionalDynamicDisp
     isEnable: boolean;
     elementStates: VariableState[];
     state: State;
-    private currentRect;
+    currentRect: JQuery;
     preState: State;
     constructor(element: HTMLElement, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, localization: Localization, signalRAppId: string);
     initState(): void;

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

@@ -139,6 +139,9 @@ export class StateControlElement extends ConditionalDynamicDisplayElement {
         if (!this.currentRect.length) {
             return;
         }
+        // 元件绑定设备状态时不需要在右上角显示状态
+        if (this.$element[0].dataset.model.includes('设备状态'))
+            return;
         const document = this.$element[0].ownerDocument;
         const imgObj = document.createElementNS('http://www.w3.org/2000/svg', 'image');
         if (imgObj) {

package/elements/datetime-display/datetime-display-element.d.ts

@@ -13,6 +13,7 @@ export declare class DatetimeDisplayElement extends ConditionalDisplayElement {
     protected readonly model: DatetimeDisplay;
     protected readonly logger: LoggerService;
     private readonly $dateTimeText;
+    private timeZoneMap;
     constructor(element: HTMLElement, injector: Injector, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, graphStore: GraphStore, signalRAppId: string);
     private getAndSetCurrentTime;
     private getDatetimeFormat;

package/elements/datetime-display/datetime-display-element.js

@@ -5,6 +5,7 @@ import { TimeFormatType } from '../../model/datetime-display/time-format-type';
 import { ConditionalDisplayElement } from '../base/conditional-display-element';
 import { GraphStateElement } from '../shared/graph/graph-state-element';
 import { LOGGER_SERVICE_TOKEN } from '../../logger';
+import timeZoneOptions from './time-zone-select-json';
 export class DatetimeDisplayElement extends ConditionalDisplayElement {
     constructor(element, injector, permissionChecker, variableCommunicator, variableStore, graphStore, signalRAppId) {
         super(element, permissionChecker, variableCommunicator, variableStore, signalRAppId);
@@ -12,7 +13,12 @@ export class DatetimeDisplayElement extends ConditionalDisplayElement {
         this.variableCommunicator = variableCommunicator;
         this.variableStore = variableStore;
         this.graphStore = graphStore;
+        this.timeZoneMap = new Map();
         this.logger = injector.get(LOGGER_SERVICE_TOKEN);
+        // 初始化时区
+        timeZoneOptions.forEach((item) => {
+            this.timeZoneMap.set(item.key, item.utcoffset);
+        });
         if (this.model.size && this.model.useGraph) {
             this.initGraph(this.model.size.width, this.model.size.height);
         }
@@ -22,11 +28,13 @@ export class DatetimeDisplayElement extends ConditionalDisplayElement {
             this.getAndSetCurrentTime(format);
             setInterval(() => {
                 this.getAndSetCurrentTime(format);
-            }, 1000);
+            }, 100);
         }
     }
     getAndSetCurrentTime(format) {
-        const content = moment().local().format(format);
+        var _a;
+        const currentTimeZone = this.timeZoneMap.get((_a = this.model.timeZone) !== null && _a !== void 0 ? _a : '');
+        const content = moment().utcOffset(currentTimeZone !== null && currentTimeZone !== void 0 ? currentTimeZone : this.timeZoneMap.get('')).format(format);
         this.$dateTimeText.text(content);
         let fontF = this.$dateTimeText.css('font-family');
         if (fontF && fontF.lastIndexOf('msyh') === -1) {

package/elements/datetime-display/datetime-display-element.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"DatetimeDisplayElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-display-element","name":"ConditionalDisplayElement","line":14,"character":44},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":21,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":21,"character":48},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":22,"character":46},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":23,"character":49},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":24,"character":42},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":25,"character":37},{"__symbolic":"reference","name":"string"}]}],"getAndSetCurrentTime":[{"__symbolic":"method"}],"getDatetimeFormat":[{"__symbolic":"method"}],"initGraph":[{"__symbolic":"method"}],"getFormat":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"DatetimeDisplayElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-display-element","name":"ConditionalDisplayElement","line":15,"character":44},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":24,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":24,"character":48},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":25,"character":46},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":26,"character":49},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":27,"character":42},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":28,"character":37},{"__symbolic":"reference","name":"string"}]}],"getAndSetCurrentTime":[{"__symbolic":"method"}],"getDatetimeFormat":[{"__symbolic":"method"}],"initGraph":[{"__symbolic":"method"}],"getFormat":[{"__symbolic":"method"}]}}}}]

package/elements/datetime-display/time-zone-select-json.d.ts

@@ -0,0 +1,8 @@
+/**
+ * 导出时区json
+ */
+declare const timeZoneOptions: {
+    key: string;
+    utcoffset: string;
+}[];
+export default timeZoneOptions;