@flexem/fc-gui 3.0.0-alpha.16 → 3.0.0-alpha.160

package/elements/main-element.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"MainElement":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":53,"character":43},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":54,"character":41},{"__symbolic":"reference","module":"../gui/gui-context","name":"GuiContext","line":55,"character":34},{"__symbolic":"reference","module":"../communication","name":"VariableCommunicator","line":56,"character":47},{"__symbolic":"reference","module":"../view/popup-view.service","name":"PopupViewService","line":57,"character":43},null]}],"load":[{"__symbolic":"method"}],"uniformStretch":[{"__symbolic":"method"}],"changeVideoStyle":[{"__symbolic":"method"}],"horizontalStretch":[{"__symbolic":"method"}],"initElementState":[{"__symbolic":"method"}],"getVariableNames":[{"__symbolic":"method"}],"reportVariableStates":[{"__symbolic":"method"}],"reportVariableValues":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}],"checkIsLoaded":[{"__symbolic":"method"}],"initBackground":[{"__symbolic":"method"}],"getImageEl":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"MainElement":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":56,"character":43},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":57,"character":41},{"__symbolic":"reference","module":"../gui/gui-context","name":"GuiContext","line":58,"character":34},{"__symbolic":"reference","module":"../communication","name":"VariableCommunicator","line":59,"character":47},{"__symbolic":"reference","module":"../view/popup-view.service","name":"PopupViewService","line":60,"character":43},null]}],"load":[{"__symbolic":"method"}],"uniformStretch":[{"__symbolic":"method"}],"changeVideoStyle":[{"__symbolic":"method"}],"horizontalStretch":[{"__symbolic":"method"}],"initElementState":[{"__symbolic":"method"}],"getVariableNames":[{"__symbolic":"method"}],"reportVariableStates":[{"__symbolic":"method"}],"getVirtualDeviceIdFromRect":[{"__symbolic":"method"}],"reportVariableValues":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}],"checkIsLoaded":[{"__symbolic":"method"}],"initBackground":[{"__symbolic":"method"}],"getImageEl":[{"__symbolic":"method"}]}}}}]

package/elements/meter-element.d.ts

@@ -1,20 +1,26 @@
-import { Meter } from '../model';
-import { VariableCommunicator } from '../communication';
-import { Localization } from '../localization';
-import { ReadableElement } from './base';
-import { VariableStore } from '../config';
-import { PermissionChecker } from '../service';
-export declare class MeterElement extends ReadableElement {
-    private readonly $handEl;
-    private readonly arcPath$;
-    private cx;
-    private cy;
-    private offsetY;
-    private mainElementTransform;
-    readonly model: Meter;
-    constructor(element: HTMLElement, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, localization: Localization, signalRAppId: string);
-    updateVariableValue(value: number): void;
-    private initFrameNode;
-    private getAngle;
-    private directionPoint;
-}
+import { Meter } from '../model';
+import { VariableCommunicator } from '../communication';
+import { Localization } from '../localization';
+import { ReadableElement } from './base';
+import { VariableStore } from '../config';
+import { PermissionChecker } from '../service';
+export declare class MeterElement extends ReadableElement {
+    private static DEFAULT_MIN_VALUE;
+    private static DEFAULT_MAX_VALUE;
+    private readonly $handEl;
+    private readonly arcPath$;
+    private cx;
+    private cy;
+    private offsetY;
+    private mainElementTransform;
+    private valueObj;
+    private isNeedUpdateScale;
+    readonly model: Meter;
+    constructor(element: HTMLElement, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, localization: Localization, signalRAppId: string);
+    private updateValueObj;
+    updateVariableValue(value: number, variableName: any): void;
+    private initFrameNode;
+    private updateScale;
+    private getAngle;
+    private directionPoint;
+}

package/elements/meter-element.js

@@ -1,70 +1,139 @@
-import { ReadableElement } from './base';
-export class MeterElement extends ReadableElement {
-    constructor(element, permissionChecker, variableCommunicator, variableStore, localization, signalRAppId) {
-        super(element, permissionChecker, variableCommunicator, variableStore, localization, signalRAppId);
-        this.cx = 0;
-        this.cy = 0;
-        this.offsetY = 0;
-        let mainEl$;
-        if (this.model.version && this.model.version > 3) {
-            mainEl$ = this.$element.find('[data-id="main"]');
-            this.$handEl = this.$element.find('[data-id="hand"]');
-            this.arcPath$ = this.$element.find('[data-id="arc"]');
-        }
-        else {
-            mainEl$ = this.$element.children().eq(0);
-            this.$handEl = this.$element.find('path[fill=\'red\']'); // 用g:first > path:eq(0)取handle可能因为多次封装取不到所以通过属性取handle
-            this.arcPath$ = this.$element.find('g:first > g:first > path:eq(0)');
-        }
-        if (this.$handEl.length !== 1) {
-            throw new Error('missing meter hand.');
-        }
-        this.mainElementTransform = mainEl$.attr('transform');
-        const snapEl = Snap(this.$handEl[0]);
-        const bBox = snapEl.getBBox(true);
-        const radius = (bBox.x + bBox.width) / 2;
-        this.cx = radius;
-        this.cy = radius - bBox.x;
-        this.offsetY = radius - (bBox.height / 2);
-        setTimeout(() => {
-            this.initFrameNode();
-            this.changeStates();
-        });
-    }
-    updateVariableValue(value) {
-        const angle = this.getAngle(value);
-        this.$handEl.attr('transform', this.mainElementTransform + ` translate(0,${this.offsetY}) rotate(${angle}, ${this.cx}, ${this.cy})`);
-    }
-    initFrameNode() {
-        const b = Snap(this.$element[0]).getBBox();
-        this.rootElement.append('rect').attr('id', 'StateFrame').attr('width', b.width).attr('height', b.height).attr('fill', 'transparent');
-    }
-    getAngle(value) {
-        const min = this.model.min;
-        const max = this.model.max;
-        value = Math.min(Math.max(value, min), max);
-        const len = (value - min) / (max - min);
-        const arcPath = Snap(this.arcPath$[0]);
-        const b = arcPath.getBBox(true);
-        const point = arcPath.getPointAtLength(len * arcPath.getTotalLength());
-        const angle = this.directionPoint({ x: b.width / 2, y: b.height / 2 }, point);
-        return angle;
-    }
-    directionPoint(point1, point2) {
-        const a = point2.x - point1.x;
-        const b = point2.y - point1.y;
-        if (0 === a) {
-            return 0 < b ? 90 : 0 > b ? 270 : 0;
-        }
-        if (0 === b) {
-            return 0 < a ? 0 : 180;
-        }
-        if (isNaN(a) || isNaN(b)) {
-            return 0;
-        }
-        let c = 180 * Math.atan(Math.abs(b / a)) / Math.PI;
-        // eslint-disable-next-line no-unused-expressions
-        0 > a ? c = 0 > b ? c + 180 : 180 - c : 0 > b && (c = 360 - c);
-        return c;
-    }
-}
+import { ReadableElement } from './base';
+import { isNumber } from 'lodash';
+import { VariableValueType } from '../model/shared/condition/variable-value-type';
+export class MeterElement extends ReadableElement {
+    constructor(element, permissionChecker, variableCommunicator, variableStore, localization, signalRAppId) {
+        super(element, permissionChecker, variableCommunicator, variableStore, localization, signalRAppId);
+        this.cx = 0;
+        this.cy = 0;
+        this.offsetY = 0;
+        this.valueObj = {};
+        this.isNeedUpdateScale = false;
+        if ((this.model.minValueType === VariableValueType.Constant && this.model.maxValueType === VariableValueType.Variable)
+            || this.model.maxValueType === VariableValueType.Constant && this.model.minValueType === VariableValueType.Variable) {
+            this.isNeedUpdateScale = true;
+            this.updateScale();
+            this.isNeedUpdateScale = false;
+        }
+        let mainEl$;
+        if (this.model.version && this.model.version > 3) {
+            mainEl$ = this.$element.find('[data-id="main"]');
+            this.$handEl = this.$element.find('[data-id="hand"]');
+            this.arcPath$ = this.$element.find('[data-id="arc"]');
+        }
+        else {
+            mainEl$ = this.$element.children().eq(0);
+            this.$handEl = this.$element.find('path[fill=\'red\']'); // 用g:first > path:eq(0)取handle可能因为多次封装取不到所以通过属性取handle
+            this.arcPath$ = this.$element.find('g:first > g:first > path:eq(0)');
+        }
+        if (this.$handEl.length !== 1) {
+            throw new Error('missing meter hand.');
+        }
+        this.mainElementTransform = mainEl$.attr('transform');
+        const snapEl = Snap(this.$handEl[0]);
+        const bBox = snapEl.getBBox(true);
+        const radius = (bBox.x + bBox.width) / 2;
+        this.cx = radius;
+        this.cy = radius - bBox.x;
+        this.offsetY = radius - (bBox.height / 2);
+        setTimeout(() => {
+            this.initFrameNode();
+            this.changeStates();
+        });
+    }
+    updateValueObj(value, variableName) {
+        var _a, _b, _c;
+        if (((_a = this.model.readVariable) === null || _a === void 0 ? void 0 : _a.name) === variableName) {
+            this.isNeedUpdateScale = false;
+            this.valueObj.value = value;
+        }
+        if (((_b = this.model.minVariable) === null || _b === void 0 ? void 0 : _b.name) === variableName) {
+            this.isNeedUpdateScale = true;
+            this.valueObj.min = value;
+        }
+        if (((_c = this.model.maxVariable) === null || _c === void 0 ? void 0 : _c.name) === variableName) {
+            this.isNeedUpdateScale = true;
+            this.valueObj.max = value;
+        }
+    }
+    updateVariableValue(value, variableName) {
+        this.updateValueObj(value, variableName);
+        this.updateScale();
+        const angle = this.getAngle();
+        if (isNumber(angle)) {
+            this.$handEl.attr('transform', this.mainElementTransform + ` translate(0,${this.offsetY}) rotate(${angle}, ${this.cx}, ${this.cy})`);
+        }
+    }
+    initFrameNode() {
+        const b = Snap(this.$element[0]).getBBox();
+        this.rootElement.append('rect').attr('id', 'StateFrame').attr('width', b.width).attr('height', b.height).attr('fill', 'transparent');
+    }
+    updateScale() {
+        if (!this.isNeedUpdateScale) {
+            return;
+        }
+        let min = this.model.minValueType ? this.valueObj.min : this.model.min;
+        let max = this.model.maxValueType ? this.valueObj.max : this.model.max;
+        min = Number(min);
+        max = Number(max);
+        if (isNaN(min) || isNaN(max)) {
+            min = MeterElement.DEFAULT_MIN_VALUE;
+            max = MeterElement.DEFAULT_MAX_VALUE;
+        }
+        const avgSacle = ((max - min) / this.model.masterDivisionNumber).toFixed(5);
+        const textElements = this.$element.find('g:first > text');
+        for (let i = 0; i < textElements.length; i++) {
+            const text = textElements[i];
+            if (!text.innerHTML) {
+                continue;
+            }
+            let sacleValue = ((Number(avgSacle) * i) + min).toFixed(0);
+            // 整数位和小数位格式化；
+            if (this.model.fractionDigits > 0) {
+                sacleValue = (sacleValue / Math.pow(10, this.model.fractionDigits)).toFixed(this.model.fractionDigits);
+            }
+            if (!isNaN(sacleValue)) {
+                text.innerHTML = sacleValue;
+            }
+        }
+    }
+    getAngle() {
+        let min = this.model.minValueType ? this.valueObj.min : this.model.min;
+        let max = this.model.maxValueType ? this.valueObj.max : this.model.max;
+        min = Number(min);
+        max = Number(max);
+        if (isNaN(min) || isNaN(max)) {
+            min = MeterElement.DEFAULT_MIN_VALUE;
+            max = MeterElement.DEFAULT_MAX_VALUE;
+        }
+        if (!this.valueObj.value && isNaN(Number(this.valueObj.value))) {
+            return undefined;
+        }
+        const value = Math.min(Math.max(this.valueObj.value || 0, min), max);
+        const len = (value - min) / (max - min);
+        const arcPath = Snap(this.arcPath$[0]);
+        const b = arcPath.getBBox(true);
+        const point = arcPath.getPointAtLength(len * arcPath.getTotalLength());
+        const angle = this.directionPoint({ x: b.width / 2, y: b.height / 2 }, point);
+        return angle;
+    }
+    directionPoint(point1, point2) {
+        const a = point2.x - point1.x;
+        const b = point2.y - point1.y;
+        if (0 === a) {
+            return 0 < b ? 90 : 0 > b ? 270 : 0;
+        }
+        if (0 === b) {
+            return 0 < a ? 0 : 180;
+        }
+        if (isNaN(a) || isNaN(b)) {
+            return 0;
+        }
+        let c = 180 * Math.atan(Math.abs(b / a)) / Math.PI;
+        // eslint-disable-next-line no-unused-expressions
+        0 > a ? c = 0 > b ? c + 180 : 180 - c : 0 > b && (c = 360 - c);
+        return c;
+    }
+}
+MeterElement.DEFAULT_MIN_VALUE = 0;
+MeterElement.DEFAULT_MAX_VALUE = 100;

package/elements/meter-element.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"MeterElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"./base","name":"ReadableElement","line":7,"character":34},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":18,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"../service","name":"PermissionChecker","line":18,"character":57},{"__symbolic":"reference","module":"../communication","name":"VariableCommunicator","line":19,"character":30},{"__symbolic":"reference","module":"../config","name":"VariableStore","line":19,"character":67},{"__symbolic":"reference","module":"../localization","name":"Localization","line":19,"character":96},{"__symbolic":"reference","name":"string"}]}],"updateVariableValue":[{"__symbolic":"method"}],"initFrameNode":[{"__symbolic":"method"}],"getAngle":[{"__symbolic":"method"}],"directionPoint":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"MeterElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"./base","name":"ReadableElement","line":9,"character":34},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":25,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"../service","name":"PermissionChecker","line":25,"character":57},{"__symbolic":"reference","module":"../communication","name":"VariableCommunicator","line":26,"character":30},{"__symbolic":"reference","module":"../config","name":"VariableStore","line":26,"character":67},{"__symbolic":"reference","module":"../localization","name":"Localization","line":26,"character":96},{"__symbolic":"reference","name":"string"}]}],"updateValueObj":[{"__symbolic":"method"}],"updateVariableValue":[{"__symbolic":"method"}],"initFrameNode":[{"__symbolic":"method"}],"updateScale":[{"__symbolic":"method"}],"getAngle":[{"__symbolic":"method"}],"directionPoint":[{"__symbolic":"method"}]},"statics":{"DEFAULT_MIN_VALUE":0,"DEFAULT_MAX_VALUE":100}}}}]

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

@@ -1,41 +1,60 @@
-import { Injector } from '@angular/core';
-import { BsModalService } from 'ngx-bootstrap/modal';
-import { GraphStore, VariableStore } from '../../config';
-import { Localization } from '../../localization';
-import { NumericalDisplay } from '../../model';
-import { PermissionChecker, OperationRecordService } from '../../service';
-import { VariableCommunicator } from '../../communication';
-import { ReadableElement } from '../base/readable-element';
-import { SecurityChecker } from '../../security';
-export declare class NumericalDisplayElement extends ReadableElement {
-    private readonly modalService;
-    private readonly graphStore;
-    private readonly operationRecordService;
-    private readonly securityChecker;
-    private readonly dataTypeService;
-    private readonly fractionDigitService;
-    private readonly accessPermissionService;
-    private readonly numericalOperationService;
-    readonly model: NumericalDisplay;
-    private displayText;
-    private readonly logger;
-    private displayForeignObject;
-    private enableDataParsed;
-    get writeVariableName(): string;
-    constructor(element: HTMLElement, injector: Injector, modalService: BsModalService, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, graphStore: GraphStore, operationRecordService: OperationRecordService, securityChecker: SecurityChecker, variableStore: VariableStore, localization: Localization, signalRAppId: string);
-    dispose(): void;
-    initElement(): any;
-    private checkElementPassword;
-    private initVariableText;
-    private initGraphAndText;
-    private doWriteValue;
-    private recordOperation;
-    changeStates(): void;
-    protected updateVariableValue(value: number): void;
-    private updateDisplayText;
-    private rebuildTextElement;
-    private formatNumericalDisplayText;
-    private formatFloatDisplayText;
-    private isNumeric;
-    private formatDisplayTextUnit;
-}
+import { Injector } from '@angular/core';
+import { BsModalService } from 'ngx-bootstrap/modal';
+import { GraphStore, VariableStore } from '../../config';
+import { Localization } from '../../localization';
+import { NumericalDisplay } from '../../model';
+import { PermissionChecker, OperationRecordService, ReleasedVariableService } from '../../service';
+import { VariableCommunicator, VariableValue } from '../../communication';
+import { ReadableElement } from '../base/readable-element';
+import { SecurityChecker } from '../../security';
+import { GuiContext } from '../../gui/gui-context';
+export declare class NumericalDisplayElement extends ReadableElement {
+    private readonly modalService;
+    private readonly graphStore;
+    private readonly operationRecordService;
+    private readonly releasedVariableService;
+    private readonly securityChecker;
+    private readonly guiContext?;
+    private readonly dataTypeService;
+    private readonly fractionDigitService;
+    private readonly accessPermissionService;
+    private readonly numericalOperationService;
+    readonly model: NumericalDisplay;
+    private displayText;
+    private readonly logger;
+    private displayForeignObject;
+    private enableDataParsed;
+    private writeValueMmodalRef;
+    private recordValue;
+    private showValue;
+    private numericalOperation;
+    private restorationTimer;
+    private _resolvedUpperLimitValue;
+    private _resolvedLowerLimitValue;
+    /** 当数值上限配置为变量类型时，返回变量名；否则返回 undefined */
+    get upperLimitVariableName(): string | undefined;
+    /** 当数值下限配置为变量类型时，返回变量名；否则返回 undefined */
+    get lowerLimitVariableName(): string | undefined;
+    get writeVariableName(): string;
+    constructor(element: HTMLElement, injector: Injector, modalService: BsModalService, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, graphStore: GraphStore, operationRecordService: OperationRecordService, releasedVariableService: ReleasedVariableService, securityChecker: SecurityChecker, variableStore: VariableStore, localization: Localization, signalRAppId: string, guiContext?: GuiContext);
+    dispose(): void;
+    /**
+     * 重写父类方法，处理"当前语种ID"系统变量
+     * 当值为null时，显示默认语种ID
+     */
+    reportValueChanged(value: VariableValue): void;
+    initElement(): any;
+    private checkElementPassword;
+    private initVariableText;
+    private initGraphAndText;
+    private doWriteValue;
+    private recordOperation;
+    changeStates(): void;
+    protected updateVariableValue(value: number): void;
+    private updateDisplayText;
+    private rebuildTextElement;
+    private formatNumericalDisplayText;
+    private formatFloatDisplayText;
+    private isNumeric;
+    private formatDisplayTextUnit;
+}