diff --git a/src/components/AutoDataZTree/index.vue b/src/components/AutoDataZTree/index.vue index 73cb17fac..4a3cad684 100644 --- a/src/components/AutoDataZTree/index.vue +++ b/src/components/AutoDataZTree/index.vue @@ -37,7 +37,8 @@ export default { onRename: this.onRename.bind(this), onSelected: this.onSelected.bind(this), beforeDrop: this.beforeDrop.bind(this), - onDrop: this.onDrop.bind(this) + onDrop: this.onDrop.bind(this), + refresh: this.refresh.bind(this) // 尚未定义的函数 // beforeClick // beforeDrag @@ -214,6 +215,12 @@ export default { var node = this.zTree.getNodeByParam('id', newNode.id, parentNode) this.zTree.editName(node) }) + }, + refresh: function() { + this.$axios.post( + '/api/v1/assets/nodes/00000000-0000-0000-0000-000000000000/tasks/', + { action: 'refresh_cache' } + ) } } } diff --git a/src/components/DataZTree/components/ZTree/index.vue b/src/components/DataZTree/components/ZTree/index.vue index 1f7a2b166..6377976e7 100644 --- a/src/components/DataZTree/components/ZTree/index.vue +++ b/src/components/DataZTree/components/ZTree/index.vue @@ -18,13 +18,10 @@ import $ from '@/utils/jquery-vendor.js' import 'ztree' import '@/styles/ztree.css' -const merge = require('deepmerge') const defaultObject = { type: Object, - default: () => { - - } + default: () => {} } export default { name: 'ZTree', @@ -35,18 +32,13 @@ export default { }, data() { return { - defaultSetting: { - - }, zTree: '', rMenu: '' } }, computed: { treeSetting() { - const treeSetting = merge(this.defaultSetting, this.setting) - - return treeSetting + return this.setting } }, mounted() { @@ -60,15 +52,7 @@ export default { if (this.treeSetting.showRefresh) { this.rootNodeAddDom( this.zTree, - () => { - this.$axios.post( - '/api/v1/assets/nodes/00000000-0000-0000-0000-000000000000/tasks/', - { action: 'refresh_cache' } - ).then(res => { - this.initTree() - } - ) - } + this.treeSetting.callback.refresh ) } @@ -81,6 +65,7 @@ export default { }) }, rootNodeAddDom: function(ztree, callback) { + const vm = this var refreshIcon = "" var rootNode = ztree.getNodes()[0] if (rootNode) { @@ -94,28 +79,8 @@ export default { refreshIconRef.bind('click', function() { ztree.destroy() callback() + vm.initTree() }) - }, - setUrlParam: function(url, name, value) { - var urlArray = url.split('?') - if (urlArray.length === 1) { - url += '?' + name + '=' + value - } else { - var oriParam = urlArray[1].split('&') - var oriParamMap = {} - $.each(oriParam, function(index, value) { - var v = value.split('=') - oriParamMap[v[0]] = v[1] - }) - oriParamMap[name] = value - url = urlArray[0] + '?' - var newParam = [] - $.each(oriParamMap, function(index, value) { - newParam.push(index + '=' + value) - }) - url += newParam.join('&') - } - return url } } diff --git a/src/components/DataZTree/index.vue b/src/components/DataZTree/index.vue index 44708e80a..88ce54f17 100644 --- a/src/components/DataZTree/index.vue +++ b/src/components/DataZTree/index.vue @@ -50,7 +50,8 @@ export default { onDrag: this.defaultCallback.bind(this, 'onDrag'), beforeDrop: this.defaultCallback.bind(this, 'beforeDrop'), onDrop: this.defaultCallback.bind(this, 'onDrop'), - beforeAsync: this.defaultCallback.bind(this, 'beforeAsync') + beforeAsync: this.defaultCallback.bind(this, 'beforeAsync'), + refresh: this.defaultCallback.bind(this, 'refresh') } } }