v-nuxt-ui 0.2.33 → 0.3.0

package/dist/runtime/types/components/table/header.d.ts

@@ -1,12 +1,14 @@
 import type { ButtonProps } from '@nuxt/ui';
 import type { ApiGroup, OrderQueryProps, VColumn, VTableExportExcelProps, WhereQueryProps } from '.';
 import type { Size, WhereQuery } from '../../index.js';
+import type { Column } from '../../storage.js';
 export type TableHeaderOprType = 'create' | 'whereQuery' | 'orderQuery' | 'batchDelete' | 'refresh' | 'settings' | 'exportExcel';
 export type TableHeaderProps<T> = {
     name: string;
+    tblName?: string;
     fetching?: boolean;
     rawBizColumns: VColumn<T>[];
-    onUpdateBizColumns?: (columns: VColumn<T>[]) => void;
+    onUpdateBizColumns?: (columns: VColumn<T>[], storageColumns?: Column[]) => void;
     oprOrder?: TableHeaderOprType[];
     onNew?: () => T;
     apiGroup?: () => ApiGroup<T>;

package/dist/runtime/types/components/table/query/order.d.ts

@@ -9,6 +9,8 @@ export type OrderQueryProps<T> = {
     defaultOrderQuery?: OrderQuery<T>;
     orderQuery: OrderQuery<T>;
     onUpdateOrderQuery: (query: OrderQuery<T>) => void;
+    orderQueryOpen?: boolean;
+    onUpdateOrderQueryOpen?: (open: boolean) => void;
     fetching?: boolean;
     triggerFetching: () => Promise<void>;
     bizColumns: VColumn<T>[];

package/dist/runtime/types/components/table/query/where.d.ts

@@ -2,7 +2,6 @@ import type { VColumn, WhereQuery, WhereQueryColumnOption, WhereQueryItemGroup }
 export type WhereQueryOption<T> = {
     field: string & keyof T | string;
     label: string;
-    preferred?: boolean;
 } & WhereQueryColumnOption<T>;
 export type WhereQueryProps<T> = {
     whereOptions: WhereQueryOption<T>[];

package/dist/runtime/types/query.d.ts

@@ -36,6 +36,7 @@ export interface WhereQueryItem<T> {
     value?: any;
     custom?: boolean;
     extraData?: any;
+    whereQuerySection?: 'preferred' | 'other';
 }
 export type OrderQueryOpr = 'asc' | 'desc' | 'str_len_asc' | 'str_len_desc' | null;
 export type OrderQuery<T> = OrderQueryItem<T>[];

package/dist/runtime/types/storage.d.ts

@@ -20,5 +20,6 @@ export type TableSettings<T> = {
     pageSize?: number;
     whereQuery?: import('./query').WhereQuery<T>;
     whereQueryOpen?: boolean;
+    orderQueryOpen?: boolean;
     orderQuery?: import('./query').OrderQuery<T>;
 };

package/package.json

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

package/dist/runtime/components/form/save-model-template/ConfirmUpdateModal.d.vue.ts

@@ -1,19 +0,0 @@
-import type { VFormFieldProps } from '#v/types';
-export interface ConfirmDiffItem {
-    fieldName: string;
-    oldValue: unknown;
-    newValue: unknown;
-}
-type __VLS_Props = {
-    fields: VFormFieldProps[];
-    diffItems: ConfirmDiffItem[];
-    oldModelValue: Record<string, unknown>;
-    newModelValue: Record<string, unknown>;
-};
-declare const __VLS_export: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-    close: (args_0: boolean) => any;
-}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{
-    onClose?: ((args_0: boolean) => any) | undefined;
-}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
-declare const _default: typeof __VLS_export;
-export default _default;

package/dist/runtime/components/form/save-model-template/ConfirmUpdateModal.vue

@@ -1,111 +0,0 @@
-<script setup>
-import { isEmptyString } from "#v/utils";
-import { diffEligibleTypes, useConfirmDiff } from "#v/composables";
-const props = defineProps({
-  fields: { type: Array, required: true },
-  diffItems: { type: Array, required: true },
-  oldModelValue: { type: Object, required: true },
-  newModelValue: { type: Object, required: true }
-});
-const emit = defineEmits(["close"]);
-const { diffedItems } = useConfirmDiff(
-  () => props.fields,
-  () => props.diffItems,
-  () => props.oldModelValue,
-  () => props.newModelValue
-);
-</script>
-
-<template>
-  <UModal
-    title="确认修改"
-    :close="{ onClick: () => emit('close', false) }"
-    :dismissible="false"
-  >
-    <template #description>
-      <div class="flex items-center gap-3 w-full">
-        <span>
-          请确认以下 {{ diffedItems.length }} 处修改内容
-        </span>
-      </div>
-    </template>
-    <template #body>
-      <div class="overflow-y-auto max-h-96">
-        <div class="space-y-4">
-          <UFormField
-            v-for="item in diffedItems"
-            :key="item.fieldName"
-            :label="item.field.label || item.fieldName"
-          >
-            <!-- String types: word diff -->
-            <div v-if="item.field.diffable ?? diffEligibleTypes.has(item.field.type)" class="flex items-center flex-wrap gap-2">
-              <span
-                class="rounded-md bg-muted px-2 py-1 text-sm text-dimmed"
-                :title="item.oldDisplay"
-              >
-                <span v-if="!item.parts.filter((part2) => !part2.added).length">{{ "\xA0" }}</span>
-                <template v-for="(part, idx) in item.parts" :key="idx">
-                  <span
-                    v-if="!part.added"
-                    :class="{ 'bg-red-200 text-red-800 dark:bg-red-800 dark:text-red-200 rounded-sm line-through px-0.5': part.removed }"
-                  >{{ isEmptyString(part.value) ? "\xA0" : part.value }}</span>
-                </template>
-              </span>
-              <UIcon
-                name="i-lucide-arrow-right"
-                class="text-dimmed shrink-0 size-4"
-              />
-              <span
-                class="rounded-md bg-elevated px-2 py-1 text-sm text-highlighted font-bold"
-                :title="item.newDisplay"
-              >
-                <span v-if="!item.parts.filter((part2) => !part2.removed).length">{{ "\xA0" }}</span>
-                <template v-for="(part, idx) in item.parts" :key="idx">
-                  <span
-                    v-if="!part.removed"
-                    :class="{ 'bg-green-200 text-green-800 dark:bg-green-800 dark:text-green-200 rounded-sm px-0.5': part.added }"
-                  >{{ isEmptyString(part.value) ? "\xA0" : part.value }}</span>
-                </template>
-              </span>
-            </div>
-            <!-- Other types: simple old -> new -->
-            <div v-else class="flex items-center flex-wrap gap-2">
-              <span
-                class="rounded-md bg-muted px-2 py-1 text-sm text-dimmed"
-                :title="item.oldDisplay"
-              >
-                {{ isEmptyString(item.oldDisplay) ? "\xA0" : item.oldDisplay }}
-              </span>
-              <UIcon
-                name="i-lucide-arrow-right"
-                class="text-dimmed shrink-0 size-4"
-              />
-              <span
-                class="rounded-md bg-elevated px-2 py-1 text-sm text-highlighted font-medium"
-                :title="item.newDisplay"
-              >
-                {{ isEmptyString(item.newDisplay) ? "\xA0" : item.newDisplay }}
-              </span>
-            </div>
-          </UFormField>
-        </div>
-      </div>
-    </template>
-    <template #footer>
-      <UButton
-        label="取消"
-        color="neutral"
-        variant="subtle"
-        icon="i-lucide-x"
-        @click="emit('close', false)"
-      />
-      <UButton
-        :label="`\u786E\u8BA4 ${diffedItems.length} \u5904\u4FEE\u6539`"
-        color="primary"
-        variant="solid"
-        icon="i-lucide-check"
-        @click="emit('close', true)"
-      />
-    </template>
-  </UModal>
-</template>

package/dist/runtime/components/form/save-model-template/ConfirmUpdateModal.vue.d.ts

@@ -1,19 +0,0 @@
-import type { VFormFieldProps } from '#v/types';
-export interface ConfirmDiffItem {
-    fieldName: string;
-    oldValue: unknown;
-    newValue: unknown;
-}
-type __VLS_Props = {
-    fields: VFormFieldProps[];
-    diffItems: ConfirmDiffItem[];
-    oldModelValue: Record<string, unknown>;
-    newModelValue: Record<string, unknown>;
-};
-declare const __VLS_export: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-    close: (args_0: boolean) => any;
-}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{
-    onClose?: ((args_0: boolean) => any) | undefined;
-}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
-declare const _default: typeof __VLS_export;
-export default _default;

package/dist/runtime/components/form/save-model-template/WithApi.d.vue.ts

@@ -1,19 +0,0 @@
-import type { BaseModel, SaveModalFormTemplatePropsWithApi } from '#v/types';
-declare const __VLS_export: <T extends BaseModel>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_exposed?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
-    props: import("vue").PublicProps & __VLS_PrettifyLocal<SaveModalFormTemplatePropsWithApi<T>> & (typeof globalThis extends {
-        __VLS_PROPS_FALLBACK: infer P;
-    } ? P : {});
-    expose: (exposed: {}) => void;
-    attrs: any;
-    slots: {};
-    emit: {};
-}>) => import("vue").VNode & {
-    __ctx?: Awaited<typeof __VLS_setup>;
-};
-declare const _default: typeof __VLS_export;
-export default _default;
-type __VLS_PrettifyLocal<T> = (T extends any ? {
-    [K in keyof T]: T[K];
-} : {
-    [K in keyof T as K]: T[K];
-}) & {};

package/dist/runtime/components/form/save-model-template/WithApi.vue

@@ -1,37 +0,0 @@
-<script setup>
-import { toRef } from "vue";
-import { useFormSubmission, useFormValues } from "#v/composables/form/useForm";
-import FormSaveModalTemplate from "./index.vue";
-const props = defineProps({
-  apiGroup: { type: Function, required: true },
-  valuePruneFn: { type: Function, required: false },
-  defaultModelValue: { type: Object, required: false },
-  onSave: { type: Function, required: true },
-  title: { type: String, required: true },
-  description: { type: String, required: false },
-  fields: { type: Array, required: true },
-  onClose: { type: Function, required: true },
-  modelValue: { type: Object, required: true },
-  onUpdateModelValue: { type: Function, required: false }
-});
-const { oldValues, newValues } = useFormValues(toRef(props.modelValue), props.defaultModelValue);
-const { onSubmit } = useFormSubmission(
-  toRef(oldValues),
-  toRef(newValues),
-  props.onClose,
-  props.onSave,
-  props.apiGroup
-);
-</script>
-
-<template>
-  <FormSaveModalTemplate
-    v-model:model-value="newValues"
-    :old-model-value="oldValues"
-    :title="title"
-    :description="description"
-    :on-close="onClose"
-    :on-submit="onSubmit"
-    :fields="fields"
-  />
-</template>

package/dist/runtime/components/form/save-model-template/WithApi.vue.d.ts

@@ -1,19 +0,0 @@
-import type { BaseModel, SaveModalFormTemplatePropsWithApi } from '#v/types';
-declare const __VLS_export: <T extends BaseModel>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_exposed?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
-    props: import("vue").PublicProps & __VLS_PrettifyLocal<SaveModalFormTemplatePropsWithApi<T>> & (typeof globalThis extends {
-        __VLS_PROPS_FALLBACK: infer P;
-    } ? P : {});
-    expose: (exposed: {}) => void;
-    attrs: any;
-    slots: {};
-    emit: {};
-}>) => import("vue").VNode & {
-    __ctx?: Awaited<typeof __VLS_setup>;
-};
-declare const _default: typeof __VLS_export;
-export default _default;
-type __VLS_PrettifyLocal<T> = (T extends any ? {
-    [K in keyof T]: T[K];
-} : {
-    [K in keyof T as K]: T[K];
-}) & {};

package/dist/runtime/components/form/save-model-template/index.d.vue.ts

@@ -1,21 +0,0 @@
-import type { BaseModel, SaveModalFormTemplateProps } from '#v/types';
-declare const __VLS_export: <T extends BaseModel>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_exposed?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
-    props: import("vue").PublicProps & __VLS_PrettifyLocal<SaveModalFormTemplateProps<T>> & (typeof globalThis extends {
-        __VLS_PROPS_FALLBACK: infer P;
-    } ? P : {});
-    expose: (exposed: {}) => void;
-    attrs: any;
-    slots: {
-        'after-form'?: (props: {}) => any;
-    };
-    emit: {};
-}>) => import("vue").VNode & {
-    __ctx?: Awaited<typeof __VLS_setup>;
-};
-declare const _default: typeof __VLS_export;
-export default _default;
-type __VLS_PrettifyLocal<T> = (T extends any ? {
-    [K in keyof T]: T[K];
-} : {
-    [K in keyof T as K]: T[K];
-}) & {};

package/dist/runtime/components/form/save-model-template/index.vue

@@ -1,123 +0,0 @@
-<script setup>
-import { computed, ref, useTemplateRef } from "vue";
-import { useOverlay } from "@nuxt/ui/composables";
-import { useSubmitting } from "#v/composables";
-import Form from "../index.vue";
-import ConfirmUpdateModal from "./ConfirmUpdateModal.vue";
-const props = defineProps({
-  title: { type: String, required: true },
-  description: { type: String, required: false },
-  onClose: { type: Function, required: true },
-  onSubmit: { type: Function, required: true },
-  fields: { type: Array, required: true },
-  oldModelValue: { type: Object, required: true },
-  modelValue: { type: Object, required: true },
-  onUpdateModelValue: { type: Function, required: false },
-  rowKey: { type: null, required: false, default: "id" },
-  fullscreen: { type: Boolean, required: false }
-});
-const form = useTemplateRef("form");
-const action = computed(() => props.modelValue[props.rowKey] === 0 ? "\u521B\u5EFA" : "\u66F4\u65B0");
-const isUpdate = computed(() => props.modelValue[props.rowKey] !== 0);
-const titleWithAction = computed(() => `${action.value}${props.title}`);
-const descWithAction = computed(() => props.description ?? `\u8BF7${action.value}${props.title}`);
-const submitIcon = computed(() => props.modelValue[props.rowKey] === 0 ? "i-lucide-clipboard-plus" : "i-lucide-clipboard-pen-line");
-const initialModelValue = ref(JSON.parse(JSON.stringify(props.modelValue)));
-const overlay = useOverlay();
-const confirmModal = overlay.create(ConfirmUpdateModal);
-function computeDiff() {
-  const items = [];
-  for (const field of props.fields) {
-    if (!field.name || field.hidden) continue;
-    const name = field.name;
-    const oldVal = initialModelValue.value[name];
-    const newVal = props.modelValue[name];
-    if ((oldVal === null || oldVal === void 0) && (newVal === null || newVal === void 0)) continue;
-    if (oldVal === newVal) continue;
-    if (typeof oldVal === "object" && typeof newVal === "object" && oldVal !== null && newVal !== null) {
-      if (JSON.stringify(oldVal) === JSON.stringify(newVal)) continue;
-    }
-    items.push({
-      fieldName: name,
-      oldValue: oldVal,
-      newValue: newVal
-    });
-  }
-  return items;
-}
-const { submitting, startSubmitting, endSubmitting } = useSubmitting();
-async function doSubmit() {
-  try {
-    startSubmitting();
-    await props.onSubmit();
-  } finally {
-    endSubmitting();
-  }
-}
-async function onSubmitWithValidation(e) {
-  e.preventDefault();
-  e.stopPropagation();
-  try {
-    await form.value?.validate?.();
-  } catch {
-    return;
-  }
-  if (isUpdate.value) {
-    const items = computeDiff();
-    if (items.length === 0) {
-      await doSubmit();
-      return;
-    }
-    const confirmed = await confirmModal.open({
-      fields: props.fields,
-      diffItems: items,
-      oldModelValue: props.oldModelValue,
-      newModelValue: props.modelValue
-    }).result;
-    if (confirmed) {
-      await doSubmit();
-    }
-    return;
-  }
-  await doSubmit();
-}
-</script>
-
-<template>
-  <UModal
-    :title="titleWithAction"
-    :description="descWithAction"
-    :close="{ onClick: () => props.onClose(false) }"
-    :dismissible="false"
-    :fullscreen="fullscreen"
-  >
-    <template #body>
-      <Form
-        ref="form"
-        :fields="fields"
-        :loading="submitting"
-        :model-value="modelValue"
-        @trigger-submit="onSubmitWithValidation"
-        @update-model-value="onUpdateModelValue"
-      />
-      <slot name="after-form" />
-    </template>
-    <template #footer>
-      <UButton
-        label="取消"
-        color="neutral"
-        variant="subtle"
-        icon="i-lucide-x"
-        @click="props.onClose(false)"
-      />
-      <UButton
-        :label="action"
-        color="primary"
-        variant="solid"
-        :icon="submitIcon"
-        :loading="submitting"
-        @click="onSubmitWithValidation"
-      />
-    </template>
-  </UModal>
-</template>

package/dist/runtime/components/form/save-model-template/index.vue.d.ts

@@ -1,21 +0,0 @@
-import type { BaseModel, SaveModalFormTemplateProps } from '#v/types';
-declare const __VLS_export: <T extends BaseModel>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_exposed?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
-    props: import("vue").PublicProps & __VLS_PrettifyLocal<SaveModalFormTemplateProps<T>> & (typeof globalThis extends {
-        __VLS_PROPS_FALLBACK: infer P;
-    } ? P : {});
-    expose: (exposed: {}) => void;
-    attrs: any;
-    slots: {
-        'after-form'?: (props: {}) => any;
-    };
-    emit: {};
-}>) => import("vue").VNode & {
-    __ctx?: Awaited<typeof __VLS_setup>;
-};
-declare const _default: typeof __VLS_export;
-export default _default;
-type __VLS_PrettifyLocal<T> = (T extends any ? {
-    [K in keyof T]: T[K];
-} : {
-    [K in keyof T as K]: T[K];
-}) & {};