({
{
label: "创建时间",
prop: "createTime",
- minWidth: 160,
+ minWidth: 170,
sortable: "desc"
},
{
diff --git a/src/modules/demo/views/crud/components/search/base.vue b/src/modules/demo/views/crud/components/search/base.vue
index 4d8953e..33c5f3d 100644
--- a/src/modules/demo/views/crud/components/search/base.vue
+++ b/src/modules/demo/views/crud/components/search/base.vue
@@ -77,7 +77,7 @@ const Table = useTable({
{
label: "创建时间",
prop: "createTime",
- minWidth: 160,
+ minWidth: 170,
sortable: "desc"
}
]
diff --git a/src/modules/demo/views/crud/components/search/custom.vue b/src/modules/demo/views/crud/components/search/custom.vue
index ece49b9..2657d2d 100644
--- a/src/modules/demo/views/crud/components/search/custom.vue
+++ b/src/modules/demo/views/crud/components/search/custom.vue
@@ -88,7 +88,7 @@ const Table = useTable({
{
label: "创建时间",
prop: "createTime",
- minWidth: 160,
+ minWidth: 170,
sortable: "desc"
}
]
diff --git a/src/modules/demo/views/crud/components/search/layout.vue b/src/modules/demo/views/crud/components/search/layout.vue
index db5ea97..c20e517 100644
--- a/src/modules/demo/views/crud/components/search/layout.vue
+++ b/src/modules/demo/views/crud/components/search/layout.vue
@@ -75,7 +75,7 @@ const Table = useTable({
{
label: "创建时间",
prop: "createTime",
- minWidth: 160,
+ minWidth: 170,
sortable: "desc"
}
]
diff --git a/src/modules/demo/views/crud/components/table/base.vue b/src/modules/demo/views/crud/components/table/base.vue
index f625e8c..413881b 100644
--- a/src/modules/demo/views/crud/components/table/base.vue
+++ b/src/modules/demo/views/crud/components/table/base.vue
@@ -94,7 +94,7 @@ const Table = useTable({
{
label: "创建时间",
prop: "createTime",
- minWidth: 160,
+ minWidth: 170,
// 是否排序,desc, asc
sortable: "desc"
}
diff --git a/src/modules/demo/views/crud/components/table/children.vue b/src/modules/demo/views/crud/components/table/children.vue
index fbf4cd7..8ac4534 100644
--- a/src/modules/demo/views/crud/components/table/children.vue
+++ b/src/modules/demo/views/crud/components/table/children.vue
@@ -84,7 +84,7 @@ const Table = useTable({
{
label: "创建时间",
prop: "createTime",
- minWidth: 160,
+ minWidth: 170,
sortable: "desc"
}
]
diff --git a/src/modules/demo/views/crud/components/table/column-custom.vue b/src/modules/demo/views/crud/components/table/column-custom.vue
index f67a134..03a5f93 100644
--- a/src/modules/demo/views/crud/components/table/column-custom.vue
+++ b/src/modules/demo/views/crud/components/table/column-custom.vue
@@ -94,7 +94,7 @@ const Table = useTable({
{
label: "创建时间",
prop: "createTime",
- minWidth: 160,
+ minWidth: 170,
sortable: "desc"
}
]
diff --git a/src/modules/demo/views/crud/components/table/component/index.vue b/src/modules/demo/views/crud/components/table/component/index.vue
index 3e1ee21..7d2564b 100644
--- a/src/modules/demo/views/crud/components/table/component/index.vue
+++ b/src/modules/demo/views/crud/components/table/component/index.vue
@@ -94,7 +94,7 @@ const Table = useTable({
{
label: "创建时间",
prop: "createTime",
- minWidth: 160,
+ minWidth: 170,
sortable: "desc"
}
]
diff --git a/src/modules/demo/views/crud/components/table/context-menu.vue b/src/modules/demo/views/crud/components/table/context-menu.vue
index 83be23d..dd170d8 100644
--- a/src/modules/demo/views/crud/components/table/context-menu.vue
+++ b/src/modules/demo/views/crud/components/table/context-menu.vue
@@ -145,7 +145,7 @@ const Table = useTable({
{
label: "创建时间",
prop: "createTime",
- minWidth: 160,
+ minWidth: 170,
sortable: "desc"
}
]
diff --git a/src/modules/demo/views/crud/components/table/dict.vue b/src/modules/demo/views/crud/components/table/dict.vue
index 1c79e6f..f808ac3 100644
--- a/src/modules/demo/views/crud/components/table/dict.vue
+++ b/src/modules/demo/views/crud/components/table/dict.vue
@@ -112,7 +112,7 @@ const Table = useTable({
{
label: "创建时间",
prop: "createTime",
- minWidth: 160,
+ minWidth: 170,
sortable: "desc"
}
]
diff --git a/src/modules/demo/views/crud/components/table/hidden.vue b/src/modules/demo/views/crud/components/table/hidden.vue
index 75db479..92e0e6d 100644
--- a/src/modules/demo/views/crud/components/table/hidden.vue
+++ b/src/modules/demo/views/crud/components/table/hidden.vue
@@ -105,7 +105,7 @@ const Table = useTable({
{
label: "创建时间",
prop: "createTime",
- minWidth: 160,
+ minWidth: 170,
sortable: "desc"
}
]
diff --git a/src/modules/demo/views/crud/components/table/op.vue b/src/modules/demo/views/crud/components/table/op.vue
index 463f60f..2be8828 100644
--- a/src/modules/demo/views/crud/components/table/op.vue
+++ b/src/modules/demo/views/crud/components/table/op.vue
@@ -88,7 +88,7 @@ const Table = useTable({
{
label: "创建时间",
prop: "createTime",
- minWidth: 160,
+ minWidth: 170,
sortable: "desc"
},
{
diff --git a/src/modules/demo/views/crud/components/table/plugin/index.vue b/src/modules/demo/views/crud/components/table/plugin/index.vue
index 5cae6fb..04a8811 100644
--- a/src/modules/demo/views/crud/components/table/plugin/index.vue
+++ b/src/modules/demo/views/crud/components/table/plugin/index.vue
@@ -69,7 +69,7 @@ const Table = useTable({
{
label: "创建时间",
prop: "createTime",
- minWidth: 160,
+ minWidth: 170,
sortable: "desc"
}
],
diff --git a/src/modules/demo/views/crud/components/table/search.vue b/src/modules/demo/views/crud/components/table/search.vue
index 781dd97..12f5824 100644
--- a/src/modules/demo/views/crud/components/table/search.vue
+++ b/src/modules/demo/views/crud/components/table/search.vue
@@ -118,7 +118,7 @@ const Table = useTable({
{
label: "创建时间",
prop: "createTime",
- minWidth: 160,
+ minWidth: 170,
sortable: "desc",
//【很重要】搜索参数配置
diff --git a/src/modules/demo/views/crud/components/table/selection.vue b/src/modules/demo/views/crud/components/table/selection.vue
index 26417dd..aef6ab9 100644
--- a/src/modules/demo/views/crud/components/table/selection.vue
+++ b/src/modules/demo/views/crud/components/table/selection.vue
@@ -83,7 +83,7 @@ const Table = useTable({
{
label: "创建时间",
prop: "createTime",
- minWidth: 160,
+ minWidth: 170,
sortable: "desc"
}
]
diff --git a/src/modules/demo/views/crud/components/table/slot.vue b/src/modules/demo/views/crud/components/table/slot.vue
index 1a5389d..c8fbc0e 100644
--- a/src/modules/demo/views/crud/components/table/slot.vue
+++ b/src/modules/demo/views/crud/components/table/slot.vue
@@ -83,7 +83,7 @@ const Table = useTable({
{
label: "创建时间",
prop: "createTime",
- minWidth: 160,
+ minWidth: 170,
sortable: "desc"
}
]
diff --git a/src/modules/demo/views/crud/components/table/span-method.vue b/src/modules/demo/views/crud/components/table/span-method.vue
index 6795537..add3afa 100644
--- a/src/modules/demo/views/crud/components/table/span-method.vue
+++ b/src/modules/demo/views/crud/components/table/span-method.vue
@@ -78,7 +78,7 @@ const Table = useTable({
{
label: "创建时间",
prop: "createTime",
- minWidth: 160,
+ minWidth: 170,
sortable: "desc"
}
]
diff --git a/src/modules/demo/views/crud/components/table/summary.vue b/src/modules/demo/views/crud/components/table/summary.vue
index 11af421..b35283e 100644
--- a/src/modules/demo/views/crud/components/table/summary.vue
+++ b/src/modules/demo/views/crud/components/table/summary.vue
@@ -77,7 +77,7 @@ const Table = useTable({
{
label: "创建时间",
prop: "createTime",
- minWidth: 160,
+ minWidth: 170,
sortable: "desc"
}
]
diff --git a/src/modules/demo/views/crud/components/upsert/base.vue b/src/modules/demo/views/crud/components/upsert/base.vue
index 1841670..876da17 100644
--- a/src/modules/demo/views/crud/components/upsert/base.vue
+++ b/src/modules/demo/views/crud/components/upsert/base.vue
@@ -80,7 +80,7 @@ const Table = useTable({
{
label: "创建时间",
prop: "createTime",
- minWidth: 160,
+ minWidth: 170,
sortable: "desc"
},
{
diff --git a/src/modules/demo/views/crud/components/upsert/event.vue b/src/modules/demo/views/crud/components/upsert/event.vue
index 1f8ac61..9cedc47 100644
--- a/src/modules/demo/views/crud/components/upsert/event.vue
+++ b/src/modules/demo/views/crud/components/upsert/event.vue
@@ -82,7 +82,7 @@ const Table = useTable({
{
label: "创建时间",
prop: "createTime",
- minWidth: 160,
+ minWidth: 170,
sortable: "desc"
},
{
diff --git a/src/modules/demo/views/crud/components/upsert/hook/index.vue b/src/modules/demo/views/crud/components/upsert/hook/index.vue
index 5b6c0b6..1b724bc 100644
--- a/src/modules/demo/views/crud/components/upsert/hook/index.vue
+++ b/src/modules/demo/views/crud/components/upsert/hook/index.vue
@@ -88,7 +88,7 @@ const Table = useTable({
{
label: "创建时间",
prop: "createTime",
- minWidth: 160,
+ minWidth: 170,
sortable: "desc"
},
{
diff --git a/src/modules/demo/views/crud/components/upsert/mode.vue b/src/modules/demo/views/crud/components/upsert/mode.vue
index 3ee388b..cc86d02 100644
--- a/src/modules/demo/views/crud/components/upsert/mode.vue
+++ b/src/modules/demo/views/crud/components/upsert/mode.vue
@@ -81,7 +81,7 @@ const Table = useTable({
{
label: "创建时间",
prop: "createTime",
- minWidth: 160,
+ minWidth: 170,
sortable: "desc"
},
{
diff --git a/src/modules/dict/views/list.vue b/src/modules/dict/views/list.vue
index c396fbe..444f091 100644
--- a/src/modules/dict/views/list.vue
+++ b/src/modules/dict/views/list.vue
@@ -228,10 +228,10 @@ const Table = useTable({
{ label: "名称", prop: "name", align: "left", minWidth: 200 },
{ label: "ID", prop: "id", minWidth: 120 },
{ label: "值", prop: "value", minWidth: 200, showOverflowTooltip: true },
- { label: "备注", prop: "remark", showOverflowTooltip: true, minWidth: 160 },
+ { label: "备注", prop: "remark", showOverflowTooltip: true, minWidth: 170 },
{ label: "排序", prop: "orderNum", sortable: "desc", width: 100, fixed: "right" },
- { label: "创建时间", prop: "createTime", sortable: "custom", minWidth: 160 },
- { label: "更新时间", prop: "updateTime", sortable: "custom", minWidth: 160 },
+ { label: "创建时间", prop: "createTime", sortable: "custom", minWidth: 170 },
+ { label: "更新时间", prop: "updateTime", sortable: "custom", minWidth: 170 },
{
type: "op",
width: 250,
diff --git a/src/modules/recycle/views/data.vue b/src/modules/recycle/views/data.vue
index d185c8a..d8f282d 100644
--- a/src/modules/recycle/views/data.vue
+++ b/src/modules/recycle/views/data.vue
@@ -68,7 +68,7 @@ const Table = useTable({
}
},
{ label: "删除条数", prop: "count", minWidth: 120, sortable: "custom" },
- { label: "创建时间", prop: "createTime", minWidth: 160, sortable: "desc" },
+ { label: "创建时间", prop: "createTime", minWidth: 170, sortable: "desc" },
{
type: "op",
width: 120,
diff --git a/src/modules/task/components/logs.vue b/src/modules/task/components/logs.vue
index 68eabe6..af6657e 100644
--- a/src/modules/task/components/logs.vue
+++ b/src/modules/task/components/logs.vue
@@ -76,7 +76,7 @@ const Table = useTable({
{
label: "执行时间",
prop: "createTime",
- minWidth: 160
+ minWidth: 170
}
]
});
diff --git a/src/modules/user/components/select.vue b/src/modules/user/components/select.vue
index 0dbaa18..e1324d5 100644
--- a/src/modules/user/components/select.vue
+++ b/src/modules/user/components/select.vue
@@ -186,7 +186,7 @@ const Table = useTable({
label: "创建时间",
prop: "createTime",
sortable: "desc",
- minWidth: 160
+ minWidth: 170
}
]
});
diff --git a/src/modules/user/views/list.vue b/src/modules/user/views/list.vue
index a1aa653..cc68689 100644
--- a/src/modules/user/views/list.vue
+++ b/src/modules/user/views/list.vue
@@ -146,7 +146,7 @@ const Table = useTable({
label: "创建时间",
prop: "createTime",
sortable: "desc",
- minWidth: 160
+ minWidth: 170
},
{
label: "操作",
diff --git a/src/plugins/editor-preview/components/preview.vue b/src/plugins/editor-preview/components/preview.vue
index c0baf53..41e1d3c 100644
--- a/src/plugins/editor-preview/components/preview.vue
+++ b/src/plugins/editor-preview/components/preview.vue
@@ -10,6 +10,7 @@
:scrollbar="isScroll"
append-to-body
v-model="visible"
+ v-bind="$attrs"
>
diff --git a/src/plugins/upload/hooks/index.ts b/src/plugins/upload/hooks/index.ts
index 36d4aad..1ddcd8c 100644
--- a/src/plugins/upload/hooks/index.ts
+++ b/src/plugins/upload/hooks/index.ts
@@ -22,7 +22,7 @@ export function useUpload() {
}> {
return new Promise(async (resolve, reject) => {
// 合并配置
- const { prefixPath, onProgress } = merge(opts, options);
+ const { prefixPath, onProgress } = merge(options, opts);
// 文件id
const fileId = uuid("");
@@ -120,7 +120,7 @@ export function useUpload() {
type == "aws"
? {
key
- }
+ }
: {}
)
.then((res) => {