From 0fc428d58e6d0f989be913cc12646380cb716771 Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Mon, 23 Sep 2024 09:12:35 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E7=A7=9F=E6=88=B7=E5=A5=97=E9=A4=90?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/system/tenant/tenant-drawer.vue | 31 ++++++++-----------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/apps/web-antd/src/views/system/tenant/tenant-drawer.vue b/apps/web-antd/src/views/system/tenant/tenant-drawer.vue
index 48401bd5..9937938a 100644
--- a/apps/web-antd/src/views/system/tenant/tenant-drawer.vue
+++ b/apps/web-antd/src/views/system/tenant/tenant-drawer.vue
@@ -6,6 +6,7 @@ import { $t } from '@vben/locales';
 
 import { useVbenForm } from '#/adapter';
 import { clientAdd, clientUpdate } from '#/api/system/client';
+import { packageSelectList } from '#/api/system/tenant-package';
 
 import { drawerSchema } from './data';
 
@@ -31,23 +32,17 @@ const [BasicForm, formApi] = useVbenForm({
   wrapperClass: 'grid-cols-2',
 });
 
-function setupForm() {
-  formApi.setState((prev) => {
-    return {
-      ...prev,
-      schema: prev.schema?.map((item) => {
-        if (item.fieldName === 'packageId') {
-          return {
-            ...item,
-            componentProps: {
-              ...item.componentProps,
-            },
-          };
-        }
-        return item;
-      }),
-    };
-  });
+async function setupPackageSelect() {
+  const tenantPackageList = await packageSelectList();
+  formApi.updateSchema([
+    {
+      componentProps: {
+        fieldNames: { label: 'packageName', value: 'packageId' },
+        options: tenantPackageList,
+      },
+      fieldName: 'packageId',
+    },
+  ]);
 }
 
 const [BasicDrawer, drawerApi] = useVbenDrawer({
@@ -61,7 +56,7 @@ const [BasicDrawer, drawerApi] = useVbenDrawer({
     const { record, update } = drawerApi.getData() as DrawerProps;
     isUpdate.value = update;
     // 初始化
-    setupForm();
+    await setupPackageSelect();
     if (update && record) {
       for (const key in record) {
         await formApi.setFieldValue(key, record[key]);