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

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

@@ -38330,6 +38330,9 @@ class numerical_display_element_NumericalDisplayElement extends readable_element
         this.guiContext = guiContext;
         this.displayText = '';
         this.enableDataParsed = false;
+        // 上下限变量的实时缓存值（仅当上下限配置为变量类型时使用）
+        this._resolvedUpperLimitValue = undefined;
+        this._resolvedLowerLimitValue = undefined;
         this.logger = injector.get(logger["b" /* LOGGER_SERVICE_TOKEN */]);
         this.dataTypeService = injector.get(data_type_service["a" /* DataTypeService */]);
         this.fractionDigitService = injector.get(fraction_digit_service["a" /* FractionDigitService */]);
@@ -38349,6 +38352,22 @@ class numerical_display_element_NumericalDisplayElement extends readable_element
         }
         this.initElement();
     }
+    /** 当数值上限配置为变量类型时，返回变量名；否则返回 undefined */
+    get upperLimitVariableName() {
+        const upper = this.model.numericalUpperLimit;
+        if (upper && typeof upper === 'object' && upper.type === 1 && upper.variableName) {
+            return upper.variableName;
+        }
+        return undefined;
+    }
+    /** 当数值下限配置为变量类型时，返回变量名；否则返回 undefined */
+    get lowerLimitVariableName() {
+        const lower = this.model.numericalLowerLimit;
+        if (lower && typeof lower === 'object' && lower.type === 1 && lower.variableName) {
+            return lower.variableName;
+        }
+        return undefined;
+    }
     get writeVariableName() {
         return this.readVariableName;
     }
@@ -38366,6 +38385,17 @@ 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 (this.lowerLimitVariableName && value.variableName === this.lowerLimitVariableName) {
+            const num = Number(value.value);
+            this._resolvedLowerLimitValue = (value.value != null && !isNaN(num)) ? num : undefined;
+            return;
+        }
         // 处理系统变量"当前语种ID"
         if (value.variableName === '当前语种ID') {
             let displayValue = value.value;
@@ -38502,7 +38532,20 @@ class numerical_display_element_NumericalDisplayElement extends readable_element
         if (null == this.writeVariableName) {
             return;
         }
-        const args = new WriteValueModalArgs(this.writeVariableName, this.model.dataType, this.model.fBoxDataType, this.model.integerDigits, this.model.fractionDigits, this.numericalOperationService.getNumericalOperations(this.model), this.model.version, this.enableDataParsed, this.releasedVariableService, this.guiContext);
+        // 获取数值操作配置，上下限变量类型已在 reportValueChanged 中实时更新到缓存
+        const numericalOperation = this.numericalOperationService.getNumericalOperations(this.model);
+        // 用缓存的实时值替换变量类型上下限
+        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 (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);
+        }
+        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 */], {
             initialState: { args: args }, backdrop: 'static', class: 'gui-modal-dialog-position', animated: false
         });
@@ -43744,6 +43787,17 @@ class main_element_MainElement {
                 if (variableName && !variableNames.find(v => Object(lodash["isEqual"])(variableName, v))) {
                     variableNames.push(element.readVariableName);
                 }
+                // 数值显示元件：上下限变量类型时，将上下限变量名也加入订阅
+                if (element instanceof numerical_display_element_NumericalDisplayElement) {
+                    const upperLimitVarName = element.upperLimitVariableName;
+                    if (upperLimitVarName && !variableNames.find(v => Object(lodash["isEqual"])(upperLimitVarName, v))) {
+                        variableNames.push(upperLimitVarName);
+                    }
+                    const lowerLimitVarName = element.lowerLimitVariableName;
+                    if (lowerLimitVarName && !variableNames.find(v => Object(lodash["isEqual"])(lowerLimitVarName, v))) {
+                        variableNames.push(lowerLimitVarName);
+                    }
+                }
             }
         });
         return variableNames;
@@ -43782,6 +43836,11 @@ class main_element_MainElement {
                         e.minVariableName === value.variableName || e.maxVariableName === value.variableName))) {
                         e.reportValueChanged(value);
                     }
+                    // 数值显示元件：上下限变量推送分发
+                    if (e instanceof numerical_display_element_NumericalDisplayElement && value.variableName && (e.upperLimitVariableName === value.variableName ||
+                        e.lowerLimitVariableName === value.variableName)) {
+                        e.reportValueChanged(value);
+                    }
                     if (e.readVariableName === value.systemName) {
                         const rect = (_a = e.currentRect) === null || _a === void 0 ? void 0 : _a[0];
                         const deviceId = this.getVirtualDeviceIdFromRect(rect);
@@ -44778,17 +44837,20 @@ let WriteValueModalComponent = class WriteValueModalComponent {
         this.writeValueRangeText = this.getWriteValueRangeText();
     }
     setValueRangeAccordToDataParsed(option) {
+        // 上下限已在 numerical-display-element.ts 中解析为数值，直接使用
+        const resolvedUpperLimit = Number(this.numericalOperation.numericalUpperLimit);
+        const resolvedLowerLimit = Number(this.numericalOperation.numericalLowerLimit);
         if (this.dataTypeService.isFloat(option.version, this.dataType) || this.enableNumericalOperation) {
             this.maxValueLimit = this.dataTypeService.getMaxValue(option.version, this.dataType, this.fBoxDataType);
             this.minValueLimit = this.dataTypeService.getMinValue(option.version, this.dataType, this.fBoxDataType);
-            this.numericalLowerLimit = this.numericalOperation.numericalLowerLimit;
-            this.numericalUpperLimit = this.numericalOperation.numericalUpperLimit;
+            this.numericalLowerLimit = resolvedLowerLimit;
+            this.numericalUpperLimit = resolvedUpperLimit;
         }
         else {
             this.maxValueLimit = +this.fractionDigitService.movePoint(this.dataTypeService.getMaxValue(option.version, this.dataType, this.fBoxDataType), -this.fractionDigits);
             this.minValueLimit = +this.fractionDigitService.movePoint(this.dataTypeService.getMinValue(option.version, this.dataType, this.fBoxDataType), -this.fractionDigits);
-            this.numericalLowerLimit = +this.fractionDigitService.movePoint(this.numericalOperation.numericalLowerLimit, -this.fractionDigits);
-            this.numericalUpperLimit = +this.fractionDigitService.movePoint(this.numericalOperation.numericalUpperLimit, -this.fractionDigits);
+            this.numericalLowerLimit = +this.fractionDigitService.movePoint(resolvedLowerLimit, -this.fractionDigits);
+            this.numericalUpperLimit = +this.fractionDigitService.movePoint(resolvedUpperLimit, -this.fractionDigits);
         }
         const minValue = this.numericalOperationService.getWriteMinValue(this.minValueLimit, this.numericalOperation);
         const maxValue = this.numericalOperationService.getWriteMaxValue(this.maxValueLimit, this.numericalOperation);
@@ -45362,10 +45424,34 @@ let numerical_operation_service_NumericalOperationService = class NumericalOpera
     }
     getNumericalOperations(model) {
         const numericalOperation = {};
-        numericalOperation.numericalUpperLimit = (model.numericalUpperLimit || model.numericalUpperLimit === 0) ? +model.numericalUpperLimit
-            : this.dataTypeService.getMaxValue(model.version, model.dataType, model.fBoxDataType, model.integerDigits, model.fractionDigits);
-        numericalOperation.numericalLowerLimit = (model.numericalLowerLimit || model.numericalLowerLimit === 0) ? +model.numericalLowerLimit
-            : this.dataTypeService.getMinValue(model.version, model.dataType, model.fBoxDataType, model.integerDigits, model.fractionDigits);
+        // 处理上限：兼容老结构（number）和新结构（变量对象）
+        if (model.numericalUpperLimit || model.numericalUpperLimit === 0) {
+            if (typeof model.numericalUpperLimit === 'object' && model.numericalUpperLimit.type === 1) {
+                // 新结构：变量类型，保留原对象
+                numericalOperation.numericalUpperLimit = model.numericalUpperLimit;
+            }
+            else {
+                // 老结构：数字类型
+                numericalOperation.numericalUpperLimit = +model.numericalUpperLimit;
+            }
+        }
+        else {
+            numericalOperation.numericalUpperLimit = this.dataTypeService.getMaxValue(model.version, model.dataType, model.fBoxDataType, model.integerDigits, model.fractionDigits);
+        }
+        // 处理下限：兼容老结构（number）和新结构（变量对象）
+        if (model.numericalLowerLimit || model.numericalLowerLimit === 0) {
+            if (typeof model.numericalLowerLimit === 'object' && model.numericalLowerLimit.type === 1) {
+                // 新结构：变量类型，保留原对象
+                numericalOperation.numericalLowerLimit = model.numericalLowerLimit;
+            }
+            else {
+                // 老结构：数字类型
+                numericalOperation.numericalLowerLimit = +model.numericalLowerLimit;
+            }
+        }
+        else {
+            numericalOperation.numericalLowerLimit = this.dataTypeService.getMinValue(model.version, model.dataType, model.fBoxDataType, model.integerDigits, model.fractionDigits);
+        }
         numericalOperation.enableNumericalOperation = model.enableNumericalOperation;
         if (model.enableNumericalOperation) {
             numericalOperation.type = model.numericalOperationSetting.type;