diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminTopicController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminTopicController.java index 75aa40d1..6020759a 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminTopicController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminTopicController.java @@ -1,9 +1,11 @@ package org.linlinjava.litemall.admin.web; +import io.swagger.models.auth.In; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.linlinjava.litemall.admin.annotation.RequiresPermissionsDesc; +import org.linlinjava.litemall.core.util.JacksonUtil; import org.linlinjava.litemall.core.util.ResponseUtil; import org.linlinjava.litemall.core.validator.Order; import org.linlinjava.litemall.core.validator.Sort; @@ -114,4 +116,12 @@ public class AdminTopicController { return ResponseUtil.ok(); } + @RequiresPermissions("admin:topic:batch-delete") + @RequiresPermissionsDesc(menu = {"推广管理", "专题管理"}, button = "批量删除") + @PostMapping("/batch-delete") + public Object batchDelete(@RequestBody String body) { + List ids = JacksonUtil.parseIntegerList(body, "ids"); + topicService.deleteByIds(ids); + return ResponseUtil.ok(); + } } diff --git a/litemall-admin/package.json b/litemall-admin/package.json index fe1987ad..613b76df 100644 --- a/litemall-admin/package.json +++ b/litemall-admin/package.json @@ -44,6 +44,7 @@ }, "dependencies": { "@tinymce/tinymce-vue": "3.0.1", + "lodash": "^4.17.11", "v-charts": "1.19.0", "axios": "0.18.1", "clipboard": "2.0.4", @@ -83,9 +84,7 @@ "html-webpack-plugin": "3.2.0", "husky": "1.3.1", "lint-staged": "8.1.5", - "mockjs": "1.0.1-beta3", "node-sass": "^4.9.0", - "plop": "2.3.0", "runjs": "^4.3.2", "sass-loader": "^7.1.0", "script-ext-html-webpack-plugin": "2.1.3", diff --git a/litemall-admin/src/api/topic.js b/litemall-admin/src/api/topic.js index e1ec53c5..697245df 100644 --- a/litemall-admin/src/api/topic.js +++ b/litemall-admin/src/api/topic.js @@ -39,3 +39,11 @@ export function deleteTopic(data) { data }) } + +export function batchDeleteTopic(data) { + return request({ + url: '/topic/batch-delete', + method: 'post', + data + }) +} diff --git a/litemall-admin/src/styles/index.scss b/litemall-admin/src/styles/index.scss index 96095ef6..0c6dc0c5 100644 --- a/litemall-admin/src/styles/index.scss +++ b/litemall-admin/src/styles/index.scss @@ -181,6 +181,12 @@ aside { } } +.operator-container { + padding-bottom: 10px; + display: flex; + justify-content: flex-end; +} + //refine vue-multiselect plugin .multiselect { line-height: 16px; diff --git a/litemall-admin/src/views/promotion/topic.vue b/litemall-admin/src/views/promotion/topic.vue index 05711376..9ebcc646 100644 --- a/litemall-admin/src/views/promotion/topic.vue +++ b/litemall-admin/src/views/promotion/topic.vue @@ -3,18 +3,24 @@
- - + + 查找 添加 导出
- - - +
+ 批量删除 +
- + + + + + + +