优化

package.json

@@ -19,7 +19,7 @@
 		"core-js": "^3.32.1",
 		"dayjs": "^1.11.10",
 		"echarts": "^5.4.3",
-		"element-plus": "^2.5.6",
+		"element-plus": "^2.7.3",
 		"file-saver": "^2.0.5",
 		"lodash-es": "^4.17.21",
 		"marked": "^11.1.1",

packages/crud/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cool-vue/crud",
-	"version": "7.1.22",
+	"version": "7.1.23",
 	"private": false,
 	"main": "./dist/index.umd.min.js",
 	"typings": "types/index.d.ts",

packages/crud/src/utils/parse.tsx

@@ -199,7 +199,7 @@ export function parseExtensionComponent(vnode: any) {
 							return <el-option key={i} label={label} value={value} {...e.props} />;
 						case "el-radio-group":
 							return (
-								<el-radio key={i} label={value} {...e.props}>
+								<el-radio key={i} value={value} {...e.props}>
 									{label}
 								</el-radio>
 							);

src/modules/base/views/log.vue

@@ -111,7 +111,7 @@ const Table = useTable({
 		{
 			prop: "createTime",
 			label: "请求时间",
-			minWidth: 160,
+			minWidth: 170,
 			sortable: "desc"
 		}
 	]

src/modules/base/views/menu/index.vue

@@ -179,7 +179,7 @@ const Table = useTable({
 		{
 			prop: "router",
 			label: "节点路由",
-			minWidth: 160
+			minWidth: 170
 		},
 		{
 			prop: "keepAlive",

src/modules/base/views/role.vue

@@ -143,13 +143,13 @@ const Table = useTable({
 			prop: "createTime",
 			label: "创建时间",
 			sortable: "desc",
-			minWidth: 160
+			minWidth: 170
 		},
 		{
 			prop: "updateTime",
 			label: "更新时间",
 			sortable: "custom",
-			minWidth: 160
+			minWidth: 170
 		},
 		{
 			label: "操作",

src/modules/base/views/user/index.vue

@@ -142,7 +142,7 @@ const Table = useTable({
 			prop: "createTime",
 			label: "创建时间",
 			sortable: "desc",
-			minWidth: 160
+			minWidth: 170
 		},
 		{
 			type: "op",

src/modules/demo/views/crud/components/adv-search/base.vue

@@ -80,7 +80,7 @@ const Table = useTable({
 		{
 			label: "创建时间",
 			prop: "createTime",
-			minWidth: 160,
+			minWidth: 170,
 			sortable: "desc"
 		}
 	]

src/modules/demo/views/crud/components/adv-search/custom.vue

@@ -85,7 +85,7 @@ const Table = useTable({
 		{
 			label: "创建时间",
 			prop: "createTime",
-			minWidth: 160,
+			minWidth: 170,
 			sortable: "desc"
 		}
 	]

src/modules/demo/views/crud/components/crud/base.vue

@@ -95,7 +95,7 @@ const Table = useTable({
 		{
 			label: "创建时间",
 			prop: "createTime",
-			minWidth: 160,
+			minWidth: 170,
 			sortable: "desc"
 		},
 		{

src/modules/demo/views/crud/components/crud/dict.vue

@@ -114,7 +114,7 @@ const Table = useTable({
 		{
 			label: "创建时间",
 			prop: "createTime",
-			minWidth: 160,
+			minWidth: 170,
 			sortable: "desc"
 		},
 		{

src/modules/demo/views/crud/components/crud/event.vue

@@ -114,7 +114,7 @@ const Table = useTable({
 		{
 			label: "创建时间",
 			prop: "createTime",
-			minWidth: 160,
+			minWidth: 170,
 			sortable: "desc"
 		},
 		{

src/modules/demo/views/crud/components/crud/service.vue

@@ -126,7 +126,7 @@ const Table = useTable({
 		{
 			label: "创建时间",
 			prop: "createTime",
-			minWidth: 160,
+			minWidth: 170,
 			sortable: "desc"
 		},
 		{

src/modules/demo/views/crud/components/other/tips.vue

@@ -99,7 +99,7 @@ const Table = useTable<Eps.DemoGoodsEntity>({
 		{
 			label: "创建时间",
 			prop: "createTime",
-			minWidth: 160,
+			minWidth: 170,
 			sortable: "desc"
 		},
 		{

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"
 		}
 	]

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"
 		}
 	]

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"
 		}
 	]

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"
 		}

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"
 		}
 	]

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"
 		}
 	]

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"
 		}
 	]

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"
 		}
 	]

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"
 		}
 	]

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"
 		}
 	]

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"
 		},
 		{

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"
 		}
 	],

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",
 
 			//【很重要】搜索参数配置

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"
 		}
 	]

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"
 		}
 	]

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"
 		}
 	]

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"
 		}
 	]

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"
 		},
 		{

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"
 		},
 		{

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"
 		},
 		{

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"
 		},
 		{

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,

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,

src/modules/task/components/logs.vue

@@ -76,7 +76,7 @@ const Table = useTable({
 		{
 			label: "执行时间",
 			prop: "createTime",
-			minWidth: 160
+			minWidth: 170
 		}
 	]
 });

src/modules/user/components/select.vue

@@ -186,7 +186,7 @@ const Table = useTable({
 			label: "创建时间",
 			prop: "createTime",
 			sortable: "desc",
-			minWidth: 160
+			minWidth: 170
 		}
 	]
 });

src/modules/user/views/list.vue

@@ -146,7 +146,7 @@ const Table = useTable({
 			label: "创建时间",
 			prop: "createTime",
 			sortable: "desc",
-			minWidth: 160
+			minWidth: 170
 		},
 		{
 			label: "操作",

src/plugins/editor-preview/components/preview.vue

@@ -10,6 +10,7 @@
 		:scrollbar="isScroll"
 		append-to-body
 		v-model="visible"
+		v-bind="$attrs"
 	>
 		<div class="cl-editor-preview">
 			<el-tabs v-model="active" type="card" v-if="list.length > 1" @tab-change="onTabChange">

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) => {