mirror of
https://github.com/cool-team-official/cool-admin-vue.git
synced 2024-11-01 14:10:27 +08:00
优化
This commit is contained in:
神仙都没用
parent
a0b9e23b7c
commit
460e88dbae
@ -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",
|
||||
|
||||
@ -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",
|
||||
|
||||
@ -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>
|
||||
);
|
||||
|
||||
5737
pnpm-lock.yaml
5737
pnpm-lock.yaml
File diff suppressed because it is too large
Load Diff
@ -111,7 +111,7 @@ const Table = useTable({
|
||||
{
|
||||
prop: "createTime",
|
||||
label: "请求时间",
|
||||
minWidth: 160,
|
||||
minWidth: 170,
|
||||
sortable: "desc"
|
||||
}
|
||||
]
|
||||
|
||||
@ -179,7 +179,7 @@ const Table = useTable({
|
||||
{
|
||||
prop: "router",
|
||||
label: "节点路由",
|
||||
minWidth: 160
|
||||
minWidth: 170
|
||||
},
|
||||
{
|
||||
prop: "keepAlive",
|
||||
|
||||
@ -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: "操作",
|
||||
|
||||
@ -142,7 +142,7 @@ const Table = useTable({
|
||||
prop: "createTime",
|
||||
label: "创建时间",
|
||||
sortable: "desc",
|
||||
minWidth: 160
|
||||
minWidth: 170
|
||||
},
|
||||
{
|
||||
type: "op",
|
||||
|
||||
@ -80,7 +80,7 @@ const Table = useTable({
|
||||
{
|
||||
label: "创建时间",
|
||||
prop: "createTime",
|
||||
minWidth: 160,
|
||||
minWidth: 170,
|
||||
sortable: "desc"
|
||||
}
|
||||
]
|
||||
|
||||
@ -85,7 +85,7 @@ const Table = useTable({
|
||||
{
|
||||
label: "创建时间",
|
||||
prop: "createTime",
|
||||
minWidth: 160,
|
||||
minWidth: 170,
|
||||
sortable: "desc"
|
||||
}
|
||||
]
|
||||
|
||||
@ -95,7 +95,7 @@ const Table = useTable({
|
||||
{
|
||||
label: "创建时间",
|
||||
prop: "createTime",
|
||||
minWidth: 160,
|
||||
minWidth: 170,
|
||||
sortable: "desc"
|
||||
},
|
||||
{
|
||||
|
||||
@ -114,7 +114,7 @@ const Table = useTable({
|
||||
{
|
||||
label: "创建时间",
|
||||
prop: "createTime",
|
||||
minWidth: 160,
|
||||
minWidth: 170,
|
||||
sortable: "desc"
|
||||
},
|
||||
{
|
||||
|
||||
@ -114,7 +114,7 @@ const Table = useTable({
|
||||
{
|
||||
label: "创建时间",
|
||||
prop: "createTime",
|
||||
minWidth: 160,
|
||||
minWidth: 170,
|
||||
sortable: "desc"
|
||||
},
|
||||
{
|
||||
|
||||
@ -126,7 +126,7 @@ const Table = useTable({
|
||||
{
|
||||
label: "创建时间",
|
||||
prop: "createTime",
|
||||
minWidth: 160,
|
||||
minWidth: 170,
|
||||
sortable: "desc"
|
||||
},
|
||||
{
|
||||
|
||||
@ -99,7 +99,7 @@ const Table = useTable<Eps.DemoGoodsEntity>({
|
||||
{
|
||||
label: "创建时间",
|
||||
prop: "createTime",
|
||||
minWidth: 160,
|
||||
minWidth: 170,
|
||||
sortable: "desc"
|
||||
},
|
||||
{
|
||||
|
||||
@ -77,7 +77,7 @@ const Table = useTable({
|
||||
{
|
||||
label: "创建时间",
|
||||
prop: "createTime",
|
||||
minWidth: 160,
|
||||
minWidth: 170,
|
||||
sortable: "desc"
|
||||
}
|
||||
]
|
||||
|
||||
@ -88,7 +88,7 @@ const Table = useTable({
|
||||
{
|
||||
label: "创建时间",
|
||||
prop: "createTime",
|
||||
minWidth: 160,
|
||||
minWidth: 170,
|
||||
sortable: "desc"
|
||||
}
|
||||
]
|
||||
|
||||
@ -75,7 +75,7 @@ const Table = useTable({
|
||||
{
|
||||
label: "创建时间",
|
||||
prop: "createTime",
|
||||
minWidth: 160,
|
||||
minWidth: 170,
|
||||
sortable: "desc"
|
||||
}
|
||||
]
|
||||
|
||||
@ -94,7 +94,7 @@ const Table = useTable({
|
||||
{
|
||||
label: "创建时间",
|
||||
prop: "createTime",
|
||||
minWidth: 160,
|
||||
minWidth: 170,
|
||||
// 是否排序，desc, asc
|
||||
sortable: "desc"
|
||||
}
|
||||
|
||||
@ -84,7 +84,7 @@ const Table = useTable({
|
||||
{
|
||||
label: "创建时间",
|
||||
prop: "createTime",
|
||||
minWidth: 160,
|
||||
minWidth: 170,
|
||||
sortable: "desc"
|
||||
}
|
||||
]
|
||||
|
||||
@ -94,7 +94,7 @@ const Table = useTable({
|
||||
{
|
||||
label: "创建时间",
|
||||
prop: "createTime",
|
||||
minWidth: 160,
|
||||
minWidth: 170,
|
||||
sortable: "desc"
|
||||
}
|
||||
]
|
||||
|
||||
@ -94,7 +94,7 @@ const Table = useTable({
|
||||
{
|
||||
label: "创建时间",
|
||||
prop: "createTime",
|
||||
minWidth: 160,
|
||||
minWidth: 170,
|
||||
sortable: "desc"
|
||||
}
|
||||
]
|
||||
|
||||
@ -145,7 +145,7 @@ const Table = useTable({
|
||||
{
|
||||
label: "创建时间",
|
||||
prop: "createTime",
|
||||
minWidth: 160,
|
||||
minWidth: 170,
|
||||
sortable: "desc"
|
||||
}
|
||||
]
|
||||
|
||||
@ -112,7 +112,7 @@ const Table = useTable({
|
||||
{
|
||||
label: "创建时间",
|
||||
prop: "createTime",
|
||||
minWidth: 160,
|
||||
minWidth: 170,
|
||||
sortable: "desc"
|
||||
}
|
||||
]
|
||||
|
||||
@ -105,7 +105,7 @@ const Table = useTable({
|
||||
{
|
||||
label: "创建时间",
|
||||
prop: "createTime",
|
||||
minWidth: 160,
|
||||
minWidth: 170,
|
||||
sortable: "desc"
|
||||
}
|
||||
]
|
||||
|
||||
@ -88,7 +88,7 @@ const Table = useTable({
|
||||
{
|
||||
label: "创建时间",
|
||||
prop: "createTime",
|
||||
minWidth: 160,
|
||||
minWidth: 170,
|
||||
sortable: "desc"
|
||||
},
|
||||
{
|
||||
|
||||
@ -69,7 +69,7 @@ const Table = useTable({
|
||||
{
|
||||
label: "创建时间",
|
||||
prop: "createTime",
|
||||
minWidth: 160,
|
||||
minWidth: 170,
|
||||
sortable: "desc"
|
||||
}
|
||||
],
|
||||
|
||||
@ -118,7 +118,7 @@ const Table = useTable({
|
||||
{
|
||||
label: "创建时间",
|
||||
prop: "createTime",
|
||||
minWidth: 160,
|
||||
minWidth: 170,
|
||||
sortable: "desc",
|
||||
|
||||
//【很重要】搜索参数配置
|
||||
|
||||
@ -83,7 +83,7 @@ const Table = useTable({
|
||||
{
|
||||
label: "创建时间",
|
||||
prop: "createTime",
|
||||
minWidth: 160,
|
||||
minWidth: 170,
|
||||
sortable: "desc"
|
||||
}
|
||||
]
|
||||
|
||||
@ -83,7 +83,7 @@ const Table = useTable({
|
||||
{
|
||||
label: "创建时间",
|
||||
prop: "createTime",
|
||||
minWidth: 160,
|
||||
minWidth: 170,
|
||||
sortable: "desc"
|
||||
}
|
||||
]
|
||||
|
||||
@ -78,7 +78,7 @@ const Table = useTable({
|
||||
{
|
||||
label: "创建时间",
|
||||
prop: "createTime",
|
||||
minWidth: 160,
|
||||
minWidth: 170,
|
||||
sortable: "desc"
|
||||
}
|
||||
]
|
||||
|
||||
@ -77,7 +77,7 @@ const Table = useTable({
|
||||
{
|
||||
label: "创建时间",
|
||||
prop: "createTime",
|
||||
minWidth: 160,
|
||||
minWidth: 170,
|
||||
sortable: "desc"
|
||||
}
|
||||
]
|
||||
|
||||
@ -80,7 +80,7 @@ const Table = useTable({
|
||||
{
|
||||
label: "创建时间",
|
||||
prop: "createTime",
|
||||
minWidth: 160,
|
||||
minWidth: 170,
|
||||
sortable: "desc"
|
||||
},
|
||||
{
|
||||
|
||||
@ -82,7 +82,7 @@ const Table = useTable({
|
||||
{
|
||||
label: "创建时间",
|
||||
prop: "createTime",
|
||||
minWidth: 160,
|
||||
minWidth: 170,
|
||||
sortable: "desc"
|
||||
},
|
||||
{
|
||||
|
||||
@ -88,7 +88,7 @@ const Table = useTable({
|
||||
{
|
||||
label: "创建时间",
|
||||
prop: "createTime",
|
||||
minWidth: 160,
|
||||
minWidth: 170,
|
||||
sortable: "desc"
|
||||
},
|
||||
{
|
||||
|
||||
@ -81,7 +81,7 @@ const Table = useTable({
|
||||
{
|
||||
label: "创建时间",
|
||||
prop: "createTime",
|
||||
minWidth: 160,
|
||||
minWidth: 170,
|
||||
sortable: "desc"
|
||||
},
|
||||
{
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -76,7 +76,7 @@ const Table = useTable({
|
||||
{
|
||||
label: "执行时间",
|
||||
prop: "createTime",
|
||||
minWidth: 160
|
||||
minWidth: 170
|
||||
}
|
||||
]
|
||||
});
|
||||
|
||||
@ -186,7 +186,7 @@ const Table = useTable({
|
||||
label: "创建时间",
|
||||
prop: "createTime",
|
||||
sortable: "desc",
|
||||
minWidth: 160
|
||||
minWidth: 170
|
||||
}
|
||||
]
|
||||
});
|
||||
|
||||
@ -146,7 +146,7 @@ const Table = useTable({
|
||||
label: "创建时间",
|
||||
prop: "createTime",
|
||||
sortable: "desc",
|
||||
minWidth: 160
|
||||
minWidth: 170
|
||||
},
|
||||
{
|
||||
label: "操作",
|
||||
|
||||
@ -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">
|
||||
|
||||
@ -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) => {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user