Skip to content

Commit a9a9fd0

Browse files
levy9527levy9527
authored
Merge pull request #20 from FEMessage/dev
2 parents 3d4758b + 467a85f commit a9a9fd0

File tree

13 files changed

+3355
-4089
lines changed

13 files changed

+3355
-4089
lines changed

‎.babelrc‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,6 @@
22
"presets": [
33
["@babel/env", { "modules": false }]
44
],
5-
"env": {
6-
"test": {
7-
"presets": [
8-
["@babel/env", { "targets": { "node": "current" }}]
9-
]
10-
}
11-
},
125
"plugins": [
136
["@babel/transform-runtime", {
147
"regenerator": true

‎.travis.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ git:
99
install:
1010
- yarn --frozen-lockfile
1111
script:
12-
- yarn build
12+
- ./build.sh
13+
after_success:
14+
- GREN_GITHUB_TOKEN=$GITHUB_TOKEN yarn release
15+
- ./notify.sh
1316
cache: yarn
1417
deploy:
1518
- provider: pages

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ allowDrop(dragNode, dropNode, dropType) {
542542
| customQuery | 外部的注入额外的查询参数, 键值对形式 | Object | - |
543543
| extraParams | 新增/修改提交时注入额外的参数 | Object | - |
544544
| hasOperation | 是否有操作列 | Boolean | true |
545-
| hasTitle | 是否有标题栏 | Boolean | false |
545+
| hasHeader | 是否有标题栏 | Boolean | false |
546546
| hasDelete | 是否有删除按钮 | Boolean | true |
547547
| hasNew | 是否有新增按钮 | Boolean | true |
548548
| hasEdit | 是否有编辑按钮 | Boolean | true |

‎build.sh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/sh
2+
yarn stdver
3+
4+
yarn build
5+
6+
git remote add github https://$GITHUB_TOKEN@github.com/FEMessage/el-data-tree.git > /dev/null 2>&1
7+
git push github HEAD:master --follow-tags
8+

‎docs/extra-buttons-type.md‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
自定义节点菜单(text)
2+
3+
```vue
4+
<template>
5+
<el-data-tree
6+
:form="form"
7+
:url="getUrl"
8+
data-path="data.payload"
9+
:extraButtons="extraButtons"
10+
extraButtonsType="text"
11+
></el-data-tree>
12+
</template>
13+
14+
<script>
15+
export default {
16+
data() {
17+
return {
18+
form: [
19+
{
20+
$id: 'name',
21+
$type: 'input',
22+
label: '名字',
23+
$el: {
24+
placeholder: '请输入'
25+
}
26+
}
27+
],
28+
extraButtons: [
29+
{
30+
text: '自定义按钮',
31+
atClick: (node, data) => {
32+
console.log(data)
33+
}
34+
}
35+
]
36+
}
37+
}
38+
}
39+
</script>
40+
41+
```

‎docs/has-header.md‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
有标题的用法
2+
3+
```vue
4+
<template>
5+
<el-data-tree v-bind="$data" :url="getUrl" :onNew="onNew" :onEdit="onEdit" :onDelete="onDelete">
6+
<span slot="title">这是 slot 标题</span>
7+
<el-button type="primary" size="mini" slot="header-new-btn">添加组织</el-button>
8+
<el-button type="primary" size="mini" slot="header-extra-block">其他按钮</el-button>
9+
</el-data-tree>
10+
</template>
11+
12+
<script>
13+
export default {
14+
data() {
15+
return {
16+
dataPath: 'data.payload',
17+
hasHeader: true,
18+
form: [
19+
{
20+
$id: 'name',
21+
$type: 'input',
22+
label: '名字',
23+
$el: {
24+
placeholder: '请输入'
25+
}
26+
}
27+
]
28+
}
29+
},
30+
methods: {
31+
onNew(data) {
32+
return this.$axios.post(this.postUrl, data)
33+
},
34+
onEdit(data) {
35+
return this.$axios.put(this.editUrl, data)
36+
},
37+
onDelete(data) {
38+
return this.$axios.delete(this.deleteUrl, data)
39+
}
40+
}
41+
}
42+
</script>
43+
```

‎docs/slot-node-label.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
自定义节点文本内容
2+
3+
```vue
4+
<template>
5+
<el-data-tree :url="getUrl" data-path="data.payload">
6+
<span slot="node-label" slot-scope="{ data }">
7+
<el-tag size="small">{{ data.id }}</el-tag>
8+
{{ data.name }}
9+
<el-tag size="mini" type="info">{{ data.tag }}</el-tag>
10+
</span>
11+
</el-data-tree>
12+
</template>
13+
```

‎notify.sh‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/sh
2+
url=https://api.github.com/repos/FEMessage/el-data-tree/releases/latest
3+
html_url=`curl $url | sed -n 5p | sed 's/\"html_url\"://g' | awk -F '"' '{print $2}'`
4+
body=`curl $url | grep body | sed 's/\"body\"://g;s/\"//g'`
5+
6+
msg='{"msgtype": "markdown", "markdown": {"title": "新版本发布", "text": "@所有人\n# ['$html_url']('$html_url')\n'$body'"}}'
7+
8+
curl -X POST https://oapi.dingtalk.com/robot/send\?access_token\=$DINGTALK_ROBOT_TOKEN -H 'Content-Type: application/json' -d "$msg"
9+

‎package.json‎

Lines changed: 23 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -8,51 +8,48 @@
88
"type": "git",
99
"url": "https://github.com/FEMessage/el-data-tree.git"
1010
},
11-
"keywords": [
12-
"vue",
13-
"element-ui",
14-
"tree",
15-
"data-tree",
16-
"element tree"
17-
],
18-
"files": [
19-
"src",
20-
"dist",
21-
"yarn.lock"
22-
],
11+
"keywords": ["vue", "element-ui", "tree", "data-tree", "element tree"],
12+
"files": ["src", "dist", "yarn.lock"],
2313
"main": "dist/el-data-tree.umd.js",
2414
"module": "dist/el-data-tree.esm.js",
2515
"unpkg": "dist/el-data-tree.min.js",
2616
"browser": {
2717
"./sfc": "src/el-data-tree.vue"
2818
},
19+
2920
"scripts": {
3021
"dev": "vue-styleguidist server",
3122
"doc": "vue-styleguidist build",
32-
"test": "jest",
33-
"build": "npm run build:unpkg & npm run build:es & npm run build:umd & npm run doc",
34-
"build:umd": "rollup --config build/rollup.config.js --format umd --file dist/el-data-tree.umd.js",
35-
"build:es": "rollup --config build/rollup.config.js --format es --file dist/el-data-tree.esm.js",
36-
"build:unpkg": "rollup --config build/rollup.config.js --format iife --file dist/el-data-tree.min.js",
37-
"precommit": "pretty-quick --staged"
23+
"build":
24+
"npm run build:unpkg & npm run build:es & npm run build:umd & npm run doc",
25+
"build:umd":
26+
"rollup --config build/rollup.config.js --format umd --file dist/el-data-tree.umd.js",
27+
"build:es":
28+
"rollup --config build/rollup.config.js --format es --file dist/el-data-tree.esm.js",
29+
"build:unpkg":
30+
"rollup --config build/rollup.config.js --format iife --file dist/el-data-tree.min.js",
31+
"precommit": "pretty-quick --staged",
32+
"stdver": "standard-version -m '[skip ci] chore(release): v%s'",
33+
"release": "gren release --override"
3834
},
35+
3936
"dependencies": {
4037
"lodash.get": "^4.4.2"
4138
},
39+
4240
"devDependencies": {
4341
"@babel/core": "^7.4.3",
4442
"@babel/plugin-transform-runtime": "^7.4.3",
4543
"@babel/preset-env": "^7.4.3",
4644
"@femessage/el-form-renderer": "^1.5.5",
47-
"@vue/test-utils": "^1.0.0-beta.16",
4845
"axios": "^0.18.0",
49-
"babel-jest": "^24.7.1",
5046
"babel-loader": "^8.0.5",
5147
"css-loader": "^2.1.1",
5248
"element-ui": "2.4.11",
5349
"file-loader": "^3.0.1",
50+
"github-release-notes": "^0.17.0",
51+
"glob": "^7.1.3",
5452
"husky": "^0.14.3",
55-
"jest": "^23.1.0",
5653
"minimist": "^1.2.0",
5754
"prettier": "1.12.1",
5855
"pretty-quick": "^1.4.1",
@@ -61,29 +58,22 @@
6158
"rollup-plugin-commonjs": "^9.3.4",
6259
"rollup-plugin-terser": "^4.0.4",
6360
"rollup-plugin-vue": "^4.7.2",
61+
"standard-version": "^6.0.1",
6462
"stylus": "^0.54.5",
6563
"stylus-loader": "^3.0.2",
6664
"vue": "^2.5.16",
67-
"vue-jest": "^3.0.4",
6865
"vue-loader": "^15.7.0",
6966
"vue-styleguidist": "3.11.4",
7067
"vue-template-compiler": "^2.5.16",
7168
"webpack": "^4.29.6"
7269
},
70+
7371
"publishConfig": {
7472
"access": "public"
7573
},
76-
"jest": {
77-
"moduleFileExtensions": [
78-
"js",
79-
"vue"
80-
],
81-
"transform": {
82-
"^.+\\.js$": "./node_modules/babel-jest",
83-
"^.+\\.vue$": "./node_modules/vue-jest"
84-
}
85-
},
86-
"vue-sfc-cli": "1.3.1",
74+
75+
"vue-sfc-cli": "1.6.0",
76+
8777
"engines": {
8878
"node": ">= 4.0.0",
8979
"npm": ">= 3.0.0"

0 commit comments

Comments
 (0)