From e83828dd224836da9cfcfd7dd86023f922c3d376 Mon Sep 17 00:00:00 2001 From: OrangeM21 Date: Mon, 13 Apr 2020 19:58:39 +0800 Subject: [PATCH] =?UTF-8?q?[update]=E6=B7=BB=E5=8A=A0Ztree?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 +- src/components/TreeNode/index.vue | 5 +- src/components/TreeTable/index.vue | 7 +- src/components/ZTree/index.vue | 331 +++++++++++++++++++++++++++++ src/utils/jquery-vendor.js | 4 + src/views/assets/AssetList.vue | 2 +- yarn.lock | 12 ++ 7 files changed, 357 insertions(+), 8 deletions(-) create mode 100644 src/components/ZTree/index.vue create mode 100644 src/utils/jquery-vendor.js diff --git a/package.json b/package.json index 3cbcc3ff3..6268fb292 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "axios": "0.18.1", "element-ui": "2.13.0", "eslint-plugin-html": "^6.0.0", + "jquery": "^3.5.0", "js-cookie": "2.2.0", "less": "^3.10.3", "less-loader": "^5.0.0", @@ -42,7 +43,8 @@ "vue-i18n": "^8.15.5", "vue-router": "3.0.6", "vue-select": "^3.9.5", - "vuex": "3.1.0" + "vuex": "3.1.0", + "ztree": "^3.5.24" }, "devDependencies": { "@babel/core": "7.0.0", diff --git a/src/components/TreeNode/index.vue b/src/components/TreeNode/index.vue index c01baa19d..5d706f39e 100644 --- a/src/components/TreeNode/index.vue +++ b/src/components/TreeNode/index.vue @@ -59,10 +59,9 @@ export default { // Object.assign(data, { node_id: '', asset_id: node.id }) // } if (node.type === 'node') { - console.log(this.url) - this.$emit('urlChanged', this.internalUrl + '?node_id=' + node.id) + this.$emit('nodeClicked', this.internalUrl + '?node_id=' + node.id) } else { - this.$emit('urlChanged', this.internalUrl + '?asset_id=' + node.id) + this.$emit('assetClicked', this.internalUrl + '?asset_id=' + node.id) } // this.$axios.get(this.url, { params: data }).then(res => { diff --git a/src/components/TreeTable/index.vue b/src/components/TreeTable/index.vue index bef295175..0954452d6 100644 --- a/src/components/TreeTable/index.vue +++ b/src/components/TreeTable/index.vue @@ -4,7 +4,7 @@
- +
@@ -23,14 +23,15 @@ + + diff --git a/src/utils/jquery-vendor.js b/src/utils/jquery-vendor.js new file mode 100644 index 000000000..97b3464ae --- /dev/null +++ b/src/utils/jquery-vendor.js @@ -0,0 +1,4 @@ +import $ from 'jquery' +window.$ = $ +window.jQuery = $ +export default $ diff --git a/src/views/assets/AssetList.vue b/src/views/assets/AssetList.vue index 68edd0371..18c4a5f22 100644 --- a/src/views/assets/AssetList.vue +++ b/src/views/assets/AssetList.vue @@ -14,7 +14,7 @@ export default { return { tableConfig: { url: '/api/v1/assets/assets/', - treeurl: '/api/v1/assets/nodes/children/tree/', + treeurl: '/api/v1/assets/nodes/children/tree/?assets=0', columns: [ { prop: 'hostname', diff --git a/yarn.lock b/yarn.lock index 2ef10c742..6c51026b0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5597,6 +5597,11 @@ jest@^23.6.0: import-local "^1.0.0" jest-cli "^23.6.0" +jquery@>=1.4.4, jquery@^3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9" + integrity sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ== + js-base64@^2.1.8, js-base64@^2.1.9: version "2.5.2" resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.2.tgz#313b6274dda718f714d00b3330bbae6e38e90209" @@ -9986,3 +9991,10 @@ yorkie@^2.0.0: is-ci "^1.0.10" normalize-path "^1.0.0" strip-indent "^2.0.0" + +ztree@^3.5.24: + version "3.5.24" + resolved "https://registry.yarnpkg.com/ztree/-/ztree-3.5.24.tgz#b63fe52981fdf2c329675cfd2772f0d147521ff1" + integrity sha1-tj/lKYH98sMpZ1z9J3Lw0UdSH/E= + dependencies: + jquery ">=1.4.4"