Merge branch 'xinyan' into test

package-lock.json

@@ -53,7 +53,7 @@
 				"vue-grid-layout": "^3.0.0-beta1",
 				"vue-i18n": "^9.5.0",
 				"vue-router": "^4.3.0",
-				"vxe-table": "^4.5.20",
+				"vxe-table": "^4.7.91",
 				"xe-utils": "^3.5.7"
 			},
 			"devDependencies": {
@@ -5095,6 +5095,18 @@
 				}
 			}
 		},
+		"node_modules/@vxe-ui/core": {
+			"version": "4.0.16",
+			"resolved": "https://registry.npmmirror.com/@vxe-ui/core/-/core-4.0.16.tgz",
+			"integrity": "sha512-7d8485RYAv3tgr5+ckz5iK+Tt3yPjcXBaWcRdxRrxnDJNYVq6A4jAFT+Z9eHoFxqx60ASTOVCqnS8Tav/oPutA==",
+			"dependencies": {
+				"dom-zindex": "^1.0.6",
+				"xe-utils": "^3.5.31"
+			},
+			"peerDependencies": {
+				"vue": "^3.2.0"
+			}
+		},
 		"node_modules/@wangeditor/basic-modules": {
 			"version": "1.1.7",
 			"resolved": "https://registry.npmmirror.com/@wangeditor/basic-modules/-/basic-modules-1.1.7.tgz",
@@ -6097,9 +6109,9 @@
 			}
 		},
 		"node_modules/dom-zindex": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmmirror.com/dom-zindex/-/dom-zindex-1.0.1.tgz",
-			"integrity": "sha512-M/MERVDZ8hguvjl6MAlLWSLYLS7PzEyXaTb5gEeJ+SF+e9iUC0sdvlzqe91MMDHBoy+nqw7wKcUOrDSyvMCrRg=="
+			"version": "1.0.6",
+			"resolved": "https://registry.npmmirror.com/dom-zindex/-/dom-zindex-1.0.6.tgz",
+			"integrity": "sha512-FKWIhiU96bi3xpP9ewRMgANsoVmMUBnMnmpCT6dPMZOunVYJQmJhSRruoI0XSPoHeIif3kyEuiHbFrOJwEJaEA=="
 		},
 		"node_modules/dom7": {
 			"version": "3.0.0",
@@ -10332,23 +10344,21 @@
 			"resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.14.0.tgz",
 			"integrity": "sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w=="
 		},
-		"node_modules/vxe-table": {
-			"version": "4.5.20",
-			"resolved": "https://registry.npmmirror.com/vxe-table/-/vxe-table-4.5.20.tgz",
-			"integrity": "sha512-UC+z1ED3QE6Be/UN0390hSXMAseXg+com3fkX9q3tjfsCGFx7CjN9tLstuNtecn+ElkPGHqzRGtA3N5FTSv5Vw==",
+		"node_modules/vxe-pc-ui": {
+			"version": "4.2.26",
+			"resolved": "https://registry.npmmirror.com/vxe-pc-ui/-/vxe-pc-ui-4.2.26.tgz",
+			"integrity": "sha512-dwPN0r0X+C6fr8ve0Tug19RZjxcdWQRfYy3V2fzqOoz+t2eB2F085/Pn7+Zpjps7mxajJCsgfQKSakN9tOKTmg==",
 			"dependencies": {
-				"dom-zindex": "^1.0.1",
-				"xe-utils": "^3.5.20"
-			},
-			"peerDependencies": {
-				"vue": "^3.2.28",
-				"xe-utils": "^3.5.0"
+				"@vxe-ui/core": "^4.0.16"
 			}
 		},
-		"node_modules/vxe-table/node_modules/xe-utils": {
-			"version": "3.5.20",
-			"resolved": "https://registry.npmmirror.com/xe-utils/-/xe-utils-3.5.20.tgz",
-			"integrity": "sha512-dZewCp04O0xQ4JnUxlvRfxsBlV1vxrA9LCazGAFFeRWoTj0DU70OpqUNd8is1GnJXUL4ineZ4nywrEq/3Mbybg=="
+		"node_modules/vxe-table": {
+			"version": "4.7.93",
+			"resolved": "https://registry.npmmirror.com/vxe-table/-/vxe-table-4.7.93.tgz",
+			"integrity": "sha512-LkL/VWenJFGrPRG3BZdbThOJd3WGv1IXLfxVmaeWb8Oyj9LG902o9FP8GNQWFbZ+8Kj5SCUaUUF5S3pvbPXN+g==",
+			"dependencies": {
+				"vxe-pc-ui": "^4.2.26"
+			}
 		},
 		"node_modules/webpack-sources": {
 			"version": "3.2.3",
@@ -10536,9 +10546,9 @@
 			}
 		},
 		"node_modules/xe-utils": {
-			"version": "3.5.13",
-			"resolved": "https://registry.npmmirror.com/xe-utils/-/xe-utils-3.5.13.tgz",
-			"integrity": "sha512-ORT6ghCRk0mUVavMBxetcPzUPskS6NGfntzpWazJ86e+XU0uK4HwHfDhN/jKATiyInrOH5RwQo9SO/+DB8XeBw=="
+			"version": "3.5.31",
+			"resolved": "https://registry.npmmirror.com/xe-utils/-/xe-utils-3.5.31.tgz",
+			"integrity": "sha512-oS4yv8qktvlE0wc9yYkitDidEmThc5qN0UTRvKCvrWnejxbTyIxbwfrdZmPKdKGZtB+/U8cEAMFywLJjHtD11A=="
 		},
 		"node_modules/xlsx": {
 			"version": "0.18.5",
@@ -14639,6 +14649,15 @@
 				}
 			}
 		},
+		"@vxe-ui/core": {
+			"version": "4.0.16",
+			"resolved": "https://registry.npmmirror.com/@vxe-ui/core/-/core-4.0.16.tgz",
+			"integrity": "sha512-7d8485RYAv3tgr5+ckz5iK+Tt3yPjcXBaWcRdxRrxnDJNYVq6A4jAFT+Z9eHoFxqx60ASTOVCqnS8Tav/oPutA==",
+			"requires": {
+				"dom-zindex": "^1.0.6",
+				"xe-utils": "^3.5.31"
+			}
+		},
 		"@wangeditor/basic-modules": {
 			"version": "1.1.7",
 			"resolved": "https://registry.npmmirror.com/@wangeditor/basic-modules/-/basic-modules-1.1.7.tgz",
@@ -15420,9 +15439,9 @@
 			}
 		},
 		"dom-zindex": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmmirror.com/dom-zindex/-/dom-zindex-1.0.1.tgz",
-			"integrity": "sha512-M/MERVDZ8hguvjl6MAlLWSLYLS7PzEyXaTb5gEeJ+SF+e9iUC0sdvlzqe91MMDHBoy+nqw7wKcUOrDSyvMCrRg=="
+			"version": "1.0.6",
+			"resolved": "https://registry.npmmirror.com/dom-zindex/-/dom-zindex-1.0.6.tgz",
+			"integrity": "sha512-FKWIhiU96bi3xpP9ewRMgANsoVmMUBnMnmpCT6dPMZOunVYJQmJhSRruoI0XSPoHeIif3kyEuiHbFrOJwEJaEA=="
 		},
 		"dom7": {
 			"version": "3.0.0",
@@ -18748,20 +18767,20 @@
 				}
 			}
 		},
+		"vxe-pc-ui": {
+			"version": "4.2.26",
+			"resolved": "https://registry.npmmirror.com/vxe-pc-ui/-/vxe-pc-ui-4.2.26.tgz",
+			"integrity": "sha512-dwPN0r0X+C6fr8ve0Tug19RZjxcdWQRfYy3V2fzqOoz+t2eB2F085/Pn7+Zpjps7mxajJCsgfQKSakN9tOKTmg==",
+			"requires": {
+				"@vxe-ui/core": "^4.0.16"
+			}
+		},
 		"vxe-table": {
-			"version": "4.5.20",
-			"resolved": "https://registry.npmmirror.com/vxe-table/-/vxe-table-4.5.20.tgz",
-			"integrity": "sha512-UC+z1ED3QE6Be/UN0390hSXMAseXg+com3fkX9q3tjfsCGFx7CjN9tLstuNtecn+ElkPGHqzRGtA3N5FTSv5Vw==",
+			"version": "4.7.93",
+			"resolved": "https://registry.npmmirror.com/vxe-table/-/vxe-table-4.7.93.tgz",
+			"integrity": "sha512-LkL/VWenJFGrPRG3BZdbThOJd3WGv1IXLfxVmaeWb8Oyj9LG902o9FP8GNQWFbZ+8Kj5SCUaUUF5S3pvbPXN+g==",
 			"requires": {
-				"dom-zindex": "^1.0.1",
-				"xe-utils": "^3.5.20"
-			},
-			"dependencies": {
-				"xe-utils": {
-					"version": "3.5.20",
-					"resolved": "https://registry.npmmirror.com/xe-utils/-/xe-utils-3.5.20.tgz",
-					"integrity": "sha512-dZewCp04O0xQ4JnUxlvRfxsBlV1vxrA9LCazGAFFeRWoTj0DU70OpqUNd8is1GnJXUL4ineZ4nywrEq/3Mbybg=="
-				}
+				"vxe-pc-ui": "^4.2.26"
 			}
 		},
 		"webpack-sources": {
@@ -18899,9 +18918,9 @@
 			"requires": {}
 		},
 		"xe-utils": {
-			"version": "3.5.13",
-			"resolved": "https://registry.npmmirror.com/xe-utils/-/xe-utils-3.5.13.tgz",
-			"integrity": "sha512-ORT6ghCRk0mUVavMBxetcPzUPskS6NGfntzpWazJ86e+XU0uK4HwHfDhN/jKATiyInrOH5RwQo9SO/+DB8XeBw=="
+			"version": "3.5.31",
+			"resolved": "https://registry.npmmirror.com/xe-utils/-/xe-utils-3.5.31.tgz",
+			"integrity": "sha512-oS4yv8qktvlE0wc9yYkitDidEmThc5qN0UTRvKCvrWnejxbTyIxbwfrdZmPKdKGZtB+/U8cEAMFywLJjHtD11A=="
 		},
 		"xlsx": {
 			"version": "0.18.5",

package.json

@@ -53,7 +53,7 @@
 		"vue-grid-layout": "^3.0.0-beta1",
 		"vue-i18n": "^9.5.0",
 		"vue-router": "^4.3.0",
-		"vxe-table": "^4.5.20",
+		"vxe-table": "^4.7.91",
 		"xe-utils": "^3.5.7"
 	},
 	"devDependencies": {