chore(version): 1.1.2

refactor: change event name
Merge pull request #20 from energiehund/feature/events-for-node-operations
2019-02-15 09:43:24 +08:00 · 2019-02-15 09:41:53 +08:00 · 2019-02-15 09:23:25 +08:00 · 2019-02-13 17:14:53 +08:00 · 2019-01-03 09:56:25 +08:00 · 2019-01-03 09:55:27 +08:00
15 changed files with 151 additions and 58 deletions
--- a/.commitlintrc.yml
+++ b/.commitlintrc.yml
@@ -0,0 +1,2 @@
 extends:
  - "@commitlint/config-conventional"
--- a/.czrc
+++ b/.czrc
@@ -0,0 +1,3 @@
 {
  "path": "cz-conventional-changelog"
 }
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ node_modules
 npm-debug.log
 .idea
 coverage
 package-lock.json
--- a/.huskyrc.yml
+++ b/.huskyrc.yml
@@ -0,0 +1,4 @@
 hooks:
  pre-commit:
    - npm run standard
  commit-msg: commitlint -E HUSKY_GIT_PARAMS
--- a/build/webpack.base.conf.js
+++ b/build/webpack.base.conf.js
@@ -1,5 +1,4 @@
-var webpack = require('webpack');
+var path = require('path')
 var path = require('path');
 var projectRoot = path.resolve(__dirname, '../')
--- a/build/webpack.dev.conf.js
+++ b/build/webpack.dev.conf.js
@@ -2,9 +2,6 @@ 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',
--- a/dev/App.vue
+++ b/dev/App.vue
@@ -1,7 +1,16 @@
 <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>
+        <vue-tree-list
          @click="onClick"
          @change-name="onChange"
          @delete-node="onChange"
          @add-node="onChange"
          :model="data"
          default-tree-node-name="new node"
          default-leaf-node-name="new leaf"
          v-bind:default-expanded="false">
        </vue-tree-list>
        <button @click="getNewTree">Get new tree</button>
        <pre>
          {{newTree}}
@@ -47,13 +56,17 @@
      }
    },
    methods: {
-      addNode: function () {
+      onChange (data) {
        console.log(data)
      },
      addNode () {
        var node = new TreeNode({ name: 'new node', isLeaf: false })
        if (!this.data.children) this.data.children = []
        this.data.addChildren(node)
      },
-      getNewTree: function () {
+      getNewTree () {
        var vm = this
        function _dfs (oldNode) {
          var newNode = {}
--- a/dist/vue-tree-list.min.js
+++ b/dist/vue-tree-list.min.js
--- a/examples/demo1.html
+++ b/examples/demo1.html
@@ -59,6 +59,27 @@
            }
        }
        .vtl .vtl-drag-disabled, .vtl .vtl-drag-disabled:hover {
          background-color: #dbd7d7;
          position: relative;
        }
        .vtl .vtl-drag-disabled::after, .vtl .vtl-disabled::after {
          content: 'drag disabled';
          position: absolute;
          right: 10px;
          font-size: 12px;
          font-style: italic;
        }
        .vtl .vtl-disabled, .vtl .vtl-disabled:hover {
          background-color: red;
          position: relative;
        }
        .vtl .vtl-disabled::after {
          content: 'disabled';
        }
    </style>
 </head>
 <body>
@@ -141,7 +162,7 @@
            name: 'Node 2',
            id: 3,
            pid: 0,
-            dragDisabled: true
+            disabled: true
          },
          {
            name: 'Node 3',
--- a/package.json
+++ b/package.json
@@ -1,9 +1,11 @@
 {
  "name": "vue-tree-list",
-  "version": "1.1.0",
+  "version": "1.1.2",
  "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",
@@ -26,6 +28,8 @@
  },
  "homepage": "https://github.com/ParadeTo/vue-tree-list#readme",
  "devDependencies": {
    "@commitlint/cli": "^7.2.1",
    "@commitlint/config-conventional": "^7.1.2",
    "autoprefixer": "^6.4.0",
    "babel-core": "^6.0.0",
    "babel-eslint": "^7.0.0",
@@ -39,6 +43,8 @@
    "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",
@@ -46,6 +52,7 @@
    "sinon": "^2.3.5",
    "sinon-chai": "^2.11.0",
    "sourcemap": "^0.1.0",
    "standard": "^12.0.1",
    "url-loader": "^0.5.7",
    "vue": "^2.3.4",
    "vue-loader": "^11.1.3",
@@ -53,7 +60,9 @@
    "vue-template-compiler": "^2.2.0",
    "webpack": "^1.13.2",
    "webpack-dev-server": "1.14.0",
-    "webpack-merge": "^0.14.1",
+    "webpack-merge": "^0.14.1"
-    "html-webpack-plugin": "^2.8.1"
+  },
  "dependencies": {
    "cz-conventional-changelog": "^2.1.0"
  }
 }
--- a/readme.md
+++ b/readme.md
@@ -9,14 +9,25 @@ A vue component for tree structure. Support adding treenode/leafnode, editing no
 ``npm install vue-tree-list``
 ```javascript
-<button @click="addNode">Add Node</button>
+<div>
-<vue-tree-list @click="onClick" :model="data" default-tree-node-name="new node" default-leaf-node-name="new leaf"></vue-tree-list>
+    <button @click="addNode">Add Node</button>
-<button @click="getNewTree">Get new tree</button>
+    <vue-tree-list
-<pre>
+      @click="onClick"
-  {{newTree}}
+      @change-name="onChange"
-</pre>
+      @delete-node="onChange"
      @add-node="onChange"
      :model="data"
      default-tree-node-name="new node"
      default-leaf-node-name="new leaf"
      v-bind:default-expanded="false">
    </vue-tree-list>
    <button @click="getNewTree">Get new tree</button>
    <pre>
      {{newTree}}
    </pre>
 </div>
 ...
-import { VueTreeList, Tree, TreeNode } from '../src'
+import { VueTreeList, Tree, TreeNode } from 'vue-tree-list'
 export default {
  components: {
    VueTreeList
@@ -43,7 +54,7 @@ export default {
          name: 'Node 2',
          id: 3,
          pid: 0,
-          dragDisabled: true
+          disabled: true
        },
        {
          name: 'Node 3',
@@ -54,13 +65,17 @@ export default {
    }
  },
  methods: {
-    addNode: function () {
+    onChange (data) {
      console.log(data)
    },
    addNode () {
      var node = new TreeNode({ name: 'new node', isLeaf: false })
      if (!this.data.children) this.data.children = []
      this.data.addChildren(node)
    },
-    getNewTree: function () {
+    getNewTree () {
      var vm = this
      function _dfs (oldNode) {
        var newNode = {}
@@ -93,23 +108,36 @@ export default {
 # props
 **default-tree-node-name**
- Default name for new treenode.
+Default name for new treenode.
 **default-leaf-node-name**
 Default name for new leafnode.
 **onDeleteNode**
 ```javascript
 onDeleteNode(confirm) {
  if (something) {
    confirm()
  }
 }
 ```
 **default-expanded**
 Default node is expanded or not.
 # events
 **click**
-```javascript
+**change-name**
-<vue-tree-list @click="onClick" ...
+
-...
+**delete-node**
-onClick(model) {
+
-  console.log(model)
+**add-node**
 }
 ...
 ```
 # Forbid dragging
 Use `dragDisabled` to forbid dragging:
--- a/src/Tree.js
+++ b/src/Tree.js
@@ -1,5 +1,3 @@
 let nodeId = 1
 /**
 * Tree data struct
 * Created by ayou on 2017/7/20.
@@ -13,7 +11,7 @@ let nodeId = 1
 const TreeNode = function (data) {
  const { id, isLeaf } = data
  // this.name = name
-  this.id = (typeof id === 'undefined') ? ('new' + nodeId++) : id
+  this.id = (typeof id === 'undefined') ? new Date().valueOf() : id
  this.parent = null
  // this.pid = null
  this.children = null
--- a/src/VueTreeList.vue
+++ b/src/VueTreeList.vue
@@ -69,10 +69,11 @@
        @dragleave="dragLeaveBottom"></div>
    </div>
-    <div :class="{'vtl-tree-margin': model.name !== 'root'}" v-show="expanded" v-if="isFolder">
+    <div :class="{'vtl-tree-margin': model.name !== 'root'}" v-show="model.name === 'root' || expanded" v-if="isFolder">
      <item v-for="model in model.children"
        :default-tree-node-name="defaultTreeNodeName"
        :default-leaf-node-name="defaultLeafNodeName"
        v-bind:default-expanded="defaultExpanded"
        :model="model"
        :key='model.id'>
      </item>
@@ -94,7 +95,7 @@
        isDragEnterUp: false,
        isDragEnterBottom: false,
        isDragEnterNode: false,
-        expanded: true
+        expanded: this.defaultExpanded
      }
    },
    props: {
@@ -108,6 +109,14 @@
      defaultTreeNodeName: {
        type: String,
        default: 'New tree node'
      },
      onDeleteNode: {
        type: Function,
        default: confirm => { confirm() }
      },
      defaultExpanded: {
        type: Boolean,
        default: true
      }
    },
    computed: {
@@ -155,14 +164,18 @@
    },
    methods: {
      updateName (e) {
        var oldName = this.model.name;
        this.model.changeName(e.target.value)
        var node = this.getRootNode();
        node.$emit('change-name', {'id': this.model.id, 'oldName': oldName, 'newName': e.target.value})
      },
      delNode () {
        const vm = this
-        if (window.confirm('Are you sure?')) {
+        const confirm = () => vm.model.remove()
-          vm.model.remove()
+        this.onDeleteNode(confirm)
-        }
+        var node = this.getRootNode()
        node.$emit('delete-node', this.model)
      },
      setEditable () {
@@ -193,12 +206,8 @@
      },
      click() {
-        var node = this.$parent
+        var node = this.getRootNode()
-        var clickModel = this.model
+        node.$emit('click', this.model);
        while (node._props.model.name !== 'root') {
          node = node.$parent
        }
        node.$emit('click', clickModel)
      },
      addChild(isLeaf) {
@@ -206,6 +215,8 @@
        this.expanded = true
        var node = new TreeNode({ name, isLeaf })
        this.model.addChildren(node, true)
        var root = this.getRootNode();
        root.$emit('add-node', node)
      },
      dragStart(e) {
@@ -273,6 +284,13 @@
        if (!fromComp) return
        fromComp.model.insertAfter(this.model)
        this.isDragEnterBottom = false
      },
      getRootNode() {
        var node = this.$parent
        while (node._props.model.name !== 'root') {
          node = node.$parent
        }
        return node;
      }
    },
    beforeCreate () {
--- a/src/tools.js
+++ b/src/tools.js
@@ -4,24 +4,24 @@
 var handlerCache
-exports.addHandler = function(element, type, handler) {
+exports.addHandler = function (element, type, handler) {
  handlerCache = handler
  if (element.addEventListener) {
-    element.addEventListener(type, handler, false);
+    element.addEventListener(type, handler, false)
  } else if (element.attachEvent) {
-    element.attachEvent("on" + type, handler);
+    element.attachEvent('on' + type, handler)
  } else {
-    element["on" + type] = handler;
+    element['on' + type] = handler
  }
 }
 exports.removeHandler = function (element, type) {
  if (element.removeEventListener) {
-    element.removeEventListener(type, handlerCache, false);
+    element.removeEventListener(type, handlerCache, false)
  } else if (element.detachEvent) {
-    element.detachEvent("on" + type, handlerCache);
+    element.detachEvent('on' + type, handlerCache)
  } else {
-    element["on" + type] = null;
+    element['on' + type] = null
  }
 }
Author	SHA1	Message	Date
youxingzhi	3dd6e31028	chore(version): 1.1.2	2019-02-15 09:43:24 +08:00
youxingzhi	cde7836539	refactor: change event name	2019-02-15 09:41:53 +08:00
ayou	a8284583da	Merge pull request #20 from energiehund/feature/events-for-node-operations feat: Emit events for node operations	2019-02-15 09:23:25 +08:00
energiehund	8cb42cd952	feat: Emit events for node operations	2019-02-13 17:14:53 +08:00
youxingzhi	5ab8775ace	chore: 1.1.1	2019-01-03 09:56:25 +08:00
youxingzhi	3fec41a890	fix: add semi	2019-01-03 09:55:27 +08:00
youxingzhi	867ef2a7fa	chore(add husky): add standard and commitlint	2018-12-11 11:16:29 +08:00
youxingzhi	2b2b1419ad	chore: update demo update demo because of new style	2018-12-11 11:14:49 +08:00
ayou	47a4e2df8d	Merge pull request #16 from ParadeTo/fix-issue#14 fix issue #14, make delete node configurable	2018-12-11 10:29:18 +08:00
ayou	ec49d0e226	Merge branch 'master' into fix-issue#14	2018-12-11 10:29:07 +08:00
ayou	52a63af52f	Merge pull request #15 from ParadeTo/fix-issue#11 Fix issue#11	2018-12-11 10:23:41 +08:00
ayou	b10803df64	Merge pull request #17 from ParadeTo/fix-issue#13 fix issue #13	2018-12-08 22:20:50 +08:00
Zhiyuan Guo	7d35504b40	rm logs	2018-12-08 15:13:08 +08:00
Zhiyuan Guo	b2eba3e3c9	update readme	2018-12-08 15:11:11 +08:00
Zhiyuan Guo	d6826e1a24	fix issue #14 , make delete node configurable	2018-12-08 15:08:43 +08:00
Zhiyuan Guo	a815fc658b	fix issue #11	2018-12-08 14:43:35 +08:00
Zhiyuan Guo	572b045314	fix issue #13	2018-12-08 11:53:36 +08:00
		`@@ -0,0 +1,2 @@`
							`extends:`
							`- "@commitlint/config-conventional"`