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

jqmin19 · jqmin19 · commit 70c585e0a96b · 2022-02-24T09:42:09.000+08:00
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,4 @@
 *.js text eol=lf
 *.json text eol=lf
-*.ts text eol=lf
+*.ts text eol=lf
+*.vue text eol=lf
diff --git a/README.md b/README.md
@@ -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>
 </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">
     <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" />
diff --git a/src/cool/modules/base/views/log.vue b/src/cool/modules/base/views/log.vue
@@ -117,7 +117,7 @@ export default defineComponent({
 
 		// 保存天数
 		function saveDay() {
-			service.base.sys.log.setKeep(day.value).then(() => {
+			service.base.sys.log.setKeep({ value: day.value }).then(() => {
 				ElMessage.success("保存成功");
 			});
 		}
diff --git a/src/cool/modules/task/views/task.vue b/src/cool/modules/task/views/task.vue
@@ -316,6 +316,9 @@ export default defineComponent({
 
 		// 更多列表
 		function moreList(res: any, { list, pagination }: any) {
+			if (!res) {
+				return;
+			}
 			const { page, size } = res.pagination;
 			const len = res.list.length;
 			const max = list.length;
@@ -486,7 +489,7 @@ export default defineComponent({
 						component: {
 							name: "el-input",
 							props: {
-								placeholder: "sys.test.add(params)"
+								placeholder: "taskDemoService.test([1,2])"
 							}
 						}
 					},

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ export default defineComponent({`
`117`	`117`
`118`	`118`	`// 保存天数`
`119`	`119`	`function saveDay() {`
`120`		`- service.base.sys.log.setKeep(day.value).then(() => {`
	`120`	`+ service.base.sys.log.setKeep({ value: day.value }).then(() => {`
`121`	`121`	`ElMessage.success("保存成功");`
`122`	`122`	`});`
`123`	`123`	`}`