@neatui/vue 2.11.0 → 2.12.0

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

@@ -1,12 +1,15 @@
 <template>
-  <div :ui-form="`@a type:select sz:${sz}`" :ui-form-open="state.show ? 'show' : ''">
+  <div :ui-form="`@a type:select${sz ? 'sz:' + sz : ''}`" :ui-form-open="state.show ? 'show' : ''">
     <IFollowView ref="ifollow" tipBoxClass="ny-sm nx-no" tipBoxStyle="min-width: 100%" @onshow="onshow" @onhide="onhide">
       <Input
         v-bind="{ placeholder, rules, theme, sz, co, block, ready, type, tips, disabled, readonly: true, clearable: false, verify, prefix, suffix, interacted }"
         v-model="state.selectd.label"
         :interacted="interacted"
       >
-        <template #suffix><i ui-form-select=""></i></template>
+        <template #suffix>
+          <i v-if="clearable && modelValue && !readonly && !disabled" ui-form-clean="" @click.stop="remove"></i>
+          <i ui-form-select=""></i>
+        </template>
       </Input>
       <template #tips v-if="!readonly && !disabled">
         <div v-if="search" class="ny-sm nx-sl">
@@ -16,7 +19,7 @@
             </template>
           </Input>
         </div>
-        <ul v-if="props.options?.length" ui-scroll=":y s" class="nx-sm lh-sl" style="min-width: 100%; max-height: 16em">
+        <ul v-if="state.filter?.length" ui-scroll=":y s" class="nx-sm lh-sl" style="min-width: 100%; max-height: 16em">
           <template v-for="(item, idx) of state.filter" :key="idx">
             <li v-if="item.disabled" class="ux-hover nx-sm ny-ss r-ss o-ms nowrap" :class="item.value === state.selectd?.value ? 'co-main' : ''">
               <del>{{ item.label || item }}</del>
@@ -47,7 +50,7 @@
 
 <script setup lang="ts">
   import { reactive, ref, computed } from 'vue';
-  import { Input } from '../form';
+  import { Input } from '.';
   import { IFollowView } from '../basic';
   const ifollow: any = ref(null);
 
@@ -139,14 +142,14 @@
     minlength: null,
     disabled: false,
     readonly: false,
-    clearable: false,
+    clearable: true,
     verify: false,
     prefix: () => [],
     suffix: () => [],
     interacted: false,
   });
 
-  const change = ({ value = '' }: any = {}) => {
+  const change = ({ value = null }: any = {}) => {
     emits('update:modelValue', value);
     emits('change', value);
   };

package/src/components/form/SelectList.vue

@@ -1,8 +1,8 @@
 <template>
   <ul v-if="props.options?.length" class="my-sm-sub lh-ss">
     <li
-      class="hover:bg-main-ss n-sl r-ss b-solid b-xs"
-      :class="`${item.value === mv ? 'bk-main-ml bg-main-ss' : 'bk-case'}`"
+      class="hover:bg-main-o-ss n-sl r-ss b-solid b-xs"
+      :class="`${item.value === mv ? 'bk-main-o-ml bg-main-o-ss' : 'bk-case'}`"
       v-for="(item, idx) of props.options"
       :key="idx"
       @click="mv = item.value === mv ? '' : item.value"
@@ -27,16 +27,16 @@
     placeholder: { type: String, default: '' },
     options: {
       type: Array as () => any[],
-      default: () => []
+      default: () => [],
     },
     modelValue: {
       type: [String, Number],
-      default: ''
+      default: '',
     },
     rules: {
       type: Array,
-      default: () => []
-    }
+      default: () => [],
+    },
   });
 
   // eslint-disable-next-line vue/no-dupe-keys
@@ -47,12 +47,12 @@
     () => props.modelValue,
     (value: any) => {
       mv.value = value;
-    }
+    },
   );
   watch(
     () => mv.value,
     (value: any) => {
       emits('update:modelValue', value);
-    }
+    },
   );
 </script>

package/src/components/form/SelectPicker.vue

@@ -29,7 +29,7 @@
 
 <script setup lang="ts">
   import { reactive, ref, computed } from 'vue';
-  import { Input } from '../form';
+  import { Input } from '.';
   import { IPickerView, IScrollView } from '../basic';
   import { watch } from 'vue';
   const ipicker: any = ref(null);
@@ -43,16 +43,16 @@
     placeholder: { type: String, default: '' },
     options: {
       type: Array as () => any[],
-      default: () => []
+      default: () => [],
     },
     modelValue: {
       type: [String, Number],
-      default: ''
+      default: '',
     },
     rules: {
       type: Array,
-      default: () => []
-    }
+      default: () => [],
+    },
   });
   // 内部数据
   const mv: any = ref(props.modelValue);
@@ -61,7 +61,7 @@
     (v: any) => {
       mv.value = v;
     },
-    { deep: true, immediate: true }
+    { deep: true, immediate: true },
   );
   const state = reactive({
     view: 0,
@@ -74,7 +74,7 @@
         }
       }
       return _value;
-    })
+    }),
   });
   // 更新
   const change = ({ value = null }: any = {}) => {

package/src/components/form/SelectTags.vue

@@ -2,7 +2,7 @@
   <div v-if="props.options?.length" class="mr-sm-sub mb-sm-sub">
     <span
       class="lh-ss ny-sm nx-ms r-xl dib"
-      :class="`${mv == item.value ? 'bg-main-sm co-main' : 'bg-weak'}`"
+      :class="`${mv == item.value ? 'bg-main-o-sm co-main' : 'bg-weak'}`"
       v-for="(item, idx) of props.options"
       :key="idx"
       @click="mv = item.value === mv ? '' : item.value"
@@ -24,16 +24,16 @@
     placeholder: { type: String, default: '' },
     options: {
       type: Array as () => any[],
-      default: () => []
+      default: () => [],
     },
     modelValue: {
       type: [String, Number],
-      default: ''
+      default: '',
     },
     rules: {
       type: Array,
-      default: () => []
-    }
+      default: () => [],
+    },
   });
   // 内部数据
   const mv: any = ref(props.modelValue);
@@ -41,12 +41,12 @@
     () => props.modelValue,
     (value: any) => {
       mv.value = value;
-    }
+    },
   );
   watch(
     () => mv.value,
     (value: any) => {
       emits('update:modelValue', value);
-    }
+    },
   );
 </script>

package/src/components/form/SelectTree/SelectTree@v1.vue

@@ -40,7 +40,7 @@
 
 <script setup lang="ts">
   import { reactive, ref, computed, watch } from 'vue';
-  import { Input } from '../../form';
+  import { Input } from '..';
   import { IFollowView } from '../../basic';
   import { TreeView } from '../../display';
   import { findByJson, filterJson } from '@fekit/utils';
@@ -144,7 +144,7 @@
     verify: false,
     prefix: () => [],
     suffix: () => [],
-    interacted: false
+    interacted: false,
   });
 
   const state: any = reactive({
@@ -158,7 +158,7 @@
       return (props.chain ? _item.chain : _item.label) || '';
     }),
     filter: [],
-    value: ''
+    value: '',
   });
   watch(
     () => state.value,
@@ -167,7 +167,7 @@
         change(value);
       }
     },
-    { deep: true }
+    { deep: true },
   );
   watch(
     [() => state.search, () => props.options],
@@ -178,7 +178,7 @@
         state.filter = props.options;
       }
     },
-    { deep: true, immediate: true }
+    { deep: true, immediate: true },
   );
 
   const change = (value: any = '') => {
@@ -221,7 +221,7 @@
     select,
     remove,
     change,
-    cancel
+    cancel,
   });
 </script>
 .. ..

package/src/components/form/Switch.vue

@@ -1,6 +1,6 @@
 <template>
-  <label ui-form="@a type:switch" class="lh-ls">
-    <input type="checkbox" name="form2" :checked="value ? true : false" />
+  <label ui-form="@a type:switch">
+    <input type="checkbox" v-model="internalValue" :disabled="disabled" />
     <slot>
       <span>{{ text }}</span>
     </slot>
@@ -8,7 +8,7 @@
 </template>
 
 <script setup lang="ts">
-  import { ref, watch, computed, onMounted, PropType } from 'vue';
+  import { ref, watch, PropType } from 'vue';
 
   const props = defineProps({
     theme: { type: String, default: '@a' },
@@ -17,79 +17,54 @@
     block: { type: Boolean, default: true },
     // 值
     modelValue: {
-      type: [Number, Boolean],
+      type: [Number, Boolean, String],
       default: false,
     },
-    // 类型
-    type: {
-      type: String,
-      default: 'text',
-    },
     text: {
       type: String,
       default: '',
     },
-    // 提示文案
-    tips: {
-      type: String,
-      default: '',
-    },
-    // 内容占位
-    placeholder: {
-      type: String,
-      default: '',
-    },
-    // 最大长度
-    maxlength: {
-      type: Number,
-      default: null,
-    },
-    // 最小长度
-    minlength: {
-      type: Number,
-      default: null,
-    },
     // 是否禁用
     disabled: {
       type: Boolean,
       default: false,
     },
-    // 是否中读
-    readonly: {
-      type: Boolean,
-      default: false,
-    },
-    // 是否显示清除按钮
-    clearable: {
-      type: Boolean,
-      default: true,
-    },
-    // 校验规则
-    rules: {
-      type: Array,
-      default: () => [],
-    },
-    // 是否是示校验图标
-    verify: {
-      type: Boolean,
-      default: false,
-    },
-    prefix: {
-      type: Array as PropType<any[]>,
-      default: () => [],
-    },
-    suffix: {
+    map: {
       type: Array as PropType<any[]>,
-      default: () => [],
+      default: () => [false, true],
     },
   });
 
-  const value = ref(props.modelValue);
-  // 监听异步数据
+  const emit = defineEmits(['update:modelValue']);
+
+  // 内部值（始终是布尔值）
+  const internalValue = ref(false);
+
+  // 计算内部值
+  const getInternalValue = (externalValue: any) => {
+    const index = props.map.indexOf(externalValue);
+    return index === 0 ? true : index === 1 ? false : Boolean(externalValue);
+  };
+
+  // 计算外部值
+  const getExternalValue = (internalValue: boolean) => {
+    return internalValue ? props.map[0] : props.map[1];
+  };
+
+  // 初始化内部值
+  internalValue.value = getInternalValue(props.modelValue);
+
+  // 监听外部值变化
   watch(
     () => props.modelValue,
     (newValue) => {
-      value.value = newValue;
+      internalValue.value = getInternalValue(newValue);
     },
   );
+
+  // 监听内部值变化，向父组件发送映射后的值
+  watch(internalValue, (newValue) => {
+    const externalValue = getExternalValue(newValue);
+    emit('update:modelValue', externalValue);
+  });
 </script>

package/src/components/form/Textarea@v2.vue

@@ -0,0 +1,275 @@
+<template>
+  <div
+    :ui-form="`${theme} sz:${sz} ${state.error.co} type:textarea ${block ? ' :block' : ''} ${disabled ? 'disabled' : ''} ${readonly ? 'readonly' : ''}`"
+    @click="emits('click', $event)"
+  >
+    <div :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)">
+          <div v-html="isFunction(item.value) ? item.value(props.modelValue) : item.value"></div>
+        </div>
+        <div v-else v-html="isFunction(item) ? item(props.modelValue) : item"></div>
+      </template>
+      <slot name="prefix"></slot>
+    </div>
+    <slot>
+      <textarea
+        ref="el"
+        :title="props.modelValue"
+        :value="props.modelValue"
+        :placeholder="placeholder"
+        :disabled="disabled"
+        :readonly="readonly"
+        :rows="rows"
+        ui-scroll=":y"
+        dir="auto"
+        @focus="emits('focus', $event, state)"
+        @input="input($event)"
+        @change="emits('change', $event, state)"
+        @blur="blur($event)"
+      ></textarea>
+    </slot>
+    <div ui-form-suffix="">
+      <i ui-form-clean="" v-if="clearable && props.modelValue && !readonly && !disabled" @click.stop="clear"></i>
+      <slot name="suffix"></slot>
+      <template v-for="(item, idx) in suffix" :key="idx">
+        <div v-if="isObject(item)" v-bind="item.attrs" v-on="event(item, props.modelValue)">
+          <div v-html="isFunction(item.value) ? item.value(props.modelValue) : item.value"></div>
+        </div>
+        <div v-else v-html="isFunction(item) ? item(props.modelValue) : item"></div>
+      </template>
+    </div>
+    <i v-if="verify && state.interacted" :ui-form-verify="state.error.verify"></i>
+  </div>
+</template>
+
+<script setup lang="ts">
+  import { reactive, watch, ref, nextTick, onMounted } from 'vue';
+  import { isObject, isFunction } from '@fekit/utils';
+
+  const emits = defineEmits(['update:modelValue', 'click', 'blur', 'focus', 'change', 'input', 'clear']);
+
+  /**
+   * 入参说明
+   *
+   * modelValue     值
+   * theme          主题
+   * sz             尺寸
+   * co             颜色
+   * block          撑满
+   * ready          准备就绪
+   * tips           提示文案
+   * placeholder    内容占位
+   * maxlength      最大长度
+   * minlength      最小长度
+   * disabled       是否禁用
+   * readonly       是否只读
+   * clearable      是否显示清除按钮
+   * rules          校验规则
+   * verify         是否是示校验图标 2=tips 3=text 4=icon 5=tips+text 6=text+icon 7=text+icon
+   * prefix         前缀内容
+   * suffix         后缀内容
+   * interacted     用户是否交互
+   * autoHeight     是否自动调整高度
+   * rows           初始行数
+   */
+
+  // 类型
+  interface Props {
+    modelValue?: string | number;
+    placeholder?: string;
+    rules?: Array<object>;
+    theme?: string;
+    sz?: '' | 'xs' | 's' | 'm' | 'l' | 'xl';
+    co?: string;
+    block?: boolean;
+    ready?: boolean;
+    tips?: string;
+    maxlength?: null | number;
+    minlength?: null | number;
+    disabled?: boolean;
+    readonly?: boolean;
+    clearable?: boolean;
+    verify?: boolean;
+    prefix?: Array<any>;
+    suffix?: Array<any>;
+    interacted?: boolean;
+    autoHeight?: boolean;
+    rows?: number;
+  }
+  const props: any = withDefaults(defineProps<Props>(), {
+    modelValue: '',
+    placeholder: '',
+    rules: () => [],
+    theme: '@a',
+    sz: '',
+    co: '',
+    block: true,
+    ready: false,
+    tips: '',
+    maxlength: null,
+    minlength: null,
+    disabled: false,
+    readonly: false,
+    clearable: true,
+    verify: false,
+    prefix: () => [],
+    suffix: () => [],
+    interacted: false,
+    // textarea 特有属性默认值
+    autoHeight: false,
+    rows: 3,
+  });
+
+  const state: any = reactive({
+    // 用户是否交互
+    interacted: false,
+    // 值
+    value: props.modelValue,
+    // 错误
+    error: {},
+  });
+
+  // textarea 元素引用
+  const el: any = ref(null);
+
+  // 自动高度功能
+  const fAutoHeight = () => {
+    nextTick(() => {
+      if (props.autoHeight && el.value) {
+        el.value.style.height = 'auto';
+        el.value.style.height = el.value.scrollHeight + 1 + 'px';
+      }
+    });
+  };
+
+  // 外部传入交互标识，主要用于外部没有输入但点击了提交
+  watch(
+    () => props.interacted,
+    (interacted: any) => {
+      if (interacted) {
+        state.interacted = interacted;
+      }
+    },
+    { deep: true, immediate: true },
+  );
+
+  // 校验
+  watch(
+    [() => state.interacted, () => props.modelValue],
+    async () => {
+      if (state.interacted) {
+        // 提示文案
+        let tips = '';
+        // 错误类型
+        let type = '';
+        // 验证结果
+        let verify = '';
+
+        if (props.modelValue) {
+          // 有值
+          let hasError = false;
+          // 遍历校验规则
+          for (const rule of props.rules) {
+            if (rule && rule.validator) {
+              const yes = !(await rule.validator(props.modelValue));
+              if (yes) {
+                tips = rule.msg;
+                type = rule.type;
+                hasError = true;
+                break;
+              }
+            }
+          }
+          verify = hasError ? 'no' : 'ok';
+        } else {
+          // 无值
+          let hasError = false;
+          // 遍历校验规则
+          for (const rule of props.rules) {
+            if (rule) {
+              tips = rule.msg;
+              type = rule.type;
+              if (rule.required) {
+                hasError = true;
+                break;
+              }
+            }
+          }
+          verify = hasError ? 'no' : '';
+        }
+        if (verify !== 'no' && props.tips) {
+          tips = props.tips;
+        }
+        // 是否显示提示
+        const ontips = (verify === 'no' && tips) || props.tips ? 'show' : '';
+        // 状态颜色
+        const co = verify === 'no' ? 'co:' + type : props.co ? 'co:' + props.co : '';
+        state.error = { tips, ontips, verify, co };
+      } else {
+        state.error = { tips: props.tips, ontips: props.tips ? 'show' : '', verify: '', co: '' };
+      }
+    },
+    { deep: true, immediate: true },
+  );
+
+  // 清空
+  function clear() {
+    emits('update:modelValue', null);
+    emits('clear');
+  }
+  // 输入
+  const input = (e: any) => {
+    // 用户交互
+    if (!state.interacted) {
+      setTimeout(() => {
+        state.interacted = true;
+      }, 50);
+    }
+
+    // 长度限制
+    const value = e?.target?.value || '';
+    if (props.maxlength && value.length > props.maxlength) {
+      e.target.value = props.modelValue;
+      return false;
+    }
+    // 输入事件
+    emits('input', e, state);
+    emits('update:modelValue', value || null);
+
+    // 自动高度
+    fAutoHeight();
+  };
+  // 失焦
+  const blur = (e: any) => {
+    if (!state.interacted) {
+      setTimeout(() => {
+        state.interacted = true;
+      }, 50);
+    }
+    emits('blur', e, state);
+  };
+
+  // 事件处理
+  const event: any = (item: any, data: any): object => {
+    const _event: any = {};
+    if (isObject(item.event)) {
+      for (const key in item.event) {
+        const fun = item.event[key];
+        if (isFunction(fun)) {
+          _event[key] = (...args: any) => {
+            return fun({ data }, ...args);
+          };
+        }
+      }
+    }
+    return { ..._event };
+  };
+
+  // 组件挂载后初始化自动高度
+  onMounted(() => {
+    // 自动高度
+    fAutoHeight();
+  });
+</script>