From 34c9676e4c61cb2159f4dac693c5de05170c5bde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=87=E6=B0=B8=E8=BE=BE?= <bmdzh11713@163.com>
Date: Wed, 27 Sep 2023 00:03:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=85=B3=E8=81=94=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=98=AF=E5=90=A6=E6=8E=88=E6=9D=83=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Sidebar/Logo.vue |  8 ++++----
 src/views/system/rolefields/index.vue  | 15 ++++++++++-----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 63740d0..3ea82f4 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -20,13 +20,13 @@ import useSettingsStore from '@/store/modules/settings'
 defineProps({
   collapse: {
     type: Boolean,
-    required: true,
-  },
+    required: true
+  }
 })
 
 const title = ref(import.meta.env.VITE_APP_TITLE)
-const settingsStore = useSettingsStore();
-const sideTheme = computed(() => settingsStore.sideTheme);
+const settingsStore = useSettingsStore()
+const sideTheme = computed(() => settingsStore.sideTheme)
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/system/rolefields/index.vue b/src/views/system/rolefields/index.vue
index f927798..24b0e79 100644
--- a/src/views/system/rolefields/index.vue
+++ b/src/views/system/rolefields/index.vue
@@ -30,12 +30,12 @@
                 <el-button type="primary" plain>{{ $t('btn.save') }}</el-button>
               </div>
             </template>
-            <el-table :data="fieldList" height="580" border>
+            <el-table v-loading="fieldListLoading" :data="fieldList" height="580" border>
               <el-table-column prop="fieldName" label="字段名称" />
               <el-table-column prop="fieldType" label="字段类型" />
-              <el-table-column prop="" label="是否授权" align="center">
+              <el-table-column prop="isPermission" label="是否授权" align="center">
                 <template #default="scope">
-                  <el-switch v-model="value2" class="ml-2" style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949" />
+                  <el-switch v-model="scope.row.isPermission" class="ml-2" style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949" />
                 </template>
               </el-table-column>
             </el-table>
@@ -62,11 +62,13 @@ const handleInit = async () => {
 }
 interface model {
   fullName: string
-  properties: field[]
+  // properties: field[]
 }
 interface field {
+  id: number
   fieldName: string
   fieldType: string
+  isPermission: boolean
 }
 const modelList = ref<model[]>([])
 const fieldList = ref<field[]>([])
@@ -77,12 +79,15 @@ const getList = async () => {
   cardLoading.value = false
 }
 const handleCurrentChange = async (val: any) => {
-  const { data } = await getFields({ fullName: val.fullName })
+  fieldListLoading.value = true
+  const { data } = await getFields({ fullName: val.fullName, roleId: route.query.roleId })
   fieldList.value = data
+  fieldListLoading.value = false
 }
 const getProperties = (row) => {
   console.log(row)
 }
+const fieldListLoading = ref(false)
 const value2 = ref(true)
 onMounted(() => {
   getList()