Skip to content

Commit d4ce612

Browse files
xuliangzhanxuliangzhan
committed
update
1 parent c8a7884 commit d4ce612

File tree

10 files changed

+94
-320
lines changed

10 files changed

+94
-320
lines changed

‎README.md

Lines changed: 35 additions & 282 deletions
Large diffs are not rendered by default.

‎docs/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!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"><link rel=icon href=/vue-element-extends/favicon.ico><title>ElementUI 2.X components extends.</title><link href=/vue-element-extends/static/css/chunk-vendors.a8b08852.css rel=preload as=style><link href=/vue-element-extends/static/css/index.b5f8c35c.css rel=preload as=style><link href=/vue-element-extends/static/js/chunk-vendors.5e1205b6.js rel=preload as=script><link href=/vue-element-extends/static/js/index.44ee5867.js rel=preload as=script><link href=/vue-element-extends/static/css/chunk-vendors.a8b08852.css rel=stylesheet><link href=/vue-element-extends/static/css/index.b5f8c35c.css rel=stylesheet></head><body><noscript><strong>We're sorry but test2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/vue-element-extends/static/js/chunk-vendors.5e1205b6.js></script><script src=/vue-element-extends/static/js/index.44ee5867.js></script></body></html>
1+
<!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"><link rel=icon href=/vue-element-extends/favicon.ico><title>ElementUI 2.X components extends.</title><link href=/vue-element-extends/static/css/chunk-vendors.a8b08852.css rel=preload as=style><link href=/vue-element-extends/static/css/index.b5f8c35c.css rel=preload as=style><link href=/vue-element-extends/static/js/chunk-vendors.5e1205b6.js rel=preload as=script><link href=/vue-element-extends/static/js/index.28f351d5.js rel=preload as=script><link href=/vue-element-extends/static/css/chunk-vendors.a8b08852.css rel=stylesheet><link href=/vue-element-extends/static/css/index.b5f8c35c.css rel=stylesheet></head><body><noscript><strong>We're sorry but test2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/vue-element-extends/static/js/chunk-vendors.5e1205b6.js></script><script src=/vue-element-extends/static/js/index.28f351d5.js></script></body></html>

‎docs/static/js/index.44ee5867.js renamed to ‎docs/static/js/index.28f351d5.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/views/editable/Click9.vue

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
<elx-editable-column prop="region" label="地区" width="200" :edit-render="{name: 'ElCascader', props: {options: regionList}}"></elx-editable-column>
5050
<elx-editable-column prop="role" label="角色" show-overflow-tooltip :edit-render="{name: 'ElInput'}"></elx-editable-column>
5151
<elx-editable-column prop="date" label="日期" width="160" :edit-render="{name: 'ElDatePicker', props: {type: 'datetime', format: 'yyyy-MM-dd'}}"></elx-editable-column>
52+
<elx-editable-column prop="date2" label="任意时间范围" width="340" :edit-render="{name: 'ElTimePicker', props: {isRange: true, rangeSeparator: '至', startPlaceholder: '开始时间', endPlaceholder: '结束时间', placeholder: '选择时间范围'}}"></elx-editable-column>
5253
<elx-editable-column prop="flag" label="是否启用" :edit-render="{name: 'ElSwitch', type: 'visible'}"></elx-editable-column>
5354
<elx-editable-column prop="rate" label="评分" min-width="150" :edit-render="{name: 'ElRate', type: 'visible'}"></elx-editable-column>
5455
<elx-editable-column prop="describe" label="备注" show-overflow-tooltip :edit-render="{name: 'ElInput'}"></elx-editable-column>
@@ -193,7 +194,10 @@ export default {
193194
this.pendingRemoveList = []
194195
XEAjax.doGet(`/api/user/page/list/${this.pageVO.pageSize}/${this.pageVO.currentPage}`, this.formData).then(response => {
195196
let { page, result } = response.data
196-
this.list = result
197+
this.list = result.map(item => {
198+
item.date2 = [new Date(2016, 9, 10, 8, 40), new Date(2016, 9, 10, 9, 40)]
199+
return item
200+
})
197201
this.pageVO.totalResult = page.totalResult
198202
this.loading = false
199203
}).catch(e => {

‎lib/index.common.js

Lines changed: 22 additions & 15 deletions
Large diffs are not rendered by default.

‎lib/index.umd.js

Lines changed: 22 additions & 15 deletions
Large diffs are not rendered by default.

‎lib/index.umd.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-element-extends",
3-
"version": "1.2.18",
3+
"version": "1.2.19",
44
"description": "Extension component based on ElementUI 2.x",
55
"scripts": {
66
"serve": "vue-cli-service serve",

‎packages/editable/src/editable-column.vue

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,9 @@ export default {
348348
getTimePickerLabel ({ row, column }) {
349349
let value = this.getRowIdentity(row, column)
350350
let props = this.renderOpts.props || this.renderOpts.attrs || {}
351+
if (props.isRange) {
352+
return value.map(date => XEUtils.toDateString(date, props.format || 'hh:mm:ss')).join(` ${props.rangeSeparator || '-'} `)
353+
}
351354
return XEUtils.toDateString(value, props.format || 'hh:mm:ss')
352355
},
353356
getDatePickerLabel ({ row, column }) {

‎packages/editable/src/editable.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -269,18 +269,18 @@ export default {
269269
},
270270
toggleRowSelection (record, selected) {
271271
let matchObj = XEUtils.findTree(this.datas, row => row.data === record, this.elTreeOpts)
272-
return this.$refs.refElTable.toggleRowSelection(matchObj.item, selected)
272+
return matchObj ? this.$refs.refElTable.toggleRowSelection(matchObj.item, selected) : null
273273
},
274274
toggleAllSelection () {
275275
return this.$refs.refElTable.toggleAllSelection()
276276
},
277277
toggleRowExpansion (record, expanded) {
278278
let matchObj = XEUtils.findTree(this.datas, row => row.data === record, this.elTreeOpts)
279-
return this.$refs.refElTable.toggleRowExpansion(matchObj.item, expanded)
279+
return matchObj ? this.$refs.refElTable.toggleRowExpansion(matchObj.item, expanded) : null
280280
},
281281
setCurrentRow (record) {
282282
let matchObj = XEUtils.findTree(this.datas, row => row.data === record, this.elTreeOpts)
283-
return this.$refs.refElTable.setCurrentRow(matchObj.item)
283+
return matchObj ? this.$refs.refElTable.setCurrentRow(matchObj.item) : null
284284
},
285285
clearSort () {
286286
return this.$refs.refElTable.clearSort()

0 commit comments

Comments
 (0)