[pull] master from x-extends:master

.eslintrc.js

@@ -15,7 +15,6 @@ 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/no-explicit-any': 'off',
-    'vue/multi-word-component-names': 'off'
+    '@typescript-eslint/no-explicit-any': 'off'
   }
 }

.gitee/ISSUE_TEMPLATE/bug_report.yml

@@ -5,10 +5,18 @@ body:
 - type: input
   id: issue_link
   attributes:
-    label: "可复现的链接："
-    description: "一个最小化的重现示例能让我们精确地定位问题，从而快速解决问题。如何创建，点击 v3：[codesandbox](https://codesandbox.io/s/vue-template-916h0)、[jsfiddle](https://jsfiddle.net/86p7Ltny/)、[jsrun](https://jsrun.net/vIyKp/edit) 或 v4：[codesandbox](https://codesandbox.io/s/vxe-table-wentiyanshi-forked-54v2j)、[jsfiddle](https://jsfiddle.net/9qoghkbj/)、[jsrun](https://jsrun.net/K5IKp/edit)，将代码示例编辑后保存。"
+    label: "可复现的链接（必须为公开链接，仅包含能复现问题的示例代码）："
+    description: "一个最小化的重现示例能让我们精确地定位问题，从而快速解决问题。"
   validations:
     required: true
+- type: checkboxes
+  id: issue_confirm_read_agreement
+  attributes:
+    label: "是否已准备好复现链接与示例代码？"
+    description: "按要求准备好复现 Demo，复现 Demo 操作步骤：https://vxetable.cn/issues.html"
+    options:
+    - label: "我确定已准备好以上复现链接"
+      required: true
 - type: textarea
   id: issue_describe
   attributes:
@@ -17,7 +25,7 @@ body:
     required: true
 - type: markdown
   attributes:
-    value: "在发布问题之前，请仔细阅读所填写的步骤，以确保是详细和清晰的。"
+    value: "在发布问题之前，请先查阅[最新文档](https://vxetable.cn/)确保使用的是最新版本，并仔细阅读所填写的步骤，以确保是详细和清晰的。"
 - type: input
   id: issue_expect
   attributes:
@@ -40,13 +48,28 @@ body:
   id: issue_vue_version
   attributes:
     label: "vue 版本："
-    placeholder: "例如：2.6.0"
+    placeholder: "例如：3.4.27"
+  validations:
+    required: true
+- type: input
+  id: issue_vxe_ui_version
+  attributes:
+    label: "vxe-pc-ui 版本："
+    placeholder: "例如：4.3.51"
   validations:
     required: true
 - type: input
-  id: issue_vxe_version
+  id: issue_vxe_table_version
   attributes:
     label: "vxe-table 版本："
-    placeholder: "例如：3.4.0"
+    placeholder: "例如：4.9.35"
   validations:
     required: true
+- type: checkboxes
+  id: issue_confirm_latest_version
+  attributes:
+    label: "是否使用当前最新版本？"
+    description: "仅支持提交最新版本的问题反馈，非最新版本不予处理，一律自动关闭"
+    options:
+    - label: "我确定已经更新到最新版本后依然存在该问题"
+      required: true

.gitee/ISSUE_TEMPLATE/feature_request.yml

@@ -10,7 +10,7 @@ body:
     required: true
 - type: markdown
   attributes:
-    value: "请先查看[最新文档](https://xuliangzhan_admin.gitee.io/vxe-table/#/table/api)，确定该功能是否已有实现"
+    value: "请先查阅[最新文档](https://vxetable.cn/)，确定该功能是否已有实现"
 - type: textarea
   id: issue_api_describe
   attributes:
@@ -25,3 +25,11 @@ body:
 - type: markdown
   attributes:
     value: "如果有其他已实现的方案，可以通过链接或截图描述一下"
+- type: checkboxes
+  id: issue_confirm_latest_version
+  attributes:
+    label: "是否使用当前最新版本？"
+    description: "官方只维护最新版本，如果不是最新版本，请先更新到[最新版本](https://vxetable.cn/)之后再反馈问题！"
+    options:
+    - label: "我已确认是使用当前的最新版本。"
+      required: true

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -5,10 +5,18 @@ body:
 - type: input
   id: issue_link
   attributes:
-    label: "可复现的链接："
-    description: "一个最小化的重现示例能让我们精确地定位问题，从而快速解决问题。如何创建，点击 v3：[codesandbox](https://codesandbox.io/s/vue-template-916h0)、[jsfiddle](https://jsfiddle.net/86p7Ltny/)、[jsrun](https://jsrun.net/vIyKp/edit) 或 v4：[codesandbox](https://codesandbox.io/s/vxe-table-wentiyanshi-forked-54v2j)、[jsfiddle](https://jsfiddle.net/9qoghkbj/)、[jsrun](https://jsrun.net/K5IKp/edit)，将代码示例编辑后保存。"
+    label: "可复现的链接（必须为公开链接，仅包含能复现问题的示例代码）："
+    description: "一个最小化的重现示例能让我们精确地定位问题，从而快速解决问题。"
   validations:
     required: true
+- type: checkboxes
+  id: issue_confirm_read_agreement
+  attributes:
+    label: "是否已准备好复现链接与示例代码？"
+    description: "按要求准备好复现 Demo，复现 Demo 操作步骤：https://vxetable.cn/issues.html"
+    options:
+    - label: "我确定已准备好以上复现链接"
+      required: true
 - type: textarea
   id: issue_describe
   attributes:
@@ -17,7 +25,7 @@ body:
     required: true
 - type: markdown
   attributes:
-    value: "在发布问题之前，请仔细阅读所填写的步骤，以确保是详细和清晰的。"
+    value: "在发布问题之前，请先查阅[最新文档](https://vxetable.cn/)确保使用的是最新版本，并仔细阅读所填写的步骤，以确保是详细和清晰的。"
 - type: input
   id: issue_expect
   attributes:
@@ -40,13 +48,28 @@ body:
   id: issue_vue_version
   attributes:
     label: "vue 版本："
-    placeholder: "例如：2.6.0"
+    placeholder: "例如：3.4.27"
+  validations:
+    required: true
+- type: input
+  id: issue_vxe_ui_version
+  attributes:
+    label: "vxe-pc-ui 版本："
+    placeholder: "例如：4.3.51"
   validations:
     required: true
 - type: input
-  id: issue_vxe_version
+  id: issue_vxe_table_version
   attributes:
     label: "vxe-table 版本："
-    placeholder: "例如：3.4.0"
+    placeholder: "例如：4.9.35"
   validations:
     required: true
+- type: checkboxes
+  id: issue_confirm_latest_version
+  attributes:
+    label: "是否使用当前最新版本？"
+    description: "仅支持提交最新版本的问题反馈，非最新版本不予处理，一律自动关闭"
+    options:
+    - label: "我确定已经更新到最新版本后依然存在该问题"
+      required: true

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -10,7 +10,7 @@ body:
     required: true
 - type: markdown
   attributes:
-    value: "请先查看[最新文档](https://xuliangzhan_admin.gitee.io/vxe-table/#/table/api)，确定该功能是否已有实现"
+    value: "请先查阅[最新文档](https://vxetable.cn/)，确定该功能是否已有实现"
 - type: textarea
   id: issue_api_describe
   attributes:
@@ -25,3 +25,11 @@ body:
 - type: markdown
   attributes:
     value: "如果有其他已实现的方案，可以通过链接或截图描述一下"
+- type: checkboxes
+  id: issue_confirm_latest_version
+  attributes:
+    label: "是否使用当前最新版本？"
+    description: "官方只维护最新版本，如果不是最新版本，请先更新到[最新版本](https://vxetable.cn/)之后再反馈问题！"
+    options:
+    - label: "我已确认是使用当前的最新版本。"
+      required: true

README.en.md

@@ -1,8 +1,8 @@
 # vxe-table
 
-[简体中文](README.md) | [繁體中文](README.zh-TW.md) | English  
+[简体中文](README.md) | [繁體中文](README.zh-TW.md) | English | [日本語](README.ja-JP.md)  
 
-[![star](https://gitee.com/xuliangzhan_admin/vxe-table/badge/star.svg?theme=gvp)](https://gitee.com/xuliangzhan_admin/vxe-table/stargazers)
+[![star](https://gitee.com/x-extends/vxe-table/badge/star.svg?theme=gvp)](https://gitee.com/x-extends/vxe-table/stargazers)
 [![npm version](https://img.shields.io/npm/v/vxe-table.svg?style=flat-square)](https://www.npmjs.com/package/vxe-table)
 [![NodeJS with Webpack](https://github.com/x-extends/vxe-table/actions/workflows/webpack.yml/badge.svg)](https://github.com/x-extends/vxe-table/actions/workflows/webpack.yml)
 [![npm downloads](https://img.shields.io/npm/dt/vxe-table.svg?style=flat-square)](https://npm-stat.com/charts.html?package=vxe-table)
@@ -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, import/export/print, 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, drag and drop, lazy loading, shortcut menu, data verification, import/export/print, form rendering, custom template, renderer, JSON configuration...
 
 ## Browser Support
 
@@ -28,6 +28,8 @@ Latest ✔ | Latest ✔ | Latest ✔ | Latest ✔ | Latest ✔ |
 * [x] Table with border
 * [x] Cell style
 * [x] Column resizing
+* [x] Column drag and drop
+* [x] Row drag and drop
 * [x] Minimum/maximum height
 * [x] Resize height & width
 * [x] Fixed column
@@ -64,25 +66,44 @@ Latest ✔ | Latest ✔ | Latest ✔ | Latest ✔ | Latest ✔ |
 * [x] ([Enterprise](https://vxetable.cn/pluginDocs/)) Cell copy & paste
 * [x] ([Enterprise](https://vxetable.cn/pluginDocs/)) Cell find and replace
 * [x] ([Enterprise](https://vxetable.cn/pluginDocs/)) Full keyboard operation
+* [x] ([Enterprise](https://vxetable.cn/pluginDocs/)) Integrated chart
 
 ## Installing
 
 Version: [vue](https://www.npmjs.com/package/vue) 3.x
 
 ```shell
-npm install vxe-table
+npm install vxe-table@next
 ```
 
 Get on [unpkg](https://unpkg.com/vxe-table/) and [cdnjs](https://cdn.jsdelivr.net/npm/vxe-table/)
 
-### npm
+### NPM
+
+### Use Table
+
+```javascript
+// ...
+import VxeTable from 'vxe-table'
+import 'vxe-table/lib/style.css'
+// ...
+
+createApp(App).use(VxeTable).mount('#app')
+```
+
+### Use Table and UI
 
 ```javascript
-import { createApp } from 'vue'
-import VxeUITable from 'vxe-table'
+// ...
+import VxeTable from 'vxe-table'
 import 'vxe-table/lib/style.css'
+// ...
+
+import VxeUI from 'vxe-pc-ui'
+import 'vxe-pc-ui/lib/style.css'
+// ...
 
-createApp(App).use(VxeUITable).mount('#app')
+createApp(App).use(VxeUI).use(VxeTable).mount('#app')
 ```
 
 ### CDN
@@ -91,11 +112,15 @@ Use a third-party CDN to remember to lock the version number to avoid being affe
 ***It is not recommended to use the CDN address of a third party in a formal environment because the connection can fail at any time***  
 
 ```HTML
-<!-- Style -->
-<link rel="stylesheet" href="https://unpkg.com/vxe-table/lib/style.css">
-<!-- Script -->
-<script src="https://unpkg.com/xe-utils"></script>
-<script src="https://unpkg.com/vxe-table"></script>
+<!-- style -->
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/vxe-pc-ui/lib/style.css">
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/vxe-table@next/lib/style.css">
+<!-- vue -->
+<script src="https://cdn.jsdelivr.net/npm/vue"></script>
+<!-- table -->
+<script src="https://cdn.jsdelivr.net/npm/xe-utils"></script>
+<script src="https://cdn.jsdelivr.net/npm/vxe-pc-ui"></script>
+<script src="https://cdn.jsdelivr.net/npm/vxe-table@next"></script>
 ```
 
 ## Example
@@ -128,14 +153,15 @@ const tableData = ref([
 
 ## Online Documents
 
-👉 [Document](https://vxetable.cn)  
+👉 [UI Document](https://vxeui.com)  
+👉 [Table Document](https://vxetable.cn)  
 
 ## Run the project
 
 Install dependencies
 
 ```shell
-npm install
+npm run update
 ```
 
 Start local debugging