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

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

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"CharacterDisplayElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/readable-element","name":"ReadableElement","line":19,"character":45},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":28,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":28,"character":48},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":29,"character":39},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":30,"character":30},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":31,"character":37},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":32,"character":27},{"__symbolic":"reference","module":"../../service","name":"OperationRecordService","line":33,"character":49},{"__symbolic":"reference","module":"../../security","name":"SecurityChecker","line":34,"character":42},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":35,"character":23},{"__symbolic":"reference","module":"../../localization","name":"Localization","line":36,"character":22},{"__symbolic":"reference","name":"string"}]}],"updateVariableValue":[{"__symbolic":"method"}],"changeStates":[{"__symbolic":"method"}],"updateDisplayValue":[{"__symbolic":"method"}],"getVariableValueText":[{"__symbolic":"method"}],"characterDisplayText":[{"__symbolic":"method"}],"initElement":[{"__symbolic":"method"}],"initVariableText":[{"__symbolic":"method"}],"initClickEvent":[{"__symbolic":"method"}],"checkElementPassword":[{"__symbolic":"method"}],"doWriteCharacterValue":[{"__symbolic":"method"}],"recordOperation":[{"__symbolic":"method"}],"changeGraph":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"CharacterDisplayElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/readable-element","name":"ReadableElement","line":20,"character":45},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":29,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":29,"character":48},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":30,"character":39},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":31,"character":30},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":32,"character":37},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":33,"character":27},{"__symbolic":"reference","module":"../../service","name":"OperationRecordService","line":34,"character":49},{"__symbolic":"reference","module":"../../security","name":"SecurityChecker","line":35,"character":42},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":36,"character":23},{"__symbolic":"reference","module":"../../localization","name":"Localization","line":37,"character":22},{"__symbolic":"reference","name":"string"}]}],"updateVariableValue":[{"__symbolic":"method"}],"changeStates":[{"__symbolic":"method"}],"updateDisplayValue":[{"__symbolic":"method"}],"getVariableValueText":[{"__symbolic":"method"}],"characterDisplayText":[{"__symbolic":"method"}],"initElement":[{"__symbolic":"method"}],"initVariableText":[{"__symbolic":"method"}],"initClickEvent":[{"__symbolic":"method"}],"checkElementPassword":[{"__symbolic":"method"}],"doWriteCharacterValue":[{"__symbolic":"method"}],"recordOperation":[{"__symbolic":"method"}],"changeGraph":[{"__symbolic":"method"}]}}}}]

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

@@ -1,21 +1,22 @@
-import { DatetimeDisplay } from '../../model/datetime-display/datetime-display';
-import { PermissionChecker } from '../../service';
-import { VariableCommunicator } from '../../communication';
-import { ConditionalDisplayElement } from '../base/conditional-display-element';
-import { GraphStore, VariableStore } from '../../config';
-import { LoggerService } from '../../logger';
-import { Injector } from '@angular/core';
-export declare class DatetimeDisplayElement extends ConditionalDisplayElement {
-    protected readonly permissionChecker: PermissionChecker;
-    protected readonly variableCommunicator: VariableCommunicator;
-    protected readonly variableStore: VariableStore;
-    private readonly graphStore;
-    protected readonly model: DatetimeDisplay;
-    protected readonly logger: LoggerService;
-    private readonly $dateTimeText;
-    constructor(element: HTMLElement, injector: Injector, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, graphStore: GraphStore, signalRAppId: string);
-    private getAndSetCurrentTime;
-    private getDatetimeFormat;
-    private initGraph;
-    private getFormat;
-}
+import { DatetimeDisplay } from '../../model/datetime-display/datetime-display';
+import { PermissionChecker } from '../../service';
+import { VariableCommunicator } from '../../communication';
+import { ConditionalDisplayElement } from '../base/conditional-display-element';
+import { GraphStore, VariableStore } from '../../config';
+import { LoggerService } from '../../logger';
+import { Injector } from '@angular/core';
+export declare class DatetimeDisplayElement extends ConditionalDisplayElement {
+    protected readonly permissionChecker: PermissionChecker;
+    protected readonly variableCommunicator: VariableCommunicator;
+    protected readonly variableStore: VariableStore;
+    private readonly graphStore;
+    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;
+    private initGraph;
+    private getFormat;
+}

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

@@ -1,132 +1,140 @@
-import * as moment from 'moment';
-import { DateFormatType } from '../../model/datetime-display/date-format-type';
-import { DatetimeSeparatorType } from '../../model/datetime-display/datetime-separator-type';
-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';
-export class DatetimeDisplayElement extends ConditionalDisplayElement {
-    constructor(element, injector, permissionChecker, variableCommunicator, variableStore, graphStore, signalRAppId) {
-        super(element, permissionChecker, variableCommunicator, variableStore, signalRAppId);
-        this.permissionChecker = permissionChecker;
-        this.variableCommunicator = variableCommunicator;
-        this.variableStore = variableStore;
-        this.graphStore = graphStore;
-        this.logger = injector.get(LOGGER_SERVICE_TOKEN);
-        if (this.model.size && this.model.useGraph) {
-            this.initGraph(this.model.size.width, this.model.size.height);
-        }
-        if (this.model.showDate || this.model.showWeek || this.model.showTime) {
-            this.$dateTimeText = this.$element.find('text').last();
-            const format = this.getDatetimeFormat(this.model);
-            this.getAndSetCurrentTime(format);
-            setInterval(() => {
-                this.getAndSetCurrentTime(format);
-            }, 1000);
-        }
-    }
-    getAndSetCurrentTime(format) {
-        const content = moment().local().format(format);
-        this.$dateTimeText.text(content);
-        let fontF = this.$dateTimeText.css('font-family');
-        if (fontF && fontF.lastIndexOf('msyh') === -1) {
-            this.$dateTimeText.css('font-family', fontF += ', msyh');
-        }
-    }
-    getDatetimeFormat(displaySetting) {
-        let timeFormat = '';
-        // 显示4位年份
-        const yearFormat = displaySetting.showFullYear ? 'YYYY' : 'YY';
-        // 分隔符
-        let seperator = '';
-        // 日月清零
-        const monthFormat = displaySetting.showMonthDayWithoutZero ? 'M' : 'MM';
-        const dayFormat = displaySetting.showMonthDayWithoutZero ? 'D' : 'DD';
-        if (displaySetting.showDate) {
-            switch (displaySetting.datetimeSeparator) {
-                case DatetimeSeparatorType.Slash:
-                    seperator = '/';
-                    break;
-                case DatetimeSeparatorType.Line:
-                    seperator = '-';
-                    break;
-                case DatetimeSeparatorType.Dot:
-                    seperator = '.';
-                    break;
-                case DatetimeSeparatorType.CHS:
-                    // 年月日格式在构造时候处理
-                    break;
-            }
-            // TODO 方法重写
-            timeFormat = this.getFormat(displaySetting.dateFormat, yearFormat, monthFormat, dayFormat, seperator);
-        }
-        if (displaySetting.showWeek) {
-            timeFormat += ' ddd';
-        }
-        if (displaySetting.showTime) {
-            timeFormat += ' ';
-            if (displaySetting.isTwelveHourHex) {
-                timeFormat += 'A ';
-                switch (displaySetting.timeFormat) {
-                    case TimeFormatType.HHMMSS:
-                        timeFormat += 'h:mm:ss';
-                        break;
-                    case TimeFormatType.HHMM:
-                        timeFormat += 'h:mm';
-                        break;
-                }
-            }
-            else {
-                switch (displaySetting.timeFormat) {
-                    case TimeFormatType.HHMMSS:
-                        timeFormat += 'HH:mm:ss';
-                        break;
-                    case TimeFormatType.HHMM:
-                        timeFormat += 'HH:mm';
-                        break;
-                }
-            }
-        }
-        return timeFormat;
-    }
-    initGraph(width, height) {
-        if (this.model.useGraph === true) {
-            const graphStateElement = new GraphStateElement(this.model.graphSetting, width, height, this.graphStore, this.logger);
-            graphStateElement.switchToState(0);
-            this.$element.prepend(graphStateElement.Element);
-        }
-    }
-    getFormat(dateFormatType, yearFormat, monthFormat, dayFormat, seperator) {
-        const yearSeperator = '年';
-        const monthSeperator = '月';
-        const daySeperator = '日';
-        let _dateFormat = '';
-        if (seperator === '') {
-            switch (dateFormatType) {
-                case DateFormatType.YYMMDD:
-                    _dateFormat = yearFormat + yearSeperator + monthFormat + monthSeperator + dayFormat + daySeperator;
-                    break;
-                case DateFormatType.MMDDYY:
-                    _dateFormat = monthFormat + monthSeperator + dayFormat + daySeperator + yearFormat + yearSeperator;
-                    break;
-                case DateFormatType.DDMMYY:
-                    _dateFormat = dayFormat + daySeperator + monthFormat + monthSeperator + yearFormat + yearSeperator;
-                    break;
-            }
-        }
-        else {
-            switch (dateFormatType) {
-                case DateFormatType.YYMMDD:
-                    _dateFormat = yearFormat + seperator + monthFormat + seperator + dayFormat;
-                    break;
-                case DateFormatType.MMDDYY:
-                    _dateFormat = monthFormat + seperator + dayFormat + seperator + yearFormat;
-                    break;
-                case DateFormatType.DDMMYY:
-                    _dateFormat = dayFormat + seperator + monthFormat + seperator + yearFormat;
-                    break;
-            }
-        }
-        return _dateFormat;
-    }
-}
+import * as moment from 'moment';
+import { DateFormatType } from '../../model/datetime-display/date-format-type';
+import { DatetimeSeparatorType } from '../../model/datetime-display/datetime-separator-type';
+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);
+        this.permissionChecker = permissionChecker;
+        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);
+        }
+        if (this.model.showDate || this.model.showWeek || this.model.showTime) {
+            this.$dateTimeText = this.$element.find('text').last();
+            const format = this.getDatetimeFormat(this.model);
+            this.getAndSetCurrentTime(format);
+            setInterval(() => {
+                this.getAndSetCurrentTime(format);
+            }, 100);
+        }
+    }
+    getAndSetCurrentTime(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) {
+            this.$dateTimeText.css('font-family', fontF += ', msyh');
+        }
+    }
+    getDatetimeFormat(displaySetting) {
+        let timeFormat = '';
+        // 显示4位年份
+        const yearFormat = displaySetting.showFullYear ? 'YYYY' : 'YY';
+        // 分隔符
+        let seperator = '';
+        // 日月清零
+        const monthFormat = displaySetting.showMonthDayWithoutZero ? 'M' : 'MM';
+        const dayFormat = displaySetting.showMonthDayWithoutZero ? 'D' : 'DD';
+        if (displaySetting.showDate) {
+            switch (displaySetting.datetimeSeparator) {
+                case DatetimeSeparatorType.Slash:
+                    seperator = '/';
+                    break;
+                case DatetimeSeparatorType.Line:
+                    seperator = '-';
+                    break;
+                case DatetimeSeparatorType.Dot:
+                    seperator = '.';
+                    break;
+                case DatetimeSeparatorType.CHS:
+                    // 年月日格式在构造时候处理
+                    break;
+            }
+            // TODO 方法重写
+            timeFormat = this.getFormat(displaySetting.dateFormat, yearFormat, monthFormat, dayFormat, seperator);
+        }
+        if (displaySetting.showWeek) {
+            timeFormat += ' ddd';
+        }
+        if (displaySetting.showTime) {
+            timeFormat += ' ';
+            if (displaySetting.isTwelveHourHex) {
+                timeFormat += 'A ';
+                switch (displaySetting.timeFormat) {
+                    case TimeFormatType.HHMMSS:
+                        timeFormat += 'h:mm:ss';
+                        break;
+                    case TimeFormatType.HHMM:
+                        timeFormat += 'h:mm';
+                        break;
+                }
+            }
+            else {
+                switch (displaySetting.timeFormat) {
+                    case TimeFormatType.HHMMSS:
+                        timeFormat += 'HH:mm:ss';
+                        break;
+                    case TimeFormatType.HHMM:
+                        timeFormat += 'HH:mm';
+                        break;
+                }
+            }
+        }
+        return timeFormat;
+    }
+    initGraph(width, height) {
+        if (this.model.useGraph === true) {
+            const graphStateElement = new GraphStateElement(this.model.graphSetting, width, height, this.graphStore, this.logger);
+            graphStateElement.switchToState(0);
+            this.$element.prepend(graphStateElement.Element);
+        }
+    }
+    getFormat(dateFormatType, yearFormat, monthFormat, dayFormat, seperator) {
+        const yearSeperator = '年';
+        const monthSeperator = '月';
+        const daySeperator = '日';
+        let _dateFormat = '';
+        if (seperator === '') {
+            switch (dateFormatType) {
+                case DateFormatType.YYMMDD:
+                    _dateFormat = yearFormat + yearSeperator + monthFormat + monthSeperator + dayFormat + daySeperator;
+                    break;
+                case DateFormatType.MMDDYY:
+                    _dateFormat = monthFormat + monthSeperator + dayFormat + daySeperator + yearFormat + yearSeperator;
+                    break;
+                case DateFormatType.DDMMYY:
+                    _dateFormat = dayFormat + daySeperator + monthFormat + monthSeperator + yearFormat + yearSeperator;
+                    break;
+            }
+        }
+        else {
+            switch (dateFormatType) {
+                case DateFormatType.YYMMDD:
+                    _dateFormat = yearFormat + seperator + monthFormat + seperator + dayFormat;
+                    break;
+                case DateFormatType.MMDDYY:
+                    _dateFormat = monthFormat + seperator + dayFormat + seperator + yearFormat;
+                    break;
+                case DateFormatType.DDMMYY:
+                    _dateFormat = dayFormat + seperator + monthFormat + seperator + yearFormat;
+                    break;
+            }
+        }
+        return _dateFormat;
+    }
+}

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;