Compare commits

..

27 Commits

Author SHA1 Message Date
youxingzhi
57be520b99 1.4.1 2019-12-29 21:25:47 +08:00
ayou
7b70e8dbf2 Merge pull request #49 from beyoursun/master
Add unit test
2019-12-29 21:01:36 +08:00
Binbin Sun
b9402076ec chore: 🤖 change lock registry to official npm 2019-12-29 20:46:21 +08:00
Binbin Sun
669e84fdc5 chore: 🤖 add snapshot testing 2019-12-29 11:23:46 +08:00
Binbin Sun
146b61e70d chore: 🤖 add unit test 2019-12-29 11:14:03 +08:00
ayou
b3e238208b Merge pull request #48 from beyoursun/master
Migrate to vue cli 3
2019-12-27 14:26:25 +08:00
Binbin Sun
4b8bbcbfde chore: 🤖 migrate to vue cli 3 2019-12-27 14:14:34 +08:00
youxingzhi
0723294c7b 1.4.0 2019-12-08 17:41:49 +08:00
youxingzhi
22988f0c81 refactor: 💡 rename the slot name 2019-12-08 17:41:41 +08:00
ayou
c46c570c30 Merge pull request #46 from Lwtsde/slot-fix
fix(slots): fixed slots in childrens
2019-12-08 17:22:13 +08:00
Lucas Wassenhoven
cfe90c7f81 fix(slots): fixed slots in childrens 2019-12-06 11:50:33 +01:00
ayou
7e0184f7f5 Merge pull request #42 from evillt-bot/master
chore(readme): format code
2019-08-30 22:07:09 +08:00
EVILLT
a78ff3f904 chore(readme): update 2019-08-30 16:56:01 +08:00
youxingzhi
cf41282fcf feat(event): add drop-before and drop-after 2019-07-17 09:54:15 +08:00
ayou
6154cfd1ad Merge pull request #37 from zymawy/patch-1
Duplicate Declaration On onClick Method
2019-06-16 10:47:35 +08:00
Hamza Ironside
51167862c9 Duplicate Declaration On onClick Method
There Were Two Methods With The Same Name
2019-06-15 05:56:21 +03:00
ayou
e38102ed71 Merge pull request #27 from iakta/feature/drop-events
Feature/drop events
2019-03-15 22:49:45 +08:00
Salvatore Giordano
d605642199 feat(events): add docs for drop and drop-up 2019-03-13 09:48:20 +01:00
Salvatore Giordano
62335d9eac feat(events): rename event using dashes 2019-03-13 09:45:25 +01:00
Salvatore Giordano
625dadcb44 feat(events): add dropBottom event 2019-03-13 09:30:13 +01:00
youxingzhi
87b8a30bfb fix(demo): change param name 2019-03-13 12:09:53 +08:00
youxingzhi
2164d032ca feat: #23 2019-03-13 12:05:34 +08:00
Salvatore Giordano
538678d916 fix(events): fix oldParent object in drop events 2019-03-12 16:29:49 +01:00
Salvatore Giordano
dd3d61ddf7 feat(events): update version 2019-03-12 16:21:58 +01:00
Salvatore Giordano
e7757b97a7 feat(events): add oldParent information in drop event 2019-03-12 16:15:18 +01:00
Salvatore Giordano
76e67c583c feat(events): emit drop and dropup events 2019-03-12 15:20:52 +01:00
youxingzhi
106708217f chore(readme): fix format 2019-02-23 11:58:16 +08:00
18 changed files with 14156 additions and 254 deletions

View File

@@ -1,10 +0,0 @@
{
"presets": ["es2015", "stage-2"],
"plugins": ["transform-runtime"],
"comments": false,
"env": {
"test": {
"plugins": [ "istanbul" ]
}
}
}

22
.gitignore vendored
View File

@@ -1,5 +1,21 @@
.DS_Store
node_modules node_modules
npm-debug.log /dist
# local env files
.env.local
.env.*.local
# Log files
npm-debug.log*
yarn-debug.log*
yarn-error.log*
# Editor directories and files
.idea .idea
coverage .vscode
package-lock.json *.suo
*.ntvs*
*.njsproj
*.sln
*.sw?

5
babel.config.js Normal file
View File

@@ -0,0 +1,5 @@
module.exports = {
presets: [
'@vue/cli-plugin-babel/preset'
]
}

View File

@@ -1,38 +0,0 @@
var path = require('path')
var projectRoot = path.resolve(__dirname, '../')
module.exports = {
module: {
loaders: [
{
test: /\.vue$/,
loader: 'vue'
},
{
test: /\.js$/,
loader: 'babel',
include: [path.join(projectRoot, 'src'), path.join(projectRoot, 'dev')],
exclude: /node_modules/
},
{
test: /\.(woff2?|eot|ttf|otf|svg)(\?.*)?$/,
loader: 'url-loader',
query: {
limit: 10000,
name: 'fonts/[name].[hash:7].[ext]'
}
}
]
},
vue: {
loaders: {
less: 'vue-style!css!less'
},
postcss: [
require('autoprefixer')({
browsers: ['iOS >= 7', 'Android >= 4.1']
})
]
}
}

View File

@@ -1,23 +0,0 @@
var webpack = require('webpack')
var merge = require('webpack-merge')
var baseConfig = require('./webpack.base.conf')
var path = require('path')
var projectRoot = path.resolve(__dirname, '../')
module.exports = merge(baseConfig, {
entry: './src/index.js',
output: {
path: path.resolve(projectRoot, 'dist'),
filename: 'vue-tree-list.min.js',
library: 'VueTreeList',
libraryTarget: 'umd'
},
plugins: [
new webpack.optimize.UglifyJsPlugin({
compress: {
warnings: false
}
})
]
})

View File

@@ -1,25 +0,0 @@
var webpack = require('webpack')
var merge = require('webpack-merge')
var HtmlWebpackPlugin = require('html-webpack-plugin')
var baseConfig = require('./webpack.base.conf')
module.exports = merge(baseConfig, {
entry: './dev/index.js',
devServer: {
historyApiFallback: true,
noInfo: true,
overlay: true,
open: true,
hot: true,
inline: true
},
devtool: '#eval-source-map',
plugins: [
new HtmlWebpackPlugin({
template: './dev/index.html',
filename: 'index.html',
inject: true
}),
new webpack.HotModuleReplacementPlugin()
]
})

View File

@@ -6,14 +6,19 @@
@change-name="onChangeName" @change-name="onChangeName"
@delete-node="onDel" @delete-node="onDel"
@add-node="onAddNode" @add-node="onAddNode"
@drop="drop"
@drop-before="dropBefore"
@drop-after="dropAfter"
:model="data" :model="data"
default-tree-node-name="new node" default-tree-node-name="new node"
default-leaf-node-name="new leaf" default-leaf-node-name="new leaf"
v-bind:default-expanded="false"> v-bind:default-expanded="false">
<span class="icon" slot="addTreeNode">addTreeNode</span> <span class="icon" slot="addTreeNodeIcon">📂</span>
<span class="icon" slot="addLeafNode">addLeafNode</span> <span class="icon" slot="addLeafNodeIcon"></span>
<span class="icon" slot="editNode">editNode</span> <span class="icon" slot="editNodeIcon">📃</span>
<span class="icon" slot="delNode">delNode</span> <span class="icon" slot="delNodeIcon"></span>
<span class="icon" slot="leafNodeIcon">🍃</span>
<span class="icon" slot="treeNodeIcon">🌲</span>
</vue-tree-list> </vue-tree-list>
<button @click="getNewTree">Get new tree</button> <button @click="getNewTree">Get new tree</button>
<pre> <pre>
@@ -64,8 +69,8 @@
} }
}, },
methods: { methods: {
onDel (params) { onDel (node) {
console.log(params) console.log(node)
node.remove() node.remove()
}, },
@@ -81,6 +86,18 @@
console.log(params) console.log(params)
}, },
drop: function ({node, src, target}) {
console.log('drop', node, src, target)
},
dropBefore: function ({node, src, target}) {
console.log('drop-before', node, src, target)
},
dropAfter: function ({node, src, target}) {
console.log('drop-after', node, src, target)
},
addNode () { addNode () {
var node = new TreeNode({ name: 'new node', isLeaf: false }) var node = new TreeNode({ name: 'new node', isLeaf: false })
if (!this.data.children) this.data.children = [] if (!this.data.children) this.data.children = []
@@ -108,10 +125,6 @@
} }
vm.newTree = _dfs(vm.data) vm.newTree = _dfs(vm.data)
},
onClick(model) {
console.log(model)
} }
} }
} }

View File

@@ -1,11 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta name="viewport" content="with=device-width,initial-scale=1.0,
maximum-scale=1.0,minimum-scale=1.0,uses-scalable=no">
<title>vue-tree-list</title>
</head>
<body>
<div id="app"></div>
</body>
</html>

File diff suppressed because one or more lines are too long

4
jest.config.js Normal file
View File

@@ -0,0 +1,4 @@
module.exports = {
preset: "@vue/cli-plugin-unit-jest",
snapshotSerializers: ["jest-serializer-vue"]
};

13806
package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -1,68 +1,77 @@
{ {
"name": "vue-tree-list", "name": "vue-tree-list",
"version": "1.3.0", "version": "1.4.1",
"description": "A vue component for tree structure. Support adding treenode/leafnode, editing node's name and dragging.", "description": "A vue component for tree structure. Support adding treenode/leafnode, editing node's name and dragging.",
"main": "dist/vue-tree-list.min.js",
"scripts": {
"commit": "npx git-cz",
"standard": "standard",
"test": "karma start --single-run",
"unit": "karma start --watch",
"coveralls": "npm run test -- --report lcovonly && cat ./coverage/lcov.info | coveralls",
"build": "webpack --config build/webpack.build.conf.js",
"dev": "webpack-dev-server --config build/webpack.dev.conf.js",
"prepublishOnly": "npm run build"
},
"repository": {
"type": "git",
"url": "git+https://github.com/ParadeTo/vue-tree-list.git"
},
"keywords": [
"vue",
"tree"
],
"author": "ayou", "author": "ayou",
"license": "ISC", "scripts": {
"serve": "vue-cli-service serve dev",
"build": "vue-cli-service build --target lib src/index.js",
"test:unit": "vue-cli-service test:unit",
"lint": "vue-cli-service lint",
"commit": "npx git-cz",
"prepublish": "npm run build"
},
"main": "dist/vue-tree-list.umd.min.js",
"dependencies": {
"core-js": "^3.4.3",
"vue": "^2.6.10"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^4.1.0",
"@vue/cli-plugin-eslint": "^4.1.0",
"@vue/cli-plugin-unit-jest": "^4.1.1",
"@vue/cli-service": "^4.1.0",
"@vue/test-utils": "1.0.0-beta.29",
"babel-eslint": "^10.0.3",
"eslint": "^5.16.0",
"eslint-plugin-vue": "^5.0.0",
"jest-serializer-vue": "^2.0.2",
"less": "^3.10.3",
"less-loader": "^5.0.0",
"vue-template-compiler": "^2.6.10"
},
"eslintConfig": {
"root": true,
"env": {
"node": true
},
"extends": [
"plugin:vue/essential",
"eslint:recommended"
],
"rules": {
"no-console": "warn"
},
"parserOptions": {
"parser": "babel-eslint"
},
"overrides": [
{
"files": [
"**/__tests__/*.{j,t}s?(x)",
"**/tests/unit/**/*.spec.{j,t}s?(x)"
],
"env": {
"jest": true
}
}
]
},
"browserslist": [
"> 1%",
"last 2 versions"
],
"bugs": { "bugs": {
"url": "https://github.com/ParadeTo/vue-tree-list/issues" "url": "https://github.com/ParadeTo/vue-tree-list/issues"
}, },
"homepage": "https://github.com/ParadeTo/vue-tree-list#readme", "homepage": "https://github.com/ParadeTo/vue-tree-list#readme",
"devDependencies": { "keywords": [
"@commitlint/cli": "^7.2.1", "vue",
"@commitlint/config-conventional": "^7.1.2", "tree"
"autoprefixer": "^6.4.0", ],
"babel-core": "^6.0.0", "license": "ISC",
"babel-eslint": "^7.0.0", "repository": {
"babel-loader": "^6.0.0", "type": "git",
"babel-plugin-istanbul": "^3.0.0", "url": "git+https://github.com/ParadeTo/vue-tree-list.git"
"babel-plugin-transform-runtime": "^6.0.0",
"babel-preset-es2015": "^6.0.0",
"babel-preset-stage-2": "^6.0.0",
"babel-register": "^6.0.0",
"chai": "^3.5.0",
"cross-env": "^5.0.1",
"css-loader": "^0.26.2",
"file-loader": "^0.10.1",
"html-webpack-plugin": "^2.8.1",
"husky": "^1.2.0",
"isparta": "^4.0.0",
"isparta-loader": "^2.0.0",
"less": "^2.7.2",
"less-loader": "^2.2.3",
"sinon": "^2.3.5",
"sinon-chai": "^2.11.0",
"sourcemap": "^0.1.0",
"standard": "^12.0.1",
"url-loader": "^0.5.7",
"vue": "^2.6.6",
"vue-loader": "^11.1.3",
"vue-style-loader": "^2.0.3",
"vue-template-compiler": "^2.6.6",
"webpack": "^1.13.2",
"webpack-dev-server": "1.14.0",
"webpack-merge": "^0.14.1"
},
"dependencies": {
"cz-conventional-changelog": "^2.1.0"
} }
} }

17
public/index.html Normal file
View File

@@ -0,0 +1,17 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title>vue-tree-list</title>
</head>
<body>
<noscript>
<strong>We're sorry but vue-tree-list doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
</noscript>
<div id="app"></div>
<!-- built files will be auto injected -->
</body>
</html>

View File

@@ -8,30 +8,33 @@ A vue component for tree structure. Support adding treenode/leafnode, editing no
# use # use
``npm install vue-tree-list`` ``npm install vue-tree-list``
```javascript ```html
<template> <template>
<div> <div>
<button @click="addNode">Add Node</button> <button @click="addNode">Add Node</button>
<vue-tree-list <vue-tree-list
@click="onClick" @click="onClick"
@change-name="onChangeName" @change-name="onChangeName"
@delete-node="onDel" @delete-node="onDel"
@add-node="onAddNode" @add-node="onAddNode"
:model="data" :model="data"
default-tree-node-name="new node" default-tree-node-name="new node"
default-leaf-node-name="new leaf" default-leaf-node-name="new leaf"
v-bind:default-expanded="false"> v-bind:default-expanded="false">
<span class="icon" slot="addTreeNode">addTreeNode</span> <span class="icon" slot="addTreeNodeIcon">📂</span>
<span class="icon" slot="addLeafNode">addLeafNode</span> <span class="icon" slot="addLeafNodeIcon"></span>
<span class="icon" slot="editNode">editNode</span> <span class="icon" slot="editNodeIcon">📃</span>
<span class="icon" slot="delNode">delNode</span> <span class="icon" slot="delNodeIcon">✂️</span>
</vue-tree-list> <span class="icon" slot="leafNodeIcon">🍃</span>
<button @click="getNewTree">Get new tree</button> <span class="icon" slot="treeNodeIcon">🌲</span>
<pre> </vue-tree-list>
{{newTree}} <button @click="getNewTree">Get new tree</button>
</pre> <pre>
</div> {{newTree}}
</pre>
</div>
</template> </template>
<script> <script>
import { VueTreeList, Tree, TreeNode } from 'vue-tree-list' import { VueTreeList, Tree, TreeNode } from 'vue-tree-list'
export default { export default {
@@ -121,12 +124,10 @@ A vue component for tree structure. Support adding treenode/leafnode, editing no
vm.newTree = _dfs(vm.data) vm.newTree = _dfs(vm.data)
}, },
onClick(model) {
console.log(model)
}
} }
} }
</script> </script>
<style lang="less" rel="stylesheet/less"> <style lang="less" rel="stylesheet/less">
.vtl { .vtl {
.vtl-drag-disabled { .vtl-drag-disabled {
@@ -186,18 +187,23 @@ insertAfter | target: TreeNode | Move node after another node
# events # events
| name | params | description | | name | params | description |
|:-----:|:-------:|:------------:|:----:| |:-----:|:-------:|:----:|
click | TreeNode | Trigger when clicking a tree node click | TreeNode | Trigger when clicking a tree node
change-name | {'id', 'oldName', 'newName'} | Trigger after changing a node's name change-name | {'id', 'oldName', 'newName'} | Trigger after changing a node's name
delete-node | TreeNode | Trigger when clicking `delNode` button. You can call `remove` of `TreeNode` to remove the node. delete-node | TreeNode | Trigger when clicking `delNode` button. You can call `remove` of `TreeNode` to remove the node.
add-node | TreeNode | Trigger after adding a new node add-node | TreeNode | Trigger after adding a new node
drop | {node, src, target} | Trigger after dropping a node into another. node: the draggable node, src: the draggable node's parent, target: the node that draggable node will drop into
drop-before | {node, src, target} | Trigger after dropping a node before another. node: the draggable node, src: the draggable node's parent, target: the node that draggable node will drop before
drop-after | {node, src, target} | Trigger after dropping a node after another. node: the draggable node, src: the draggable node's parent, target: the node that draggable node will drop after
# customize operation icons # customize operation icons
The component has default icons for `addTreeNode`, `addLeafNode`, `editNode`, `delNode` button, but you can also customize them: The component has default icons for `addTreeNodeIcon`, `addLeafNodeIcon`, `editNodeIcon`, `delNodeIcon`, `leafNodeIcon`, `treeNodeIcon` button, but you can also customize them:
```html ```html
<span class="icon" slot="addTreeNode">addTreeNode</span> <span class="icon" slot="addTreeNodeIcon">📂</span>
<span class="icon" slot="addLeafNode">addLeafNode</span> <span class="icon" slot="addLeafNodeIcon"></span>
<span class="icon" slot="editNode">editNode</span> <span class="icon" slot="editNodeIcon">📃</span>
<span class="icon" slot="delNode">delNode</span> <span class="icon" slot="delNodeIcon">✂️</span>
<span class="icon" slot="leafNodeIcon">🍃</span>
<span class="icon" slot="treeNodeIcon">🌲</span>
``` ```

View File

@@ -2,7 +2,7 @@
<div class='vtl'> <div class='vtl'>
<div v-if="model.name !== 'root'"> <div v-if="model.name !== 'root'">
<div class="vtl-border vtl-up" :class="{'vtl-active': isDragEnterUp}" <div class="vtl-border vtl-up" :class="{'vtl-active': isDragEnterUp}"
@drop="dropUp" @drop="dropBefore"
@dragenter="dragEnterUp" @dragenter="dragEnterUp"
@dragover='dragOverUp' @dragover='dragOverUp'
@dragleave="dragLeaveUp"></div> @dragleave="dragLeaveUp"></div>
@@ -38,22 +38,22 @@
<input v-else class="vtl-input" type="text" ref="nodeInput" :value="model.name" @input="updateName" @blur="setUnEditable"> <input v-else class="vtl-input" type="text" ref="nodeInput" :value="model.name" @input="updateName" @blur="setUnEditable">
<div class="vtl-operation" v-show="isHover"> <div class="vtl-operation" v-show="isHover">
<span title="add tree node" @click.stop.prevent="addChild(false)" v-if="!model.isLeaf && !model.addTreeNodeDisabled"> <span title="add tree node" @click.stop.prevent="addChild(false)" v-if="!model.isLeaf && !model.addTreeNodeDisabled">
<slot name="addTreeNode"> <slot name="addTreeNodeIcon">
<i class="vtl-icon vtl-icon-folder-plus-e"></i> <i class="vtl-icon vtl-icon-folder-plus-e"></i>
</slot> </slot>
</span> </span>
<span title="add leaf node" @click.stop.prevent="addChild(true)" v-if="!model.isLeaf && !model.addLeafNodeDisabled"> <span title="add leaf node" @click.stop.prevent="addChild(true)" v-if="!model.isLeaf && !model.addLeafNodeDisabled">
<slot name="addLeafNode"> <slot name="addLeafNodeIcon">
<i class="vtl-icon vtl-icon-plus"></i> <i class="vtl-icon vtl-icon-plus"></i>
</slot> </slot>
</span> </span>
<span title="edit" @click.stop.prevent="setEditable" v-if="!model.editNodeDisabled"> <span title="edit" @click.stop.prevent="setEditable" v-if="!model.editNodeDisabled">
<slot name="editNode"> <slot name="editNodeIcon">
<i class="vtl-icon vtl-icon-edit"></i> <i class="vtl-icon vtl-icon-edit"></i>
</slot> </slot>
</span> </span>
<span title="delete" @click.stop.prevent="delNode" v-if="!model.delNodeDisabled"> <span title="delete" @click.stop.prevent="delNode" v-if="!model.delNodeDisabled">
<slot name="delNode"> <slot name="delNodeIcon">
<i class="vtl-icon vtl-icon-trash"></i> <i class="vtl-icon vtl-icon-trash"></i>
</slot> </slot>
</span> </span>
@@ -63,7 +63,7 @@
<div v-if="model.children && model.children.length > 0 && expanded" <div v-if="model.children && model.children.length > 0 && expanded"
class="vtl-border vtl-bottom" class="vtl-border vtl-bottom"
:class="{'vtl-active': isDragEnterBottom}" :class="{'vtl-active': isDragEnterBottom}"
@drop="dropBottom" @drop="dropAfter"
@dragenter="dragEnterBottom" @dragenter="dragEnterBottom"
@dragover='dragOverBottom' @dragover='dragOverBottom'
@dragleave="dragLeaveBottom"></div> @dragleave="dragLeaveBottom"></div>
@@ -76,20 +76,22 @@
v-bind:default-expanded="defaultExpanded" v-bind:default-expanded="defaultExpanded"
:model="model" :model="model"
:key='model.id'> :key='model.id'>
<slot name="addTreeNode" slot="addTreeNode" /> <slot name="addTreeNodeIcon" slot="addTreeNodeIcon" />
<slot name="addLeafNode" slot="addLeafNode" /> <slot name="addLeafNodeIcon" slot="addLeafNodeIcon" />
<slot name="editNode" slot="editNode" /> <slot name="editNodeIcon" slot="editNodeIcon" />
<slot name="delNode" slot="delNode" /> <slot name="delNodeIcon" slot="delNodeIcon" />
<slot name="leafNodeIcon" slot="leafNodeIcon" />
<slot name="treeNodeIcon" slot="treeNodeIcon" />
</item> </item>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import { Tree, TreeNode } from './Tree.js' import { TreeNode } from './Tree.js'
import { addHandler, removeHandler } from './tools.js' import { addHandler, removeHandler } from './tools.js'
let fromComp = null let compInOperation = null
export default { export default {
data: function () { data: function () {
@@ -150,6 +152,9 @@
} }
} }
}, },
beforeCreate () {
this.$options.components.item = require('./VueTreeList').default
},
mounted () { mounted () {
const vm = this const vm = this
addHandler(window, 'keyup', function (e) { addHandler(window, 'keyup', function (e) {
@@ -178,8 +183,9 @@
setEditable () { setEditable () {
this.editable = true this.editable = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.nodeInput.focus() const $input = this.$refs.nodeInput
// fireFocusEvent(this.$refs.nodeInput) $input.focus()
$input.setSelectionRange(0, $input.value.length)
}) })
}, },
@@ -193,12 +199,12 @@
} }
}, },
mouseOver(e) { mouseOver() {
if (this.model.disabled) return if (this.model.disabled) return
this.isHover = true this.isHover = true
}, },
mouseOut(e) { mouseOut() {
this.isHover = false this.isHover = false
}, },
@@ -218,7 +224,7 @@
dragStart(e) { dragStart(e) {
if (!(this.model.dragDisabled || this.model.disabled)) { if (!(this.model.dragDisabled || this.model.disabled)) {
fromComp = this compInOperation = this
// for firefox // for firefox
e.dataTransfer.setData("data","data"); e.dataTransfer.setData("data","data");
e.dataTransfer.effectAllowed = 'move' e.dataTransfer.effectAllowed = 'move'
@@ -226,29 +232,32 @@
} }
return false return false
}, },
dragEnd(e) { dragEnd() {
fromComp = null compInOperation = null
}, },
dragOver(e) { dragOver(e) {
e.preventDefault() e.preventDefault()
return true return true
}, },
dragEnter(e) { dragEnter() {
if (!fromComp) return if (!compInOperation) return
if (this.model.isLeaf) return if (this.model.isLeaf) return
this.isDragEnterNode = true this.isDragEnterNode = true
}, },
dragLeave(e) { dragLeave() {
this.isDragEnterNode = false this.isDragEnterNode = false
}, },
drop(e) { drop() {
if (!fromComp) return if (!compInOperation) return
fromComp.model.moveInto(this.model) const oldParent = compInOperation.model.parent;
compInOperation.model.moveInto(this.model)
this.isDragEnterNode = false this.isDragEnterNode = false
var node = this.getRootNode();
node.$emit('drop', {target: this.model, node: compInOperation.model, src: oldParent})
}, },
dragEnterUp () { dragEnterUp () {
if (!fromComp) return if (!compInOperation) return
this.isDragEnterUp = true this.isDragEnterUp = true
}, },
dragOverUp (e) { dragOverUp (e) {
@@ -256,17 +265,20 @@
return true return true
}, },
dragLeaveUp () { dragLeaveUp () {
if (!fromComp) return if (!compInOperation) return
this.isDragEnterUp = false this.isDragEnterUp = false
}, },
dropUp () { dropBefore () {
if (!fromComp) return if (!compInOperation) return
fromComp.model.insertBefore(this.model) const oldParent = compInOperation.model.parent;
compInOperation.model.insertBefore(this.model)
this.isDragEnterUp = false this.isDragEnterUp = false
var node = this.getRootNode();
node.$emit('drop-before', {target: this.model, node: compInOperation.model, src: oldParent})
}, },
dragEnterBottom () { dragEnterBottom () {
if (!fromComp) return if (!compInOperation) return
this.isDragEnterBottom = true this.isDragEnterBottom = true
}, },
dragOverBottom (e) { dragOverBottom (e) {
@@ -274,13 +286,16 @@
return true return true
}, },
dragLeaveBottom () { dragLeaveBottom () {
if (!fromComp) return if (!compInOperation) return
this.isDragEnterBottom = false this.isDragEnterBottom = false
}, },
dropBottom () { dropAfter () {
if (!fromComp) return if (!compInOperation) return
fromComp.model.insertAfter(this.model) const oldParent = compInOperation.model.parent;
compInOperation.model.insertAfter(this.model)
this.isDragEnterBottom = false this.isDragEnterBottom = false
var node = this.getRootNode();
node.$emit('drop-after', {target: this.model, node: compInOperation.model, src: oldParent})
}, },
getRootNode() { getRootNode() {
var node = this.$parent var node = this.$parent
@@ -289,9 +304,6 @@
} }
return node; return node;
} }
},
beforeCreate () {
this.$options.components.item = require('./VueTreeList.vue')
} }
} }
</script> </script>

View File

@@ -1,7 +1,8 @@
/** /**
* Created by ayou on 17/7/21. * Created by ayou on 17/7/21.
*/ */
exports.VueTreeList = require('./VueTreeList.vue')
exports.TreeNode = require('./Tree.js').TreeNode import VueTreeList from "./VueTreeList";
exports.Tree = require('./Tree.js').Tree import { Tree, TreeNode } from "./Tree";
// exports.Record = require('./Tree.js').Record
export { Tree, TreeNode, VueTreeList };

View File

@@ -0,0 +1,72 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`VueTreeList renders correctly 1`] = `
<div class="vtl">
<!---->
<div class="">
<div class="vtl">
<div>
<div class="vtl-border vtl-up"></div>
<div id="1" draggable="false" class="vtl-tree-node vtl-drag-disabled"><span class="vtl-caret vtl-is-small"><i class="vtl-icon vtl-icon-caret-right"></i></span> <span><i class="vtl-icon vtl-menu-icon vtl-icon-folder"></i></span>
<div class="vtl-node-content">
Node 1
</div>
<div class="vtl-operation" style="display: none;">
<!---->
<!---->
<!---->
<!---->
</div>
</div>
<!---->
</div>
<div class="vtl-tree-margin" style="display: none;">
<div class="vtl">
<div>
<div class="vtl-border vtl-up"></div>
<div id="2" draggable="true" class="vtl-tree-node">
<!----> <span><i class="vtl-icon vtl-menu-icon vtl-icon-file"></i></span>
<div class="vtl-node-content">
Node 1-2
</div>
<div class="vtl-operation" style="display: none;">
<!---->
<!----> <span title="edit"><i class="vtl-icon vtl-icon-edit"></i></span> <span title="delete"><i class="vtl-icon vtl-icon-trash"></i></span></div>
</div>
<!---->
</div>
<!---->
</div>
</div>
</div>
<div class="vtl">
<div>
<div class="vtl-border vtl-up"></div>
<div id="3" draggable="true" class="vtl-tree-node vtl-disabled">
<!----> <span><i class="vtl-icon vtl-menu-icon vtl-icon-folder"></i></span>
<div class="vtl-node-content">
Node 2
</div>
<div class="vtl-operation" style="display: none;"><span title="add tree node"><i class="vtl-icon vtl-icon-folder-plus-e"></i></span> <span title="add leaf node"><i class="vtl-icon vtl-icon-plus"></i></span> <span title="edit"><i class="vtl-icon vtl-icon-edit"></i></span> <span title="delete"><i class="vtl-icon vtl-icon-trash"></i></span></div>
</div>
<!---->
</div>
<!---->
</div>
<div class="vtl">
<div>
<div class="vtl-border vtl-up"></div>
<div id="4" draggable="true" class="vtl-tree-node">
<!----> <span><i class="vtl-icon vtl-menu-icon vtl-icon-folder"></i></span>
<div class="vtl-node-content">
Node 3
</div>
<div class="vtl-operation" style="display: none;"><span title="add tree node"><i class="vtl-icon vtl-icon-folder-plus-e"></i></span> <span title="add leaf node"><i class="vtl-icon vtl-icon-plus"></i></span> <span title="edit"><i class="vtl-icon vtl-icon-edit"></i></span> <span title="delete"><i class="vtl-icon vtl-icon-trash"></i></span></div>
</div>
<!---->
</div>
<!---->
</div>
</div>
</div>
`;

View File

@@ -0,0 +1,49 @@
import { mount } from "@vue/test-utils";
import { Tree, VueTreeList } from "@/index";
describe("VueTreeList", () => {
it("renders correctly", () => {
const tree = new Tree([
{
name: "Node 1",
id: 1,
pid: 0,
dragDisabled: true,
addTreeNodeDisabled: true,
addLeafNodeDisabled: true,
editNodeDisabled: true,
delNodeDisabled: true,
children: [
{
name: "Node 1-2",
id: 2,
isLeaf: true,
pid: 1
}
]
},
{
name: "Node 2",
id: 3,
pid: 0,
disabled: true
},
{
name: "Node 3",
id: 4,
pid: 0
}
]);
const wrapper = mount(VueTreeList, {
propsData: {
model: tree,
defaultTreeNodeName: "new node",
defaultLeafNodeName: "new leaf",
defaultExpanded: false
}
});
expect(wrapper).toMatchSnapshot();
});
});