mirroring/cool-admin-vue
1
0
Fork 0
mirror of https://github.com/cool-team-official/cool-admin-vue.git synced 2024-11-01 14:10:27 +08:00
Code Issues Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
神仙都没用 2024-06-01 17:06:02 +08:00
parent a0b9e23b7c
commit 460e88dbae
43 changed files with 3054 additions and 2774 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

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

2
packages/crud/package.json
View File

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

2
packages/crud/src/utils/parse.tsx
View File

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

5737
pnpm-lock.yaml
View File

File diff suppressed because it is too large Load Diff

2
src/modules/base/views/log.vue
View File

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

2
src/modules/base/views/menu/index.vue
View File

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

4
src/modules/base/views/role.vue
View File

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

2
src/modules/base/views/user/index.vue
View File

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

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

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

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

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

2
src/modules/demo/views/crud/components/crud/base.vue
View File

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

2
src/modules/demo/views/crud/components/crud/dict.vue
View File

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

2
src/modules/demo/views/crud/components/crud/event.vue
View File

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

2
src/modules/demo/views/crud/components/crud/service.vue
View File

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

2
src/modules/demo/views/crud/components/other/tips.vue
View File

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

2
src/modules/demo/views/crud/components/search/base.vue
View File

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

2
src/modules/demo/views/crud/components/search/custom.vue
View File

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

2
src/modules/demo/views/crud/components/search/layout.vue
View File

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

2
src/modules/demo/views/crud/components/table/base.vue
View File

@ -94,7 +94,7 @@ const Table = useTable({
{ {
label: "创建时间", label: "创建时间",
prop: "createTime", prop: "createTime",
minWidth: 160, minWidth: 170,
// 是否排序，desc, asc // 是否排序，desc, asc
sortable: "desc" sortable: "desc"
} }

2
src/modules/demo/views/crud/components/table/children.vue
View File

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

2
src/modules/demo/views/crud/components/table/column-custom.vue
View File

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

2
src/modules/demo/views/crud/components/table/component/index.vue
View File

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

2
src/modules/demo/views/crud/components/table/context-menu.vue
View File

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

2
src/modules/demo/views/crud/components/table/dict.vue
View File

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

2
src/modules/demo/views/crud/components/table/hidden.vue
View File

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

2
src/modules/demo/views/crud/components/table/op.vue
View File

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

2
src/modules/demo/views/crud/components/table/plugin/index.vue
View File

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

2
src/modules/demo/views/crud/components/table/search.vue
View File

@ -118,7 +118,7 @@ const Table = useTable({
{ {
label: "创建时间", label: "创建时间",
prop: "createTime", prop: "createTime",
minWidth: 160, minWidth: 170,
sortable: "desc", sortable: "desc",
//【很重要】搜索参数配置 //【很重要】搜索参数配置

2
src/modules/demo/views/crud/components/table/selection.vue
View File

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

2
src/modules/demo/views/crud/components/table/slot.vue
View File

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

2
src/modules/demo/views/crud/components/table/span-method.vue
View File

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

2
src/modules/demo/views/crud/components/table/summary.vue
View File

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

2
src/modules/demo/views/crud/components/upsert/base.vue
View File

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

2
src/modules/demo/views/crud/components/upsert/event.vue
View File

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

2
src/modules/demo/views/crud/components/upsert/hook/index.vue
View File

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

2
src/modules/demo/views/crud/components/upsert/mode.vue
View File

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

6
src/modules/dict/views/list.vue
View File

@ -228,10 +228,10 @@ const Table = useTable({
{ label: "名称", prop: "name", align: "left", minWidth: 200 }, { label: "名称", prop: "name", align: "left", minWidth: 200 },
{ label: "ID", prop: "id", minWidth: 120 }, { label: "ID", prop: "id", minWidth: 120 },
{ label: "值", prop: "value", minWidth: 200, showOverflowTooltip: true }, { 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: "orderNum", sortable: "desc", width: 100, fixed: "right" },
{ label: "创建时间", prop: "createTime", sortable: "custom", minWidth: 160 }, { label: "创建时间", prop: "createTime", sortable: "custom", minWidth: 170 },
{ label: "更新时间", prop: "updateTime", sortable: "custom", minWidth: 160 }, { label: "更新时间", prop: "updateTime", sortable: "custom", minWidth: 170 },
{ {
type: "op", type: "op",
width: 250, width: 250,

2
src/modules/recycle/views/data.vue
View File

@ -68,7 +68,7 @@ const Table = useTable({
} }
}, },
{ label: "删除条数", prop: "count", minWidth: 120, sortable: "custom" }, { label: "删除条数", prop: "count", minWidth: 120, sortable: "custom" },
{ label: "创建时间", prop: "createTime", minWidth: 160, sortable: "desc" }, { label: "创建时间", prop: "createTime", minWidth: 170, sortable: "desc" },
{ {
type: "op", type: "op",
width: 120, width: 120,

2
src/modules/task/components/logs.vue
View File

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

2
src/modules/user/components/select.vue
View File

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

2
src/modules/user/views/list.vue
View File

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

1
src/plugins/editor-preview/components/preview.vue
View File

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

4
src/plugins/upload/hooks/index.ts
View File

@ -22,7 +22,7 @@ export function useUpload() {
}> { }> {
return new Promise(async (resolve, reject) => { return new Promise(async (resolve, reject) => {
// 合并配置 // 合并配置
const { prefixPath, onProgress } = merge(opts, options); const { prefixPath, onProgress } = merge(options, opts);
// 文件id // 文件id
const fileId = uuid(""); const fileId = uuid("");
@ -120,7 +120,7 @@ export function useUpload() {
type == "aws" type == "aws"
? { ? {
key key
} }
: {} : {}
) )
.then((res) => { .then((res) => {