From 014de3832b5001b9c4084152f3bfb6fbdbd7c7e5 Mon Sep 17 00:00:00 2001
From: JaguarJack <njphper@gmail.com>
Date: Thu, 12 Jan 2023 10:10:17 +0800
Subject: [PATCH] chore: update table default style

---
 .../Develop/Support/Generate/stubs/vue/table.stub    |  2 +-
 modules/Develop/views/module/index.vue               |  2 +-
 modules/Develop/views/schema/index.vue               |  2 +-
 modules/Permissions/views/departments/index.vue      |  2 +-
 modules/Permissions/views/jobs/index.vue             |  2 +-
 modules/Permissions/views/roles/index.vue            |  2 +-
 modules/User/views/user/components/loginLog.vue      |  2 +-
 modules/User/views/user/components/operateLog.vue    |  2 +-
 modules/User/views/user/index.vue                    |  2 +-
 resources/admin/layout/components/content.vue        |  2 +-
 resources/admin/styles/tailwind.css                  | 12 ++++++++----
 11 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/modules/Develop/Support/Generate/stubs/vue/table.stub b/modules/Develop/Support/Generate/stubs/vue/table.stub
index 3dafda8..63ab87a 100644
--- a/modules/Develop/Support/Generate/stubs/vue/table.stub
+++ b/modules/Develop/Support/Generate/stubs/vue/table.stub
@@ -5,7 +5,7 @@
          {search}
       </template>
     </Search>
-    <div class="pl-2 pr-2 bg-white dark:bg-regal-dark rounded-lg mt-4 pb-10">
+    <div class="table-default">
       <Operate :show="open" />
       <el-table :data="tableData" class="mt-3" v-loading="loading"{tree}>
         {table}
diff --git a/modules/Develop/views/module/index.vue b/modules/Develop/views/module/index.vue
index 678a054..70414c0 100644
--- a/modules/Develop/views/module/index.vue
+++ b/modules/Develop/views/module/index.vue
@@ -7,7 +7,7 @@
         </el-form-item>
       </template>
     </Search>
-    <div class="pl-2 pr-2 bg-white dark:bg-regal-dark rounded-lg mt-4 pb-6">
+    <div class="table-default">
       <Operate :show="open">
         <template v-slot:operate>
           <!-- header 插槽的内容放这里 -->
diff --git a/modules/Develop/views/schema/index.vue b/modules/Develop/views/schema/index.vue
index f324136..f0a90a9 100644
--- a/modules/Develop/views/schema/index.vue
+++ b/modules/Develop/views/schema/index.vue
@@ -10,7 +10,7 @@
         </el-form-item>
       </template>
     </Search>
-    <div class="pl-2 pr-2 bg-white dark:bg-regal-dark rounded-lg mt-4 pb-6">
+    <div class="table-default">
       <Operate :show="open" />
       <el-table :data="tableData" class="mt-3" v-loading="loading">
         <el-table-column prop="module" label="所属模块" />
diff --git a/modules/Permissions/views/departments/index.vue b/modules/Permissions/views/departments/index.vue
index 1acd643..4d59846 100644
--- a/modules/Permissions/views/departments/index.vue
+++ b/modules/Permissions/views/departments/index.vue
@@ -7,7 +7,7 @@
         </el-form-item>
       </template>
     </Search>
-    <div class="pl-2 pr-2 bg-white dark:bg-regal-dark rounded-lg mt-4 pb-6">
+    <div class="table-default">
       <Operate :show="open" />
       <el-table :data="tableData" class="mt-3" v-loading="loading" row-key="id" default-expand-all :tree-props="{ children: 'children' }">
         <el-table-column prop="department_name" label="部门名称" />
diff --git a/modules/Permissions/views/jobs/index.vue b/modules/Permissions/views/jobs/index.vue
index 2c724dc..38335fd 100644
--- a/modules/Permissions/views/jobs/index.vue
+++ b/modules/Permissions/views/jobs/index.vue
@@ -7,7 +7,7 @@
         </el-form-item>
       </template>
     </Search>
-    <div class="pl-2 pr-2 bg-white dark:bg-regal-dark rounded-lg mt-4 pb-6">
+    <div class="table-default">
       <Operate :show="open" />
       <el-table :data="tableData" class="mt-3" v-loading="loading">
         <el-table-column prop="job_name" label="岗位名称" />
diff --git a/modules/Permissions/views/roles/index.vue b/modules/Permissions/views/roles/index.vue
index 2d02a23..b021a0a 100644
--- a/modules/Permissions/views/roles/index.vue
+++ b/modules/Permissions/views/roles/index.vue
@@ -7,7 +7,7 @@
         </el-form-item>
       </template>
     </Search>
-    <div class="pl-2 pr-2 bg-white dark:bg-regal-dark rounded-lg mt-4 pb-6">
+    <div class="table-default">
       <div class="pt-5 pl-2">
         <Add @click="openRoleForm(null, [])" />
       </div>
diff --git a/modules/User/views/user/components/loginLog.vue b/modules/User/views/user/components/loginLog.vue
index 23767aa..5dcb276 100644
--- a/modules/User/views/user/components/loginLog.vue
+++ b/modules/User/views/user/components/loginLog.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="pl-2 pr-2 bg-white dark:bg-regal-dark rounded-lg mt-4 pb-6">
+  <div class="table-default">
     <el-table :data="tableData" class="mt-3" v-loading="loading">
       <el-table-column prop="account" label="账户" />
       <el-table-column prop="browser" label="浏览器" />
diff --git a/modules/User/views/user/components/operateLog.vue b/modules/User/views/user/components/operateLog.vue
index baa01b3..bb96671 100644
--- a/modules/User/views/user/components/operateLog.vue
+++ b/modules/User/views/user/components/operateLog.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="pl-2 pr-2 bg-white dark:bg-regal-dark rounded-lg mt-2 pb-6">
+  <div class="table-default">
     <div class="w-full flex justify-end">
       <el-radio-group v-model="query.scope" size="small" @change="search">
         <el-radio-button label="self">只看自己</el-radio-button>
diff --git a/modules/User/views/user/index.vue b/modules/User/views/user/index.vue
index 850a00b..275043b 100644
--- a/modules/User/views/user/index.vue
+++ b/modules/User/views/user/index.vue
@@ -15,7 +15,7 @@
           </el-form-item>
         </template>
       </Search>
-      <div class="pl-2 pr-2 bg-white dark:bg-regal-dark rounded-lg mt-4 pb-6">
+      <div class="table-default">
         <Operate :show="open" />
         <el-table :data="tableData" class="mt-3" v-loading="loading">
           <el-table-column prop="username" label="用户名" width="150" />
diff --git a/resources/admin/layout/components/content.vue b/resources/admin/layout/components/content.vue
index 5cdb97f..fdf89d4 100644
--- a/resources/admin/layout/components/content.vue
+++ b/resources/admin/layout/components/content.vue
@@ -5,7 +5,7 @@
     <!-- Tag view -->
     <!--<div class=""></div>-->
     <!-- Container -->
-    <div class="p-1 sm:p-4 max-w-full h-screen overflow-auto sm:overflow-x-hidden">
+    <div class="p-1 sm:p-2 max-w-full h-screen overflow-auto sm:overflow-x-hidden">
       <router-view />
 
       <!--<div class="w-full text-center text-gray-400 h-10 leading-10 mt-2">CatchAdmin 管理系统 @copyright 2018 ~ {{ year }}</div>-->
diff --git a/resources/admin/styles/tailwind.css b/resources/admin/styles/tailwind.css
index 6d5361c..34d8376 100644
--- a/resources/admin/styles/tailwind.css
+++ b/resources/admin/styles/tailwind.css
@@ -9,14 +9,18 @@
         @apply layout-sider w-64
     }
 
-    .layout-sider-hidden { 
-        @apply layout-sider w-0 lg:w-20 
+    .layout-sider-hidden {
+        @apply layout-sider w-0 lg:w-20
     }
-    
+
     .layout-sider-mask {
         @apply block lg:hidden z-40 w-full h-full absolute
     }
+
+    .table-default {
+        @apply pl-2 pr-2 bg-white dark:bg-regal-dark rounded-lg mt-2 pb-6
+    }
 }
 
 @tailwind components;
-@tailwind utilities;
\ No newline at end of file
+@tailwind utilities;