Merge branch 'vue3-ts-vite' of https://e.coding.net/shancool/cool-admin/front-next into vue3-ts-vite

This commit is contained in:
icssoa 2022-02-24 09:42:09 +08:00
commit 70c585e0a9
4 changed files with 8 additions and 4 deletions

1
.gitattributes vendored
View File

@ -1,3 +1,4 @@
*.js text eol=lf *.js text eol=lf
*.json text eol=lf *.json text eol=lf
*.ts text eol=lf *.ts text eol=lf
*.vue text eol=lf

View File

@ -4,7 +4,7 @@
<a href="https://show.cool-admin.com/" target="blank"><img src="https://admin.cool-js.com/logo.png" width="200" alt="cool-admin Logo" /></a> <a href="https://show.cool-admin.com/" target="blank"><img src="https://admin.cool-js.com/logo.png" width="200" alt="cool-admin Logo" /></a>
</p> </p>
<p align="center">cool-admin 一个很酷的后台权限管理系统,开源免费,模块化、插件化、极速开发 CRUD方便快速构建迭代后台管理系统论坛 进一步了解</p> <p align="center">cool-admin 一个很酷的后台权限管理系统,开源免费,模块化、插件化、极速开发 CRUD方便快速构建迭代后台管理系统<a href="https://cool-js.com" target="_blank">文档</a> 进一步了解</p>
<p align="center"> <p align="center">
<a href="https://github.com/cool-team-official/cool-admin-vue/blob/master/LICENSE" target="_blank"><img src="https://img.shields.io/badge/license-MIT-green?style=flat-square" alt="GitHub license" /> <a href="https://github.com/cool-team-official/cool-admin-vue/blob/master/LICENSE" target="_blank"><img src="https://img.shields.io/badge/license-MIT-green?style=flat-square" alt="GitHub license" />

View File

@ -117,7 +117,7 @@ export default defineComponent({
// //
function saveDay() { function saveDay() {
service.base.sys.log.setKeep(day.value).then(() => { service.base.sys.log.setKeep({ value: day.value }).then(() => {
ElMessage.success("保存成功"); ElMessage.success("保存成功");
}); });
} }

View File

@ -316,6 +316,9 @@ export default defineComponent({
// //
function moreList(res: any, { list, pagination }: any) { function moreList(res: any, { list, pagination }: any) {
if (!res) {
return;
}
const { page, size } = res.pagination; const { page, size } = res.pagination;
const len = res.list.length; const len = res.list.length;
const max = list.length; const max = list.length;
@ -486,7 +489,7 @@ export default defineComponent({
component: { component: {
name: "el-input", name: "el-input",
props: { props: {
placeholder: "sys.test.add(params)" placeholder: "taskDemoService.test([1,2])"
} }
} }
}, },