@flexem/fc-gui 3.0.0-alpha.18 → 3.0.0-alpha.181

package/utils/data-type/fbox-data-type.service.js

@@ -109,6 +109,16 @@ let FBoxDataTypeService = class FBoxDataTypeService {
                 return 8;
             case 15: // Binary32
                 return 32;
+            case 21: // UInt64
+                return 16;
+            case 22: // Int64
+                return 16;
+            case 23: // Bcd64
+                return 16;
+            case 24: // Hex64
+                return 8;
+            case 25: // Binary64
+                return 32;
             default:
                 return 0;
         }
@@ -165,6 +175,12 @@ let FBoxDataTypeService = class FBoxDataTypeService {
             case 13: // Bcd32
             case 14: // Hex32
             case 15: // Binary32
+            case 21: // UInt64
+            case 23: // Bcd64
+            case 14: // Hex32
+            case 15: // Binary32
+            case 24: // Hex64
+            case 25: // Binary64
                 minValue = 0;
                 break;
             case 2: // Int16
@@ -176,6 +192,13 @@ let FBoxDataTypeService = class FBoxDataTypeService {
             case 16: // Single
                 minValue = -1000000000;
                 break;
+            case 22: // Int64
+                // minValue = -9223372036854775808;
+                minValue = Number.MIN_SAFE_INTEGER;
+                break;
+            case 26: // Double
+                minValue = -Number.MAX_VALUE;
+                break;
         }
         if (integerDigits) {
             let digitsLength = integerDigits;
@@ -227,6 +250,23 @@ let FBoxDataTypeService = class FBoxDataTypeService {
             case 16: // Single
                 maxValue = 1000000000;
                 break;
+            case 21: // UInt64
+            case 24: // Hex64
+            case 25: // Binary64
+                // maxValue = 18446744073709551615;
+                maxValue = Number.MAX_SAFE_INTEGER;
+                break;
+            case 22: // Int64
+                // maxValue = 9223372036854775807;
+                maxValue = Number.MAX_SAFE_INTEGER;
+                break;
+            case 23: // Bcd64
+                // maxValue = 9999999999999999;
+                maxValue = Number.MAX_SAFE_INTEGER;
+                break;
+            case 26: // Double
+                maxValue = Number.MAX_VALUE;
+                break;
         }
         if (integerDigits) {
             let digitsLength = integerDigits;

package/utils/numerical-operation.service.js

@@ -43,10 +43,34 @@ let NumericalOperationService = class NumericalOperationService {
     }
     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;

package/view/popup-view.service.d.ts

@@ -1,7 +1,7 @@
 import { Observable } from 'rxjs';
 import { ElementRef } from '@angular/core';
 export interface PopupViewService {
-    popView(viewIndex: number, hostContainerId: string, el: ElementRef): Observable<void>;
+    popView(viewIndex: number, hostContainerId: string, el: ElementRef, triggerRect?: DOMRect): Observable<void>;
     closeView(): any;
     moveView(movementX: number, movementY: number): any;
 }