@fmdeui/fmui 1.0.154 → 1.0.156

package/es/components/fm-inputnumber/index.d.ts

@@ -18,15 +18,15 @@ export declare const FmInputNumber: {
             default: number;
         };
         modelValue: {
-            type: PropType<string | number>;
+            type: PropType<number>;
             required: true;
         };
     }>> & Readonly<{
-        "onUpdate:modelValue"?: ((value: string | number) => any) | undefined;
+        "onUpdate:modelValue"?: ((value: number) => any) | undefined;
         onHandleInput?: ((...args: any[]) => any) | undefined;
     }>, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
         handleInput: (...args: any[]) => void;
-        "update:modelValue": (value: string | number) => void;
+        "update:modelValue": (value: number) => void;
     }, PublicProps, {
         defaultValue: number;
         placeholder: string;
@@ -57,11 +57,11 @@ export declare const FmInputNumber: {
             default: number;
         };
         modelValue: {
-            type: PropType<string | number>;
+            type: PropType<number>;
             required: true;
         };
     }>> & Readonly<{
-        "onUpdate:modelValue"?: ((value: string | number) => any) | undefined;
+        "onUpdate:modelValue"?: ((value: number) => any) | undefined;
         onHandleInput?: ((...args: any[]) => any) | undefined;
     }>, {}, {}, {}, {}, {
         defaultValue: number;
@@ -90,15 +90,15 @@ export declare const FmInputNumber: {
         default: number;
     };
     modelValue: {
-        type: PropType<string | number>;
+        type: PropType<number>;
         required: true;
     };
 }>> & Readonly<{
-    "onUpdate:modelValue"?: ((value: string | number) => any) | undefined;
+    "onUpdate:modelValue"?: ((value: number) => any) | undefined;
     onHandleInput?: ((...args: any[]) => any) | undefined;
 }>, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
     handleInput: (...args: any[]) => void;
-    "update:modelValue": (value: string | number) => void;
+    "update:modelValue": (value: number) => void;
 }, string, {
     defaultValue: number;
     placeholder: string;
@@ -107,8 +107,12 @@ export declare const FmInputNumber: {
 }, {}, string, {}, GlobalComponents, GlobalDirectives, string, ComponentProvideOptions> & VNodeProps & AllowedComponentProps & ComponentCustomProps & (new () => {
     $slots: {
         prepend?(_: {}): any;
+        prepend?(_: {}): any;
+        append?(_: {}): any;
         append?(_: {}): any;
         prefix?(_: {}): any;
+        prefix?(_: {}): any;
+        suffix?(_: {}): any;
         suffix?(_: {}): any;
     };
 });

package/es/components/fm-inputnumber/index.vue.d.ts

@@ -3,8 +3,12 @@ declare function __VLS_template(): {
     attrs: Partial<{}>;
     slots: {
         prepend?(_: {}): any;
+        prepend?(_: {}): any;
+        append?(_: {}): any;
         append?(_: {}): any;
         prefix?(_: {}): any;
+        prefix?(_: {}): any;
+        suffix?(_: {}): any;
         suffix?(_: {}): any;
     };
     refs: {};
@@ -32,12 +36,12 @@ declare const __VLS_component: DefineComponent<ExtractPropTypes<{
         default: number;
     };
     modelValue: {
-        type: PropType<string | number>;
+        type: PropType<number>;
         required: true;
     };
 }>, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
     handleInput: (...args: any[]) => void;
-    "update:modelValue": (value: string | number) => void;
+    "update:modelValue": (value: number) => void;
 }, string, PublicProps, Readonly< ExtractPropTypes<{
     placeholder: {
         type: StringConstructor;
@@ -59,11 +63,11 @@ declare const __VLS_component: DefineComponent<ExtractPropTypes<{
         default: number;
     };
     modelValue: {
-        type: PropType<string | number>;
+        type: PropType<number>;
         required: true;
     };
 }>> & Readonly<{
-    "onUpdate:modelValue"?: ((value: string | number) => any) | undefined;
+    "onUpdate:modelValue"?: ((value: number) => any) | undefined;
     onHandleInput?: ((...args: any[]) => any) | undefined;
 }>, {
     defaultValue: number;

package/es/packages/components/fm-inputnumber/index2.vue.mjs

@@ -39,76 +39,95 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         emit("handleInput", validNum);
         return;
       }
-      let strVal = String(val);
-      strVal = strVal.replace(/[^\d.-]/g, "");
-      if (strVal.indexOf("-") !== -1) {
-        if (!strVal.startsWith("-")) {
-          strVal = strVal.replace(/-/g, "");
-        } else {
-          const rest = strVal.substring(1);
-          if (rest.includes("-")) {
-            strVal = "-" + rest.replace(/-/g, "");
-          }
-        }
-      }
-      const dotCount = (strVal.match(/\./g) || []).length;
-      if (dotCount > 1) {
-        const firstDotIndex = strVal.indexOf(".");
-        const before = strVal.substring(0, firstDotIndex + 1);
-        const after = strVal.substring(firstDotIndex + 1).replace(/\./g, "");
-        strVal = before + after;
-      }
-      let sign = "";
-      let body = strVal;
-      if (body.startsWith("-")) {
-        sign = "-";
-        body = body.substring(1);
-      }
-      if (body === "") {
-        modelValue.value = sign;
-        emit("handleInput", sign);
+      if (props.bType == "number") {
+        let trimstr = String(val).replace(/[^\d]/g, "");
+        const num = parseInt(trimstr, 10);
+        const validNum = Number.isNaN(num) ? props.defaultValue : num;
+        modelValue.value = validNum;
+        emit("handleInput", validNum);
         return;
       }
-      if (body.startsWith(".")) {
-        body = "0" + body;
-      }
-      const parts = body.split(".");
-      let intPart = parts[0];
-      let decPart = parts.length > 1 ? parts[1] : "";
-      intPart = intPart.replace(/^0+/, "") || "0";
-      if (props.bType === "number") {
-        decPart = "";
-      } else {
-        if (decPart.length > props.decimalPlaces) {
-          decPart = decPart.substring(0, props.decimalPlaces);
-        }
+      let cleaned = String(val).replace(/[^\d.]/g, "");
+      const dotIndex = cleaned.indexOf(".");
+      if (dotIndex !== -1) {
+        const before = cleaned.substring(0, dotIndex + 1);
+        const after = cleaned.substring(dotIndex + 1).replace(/\./g, "");
+        cleaned = before + after;
       }
-      let finalStr = sign + intPart;
-      if (decPart !== "") {
-        finalStr += "." + decPart;
+      if (cleaned.startsWith(".")) {
+        cleaned = "0" + cleaned;
       }
-      if (finalStr === "" || finalStr === "-" || finalStr === "-.") {
-        finalStr = "0";
-      } else {
-        modelValue.value = finalStr;
+      const parts = cleaned.split(".");
+      parts[0] = parts[0].replace(/^0+/, "") || "0";
+      cleaned = parts.join(".");
+      if (cleaned.includes(".")) {
+        const [intPart, decPart] = cleaned.split(".");
+        cleaned = `${intPart}.${decPart.substring(0, props.decimalPlaces)}`;
       }
-      const numValue = Number(finalStr);
-      const finalNum = Number.isNaN(numValue) ? props.defaultValue !== -1 ? props.defaultValue : 0 : numValue;
-      emit("handleInput", finalNum);
+      modelValue.value = cleaned;
+      emit("handleInput", cleaned);
     };
     watch(() => modelValue.value, (newvalue, oldValue) => {
-      if (newvalue == "" || newvalue === "-" || newvalue === "-.") {
-        modelValue.value = props.defaultValue == -1 ? 0 : props.defaultValue;
+      if (props.bType == "number") {
+        if (newvalue === null || newvalue === void 0 || newvalue === "") {
+          modelValue.value = props.defaultValue == -1 ? 0 : props.defaultValue;
+        }
+      } else {
+        if (newvalue === null || newvalue === void 0 || newvalue === "") {
+          const validNum = props.defaultValue == -1 ? 0 : props.defaultValue;
+          modelValue.value = validNum;
+        } else {
+          emit("handleInput", newvalue);
+        }
       }
     });
     return (_ctx, _cache) => {
       const _component_el_input = resolveComponent("el-input");
-      return openBlock(), createBlock(_component_el_input, {
+      const _component_el_input_number = resolveComponent("el-input-number");
+      return __props.bType !== "money" ? (openBlock(), createBlock(_component_el_input, {
+        key: 0,
         modelValue: modelValue.value,
         "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => modelValue.value = $event),
         placeholder: __props.placeholder,
-        onInput: handleInput,
-        type: "text"
+        onInput: handleInput
+      }, createSlots({
+        _: 2
+        /* DYNAMIC */
+      }, [
+        _ctx.$slots.prepend ? {
+          name: "prepend",
+          fn: withCtx(() => [
+            renderSlot(_ctx.$slots, "prepend")
+          ]),
+          key: "0"
+        } : void 0,
+        _ctx.$slots.append ? {
+          name: "append",
+          fn: withCtx(() => [
+            renderSlot(_ctx.$slots, "append")
+          ]),
+          key: "1"
+        } : void 0,
+        _ctx.$slots.prefix ? {
+          name: "prefix",
+          fn: withCtx(() => [
+            renderSlot(_ctx.$slots, "prefix")
+          ]),
+          key: "2"
+        } : void 0,
+        _ctx.$slots.suffix ? {
+          name: "suffix",
+          fn: withCtx(() => [
+            renderSlot(_ctx.$slots, "suffix")
+          ]),
+          key: "3"
+        } : void 0
+      ]), 1032, ["modelValue", "placeholder"])) : (openBlock(), createBlock(_component_el_input_number, {
+        key: 1,
+        modelValue: modelValue.value,
+        "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => modelValue.value = $event),
+        controls: false,
+        placeholder: __props.placeholder
       }, createSlots({
         _: 2
         /* DYNAMIC */
@@ -141,7 +160,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           ]),
           key: "3"
         } : void 0
-      ]), 1032, ["modelValue", "placeholder"]);
+      ]), 1032, ["modelValue", "placeholder"]));
     };
   }
 });

package/index.js

@@ -1,4 +1,4 @@
-/*! fmdeui-fmui v1.0.154 */
+/*! fmdeui-fmui v1.0.156 */
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('vxe-table'), require('@vxe-ui/plugin-render-element'), require('@vxe-ui/plugin-export-xlsx'), require('vxe-pc-ui'), require('exceljs'), require('@element-plus/icons-vue'), require('vue'), require('element-plus'), require('lodash-es'), require('js-cookie'), require('pinia'), require('vue-router'), require('@vueuse/core'), require('crypto-js'), require('xlsx-js-style'), require('vue-i18n'), require('sortablejs'), require('screenfull'), require('push.js'), require('mitt'), require('@microsoft/signalr'), require('axios')) :
 	typeof define === 'function' && define.amd ? define(['exports', 'vxe-table', '@vxe-ui/plugin-render-element', '@vxe-ui/plugin-export-xlsx', 'vxe-pc-ui', 'exceljs', '@element-plus/icons-vue', 'vue', 'element-plus', 'lodash-es', 'js-cookie', 'pinia', 'vue-router', '@vueuse/core', 'crypto-js', 'xlsx-js-style', 'vue-i18n', 'sortablejs', 'screenfull', 'push.js', 'mitt', '@microsoft/signalr', 'axios'], factory) :
@@ -27437,76 +27437,57 @@
 	        emit("handleInput", validNum);
 	        return;
 	      }
-	      let strVal = String(val);
-	      strVal = strVal.replace(/[^\d.-]/g, "");
-	      if (strVal.indexOf("-") !== -1) {
-	        if (!strVal.startsWith("-")) {
-	          strVal = strVal.replace(/-/g, "");
-	        } else {
-	          const rest = strVal.substring(1);
-	          if (rest.includes("-")) {
-	            strVal = "-" + rest.replace(/-/g, "");
-	          }
-	        }
-	      }
-	      const dotCount = (strVal.match(/\./g) || []).length;
-	      if (dotCount > 1) {
-	        const firstDotIndex = strVal.indexOf(".");
-	        const before = strVal.substring(0, firstDotIndex + 1);
-	        const after = strVal.substring(firstDotIndex + 1).replace(/\./g, "");
-	        strVal = before + after;
-	      }
-	      let sign = "";
-	      let body = strVal;
-	      if (body.startsWith("-")) {
-	        sign = "-";
-	        body = body.substring(1);
-	      }
-	      if (body === "") {
-	        modelValue.value = sign;
-	        emit("handleInput", sign);
+	      if (props.bType == "number") {
+	        let trimstr = String(val).replace(/[^\d]/g, "");
+	        const num = parseInt(trimstr, 10);
+	        const validNum = Number.isNaN(num) ? props.defaultValue : num;
+	        modelValue.value = validNum;
+	        emit("handleInput", validNum);
 	        return;
 	      }
-	      if (body.startsWith(".")) {
-	        body = "0" + body;
+	      let cleaned = String(val).replace(/[^\d.]/g, "");
+	      const dotIndex = cleaned.indexOf(".");
+	      if (dotIndex !== -1) {
+	        const before = cleaned.substring(0, dotIndex + 1);
+	        const after = cleaned.substring(dotIndex + 1).replace(/\./g, "");
+	        cleaned = before + after;
 	      }
-	      const parts = body.split(".");
-	      let intPart = parts[0];
-	      let decPart = parts.length > 1 ? parts[1] : "";
-	      intPart = intPart.replace(/^0+/, "") || "0";
-	      if (props.bType === "number") {
-	        decPart = "";
-	      } else {
-	        if (decPart.length > props.decimalPlaces) {
-	          decPart = decPart.substring(0, props.decimalPlaces);
-	        }
+	      if (cleaned.startsWith(".")) {
+	        cleaned = "0" + cleaned;
 	      }
-	      let finalStr = sign + intPart;
-	      if (decPart !== "") {
-	        finalStr += "." + decPart;
+	      const parts = cleaned.split(".");
+	      parts[0] = parts[0].replace(/^0+/, "") || "0";
+	      cleaned = parts.join(".");
+	      if (cleaned.includes(".")) {
+	        const [intPart, decPart] = cleaned.split(".");
+	        cleaned = `${intPart}.${decPart.substring(0, props.decimalPlaces)}`;
 	      }
-	      if (finalStr === "" || finalStr === "-" || finalStr === "-.") {
-	        finalStr = "0";
-	      } else {
-	        modelValue.value = finalStr;
-	      }
-	      const numValue = Number(finalStr);
-	      const finalNum = Number.isNaN(numValue) ? props.defaultValue !== -1 ? props.defaultValue : 0 : numValue;
-	      emit("handleInput", finalNum);
+	      modelValue.value = cleaned;
+	      emit("handleInput", cleaned);
 	    };
 	    vue.watch(() => modelValue.value, (newvalue, oldValue) => {
-	      if (newvalue == "" || newvalue === "-" || newvalue === "-.") {
-	        modelValue.value = props.defaultValue == -1 ? 0 : props.defaultValue;
+	      if (props.bType == "number") {
+	        if (newvalue === null || newvalue === void 0 || newvalue === "") {
+	          modelValue.value = props.defaultValue == -1 ? 0 : props.defaultValue;
+	        }
+	      } else {
+	        if (newvalue === null || newvalue === void 0 || newvalue === "") {
+	          const validNum = props.defaultValue == -1 ? 0 : props.defaultValue;
+	          modelValue.value = validNum;
+	        } else {
+	          emit("handleInput", newvalue);
+	        }
 	      }
 	    });
 	    return (_ctx, _cache) => {
 	      const _component_el_input = vue.resolveComponent("el-input");
-	      return vue.openBlock(), vue.createBlock(_component_el_input, {
+	      const _component_el_input_number = vue.resolveComponent("el-input-number");
+	      return __props.bType !== "money" ? (vue.openBlock(), vue.createBlock(_component_el_input, {
+	        key: 0,
 	        modelValue: modelValue.value,
 	        "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => modelValue.value = $event),
 	        placeholder: __props.placeholder,
-	        onInput: handleInput,
-	        type: "text"
+	        onInput: handleInput
 	      }, vue.createSlots({
 	        _: 2
 	        /* DYNAMIC */
@@ -27539,7 +27520,45 @@
 	          ]),
 	          key: "3"
 	        } : void 0
-	      ]), 1032, ["modelValue", "placeholder"]);
+	      ]), 1032, ["modelValue", "placeholder"])) : (vue.openBlock(), vue.createBlock(_component_el_input_number, {
+	        key: 1,
+	        modelValue: modelValue.value,
+	        "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => modelValue.value = $event),
+	        controls: false,
+	        placeholder: __props.placeholder
+	      }, vue.createSlots({
+	        _: 2
+	        /* DYNAMIC */
+	      }, [
+	        _ctx.$slots.prepend ? {
+	          name: "prepend",
+	          fn: vue.withCtx(() => [
+	            vue.renderSlot(_ctx.$slots, "prepend")
+	          ]),
+	          key: "0"
+	        } : void 0,
+	        _ctx.$slots.append ? {
+	          name: "append",
+	          fn: vue.withCtx(() => [
+	            vue.renderSlot(_ctx.$slots, "append")
+	          ]),
+	          key: "1"
+	        } : void 0,
+	        _ctx.$slots.prefix ? {
+	          name: "prefix",
+	          fn: vue.withCtx(() => [
+	            vue.renderSlot(_ctx.$slots, "prefix")
+	          ]),
+	          key: "2"
+	        } : void 0,
+	        _ctx.$slots.suffix ? {
+	          name: "suffix",
+	          fn: vue.withCtx(() => [
+	            vue.renderSlot(_ctx.$slots, "suffix")
+	          ]),
+	          key: "3"
+	        } : void 0
+	      ]), 1032, ["modelValue", "placeholder"]));
 	    };
 	  }
 	});