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

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/historical-curve/historical-curve.element.d.ts

@@ -33,6 +33,8 @@ export declare class HistoricalCurveElement extends ConditionalDisplayElement {
      */
     private currentEndTime;
     private currentTimePeriod;
+    private customStartTime;
+    private customEndTime;
     private refreshIntervalId;
     private elementStatus;
     private chartElement;
@@ -42,6 +44,8 @@ export declare class HistoricalCurveElement extends ConditionalDisplayElement {
     private resizeEventListener;
     private isAndroid;
     private needResize;
+    private dropdownListEl;
+    private dropdownTriggerEl;
     constructor(element: HTMLElement, injector: Injector, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, historyDataStore: HistoryDataStore, signalRAppId: string, systemTextLibraryService?: SystemTextLibraryService, languageService?: LanguageService, guiContext?: GuiContext);
     dispose(): void;
     private initKeyboardListener;
@@ -60,7 +64,7 @@ export declare class HistoricalCurveElement extends ConditionalDisplayElement {
     private getCurrentCulture;
     private getValidTimePeriods;
     /**
-     * 获取时间段文案（从系统文本库获取多语种翻译）
+     * 获取时间段文案（从系统文本库获取多语种翻译，fallback 到 localization）
      */
     private getTimePeriodText;
     private updateTimeRange;
@@ -75,6 +79,9 @@ export declare class HistoricalCurveElement extends ConditionalDisplayElement {
     private renderCommonProperty;
     private renderOperationArea;
     private timeFormat;
+    private fmtDatetimeLocal;
+    private showCustomTimeRangeModal;
+    private showCustomTimeRangeModalFallback;
     private loadFirstPage;
     private loadNextPage;
     private loadPreviousPage;

package/elements/historical-curve/historical-curve.element.js

@@ -32,9 +32,13 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
             operationButtonHeight: 24,
             operationButtonMargin: 4
         };
+        this.customStartTime = null;
+        this.customEndTime = null;
         this.elementStatus = HistoricalCurveElementStatus.Loading;
         this.data = [];
         this.needResize = true;
+        this.dropdownListEl = null;
+        this.dropdownTriggerEl = null;
         this.setNeedResize = () => {
             this.needResize = false;
             setTimeout(() => this.needResize = true, 500);
@@ -118,21 +122,43 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
      * 更新语种相关的文案（时间段选择器）
      */
     updateLanguageTexts() {
-        // 重新生成时间段数据
         const updatedTimePeriods = this.getValidTimePeriods();
         this.timePeriods = updatedTimePeriods;
-        // select 在 foreignObject 内部的 HTML 命名空间中，D3 的 rootElement.select('select') 无法跨命名空间查找
-        // 改用 jQuery 查找
-        const nativeSelectEl = this.$element && this.$element.find('select');
-        if (nativeSelectEl && nativeSelectEl.length > 0) {
-            const options = nativeSelectEl.find('option');
-            options.each(function (i) {
+        // 更新下拉列表各选项文字
+        if (this.dropdownListEl) {
+            const items = this.dropdownListEl.querySelectorAll('.hc-dropdown-item');
+            items.forEach((item, i) => {
                 if (i < updatedTimePeriods.length) {
-                    this.text = updatedTimePeriods[i].name;
+                    item.textContent = updatedTimePeriods[i].name;
                 }
             });
+            // 文字更新后重新测量宽度，修正首次加载时文字为空导致宽度过小的问题
+            const prevDisplay = this.dropdownListEl.style.display;
+            const prevVisibility = this.dropdownListEl.style.visibility;
+            this.dropdownListEl.style.display = 'block';
+            this.dropdownListEl.style.visibility = 'hidden';
+            this.dropdownListEl.style.width = '';
+            const newWidth = this.dropdownListEl.offsetWidth;
+            this.dropdownListEl.style.display = prevDisplay;
+            this.dropdownListEl.style.visibility = prevVisibility;
+            this.dropdownListEl.style.width = newWidth + 'px';
+            if (this.dropdownTriggerEl) {
+                this.dropdownTriggerEl.style.width = newWidth + 'px';
+            }
+        }
+        // 更新触发按钮文字（显示当前选中项的最新语言文案）
+        if (this.dropdownTriggerEl) {
+            const selected = updatedTimePeriods.find(p => p.key === Number(this.currentTimePeriod));
+            if (selected) {
+                const textNode = Array.from(this.dropdownTriggerEl.childNodes).find(n => n.nodeType === Node.TEXT_NODE);
+                if (textNode) {
+                    textNode.textContent = selected.name;
+                }
+                else {
+                    this.dropdownTriggerEl.insertBefore(document.createTextNode(selected.name), this.dropdownTriggerEl.firstChild);
+                }
+            }
         }
-        // 如果 select 元素不存在，timePeriods 已更新，下次 renderOperationArea 时会使用新的文本
     }
     /**
      * 获取当前语种的 culture 代码
@@ -168,12 +194,13 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
         timePeriods.push({ key: 3, name: this.getTimePeriodText(TIME_PERIOD_KEYS.LAST_SEVEN_DAYS) });
         timePeriods.push({ key: 4, name: this.getTimePeriodText(TIME_PERIOD_KEYS.LAST_THIRTY_DAYS) });
         timePeriods.push({ key: 5, name: this.getTimePeriodText(TIME_PERIOD_KEYS.LAST_ONE_YEAR) });
+        timePeriods.push({ key: 8, name: this.getTimePeriodText(TIME_PERIOD_KEYS.CUSTOM, this.localization.customTimeRange) });
         return timePeriods;
     }
     /**
-     * 获取时间段文案（从系统文本库获取多语种翻译）
+     * 获取时间段文案（从系统文本库获取多语种翻译，fallback 到 localization）
      */
-    getTimePeriodText(textKey) {
+    getTimePeriodText(textKey, fallback = '') {
         const currentCulture = this.getCurrentCulture();
         const systemType = SYSTEM_TEXT_LIBRARY_TYPES.COMPONENT_BUILTIN;
         if (this.systemTextLibraryService) {
@@ -182,13 +209,20 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
                 return translation;
             }
         }
-        return '';
+        return fallback;
     }
     updateTimeRange(timePeriodType) {
         this.currentTimePeriod = +timePeriodType;
         this.updateQueryTimeRange();
     }
     updateQueryTimeRange() {
+        if (this.currentTimePeriod === 8) {
+            if (this.customStartTime && this.customEndTime) {
+                this.startTime = this.customStartTime.clone();
+                this.endTime = this.customEndTime.clone();
+            }
+            return;
+        }
         this.endTime = moment();
         switch (this.currentTimePeriod) {
             case 1:
@@ -563,18 +597,143 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
         const operationArea = this.rootElement.append('g').attr('transform', `translate(0,${chartHeight + this.displayOption.operationAreaMarginTop})`)
             .append('foreignObject').attr('width', chartWidth).attr('height', this.displayOption.operationAreaHeight).attr('fill', 'none')
             .append('xhtml:div').style('height', (this.displayOption.operationAreaHeight - 4) + 'px').style('overflow', 'hidden').style('margin-top', '4px');
-        const selectElement = operationArea.append('select').style('margin-left', this.displayOption.marginLeft + 'px')
-            .style('background-color', backgroundColor)
-            .style('font-size', this.displayOption.operationSelectFontSize).on('change', () => {
-            const displayTimePeriod = this.rootElement.select('select').property('value');
-            this.updateTimeRange(displayTimePeriod);
-            this.reRenderElement(this.startTime, this.endTime, this.displayOption.dataLimit, HistoricalCurveTimeRange.BeginOpenEndOpen);
-        });
         const rect = this.$element.parent().parent().find('rect');
         const fillColor = rect.attr('fill');
-        const options = selectElement.selectAll('option').data(this.timePeriods).enter().append('option');
-        options.text(d => d.name).attr('value', d => d.key).property('selected', d => d.key === Number(this.currentTimePeriod))
-            .style('background-color', this.model.displaySetting.axisSetting.filterBackgroudColor || fillColor);
+        const dropdownBg = this.model.displaySetting.axisSetting.filterBackgroudColor || fillColor || '#fff';
+        const dropdownWrapper = operationArea.append('div')
+            .style('display', 'inline-block')
+            .style('position', 'relative')
+            .style('margin-left', this.displayOption.marginLeft + 'px')
+            .style('vertical-align', 'middle');
+        const selectedText = this.timePeriods.find(t => t.key === Number(this.currentTimePeriod));
+        const dropdownTrigger = dropdownWrapper.append('div')
+            .attr('class', 'hc-dropdown-trigger')
+            .style('background-color', backgroundColor)
+            .style('font-size', this.displayOption.operationSelectFontSize)
+            .style('cursor', 'pointer')
+            .style('padding', '0 18px 0 4px')
+            .style('border', '1px solid #ccc')
+            .style('border-radius', '2px')
+            .style('position', 'relative')
+            .style('white-space', 'nowrap')
+            .style('line-height', (this.displayOption.operationAreaHeight - 8) + 'px')
+            .style('min-height', (this.displayOption.operationAreaHeight - 8) + 'px')
+            .text(selectedText ? selectedText.name : '');
+        dropdownTrigger.append('span')
+            .style('position', 'absolute')
+            .style('right', '4px')
+            .style('top', '50%')
+            .style('transform', 'translateY(-50%)')
+            .style('font-size', '10px')
+            .style('pointer-events', 'none')
+            .text('▼');
+        const dropdownListEl = document.createElement('div');
+        dropdownListEl.style.cssText = 'display:none;position:fixed;background:' + dropdownBg
+            + ';border:1px solid #ccc;border-radius:2px;z-index:9999;box-shadow:0 2px 6px rgba(0,0,0,0.15);';
+        document.body.appendChild(dropdownListEl);
+        this.dropdownListEl = dropdownListEl;
+        this.dropdownTriggerEl = dropdownTrigger.node();
+        const dropdownList = d3.select(dropdownListEl);
+        this.timePeriods.forEach(tp => {
+            dropdownList.append('div')
+                .attr('class', 'hc-dropdown-item')
+                .style('padding', '4px 8px')
+                .style('cursor', 'pointer')
+                .style('white-space', 'nowrap')
+                .style('font-size', this.displayOption.operationSelectFontSize)
+                .style('line-height', (this.displayOption.operationAreaHeight - 8) + 'px')
+                .style('min-height', (this.displayOption.operationAreaHeight - 8) + 'px')
+                .style('background', tp.key === Number(this.currentTimePeriod) ? '#1890ff' : 'transparent')
+                .style('color', tp.key === Number(this.currentTimePeriod) ? '#fff' : '#333')
+                .text(tp.name)
+                .on('mouseover', function () {
+                const el = d3.select(this);
+                if (!el.classed('hc-dropdown-selected')) {
+                    el.style('background', '#e6f7ff').style('color', '#333');
+                }
+            })
+                .on('mouseout', function () {
+                const el = d3.select(this);
+                if (!el.classed('hc-dropdown-selected')) {
+                    el.style('background', 'transparent').style('color', '#333');
+                }
+            })
+                .on('click', () => {
+                dropdownListEl.style.display = 'none';
+                // 从 this.timePeriods 实时查找，确保语种切换后显示最新文案
+                const currentPeriod = this.timePeriods.find(p => p.key === tp.key);
+                const currentName = currentPeriod ? currentPeriod.name : tp.name;
+                dropdownTrigger.text(currentName);
+                dropdownTrigger.append('span')
+                    .style('position', 'absolute')
+                    .style('right', '4px')
+                    .style('top', '50%')
+                    .style('transform', 'translateY(-50%)')
+                    .style('font-size', '10px')
+                    .style('pointer-events', 'none')
+                    .text('▼');
+                // 更新选中状态
+                dropdownList.selectAll('.hc-dropdown-item')
+                    .classed('hc-dropdown-selected', false)
+                    .style('background', 'transparent')
+                    .style('color', '#333');
+                d3.select(d3.event.currentTarget)
+                    .classed('hc-dropdown-selected', true)
+                    .style('background', '#1890ff')
+                    .style('color', '#fff');
+                if (tp.key === 8) {
+                    this.showCustomTimeRangeModal();
+                    return;
+                }
+                this.updateTimeRange(tp.key);
+                this.reRenderElement(this.startTime, this.endTime, this.displayOption.dataLimit, HistoricalCurveTimeRange.BeginOpenEndOpen);
+            });
+        });
+        // 测量下拉列表最大宽度，让 trigger 和列表宽度一致
+        dropdownListEl.style.display = 'block';
+        dropdownListEl.style.visibility = 'hidden';
+        const listContentWidth = dropdownListEl.offsetWidth;
+        dropdownListEl.style.display = 'none';
+        dropdownListEl.style.visibility = '';
+        dropdownListEl.style.width = listContentWidth + 'px';
+        dropdownTrigger.node().style.width = listContentWidth + 'px';
+        dropdownTrigger.node().style.boxSizing = 'border-box';
+        const hideDropdown = () => { dropdownListEl.style.display = 'none'; };
+        dropdownTrigger.on('click', () => {
+            const isVisible = dropdownListEl.style.display !== 'none';
+            if (isVisible) {
+                hideDropdown();
+            }
+            else {
+                const triggerNode = dropdownTrigger.node();
+                const triggerRect = triggerNode.getBoundingClientRect();
+                // 设置宽度至少和 trigger 一样宽
+                dropdownListEl.style.minWidth = triggerRect.width + 'px';
+                dropdownListEl.style.left = triggerRect.left + 'px';
+                dropdownListEl.style.display = 'block';
+                const listHeight = dropdownListEl.offsetHeight;
+                const spaceBelow = window.innerHeight - triggerRect.bottom;
+                if (spaceBelow < listHeight) {
+                    // 向上展开
+                    dropdownListEl.style.top = '';
+                    dropdownListEl.style.bottom = (window.innerHeight - triggerRect.top) + 'px';
+                }
+                else {
+                    // 向下展开
+                    dropdownListEl.style.bottom = '';
+                    dropdownListEl.style.top = triggerRect.bottom + 'px';
+                }
+            }
+        });
+        // 点击外部收起
+        document.addEventListener('click', (event) => {
+            const triggerNode = dropdownTrigger.node();
+            if (!dropdownListEl.contains(event.target) && !triggerNode.contains(event.target)) {
+                hideDropdown();
+            }
+        });
+        // 滚动时收起
+        document.addEventListener('scroll', hideDropdown, true);
         const buttonWidth = this.displayOption.operationButtonWidth + 'px', buttonHeight = this.displayOption.operationButtonHeight + 'px';
         operationArea.append('button').style('width', buttonWidth).style('height', buttonHeight).style('border', 'none')
             .style('float', 'right').style('background-image', 'url(assets/img/black_last_page.png)')
@@ -599,6 +758,131 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
     timeFormat(datetime, specifier) {
         return d3.time.format(specifier)(new Date(datetime));
     }
+    fmtDatetimeLocal(d) {
+        const p2 = (n) => (n < 10 ? '0' : '') + n;
+        return d.getFullYear() + '-' + p2(d.getMonth() + 1) + '-' + p2(d.getDate())
+            + 'T' + p2(d.getHours()) + ':' + p2(d.getMinutes()) + ':' + p2(d.getSeconds());
+    }
+    showCustomTimeRangeModal() {
+        const now = new Date();
+        const defaultStart = this.customStartTime ? this.customStartTime.toDate()
+            : new Date(now.getFullYear(), now.getMonth(), now.getDate(), 0, 0, 0);
+        const defaultEnd = this.customEndTime ? this.customEndTime.toDate()
+            : new Date(now.getFullYear(), now.getMonth(), now.getDate(), 23, 59, 59);
+        if (this.guiContext && this.guiContext.showCustomTimeRangeModal) {
+            this.guiContext.showCustomTimeRangeModal({ startTime: defaultStart, endTime: defaultEnd }).then(result => {
+                if (result) {
+                    const momentAny = moment;
+                    this.customStartTime = momentAny(result.startTime);
+                    this.customEndTime = momentAny(result.endTime);
+                    this.updateTimeRange(8);
+                    this.reRenderElement(this.startTime, this.endTime, this.displayOption.dataLimit, HistoricalCurveTimeRange.BeginOpenEndOpen);
+                }
+            });
+            return;
+        }
+        this.showCustomTimeRangeModalFallback();
+    }
+    showCustomTimeRangeModalFallback() {
+        const prevTimePeriod = this.currentTimePeriod;
+        const now = new Date();
+        const defaultStart = this.fmtDatetimeLocal(this.customStartTime ? this.customStartTime.toDate()
+            : new Date(now.getFullYear(), now.getMonth(), now.getDate(), 0, 0, 0));
+        const defaultEnd = this.fmtDatetimeLocal(this.customEndTime ? this.customEndTime.toDate()
+            : new Date(now.getFullYear(), now.getMonth(), now.getDate(), 23, 59, 59));
+        const overlay = document.createElement('div');
+        overlay.style.cssText = 'position:fixed;top:0;left:0;width:100%;height:100%;background:rgba(0,0,0,0.5);z-index:9999;';
+        const modal = document.createElement('div');
+        const modalCss = 'position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);'
+            + 'background:#fff;border-radius:4px;min-width:460px;'
+            + 'box-shadow:0 4px 12px rgba(0,0,0,0.15);font-family:inherit;font-size:14px;';
+        modal.style.cssText = modalCss;
+        const header = document.createElement('div');
+        header.style.cssText = 'display:flex;align-items:center;justify-content:space-between;padding:12px 16px;border-bottom:1px solid #e8e8e8;';
+        const title = document.createElement('span');
+        title.style.cssText = 'font-size:16px;font-weight:500;color:#333;';
+        title.textContent = this.localization.customTimeRange || '自定义';
+        const closeBtn = document.createElement('span');
+        closeBtn.style.cssText = 'cursor:pointer;font-size:18px;color:#999;line-height:1;';
+        closeBtn.textContent = '×';
+        header.appendChild(title);
+        header.appendChild(closeBtn);
+        const body = document.createElement('div');
+        body.style.cssText = 'padding:20px 16px;display:flex;align-items:center;flex-wrap:wrap;gap:8px;';
+        const label = document.createElement('span');
+        label.style.cssText = 'color:#333;white-space:nowrap;';
+        label.textContent = '时间范围：';
+        const inputStyle = 'border:1px solid #d9d9d9;border-radius:4px;padding:4px 8px;font-size:14px;height:32px;outline:none;color:#333;';
+        const startInput = document.createElement('input');
+        startInput.type = 'datetime-local';
+        startInput.setAttribute('step', '1');
+        startInput.value = defaultStart;
+        startInput.style.cssText = inputStyle;
+        const separator = document.createElement('span');
+        separator.textContent = ' - ';
+        separator.style.cssText = 'color:#333;';
+        const endInput = document.createElement('input');
+        endInput.type = 'datetime-local';
+        endInput.setAttribute('step', '1');
+        endInput.value = defaultEnd;
+        endInput.style.cssText = inputStyle;
+        body.appendChild(label);
+        body.appendChild(startInput);
+        body.appendChild(separator);
+        body.appendChild(endInput);
+        const footer = document.createElement('div');
+        footer.style.cssText = 'display:flex;justify-content:flex-end;gap:8px;padding:12px 16px;border-top:1px solid #e8e8e8;';
+        const cancelBtn = document.createElement('button');
+        cancelBtn.textContent = this.localization.cancel || '取消';
+        cancelBtn.style.cssText = 'padding:5px 16px;border:1px solid #d9d9d9;border-radius:4px;background:#fff;cursor:pointer;font-size:14px;color:#333;';
+        const saveBtn = document.createElement('button');
+        saveBtn.textContent = '保存';
+        saveBtn.style.cssText = 'padding:5px 16px;border:none;border-radius:4px;background:#1890ff;color:#fff;cursor:pointer;font-size:14px;';
+        footer.appendChild(cancelBtn);
+        footer.appendChild(saveBtn);
+        modal.appendChild(header);
+        modal.appendChild(body);
+        modal.appendChild(footer);
+        overlay.appendChild(modal);
+        document.body.appendChild(overlay);
+        const close = (revert) => {
+            document.body.removeChild(overlay);
+            if (revert) {
+                const selectEl = this.$element && this.$element.find('select');
+                if (selectEl && selectEl.length) {
+                    selectEl.val(prevTimePeriod.toString());
+                }
+            }
+        };
+        closeBtn.addEventListener('click', () => close(true));
+        cancelBtn.addEventListener('click', () => close(true));
+        saveBtn.addEventListener('click', () => {
+            const startVal = startInput.value;
+            const endVal = endInput.value;
+            if (!startVal) {
+                startInput.style.borderColor = 'red';
+                return;
+            }
+            const startDate = new Date(startVal);
+            const endDate = endVal
+                ? new Date(endVal)
+                : new Date(startDate.getFullYear(), startDate.getMonth(), startDate.getDate(), 23, 59, 59);
+            if (isNaN(startDate.getTime())) {
+                startInput.style.borderColor = 'red';
+                return;
+            }
+            if (endDate.getTime() <= startDate.getTime()) {
+                endInput.style.borderColor = 'red';
+                return;
+            }
+            const momentAny = moment;
+            this.customStartTime = momentAny(startDate);
+            this.customEndTime = momentAny(endDate);
+            close(false);
+            this.updateTimeRange(8);
+            this.reRenderElement(this.startTime, this.endTime, this.displayOption.dataLimit, HistoricalCurveTimeRange.BeginOpenEndOpen);
+        });
+    }
     loadFirstPage() {
         this.updateQueryTimeRange();
         this.reRenderElement(this.startTime, this.endTime, this.displayOption.dataLimit, HistoricalCurveTimeRange.BeginOpenEndOpen);

package/elements/historical-curve/historical-curve.element.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"HistoricalCurveElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-display-element","name":"ConditionalDisplayElement","line":23,"character":44},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":71,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":72,"character":18},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":73,"character":27},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":74,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":75,"character":23},{"__symbolic":"reference","module":"../../config","name":"HistoryDataStore","line":76,"character":43},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"../../service","name":"SystemTextLibraryService","line":78,"character":52},{"__symbolic":"reference","module":"../../service","name":"LanguageService","line":79,"character":43},{"__symbolic":"reference","module":"../../gui/gui-context","name":"GuiContext","line":80,"character":38}]}],"dispose":[{"__symbolic":"method"}],"initKeyboardListener":[{"__symbolic":"method"}],"subscribeLanguageChange":[{"__symbolic":"method"}],"updateLanguageTexts":[{"__symbolic":"method"}],"getCurrentCulture":[{"__symbolic":"method"}],"getValidTimePeriods":[{"__symbolic":"method"}],"getTimePeriodText":[{"__symbolic":"method"}],"updateTimeRange":[{"__symbolic":"method"}],"updateQueryTimeRange":[{"__symbolic":"method"}],"reRenderElement":[{"__symbolic":"method"}],"renderElement":[{"__symbolic":"method"}],"setupTooltipAutoHide":[{"__symbolic":"method"}],"renderChart":[{"__symbolic":"method"}],"initPoint":[{"__symbolic":"method"}],"getLineChart":[{"__symbolic":"method"}],"getMultiBarWithFocusChart":[{"__symbolic":"method"}],"renderCommonProperty":[{"__symbolic":"method"}],"renderOperationArea":[{"__symbolic":"method"}],"timeFormat":[{"__symbolic":"method"}],"loadFirstPage":[{"__symbolic":"method"}],"loadNextPage":[{"__symbolic":"method"}],"loadPreviousPage":[{"__symbolic":"method"}],"loadLastPage":[{"__symbolic":"method"}],"initElementStatus":[{"__symbolic":"method"}],"updateElementStatus":[{"__symbolic":"method"}],"setStatusAsUnbound":[{"__symbolic":"method"}],"setStatusAsLoading":[{"__symbolic":"method"}],"setStatusAsLoadFailed":[{"__symbolic":"method"}],"renderStatus":[{"__symbolic":"method"}],"clearStatus":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"HistoricalCurveElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-display-element","name":"ConditionalDisplayElement","line":23,"character":44},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":75,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":76,"character":18},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":77,"character":27},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":78,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":79,"character":23},{"__symbolic":"reference","module":"../../config","name":"HistoryDataStore","line":80,"character":43},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"../../service","name":"SystemTextLibraryService","line":82,"character":52},{"__symbolic":"reference","module":"../../service","name":"LanguageService","line":83,"character":43},{"__symbolic":"reference","module":"../../gui/gui-context","name":"GuiContext","line":84,"character":38}]}],"dispose":[{"__symbolic":"method"}],"initKeyboardListener":[{"__symbolic":"method"}],"subscribeLanguageChange":[{"__symbolic":"method"}],"updateLanguageTexts":[{"__symbolic":"method"}],"getCurrentCulture":[{"__symbolic":"method"}],"getValidTimePeriods":[{"__symbolic":"method"}],"getTimePeriodText":[{"__symbolic":"method"}],"updateTimeRange":[{"__symbolic":"method"}],"updateQueryTimeRange":[{"__symbolic":"method"}],"reRenderElement":[{"__symbolic":"method"}],"renderElement":[{"__symbolic":"method"}],"setupTooltipAutoHide":[{"__symbolic":"method"}],"renderChart":[{"__symbolic":"method"}],"initPoint":[{"__symbolic":"method"}],"getLineChart":[{"__symbolic":"method"}],"getMultiBarWithFocusChart":[{"__symbolic":"method"}],"renderCommonProperty":[{"__symbolic":"method"}],"renderOperationArea":[{"__symbolic":"method"}],"timeFormat":[{"__symbolic":"method"}],"fmtDatetimeLocal":[{"__symbolic":"method"}],"showCustomTimeRangeModal":[{"__symbolic":"method"}],"showCustomTimeRangeModalFallback":[{"__symbolic":"method"}],"loadFirstPage":[{"__symbolic":"method"}],"loadNextPage":[{"__symbolic":"method"}],"loadPreviousPage":[{"__symbolic":"method"}],"loadLastPage":[{"__symbolic":"method"}],"initElementStatus":[{"__symbolic":"method"}],"updateElementStatus":[{"__symbolic":"method"}],"setStatusAsUnbound":[{"__symbolic":"method"}],"setStatusAsLoading":[{"__symbolic":"method"}],"setStatusAsLoadFailed":[{"__symbolic":"method"}],"renderStatus":[{"__symbolic":"method"}],"clearStatus":[{"__symbolic":"method"}]}}}}]

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-context.d.ts

@@ -22,5 +22,12 @@ export interface GuiContext {
     getDefaultLanguageId?(): number;
     getLanguageCultureById?(languageId: number | null): string | null;
     updateCurrentLanguageId?(languageId: number | null): Promise<void>;
+    showCustomTimeRangeModal?(config: {
+        startTime?: Date;
+        endTime?: Date;
+    }): Promise<{
+        startTime: Date;
+        endTime: Date;
+    } | null>;
     dispose(): void;
 }

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;
@@ -39,6 +40,9 @@ export interface Localization {
     lastSevenDays: any;
     lastThirtyDays: any;
     lastOneYear: any;
+    customTimeRange: any;
+    startTime: any;
+    endTime: any;
     grouped: any;
     stacked: any;
     passwordVerify: 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',
@@ -39,6 +40,9 @@ export const DefaultLocalization = {
     lastSevenDays: 'Last 7 days',
     lastThirtyDays: 'Last 30 days',
     lastOneYear: 'Last 1 year',
+    customTimeRange: 'Custom',
+    startTime: 'Start Time',
+    endTime: 'End Time',
     grouped: 'Grouped',
     stacked: 'Stacked',
     passwordVerify: 'Password verifiers',