From 02b499d1705ddc836d537b5149cbffda480507a0 Mon Sep 17 00:00:00 2001 From: xuliangzhan Date: Tue, 11 Aug 2020 19:27:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dgrid=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=BB=A3=E7=90=86=E7=9A=84=E8=BF=9C=E7=A8=8B=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E6=9C=AA=E9=87=8D=E7=BD=AE=E4=B8=BA=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E9=A1=B5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/api/button.js | 2 +- examples/api/checkbox.js | 2 +- examples/api/input.js | 11 +- examples/api/list.js | 2 +- examples/api/pager.js | 2 +- examples/api/pulldown.js | 2 +- examples/api/radio.js | 2 +- examples/api/select.js | 11 +- examples/api/switch.js | 2 +- examples/api/textarea.js | 2 +- examples/api/toolbar.js | 2 +- examples/views/api/API.vue | 86 +++---- examples/views/table/base/Tooltip.vue | 9 +- examples/views/table/grid/FullEdit.vue | 18 +- examples/views/table/grid/FullQuery.vue | 30 +-- examples/views/table/grid/TreeEdit.vue | 2 + examples/views/table/grid/TreeLazyEdit.vue | 2 + examples/views/table/start/Global.vue | 3 +- examples/views/table/tree/Basic.vue | 2 + examples/views/table/tree/CellValid.vue | 2 + examples/views/table/tree/Edit.vue | 2 + examples/views/table/tree/Insert.vue | 2 + examples/views/table/tree/LazyEdit.vue | 2 + examples/views/table/tree/Menu.vue | 2 + examples/views/table/tree/RowValid.vue | 2 + examples/views/table/tree/Toolbar.vue | 2 + helper/vetur/attributes.json | 12 +- helper/vetur/tags.json | 2 + packages/body/src/body.js | 2 +- packages/button/src/button.js | 5 +- packages/cell/src/cell.js | 59 +++-- packages/checkbox/src/checkbox.js | 5 +- packages/conf/index.js | 8 +- packages/form/src/form.js | 5 +- packages/grid/src/grid.js | 25 +- packages/input/src/input.js | 9 +- packages/mixins/size.js | 8 + packages/modal/src/modal.js | 5 +- packages/pager/src/pager.js | 5 +- packages/pulldown/src/pulldown.js | 7 +- packages/radio/src/radio.js | 5 +- packages/select/src/select.js | 15 +- packages/switch/src/switch.js | 5 +- packages/table/src/methods.js | 46 ++-- packages/table/src/table.js | 7 +- packages/textarea/src/textarea.js | 5 +- packages/toolbar/src/toolbar.js | 5 +- packages/tooltip/src/tooltip.js | 68 +++--- styles/button.scss | 2 + styles/footer.scss | 16 +- styles/input.scss | 252 +++++++++++---------- styles/pulldown.scss | 2 + styles/select.scss | 2 + styles/table.scss | 3 +- vue.config.js | 4 +- 55 files changed, 459 insertions(+), 341 deletions(-) create mode 100644 packages/mixins/size.js diff --git a/examples/api/button.js b/examples/api/button.js index 10d2cd659..6e4cf7043 100644 --- a/examples/api/button.js +++ b/examples/api/button.js @@ -30,7 +30,7 @@ const apis = [ descKey: 'app.api.button.desc.size', version: '', type: 'string', - enum: 'medium,small,mini', + enum: 'medium, small, mini', defVal: '继承上下文', list: [] }, diff --git a/examples/api/checkbox.js b/examples/api/checkbox.js index 117512349..5a365a100 100644 --- a/examples/api/checkbox.js +++ b/examples/api/checkbox.js @@ -39,7 +39,7 @@ const apis = [ descKey: 'app.api.checkbox.desc.size', version: '', type: 'string', - enum: 'medium,small,mini', + enum: 'medium, small, mini', defVal: '继承上下文', list: [] }, diff --git a/examples/api/input.js b/examples/api/input.js index 62285872c..e8bd3990e 100644 --- a/examples/api/input.js +++ b/examples/api/input.js @@ -21,7 +21,7 @@ const apis = [ descKey: 'app.api.input.desc.size', version: '', type: 'string', - enum: 'medium,small,mini', + enum: 'medium, small, mini', defVal: '继承上下文', list: [] }, @@ -160,6 +160,15 @@ const apis = [ defVal: '默认 2,继承 setup.input.digits', list: [] }, + { + name: 'align', + desc: '内容对齐方式', + version: '', + type: 'string', + enum: 'left, center, right', + defVal: 'left', + list: [] + }, { name: 'controls', desc: '只对 type=number|integer|float 有效,是否显示控制按钮', diff --git a/examples/api/list.js b/examples/api/list.js index b339db347..b5242550c 100644 --- a/examples/api/list.js +++ b/examples/api/list.js @@ -21,7 +21,7 @@ const apis = [ descKey: 'app.api.list.desc.size', version: '', type: 'string', - enum: 'medium,small,mini', + enum: 'medium, small, mini', defVal: '继承上下文', list: [] }, diff --git a/examples/api/pager.js b/examples/api/pager.js index 492660f6d..ba05fea92 100644 --- a/examples/api/pager.js +++ b/examples/api/pager.js @@ -12,7 +12,7 @@ const apis = [ descKey: 'app.api.pager.desc.size', version: '', type: 'string', - enum: 'medium,small,mini', + enum: 'medium, small, mini', defVal: '继承上下文', list: [] }, diff --git a/examples/api/pulldown.js b/examples/api/pulldown.js index c595f9182..bcc1cd31b 100644 --- a/examples/api/pulldown.js +++ b/examples/api/pulldown.js @@ -12,7 +12,7 @@ const apis = [ descKey: 'app.api.pulldown.desc.size', version: '', type: 'string', - enum: 'medium,small,mini', + enum: 'medium, small, mini', defVal: '继承上下文', list: [] }, diff --git a/examples/api/radio.js b/examples/api/radio.js index 27b710b22..26c32668c 100644 --- a/examples/api/radio.js +++ b/examples/api/radio.js @@ -39,7 +39,7 @@ const apis = [ descKey: 'app.api.radio.desc.size', version: '', type: 'string', - enum: 'medium,small,mini', + enum: 'medium, small, mini', defVal: '继承上下文', list: [] }, diff --git a/examples/api/select.js b/examples/api/select.js index 229d88617..c4ac5783b 100644 --- a/examples/api/select.js +++ b/examples/api/select.js @@ -21,7 +21,7 @@ const apis = [ descKey: 'app.api.select.desc.size', version: '', type: 'string', - enum: 'medium,small,mini', + enum: 'medium, small, mini', defVal: '继承上下文', list: [] }, @@ -34,6 +34,15 @@ const apis = [ defVal: '', list: [] }, + { + name: 'multi-char-overflow', + desc: '只对 multiple 有效,设置多选中每个选项显示值的最大字符数,如果超出显示省略号;如果为 -1 则关闭', + version: '', + type: 'number, string', + enum: '', + defVal: '默认 8,继承 setup.select.multiCharOverflow', + list: [] + }, { name: 'clearable', descKey: 'app.api.select.desc.clearable', diff --git a/examples/api/switch.js b/examples/api/switch.js index 4c5380b99..fbc934063 100644 --- a/examples/api/switch.js +++ b/examples/api/switch.js @@ -30,7 +30,7 @@ const apis = [ descKey: 'app.api.switch.desc.size', version: '', type: 'string', - enum: 'medium,small,mini', + enum: 'medium, small, mini', defVal: '继承上下文', list: [] }, diff --git a/examples/api/textarea.js b/examples/api/textarea.js index 381543a19..ac0799a8f 100644 --- a/examples/api/textarea.js +++ b/examples/api/textarea.js @@ -21,7 +21,7 @@ const apis = [ descKey: 'app.api.input.desc.size', version: '', type: 'string', - enum: 'medium,small,mini', + enum: 'medium, small, mini', defVal: '继承上下文', list: [] }, diff --git a/examples/api/toolbar.js b/examples/api/toolbar.js index e210f8142..a971e5fd9 100644 --- a/examples/api/toolbar.js +++ b/examples/api/toolbar.js @@ -12,7 +12,7 @@ const apis = [ descKey: 'app.api.toolbar.desc.size', version: '', type: 'string', - enum: 'medium,small,mini', + enum: 'medium, small, mini', defVal: '继承上下文', list: [] }, diff --git a/examples/views/api/API.vue b/examples/views/api/API.vue index e03dd18b1..a7b67b33c 100644 --- a/examples/views/api/API.vue +++ b/examples/views/api/API.vue @@ -28,12 +28,12 @@ @header-cell-context-menu="headerCellContextMenuEvent" @cell-context-menu="cellContextMenuEvent" @context-menu-click="contextMenuClickEvent"> - + - - + + @@ -75,48 +75,48 @@ import switchAPI from '../../api/switch' import listAPI from '../../api/list' import pulldownAPI from '../../api/pulldown' -import i18n from '../../i18n' -const attributes = window.attributes = {} -const tags = window.tags = {} +// import i18n from '../../i18n' +// const attributes = window.attributes = {} +// const tags = window.tags = {} -const tagMaps = [ - ['vxe-table', tableAPI, { subtags: ['vxe-table-column'], description: '基础表格' }], - ['vxe-table-column', tableColumnAPI, { description: '基础表格 - 列' }], - ['vxe-grid', gridAPI, { description: '高级表格' }], - ['vxe-toolbar', toolbarAPI, { description: '工具栏' }], - ['vxe-pager', pagerAPI, { description: '分页' }], - ['vxe-radio', radioAPI, { description: '单选框' }], - ['vxe-radio-group', radioGroupAPI, { description: '单选组' }], - ['vxe-radio-button', radioButtonAPI, { description: '单选按钮' }], - ['vxe-checkbox', checkboxAPI, { description: '复选框' }], - ['vxe-checkbox-group', checkboxGroupAPI, { description: '复选组' }], - ['vxe-switch', switchAPI, { description: '开关按钮' }], - ['vxe-input', inputAPI, { description: '输入框' }], - ['vxe-select', selectAPI, { subtags: ['vxe-optgroup', 'vxe-option'], description: '下拉框' }], - ['vxe-optgroup', optgroupAPI, { subtags: ['vxe-option'], description: '下拉框 - 分组' }], - ['vxe-option', optionAPI, { description: '下拉框 - 选项' }], - ['vxe-button', buttonAPI, { description: '按钮' }], - ['vxe-tooltip', tooltipAPI, { description: '工具提示' }], - ['vxe-modal', modalAPI, { description: '模态窗口' }], - ['vxe-form', formAPI, { subtags: ['vxe-form-item'], description: '表单' }], - ['vxe-form-item', formItemAPI, { description: '表单 - 项' }], - ['vxe-list', listAPI, { description: '列表' }], - ['vxe-pulldown', pulldownAPI, { description: '下拉容器' }] -] +// const tagMaps = [ +// ['vxe-table', tableAPI, { subtags: ['vxe-table-column'], description: '基础表格' }], +// ['vxe-table-column', tableColumnAPI, { description: '基础表格 - 列' }], +// ['vxe-grid', gridAPI, { description: '高级表格' }], +// ['vxe-toolbar', toolbarAPI, { description: '工具栏' }], +// ['vxe-pager', pagerAPI, { description: '分页' }], +// ['vxe-radio', radioAPI, { description: '单选框' }], +// ['vxe-radio-group', radioGroupAPI, { description: '单选组' }], +// ['vxe-radio-button', radioButtonAPI, { description: '单选按钮' }], +// ['vxe-checkbox', checkboxAPI, { description: '复选框' }], +// ['vxe-checkbox-group', checkboxGroupAPI, { description: '复选组' }], +// ['vxe-switch', switchAPI, { description: '开关按钮' }], +// ['vxe-input', inputAPI, { description: '输入框' }], +// ['vxe-select', selectAPI, { subtags: ['vxe-optgroup', 'vxe-option'], description: '下拉框' }], +// ['vxe-optgroup', optgroupAPI, { subtags: ['vxe-option'], description: '下拉框 - 分组' }], +// ['vxe-option', optionAPI, { description: '下拉框 - 选项' }], +// ['vxe-button', buttonAPI, { description: '按钮' }], +// ['vxe-tooltip', tooltipAPI, { description: '工具提示' }], +// ['vxe-modal', modalAPI, { description: '模态窗口' }], +// ['vxe-form', formAPI, { subtags: ['vxe-form-item'], description: '表单' }], +// ['vxe-form-item', formItemAPI, { description: '表单 - 项' }], +// ['vxe-list', listAPI, { description: '列表' }], +// ['vxe-pulldown', pulldownAPI, { description: '下拉容器' }] +// ] -tagMaps.forEach(confs => { - const props = confs[1].find(item => item.name === 'Props').list - const keys = [] - props.forEach(item => { - const name = XEUtils.kebabCase(item.name) - attributes[`${confs[0]}/${name}`] = { - type: XEUtils.toString(item.type).toLowerCase(), - description: item.descKey ? i18n.t(item.descKey) : item.desc - } - keys.push(name) - }) - tags[confs[0]] = Object.assign({ attributes: keys }, confs[2]) -}) +// tagMaps.forEach(confs => { +// const props = confs[1].find(item => item.name === 'Props').list +// const keys = [] +// props.forEach(item => { +// const name = XEUtils.kebabCase(item.name) +// attributes[`${confs[0]}/${name}`] = { +// type: XEUtils.toString(item.type).toLowerCase(), +// description: item.descKey ? i18n.t(item.descKey) : item.desc +// } +// keys.push(name) +// }) +// tags[confs[0]] = Object.assign({ attributes: keys }, confs[2]) +// }) export default { data () { diff --git a/examples/views/table/base/Tooltip.vue b/examples/views/table/base/Tooltip.vue index fa4e68666..afe0c68d1 100644 --- a/examples/views/table/base/Tooltip.vue +++ b/examples/views/table/base/Tooltip.vue @@ -1,6 +1,9 @@