Merge branch 'master' of https://gitlab.com/halo_dev/halo-admin

src/api/journal.js

@@ -28,4 +28,11 @@ journalApi.update = (journalId, journal) => {
   })
 }
 
+journalApi.delete = journalId => {
+  return service({
+    url: `${baseUrl}/${journalId}`,
+    method: 'delete'
+  })
+}
+
 export default journalApi

src/components/global.less

@@ -8,7 +8,8 @@ body {
   height: auto;
   overflow-x: hidden;
 
-  &.mobile,&.tablet {
+  &.mobile,
+  &.tablet {
 
     .ant-layout-content {
 
@@ -25,11 +26,14 @@ body {
       .ant-table-content {
         overflow-y: auto;
       }
+
       .ant-table-body {
         min-width: 800px;
       }
     }
+
     .topmenu {
+
       /* 必须为 topmenu  才能启用流式布局 */
       &.content-width-Fluid {
         .header-index-wide {
@@ -43,7 +47,8 @@ body {
     .sidemenu {
       .ant-header-fixedHeader {
 
-        &.ant-header-side-opened, &.ant-header-side-closed  {
+        &.ant-header-side-opened,
+        &.ant-header-side-closed {
           width: 100%
         }
       }
@@ -60,6 +65,7 @@ body {
     padding: 0 24px;
     cursor: pointer;
     transition: color .3s;
+
     &:hover {
       background: rgba(0, 0, 0, 0.025);
     }
@@ -82,6 +88,7 @@ body {
         width: 100%;
       }
     }
+
     /* 必须为 topmenu  才能启用流式布局 */
     &.content-width-Fluid {
       .header-index-wide {
@@ -123,7 +130,8 @@ body {
     position: relative;
   }
 
-  .header, .top-nav-header-index {
+  .header,
+  .top-nav-header-index {
 
     .user-wrapper {
       float: right;
@@ -160,6 +168,7 @@ body {
 
         .action {
           color: rgba(255, 255, 255, 0.85);
+
           a {
             color: rgba(255, 255, 255, 0.85);
           }
@@ -172,7 +181,8 @@ body {
     }
   }
 
-  &.mobile,&.tablet {
+  &.mobile,
+  &.tablet {
     .top-nav-header-index {
 
       .header-index-wide {
@@ -188,6 +198,7 @@ body {
             flex: 0;
             text-align: center;
             line-height: 58px;
+
             h1 {
               display: none;
             }
@@ -205,12 +216,14 @@ body {
             }
           }
         }
+
         //
       }
     }
   }
 
   &.tablet {
+
     // overflow: hidden; text-overflow:ellipsis; white-space: nowrap;
     .top-nav-header-index {
 
@@ -223,6 +236,7 @@ body {
             white-space: nowrap;
           }
         }
+
         .ant-menu.ant-menu-horizontal {
           flex: 1 1;
           white-space: normal;
@@ -262,7 +276,8 @@ body {
           transition: all .3s;
           overflow: hidden;
 
-          img, svg {
+          img,
+          svg {
             display: inline-block;
             vertical-align: middle;
             height: 32px;
@@ -330,8 +345,10 @@ body {
       background-color: rgb(0, 21, 41);
     }
   }
+
   &.light {
     box-shadow: none;
+
     .ant-drawer-content {
       background-color: #fff;
     }
@@ -352,6 +369,7 @@ body {
   .ant-layout-sider-children {
     padding-top: 64px;
     overflow-y: hidden;
+
     &:hover {
       overflow-y: auto;
     }
@@ -376,12 +394,15 @@ body {
     overflow: hidden;
     z-index: 9;
 
-    img, svg, h1 {
+    img,
+    svg,
+    h1 {
       display: inline-block;
       vertical-align: middle;
     }
 
-    img, svg {
+    img,
+    svg {
       height: 32px;
       width: 32px;
     }
@@ -422,6 +443,7 @@ body {
     user-select: none;
   }
 }
+
 .user-dropdown-menu-wrapper.ant-dropdown-menu {
   padding: 4px 0;
 
@@ -431,8 +453,7 @@ body {
 
   .ant-dropdown-menu-item>.anticon:first-child,
   .ant-dropdown-menu-item>a>.anticon:first-child,
-  .ant-dropdown-menu-submenu-title > .anticon:first-child
+  .ant-dropdown-menu-submenu-title>.anticon:first-child .ant-dropdown-menu-submenu-title>a>.anticon:first-child {
-  .ant-dropdown-menu-submenu-title > a > .anticon:first-child {
     min-width: 12px;
     margin-right: 8px;
   }
@@ -464,6 +485,7 @@ body {
         padding-right: 8px;
         width: auto;
       }
+
       .ant-form-item-control {
         height: 32px;
         line-height: 32px;
@@ -493,6 +515,7 @@ body {
 .ant-card {
   .ant-card-head {
     padding: 0 16px !important;
+
     .ant-card-head-wrapper {
       .ant-card-head-title {
         padding: 12px 0 !important;
@@ -520,21 +543,26 @@ body {
 
 .card-container {
   background: #f5f5f5;
+
   &>.ant-tabs-card {
     &>.ant-tabs-content {
       margin-top: -16px;
+
       &>.ant-tabs-tabpane {
         background: #fff;
         padding: 16px;
       }
     }
+
     &>.ant-tabs-bar {
       border-color: #fff;
+
       .ant-tabs-tab {
         border: none !important;
         margin-right: 0 !important;
         background: transparent;
       }
+
       .ant-tabs-tab-active {
         border-color: #fff;
         background: #fff;
@@ -554,3 +582,22 @@ body {
   background: rgb(255, 255, 255);
   border-radius: 0px 0px 4px 4px;
 }
+
+.page-wrapper {
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  -webkit-box-pack: end;
+  -ms-flex-pack: end;
+  justify-content: flex-end;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-orient: horizontal;
+  -webkit-box-direction: normal;
+  -ms-flex-flow: row wrap;
+  flex-flow: row wrap;
+  .ant-pagination-options-size-changer.ant-select{
+    margin:0
+  }
+}

src/views/attachment/AttachmentList.vue

@@ -107,10 +107,7 @@
         </a-list>
       </a-col>
     </a-row>
-    <a-row
+    <div class="page-wrapper">
-      type="flex"
-      justify="end"
-    >
       <a-pagination
         :total="pagination.total"
         :defaultPageSize="pagination.size"
@@ -119,7 +116,7 @@
         @change="handlePaginationChange"
         @showSizeChange="handlePaginationChange"
       />
-    </a-row>
+    </div>
     <a-modal
       title="上传附件"
       v-model="uploadVisible"

src/views/attachment/components/AttachmentDrawer.vue

@@ -42,16 +42,13 @@
         </a-skeleton>
       </a-row>
       <a-divider />
-      <a-row
+      <div class="page-wrapper">
-        type="flex"
-        justify="end"
-      >
         <a-pagination
           :defaultPageSize="pagination.size"
           :total="pagination.total"
           @change="handlePaginationChange"
         ></a-pagination>
-      </a-row>
+      </div>
 
       <AttachmentDetailDrawer
         v-model="detailVisiable"

src/views/attachment/components/AttachmentSelectDrawer.vue

@@ -40,16 +40,13 @@
         </a-skeleton>
       </a-row>
       <a-divider />
-      <a-row
+      <div class="page-wrapper">
-        type="flex"
-        justify="end"
-      >
         <a-pagination
           :defaultPageSize="pagination.size"
           :total="pagination.total"
           @change="handlePaginationChange"
         ></a-pagination>
-      </a-row>
+      </div>
       <a-divider />
       <div class="bottom-control">
         <a-button

src/views/comment/CommentList.vue

@@ -102,11 +102,7 @@
             >删除</a>
           </span>
         </a-table>
-        <a-row
+        <div class="page-wrapper">
-          type="flex"
-          justify="end"
-          align="middle"
-        >
           <a-pagination
             class="pagination"
             :total="pagination.total"
@@ -115,7 +111,7 @@
             @showSizeChange="onPaginationChange"
             @change="onPaginationChange"
           />
-        </a-row>
+        </div>
       </div>
     </a-card>
   </page-view>

src/views/interface/MenuList.vue

@@ -205,14 +205,15 @@ export default {
       if (this.menuToCreate.id) {
         menuApi.update(this.menuToCreate.id, this.menuToCreate).then(response => {
           this.$message.success('更新成功！')
+          this.loadMenus()
         })
       } else {
         menuApi.create(this.menuToCreate).then(response => {
           this.$message.success('保存成功！')
+          this.loadMenus()
         })
       }
       this.handleAddMenu()
-      this.loadMenus()
     },
     toggleExpand() {
       this.fieldExpand = !this.fieldExpand

src/views/post/PostList.vue

@@ -176,11 +176,7 @@
             </a-popconfirm>
           </span>
         </a-table>
-        <a-row
+        <div class="page-wrapper">
-          type="flex"
-          justify="end"
-          align="middle"
-        >
           <a-pagination
             class="pagination"
             :total="pagination.total"
@@ -189,7 +185,7 @@
             @showSizeChange="onPaginationChange"
             @change="onPaginationChange"
           />
-        </a-row>
+        </div>
       </div>
     </a-card>
   </div>

src/views/sheet/internal/JournalList.vue

@@ -17,7 +17,7 @@
                   :sm="24"
                 >
                   <a-form-item label="关键词">
-                    <a-input />
+                    <a-input v-model="queryParam.keyword"/>
                   </a-form-item>
                 </a-col>
                 <a-col
@@ -40,7 +40,10 @@
                       type="primary"
                       @click="loadJournals(true)"
                     >查询</a-button>
-                    <a-button style="margin-left: 8px;" @click="resetParam">重置</a-button>
+                    <a-button
+                      style="margin-left: 8px;"
+                      @click="resetParam"
+                    >重置</a-button>
                   </span>
                 </a-col>
               </a-row>
@@ -84,7 +87,14 @@
                     @click="handleEdit(item)"
                   >编辑</a>
                   <a-divider type="vertical" />
+                  <a-popconfirm
+                    title="你确定要删除这条日志？"
+                    @confirm="handleDelete(item.id)"
+                    okText="确定"
+                    cancelText="取消"
+                  >
                     <a href="javascript:void(0);">删除</a>
+                  </a-popconfirm>
                 </template>
                 <a-list-item-meta :description="item.content">
                   <span slot="title">{{ item.createTime | moment }}</span>
@@ -95,7 +105,7 @@
                   />
                 </a-list-item-meta>
               </a-list-item>
-              <template>
+              <div class="page-wrapper">
                 <a-pagination
                   class="pagination"
                   :total="pagination.total"
@@ -104,7 +114,7 @@
                   @showSizeChange="onPaginationChange"
                   @change="onPaginationChange"
                 />
-              </template>
+              </div>
             </a-list>
           </div>
         </a-card>
@@ -190,18 +200,25 @@ export default {
       this.journal = item
       this.visible = true
     },
+    handleDelete(id) {
+      journalApi.delete(id).then(response => {
+        this.$message.success('删除成功！')
+        this.loadJournals()
+      })
+    },
     createOrUpdateJournal() {
       if (this.journal.id) {
         journalApi.update(this.journal.id, this.journal).then(response => {
           this.$message.success('更新成功！')
+          this.loadJournals()
         })
       } else {
         journalApi.create(this.journal).then(response => {
           this.$message.success('发表成功！')
+          this.loadJournals()
         })
       }
       this.visible = false
-      this.loadJournals()
     },
     onPaginationChange(page, pageSize) {
       this.$log.debug(`Current: ${page}, PageSize: ${pageSize}`)

src/views/sheet/internal/LinkList.vue

@@ -183,14 +183,15 @@ export default {
       if (this.link.id) {
         linkApi.update(this.link.id, this.link).then(response => {
           this.$message.success('更新成功！')
+          this.loadLinks()
         })
       } else {
         linkApi.create(this.link).then(response => {
           this.$message.success('保存成功！')
+          this.loadLinks()
         })
       }
       this.handleAddLink()
-      this.loadLinks()
     }
   }
 }

src/views/sheet/internal/PhotoList.vue

@@ -90,10 +90,7 @@
         </a-list>
       </a-col>
     </a-row>
-    <a-row
+    <div class="page-wrapper">
-      type="flex"
-      justify="end"
-    >
       <a-pagination
         :total="pagination.total"
         :defaultPageSize="pagination.size"
@@ -102,7 +99,7 @@
         @change="handlePaginationChange"
         @showSizeChange="handlePaginationChange"
       />
-    </a-row>
+    </div>
     <a-drawer
       title="图片详情"
       :width="isMobile()?'100%':'460'"