@ebuilding/form 2.3.9 → 2.3.10

package/fesm2022/ebuilding-form.mjs

@@ -1457,25 +1457,16 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.15", ngImpo
 
 class DeonNzFieldNumber extends FieldType {
     get precision() {
-        if (this.props["precision"] && this.props["precision"] > 0) {
-            return this.props["precision"];
-        }
-        return 0;
+        return this.props?.['precision'] > 0 ? this.props['precision'] : 0;
     }
     get min() {
-        if (this.props["min"] != undefined && this.props["min"] != null) {
-            return this.props["min"];
-        }
-        return -999999999;
+        return this.props?.['min'] ?? -99999999;
     }
     get max() {
-        if (this.props["max"] != undefined && this.props["max"] != null) {
-            return this.props["max"];
-        }
-        return 99999999;
+        return this.props?.['max'] ?? 99999999;
     }
     get password() {
-        return this.props?.["password"] === true;
+        return this.props?.['password'] === true;
     }
     constructor() {
         super();
@@ -1487,23 +1478,48 @@ class DeonNzFieldNumber extends FieldType {
         return String(value); // 不要 format，小数位留给 blur 处理
     };
     parseNumber = (value) => {
-        const parsed = parseFloat(value);
-        return isNaN(parsed) ? null : parsed;
+        const num = Number(value);
+        return isNaN(num) ? this.formControl.value ?? 0 : num;
     };
-    onFormatPrecision() {
-        let value = this.formControl.value;
-        // 空值直接跳过，不格式化
+    onBeforeInput(event) {
+        // 删除 / 撤销 / 重做 直接放行
+        if (event.inputType?.startsWith('delete') ||
+            event.inputType === 'historyUndo' ||
+            event.inputType === 'historyRedo') {
+            return;
+        }
+        const data = event.data ?? '';
+        if (!data)
+            return;
+        const next = this.calcNextValue(data);
+        const reg = this.precision > 0
+            ? /^-?\d*(\.\d*)?$/
+            : /^-?\d*$/;
+        // 不符合数字规则，直接阻止
+        if (!reg.test(next)) {
+            event.preventDefault();
+        }
+    }
+    /* ===== 计算“即将写入后的值” ===== */
+    calcNextValue(insert) {
+        const input = document.activeElement;
+        if (!input)
+            return insert;
+        const start = input.selectionStart ?? 0;
+        const end = input.selectionEnd ?? 0;
+        const value = input.value ?? '';
+        return value.slice(0, start) + insert + value.slice(end);
+    }
+    /* ===== blur 时统一格式化 ===== */
+    onBlurFormat() {
+        const value = this.formControl.value;
         if (value === null || value === undefined || value === '')
             return;
-        // 强制转成数字
         const num = Number(value);
         if (isNaN(num))
             return;
-        // 设置精度
         const fixed = num.toFixed(this.precision);
-        // ⚠ 注意：toFixed 返回 string，但 formControl 可能希望是 number
-        // 所以统一再转 number 避免下游报错
-        this.formControl.setValue(this.precision > 0 ? Number(fixed) : parseInt(fixed), { emitEvent: false });
+        this.formControl.setValue(this.precision > 0 ? Number(fixed) : parseInt(fixed, 10), { emitEvent: false });
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.15", ngImport: i0, type: DeonNzFieldNumber, deps: [], target: i0.ɵɵFactoryTarget.Component });
     static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "19.2.15", type: DeonNzFieldNumber, isStandalone: true, selector: "deon-nz-field-number", usesInheritance: true, ngImport: i0, template: `
@@ -1520,7 +1536,8 @@ class DeonNzFieldNumber extends FieldType {
             [nzMax]="max"
             [nzFormatter]="formatNumber"
             [nzParser]="parseNumber"
-          (nzBlur)="onFormatPrecision()"
+            (beforeinput)="onBeforeInput($event)"
+            (nzBlur)="onBlurFormat()"
           ></nz-input-number>
         </nz-input-group>
       </ng-container>
@@ -1535,7 +1552,8 @@ class DeonNzFieldNumber extends FieldType {
           [nzMax]="max"
           [nzFormatter]="formatNumber"
           [nzParser]="parseNumber"
-          (nzBlur)="onFormatPrecision()"
+          (beforeinput)="onBeforeInput($event)"
+          (nzBlur)="onBlurFormat()"
         ></nz-input-number>
       </ng-template>
     </ng-container>
@@ -1561,7 +1579,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.15", ngImpo
             [nzMax]="max"
             [nzFormatter]="formatNumber"
             [nzParser]="parseNumber"
-          (nzBlur)="onFormatPrecision()"
+            (beforeinput)="onBeforeInput($event)"
+            (nzBlur)="onBlurFormat()"
           ></nz-input-number>
         </nz-input-group>
       </ng-container>
@@ -1576,7 +1595,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.15", ngImpo
           [nzMax]="max"
           [nzFormatter]="formatNumber"
           [nzParser]="parseNumber"
-          (nzBlur)="onFormatPrecision()"
+          (beforeinput)="onBeforeInput($event)"
+          (nzBlur)="onBlurFormat()"
         ></nz-input-number>
       </ng-template>
     </ng-container>