v-nuxt-ui 0.2.17 → 0.2.18

package/dist/module.json

@@ -7,7 +7,7 @@
   "dependencies": [
     "@nuxt/ui"
   ],
-  "version": "0.2.17",
+  "version": "0.2.18",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/runtime/components/sys/user/Table.vue

@@ -191,6 +191,11 @@ const columns = [
     :extra-order-query-options="[
   { field: 'createdAt', label: '\u521B\u5EFA\u65F6\u95F4', defaultOpr: 'desc' }
 ]"
+    :extra-where-query-init-values="{
+  items: [
+    { field: 'isAdmin', opr: 'eq', value: false }
+  ]
+}"
     @edit-row-from-modal="async (row) => await createModal.open({ model: row }).result"
   />
 </template>

package/dist/runtime/components/table/query/where/index.vue

@@ -66,6 +66,14 @@ const isWhereQueryEmpty = computed(() => {
   return !props.whereQuery || Object.keys(props.whereQuery ?? {}).length === 0 || // 仅检查有对应option的item的值是否为空
   (props.whereQuery?.items?.filter((query) => props.whereOptions.find((option) => option.field === query.field)).length ?? 0) === 0 && (props.whereQuery?.groups?.length ?? 0) === 0;
 });
+const whereQueryWithoutDefault = computed(() => {
+  if (!props.whereQuery) return [];
+  const defaultKeys = props.defaultWhereQuery?.items?.map((query) => query.field) ?? [];
+  return props.whereQuery.items?.filter((query) => {
+    const field = query.field;
+    return !defaultKeys.includes(field);
+  }) ?? [];
+});
 const focusField = (field) => {
   const item = itemRefMap.value.get(field);
   if (item) {
@@ -84,7 +92,7 @@ defineExpose({ focusField });
       <!-- key如果是field，那么field修改后，不能聚焦后面的组件，所以这里的key用idx代替 -->
       <template v-if="!isWhereQueryEmpty">
         <TableQueryWhereSimpleItem
-          v-for="(item, idx) in whereQuery?.items"
+          v-for="(item, idx) in whereQueryWithoutDefault"
           :ref="(el) => setItemRef(item.field, el)"
           :key="idx"
           :where-query-item="item"
@@ -93,8 +101,11 @@ defineExpose({ focusField });
           :trigger-fetching="() => triggerFetching(true)"
           @remove="onRemoveFilter"
           @update:where-query-item="(newWhereQueryItem) => {
-  const updatedItems = [...props.whereQuery?.items ?? []];
-  updatedItems[idx] = newWhereQueryItem;
+  const items = props.whereQuery?.items ?? [];
+  const realIdx = items.findIndex((q) => q.field === item.field);
+  if (realIdx === -1) return;
+  const updatedItems = [...items];
+  updatedItems[realIdx] = newWhereQueryItem;
   onUpdateWhereQuery({
     ...whereQuery,
     items: updatedItems

package/dist/runtime/components/table/query/where/simple/item/index.vue

@@ -12,9 +12,10 @@ const props = defineProps({
 const whereQueryItem = defineModel("whereQueryItem", { type: Object, ...{ required: true } });
 const option = computed(() => props.options.find((option2) => option2.field === whereQueryItem.value.field));
 watch(
-  () => whereQueryItem.value.custom,
-  () => {
-    whereQueryItem.value = { ...whereQueryItem.value, custom: option.value?.custom };
+  () => option.value?.custom,
+  (newCustom) => {
+    if (whereQueryItem.value.custom === newCustom) return;
+    whereQueryItem.value = { ...whereQueryItem.value, custom: newCustom };
   },
   { immediate: true }
 );

package/dist/runtime/components/table/query/where/simple/item/opr/index.vue

@@ -13,9 +13,10 @@ const props = defineProps({
 const whereQueryItem = defineModel("whereQueryItem", { type: Object, ...{ required: true } });
 const option = computed(() => props.options.find((option2) => option2.field === whereQueryItem.value.field) ?? { type: "unknown", field: "unknown", label: "\u672A\u77E5\u5B57\u6BB5" });
 watch(
-  () => whereQueryItem.value.custom,
-  () => {
-    whereQueryItem.value = { ...whereQueryItem.value, custom: option.value?.custom };
+  () => option.value?.custom,
+  (newCustom) => {
+    if (whereQueryItem.value.custom === newCustom) return;
+    whereQueryItem.value = { ...whereQueryItem.value, custom: newCustom };
   },
   { immediate: true }
 );

package/dist/runtime/composables/table/useTableQuery.js

@@ -72,7 +72,8 @@ export function useTableQuery(props) {
     if (itemsWithOprNoValues.length > 0) {
       return false;
     }
-    return !items.filter((item) => !noValueOprList.includes(item.opr)).some((item) => item.value !== null && item.value !== void 0 && item.value !== "");
+    const defaultKeys = whereQueryInitValues.value.items?.map((query) => query.field) ?? [];
+    return !items.filter((item) => !defaultKeys.includes(item.field)).filter((item) => !noValueOprList.includes(item.opr)).some((item) => item.value !== null && item.value !== void 0 && item.value !== "");
   };
   const checkIfWhereQueryGroupsValueEmpty = (groups) => {
     for (const group of groups) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "v-nuxt-ui",
-  "version": "0.2.17",
+  "version": "0.2.18",
   "description": "Veken UI Component Library - Reusable Nuxt UI components, composables, and utilities for enterprise applications",
   "type": "module",
   "style": "./dist/runtime/index.css",