@flexem/fc-gui 3.0.0-alpha.165 → 3.0.0-alpha.167

package/bundles/@flexem/fc-gui.umd.js

@@ -22355,7 +22355,7 @@ const Localization_zh_CN = {
     lastTwentyFourHours: '最近24小时',
     lastSevenDays: '最近7天',
     lastThirtyDays: '最近30天',
-    lastOneYear: '最近1年',
+    lastOneYear: '最近半年',
     customTimeRange: '自定义',
     startTime: '开始时间',
     endTime: '结束时间',
@@ -32555,7 +32555,7 @@ const DefaultLocalization = {
     lastTwentyFourHours: 'Last 24 hours',
     lastSevenDays: 'Last 7 days',
     lastThirtyDays: 'Last 30 days',
-    lastOneYear: 'Last 1 year',
+    lastOneYear: 'Last 6 months',
     customTimeRange: 'Custom',
     startTime: 'Start Time',
     endTime: 'End Time',
@@ -35106,22 +35106,19 @@ class state_control_element_StateControlElement extends conditional_dynamic_disp
     }
     changeState(state) {
         switch (state) {
+            case _tmp_model["State"].InvalidMonitor:
+                this.state = _tmp_model["State"].InvalidMonitor;
+                break;
             case _tmp_model["State"].Unbind:
-                // Unbind 优先级最高，可覆盖任何状态
-                this.state = _tmp_model["State"].Unbind;
+                if (this.state !== _tmp_model["State"].InvalidMonitor) {
+                    this.state = _tmp_model["State"].Unbind;
+                }
                 break;
             case _tmp_model["State"].Offline:
-                // Offline 优先级次于 Unbind
-                if (this.state !== _tmp_model["State"].Unbind) {
+                if (this.state !== _tmp_model["State"].Unbind && this.state !== _tmp_model["State"].InvalidMonitor) {
                     this.state = _tmp_model["State"].Offline;
                 }
                 break;
-            case _tmp_model["State"].InvalidMonitor:
-                // InvalidMonitor 优先级低于 Offline/Unbind
-                if (this.state !== _tmp_model["State"].Unbind && this.state !== _tmp_model["State"].Offline) {
-                    this.state = _tmp_model["State"].InvalidMonitor;
-                }
-                break;
             case _tmp_model["State"].Loading:
                 if (this.state !== _tmp_model["State"].Unbind && this.state !== _tmp_model["State"].Offline && this.state !== _tmp_model["State"].InvalidMonitor) {
                     this.state = _tmp_model["State"].Loading;
@@ -36177,7 +36174,7 @@ class character_display_element_CharacterDisplayElement extends readable_element
         }
         const args = new WriteCharacterModalArgs(this.writeVariableName, this.model.isPassword, this.model.charCount, this.displayValue);
         const modalRef = this.modalService.show(write_character_modal_component["a" /* WriteCharacterModalComponent */], {
-            initialState: { args: args }, backdrop: 'static', class: 'gui-modal-dialog-position', animated: false
+            initialState: { args: args }, backdrop: 'static', class: 'gui-modal-dialog-position gui-modal-write', animated: false
         });
         const onClosedSub = modalRef.content.onClosed.subscribe(result => {
             modalRef.hide();
@@ -37165,12 +37162,13 @@ var AxisRangeType;
 
 
 class historical_curve_element_HistoricalCurveElement extends conditional_display_element_ConditionalDisplayElement {
-    constructor(element, injector, permissionChecker, variableCommunicator, variableStore, historyDataStore, signalRAppId, systemTextLibraryService, languageService, guiContext) {
+    constructor(element, injector, permissionChecker, variableCommunicator, variableStore, historyDataStore, signalRAppId, systemTextLibraryService, languageService, guiContext, releasedVariableService) {
         super(element, permissionChecker, variableCommunicator, variableStore, signalRAppId);
         this.historyDataStore = historyDataStore;
         this.systemTextLibraryService = systemTextLibraryService;
         this.languageService = languageService;
         this.guiContext = guiContext;
+        this.releasedVariableService = releasedVariableService;
         this.displayOption = {
             dataLimit: 500,
             dataZoomHeight: 32,
@@ -37346,13 +37344,13 @@ class historical_curve_element_HistoricalCurveElement extends conditional_displa
         timePeriods.push({ key: 3, name: this.getTimePeriodText(service["TIME_PERIOD_KEYS"].LAST_SEVEN_DAYS) });
         timePeriods.push({ key: 4, name: this.getTimePeriodText(service["TIME_PERIOD_KEYS"].LAST_THIRTY_DAYS) });
         timePeriods.push({ key: 5, name: this.getTimePeriodText(service["TIME_PERIOD_KEYS"].LAST_ONE_YEAR) });
-        timePeriods.push({ key: 8, name: this.getTimePeriodText(service["TIME_PERIOD_KEYS"].CUSTOM, this.localization.customTimeRange) });
+        timePeriods.push({ key: 8, name: this.getTimePeriodText(service["TIME_PERIOD_KEYS"].CUSTOM) });
         return timePeriods;
     }
     /**
-     * 获取时间段文案（从系统文本库获取多语种翻译，fallback 到 localization）
+     * 获取时间段文案（从系统文本库获取多语种翻译）
      */
-    getTimePeriodText(textKey, fallback = '') {
+    getTimePeriodText(textKey) {
         const currentCulture = this.getCurrentCulture();
         const systemType = service["SYSTEM_TEXT_LIBRARY_TYPES"].COMPONENT_BUILTIN;
         if (this.systemTextLibraryService) {
@@ -37361,7 +37359,7 @@ class historical_curve_element_HistoricalCurveElement extends conditional_displa
                 return translation;
             }
         }
-        return fallback;
+        return '';
     }
     updateTimeRange(timePeriodType) {
         this.currentTimePeriod = +timePeriodType;
@@ -37834,7 +37832,10 @@ class historical_curve_element_HistoricalCurveElement extends conditional_displa
                     .style('background', '#1890ff')
                     .style('color', '#fff');
                 if (tp.key === 8) {
-                    this.showCustomTimeRangeModal();
+                    const isSimulation = !this.releasedVariableService;
+                    if (!isSimulation) {
+                        this.showCustomTimeRangeModal();
+                    }
                     return;
                 }
                 this.updateTimeRange(tp.key);
@@ -37953,7 +37954,7 @@ class historical_curve_element_HistoricalCurveElement extends conditional_displa
         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 || '自定义';
+        title.textContent = this.getTimePeriodText(service["TIME_PERIOD_KEYS"].CUSTOM);
         const closeBtn = document.createElement('span');
         closeBtn.style.cssText = 'cursor:pointer;font-size:18px;color:#999;line-height:1;';
         closeBtn.textContent = '×';
@@ -38390,16 +38391,22 @@ class numerical_display_element_NumericalDisplayElement extends readable_element
      */
     reportValueChanged(value) {
         var _a, _b, _c;
-        // 拦截上下限变量推送，更新缓存值
+        // 更新上下限变量缓存(不阻断后续处理)
         if (this.upperLimitVariableName && value.variableName === this.upperLimitVariableName) {
             const num = Number(value.value);
             this._resolvedUpperLimitValue = (value.value != null && !isNaN(num)) ? num : undefined;
-            return;
+            // 如果上限变量不是主显示变量，直接返回
+            if (value.variableName !== this.readVariableName) {
+                return;
+            }
         }
         if (this.lowerLimitVariableName && value.variableName === this.lowerLimitVariableName) {
             const num = Number(value.value);
             this._resolvedLowerLimitValue = (value.value != null && !isNaN(num)) ? num : undefined;
-            return;
+            // 如果下限变量不是主显示变量，直接返回
+            if (value.variableName !== this.readVariableName) {
+                return;
+            }
         }
         // 处理系统变量"当前语种ID"
         if (value.variableName === '当前语种ID') {
@@ -38540,15 +38547,27 @@ class numerical_display_element_NumericalDisplayElement extends readable_element
         // 获取数值操作配置，上下限变量类型已在 reportValueChanged 中实时更新到缓存
         const numericalOperation = this.numericalOperationService.getNumericalOperations(this.model);
         // 用缓存的实时值替换变量类型上下限
+        // 模拟模式下（releasedVariableService 为空）变量无实时值，直接使用数据类型默认范围
+        const isSimulation = !this.releasedVariableService;
         if (typeof numericalOperation.numericalUpperLimit === 'object' && numericalOperation.numericalUpperLimit.type === 1) {
-            numericalOperation.numericalUpperLimit = this._resolvedUpperLimitValue != null
-                ? this._resolvedUpperLimitValue
-                : (this.dataTypeService.getMaxValue(this.model.version || 0, this.model.dataType || 0, this.model.fBoxDataType || 0) || 0);
+            if (isSimulation) {
+                numericalOperation.numericalUpperLimit = this.dataTypeService.getMaxValue(this.model.version || 0, this.model.dataType || 0, this.model.fBoxDataType || 0, this.model.integerDigits || undefined, this.model.fractionDigits || undefined);
+            }
+            else {
+                numericalOperation.numericalUpperLimit = this._resolvedUpperLimitValue != null
+                    ? this._resolvedUpperLimitValue
+                    : (this.dataTypeService.getMaxValue(this.model.version || 0, this.model.dataType || 0, this.model.fBoxDataType || 0) || 0);
+            }
         }
         if (typeof numericalOperation.numericalLowerLimit === 'object' && numericalOperation.numericalLowerLimit.type === 1) {
-            numericalOperation.numericalLowerLimit = this._resolvedLowerLimitValue != null
-                ? this._resolvedLowerLimitValue
-                : (this.dataTypeService.getMinValue(this.model.version || 0, this.model.dataType || 0, this.model.fBoxDataType || 0) || 0);
+            if (isSimulation) {
+                numericalOperation.numericalUpperLimit = this.dataTypeService.getMinValue(this.model.version || 0, this.model.dataType || 0, this.model.fBoxDataType || 0, this.model.integerDigits || undefined, this.model.fractionDigits || undefined);
+            }
+            else {
+                numericalOperation.numericalLowerLimit = this._resolvedLowerLimitValue != null
+                    ? this._resolvedLowerLimitValue
+                    : (this.dataTypeService.getMinValue(this.model.version || 0, this.model.dataType || 0, this.model.fBoxDataType || 0) || 0);
+            }
         }
         const args = new WriteValueModalArgs(this.writeVariableName, this.model.dataType, this.model.fBoxDataType, this.model.integerDigits, this.model.fractionDigits, numericalOperation, this.model.version, this.enableDataParsed, this.releasedVariableService, this.guiContext);
         this.writeValueMmodalRef = this.modalService.show(write_value_modal_component["a" /* WriteValueModalComponent */], {
@@ -43695,7 +43714,7 @@ class main_element_MainElement {
                     this.elements.push(new datetime_display_element_DatetimeDisplayElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.graphStore, this.signalRAppId));
                     break;
                 case shared["d" /* GuiConsts */].components.historicalCurveKey:
-                    this.elements.push(new historical_curve_element_HistoricalCurveElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.historyDataStore, this.signalRAppId, this.context.systemTextLibraryService, this.context.languageService, this.context));
+                    this.elements.push(new historical_curve_element_HistoricalCurveElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.historyDataStore, this.signalRAppId, this.context.systemTextLibraryService, this.context.languageService, this.context, this.context.releasedVariableService));
                     break;
                 case shared["d" /* GuiConsts */].components.ringGraphKey:
                     this.elements.push(new ring_graph_element_RingGraphElement(element, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.injector.get(_tmp_localization["b" /* LOCALIZATION */]), this.signalRAppId));
@@ -45074,7 +45093,7 @@ WriteValueModalComponent = __decorate([
     Object(_angular_core__WEBPACK_IMPORTED_MODULE_0__["Component"])({
         selector: 'writeValueModal',
         template: "<form #writeValueForm=\"ngForm\" novalidate (ngSubmit)=\"save()\" bs-modal-drag> <div class=\"modal-header\"> <h4 class=\"modal-title\"> <span>{{localization.setting}}</span> <span>{{displayVariableName}}</span> </h4> <button type=\"button\" class=\"close pull-right\" aria-label=\"Close\" (click)=\"close()\"> <span aria-hidden=\"true\">&times;</span> </button> </div> <div class=\"modal-body\"> <span class=\"write-value-range\">{{localization.writeValueRange}}：</span> <span> {{writeValueRangeText}} <span *ngIf=\"valueType\">({{valueType}})</span> </span> <input type=\"text\" name=\"valueInput\" autoFocus class=\"form-control form-control-write write-value\" [(ngModel)]=\"value\" (keyup)=\"validate($event)\" autocomplete=\"off\"> <span class=\"help-block text-danger\" [hidden]=\"!validationError\">{{validationErrorText}}</span> </div> <div class=\"modal-footer modal-footer-write\"> <button type=\"submit\" class=\"btn md-skip btn-primary btn-primary-write btn-block\" [disabled]=\"validationError || isSubmitting\"> <ng-container *ngIf=\"!isSubmitting\">{{localization.submit}}</ng-container> <ng-container *ngIf=\"isSubmitting\">{{localization.submitting}}</ng-container> </button> </div> </form> ",
-        styles: [".modal-header { padding: 10px; border-color: transparent; } .modal-body { position: relative; padding: 0px 5px !important; padding-top: 10px !important; } .modal-title { display: unset; margin-left: -6px; font-size: 16px !important; } .form-control { margin: 0 5%; float: none; width: 90%; } .form-control-write { margin: 0 20px; width: 410px; } .modal-footer { padding: 10px 5px 20px 5px !important; text-align: right; border-color: transparent; } .modal-footer-write { padding: 10px 5px 20px 5px !important; } .text-danger { display: block; color: #ed6b75; font-size: 14px; margin: 5px 0px 0px 15px; } .btn-primary { background-color: #3B97FC; border-color: #3B97FC; padding: 5px 30px; width: 90%; margin: 0 5%; height: 32px; } .btn-primary-write { width: 410px; margin: 0 15px; } .write-value-range { color: #7f939e; font-size: 14px; margin-left: 15px; } .write-value { padding-left: 8px; margin-left: 16px; height: 32px; } "]
+        styles: [".modal-header { padding: 10px; border-color: transparent; } .modal-body { position: relative; padding: 0px 5px !important; padding-top: 10px !important; } .modal-title { display: unset; margin-left: -6px; font-size: 16px !important; } .form-control { margin: 0 5%; float: none; width: 90%; } .form-control-write { margin: 0 20px; width: 585px; } .modal-footer { padding: 10px 5px 20px 5px !important; text-align: right; border-color: transparent; } .modal-footer-write { margin-right: 4px; padding: 10px 5px 20px 5px !important; } .text-danger { display: block; color: #ed6b75; font-size: 14px; margin: 5px 0px 0px 15px; } .btn-primary { background-color: #3B97FC; border-color: #3B97FC; padding: 5px 30px; width: 90%; margin: 0 5%; height: 32px; } .btn-primary-write { width: 585px; margin: 0 15px 0 0; } .write-value-range { color: #7f939e; font-size: 14px; margin-left: 15px; } .write-value { padding-left: 8px; margin-left: 16px; height: 32px; } "]
     }),
     __param(0, Object(_angular_core__WEBPACK_IMPORTED_MODULE_0__["Inject"])(_localization__WEBPACK_IMPORTED_MODULE_1__[/* LOCALIZATION */ "b"]))
 ], WriteValueModalComponent);
@@ -45153,8 +45172,8 @@ __decorate([
 WriteCharacterModalComponent = __decorate([
     Object(_angular_core__WEBPACK_IMPORTED_MODULE_0__["Component"])({
         selector: 'writeCharacterModal',
-        template: "<form #writeValueForm=\"ngForm\" novalidate (ngSubmit)=\"save()\" bs-modal-drag> <div class=\"modal-header\"> <h4 class=\"modal-title\"> <span>{{localization.setting}}</span> <span>{{variableName}}</span> </h4> <button type=\"button\" class=\"close pull-right\" aria-label=\"Close\" (click)=\"close()\"> <span aria-hidden=\"true\">&times;</span> </button> </div> <div class=\"modal-body\"> <input type=\"text\" name=\"characterInput\" autoFocus class=\"form-control write-character-value\" [(ngModel)]=\"value\" (keyup)=\"validate()\" *ngIf=\"!isPassword\" autocomplete=\"off\"> <input type=\"password\" name=\"passwordInput\" autoFocus class=\"form-control write-character-value\" [(ngModel)]=\"value\" (keyup)=\"validate()\" *ngIf=\"isPassword\" autocomplete=\"off\"> <span class=\"help-block text-danger\" [hidden]=\"!validationError\">{{validationErrorText}}</span> </div> <div class=\"modal-footer\"> <button type=\"submit\" class=\"btn md-skip btn-primary btn-block\" [disabled]=\"validationError\">{{localization.submit}}</button> </div> </form> ",
-        styles: [".modal-header { padding: 10px; border-color: transparent; } .modal-body { position: relative; padding: 0px 5px !important; } .modal-title { display: unset; margin-left: -6px; font-size: 16px !important; } .form-control { margin: 0 5%; float: none; width: 90%; } .modal-footer { padding: 10px 4px 20px 5px !important; text-align: right; border-color: transparent; } .text-danger { display: block; color: #ed6b75; font-size: 14px; margin: 10px 0px 0px 15px; } .btn-primary { background-color: #3B97FC; border-color: #3B97FC; padding: 5px 30px; width: 90%; margin: 0 5%; height: 32px; } .write-character-value { padding-left: 8px; height: 32px; margin-left: 16px; } "]
+        template: "<form #writeValueForm=\"ngForm\" novalidate (ngSubmit)=\"save()\" bs-modal-drag> <div class=\"modal-header\"> <h4 class=\"modal-title\"> <span>{{localization.setting}}</span> <span>{{variableName}}</span> </h4> <button type=\"button\" class=\"close pull-right\" aria-label=\"Close\" (click)=\"close()\"> <span aria-hidden=\"true\">&times;</span> </button> </div> <div class=\"modal-body\"> <input type=\"text\" name=\"characterInput\" autoFocus class=\"form-control form-control-write write-character-value\" [(ngModel)]=\"value\" (keyup)=\"validate()\" *ngIf=\"!isPassword\" autocomplete=\"off\"> <input type=\"password\" name=\"passwordInput\" autoFocus class=\"form-control form-control-write write-character-value\" [(ngModel)]=\"value\" (keyup)=\"validate()\" *ngIf=\"isPassword\" autocomplete=\"off\"> <span class=\"help-block text-danger\" [hidden]=\"!validationError\">{{validationErrorText}}</span> </div> <div class=\"modal-footer modal-footer-write\"> <button type=\"submit\" class=\"btn md-skip btn-primary btn-primary-write btn-block\" [disabled]=\"validationError\">{{localization.submit}}</button> </div> </form> ",
+        styles: [".modal-header { padding: 10px; border-color: transparent; } .modal-body { position: relative; padding: 0px 5px !important; } .modal-title { display: unset; margin-left: -6px; font-size: 16px !important; } .form-control { margin: 0 5%; float: none; width: 90%; } .modal-footer { padding: 10px 4px 20px 5px !important; text-align: right; border-color: transparent; } .text-danger { display: block; color: #ed6b75; font-size: 14px; margin: 10px 0px 0px 15px; } .btn-primary { background-color: #3B97FC; border-color: #3B97FC; padding: 5px 30px; width: 90%; margin: 0 5%; height: 32px; } .write-character-value { padding-left: 8px; height: 32px; margin-left: 16px; } .modal-footer-write { margin-right: 4px; padding: 10px 5px 20px 5px !important; } .btn-primary-write { width: 585px; margin: 0 15px 0 0; } .form-control-write { margin: 0 16px; width: 585px; } "]
     }),
     __param(0, Object(_angular_core__WEBPACK_IMPORTED_MODULE_0__["Inject"])(_localization__WEBPACK_IMPORTED_MODULE_2__[/* LOCALIZATION */ "b"]))
 ], WriteCharacterModalComponent);