From 11bc30fa25a1a5f0cc3e80c9ec8ffe4f0d5fe578 Mon Sep 17 00:00:00 2001 From: huangshuwei Date: Mon, 22 Aug 2022 20:52:51 +0800 Subject: [PATCH 001/343] refine doc --- examples/src/docs/en/intro.md | 3 +++ examples/src/docs/zh/intro.md | 2 ++ 2 files changed, 5 insertions(+) diff --git a/examples/src/docs/en/intro.md b/examples/src/docs/en/intro.md index 148d165ec..1d0fbb3a0 100644 --- a/examples/src/docs/en/intro.md +++ b/examples/src/docs/en/intro.md @@ -32,6 +32,9 @@ Based on vue2.x flexible table components. - Cell Span - Cell Custom - Cell Selection(keyboard operation) +- Cell Autofill +- Cell Edit +- Clipboard - Cell Ellipsis - Row Radio - Row Checkbox diff --git a/examples/src/docs/zh/intro.md b/examples/src/docs/zh/intro.md index 74dda22f2..09775b3c3 100644 --- a/examples/src/docs/zh/intro.md +++ b/examples/src/docs/zh/intro.md @@ -32,7 +32,9 @@ - 单元格合并 - 单元格自定义 - 单元格选择（键盘操作） +- 单元格自动填充 - 单元格编辑 +- 剪贴板 - 右键菜单 - 单元格省略 - 行单选 From 5c844d7ed8f2a17d509d6e275103b8e1e68e1c69 Mon Sep 17 00:00:00 2001 From: huangshuwei Date: Mon, 22 Aug 2022 20:52:59 +0800 Subject: [PATCH 002/343] Update README-CN.md --- README-CN.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/README-CN.md b/README-CN.md index f73a6b938..099740331 100644 --- a/README-CN.md +++ b/README-CN.md @@ -26,8 +26,8 @@ ## API & 文档 -- [官方文档 (Github)](http://happy-coding-clans.github.io/vue-easytable/) -- [官方文档 (国内)](http://huangshuwei.gitee.io/vue-easytable/) +- [官方文档 (Github)](http://happy-coding-clans.github.io/vue-easytable/) +- [官方文档 (国内)](http://huangshuwei.gitee.io/vue-easytable/) ## 功能支持 @@ -41,7 +41,6 @@ **Table 组件** - - [x] [国际化](http://happy-coding-clans.github.io/vue-easytable/#/zh/doc/locale) - [x] [主题定制 & 内置主题](http://happy-coding-clans.github.io/vue-easytable/#/zh/doc/theme) - [x] [虚拟滚动](http://happy-coding-clans.github.io/vue-easytable/#/zh/doc/table/virtual-scroll) @@ -55,7 +54,9 @@ - [x] [单元格自定义](http://happy-coding-clans.github.io/vue-easytable/#/zh/doc/table/cell-custom) - [x] [单元格合并](http://happy-coding-clans.github.io/vue-easytable/#/zh/doc/table/cell-span) - [x] [单元格选择（键盘操作）](http://happy-coding-clans.github.io/vue-easytable/#/zh/doc/table/cell-selection) +- [x] [单元格自动填充](http://happy-coding-clans.github.io/vue-easytable/#/zh/doc/table/cell-autofill) - [x] [单元格编辑](http://happy-coding-clans.github.io/vue-easytable/#/zh/doc/table/cell-edit) +- [x] [剪贴板](http://happy-coding-clans.github.io/vue-easytable/#/zh/doc/table/clipboard) - [x] [右键菜单](http://happy-coding-clans.github.io/vue-easytable/#/zh/doc/table/contextmenu) - [x] [单元格省略](http://happy-coding-clans.github.io/vue-easytable/#/zh/doc/table/cell-ellipsis) - [x] [行单选](http://happy-coding-clans.github.io/vue-easytable/#/zh/doc/table/row-radio) @@ -93,8 +94,8 @@ import VueEasytable from "vue-easytable"; Vue.use(VueEasytable); new Vue({ - el: "#app", - render: (h) => h(App), + el: "#app", + render: (h) => h(App), }); ``` From f6561e3369c4ae86fd41126bf282b0f45cdea7a3 Mon Sep 17 00:00:00 2001 From: huangshuwei Date: Mon, 22 Aug 2022 20:53:22 +0800 Subject: [PATCH 003/343] Update README.md --- README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 44ed2b076..9127168db 100644 --- a/README.md +++ b/README.md @@ -20,15 +20,14 @@ Support this project by becoming a sponsor. Your logo or name will show up here with a link you provided. [Become a sponsor](https://www.patreon.com/huangshuwei) - ## Introduction Based on vue2.x flexible table components. ## API & Examples -- [Official documents (Github)](http://happy-coding-clans.github.io/vue-easytable/) -- [Official documents (China)](http://huangshuwei.gitee.io/vue-easytable/) +- [Official documents (Github)](http://happy-coding-clans.github.io/vue-easytable/) +- [Official documents (China)](http://huangshuwei.gitee.io/vue-easytable/) ## Features @@ -55,7 +54,9 @@ Based on vue2.x flexible table components. - [x] [Cell Custom](http://happy-coding-clans.github.io/vue-easytable/#/en/doc/table/cell-custom) - [x] [Cell Span](http://happy-coding-clans.github.io/vue-easytable/#/en/doc/table/cell-span) - [x] [Cell Selection(keyboard operation)](http://happy-coding-clans.github.io/vue-easytable/#/en/doc/table/cell-selection) +- [x] [Cell Autofill](http://happy-coding-clans.github.io/vue-easytable/#/en/doc/table/cell-autofill) - [x] [Cell Edit](http://happy-coding-clans.github.io/vue-easytable/#/en/doc/table/cell-edit) +- [x] [Clipboard](http://happy-coding-clans.github.io/vue-easytable/#/en/doc/table/clipboard) - [x] [Contextmenu](http://happy-coding-clans.github.io/vue-easytable/#/en/doc/table/contextmenu) - [x] [Cell Ellipsis](http://happy-coding-clans.github.io/vue-easytable/#/en/doc/table/cell-ellipsis) - [x] [Row Radio](http://happy-coding-clans.github.io/vue-easytable/#/en/doc/table/row-radio) @@ -93,8 +94,8 @@ import VueEasytable from "vue-easytable"; Vue.use(VueEasytable); new Vue({ - el: "#app", - render: (h) => h(App), + el: "#app", + render: (h) => h(App), }); ``` From 089924d30d12353a234050d903f956886f188813 Mon Sep 17 00:00:00 2001 From: huangshuwei Date: Mon, 22 Aug 2022 21:19:14 +0800 Subject: [PATCH 004/343] add doc --- examples/src/demo/index.vue | 649 +----------------------- examples/src/demo/normal-data-grid.vue | 659 +++++++++++++++++++++++++ examples/src/demo/spreadsheet.vue | 3 + 3 files changed, 666 insertions(+), 645 deletions(-) create mode 100644 examples/src/demo/normal-data-grid.vue create mode 100644 examples/src/demo/spreadsheet.vue diff --git a/examples/src/demo/index.vue b/examples/src/demo/index.vue index 4797308a4..d00f0d505 100644 --- a/examples/src/demo/index.vue +++ b/examples/src/demo/index.vue @@ -1,602 +1,20 @@ @@ -607,64 +25,5 @@ export default { background: #fff; margin-top: 62px; padding: 10px; - - .operation { - margin: 10px 0; - - .operation-item { - height: 50px; - line-height: 50px; - } - } - - .table-list { - // demo sex field - .demo-sex { - &.icon-male { - color: #91d5ff !important; - } - - &.icon-female { - color: #ffadd2 !important; - } - } - - // proficiency filed custom cell style - .table-body-cell-proficiency { - padding: 0 !important; - } - // proficiency filed - .proficiency-span-container { - height: 100%; - text-align: left; - .proficiency-span { - height: 100%; - display: inline-flex; - align-items: center; - padding-left: 10px; - font-weight: bold; - color: #555; - - &.demo-blue { - background-color: RGBA(24, 144, 255, 0.7); - } - &.demo-orange { - background-color: RGBA(255, 179, 0, 0.7); - } - &.demo-red { - background-color: RGBA(244, 93, 81, 0.7); - } - } - } - - // skills - .skill-span { - display: inline-block; - margin-right: 5px; - padding: 3px 8px; - border-radius: 4px; - color: #333; - } - } } diff --git a/examples/src/demo/normal-data-grid.vue b/examples/src/demo/normal-data-grid.vue new file mode 100644 index 000000000..a33eb01fe --- /dev/null +++ b/examples/src/demo/normal-data-grid.vue @@ -0,0 +1,659 @@ + + + + diff --git a/examples/src/demo/spreadsheet.vue b/examples/src/demo/spreadsheet.vue new file mode 100644 index 000000000..3fb37a009 --- /dev/null +++ b/examples/src/demo/spreadsheet.vue @@ -0,0 +1,3 @@ + From 1bc21a71dc39ad623d753a0254f3a14e9371d57b Mon Sep 17 00:00:00 2001 From: huangshuwei Date: Tue, 23 Aug 2022 01:04:51 +0800 Subject: [PATCH 005/343] refine doc --- examples/src/demo/index.vue | 36 ++++- examples/src/demo/normal-data-grid.vue | 4 +- examples/src/demo/spreadsheet.vue | 190 ++++++++++++++++++++++++- 3 files changed, 227 insertions(+), 3 deletions(-) diff --git a/examples/src/demo/index.vue b/examples/src/demo/index.vue index d00f0d505..ace511f20 100644 --- a/examples/src/demo/index.vue +++ b/examples/src/demo/index.vue @@ -1,17 +1,30 @@ From 7e4178c41539af79c0c8ddf1ff48db126e90d525 Mon Sep 17 00:00:00 2001 From: huangshuwei Date: Wed, 24 Aug 2022 00:49:40 +0800 Subject: [PATCH 006/343] Update spreadsheet.vue --- examples/src/demo/spreadsheet.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/src/demo/spreadsheet.vue b/examples/src/demo/spreadsheet.vue index 247f69fc0..77ae421c2 100644 --- a/examples/src/demo/spreadsheet.vue +++ b/examples/src/demo/spreadsheet.vue @@ -117,7 +117,7 @@ export default { // is operation column operationColumn: true, title: "#", - width: 30, + width: 35, fixed: "left", renderBodyCell: this.renderRowIndex, }, @@ -153,7 +153,7 @@ export default { }, initTableData() { let tableData = []; - for (let i = 0; i < 100; i++) { + for (let i = 0; i < 5000; i++) { let dataItem = { rowKey: i, }; From f06e94c1e765379ee9700d1507f77bfa08ff1b58 Mon Sep 17 00:00:00 2001 From: huangshuwei Date: Wed, 24 Aug 2022 00:53:43 +0800 Subject: [PATCH 007/343] Update spreadsheet.vue --- examples/src/demo/spreadsheet.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/src/demo/spreadsheet.vue b/examples/src/demo/spreadsheet.vue index 77ae421c2..3c86c28f8 100644 --- a/examples/src/demo/spreadsheet.vue +++ b/examples/src/demo/spreadsheet.vue @@ -167,9 +167,9 @@ export default { dataItem["D"] = "CAN"; dataItem["E"] = "TRY"; dataItem["F"] = "ENTER"; - dataItem["G"] = "SOMET"; - dataItem["G"] = "WORD"; - dataItem["H"] = "!!!"; + dataItem["G"] = "SOME"; + dataItem["H"] = "WORDS"; + dataItem["I"] = "!!!"; } tableData.push(dataItem); From af42339b76745923949a7dadb285f053b0b0d20a Mon Sep 17 00:00:00 2001 From: huangshuwei Date: Wed, 24 Aug 2022 01:05:26 +0800 Subject: [PATCH 008/343] refine doc --- examples/src/comp/locale/index.js | 109 ++++++++++++++----------- examples/src/demo/index.vue | 13 ++- examples/src/demo/normal-data-grid.vue | 2 +- 3 files changed, 73 insertions(+), 51 deletions(-) diff --git a/examples/src/comp/locale/index.js b/examples/src/comp/locale/index.js index f470e3039..300c2568f 100644 --- a/examples/src/comp/locale/index.js +++ b/examples/src/comp/locale/index.js @@ -40,30 +40,36 @@ export default { openInCodeSandBox: "在 CodeSandBox 中编辑", }, completeDemo: { - dataRowsOption: [ - { - value: 5000, - label: "5000 行", - }, - { - value: 10000, - label: "10,000 行", - }, - { - value: 100000, - label: "100,000 行", - }, - { - value: 150000, - label: "150,000 行", - }, - ], - dataRows: "数据量：", - columnFixed: "列固定：", - loading: "Loading：", - expand: "行展开：", - radio: "行单选：", - checkbox: "行多选：", + demo1: { + selection: "这是数据表格的应用场景", + dataRowsOption: [ + { + value: 5000, + label: "5000 行", + }, + { + value: 10000, + label: "10,000 行", + }, + { + value: 100000, + label: "100,000 行", + }, + { + value: 150000, + label: "150,000 行", + }, + ], + dataRows: "数据量：", + columnFixed: "列固定：", + loading: "Loading：", + expand: "行展开：", + radio: "行单选：", + checkbox: "行多选：", + }, + demo2: { + selection: "当然，你也可以把它当做 Excel 来用", + }, }, }, en: { @@ -103,30 +109,37 @@ export default { openInCodeSandBox: "Edit in CodeSandBox", }, completeDemo: { - dataRowsOption: [ - { - value: 5000, - label: "5000 Rows", - }, - { - value: 10000, - label: "10,000 Rows", - }, - { - value: 100000, - label: "100,000 Rows", - }, - { - value: 150000, - label: "150,000 Rows", - }, - ], - dataRows: "Data Rows:", - columnFixed: "Fixed Columns:", - loading: "Loading:", - expand: "Row Expand:", - radio: "Row Radio:", - checkbox: "Row Checkbox:", + demo1: { + selection: "Here is a data grid .", + dataRowsOption: [ + { + value: 5000, + label: "5000 Rows", + }, + { + value: 10000, + label: "10,000 Rows", + }, + { + value: 100000, + label: "100,000 Rows", + }, + { + value: 150000, + label: "150,000 Rows", + }, + ], + dataRows: "Data Rows:", + columnFixed: "Fixed Columns:", + loading: "Loading:", + expand: "Row Expand:", + radio: "Row Radio:", + checkbox: "Row Checkbox:", + }, + demo2: { + selection: + "Of course, you can use it like Excel or Google Sheets .", + }, }, }, }; diff --git a/examples/src/demo/index.vue b/examples/src/demo/index.vue index ace511f20..05eb94e80 100644 --- a/examples/src/demo/index.vue +++ b/examples/src/demo/index.vue @@ -3,13 +3,13 @@
- This is a simple data table display. + {{ currentLocal.demo1.selection }}
- Of course, you can also use it like Excel or Google Sheets . + {{ currentLocal.demo2.selection }}
@@ -18,6 +18,8 @@