From 8452e5b6bd64a18ab445299233a6ae7aa47cc7e0 Mon Sep 17 00:00:00 2001 From: KaneLeung Date: Thu, 29 Jun 2023 06:52:57 +0000 Subject: [PATCH] =?UTF-8?q?proxyConfig.enabled=E4=B8=BA=E7=9C=9F=E6=89=8D?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E5=86=B2=E7=AA=81=EF=BC=8C=E9=81=BF=E5=85=8D?= =?UTF-8?q?=E5=90=8C=E6=97=B6=E4=BD=BF=E7=94=A8data=E5=92=8C=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=89=80=E6=9C=89=E6=97=B6=E6=8F=90=E7=A4=BA=E5=86=B2?= =?UTF-8?q?=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: KaneLeung --- packages/grid/src/grid.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/grid/src/grid.ts b/packages/grid/src/grid.ts index 8034a584f..136667c18 100644 --- a/packages/grid/src/grid.ts +++ b/packages/grid/src/grid.ts @@ -1162,7 +1162,7 @@ export default defineComponent({ const { data, columns, proxyConfig } = props const proxyOpts = computeProxyOpts.value const formOpts = computeFormOpts.value - if (proxyConfig && (data || (proxyOpts.form && formOpts.data))) { + if (proxyConfig && proxyConfig.enabled && (data || (proxyOpts.form && formOpts.data))) { errLog('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config']) } if (columns && columns.length) { -- Gitee