Merge remote-tracking branch 'origin/dev' into dev

src/stores/modules/app.ts

@@ -40,7 +40,7 @@ const storeSetup = () => {
       document.title = resMap.get('site_title')
       document
         .querySelector('link[rel="shortcut icon"]')
-        ?.setAttribute('href', resMap.get('site_favicon') || 'https://cnadmin.charles7c.top/favicon.ico')
+        ?.setAttribute('href', resMap.get('site_favicon') || 'https://admin.continew.top/favicon.ico')
     })
   }
 
@@ -50,7 +50,7 @@ const storeSetup = () => {
     document.title = config.site_title || ''
     document
       .querySelector('link[rel="shortcut icon"]')
-      ?.setAttribute('href', config.site_favicon || 'https://cnadmin.charles7c.top/favicon.ico')
+      ?.setAttribute('href', config.site_favicon || 'https://admin.continew.top/favicon.ico')
   }
 
   // 页面切换动画类名

src/utils/http.ts

@@ -34,7 +34,7 @@ const StatusCodeMessage: ICodeMessage = {
 }
 
 const http: AxiosInstance = axios.create({
-  baseURL: import.meta.env.VITE_API_PREFIX,
+  baseURL: import.meta.env.VITE_API_PREFIX ?? import.meta.env.VITE_API_BASE_URL,
   timeout: 30 * 1000
 })
 

src/views/home/components/ProjectCard.vue

@@ -27,31 +27,31 @@ const list = [
   {
     name: 'ContiNew Admin',
     desc: '持续优化的前后端分离中后台管理框架，开箱即用，持续提供舒适的开发体验。',
-    logo: 'https://doc.charles7c.top/logo.svg',
+    logo: 'https://continew.top/logo.svg',
     url: 'https://gitee.com/continew/continew-admin'
   },
   {
     name: 'ContiNew Starter',
     desc: '包含了一系列经过企业实践优化的依赖包（如 MyBatis-Plus、SaToken）。',
-    logo: 'https://doc.charles7c.top/logo.svg',
+    logo: 'https://continew.top/logo.svg',
     url: 'https://gitee.com/continew/continew-starter'
   },
   {
     name: 'ContiNew Admin UI - GI',
     desc: '基于 Gi Demo 前端模板开发的 ContiNew Admin 前端适配项目。',
-    logo: 'https://doc.charles7c.top/logo.svg',
+    logo: 'https://continew.top/logo.svg',
     url: 'https://gitee.com/continew/continew-admin-ui-gi'
   },
   {
     name: 'ContiNew Admin UI',
     desc: '基于 Arco Design Pro 前端模板开发的 ContiNew Admin 前端适配项目。',
-    logo: 'https://doc.charles7c.top/logo.svg',
+    logo: 'https://continew.top/logo.svg',
     url: 'https://gitee.com/continew/continew-admin-ui'
   },
   {
     name: 'ContiNew Cloud（孵化中）',
     desc: 'ContiNew Admin 微服务版本',
-    logo: 'https://doc.charles7c.top/logo.svg',
+    logo: 'https://continew.top/logo.svg',
     url: '#'
   },
   {

src/views/home/components/SponsorCard.vue

@@ -1,7 +1,7 @@
 <template>
   <a-card title="特别赞助" :bordered="false" size="medium" class="card gi_card_title">
     <template #extra>
-      <a-link href="https://doc.charles7c.top/other/sponsor.html" target="_blank" rel="noopener">>></a-link>
+      <a-link href="https://continew.top/other/sponsor.html" target="_blank" rel="noopener">>></a-link>
     </template>
     <a-row :gutter="8">
       <a-carousel
@@ -29,7 +29,7 @@ interface ImageType {
 
 const imageList: ImageType[] = [
   {
-    src: `https://doc.charles7c.top/img/sponsor/ad/roovps.jpg?${new Date().getTime()}`,
+    src: `https://continew.top/img/sponsor/ad/roovps.jpg?${new Date().getTime()}`,
     title: 'ROOVPS',
     link: 'https://roovps.com/cart'
   }

src/views/home/components/SupportCard.vue

@@ -15,5 +15,5 @@
 </template>
 
 <script lang="ts" setup>
-const imageSrc = [`https://doc.charles7c.top/qrcode.jpg?${new Date().getTime()}`]
+const imageSrc = [`https://continew.top/qrcode.jpg?${new Date().getTime()}`]
 </script>

src/views/monitor/log/index.vue

@@ -13,8 +13,8 @@
 </template>
 
 <script setup lang="ts">
-import LoginLog from './LoginLog.vue'
-import OperationLog from './OperationLog.vue'
+import LoginLog from './login/index.vue'
+import OperationLog from './operation/index.vue'
 
 const route = useRoute()
 const router = useRouter()

src/views/monitor/online/index.vue

@@ -51,7 +51,7 @@ import { useUserStore } from '@/stores'
 import { useTable } from '@/hooks'
 import { isMobile } from '@/utils'
 
-defineOptions({ name: 'OnlineUser' })
+defineOptions({ name: 'MonitorOnline' })
 
 const columns: TableInstanceColumns[] = [
   {

src/views/system/config/index.vue

@@ -14,7 +14,7 @@
 <script setup lang="ts">
 import BasicSetting from './components/BasicSetting.vue'
 
-defineOptions({ name: 'Config' })
+defineOptions({ name: 'SystemConfig' })
 </script>
 
 <style scoped lang="less">

src/views/system/dept/index.vue

@@ -89,7 +89,7 @@ import { useDownload } from '@/hooks'
 import { isMobile } from '@/utils'
 import has from '@/utils/has'
 
-defineOptions({ name: 'Dept' })
+defineOptions({ name: 'SystemDept' })
 
 const columns: TableInstanceColumns[] = [
   { title: '名称', dataIndex: 'name', width: 170, ellipsis: true, tooltip: true },

src/views/system/dict/index.vue

@@ -60,7 +60,7 @@ import { useTable } from '@/hooks'
 import { isMobile } from '@/utils'
 import has from '@/utils/has'
 
-defineOptions({ name: 'Dict' })
+defineOptions({ name: 'SystemDict' })
 
 const columns: TableInstanceColumns[] = [
   {

src/views/system/file/index.vue

@@ -13,7 +13,7 @@
 import FileAside from './main/FileAside.vue'
 import FileMain from './main/FileMain/index.vue'
 
-defineOptions({ name: 'File' })
+defineOptions({ name: 'SystemFile' })
 </script>
 
 <style lang="scss" scoped>

src/views/system/menu/index.vue

@@ -101,7 +101,7 @@ import { DisEnableStatusList } from '@/constant/common'
 import { isMobile } from '@/utils'
 import has from '@/utils/has'
 
-defineOptions({ name: 'Menu' })
+defineOptions({ name: 'SystemMenu' })
 
 const columns: TableInstanceColumns[] = [
   { title: '菜单标题', dataIndex: 'title', slotName: 'title', width: 170, fixed: !isMobile() ? 'left' : undefined },

src/views/system/role/index.vue

@@ -77,7 +77,7 @@ import { isMobile } from '@/utils'
 import { DisEnableStatusList } from '@/constant/common'
 import has from '@/utils/has'
 
-defineOptions({ name: 'Role' })
+defineOptions({ name: 'SystemRole' })
 
 const { data_scope_enum } = useDict('data_scope_enum')
 

src/views/system/storage/index.vue

@@ -76,7 +76,7 @@ import { isMobile } from '@/utils'
 import has from '@/utils/has'
 import { DisEnableStatusList } from '@/constant/common'
 
-defineOptions({ name: 'Storage' })
+defineOptions({ name: 'SystemStorage' })
 
 const { storage_type_enum } = useDict('storage_type_enum')
 
@@ -104,7 +104,7 @@ const columns: TableInstanceColumns[] = [
     title: '操作',
     slotName: 'action',
     width: 130,
-    3
+    show: has.hasPermOr(['system:storage:update', 'system:storage:delete']),
     align: 'center',
     fixed: !isMobile() ? 'right' : undefined
   }

src/views/system/user/index.vue

@@ -112,7 +112,7 @@ import getAvatar from '@/utils/avatar'
 import has from '@/utils/has'
 import { DisEnableStatusList } from '@/constant/common'
 
-defineOptions({ name: 'User' })
+defineOptions({ name: 'SystemUser' })
 
 const columns: TableInstanceColumns[] = [
   {