From 412fcdee77c8b87df573a1484de344351bcd420e Mon Sep 17 00:00:00 2001 From: xuliangzhan Date: Mon, 11 Jan 2021 15:54:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en.md | 2 +- README.md | 2 +- README.zh-TW.md | 2 +- examples/App.vue | 2 +- examples/api/form-item.js | 9 +++++ examples/api/table.js | 2 +- examples/i18n/lang/en-US.js | 2 +- examples/i18n/lang/zh-CN.js | 2 +- examples/i18n/lang/zh-TC.js | 2 +- examples/views/form/Form.vue | 34 ++++++++----------- examples/views/table/advanced/Expand.vue | 5 ++- .../views/table/advanced/ExpandAccordion.vue | 5 ++- package.json | 2 +- packages/edit/src/mixin.js | 3 +- packages/form/src/form.js | 12 ++++--- packages/grid/src/grid.js | 4 +-- packages/table/src/body.js | 4 +-- packages/table/src/cell.js | 3 +- packages/table/src/methods.js | 4 +-- packages/table/src/table.js | 3 +- packages/table/src/util.js | 4 --- packages/tools/src/utils.js | 4 +++ packages/validator/src/mixin.js | 6 +--- styles/base/common.scss | 9 ++--- types/table.d.ts | 4 +-- 25 files changed, 65 insertions(+), 66 deletions(-) diff --git a/README.en.md b/README.en.md index 0871fdc36..87434a927 100644 --- a/README.en.md +++ b/README.en.md @@ -2,7 +2,7 @@ [简体中文](README.md) | [繁體中文](README.zh-TW.md) | English -[![gitee star](https://gitee.com/xuliangzhan_admin/vxe-table/badge/star.svg?theme=dark)](https://gitee.com/xuliangzhan_admin/vxe-table/stargazers) +[![star](https://gitee.com/xuliangzhan_admin/vxe-table/badge/star.svg?theme=gvp)](https://gitee.com/xuliangzhan_admin/vxe-table/stargazers) [![npm version](https://img.shields.io/npm/v/vxe-table.svg?style=flat-square)](https://www.npmjs.com/package/vxe-table) [![npm build](https://travis-ci.com/x-extends/vxe-table.svg?branch=master)](https://travis-ci.com/x-extends/vxe-table) [![npm downloads](https://img.shields.io/npm/dt/vxe-table.svg?style=flat-square)](https://npm-stat.com/charts.html?package=vxe-table) diff --git a/README.md b/README.md index 534feaed9..482c03b85 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ 简体中文 | [繁體中文](README.zh-TW.md) | [English](README.en.md) -[![gitee star](https://gitee.com/xuliangzhan_admin/vxe-table/badge/star.svg?theme=dark)](https://gitee.com/xuliangzhan_admin/vxe-table/stargazers) +[![star](https://gitee.com/xuliangzhan_admin/vxe-table/badge/star.svg?theme=gvp)](https://gitee.com/xuliangzhan_admin/vxe-table/stargazers) [![npm version](https://img.shields.io/npm/v/vxe-table.svg?style=flat-square)](https://www.npmjs.com/package/vxe-table) [![npm build](https://travis-ci.com/x-extends/vxe-table.svg?branch=master)](https://travis-ci.com/x-extends/vxe-table) [![npm downloads](https://img.shields.io/npm/dt/vxe-table.svg?style=flat-square)](https://npm-stat.com/charts.html?package=vxe-table) diff --git a/README.zh-TW.md b/README.zh-TW.md index 09ff5079a..01b8cb17c 100644 --- a/README.zh-TW.md +++ b/README.zh-TW.md @@ -2,7 +2,7 @@ [简体中文](README.md) | 繁體中文 | [English](README.en.md) -[![gitee star](https://gitee.com/xuliangzhan_admin/vxe-table/badge/star.svg?theme=dark)](https://gitee.com/xuliangzhan_admin/vxe-table/stargazers) +[![star](https://gitee.com/xuliangzhan_admin/vxe-table/badge/star.svg?theme=gvp)](https://gitee.com/xuliangzhan_admin/vxe-table/stargazers) [![npm version](https://img.shields.io/npm/v/vxe-table.svg?style=flat-square)](https://www.npmjs.com/package/vxe-table) [![npm build](https://travis-ci.com/x-extends/vxe-table.svg?branch=master)](https://travis-ci.com/x-extends/vxe-table) [![npm downloads](https://img.shields.io/npm/dt/vxe-table.svg?style=flat-square)](https://npm-stat.com/charts.html?package=vxe-table) diff --git a/examples/App.vue b/examples/App.vue index 7030f14e5..cd1f60294 100644 --- a/examples/App.vue +++ b/examples/App.vue @@ -7,7 +7,7 @@ vxe-table - star + star diff --git a/examples/api/form-item.js b/examples/api/form-item.js index be01fff32..2ba0ab27c 100644 --- a/examples/api/form-item.js +++ b/examples/api/form-item.js @@ -182,6 +182,15 @@ const apis = [ defVal: '', list: [] }, + { + name: 'enabled', + desc: '是否启用', + version: '3.0.23', + type: 'boolean', + enum: '', + defVal: 'true', + list: [] + }, { name: 'props', desc: '渲染的参数（请查看目标渲染的 Props）', diff --git a/examples/api/table.js b/examples/api/table.js index 74d21a9c8..7c75c7cbc 100644 --- a/examples/api/table.js +++ b/examples/api/table.js @@ -4222,7 +4222,7 @@ const apis = [ version: '', type: 'Promise', enum: '', - defVal: 'rows?: boolean | Row | Row[], callback?: callback?: (errMap) => void', + defVal: 'rows?: boolean | Row | Row[] | ((errMap) => void), callback?: callback?: (errMap) => void', list: [] }, { diff --git a/examples/i18n/lang/en-US.js b/examples/i18n/lang/en-US.js index 1d890565d..b539cf5a4 100644 --- a/examples/i18n/lang/en-US.js +++ b/examples/i18n/lang/en-US.js @@ -325,7 +325,7 @@ export default { compatibility: 'Compatibility', releases: 'Releases', donation: '支持我们', - issuesTitle: '該群供大家交流問題，若人满则剔除不活跃的
作者很忙基本沒有時間去看群，如果有 bug 请通过 issues 反馈', + issuesTitle: '该群供大家交流問題，群人数已达上限，将不定期剔除不活跃的
，如果有 bug 请通过 issues 反馈', newFunc: 'Since the author is busy, there may be time to support this function later!', newDevelopment: 'this release is being refactored. Stay tuned!' }, diff --git a/examples/i18n/lang/zh-CN.js b/examples/i18n/lang/zh-CN.js index 4c5821912..f8decab37 100644 --- a/examples/i18n/lang/zh-CN.js +++ b/examples/i18n/lang/zh-CN.js @@ -324,7 +324,7 @@ export default { compatibility: '兼容性变动', releases: '更新日志', donation: '支持我们', - issuesTitle: '該群供大家交流問題，若人满则剔除不活跃的
作者很忙基本沒有時間去看群，如果有 bug 请通过 issues 反馈', + issuesTitle: '该群供大家交流問題，群人数已达上限，将不定期剔除不活跃的
，如果有 bug 请通过 issues 反馈', newFunc: '由于作者很忙，后续有时间可能会支持该功能！', newDevelopment: '该版本正在重构中，敬请期待！' }, diff --git a/examples/i18n/lang/zh-TC.js b/examples/i18n/lang/zh-TC.js index ffae5f7f6..547c3096f 100644 --- a/examples/i18n/lang/zh-TC.js +++ b/examples/i18n/lang/zh-TC.js @@ -324,7 +324,7 @@ export default { compatibility: '相容性變動', releases: '更新日誌', donation: '支持我们', - issuesTitle: '該群供大家交流問題，若人满则剔除不活跃的
作者很忙基本沒有時間去看群，如果有 bug 請通過 issues 迴響', + issuesTitle: '该群供大家交流問題，群人数已达上限，将不定期剔除不活跃的
，如果有 bug 请通过 issues 反馈', newFunc: '由於作者很忙，後續有時間可能會支持該功能！', newDevelopment: '該版本正在重構中，敬請期待！' }, diff --git a/examples/views/form/Form.vue b/examples/views/form/Form.vue index 7fb87f28c..3c044cff6 100644 --- a/examples/views/form/Form.vue +++ b/examples/views/form/Form.vue @@ -108,6 +108,7 @@

- - + + - - + +