diff --git a/bookmark_front/src/components/main/Search.vue b/bookmark_front/src/components/main/Search.vue
index c84b1c0..27fe25c 100644
--- a/bookmark_front/src/components/main/Search.vue
+++ b/bookmark_front/src/components/main/Search.vue
@@ -19,22 +19,20 @@
-
+
{{ item.name }}
-
+
-
+
diff --git a/bookmark_front/src/components/main/things/AddBookmark.vue b/bookmark_front/src/components/main/things/AddBookmark.vue
index b33df6c..68c644f 100644
--- a/bookmark_front/src/components/main/things/AddBookmark.vue
+++ b/bookmark_front/src/components/main/things/AddBookmark.vue
@@ -1,14 +1,14 @@
-
+
-
+
@@ -16,7 +16,13 @@
-
+
@@ -30,14 +36,15 @@
diff --git a/bookmark_front/src/views/manage/bookmarkTree/index.vue b/bookmark_front/src/views/manage/bookmarkTree/index.vue
index 2ba8353..2281be7 100644
--- a/bookmark_front/src/views/manage/bookmarkTree/index.vue
+++ b/bookmark_front/src/views/manage/bookmarkTree/index.vue
@@ -99,7 +99,7 @@ import { mapState } from "vuex";
import { downloadFile } from "@/util/FileUtil";
import ClipboardJS from "clipboard";
import moment from "moment";
-import { TREE_DATA, SHOW_REFRESH_TOAST, refreshHomePinList, HOME_PIN_LIST } from "@/store/modules/treeData";
+import { TREE_DATA, SHOW_REFRESH_TOAST, refreshHomePinList, deleteData, HOME_PIN_LIST } from "@/store/modules/treeData";
import { dealList, exportFileHead } from "@/views/manage/bookmarkTree/helper";
import { GLOBAL_CONFIG } from "@/store/modules/globalConfig";
export default {
@@ -167,6 +167,7 @@ export default {
* 加载数据,兼容treeNode为id
*/
loadData(treeNode) {
+ console.log("加载数据", treeNode);
return new Promise((resolve) => {
const data = typeof treeNode === "number" ? this.$store.getters["treeData/getById"](treeNode) : treeNode.dataRef;
let newPath = data.path + "." + data.bookmarkId;
@@ -193,6 +194,7 @@ export default {
* 重置当前data中书签相关数据
*/
resetData() {
+ console.log("重置数据");
this.treeData = this.totalTreeData[""];
this.expandedKeys = [];
this.checkedKeys = [];
@@ -284,13 +286,9 @@ export default {
this.$message.warn("请选择后再进行操作");
return;
}
-
this.loading = true;
- await HttpUtil.post("/bookmark/batchDelete", null, {
- pathList,
- bookmarkIdList,
- });
- this.$store.dispatch("treeData/deleteData", { pathList, bookmarkIdList });
+ await HttpUtil.post("/bookmark/batchDelete", null, { pathList, bookmarkIdList });
+ this.$store.dispatch(TREE_DATA + "/" + deleteData, { pathList, bookmarkIdList });
//删除已经被删除的数据
pathList.forEach((item) => {
const id = parseInt(item.split(".").reverse()[0]);
@@ -337,8 +335,8 @@ export default {
* 关闭弹窗
* @param isUpload 说明为上传书签文件,需要刷新缓存数据
*/
- async close(isUpload) {
- if (isUpload) {
+ async close(type) {
+ if (type === "file") {
this.refresh(true);
} else {
this.treeData.__ob__.dep.notify();