v-nuxt-ui 0.2.24 → 0.2.26

package/dist/runtime/components/form/{create-modal-template → save-model-template}/index.vue

@@ -1,13 +1,16 @@
 <script setup>
-import { computed, useTemplateRef } from "vue";
-import { useSubmitting } from "#v/composables/useBoolean";
+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" },
@@ -15,10 +18,42 @@ const props = defineProps({
 });
 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();
@@ -27,12 +62,24 @@ async function onSubmitWithValidation(e) {
   } catch {
     return;
   }
-  try {
-    startSubmitting();
-    await props.onSubmit();
-  } finally {
-    endSubmitting();
+  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>
 

package/dist/runtime/components/form/{create-modal-template → save-model-template}/index.vue.d.ts

@@ -1,6 +1,6 @@
-import type { BaseModel, CreateModalFormTemplateProps } from '#v/types';
+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<CreateModalFormTemplateProps<T>> & (typeof globalThis extends {
+    props: import("vue").PublicProps & __VLS_PrettifyLocal<SaveModalFormTemplateProps<T>> & (typeof globalThis extends {
         __VLS_PROPS_FALLBACK: infer P;
     } ? P : {});
     expose: (exposed: {}) => void;

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

@@ -1,5 +1,5 @@
 <script setup>
-import { useAuth, useApp } from "#v/composables";
+import { useAuth } from "#v/composables";
 import { useRoute } from "nuxt/app";
 import { getEmojiFlag } from "#v/utils";
 import { computed } from "vue";
@@ -8,7 +8,6 @@ defineProps({
   headerMode: { type: Boolean, required: false }
 });
 const auth = useAuth();
-const app = useApp();
 const route = useRoute();
 const items = computed(() => [
   [

package/dist/runtime/components/sys/company/{CreateModal.vue → SaveModal.vue}

@@ -1,6 +1,6 @@
 <script setup>
 import * as z from "zod";
-import FormCreateModalTemplateWithApi from "#v/components/form/create-modal-template/WithApi.vue";
+import FormSaveModelTemplateWithApi from "#v/components/form/save-model-template/WithApi.vue";
 import { useCompanyApi } from "#v/composables";
 defineProps({
   model: { type: Object, required: true }
@@ -9,7 +9,7 @@ const emit = defineEmits(["close", "save"]);
 </script>
 
 <template>
-  <FormCreateModalTemplateWithApi
+  <FormSaveModelTemplateWithApi
     title="公司信息"
     :on-close="(ok) => emit('close', ok)"
     :on-save="(model) => emit('save', model)"

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

@@ -1,11 +1,11 @@
 <script setup>
 import { useOverlay } from "@nuxt/ui/composables";
 import { useCompanyApi } from "#v/composables";
-import SysCompaniesCreateModal from "./CreateModal.vue";
+import SysCompaniesSaveModal from "./SaveModal.vue";
 import { getOprColumns } from "#v/constants";
 import TablePage from "#v/components/table/Page.vue";
 const overlay = useOverlay();
-const createModal = overlay.create(SysCompaniesCreateModal);
+const saveModal = overlay.create(SysCompaniesSaveModal);
 const columns = [
   {
     accessorKey: "fullname",
@@ -41,13 +41,14 @@ const columns = [
 
 <template>
   <TablePage
-    name="sys-company"
+    name="companies"
     cn-name="公司信息"
     :use-api-group="useCompanyApi"
     :biz-columns="columns"
     :extra-order-query-options="[
   { field: 'createdAt', label: '\u521B\u5EFA\u65F6\u95F4', defaultOpr: 'desc' }
 ]"
-    @edit-row-from-modal="async (row) => await createModal.open({ model: row }).result"
+    :display-fn-in-delete-modal="(model) => model.fullname"
+    @edit-row-from-modal="async (row) => await saveModal.open({ model: row }).result"
   />
 </template>

package/dist/runtime/components/sys/department/{CreateModal.vue → SaveModal.vue}

@@ -1,6 +1,6 @@
 <script setup>
 import * as z from "zod";
-import FormCreateModalTemplate from "#v/components/form/create-modal-template/index.vue";
+import FormSaveModelTemplate from "#v/components/form/save-model-template/index.vue";
 import { useCompanyApi, useDepartmentApi, useFormSubmission, useFormValues, useUserApi } from "#v/composables";
 import { toRef, watch } from "vue";
 const props = defineProps({
@@ -27,7 +27,7 @@ const { onSubmit } = useFormSubmission(
 </script>
 
 <template>
-  <FormCreateModalTemplate
+  <FormSaveModelTemplate
     title="部门信息"
     :on-close="(ok) => emit('close', ok)"
     :fields="[
@@ -74,6 +74,7 @@ const { onSubmit } = useFormSubmission(
   }
 ]"
     :model-value="newValues"
+    :old-model-value="oldValues"
     @update-model-value="(newVal) => newValues = { id: 0, ...newVal }"
     @submit="onSubmit"
   />

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

@@ -1,11 +1,11 @@
 <script setup>
 import { useOverlay } from "@nuxt/ui/composables";
 import { useDepartmentApi } from "#v/composables";
-import SysDepartmentsCreateModal from "./CreateModal.vue";
+import SysDepartmentsSaveModal from "./SaveModal.vue";
 import { getOprColumns } from "#v/constants";
 import TablePage from "#v/components/table/Page.vue";
 const overlay = useOverlay();
-const createModal = overlay.create(SysDepartmentsCreateModal);
+const saveModal = overlay.create(SysDepartmentsSaveModal);
 const columns = [
   {
     accessorKey: "name",
@@ -40,7 +40,7 @@ const columns = [
 
 <template>
   <TablePage
-    name="sys-department"
+    name="departments"
     cn-name="部门信息"
     :use-api-group="useDepartmentApi"
     :biz-columns="columns"
@@ -53,9 +53,10 @@ const columns = [
   icon: 'i-lucide-clipboard-plus',
   label: '\u4EE5\u6B64\u4F5C\u4E3A\u7236\u90E8\u95E8\u590D\u5236',
   asyncFn: async (raw) => {
-    await createModal.open({ model: useDepartmentApi().copyAsParent?.(raw) ?? { id: 0 } });
+    await saveModal.open({ model: useDepartmentApi().copyAsParent?.(raw) ?? { id: 0 } });
   }
 }]"
-    @edit-row-from-modal="async (row) => await createModal.open({ model: row }).result"
+    :display-fn-in-delete-modal="(model) => model.name"
+    @edit-row-from-modal="async (row) => await saveModal.open({ model: row }).result"
   />
 </template>

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

@@ -1,26 +1,27 @@
 <script setup>
 import * as z from "zod";
-import FormCreateModalTemplate from "#v/components/form/create-modal-template/index.vue";
+import FormSaveModelTemplate from "#v/components/form/save-model-template/index.vue";
 import { useFormValues } from "#v/composables";
 import { toRef } from "vue";
 const props = defineProps({
   model: { type: Object, required: true }
 });
 const emit = defineEmits(["close", "save"]);
-const { newValues } = useFormValues(toRef(props.model), {
+const { oldValues, newValues } = useFormValues(toRef(props.model), {
   id: 0,
   name: ""
 });
 </script>
 
 <template>
-  <FormCreateModalTemplate
+  <FormSaveModelTemplate
     title="编辑节点"
     :on-close="(ok) => emit('close', ok)"
     :fields="[
   { name: 'name', type: 'input', label: '\u8282\u70B9\u540D\u79F0', colSpan: '24', zodType: z.string().min(1, '\u8BF7\u8F93\u5165\u8282\u70B9\u540D\u79F0') }
 ]"
     :model-value="newValues"
+    :old-model-value="oldValues"
     @update-model-value="(newVal) => newValues = { ...props.model, ...newVal }"
     @submit="async () => {
   emit('save', newValues);

package/dist/runtime/components/sys/flow/{CreateModal.vue → SaveModal.vue}

@@ -1,6 +1,6 @@
 <script setup>
 import * as z from "zod";
-import FormCreateModalTemplate from "#v/components/form/create-modal-template/index.vue";
+import FormSaveModelTemplate from "#v/components/form/save-model-template/index.vue";
 import { useFlowApi, useFormSubmission, useFormValues } from "#v/composables";
 import { toRef } from "vue";
 const props = defineProps({
@@ -18,7 +18,7 @@ const { onSubmit } = useFormSubmission(
 </script>
 
 <template>
-  <FormCreateModalTemplate
+  <FormSaveModelTemplate
     title="流程信息"
     :on-close="(ok) => emit('close', ok)"
     :fields="[
@@ -26,6 +26,7 @@ const { onSubmit } = useFormSubmission(
   { name: 'description', type: 'textarea', label: '\u6D41\u7A0B\u63CF\u8FF0', colSpan: '24' }
 ]"
     :model-value="newValues"
+    :old-model-value="oldValues"
     @update-model-value="(newVal) => newValues = { ...newValues, ...newVal }"
     @submit="onSubmit"
   />

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

@@ -5,10 +5,10 @@ import { getCreateAtColumn } from "#v/constants";
 import { useFlowApi, useFlowNodeApi, useFlowEdgeApi } from "#v/composables";
 import TablePage from "#v/components/table/Page.vue";
 import FlowEditor from "#v/components/flow/FlowEditor.client.vue";
-import CreateModal from "./CreateModal.vue";
+import SaveModal from "./SaveModal.vue";
 import EditNodeModal from "./EditNodeModal.vue";
 const overlay = useOverlay();
-const createModal = overlay.create(CreateModal);
+const saveModal = overlay.create(SaveModal);
 const editNodeModal = overlay.create(EditNodeModal);
 const tablePageRef = ref(null);
 const columns = [
@@ -87,12 +87,13 @@ function getExpandVNode(row) {
 <template>
   <TablePage
     ref="tablePageRef"
-    name="sys-flow"
+    name="flows"
     cn-name="流程列表"
     :use-api-group="useFlowApi"
     :biz-columns="columns"
     expandable
     :expand-v-node="getExpandVNode"
-    @edit-row-from-modal="async (row) => Boolean(await createModal.open({ model: { ...row } }).result)"
+    :display-fn-in-delete-modal="(model) => model.name"
+    @edit-row-from-modal="async (row) => Boolean(await saveModal.open({ model: { ...row } }).result)"
   />
 </template>

package/dist/runtime/components/sys/issue-record/{CreateModal.vue → SaveModal.vue}

@@ -1,6 +1,6 @@
 <script setup>
 import * as z from "zod";
-import FormCreateModalTemplateWithApi from "#v/components/form/create-modal-template/WithApi.vue";
+import FormSaveModelTemplateWithApi from "#v/components/form/save-model-template/WithApi.vue";
 import { useIssueRecordApi } from "#v/composables";
 defineProps({
   model: { type: Object, required: true }
@@ -9,7 +9,7 @@ const emit = defineEmits(["close", "save"]);
 </script>
 
 <template>
-  <FormCreateModalTemplateWithApi
+  <FormSaveModelTemplateWithApi
     title="改进建议"
     description="您可以针对该网页提出任何改进建议或直接联系chenrn@mail.veken.com"
     :on-close="(ok) => emit('close', ok)"

package/dist/runtime/components/sys/issue-record/Table.vue

@@ -2,10 +2,10 @@
 import { getOprColumns } from "#v/constants";
 import { useOverlay } from "@nuxt/ui/composables";
 import { useIssueRecordApi } from "#v/composables";
-import SysIssueRecordsCreateModal from "./CreateModal.vue";
+import SysIssueRecordsSaveModal from "./SaveModal.vue";
 import TablePage from "#v/components/table/Page.vue";
 const overlay = useOverlay();
-const createModal = overlay.create(SysIssueRecordsCreateModal);
+const saveModal = overlay.create(SysIssueRecordsSaveModal);
 const columns = [
   {
     accessorKey: "description",
@@ -20,13 +20,14 @@ const columns = [
 
 <template>
   <TablePage
-    name="sys-issue-record"
+    name="issue_records"
     cn-name="改进建议"
     :use-api-group="useIssueRecordApi"
     :biz-columns="columns"
     :extra-order-query-options="[
   { field: 'createdAt', label: '\u521B\u5EFA\u65F6\u95F4', defaultOpr: 'desc' }
 ]"
-    @edit-row-from-modal="async (row) => await createModal.open({ model: row }).result"
+    :display-fn-in-delete-modal="(model) => model.description"
+    @edit-row-from-modal="async (row) => await saveModal.open({ model: row }).result"
   />
 </template>

package/dist/runtime/components/sys/job-title/{CreateModal.vue → SaveModal.vue}

@@ -1,6 +1,6 @@
 <script setup>
 import * as z from "zod";
-import FormCreateModalTemplateWithApi from "#v/components/form/create-modal-template/WithApi.vue";
+import FormSaveModelTemplateWithApi from "#v/components/form/save-model-template/WithApi.vue";
 import { useJobTitleApi } from "#v/composables";
 defineProps({
   model: { type: Object, required: true }
@@ -9,7 +9,7 @@ const emit = defineEmits(["close", "save"]);
 </script>
 
 <template>
-  <FormCreateModalTemplateWithApi
+  <FormSaveModelTemplateWithApi
     title="职位信息"
     :on-close="(ok) => emit('close', ok)"
     :on-save="(model) => emit('save', model)"

package/dist/runtime/components/sys/job-title/Table.vue

@@ -1,13 +1,13 @@
 <script setup>
 import { useOverlay } from "@nuxt/ui/composables";
 import { useJobTitleApi } from "#v/composables";
-import SysJobTitlesCreateModal from "./CreateModal.vue";
+import SysJobTitlesSaveModal from "./SaveModal.vue";
 import { getOprColumns, booleanOptions } from "#v/constants";
 import UBadge from "@nuxt/ui/components/Badge.vue";
 import { h } from "vue";
 import TablePage from "#v/components/table/Page.vue";
 const overlay = useOverlay();
-const createModal = overlay.create(SysJobTitlesCreateModal);
+const saveModal = overlay.create(SysJobTitlesSaveModal);
 const columns = [
   {
     accessorKey: "name",
@@ -55,13 +55,14 @@ const columns = [
 
 <template>
   <TablePage
-    name="sys-job-title"
+    name="job_titles"
     cn-name="职位信息"
     :use-api-group="useJobTitleApi"
     :biz-columns="columns"
     :extra-order-query-options="[
   { field: 'createdAt', label: '\u521B\u5EFA\u65F6\u95F4', defaultOpr: 'desc' }
 ]"
-    @edit-row-from-modal="async (row) => await createModal.open({ model: row }).result"
+    :display-fn-in-delete-modal="(model) => model.name"
+    @edit-row-from-modal="async (row) => await saveModal.open({ model: row }).result"
   />
 </template>

package/dist/runtime/components/sys/menu/{CreateModal.vue → SaveModal.vue}

@@ -1,6 +1,6 @@
 <script setup>
 import * as z from "zod";
-import FormCreateModalTemplate from "#v/components/form/create-modal-template/index.vue";
+import FormSaveModelTemplate from "#v/components/form/save-model-template/index.vue";
 import { useMenuApi, useFormSubmission, useFormValues } from "#v/composables";
 import { toRef } from "vue";
 import { menuTypeOptions } from "#v/constants";
@@ -20,7 +20,7 @@ const { onSubmit } = useFormSubmission(
 </script>
 
 <template>
-  <FormCreateModalTemplate
+  <FormSaveModelTemplate
     title="菜单信息"
     :on-close="(ok) => emit('close', ok)"
     :fields="[
@@ -53,6 +53,7 @@ const { onSubmit } = useFormSubmission(
   { name: 'isAdmin', type: 'button-switch', label: '\u662F\u5426\u662F\u7CFB\u7EDF\u83DC\u5355', colSpan: '12', zodType: z.boolean() }
 ]"
     :model-value="newValues"
+    :old-model-value="oldValues"
     @update-model-value="(newVal) => newValues = { id: 0, ...newVal }"
     @submit="onSubmit"
   />

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

@@ -1,13 +1,13 @@
 <script setup>
 import { useOverlay } from "@nuxt/ui/composables";
 import { useMenuApi } from "#v/composables";
-import SysMenusCreateModal from "./CreateModal.vue";
+import SysMenusSaveModal from "./SaveModal.vue";
 import { getOprColumns } from "#v/constants";
 import UBadge from "@nuxt/ui/components/Badge.vue";
 import TablePage from "#v/components/table/Page.vue";
 import { h } from "vue";
 const overlay = useOverlay();
-const createModal = overlay.create(SysMenusCreateModal);
+const saveModal = overlay.create(SysMenusSaveModal);
 const columns = [
   {
     accessorKey: "type",
@@ -82,7 +82,7 @@ const columns = [
 
 <template>
   <TablePage
-    name="sys-menu"
+    name="menus"
     cn-name="菜单信息"
     :use-api-group="useMenuApi"
     :biz-columns="columns"
@@ -94,8 +94,9 @@ const columns = [
     :extra-row-actions="[{
   icon: 'i-lucide-clipboard-plus',
   label: '\u4EE5\u6B64\u4F5C\u4E3A\u7236\u83DC\u5355\u590D\u5236',
-  fnWithModal: async (raw) => await createModal.open({ model: useMenuApi().copyAsParent?.(raw) ?? { id: 0 } }).result
+  fnWithModal: async (raw) => await saveModal.open({ model: useMenuApi().copyAsParent?.(raw) ?? { id: 0 } }).result
 }]"
-    @edit-row-from-modal="async (row) => await createModal.open({ model: row }).result"
+    :display-fn-in-delete-modal="(model) => `${model.name} ${model.staticRouteKeys?.join(',')}`"
+    @edit-row-from-modal="async (row) => await saveModal.open({ model: row }).result"
   />
 </template>

package/dist/runtime/components/sys/role/{CreateModal.vue → SaveModal.vue}

@@ -1,6 +1,6 @@
 <script setup>
 import * as z from "zod";
-import FormCreateModalTemplate from "#v/components/form/create-modal-template/index.vue";
+import FormSaveModelTemplate from "#v/components/form/save-model-template/index.vue";
 import TablePermissionTab from "#v/components/table/permission/TablePermissionTab.vue";
 import { useFormSubmission, useFormValues, useMenuApi, useRoleApi } from "#v/composables";
 import { computed, onMounted, ref, toRef } from "vue";
@@ -9,7 +9,7 @@ const props = defineProps({
   model: { type: Object, required: true }
 });
 const emit = defineEmits(["close", "save"]);
-const { oldValues, newValues } = useFormValues(toRef(props.model), { id: 0, disabled: false, isAdmin: false });
+const { oldValues, newValues } = useFormValues(toRef(props.model), { id: 0, disabled: false, isAdmin: false, menus: [] });
 const { onSubmit } = useFormSubmission(
   toRef(oldValues),
   toRef(newValues),
@@ -86,19 +86,22 @@ onMounted(async () => {
 </script>
 
 <template>
-  <FormCreateModalTemplate
+  <FormSaveModelTemplate
     title="角色信息"
     :on-close="(ok) => emit('close', ok)"
     :fields="fields"
     :model-value="newValues"
+    :old-model-value="oldValues"
     @update-model-value="updateModelValue"
     @submit="onSubmit"
   >
     <template #after-form>
       <div class="border-t pt-4 mt-4">
-        <div class="font-semibold mb-2">Table 权限</div>
+        <div class="font-semibold mb-2">
+          Table 权限
+        </div>
         <TablePermissionTab v-model="tablePermissions" />
       </div>
     </template>
-  </FormCreateModalTemplate>
+  </FormSaveModelTemplate>
 </template>

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

@@ -1,13 +1,13 @@
 <script setup>
 import { useOverlay } from "@nuxt/ui/composables";
 import { useRoleApi } from "#v/composables";
-import SysRolesCreateModal from "./CreateModal.vue";
+import SysRolesSaveModal from "./SaveModal.vue";
 import { booleanOptions, getOprColumns } from "#v/constants";
 import UBadge from "@nuxt/ui/components/Badge.vue";
 import TablePage from "#v/components/table/Page.vue";
 import { h } from "vue";
 const overlay = useOverlay();
-const createModal = overlay.create(SysRolesCreateModal);
+const saveModal = overlay.create(SysRolesSaveModal);
 const columns = [
   {
     accessorKey: "name",
@@ -60,10 +60,11 @@ const columns = [
 
 <template>
   <TablePage
-    name="sys-role"
+    name="roles"
     cn-name="角色信息"
     :use-api-group="useRoleApi"
     :biz-columns="columns"
-    @edit-row-from-modal="async (row) => await createModal.open({ model: row }).result"
+    :display-fn-in-delete-modal="(model) => model.name"
+    @edit-row-from-modal="async (row) => await saveModal.open({ model: row }).result"
   />
 </template>

package/dist/runtime/components/sys/table/{CreateModal.vue → SaveModal.vue}

@@ -1,6 +1,6 @@
 <script setup>
 import * as z from "zod";
-import FormCreateModalTemplate from "#v/components/form/create-modal-template/index.vue";
+import FormSaveModelTemplate from "#v/components/form/save-model-template/index.vue";
 import TableColumnList from "./TableColumnList.vue";
 import { useFormSubmission, useFormValues, useTableApi } from "#v/composables";
 import { computed, ref, toRef } from "vue";
@@ -40,16 +40,17 @@ function updateModelValue(newVal) {
 </script>
 
 <template>
-  <FormCreateModalTemplate
+  <FormSaveModelTemplate
     title="Table"
     :on-close="(ok) => emit('close', ok)"
     :fields="fields"
     :model-value="newValues"
+    :old-model-value="oldValues"
     @update-model-value="updateModelValue"
     @submit="onSubmit"
   >
     <template #after-form>
       <TableColumnList ref="columnListRef" :initial-columns="model.columns" />
     </template>
-  </FormCreateModalTemplate>
+  </FormSaveModelTemplate>
 </template>

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

@@ -3,10 +3,10 @@ import { useOverlay } from "@nuxt/ui/composables";
 import { useTableApi, useTableColumnApi, useTablePermissionApi } from "#v/composables/api";
 import { getOprColumns } from "#v/constants";
 import TablePage from "#v/components/table/Page.vue";
-import CreateModal from "./CreateModal.vue";
+import SaveModal from "./SaveModal.vue";
 import { h, ref, watch } from "vue";
 const overlay = useOverlay();
-const createModal = overlay.create(CreateModal);
+const saveModal = overlay.create(SaveModal);
 const tableMeta = ref({});
 const columns = [
   {
@@ -93,14 +93,14 @@ watch(
 <template>
   <TablePage
     ref="tablePageRef"
-    name="sys-table"
+    name="tables"
     cn-name="Table 配置"
     :use-api-group="useTableApi"
     :biz-columns="columns"
     :expandable="true"
     :expand-v-node="getExpandVNode"
     @edit-row-from-modal="async (row) => {
-  const result = await createModal.open({ model: { ...row } }).result;
+  const result = await saveModal.open({ model: { ...row } }).result;
   return result === true;
 }"
   />

package/dist/runtime/components/sys/table/TableColumnModal.vue

@@ -1,6 +1,6 @@
 <script setup>
 import * as z from "zod";
-import FormCreateModalTemplate from "#v/components/form/create-modal-template/index.vue";
+import FormSaveModelTemplate from "#v/components/form/save-model-template/index.vue";
 import { useFormValues } from "#v/composables";
 import { computed, toRef } from "vue";
 const props = defineProps({
@@ -8,7 +8,7 @@ const props = defineProps({
   onSaveColumn: { type: Function, required: true }
 });
 const emit = defineEmits(["close"]);
-const { newValues } = useFormValues(toRef(props.column), { id: 0 });
+const { oldValues, newValues } = useFormValues(toRef(props.column), { id: 0 });
 const fixedItems = [
   { label: "\u4E0D\u56FA\u5B9A", value: "" },
   { label: "\u5DE6\u4FA7\u56FA\u5B9A", value: "left" },
@@ -25,11 +25,12 @@ const fields = computed(() => [
 </script>
 
 <template>
-  <FormCreateModalTemplate
+  <FormSaveModelTemplate
     title="列配置"
     :on-close="(ok) => emit('close', ok)"
     :fields="fields"
     :model-value="newValues"
+    :old-model-value="oldValues"
     @update-model-value="(newVal) => newValues = { id: 0, ...newVal }"
     @submit="async () => {
   props.onSaveColumn(newValues);