@neatui/vue 4.2.0 → 4.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neatui/vue",
-  "version": "4.2.0",
+  "version": "4.2.2",
   "description": "basic component ui",
   "main": "./src/index.ts",
   "license": "MIT",
@@ -34,7 +34,7 @@
     "@fekit/scrollto": "^3.0.3",
     "@fekit/toast": "^2.7.2",
     "@fekit/utils": "^6.0.0",
-    "@neatui/css": "^4.2.0",
+    "@neatui/css": "^4.2.2",
     "@rollup/plugin-commonjs": "^26.0.1",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@vue/compiler-sfc": "^3.4.30",

package/src/components/basic/LayerView/Layer.vue

@@ -107,7 +107,8 @@
       const topId = stack[stack.length - 1];
       if (!topId) return;
       const layer = _tasks[topId];
-      if (!layer || layer.view !== 3 || layer.escClose === false) return;
+      // 禁止 ESC：显式 escClose=false，或禁止暗层关闭时同步禁 ESC
+      if (!layer || layer.view !== 3 || layer.escClose === false || layer.darkClickClose === false) return;
       layer.hide();
       ev.preventDefault();
     };
@@ -333,6 +334,14 @@
     { immediate: true },
   );
 
+  watch(
+    () => props.darkClickClose,
+    (darkClickClose) => {
+      if (_tasks[props.id]) _tasks[props.id].darkClickClose = darkClickClose;
+    },
+    { immediate: true },
+  );
+
   // 回调合集
   const on: any = {
     show: [],
@@ -426,7 +435,7 @@
     console.error('Layer 有重复 id', id);
   }
   if (id) {
-    _tasks[id] = { init, show, hide, open, none, view: state.view, escClose: props.escClose };
+    _tasks[id] = { init, show, hide, open, none, view: state.view, escClose: props.escClose, darkClickClose: props.darkClickClose };
     ensureEscapeListener();
   } else {
     console.error('Layer 必须填写全局统一的 id');

package/src/components/form/MoreSelect.vue

@@ -60,6 +60,7 @@
   import { reactive, ref, computed, watch, nextTick } from 'vue';
   import Input from './Input.vue';
   import { IFollowView } from '../basic';
+  import { matchOptionSearch } from './optionSearch';
   const ifollow: any = ref(null);
 
   const emits = defineEmits(['update:modelValue']);
@@ -177,7 +178,7 @@
     filter: computed(() => {
       if (state.search) {
         return props.options?.filter((item: any) => {
-          return item.label?.includes(state.search);
+          return matchOptionSearch(item, state.search);
         });
       } else {
         return props.options;

package/src/components/form/SearchMoreSelect.vue

@@ -46,6 +46,7 @@
   import { reactive, ref, computed } from 'vue';
   import Input from './Input.vue';
   import { IFollowView } from '../basic';
+  import { matchOptionSearch } from './optionSearch';
   const ifollow: any = ref(null);
 
   const emits = defineEmits(['update:modelValue', 'change', 'request', 'onshow', 'onhide']);
@@ -118,7 +119,7 @@
     filter: computed(() => {
       if (state.search) {
         return props.options?.filter((item) => {
-          return item.label?.includes(state.search);
+          return matchOptionSearch(item, state.search);
         });
       } else {
         return props.options;

package/src/components/form/SearchSelect.vue

@@ -50,6 +50,7 @@
   import { reactive, ref, computed } from 'vue';
   import Input from './Input.vue';
   import { IFollowView } from '../basic';
+  import { matchOptionSearch } from './optionSearch';
   const ifollow: any = ref(null);
   console.warn('「SearchSelect」 即将废弃，建议使用「Select」 设置参数search为true，示例：<Select v-model="value" :search="true" />');
   const emits = defineEmits(['update:modelValue', 'change', 'onshow', 'onhide']);
@@ -161,7 +162,7 @@
     filter: computed(() => {
       if (state.search) {
         return props.options?.filter((item: any) => {
-          return item.label?.includes(state.search);
+          return matchOptionSearch(item, state.search);
         });
       } else {
         return props.options;

package/src/components/form/Select.vue

@@ -68,6 +68,7 @@
   import { reactive, ref, computed, watch, nextTick } from 'vue';
   import Input from './Input.vue';
   import { IFollowView } from '../basic';
+  import { matchOptionSearch } from './optionSearch';
   const ifollow: any = ref(null);
   const customInputRef: any = ref(null);
 
@@ -246,7 +247,7 @@
 
       if (state.search) {
         filteredOptions = filteredOptions.filter((item: any) => {
-          return item.label?.includes(state.search);
+          return matchOptionSearch(item, state.search);
         });
       }
 

package/src/components/form/optionSearch.ts

@@ -0,0 +1,31 @@
+/**
+ * 选项搜索：匹配 label / value，以及选项对象上可遍历的全部字段（含嵌套）
+ * 大小写不敏感
+ */
+export const matchOptionSearch = (item: any, keyword: unknown): boolean => {
+  const q = String(keyword ?? '')
+    .trim()
+    .toLowerCase();
+  if (!q) return true;
+  if (item == null) return false;
+
+  if (typeof item !== 'object') {
+    return String(item).toLowerCase().includes(q);
+  }
+
+  const seen = new WeakSet<object>();
+  const walk = (val: any): boolean => {
+    if (val == null) return false;
+    const t = typeof val;
+    if (t === 'string' || t === 'number' || t === 'boolean' || t === 'bigint') {
+      return String(val).toLowerCase().includes(q);
+    }
+    if (t !== 'object') return false;
+    if (seen.has(val)) return false;
+    seen.add(val);
+    if (Array.isArray(val)) return val.some(walk);
+    return Object.values(val).some(walk);
+  };
+
+  return walk(item);
+};