Merge branch 'hutu'

Author: lpya

src/router/index.ts

@@ -12,7 +12,7 @@ export const constantRoutes: Array<RouteRecordRaw> = [
 // createWebHistory(import.meta.env.BASE_URL)
 // createWebHashHistory(import.meta.env.BASE_URL)
 const router = createRouter({
-  history: createWebHistory(import.meta.env.BASE_URL),
+  history: createWebHashHistory(import.meta.env.BASE_URL),
   routes: constantRoutes
 })
 export default router

src/views/table/complex-table/Index.vue

@@ -3,7 +3,7 @@
  * @Author: hutu
  * @Date: 2022-01-12 17:32:00
  * @LastEditors: hutu
- * @LastEditTime: 2022-01-17 10:08:57
+ * @LastEditTime: 2022-01-17 10:19:11
 -->
 <template>
   <div class="complex-table">
@@ -33,13 +33,13 @@
       <div class="complex-content">
         <el-table class="complex-content-table" v-loading="loading" :data="article" @selection-change="handleSelectionChange" :stripe="true" height="calc(100vh - 250px)">
           <el-table-column type="selection" width="55" align="center"></el-table-column>
-          <el-table-column prop="id" label="文章ID" width="100" align="center"></el-table-column>
-          <el-table-column prop="created_at" label="创建时间" width="250" align="center"></el-table-column>
+          <el-table-column prop="id" label="文章ID" width="80" align="center"></el-table-column>
+          <el-table-column prop="created_at" label="创建时间" width="200" align="center"></el-table-column>
           <el-table-column prop="title" label="标题" align="center"></el-table-column>
-          <el-table-column prop="author" label="作者" width="200" align="center"></el-table-column>
-          <el-table-column prop="pageviews" label="阅读量" width="150" align="center"></el-table-column>
-          <el-table-column prop="type" label="类别" width="150" align="center"></el-table-column>
-          <el-table-column prop="status" label="状态" width="150" align="center">
+          <el-table-column prop="author" label="作者" width="100" align="center"></el-table-column>
+          <el-table-column prop="pageviews" label="阅读量" width="100" align="center"></el-table-column>
+          <el-table-column prop="type" label="类别" width="100" align="center"></el-table-column>
+          <el-table-column prop="status" label="状态" width="100" align="center">
             <template #default="scope">
               <el-tag :type="scope.row.status === 'published' ? 'success' : 'info'">{{ scope.row.status }}</el-tag>
             </template>

src/views/table/drag-table/Index.vue

@@ -3,19 +3,19 @@
  * @Author: hutu
  * @Date: 2022-01-12 17:32:00
  * @LastEditors: hutu
- * @LastEditTime: 2022-01-14 09:57:47
+ * @LastEditTime: 2022-01-17 10:21:02
 -->
 <template>
   <div class="drag-table">
     <div class="container">
       <el-table :data="article" :stripe="true">
-        <el-table-column prop="id" label="文章ID" width="100" align="center"></el-table-column>
-        <el-table-column prop="created_at" label="创建时间" width="250" align="center"></el-table-column>
+        <el-table-column prop="id" label="文章ID" width="80" align="center"></el-table-column>
+        <el-table-column prop="created_at" label="创建时间" width="200" align="center"></el-table-column>
         <el-table-column prop="title" label="标题" align="center"></el-table-column>
         <el-table-column prop="author" label="作者" width="200" align="center"></el-table-column>
-        <el-table-column prop="pageviews" label="阅读量" width="150" align="center"> </el-table-column>
-        <el-table-column prop="type" label="类别" width="150" align="center"> </el-table-column>
-        <el-table-column prop="status" label="状态" width="150" align="center">
+        <el-table-column prop="pageviews" label="阅读量" width="100" align="center"> </el-table-column>
+        <el-table-column prop="type" label="类别" width="100" align="center"> </el-table-column>
+        <el-table-column prop="status" label="状态" width="100" align="center">
           <template #default="scope">
             <el-tag :type="scope.row.status === 'published' ? 'success' : 'info'">{{ scope.row.status }}</el-tag>
           </template>
@@ -93,7 +93,9 @@ onMounted(() => {
 </script>
 <style lang="scss">
 .drag-table {
+  height: 100%;
   padding: 20px;
+  overflow: auto;
   .container {
     padding: 20px;
     background: $white;