Merge remote-tracking branch 'upstream/master'

.eslintrc.js

@@ -15,11 +15,7 @@ module.exports = {
     'no-console': 'off',
     'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
     '@typescript-eslint/no-unused-vars': process.env.NODE_ENV === 'production' ? 'error' : 'warn',
-    '@typescript-eslint/explicit-module-boundary-types': 'off',
     '@typescript-eslint/no-explicit-any': 'off',
-    '@typescript-eslint/no-empty-interface': 'off',
-    'vue/multi-word-component-names': 'off',
-    'vue/multi-word-component': 'off',
-    'multiline-ternary': 'off'
+    'vue/multi-word-component-names': 'off'
   }
 }

.gitignore

@@ -1,15 +1,12 @@
 .DS_Store
 .history
 node_modules
+/lib_temp
+/packages_temp
 /dist
 /es
 /lib
 /docs
-/public/v1
-/public/v2
-/public/v3
-/public/v3.5
-/public/v4
 package-lock.json
 yarn.lock
 

README.en.md

@@ -12,7 +12,7 @@
 [![pull requests closed](https://img.shields.io/github/issues-pr-closed/x-extends/vxe-table.svg)](https://github.com/x-extends/vxe-table/pulls?q=is%3Apr+is%3Aclosed)
 [![npm license](https://img.shields.io/github/license/mashape/apistatus.svg)](LICENSE)
 
-A [vue](https://www.npmjs.com/package/vue) based PC form component, support add delete change check, virtual tree, column drag and drop, lazy loading, shortcut menu, data verification, print export, form rendering, custom template, renderer, JSON configuration...
+A [vue](https://www.npmjs.com/package/vue) based PC form component, support add delete change check, virtual tree, column drag and drop, lazy loading, shortcut menu, data verification, import/export/print, form rendering, custom template, renderer, JSON configuration...
 
 * Design concept
   * Efficient and concise API design for modern browsers.
@@ -22,8 +22,10 @@ A [vue](https://www.npmjs.com/package/vue) based PC form component, support add
 * Plan
   * [x] ~~v1.0 Based on vue2.6, Support for all major browsers.~~
   * [x] ~~v2.0 Based on vue2.6, Support for all major browsers.~~
-  * [x] v3.0 Based on vue2.6, supports modern browsers and retains compatibility with IE11.
-  * [x] v4.0 Based on vue3.x, Only support modern browser, not IE.
+  * [x] v3.0 Based on vue2.6+, supports modern browsers and retains compatibility with IE11.
+  * [ ] v3.9 Based on vue2.6+, Reconstruct and split the components into [Vxe table](https://github.com/x-extends/vxe-table) and [Vxe UI](https://github.com/x-extends/vxe-pc-ui). Form Designer, list designer, process designer will be supported.
+  * [x] v4.0 Based on vue3.2+, Only support modern browser, not IE.
+  * [x] v4.7 Based on vue3.2+, Reconstruct and split the components into [Vxe table](https://github.com/x-extends/vxe-table) and [Vxe UI](https://github.com/x-extends/vxe-pc-ui). Form Designer, list designer, process designer will be supported.
 
 ## Browser Support
 
@@ -90,10 +92,10 @@ Get on [unpkg](https://unpkg.com/vxe-table/) and [cdnjs](https://cdn.jsdelivr.ne
 
 ```javascript
 import { createApp } from 'vue'
-import VXETable from 'vxe-table'
+import VxeUITable from 'vxe-table'
 import 'vxe-table/lib/style.css'
 
-createApp(App).use(VXETable).mount('#app')
+createApp(App).use(VxeUITable).mount('#app')
 ```
 
 ### CDN

README.md

@@ -16,7 +16,7 @@ vxe-table-cz仓库：https://github.com/WHIPLASHCZ/vxe-table-fix-checkbox
 [![pull requests closed](https://img.shields.io/github/issues-pr-closed/x-extends/vxe-table.svg)](https://github.com/x-extends/vxe-table/pulls?q=is%3Apr+is%3Aclosed)
 [![npm license](https://img.shields.io/github/license/mashape/apistatus.svg)](LICENSE)
 
-一个基于 [vue](https://www.npmjs.com/package/vue) 的 PC 端表单/表格组件，支持增删改查、虚拟树、列拖拽、懒加载、快捷菜单、数据校验、打印导出、表单渲染、自定义模板、渲染器、JSON 配置式...  
+一个基于 [vue](https://www.npmjs.com/package/vue) 的 PC 端表单/表格组件，支持增删改查、虚拟树、列拖拽、懒加载、快捷菜单、数据校验、导入/导出/打印、表单渲染、自定义模板、渲染器、JSON 配置式...  
 
 * 设计理念
   * 面向现代浏览器，高效的简洁 API 设计
@@ -26,8 +26,10 @@ vxe-table-cz仓库：https://github.com/WHIPLASHCZ/vxe-table-fix-checkbox
 * 计划
   * [x] ~~v1.0 基于 vue2.6，支持所有主流的浏览器，实现表格的一切实用的功能~~
   * [x] ~~v2.0 基于 vue2.6，支持所有主流的浏览器，同时兼具功能与性能~~
-  * [x] v3.0 基于 vue2.6，支持现代浏览器并保留兼容 IE11
-  * [x] v4.0 基于 vue3.x，只支持现代浏览器，不支持 IE
+  * [x] v3.0 基于 vue2.6+，支持现代浏览器并保留兼容 IE11
+  * [ ] v3.9 基于 vue2.6+，重构拆分组件，分为 [Vxe table](https://github.com/x-extends/vxe-table) 和 [Vxe UI](https://github.com/x-extends/vxe-pc-ui)，将支持表单设计器、列表你设计器、流程设计器
+  * [x] v4.0 基于 vue3.2+，只支持现代浏览器，不支持 IE
+  * [x] v4.7 基于 vue3.2+，重构拆分组件，分为 [Vxe table](https://github.com/x-extends/vxe-table) 和 [Vxe UI](https://github.com/x-extends/vxe-pc-ui)，将支持表单设计器、列表你设计器、流程设计器
   * [ ] 下一阶段：sticky 渲染模式、将虚拟滚动提升到极致、虚拟滚动动态行高、数据图表可视化
 
 ## 浏览器支持
@@ -101,10 +103,10 @@ Get on [unpkg](https://unpkg.com/vxe-table/) and [cdnjs](https://cdn.jsdelivr.ne
 
 ```javascript
 import { createApp } from 'vue'
-import VXETable from 'vxe-table'
+import VxeUITable from 'vxe-table'
 import 'vxe-table/lib/style.css'
 
-createApp(App).use(VXETable).mount('#app')
+createApp(App).use(VxeUITable).mount('#app')
 ```
 
 ### CDN

README.zh-TW.md

@@ -12,7 +12,7 @@
 [![pull requests closed](https://img.shields.io/github/issues-pr-closed/x-extends/vxe-table.svg)](https://github.com/x-extends/vxe-table/pulls?q=is%3Apr+is%3Aclosed)
 [![npm license](https://img.shields.io/github/license/mashape/apistatus.svg)](LICENSE)
 
-一個基於 [vue](https://www.npmjs.com/package/vue) 的PC端表格組件，支持增刪改查、虛擬樹、列拖拽、懶加載、快捷菜單、數據校驗、打印導出、表單渲染、自定義模板、渲染器、JSON 配置式…
+一個基於 [vue](https://www.npmjs.com/package/vue) 的PC端表格組件，支持增刪改查、虛擬樹、列拖拽、懶加載、快捷菜單、數據校驗、導入/匯出/列印、表單渲染、自定義模板、渲染器、JSON 配置式…
 
 * 設計理念
   * 面向現代瀏覽器，高效的簡潔 API 設計
@@ -22,8 +22,10 @@
 * 計劃
   * [x] ~~v1.0 基於 vue2.6，支持所有主流的瀏覽器，實現表格的一切實用的功能~~
   * [x] ~~v2.0 基於 vue2.6，支持所有主流的瀏覽器，同時兼具功能與效能~~
-  * [x] v3.0 基於 vue2.6，支持現代瀏覽器並保留相容IE11
+  * [x] v3.0 基於 vue2.6+，支持現代瀏覽器並保留相容IE11
+  * [ ] v3.9 基於 vue2.6+，重構拆分組件，分爲 [Vxe table](https://github.com/x-extends/vxe-table) 和 [Vxe UI](https://github.com/x-extends/vxe-pc-ui)，將支持表單設計器、列表你設計器、流程設計器
   * [x] v4.0 基于 vue3.x，只支持現代瀏覽器，不支持IE
+  * [x] v4.7 基於 vue3.x，重構拆分組件，分爲 [Vxe table](https://github.com/x-extends/vxe-table) 和 [Vxe UI](https://github.com/x-extends/vxe-pc-ui)，將支持表單設計器、列表你設計器、流程設計器
 
 ## 瀏覽器支持
 
@@ -89,10 +91,10 @@ Get on [unpkg](https://unpkg.com/vxe-table/) and [cdnjs](https://cdn.jsdelivr.ne
 
 ```javascript
 import { createApp } from 'vue'
-import VXETable from 'vxe-table'
+import VxeUITable from 'vxe-table'
 import 'vxe-table/lib/style.css'
 
-createApp(App).use(VXETable).mount('#app')
+createApp(App).use(VxeUITable).mount('#app')
 ```
 
 ### CDN