Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin

src/components/Excel/src/Export2Excel.ts

@@ -17,8 +17,8 @@ function setColumnWidth(data, worksheet, min = 3) {
     data.forEach((item) => {
         Object.keys(item).forEach((key) => {
             const cur = item[key]
-            const length = cur.length
-            obj[key] = Math.max(min, length)
+            const length = cur?.length ?? min
+            obj[key] = Math.max(length, obj[key] ?? min)
         })
     })
     Object.keys(obj).forEach((key) => {

src/components/Excel/src/ImportExcel.vue

@@ -128,8 +128,10 @@
              * @description: 触发选择文件管理器
              */
             function handleInputClick(e: Event) {
-                const files = e && (e.target as HTMLInputElement).files
+                const target = e && (e.target as HTMLInputElement)
+                const files = target?.files
                 const rawFile = files && files[0] // only setting files[0]
+                target.value = ''
                 if (!rawFile) return
                 if (props.isReturnFile) {
                     emit('success', rawFile)

src/components/Table/src/BasicTable.vue

@@ -240,6 +240,7 @@
             const tableAction: TableActionType = {
                 reload,
                 getSelectRows,
+                setSelectedRows,
                 clearSelectedRowKeys,
                 getSelectRowKeys,
                 deleteSelectRowByKey,
@@ -264,7 +265,6 @@
                 updateTableData,
                 setShowPagination,
                 getShowPagination,
-                setSelectedRows,
                 setCacheColumnsByField,
                 expandAll,
                 expandRows,

src/layouts/default/setting/components/ThemeColorPicker.vue

@@ -31,7 +31,7 @@
         props: {
             colorList: {
                 type: Array as PropType<string[]>,
-                defualt: [],
+                default: () => [],
             },
             event: {
                 type: Number as PropType<HandlerEnum>,

src/layouts/default/setting/components/TypePicker.vue

@@ -31,7 +31,7 @@
         props: {
             menuTypeList: {
                 type: Array as PropType<typeof menuTypeList>,
-                defualt: () => [],
+                default: () => [],
             },
             handler: {
                 type: Function as PropType<Fn>,

src/utils/dateUtil.ts

@@ -6,11 +6,11 @@ import dayjs from 'dayjs'
 const DATE_TIME_FORMAT = 'YYYY-MM-DD HH:mm:ss'
 const DATE_FORMAT = 'YYYY-MM-DD'
 
-export function formatToDateTime(date: dayjs.Dayjs | Date | undefined = undefined, format = DATE_TIME_FORMAT): string {
+export function formatToDateTime(date?: dayjs.ConfigType, format = DATE_TIME_FORMAT): string {
     return dayjs(date).format(format)
 }
 
-export function formatToDate(date: dayjs.Dayjs | Date | undefined = undefined, format = DATE_FORMAT): string {
+export function formatToDate(date?: dayjs.ConfigType, format = DATE_FORMAT): string {
     return dayjs(date).format(format)
 }
 

src/utils/index.ts

@@ -3,6 +3,7 @@ import type { App, Plugin } from 'vue'
 
 import { unref } from 'vue'
 import { isObject } from '/@/utils/is'
+import { cloneDeep } from 'lodash-es'
 
 export const noop = () => {}
 
@@ -35,10 +36,11 @@ export function setObjToUrlParams(baseUrl: string, obj: any): string {
 // 深度合并
 export function deepMerge<T = any>(src: any = {}, target: any = {}): T {
     let key: string
+    const res: any = cloneDeep(src)
     for (key in target) {
-        src[key] = isObject(src[key]) ? deepMerge(src[key], target[key]) : (src[key] = target[key])
+        res[key] = isObject(res[key]) ? deepMerge(res[key], target[key]) : (res[key] = target[key])
     }
-    return src
+    return res
 }
 
 export function openWindow(