From 9abd62b801baf06fd2fa470b55f221789e3069fc Mon Sep 17 00:00:00 2001
From: JaguarJack <njphper@gmail.com>
Date: Thu, 25 May 2023 07:53:35 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 composer.json                                   | 2 +-
 modules/User/Models/User.php                    | 2 +-
 modules/User/views/user/index.vue               | 8 ++++----
 resources/admin/directives/permission/action.ts | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index b8fe49c..a77e307 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
         "guzzlehttp/guzzle": "^7.2",
         "laravel/framework": "^10.0",
         "laravel/tinker": "^2.8",
-        "catchadmin/core": "^0.1.13"
+        "catchadmin/core": "^0.1.14"
     },
     "require-dev": {
         "fakerphp/faker": "^1.9.1",
diff --git a/modules/User/Models/User.php b/modules/User/Models/User.php
index 71fbde7..949742b 100644
--- a/modules/User/Models/User.php
+++ b/modules/User/Models/User.php
@@ -37,7 +37,7 @@ class User extends Model implements AuthenticatableContract
     public array $searchable = [
         'username' => 'like',
         'email' => 'like',
-        'status' => '='
+        'status' => '=',
     ];
 
     /**
diff --git a/modules/User/views/user/index.vue b/modules/User/views/user/index.vue
index c986685..87d19b2 100644
--- a/modules/User/views/user/index.vue
+++ b/modules/User/views/user/index.vue
@@ -21,7 +21,8 @@
           <el-table-column prop="username" label="用户名" width="150" />
           <el-table-column prop="avatar" label="头像">
             <template #default="scope">
-              <el-avatar :src="scope.row.avatar" />
+              <el-avatar :icon="UserFilled" v-if="!scope.row.avatar" />
+              <el-avatar :src="scope.row.avatar" v-else />
             </template>
           </el-table-column>
           <el-table-column prop="email" label="邮箱" />
@@ -50,6 +51,7 @@
 </template>
 
 <script lang="ts" setup>
+// @ts-nocheck
 import { computed, onMounted, ref } from 'vue'
 import Create from './create.vue'
 import { useGetList } from '/admin/composables/curd/useGetList'
@@ -58,11 +60,11 @@ import { useOpen } from '/admin/composables/curd/useOpen'
 import Department from './components/department.vue'
 import { useUserStore } from '/admin/stores/modules/user'
 import { isUndefined } from '/admin/support/helper'
+import { UserFilled } from '@element-plus/icons-vue'
 
 const userStore = useUserStore()
 
 const api = 'users'
-
 const { data, query, search, reset, loading } = useGetList(api)
 const { destroy, deleted } = useDestroy()
 const { open, close, title, visible, id } = useOpen()
@@ -74,9 +76,7 @@ const hasRoles = ref<boolean>(false)
 
 onMounted(() => {
   search()
-
   deleted(reset)
-
   hasRoles.value = !isUndefined(userStore.getRoles)
 })
 </script>
diff --git a/resources/admin/directives/permission/action.ts b/resources/admin/directives/permission/action.ts
index 5e23a2c..27ef257 100644
--- a/resources/admin/directives/permission/action.ts
+++ b/resources/admin/directives/permission/action.ts
@@ -18,7 +18,7 @@ function checkAction(el: any, action: any) {
       el.parentNode && el.parentNode.removeChild(el)
     }
   } else {
-    throw new Error(`need action! Like v-action="module.controller.action" || v-action="module@controller@action" `)
+    throw new Error(`need action! Like v-action="module.controller.action"`)
   }
 }