@neatui/nuxt 1.6.0 → 1.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neatui/nuxt",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "description": "NeatUI component library for Nuxt 3",
   "main": "./src/index.ts",
   "license": "MIT",
@@ -36,7 +36,7 @@
     "@fekit/scale": "^2.0.1",
     "@fekit/scrollto": "^3.0.3",
     "@fekit/toast": "^2.7.2",
-    "@fekit/utils": "^4.3.1",
+    "@fekit/utils": "^5.0.0",
     "@neatui/css": "^3.15.0",
     "@rollup/plugin-commonjs": "^26.0.1",
     "@rollup/plugin-node-resolve": "^15.2.3",

package/src/components/form/Input@v3.vue

@@ -3,7 +3,7 @@
     :ui-form="`${theme} sz:${sz} ${state.error.co} type:input ${block ? ' :block' : ''} ${disabled ? 'disabled' : ''} ${readonly ? 'readonly' : ''}`"
     @click="emits('click', $event)"
   >
-    <div :ui-form-tips="state.error.ontips">{{ state.error.tips }}</div>
+    <div v-if="state.interacted" :ui-form-tips="state.error.ontips">{{ state.error.tips }}</div>
     <div ui-form-prefix="">
       <template v-for="(item, idx) in prefix" :key="idx">
         <div v-if="isObject(item)" v-bind="item.attrs" v-on="event(item, props.modelValue)">
@@ -66,7 +66,7 @@
    * readonly       是否只读
    * clearable      是否显示清除按钮
    * rules          校验规则
-   * verify         是否是示校验图标 2=tips 3=text 4=icon 5=tips+text 6=text+icon 7=text+icon
+   * verify         是否显示校验
    * prefix         前缀内容
    * suffix         后缀内容
    * interacted     用户是否交互
@@ -92,7 +92,7 @@
     verify?: boolean;
     prefix?: Array<any>;
     suffix?: Array<any>;
-    interacted?: boolean;
+    interacted?: boolean | number | null;
   }
   const props: any = withDefaults(defineProps<Props>(), {
     modelValue: '',
@@ -113,12 +113,12 @@
     verify: false,
     prefix: () => [],
     suffix: () => [],
-    interacted: false,
+    interacted: null,
   });
 
   const state: any = reactive({
     // 用户是否交互
-    interacted: false,
+    interacted: null,
     // 值
     value: props.modelValue,
     // 错误
@@ -130,7 +130,7 @@
     (interacted: any) => {
       state.interacted = interacted;
     },
-    { deep: true, immediate: true },
+    { immediate: true },
   );
 
   // 校验
@@ -138,6 +138,8 @@
     [() => state.interacted, () => props.modelValue],
     async () => {
       if (state.interacted) {
+        const hasValue =
+          props.modelValue !== '' && props.modelValue !== null && props.modelValue !== undefined;
         // 提示文案
         let tips = '';
         // 错误类型
@@ -145,7 +147,7 @@
         // 验证结果
         let verify = '';
 
-        if (props.modelValue) {
+        if (hasValue) {
           // 有值
           let hasError = false;
           // 遍历校验规则

package/src/components/form/InputNumber.vue

@@ -35,47 +35,70 @@
 </template>
 
 <script setup lang="ts">
-  import { reactive, watch, PropType } from 'vue';
+  import { reactive, watch } from 'vue';
   import { isObject } from '@fekit/utils';
 
   const emits = defineEmits(['update:modelValue', 'click', 'blur', 'focus', 'change', 'input', 'clear']);
-  const props = defineProps({
+
+  interface Props {
     // 主题
-    theme: { type: String, default: '@a' },
+    theme?: string;
     // 尺寸
-    sz: { type: String, default: '' },
+    sz?: string;
     // 颜色
-    co: { type: String, default: '' },
+    co?: string;
     // 撑满
-    block: { type: Boolean, default: true },
+    block?: boolean;
     // 准备就绪
-    ready: { type: Boolean, default: false },
+    ready?: boolean;
     // 值
-    modelValue: { type: [String, Number], default: '' },
+    modelValue?: string | number;
     // 类型
-    type: { type: String, default: 'text' },
+    type?: string;
     // 提示文案
-    tips: { type: String, default: '' },
+    tips?: string;
     // 内容占位
-    placeholder: { type: String, default: '' },
+    placeholder?: string;
     // 最大长度
-    maxlength: { type: Number, default: null },
+    maxlength?: number | null;
     // 最小长度
-    minlength: { type: Number, default: null },
+    minlength?: number | null;
     // 是否禁用
-    disabled: { type: Boolean, default: false },
+    disabled?: boolean;
     // 是否只读
-    readonly: { type: Boolean, default: false },
+    readonly?: boolean;
     // 是否显示清除按钮
-    clearable: { type: Boolean, default: true },
+    clearable?: boolean;
     // 校验规则
-    rules: { type: Array as PropType<any[]>, default: () => [] },
+    rules?: any[];
     // 是否是示校验图标
-    verify: { type: Boolean, default: false },
-    prefix: { type: Array as PropType<any[]>, default: () => [] },
-    suffix: { type: Array as PropType<any[]>, default: () => [] },
+    verify?: boolean;
+    prefix?: any[];
+    suffix?: any[];
     // 用户是否交互
-    interacted: { type: Boolean, default: false }
+    interacted?: boolean;
+  }
+
+  const props = withDefaults(defineProps<Props>(), {
+    theme: '@a',
+    sz: '',
+    co: '',
+    block: true,
+    ready: false,
+    modelValue: '',
+    type: 'text',
+    tips: '',
+    placeholder: '',
+    maxlength: null,
+    minlength: null,
+    disabled: false,
+    readonly: false,
+    clearable: true,
+    rules: () => [],
+    verify: false,
+    prefix: () => [],
+    suffix: () => [],
+    interacted: false
   });
 
   const state: any = reactive({

package/src/components/form/Textarea.vue

@@ -94,7 +94,7 @@
     verify?: boolean;
     prefix?: Array<any>;
     suffix?: Array<any>;
-    interacted?: boolean;
+    interacted?: boolean | number | null;
     autoHeight?: boolean;
     rows?: number;
   }
@@ -116,7 +116,7 @@
     verify: false,
     prefix: () => [],
     suffix: () => [],
-    interacted: false,
+    interacted: null,
     // textarea 特有属性默认值
     autoHeight: false,
     rows: 3,
@@ -124,7 +124,7 @@
 
   const state: any = reactive({
     // 用户是否交互
-    interacted: false,
+    interacted: null,
     // 值
     value: props.modelValue,
     // 错误

package/src/components/form/index.ts

@@ -1,7 +1,7 @@
 import Input from './Input@v3.vue';
 import InputRange from './InputRange.vue';
 import Switch from './Switch.vue';
-import Textarea from './Textarea@v2.vue';
+import Textarea from './Textarea.vue';
 
 import Checkbox from './Checkbox.vue';
 import CheckboxItem from './CheckboxItem.vue';