v-nuxt-ui 0.2.33 → 0.3.0

package/dist/module.json

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

package/dist/runtime/components/AsyncSelect.vue

@@ -147,6 +147,12 @@ function findLabel(tagItem) {
   const match = items.value.find((i) => i != null && String(i.value) === String(tagItem));
   return match?.label ?? String(tagItem ?? "");
 }
+const showPlaceholder = computed(() => {
+  if (props.multiple) {
+    return !modelValue.value.values || Array.isArray(modelValue.value.values) && modelValue.value.values.length === 0 ? props.placeholder : "";
+  }
+  return !modelValue.value.values ? props.placeholder : "";
+});
 </script>
 
 <template>
@@ -158,7 +164,7 @@ function findLabel(tagItem) {
     :items="items"
     :multiple="multiple"
     :size="size"
-    :placeholder="placeholder"
+    :placeholder="showPlaceholder && placeholder"
     :create-item="canCreate && createModalComponent && {
   position: 'top',
   when: 'always'
@@ -166,13 +172,18 @@ function findLabel(tagItem) {
     color="neutral"
     delete-icon="i-lucide-trash"
     value-key="value"
-    clear
+    :clear="{
+  ui: {
+    leadingIcon: 'size-3 text-dimmed'
+  }
+}"
     clear-icon="i-lucide-circle-x"
     :icon="icon"
     :loading="fetching"
     :disabled="disabled"
     open-on-focus
     trailing
+    trailing-icon=""
     ignore-filter
     :ui="ui"
     :content="{

package/dist/runtime/components/ScrollArea.vue

@@ -165,7 +165,7 @@ onActivated(() => {
     </ScrollAreaViewport>
 
     <ScrollAreaScrollbar
-      class="flex select-none touch-none p-0.5 z-99 data-[state=visible]:animate-[fade-in_300ms_ease-in] data-[state=hidden]:animate-[fade-out_300ms_ease-out] data-[orientation=vertical]:w-2 data-[orientation=horizontal]:flex-col data-[orientation=horizontal]:h-2"
+      class="flex select-none touch-none p-0.5 z-99 transition-[width,height] duration-150 ease-out data-[state=visible]:animate-[fade-in_300ms_ease-in] data-[state=hidden]:animate-[fade-out_300ms_ease-out] data-[orientation=vertical]:w-2 data-[orientation=vertical]:hover:w-3 data-[orientation=horizontal]:flex-col data-[orientation=horizontal]:h-2 data-[orientation=horizontal]:hover:h-3"
       orientation="vertical"
     >
       <ScrollAreaThumb
@@ -174,7 +174,7 @@ onActivated(() => {
     </ScrollAreaScrollbar>
 
     <ScrollAreaScrollbar
-      class="flex select-none touch-none p-0.5 z-99 data-[state=visible]:animate-[fade-in_300ms_ease-in] data-[state=hidden]:animate-[fade-out_300ms_ease-out] data-[orientation=vertical]:w-2 data-[orientation=horizontal]:flex-col data-[orientation=horizontal]:h-2"
+      class="flex select-none touch-none p-0.5 z-99 transition-[width,height] duration-150 ease-out data-[state=visible]:animate-[fade-in_300ms_ease-in] data-[state=hidden]:animate-[fade-out_300ms_ease-out] data-[orientation=vertical]:w-2 data-[orientation=vertical]:hover:w-3 data-[orientation=horizontal]:flex-col data-[orientation=horizontal]:h-2 data-[orientation=horizontal]:hover:h-3"
       orientation="horizontal"
     >
       <UTooltip

package/dist/runtime/components/Select.vue

@@ -41,6 +41,12 @@ defineExpose({
     inputMenuRef.value?.inputRef.focus();
   }
 });
+const showPlaceholder = computed(() => {
+  if (props.multiple) {
+    return !modelValue.value || Array.isArray(modelValue.value) && modelValue.value.length === 0 ? props.placeholder : "";
+  }
+  return !modelValue.value ? props.placeholder : "";
+});
 </script>
 
 <template>
@@ -50,18 +56,23 @@ defineExpose({
     v-model:search-term="searchTerm"
     v-model="modelValue"
     :items="filteredItems"
-    :placeholder="placeholder"
+    :placeholder="showPlaceholder && placeholder"
     :multiple="multiple"
     :size="size"
     color="neutral"
     delete-icon="i-lucide-trash"
     value-key="value"
-    clear
+    :clear="{
+  ui: {
+    leadingIcon: 'size-3 text-dimmed'
+  }
+}"
     clear-icon="i-lucide-circle-x"
     :icon="icon"
     :disabled="disabled"
     open-on-focus
     trailing
+    trailing-icon=""
     ignore-filter
     :ui="ui"
     :content="{

package/dist/runtime/components/Watermark.d.vue.ts

@@ -26,10 +26,10 @@ declare const __VLS_base: import("vue").DefineComponent<Props, {}, {}, {}, {}, i
     rotate: number;
     fontColor: string;
     fontSize: number;
+    debug: boolean;
+    gap: number;
     fontWeight: string | number;
     lineHeight: number;
-    gap: number;
-    debug: boolean;
     textAlign: "left" | "center" | "right";
     xOffset: number;
     yOffset: number;

package/dist/runtime/components/Watermark.vue.d.ts

@@ -26,10 +26,10 @@ declare const __VLS_base: import("vue").DefineComponent<Props, {}, {}, {}, {}, i
     rotate: number;
     fontColor: string;
     fontSize: number;
+    debug: boolean;
+    gap: number;
     fontWeight: string | number;
     lineHeight: number;
-    gap: number;
-    debug: boolean;
     textAlign: "left" | "center" | "right";
     xOffset: number;
     yOffset: number;

package/dist/runtime/components/button/Confirm.d.vue.ts

@@ -0,0 +1,22 @@
+import type { ButtonProps } from '@nuxt/ui';
+type __VLS_Props = {
+    button?: ButtonProps;
+    confirmButton?: ButtonProps;
+    resetOnMouseleave?: boolean;
+    ui?: Record<string, any>;
+};
+type __VLS_ModelProps = {
+    'confirming'?: boolean;
+};
+type __VLS_PublicProps = __VLS_Props & __VLS_ModelProps;
+declare const __VLS_export: import("vue").DefineComponent<__VLS_PublicProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+    confirm: () => any;
+    "update:confirming": (value: boolean) => any;
+}, string, import("vue").PublicProps, Readonly<__VLS_PublicProps> & Readonly<{
+    onConfirm?: (() => any) | undefined;
+    "onUpdate:confirming"?: ((value: boolean) => any) | undefined;
+}>, {
+    resetOnMouseleave: boolean;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+declare const _default: typeof __VLS_export;
+export default _default;

package/dist/runtime/components/button/Confirm.vue

@@ -0,0 +1,47 @@
+<script setup>
+import defu from "defu";
+import { computed } from "vue";
+const props = defineProps({
+  button: { type: Object, required: false },
+  confirmButton: { type: Object, required: false },
+  resetOnMouseleave: { type: Boolean, required: false, default: true },
+  ui: { type: Object, required: false }
+});
+const emit = defineEmits(["confirm"]);
+const buttonProps = computed(() => defu(props.button, {
+  icon: "i-lucide-x",
+  color: "neutral",
+  variant: "link",
+  size: "sm"
+}));
+const confirmButtonProps = computed(() => defu(props.confirmButton, {
+  icon: "i-lucide-x",
+  color: "error",
+  variant: "ghost",
+  size: "sm",
+  label: "\u786E\u8BA4"
+}));
+const confirming = defineModel("confirming", { type: Boolean, ...{ default: false } });
+const activeButton = computed(() => confirming.value ? confirmButtonProps.value : buttonProps.value);
+const onClick = () => {
+  if (activeButton.value?.disabled) return;
+  if (!confirming.value) {
+    confirming.value = true;
+    return;
+  }
+  confirming.value = false;
+  emit("confirm");
+};
+</script>
+
+<template>
+  <UButton
+    v-bind="activeButton"
+    :ui="ui"
+    class="transition-all duration-200 ease-out"
+    @click="onClick"
+    @mouseleave="() => {
+  if (resetOnMouseleave) confirming = false;
+}"
+  />
+</template>

package/dist/runtime/components/button/Confirm.vue.d.ts

@@ -0,0 +1,22 @@
+import type { ButtonProps } from '@nuxt/ui';
+type __VLS_Props = {
+    button?: ButtonProps;
+    confirmButton?: ButtonProps;
+    resetOnMouseleave?: boolean;
+    ui?: Record<string, any>;
+};
+type __VLS_ModelProps = {
+    'confirming'?: boolean;
+};
+type __VLS_PublicProps = __VLS_Props & __VLS_ModelProps;
+declare const __VLS_export: import("vue").DefineComponent<__VLS_PublicProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+    confirm: () => any;
+    "update:confirming": (value: boolean) => any;
+}, string, import("vue").PublicProps, Readonly<__VLS_PublicProps> & Readonly<{
+    onConfirm?: (() => any) | undefined;
+    "onUpdate:confirming"?: ((value: boolean) => any) | undefined;
+}>, {
+    resetOnMouseleave: boolean;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+declare const _default: typeof __VLS_export;
+export default _default;

package/dist/runtime/components/button/Theme.vue

@@ -1,8 +1,6 @@
 <script setup>
-import { computed } from "vue";
 import { getEmojiFlag } from "#v/utils";
-import { useColorMode } from "@vueuse/core";
-const props = defineProps({
+defineProps({
   label: { type: String, required: true },
   icon: { type: String, required: false },
   chip: { type: String, required: false },
@@ -10,14 +8,6 @@ const props = defineProps({
   selected: { type: Boolean, required: false }
 });
 const slots = defineSlots();
-const colorMode = useColorMode();
-const emojiFlag = computed(() => props.locale ? getEmojiFlag(props.locale) : "");
-const chipColor = computed(() => {
-  if (!props.chip) return void 0;
-  if (props.chip === "black") return "black";
-  const shade = colorMode.value === "dark" ? "400" : "500";
-  return `var(--color-${props.chip}-${shade})`;
-});
 </script>
 
 <template>
@@ -34,11 +24,15 @@ const chipColor = computed(() => {
       <slot v-if="chip" name="leading">
         <span
           class="inline-block size-2 rounded-full"
-          :style="{ backgroundColor: chipColor }"
+          :class="chip === 'black' ? 'bg-black dark:bg-white' : 'bg-(--chip-color-light) dark:bg-(--chip-color-dark)'"
+          :style="chip && chip !== 'black' ? {
+  '--chip-color-light': `var(--color-${chip}-500)`,
+  '--chip-color-dark': `var(--color-${chip}-400)`
+} : void 0"
         />
       </slot>
       <slot v-else-if="locale" name="leading">
-        {{ emojiFlag }}
+        {{ getEmojiFlag(locale) }}
       </slot>
       <slot v-else name="leading" />
     </template>

package/dist/runtime/components/date-picker/Input.d.vue.ts

@@ -4,6 +4,7 @@ type __VLS_Props = {
     size?: InputProps['size'];
     icon?: InputProps['icon'];
     inputClass?: string;
+    roundedNone?: boolean;
 };
 type __VLS_ModelProps = {
     'value': undefined | string;

package/dist/runtime/components/date-picker/Input.vue

@@ -6,7 +6,8 @@ defineProps({
   placeholder: { type: String, required: false },
   size: { type: null, required: false },
   icon: { type: null, required: false, default: "i-lucide-calendar" },
-  inputClass: { type: String, required: false }
+  inputClass: { type: String, required: false },
+  roundedNone: { type: Boolean, required: false }
 });
 const value = defineModel("value", { type: null, ...{ required: true } });
 const emit = defineEmits(["focus", "blur"]);
@@ -40,7 +41,9 @@ const onInput = () => {
     isInternalUpdate = false;
   }
 };
-const handleClear = () => {
+const handleClear = (e) => {
+  e.preventDefault();
+  e.stopPropagation();
   inputBuffer.value = "";
   isInternalUpdate = true;
   value.value = void 0;
@@ -63,6 +66,9 @@ defineExpose({
     :placeholder="placeholder"
     :color="isInvalid ? 'error' : 'neutral'"
     :highlight="isInvalid"
+    :ui="{
+  base: roundedNone && 'rounded-none'
+}"
     @input="onInput"
     @focus="(e) => emit('focus', e)"
     @blur="(e) => emit('blur', e)"
@@ -71,8 +77,11 @@ defineExpose({
       <UButton
         color="neutral"
         variant="link"
-        size="sm"
+        size="xs"
         icon="i-lucide-circle-x"
+        :ui="{
+  leadingIcon: 'size-3 text-dimmed'
+}"
         aria-label="Clear input"
         @mousedown.prevent
         @click="handleClear"

package/dist/runtime/components/date-picker/Input.vue.d.ts

@@ -4,6 +4,7 @@ type __VLS_Props = {
     size?: InputProps['size'];
     icon?: InputProps['icon'];
     inputClass?: string;
+    roundedNone?: boolean;
 };
 type __VLS_ModelProps = {
     'value': undefined | string;

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

@@ -18,7 +18,6 @@ const { oldValues, newValues } = useFormValues(toRef(props.modelValue), props.de
 const { onSubmit } = useFormSubmission(
   toRef(oldValues),
   toRef(newValues),
-  props.onClose,
   props.onSave,
   props.apiGroup
 );
@@ -31,7 +30,7 @@ const { onSubmit } = useFormSubmission(
     :title="title"
     :description="description"
     :on-close="onClose"
-    :on-submit="onSubmit"
     :fields="fields"
+    @submit="onSubmit"
   />
 </template>

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

@@ -46,14 +46,6 @@ function computeDiff() {
   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();
@@ -62,24 +54,32 @@ async function onSubmitWithValidation(e) {
   } catch {
     return;
   }
-  if (isUpdate.value) {
-    const items = computeDiff();
-    if (items.length === 0) {
-      await doSubmit();
-      return;
+  startSubmitting();
+  let keepSubmitting = false;
+  try {
+    if (isUpdate.value) {
+      const items = computeDiff();
+      if (items.length > 0) {
+        const confirmed = await confirmModal.open({
+          fields: props.fields,
+          diffItems: items,
+          oldModelValue: props.oldModelValue,
+          newModelValue: props.modelValue
+        }).result;
+        if (!confirmed) {
+          return;
+        }
+      }
     }
-    const confirmed = await confirmModal.open({
-      fields: props.fields,
-      diffItems: items,
-      oldModelValue: props.oldModelValue,
-      newModelValue: props.modelValue
-    }).result;
-    if (confirmed) {
-      await doSubmit();
+    keepSubmitting = await props.onSubmit() === true;
+    if (keepSubmitting) {
+      props.onClose(true);
+    }
+  } finally {
+    if (!keepSubmitting) {
+      endSubmitting();
     }
-    return;
   }
-  await doSubmit();
 }
 </script>
 

package/dist/runtime/components/layout/button/ThemePicker.vue

@@ -6,7 +6,7 @@ const neutralColorOptions = theme.neutralColors.map((c) => ({ color: c, chip: c
 </script>
 
 <template>
-  <UPopover :ui="{ content: 'px-6 py-4 flex flex-col gap-4' }">
+  <UPopover :open-delay="0" :ui="{ content: 'px-6 py-4 flex flex-col gap-4' }">
     <template #default="{ open }">
       <UButton
         icon="i-lucide-swatch-book"
@@ -91,7 +91,7 @@ const neutralColorOptions = theme.neutralColors.map((c) => ({ color: c, chip: c
             v-for="m in theme.modes.value"
             :key="m.label"
             v-bind="m"
-            :selected="theme.mode.value === m.label"
+            :selected="theme.mode.value === m.value"
             @click="theme.mode.value = m.value"
           />
         </div>

package/dist/runtime/components/layout/default.vue

@@ -8,12 +8,18 @@ import LayoutModuleMenu from "#v/components/layout/button/ModuleMenu.vue";
 import LayoutThemePicker from "#v/components/layout/button/ThemePicker.vue";
 import LayoutUserMenu from "#v/components/layout/button/UserMenu.vue";
 import Watermark from "#v/components/Watermark.vue";
-import { watch } from "vue";
+import { watch, computed } from "vue";
 const app = useApp();
 const theme = useTheme();
 const loginUser = useAuth().loginUser;
 const route = useRoute();
 const { sidebarMenus, expandSidebarMenu, breadcrumbs, getBreadcrumbs } = useSidebarMenus();
+const sidebarOpen = computed({
+  get: () => !app.sidebarCollapsed.value,
+  set: (val) => {
+    app.sidebarCollapsed.value = !val;
+  }
+});
 watch(() => route.path, (newPath) => {
   expandSidebarMenu(newPath);
 }, { immediate: true });
@@ -38,7 +44,7 @@ watch(
   >
     <!-- sidebar -->
     <USidebar
-      v-model:open="app.sidebarCollapsed.value"
+      v-model:open="sidebarOpen"
       :variant="theme.sidebarVariant.value"
       :collapsible="theme.sidebarCollapsible.value"
       :side="theme.sidebarSide.value"
@@ -47,7 +53,7 @@ watch(
   footer: 'h-(--ui-footer-height)',
   container: 'ease-in-out duration-360',
   gap: 'ease-in-out duration-360',
-  inner: 'bg-default'
+  inner: ['sidebar', 'floating'].includes(theme.sidebarVariant.value) && 'bg-default'
 }"
     >
       <template #header="{ state }">
@@ -78,7 +84,7 @@ watch(
 
     <!-- main content -->
     <div
-      class="flex-1 flex flex-col w-full overflow-hidden lg:peer-data-[variant=floating]:my-4 peer-data-[variant=inset]:m-4 lg:peer-data-[variant=inset]:not-peer-data-[collapsible=offcanvas]:ms-0 peer-data-[variant=inset]:rounded-xl peer-data-[variant=inset]:shadow-sm peer-data-[variant=inset]:ring peer-data-[variant=inset]:ring-default bg-default"
+      class="flex-1 flex flex-col w-full overflow-hidden lg:peer-data-[variant=floating]:my-4 lg:peer-data-[variant=floating]:rounded-l-lg lg:peer-data-[variant=floating]:border lg:peer-data-[variant=floating]:border-r-0 lg:peer-data-[variant=floating]:border-default peer-data-[variant=inset]:m-4 lg:peer-data-[variant=inset]:not-peer-data-[collapsible=offcanvas]:ms-0 peer-data-[variant=inset]:rounded-xl peer-data-[variant=inset]:shadow-sm peer-data-[variant=inset]:ring peer-data-[variant=inset]:ring-default bg-default"
     >
       <Watermark
         :text="stringsJoin([

package/dist/runtime/components/simple-table/index.d.vue.ts

@@ -1,6 +1,6 @@
 import type { VTableProps } from '#v/types';
 declare const __VLS_export: <T>(__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<Pick<VTableProps<T>, "bizColumns" | "singleRow" | "singleColumn" | "hideLastRowBorder"> & {
+    props: import("vue").PublicProps & __VLS_PrettifyLocal<Pick<VTableProps<T>, "bizColumns" | "disableRowActions" | "extraRowActions" | "singleRow" | "singleColumn" | "hideLastRowBorder"> & {
         data: T[];
     }> & (typeof globalThis extends {
         __VLS_PROPS_FALLBACK: infer P;

package/dist/runtime/components/simple-table/index.vue

@@ -2,11 +2,14 @@
 import { computed, ref, useTemplateRef, h, onMounted, onUnmounted, watch, nextTick } from "vue";
 import UButton from "@nuxt/ui/components/Button.vue";
 import UBadge from "@nuxt/ui/components/Badge.vue";
+import UDropdownMenu from "@nuxt/ui/components/DropdownMenu.vue";
 const props = defineProps({
   singleRow: { type: Boolean, required: false, default: true },
   singleColumn: { type: Boolean, required: false, default: false },
   hideLastRowBorder: { type: Boolean, required: false },
   bizColumns: { type: Array, required: true },
+  extraRowActions: { type: Array, required: false },
+  disableRowActions: { type: Boolean, required: false },
   data: { type: Array, required: true }
 });
 const thClass = computed(() => {
@@ -120,8 +123,72 @@ const columnsWithHeader = computed(() => props.bizColumns.map((col) => ({
     });
   }
 })) || []);
+function buildActionItem(action) {
+  const item = {
+    label: action.label,
+    icon: action.icon,
+    type: action.type,
+    color: action.color
+  };
+  if (action.children && action.children.length > 0) {
+    item.children = action.children.map(buildActionItem);
+    return item;
+  }
+  item.onClick = () => {
+  };
+  return item;
+}
+function getActionColumn() {
+  return {
+    id: "actions",
+    accessorKey: "actions",
+    header: "\u64CD\u4F5C",
+    meta: {
+      class: {
+        th: "w-15 min-w-15 px-4"
+      }
+    },
+    cell: ({ row }) => {
+      const items = (props.extraRowActions || []).map((action) => {
+        const item = buildActionItem(action);
+        if (!action.children?.length) {
+          item.onClick = async () => {
+            if (action.fn) {
+              action.fn(row.original);
+            }
+            if (action.asyncFn) {
+              await action.asyncFn(row.original);
+            }
+            if (action.fnWithModal) {
+              await action.fnWithModal(row.original);
+            }
+          };
+        }
+        return item;
+      });
+      return h(
+        "div",
+        { class: "text-center" },
+        h(
+          UDropdownMenu,
+          { content: { align: "end" }, items },
+          {
+            "default": () => h(UButton, { icon: "i-lucide-ellipsis", color: "neutral", variant: "ghost", size: "sm", class: "ml-auto" }),
+            "item": () => null,
+            "item-leading": () => null,
+            "item-label": () => null,
+            "item-description": () => null,
+            "item-trailing": () => null,
+            "content-top": () => null,
+            "content-bottom": () => null
+          }
+        )
+      );
+    }
+  };
+}
 const columnsWithFilterOptions = computed(() => {
-  return columnsWithHeader.value.map((col) => {
+  const cols = columnsWithHeader.value.map((col) => {
     if (!col.filterOption) {
       return col;
     }
@@ -139,6 +206,10 @@ const columnsWithFilterOptions = computed(() => {
         return col;
     }
   });
+  if (!props.disableRowActions && props.extraRowActions?.length) {
+    cols.push(getActionColumn());
+  }
+  return cols;
 });
 </script>
 

package/dist/runtime/components/simple-table/index.vue.d.ts

@@ -1,6 +1,6 @@
 import type { VTableProps } from '#v/types';
 declare const __VLS_export: <T>(__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<Pick<VTableProps<T>, "bizColumns" | "singleRow" | "singleColumn" | "hideLastRowBorder"> & {
+    props: import("vue").PublicProps & __VLS_PrettifyLocal<Pick<VTableProps<T>, "bizColumns" | "disableRowActions" | "extraRowActions" | "singleRow" | "singleColumn" | "hideLastRowBorder"> & {
         data: T[];
     }> & (typeof globalThis extends {
         __VLS_PROPS_FALLBACK: infer P;

package/dist/runtime/components/sys/department/SaveModal.vue

@@ -20,7 +20,6 @@ watch(
 const { onSubmit } = useFormSubmission(
   toRef(oldValues),
   toRef(newValues),
-  (close) => emit("close", close),
   (model) => emit("save", model),
   useDepartmentApi
 );

package/dist/runtime/components/sys/flow/EditNodeModal.vue

@@ -11,6 +11,10 @@ const { oldValues, newValues } = useFormValues(toRef(props.model), {
   id: 0,
   name: ""
 });
+async function onSubmit() {
+  emit("save", newValues.value);
+  return true;
+}
 </script>
 
 <template>
@@ -23,9 +27,6 @@ const { oldValues, newValues } = useFormValues(toRef(props.model), {
     :model-value="newValues"
     :old-model-value="oldValues"
     @update-model-value="(newVal) => newValues = { ...props.model, ...newVal }"
-    @submit="async () => {
-  emit('save', newValues);
-  emit('close', true);
-}"
+    @submit="onSubmit"
   />
 </template>

package/dist/runtime/components/sys/flow/SaveModal.vue

@@ -11,7 +11,6 @@ const { oldValues, newValues } = useFormValues(toRef(props.model), { id: 0 });
 const { onSubmit } = useFormSubmission(
   toRef(oldValues),
   toRef(newValues),
-  (close) => emit("close", close),
   (model) => emit("save", model),
   useFlowApi
 );

package/dist/runtime/components/sys/menu/SaveModal.vue

@@ -12,7 +12,6 @@ const { oldValues, newValues } = useFormValues(toRef(props.model), { id: 0, disa
 const { onSubmit } = useFormSubmission(
   toRef(oldValues),
   toRef(newValues),
-  (close) => emit("close", close),
   (model) => emit("save", model),
   useMenuApi,
   ["staticRouteKeys"]

package/dist/runtime/components/sys/role/SaveModal.vue

@@ -13,7 +13,6 @@ const { oldValues, newValues } = useFormValues(toRef(props.model), { id: 0, disa
 const { onSubmit } = useFormSubmission(
   toRef(oldValues),
   toRef(newValues),
-  (close) => emit("close", close),
   (model) => emit("save", model),
   useRoleApi,
   ["menus"],