Merge branch 'master' of github.com:youlaitech/vue3-element-admin

src/components/CURD/PageContent.vue

@@ -266,10 +266,12 @@
             <template v-else-if="col.templet === 'date'">
               <template v-if="col.prop">
                 {{
-                  useDateFormat(
-                    scope.row[col.prop],
-                    col.dateFormat ?? "YYYY-MM-DD HH:mm:ss"
-                  ).value
+                  scope.row[col.prop]
+                    ? useDateFormat(
+                        scope.row[col.prop],
+                        col.dateFormat ?? "YYYY-MM-DD HH:mm:ss"
+                      ).value
+                    : ""
                 }}
               </template>
             </template>

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;
     });

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);
+  }
 }
 
 /** 暗黑主题 */

src/views/demo/curd/config/content.ts

@@ -18,8 +18,10 @@ const contentConfig: IContentConfig<UserPageQuery> = {
   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);

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);

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;
   }
 });