diff --git a/bookMarkService/web/src/main/resources/db/migration/V23__插件版本更新.sql b/bookMarkService/web/src/main/resources/db/migration/V23__插件版本更新.sql new file mode 100644 index 0000000..54f5158 --- /dev/null +++ b/bookMarkService/web/src/main/resources/db/migration/V23__插件版本更新.sql @@ -0,0 +1,3 @@ +update global_config +set value='0.1.2' +where code = "pluginVersion"; diff --git a/bookmark_front/src/components/main/things/AddBookmark.vue b/bookmark_front/src/components/main/things/AddBookmark.vue index 58fcfe3..4336703 100644 --- a/bookmark_front/src/components/main/things/AddBookmark.vue +++ b/bookmark_front/src/components/main/things/AddBookmark.vue @@ -62,7 +62,7 @@ export default { file: null, }, rules: { - name: [{ required: true, min: 1, max: 1000, message: "名称长度为1-1000", trigger: "change" }], + name: [{ required: true, min: 1, max: 1000, message: "名称长度为1-200", trigger: "change" }], url: [{ required: true, min: 1, message: "不能为空", trigger: "change" }], }, }; diff --git a/bookmark_front/src/main.js b/bookmark_front/src/main.js index d0b0f35..c0c9eb3 100644 --- a/bookmark_front/src/main.js +++ b/bookmark_front/src/main.js @@ -19,7 +19,8 @@ import { Popconfirm, AutoComplete, Select, - Popover + Popover, + Breadcrumb } from "ant-design-vue"; import App from "./App.vue"; import router from "./router"; @@ -46,6 +47,7 @@ Vue.use(Popconfirm); Vue.use(AutoComplete); Vue.use(Select); Vue.use(Popover); +Vue.use(Breadcrumb); Vue.component("my-icon", IconFont); Vue.prototype.$message = message; diff --git a/bookmark_front/src/store/modules/treeData.js b/bookmark_front/src/store/modules/treeData.js index cfa4ebd..0baa87b 100644 --- a/bookmark_front/src/store/modules/treeData.js +++ b/bookmark_front/src/store/modules/treeData.js @@ -249,12 +249,16 @@ const actions = { } context.state[TOTAL_TREE_DATA][""].push(targetNode); } else { + let path = sourceNode.path + "." + sourceNode.bookmarkId; + if (!context.state[TOTAL_TREE_DATA][path]) { + context.state[TOTAL_TREE_DATA][path] = []; + } if (sourceNode.children === undefined) { - sourceNode.children = []; + sourceNode.children = context.state[TOTAL_TREE_DATA][path]; } sourceNode.children.push(targetNode); } - if (targetNode.type === 0) { + if (targetNode.type === 1) { context.state[TOTAL_TREE_DATA][targetNode.path + "." + targetNode.bookmarkId] = []; } targetNode.isLeaf = targetNode.type === 0; diff --git a/bookmark_front/src/views/home/PinBookmarkItem.vue b/bookmark_front/src/views/home/PinBookmarkItem.vue index f21a36d..9ac862e 100644 --- a/bookmark_front/src/views/home/PinBookmarkItem.vue +++ b/bookmark_front/src/views/home/PinBookmarkItem.vue @@ -1,6 +1,6 @@