Skip to content

Commit 0d41ec8

Browse files
committed
support search box placeholder
1 parent 4887d94 commit 0d41ec8

File tree

6 files changed

+31
-10
lines changed

6 files changed

+31
-10
lines changed

README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
<td>-</td>
183183
</tr>
184184
<tr>
185-
<td rowspan="5"></td>
185+
<td rowspan="6"></td>
186186
<td>show</td>
187187
<td></td>
188188
<td>show or hide search box</td>
@@ -217,6 +217,13 @@
217217
<td>Function</td>
218218
<td>-</td>
219219
</tr>
220+
<tr>
221+
<td>placeholder</td>
222+
<td></td>
223+
<td>searchbox placeholder</td>
224+
<td>String</td>
225+
<td>""</td>
226+
</tr>
220227
<tr>
221228
<td>row-action-def</td>
222229
<td></td>

example/docs/cn.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ export default {
244244
getSearchDef() {
245245
return {
246246
offset: 12,
247+
placeholder: 'please input searchkey',
247248
props: ['state', 'flow_type'] // can be string or Array
248249
}
249250
},

example/docs/en.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,7 @@ export default {
251251
getSearchDef() {
252252
return {
253253
offset: 12,
254+
placeholder: 'please input searchkey',
254255
props: ['state', 'flow_type'] // can be string or Array
255256
}
256257
},

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-data-tables",
3-
"version": "1.0.6",
3+
"version": "1.0.7",
44
"description": "vue2.0 DataTables, based on element-ui, el-table + el-pagination + custom filter and sort",
55
"author": "njleonzhang <[email protected]>",
66
"main": "dist/data-tables.js",
@@ -36,7 +36,7 @@
3636
"chalk": "^1.1.3",
3737
"connect-history-api-fallback": "^1.1.0",
3838
"css-loader": "^0.25.0",
39-
"element-ui": "^1.1.5",
39+
"element-ui": "^1.2.3",
4040
"eslint": "^3.7.1",
4141
"eslint-config-standard": "^6.1.0",
4242
"eslint-friendly-formatter": "^2.0.5",

readme_table_backup.pug

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ table
114114
td -
115115

116116
tr
117-
td(rowspan='5')
117+
td(rowspan='6')
118118
td show
119119
td
120120
td show or hide search box
@@ -149,6 +149,13 @@ table
149149
td Function
150150
td -
151151

152+
tr
153+
td placeholder
154+
td
155+
td searchbox placeholder
156+
td String
157+
td ""
158+
152159
tr
153160
td row-action-def
154161
td
@@ -209,36 +216,37 @@ table
209216
td
210217
td define pagination.
211218
td Object
212-
td
219+
td -
213220

214221
tr
215222
td(rowspan='4')
216223
td layout
217224
td
218-
td
225+
td refer to
226+
a(href='http://element.eleme.io/#/zh-CN/component/pagination') Elmeme Doc
219227
td String
220228
td [prev, pager, next, jumper, sizes, total]
221229

222230
tr
223231
td pageSize
224232
td
225-
td refer to
233+
td refer to
226234
a(href='http://element.eleme.io/#/zh-CN/component/pagination') Elmeme Doc
227235
td Number
228236
td 20
229237

230238
tr
231239
td pageSizes
232240
td
233-
td refer to
241+
td refer to
234242
a(href='http://element.eleme.io/#/zh-CN/component/pagination') Elmeme Doc
235243
td Array
236244
td [20, 50, 100]
237245

238246
tr
239247
td currentPage
240248
td
241-
td refer to
249+
td refer to
242250
a(href='http://element.eleme.io/#/zh-CN/component/pagination') Elmeme Doc
243251
td Number
244252
td 1

src/components/DataTables.vue

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,10 @@
4343
:span='innerSearchDef.width',
4444
:offset='innerSearchDef.offset',
4545
v-if='searchShow')
46-
el-input(v-model='searchKey', icon='search')
46+
el-input(
47+
v-model='searchKey',
48+
:placeholder='innerSearchDef.placeholder',
49+
icon='search')
4750

4851
el-table(
4952
:data='curTableData',
@@ -175,6 +178,7 @@ export default {
175178
props: undefined,
176179
filterFunction: undefined,
177180
width: 5,
181+
placeholder: '',
178182
offset: 0
179183
}, this.searchDef)
180184
},

0 commit comments

Comments
 (0)