From cd896812817f509006353a661fe67eb2b6f23c0b Mon Sep 17 00:00:00 2001 From: diamont1001 Date: Thu, 27 Jun 2024 16:02:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=20fixed=20=E5=88=97=E8=A2=AB=E9=80=89=E4=B8=AD=E5=90=8E?= =?UTF-8?q?=E7=94=B1=E4=BA=8E=E9=A2=9C=E8=89=B2=E9=80=8F=E6=98=8E=E8=80=8C?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E5=8F=A0=E5=AD=97=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/variables.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 7b9b3eb2..42f97182 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -6,6 +6,11 @@ --menu-active-text: var(--el-menu-active-color); --menu-hover: #263445; --sidebar-logo-background: #2d3748; + + // 修复表格 fixed 列被选中后由于透明色导致叠字的 bug + .el-table { + --el-table-current-row-bg-color: rgb(235 243 250); + } } /** 暗黑主题 */ From 9b1a3623f6e5be9e48da18f1aa51b38627fd0993 Mon Sep 17 00:00:00 2001 From: diamont1001 Date: Thu, 27 Jun 2024 16:03:33 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=A4=9A=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E4=B8=8A=E4=BC=A0=E7=BB=84=E4=BB=B6JS=E5=87=BA?= =?UTF-8?q?=E9=94=99=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Upload/MultiUpload.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/components/Upload/MultiUpload.vue b/src/components/Upload/MultiUpload.vue index 01b90780..a0dfd654 100644 --- a/src/components/Upload/MultiUpload.vue +++ b/src/components/Upload/MultiUpload.vue @@ -64,6 +64,11 @@ watch( return; } + if (newVal.length <= 0) { + fileList.value = []; + return; + } + fileList.value = newVal.map((filePath) => { return { url: filePath } as UploadUserFile; }); From 7c58fa7f4e07d0d847c289fa5755a3ae4d507ea3 Mon Sep 17 00:00:00 2001 From: diamont1001 Date: Thu, 27 Jun 2024 16:04:17 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=95=B0=E6=8D=AE=E4=B8=BA=E7=A9=BA=E6=97=B6?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=20NaN=20=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CURD/PageContent.vue | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/components/CURD/PageContent.vue b/src/components/CURD/PageContent.vue index 72482e7b..f093ff57 100644 --- a/src/components/CURD/PageContent.vue +++ b/src/components/CURD/PageContent.vue @@ -255,10 +255,12 @@ From 1292d2f15ab1dd6a7956e2fc659d8974cf9dc682 Mon Sep 17 00:00:00 2001 From: diamont1001 Date: Thu, 27 Jun 2024 16:31:36 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=8C=83=E5=9B=B4=E6=9D=A1=E4=BB=B6=E9=80=89=E6=8B=A9=E5=90=8E?= =?UTF-8?q?=E5=86=8D=E6=B8=85=E7=A9=BA=E8=80=8C=E5=AF=BC=E8=87=B4=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6=E9=94=99=E4=B9=B1=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1）用户管理列表，选择“创建时间”后再点击清空，时间搜索条件并没真正清空 2）indexAction 函数里，也有类似问题 --- src/views/demo/curd/config/content.ts | 6 ++++-- src/views/demo/table-select/config/select.ts | 6 ++++-- src/views/system/user/index.vue | 3 +++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/views/demo/curd/config/content.ts b/src/views/demo/curd/config/content.ts index 9416c50b..b4ad2084 100644 --- a/src/views/demo/curd/config/content.ts +++ b/src/views/demo/curd/config/content.ts @@ -18,8 +18,10 @@ const contentConfig: IContentConfig = { indexAction: function (params) { if ("createAt" in params) { const createAt = params.createAt as string[]; - params.startTime = createAt[0]; - params.endTime = createAt[1]; + if (createAt?.length > 1) { + params.startTime = createAt[0]; + params.endTime = createAt[1]; + } delete params.createAt; } return UserAPI.getPage(params); diff --git a/src/views/demo/table-select/config/select.ts b/src/views/demo/table-select/config/select.ts index a944d644..64f1e7b3 100644 --- a/src/views/demo/table-select/config/select.ts +++ b/src/views/demo/table-select/config/select.ts @@ -84,8 +84,10 @@ const selectConfig: ISelectConfig = { indexAction: function (params) { if ("createAt" in params) { const createAt = params.createAt as string[]; - params.startTime = createAt[0]; - params.endTime = createAt[1]; + if (createAt?.length > 1) { + params.startTime = createAt[0]; + params.endTime = createAt[1]; + } delete params.createAt; } return UserAPI.getPage(params); diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 544c620e..f480b0a2 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -311,6 +311,9 @@ watch(dateTimeRange, (newVal) => { if (newVal) { queryParams.startTime = newVal[0]; queryParams.endTime = newVal[1]; + } else { + queryParams.startTime = undefined; + queryParams.endTime = undefined; } });