diff --git a/src/components/CURD/PageContent.vue b/src/components/CURD/PageContent.vue index 9d185e3e..7b73799f 100644 --- a/src/components/CURD/PageContent.vue +++ b/src/components/CURD/PageContent.vue @@ -266,10 +266,12 @@ 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; }); 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); + } } /** 暗黑主题 */ 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; } });