Compare commits

...

5 Commits
1.0.5 ... 1.0.8

Author SHA1 Message Date
youxingzhi
a7b717334c 1.0.8 2018-03-09 17:22:33 +08:00
youxingzhi
f6de5a2be8 1.0.7 2018-03-09 17:20:09 +08:00
ayou
2367a7d1e6 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	readme.md
2018-03-07 22:03:26 +08:00
ayou
01eca7d2a3 add dev mode, update readme 2018-03-07 22:03:07 +08:00
ayou
2f1205ae02 Update readme.md 2018-03-07 21:39:46 +08:00
10 changed files with 231 additions and 99 deletions

View File

@@ -9,4 +9,4 @@ test
.babelrc .babelrc
.travis.yml .travis.yml
karma.conf.js karma.conf.js
webpack.config.js build

View File

@@ -1,14 +1,9 @@
var webpack = require('webpack'); var webpack = require('webpack');
var path = require('path'); var path = require('path');
var projectRoot = path.resolve(__dirname, '../')
module.exports = { module.exports = {
entry: './src/index.js',
output: {
path: path.resolve(__dirname, 'dist'),
filename: 'vue-tree-list.min.js',
library: 'VueTreeList',
libraryTarget: 'umd'
},
module: { module: {
loaders: [ loaders: [
{ {
@@ -18,7 +13,7 @@ module.exports = {
{ {
test: /\.js$/, test: /\.js$/,
loader: 'babel', loader: 'babel',
include: [path.join(__dirname, 'src')], include: [path.join(projectRoot, 'src'), path.join(projectRoot, 'dev')],
exclude: /node_modules/ exclude: /node_modules/
}, },
{ {
@@ -40,12 +35,5 @@ module.exports = {
browsers: ['iOS >= 7', 'Android >= 4.1'] browsers: ['iOS >= 7', 'Android >= 4.1']
}) })
] ]
}, }
plugins: [
new webpack.optimize.UglifyJsPlugin({
compress: {
warnings: false
}
})
]
} }

View File

@@ -0,0 +1,23 @@
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
}
})
]
})

28
build/webpack.dev.conf.js Normal file
View File

@@ -0,0 +1,28 @@
var webpack = require('webpack')
var merge = require('webpack-merge')
var HtmlWebpackPlugin = require('html-webpack-plugin')
var baseConfig = require('./webpack.base.conf')
var path = require('path')
var projectRoot = path.resolve(__dirname, '../')
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()
]
})

84
dev/App.vue Normal file
View File

@@ -0,0 +1,84 @@
<template>
<div>
<button @click="addNode">Add Node</button>
<vue-tree-list @click="onClick" :model="data" default-tree-node-name="new node" default-leaf-node-name="new leaf"></vue-tree-list>
<button @click="getNewTree">Get new tree</button>
<pre>
{{newTree}}
</pre>
</div>
</template>
<script>
import { VueTreeList, Tree, TreeNode } from '../dist/vue-tree-list.min'
export default {
components: {
VueTreeList
},
data () {
return {
newTree: {},
data: new Tree([
{
name: 'Node 1',
id: 1,
pid: 0,
dragDisabled: true,
children: [
{
name: 'Node 1-2',
id: 2,
isLeaf: true,
pid: 1
}
]
},
{
name: 'Node 2',
id: 3,
pid: 0,
dragDisabled: true
},
{
name: 'Node 3',
id: 4,
pid: 0
}
])
}
},
methods: {
addNode: function () {
var node = new TreeNode({ name: 'new node', isLeaf: false })
if (!this.data.children) this.data.children = []
this.data.addChildren(node)
},
getNewTree: function () {
var vm = this
function _dfs (oldNode) {
var newNode = {}
for (var k in oldNode) {
if (k !== 'children' && k !== 'parent') {
newNode[k] = oldNode[k]
}
}
if (oldNode.children && oldNode.children.length > 0) {
newNode.children = []
for (var i = 0, len = oldNode.children.length; i < len; i++) {
newNode.children.push(_dfs(oldNode.children[i]))
}
}
return newNode
}
vm.newTree = _dfs(vm.data)
},
onClick(model) {
console.log(model)
}
}
}
</script>

11
dev/index.html Normal file
View File

@@ -0,0 +1,11 @@
<!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-date-range</title>
</head>
<body>
<div id="app"></div>
</body>
</html>

9
dev/index.js Normal file
View File

@@ -0,0 +1,9 @@
/**
* Created by ayou on 18/3/7.
*/
import Vue from 'vue'
import App from './App.vue'
new Vue({
render: h => h(App)
}).$mount('#app')

File diff suppressed because one or more lines are too long

View File

@@ -1,13 +1,14 @@
{ {
"name": "vue-tree-list", "name": "vue-tree-list",
"version": "1.0.5", "version": "1.0.8",
"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", "main": "dist/vue-tree-list.min.js",
"scripts": { "scripts": {
"test": "karma start --single-run", "test": "karma start --single-run",
"unit": "karma start --watch", "unit": "karma start --watch",
"coveralls": "npm run test -- --report lcovonly && cat ./coverage/lcov.info | coveralls", "coveralls": "npm run test -- --report lcovonly && cat ./coverage/lcov.info | coveralls",
"build": "webpack" "build": "webpack --config build/webpack.build.conf.js",
"dev": "webpack-dev-server --config build/webpack.dev.conf.js"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
@@ -39,17 +40,8 @@
"file-loader": "^0.10.1", "file-loader": "^0.10.1",
"isparta": "^4.0.0", "isparta": "^4.0.0",
"isparta-loader": "^2.0.0", "isparta-loader": "^2.0.0",
"karma": "^1.7.0",
"karma-coverage": "^1.1.1",
"karma-coveralls": "^1.1.2",
"karma-mocha": "^1.3.0",
"karma-phantomjs-launcher": "^1.0.4",
"karma-sinon-chai": "^1.3.1",
"karma-webpack": "^2.0.3",
"less": "^2.7.2", "less": "^2.7.2",
"less-loader": "^2.2.3", "less-loader": "^2.2.3",
"mocha": "^3.4.2",
"phantomjs-prebuilt": "^2.1.14",
"sinon": "^2.3.5", "sinon": "^2.3.5",
"sinon-chai": "^2.11.0", "sinon-chai": "^2.11.0",
"sourcemap": "^0.1.0", "sourcemap": "^0.1.0",
@@ -58,6 +50,9 @@
"vue-loader": "^11.1.3", "vue-loader": "^11.1.3",
"vue-style-loader": "^2.0.3", "vue-style-loader": "^2.0.3",
"vue-template-compiler": "^2.2.0", "vue-template-compiler": "^2.2.0",
"webpack": "^1.13.2" "webpack": "^1.13.2",
"webpack-dev-server": "1.14.0",
"webpack-merge": "^0.14.1",
"html-webpack-plugin": "^2.8.1"
} }
} }

132
readme.md
View File

@@ -16,83 +16,77 @@ A vue component for tree structure. Support adding treenode/leafnode, editing no
{{newTree}} {{newTree}}
</pre> </pre>
... ...
import { VueTreeList, Tree, TreeNode } from 'vue-tree-list' import { VueTreeList, Tree, TreeNode } from '../src'
export default { export default {
components: { components: {
VueTreeList VueTreeList
}, },
data () { data () {
return { return {
isMobile: isMobile(), newTree: {},
record: null, data: new Tree([
newTree: {}, {
data: new VueTreeList.Tree([ name: 'Node 1',
{ id: 1,
name: 'Node 1', pid: 0,
id: 1, dragDisabled: true,
pid: 0, children: [
dragDisabled: true, {
children: [ name: 'Node 1-2',
{ id: 2,
name: 'Node 1-2', isLeaf: true,
id: 2, pid: 1
isLeaf: true,
pid: 1
}
]
},
{
name: 'Node 2',
id: 3,
pid: 0,
dragDisabled: true
},
{
name: 'Node 3',
id: 4,
pid: 0
}
])
}
},
methods: {
getTreeChange: function () {
this.record = Object.assign({}, VueTreeList.Record)
},
addNode: function () {
var node = new VueTreeList.TreeNode({ name: 'new node', isLeaf: false })
if (!this.data.children) this.data.children = []
this.data.addChildren(node)
},
getNewTree: function () {
var vm = this
function _dfs (oldNode) {
var newNode = {}
for (var k in oldNode) {
if (k !== 'children' && k !== 'parent') {
newNode[k] = oldNode[k]
} }
} ]
},
{
name: 'Node 2',
id: 3,
pid: 0,
dragDisabled: true
},
{
name: 'Node 3',
id: 4,
pid: 0
}
])
}
},
methods: {
addNode: function () {
var node = new TreeNode({ name: 'new node', isLeaf: false })
if (!this.data.children) this.data.children = []
this.data.addChildren(node)
},
if (oldNode.children && oldNode.children.length > 0) { getNewTree: function () {
newNode.children = [] var vm = this
for (var i = 0, len = oldNode.children.length; i < len; i++) { function _dfs (oldNode) {
newNode.children.push(_dfs(oldNode.children[i])) var newNode = {}
}
for (var k in oldNode) {
if (k !== 'children' && k !== 'parent') {
newNode[k] = oldNode[k]
} }
return newNode
} }
vm.newTree = _dfs(vm.data) if (oldNode.children && oldNode.children.length > 0) {
}, newNode.children = []
for (var i = 0, len = oldNode.children.length; i < len; i++) {
onClick(model) { newNode.children.push(_dfs(oldNode.children[i]))
console.log(model) }
}
return newNode
} }
vm.newTree = _dfs(vm.data)
},
onClick(model) {
console.log(model)
} }
}
} }
``` ```