@fmdeui/fmui 1.0.151 → 1.0.153

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

@@ -18,15 +18,15 @@ export declare const FmInputNumber: {
             default: number;
         };
         modelValue: {
-            type: PropType<number>;
+            type: PropType<string | number>;
             required: true;
         };
     }>> & Readonly<{
-        "onUpdate:modelValue"?: ((value: number) => any) | undefined;
+        "onUpdate:modelValue"?: ((value: string | number) => any) | undefined;
         onHandleInput?: ((...args: any[]) => any) | undefined;
     }>, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
         handleInput: (...args: any[]) => void;
-        "update:modelValue": (value: number) => void;
+        "update:modelValue": (value: string | number) => void;
     }, PublicProps, {
         defaultValue: number;
         placeholder: string;
@@ -57,11 +57,11 @@ export declare const FmInputNumber: {
             default: number;
         };
         modelValue: {
-            type: PropType<number>;
+            type: PropType<string | number>;
             required: true;
         };
     }>> & Readonly<{
-        "onUpdate:modelValue"?: ((value: number) => any) | undefined;
+        "onUpdate:modelValue"?: ((value: string | number) => any) | undefined;
         onHandleInput?: ((...args: any[]) => any) | undefined;
     }>, {}, {}, {}, {}, {
         defaultValue: number;
@@ -90,15 +90,15 @@ export declare const FmInputNumber: {
         default: number;
     };
     modelValue: {
-        type: PropType<number>;
+        type: PropType<string | number>;
         required: true;
     };
 }>> & Readonly<{
-    "onUpdate:modelValue"?: ((value: number) => any) | undefined;
+    "onUpdate:modelValue"?: ((value: string | number) => any) | undefined;
     onHandleInput?: ((...args: any[]) => any) | undefined;
 }>, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
     handleInput: (...args: any[]) => void;
-    "update:modelValue": (value: number) => void;
+    "update:modelValue": (value: string | number) => void;
 }, string, {
     defaultValue: number;
     placeholder: string;

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

@@ -32,12 +32,12 @@ declare const __VLS_component: DefineComponent<ExtractPropTypes<{
         default: number;
     };
     modelValue: {
-        type: PropType<number>;
+        type: PropType<string | number>;
         required: true;
     };
 }>, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
     handleInput: (...args: any[]) => void;
-    "update:modelValue": (value: number) => void;
+    "update:modelValue": (value: string | number) => void;
 }, string, PublicProps, Readonly< ExtractPropTypes<{
     placeholder: {
         type: StringConstructor;
@@ -59,11 +59,11 @@ declare const __VLS_component: DefineComponent<ExtractPropTypes<{
         default: number;
     };
     modelValue: {
-        type: PropType<number>;
+        type: PropType<string | number>;
         required: true;
     };
 }>> & Readonly<{
-    "onUpdate:modelValue"?: ((value: number) => any) | undefined;
+    "onUpdate:modelValue"?: ((value: string | number) => any) | undefined;
     onHandleInput?: ((...args: any[]) => any) | undefined;
 }>, {
     defaultValue: number;

package/es/packages/api/index.mjs

@@ -211,6 +211,7 @@ const COST_CATEGORIES = [
   { code: "INSURE", type: 9, name: "\u4FDD\u9669", icon: "\u{1F6E1}\uFE0F", color: "#eb2f96", bg: "#fff0f6" },
   { code: "GUIDE", type: 10, name: "\u5BFC\u670D", icon: "\u{1F468}\u200D", color: "#f5222d", bg: "#fff1f0" },
   { code: "VISA", type: 15, name: "\u7B7E\u8BC1", icon: "\u{1F4CB}", color: "#faad14", bg: "#fffbe6" },
+  { code: "SHIP", type: 14, name: "\u6E38\u8239", icon: "\u{1F6A2}", color: "#0ea5e9", bg: "#e0f2fe" },
   { code: "TOPLAN", type: 6, name: "\u5730\u63A5", icon: "\u{1F91D}", color: "#1890ff", bg: "#e6f7ff" },
   { code: "OTHEROUT", type: 2, name: "\u5176\u4ED6\u652F\u51FA", icon: "\u{1F4BC}", color: "#8c8c8c", bg: "#fafafa" },
   { code: "OTHERIN", type: 1, name: "\u5176\u4ED6\u6536\u5165", icon: "\u{1F48E}", color: "#72AFF2", bg: "#D2EEFE" }

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

@@ -39,39 +39,62 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         emit("handleInput", validNum);
         return;
       }
-      const strVal = String(val);
-      const isNegative = strVal.startsWith("-");
-      let pureVal = isNegative ? strVal.substring(1) : strVal;
-      if (props.bType == "number") {
-        let trimstr = pureVal.replace(/[^\d]/g, "");
-        const num = parseInt(trimstr, 10);
-        const validNum = Number.isNaN(num) ? props.defaultValue : num;
-        modelValue.value = isNegative ? -validNum : validNum;
-        emit("handleInput", isNegative ? -validNum : validNum);
+      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);
         return;
       }
-      let cleaned = pureVal.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;
+      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);
+        }
       }
-      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)}`;
+      modelValue.value = finalStr;
+      if (finalStr === "" || finalStr === "-" || finalStr === "-.") {
+        finalStr = "0";
       }
-      modelValue.value = isNegative ? -cleaned : cleaned;
-      emit("handleInput", isNegative ? -cleaned : cleaned);
+      emit("handleInput", finalStr);
     };
     watch(() => modelValue.value, (newvalue, oldValue) => {
-      if (newvalue == "") {
+      if (newvalue == "" || newvalue === "-" || newvalue === "-.") {
         modelValue.value = props.defaultValue == -1 ? 0 : props.defaultValue;
       }
     });
@@ -81,7 +104,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         modelValue: modelValue.value,
         "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => modelValue.value = $event),
         placeholder: __props.placeholder,
-        onInput: handleInput
+        onInput: handleInput,
+        type: "text"
       }, createSlots({
         _: 2
         /* DYNAMIC */

package/index.js

@@ -1,4 +1,4 @@
-/*! fmdeui-fmui v1.0.151 */
+/*! fmdeui-fmui v1.0.153 */
 (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) :
@@ -3880,6 +3880,7 @@
 	  { code: "INSURE", type: 9, name: "\u4FDD\u9669", icon: "\u{1F6E1}\uFE0F", color: "#eb2f96", bg: "#fff0f6" },
 	  { code: "GUIDE", type: 10, name: "\u5BFC\u670D", icon: "\u{1F468}\u200D", color: "#f5222d", bg: "#fff1f0" },
 	  { code: "VISA", type: 15, name: "\u7B7E\u8BC1", icon: "\u{1F4CB}", color: "#faad14", bg: "#fffbe6" },
+	  { code: "SHIP", type: 14, name: "\u6E38\u8239", icon: "\u{1F6A2}", color: "#0ea5e9", bg: "#e0f2fe" },
 	  { code: "TOPLAN", type: 6, name: "\u5730\u63A5", icon: "\u{1F91D}", color: "#1890ff", bg: "#e6f7ff" },
 	  { code: "OTHEROUT", type: 2, name: "\u5176\u4ED6\u652F\u51FA", icon: "\u{1F4BC}", color: "#8c8c8c", bg: "#fafafa" },
 	  { code: "OTHERIN", type: 1, name: "\u5176\u4ED6\u6536\u5165", icon: "\u{1F48E}", color: "#72AFF2", bg: "#D2EEFE" }
@@ -27436,39 +27437,62 @@
 	        emit("handleInput", validNum);
 	        return;
 	      }
-	      const strVal = String(val);
-	      const isNegative = strVal.startsWith("-");
-	      let pureVal = isNegative ? strVal.substring(1) : strVal;
-	      if (props.bType == "number") {
-	        let trimstr = pureVal.replace(/[^\d]/g, "");
-	        const num = parseInt(trimstr, 10);
-	        const validNum = Number.isNaN(num) ? props.defaultValue : num;
-	        modelValue.value = isNegative ? -validNum : validNum;
-	        emit("handleInput", isNegative ? -validNum : validNum);
+	      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);
 	        return;
 	      }
-	      let cleaned = pureVal.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;
+	      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);
+	        }
 	      }
-	      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)}`;
+	      modelValue.value = finalStr;
+	      if (finalStr === "" || finalStr === "-" || finalStr === "-.") {
+	        finalStr = "0";
 	      }
-	      modelValue.value = isNegative ? -cleaned : cleaned;
-	      emit("handleInput", isNegative ? -cleaned : cleaned);
+	      emit("handleInput", finalStr);
 	    };
 	    vue.watch(() => modelValue.value, (newvalue, oldValue) => {
-	      if (newvalue == "") {
+	      if (newvalue == "" || newvalue === "-" || newvalue === "-.") {
 	        modelValue.value = props.defaultValue == -1 ? 0 : props.defaultValue;
 	      }
 	    });
@@ -27478,7 +27502,8 @@
 	        modelValue: modelValue.value,
 	        "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => modelValue.value = $event),
 	        placeholder: __props.placeholder,
-	        onInput: handleInput
+	        onInput: handleInput,
+	        type: "text"
 	      }, vue.createSlots({
 	        _: 2
 	        /* DYNAMIC */