From 268acb174d0163df0923dace1f15b13f79ab3961 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BB=96=E5=BD=A6=E6=A3=8B?= <liaoyq@pvc123.com>
Date: Thu, 14 Mar 2024 10:56:54 +0800
Subject: [PATCH] =?UTF-8?q?fix(ui):=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 new-ui/projects/admin/src/composables/useSubmit.ts    |  4 +++-
 .../views/SysPermission/SysPermissionContainer.vue    | 11 ++++++-----
 .../src/views/SysPermission/SysPermissionForm.vue     |  4 ++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/new-ui/projects/admin/src/composables/useSubmit.ts b/new-ui/projects/admin/src/composables/useSubmit.ts
index 9f44b196..62ec8d1e 100644
--- a/new-ui/projects/admin/src/composables/useSubmit.ts
+++ b/new-ui/projects/admin/src/composables/useSubmit.ts
@@ -9,7 +9,9 @@ function useSubmit<T extends Record<string, any> = Record<string, any>, R = any>
     submitting.value = true;
     try {
       const hasError = await formRef.value?.validate();
-      if (hasError) return Promise.reject({ validateErrors: hasError });
+      if (hasError) {
+        return Promise.reject({ validateErrors: hasError });
+      }
 
       const { data, code, message } = await api({ ...formData ?? {}, ...unref(params) });
       if (code) {
diff --git a/new-ui/projects/admin/src/views/SysPermission/SysPermissionContainer.vue b/new-ui/projects/admin/src/views/SysPermission/SysPermissionContainer.vue
index 4724ebbc..b35ade67 100644
--- a/new-ui/projects/admin/src/views/SysPermission/SysPermissionContainer.vue
+++ b/new-ui/projects/admin/src/views/SysPermission/SysPermissionContainer.vue
@@ -28,13 +28,14 @@ const columns: TableColumnData[] = [
 const [reload, data, loading] = useRequest(getList);
 
 const openFormModal = usePopup(SysPermissionForm, {
-  nodeProps: ([_, record]) => ({ record, options: data.value }),
-  popupProps: ([reload, record], exposed) => ({
+  nodeProps: ([record]) => ({ record, options: data.value }),
+  popupProps: ([record], exposed) => ({
     title: `${record?.id ? "编辑" : "新增"}权限`,
     onBeforeOk: async (done) => {
       await exposed()?.handleSubmit(save, {
         id: record?.id,
       });
+      Message.success("操作成功");
       await reload();
       done(true);
     },
@@ -52,7 +53,7 @@ reload();
 </script>
 <template>
   <div style="padding-bottom: 10px; text-align: right">
-    <a-button type="primary" :loading="loading" @click="openFormModal(reload, {})">
+    <a-button type="primary" :loading="loading" @click="openFormModal({})">
       <template #icon>
         <icon-plus />
       </template>
@@ -67,8 +68,8 @@ reload();
     :pagination="false"
     default-expand-all-rows
   >
-    <template #actions="{ record, reload }">
-      <a-link @click="openFormModal(reload, record)">编辑</a-link>
+    <template #actions="{ record }">
+      <a-link @click="openFormModal(record)">编辑</a-link>
       <a-popconfirm
         content="是否删除？"
         position="left"
diff --git a/new-ui/projects/admin/src/views/SysPermission/SysPermissionForm.vue b/new-ui/projects/admin/src/views/SysPermission/SysPermissionForm.vue
index 60fdf480..17bef62a 100644
--- a/new-ui/projects/admin/src/views/SysPermission/SysPermissionForm.vue
+++ b/new-ui/projects/admin/src/views/SysPermission/SysPermissionForm.vue
@@ -48,13 +48,13 @@ const props = defineProps({
 
 const { formRef, formData, handleSubmit } = useSubmit({
   name: "",
-  pid: "0",
+  pid: 0,
   slug: "",
   sort: null,
 });
 
 const _options = computed(() => {
-  return [{ id: "0", name: "顶部权限", children: unref(props.options ?? []) }];
+  return [{ id: 0, name: "顶部权限", children: unref(props.options ?? []) }];
 });
 
 Object.assign(formData, props.record);