diff --git a/src/api/infra/codegen.js b/src/api/infra/codegen.js index 0d65c93fb85defc81aba1315bf99eab819275bdc..60aba43f0cfa6133b6803967c38ad0c2e3624bd4 100644 --- a/src/api/infra/codegen.js +++ b/src/api/infra/codegen.js @@ -96,3 +96,11 @@ export function deleteCodegen(tableId) { method: 'delete' }) } + +// 批量删除数据库的表和字段定义 +export function deleteCodegenList(tableIds) { + return request({ + url: `/infra/codegen/delete-list?tableIds=${tableIds.join(',')}`, + method: 'delete' + }) +} diff --git a/src/api/infra/config.js b/src/api/infra/config.js index eec15177962dfc0702f40e673b73fe8a9a3cfa88..214bd38c55079ce7e6a827922c0d63a4cad9de11 100644 --- a/src/api/infra/config.js +++ b/src/api/infra/config.js @@ -51,6 +51,14 @@ export function delConfig(configId) { }) } +// 批量删除参数配置 +export function delConfigList(ids) { + return request({ + url: `/infra/config/delete-list?ids=${ids.join(',')}`, + method: 'delete' + }) +} + // 导出参数 export function exportConfig(query) { return request({ diff --git a/src/api/infra/dataSourceConfig.js b/src/api/infra/dataSourceConfig.js index 2d96b49ccff16a4cf1e31c3d2e8010d4dedab205..5567140d306a846cb58b77098426a09b6e9ce1bf 100755 --- a/src/api/infra/dataSourceConfig.js +++ b/src/api/infra/dataSourceConfig.js @@ -26,6 +26,14 @@ export function deleteDataSourceConfig(id) { }) } +// 批量删除数据源配置 +export function deleteDataSourceConfigList(ids) { + return request({ + url: `/infra/data-source-config/delete-list?ids=${ids.join(',')}`, + method: 'delete' + }) +} + // 获得数据源配置 export function getDataSourceConfig(id) { return request({ diff --git a/src/api/infra/demo01.js b/src/api/infra/demo01.js index b3e5ac144aab80c3e5fd332e09dcf5aa389ba01e..ffa72b5ed9485cbf9cd40bae8b739d797bf905e5 100644 --- a/src/api/infra/demo01.js +++ b/src/api/infra/demo01.js @@ -26,6 +26,14 @@ export function deleteDemo01Contact(id) { }) } +/** 批量删除示例联系人 */ +export function deleteDemo01ContactList(ids) { + return request({ + url: `/infra/demo01-contact/delete-list?ids=${ids.join(',')}`, + method: 'delete' + }) +} + // 获得示例联系人 export function getDemo01Contact(id) { return request({ diff --git a/src/api/infra/demo02.js b/src/api/infra/demo02.js index 7d6d4cdd0567d53de57c1f97c4667481b848d564..8e15713769cca364b04e12803fe89e8aa1f47a4a 100644 --- a/src/api/infra/demo02.js +++ b/src/api/infra/demo02.js @@ -26,6 +26,14 @@ export function deleteDemo02Category(id) { }) } +// 批量删除示例分类 +export function deleteDemo02CategoryList(ids) { + return request({ + url: `/infra/demo02-category/delete-list?ids=${ids.join(',')}`, + method: 'delete' + }) +} + // 获得示例分类 export function getDemo02Category(id) { return request({ diff --git a/src/api/infra/demo03-erp.js b/src/api/infra/demo03-erp.js index 521317caec1af5a82070d2471651075538dda1d2..3209a0f222e1516bb7f5e8a51341a43c0aefdb8b 100644 --- a/src/api/infra/demo03-erp.js +++ b/src/api/infra/demo03-erp.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 创建学生 export function createDemo03Student(data) { return request({ - url: '/infra/demo03-student/create', + url: '/infra/demo03-student-erp/create', method: 'post', data: data }) @@ -12,7 +12,7 @@ export function createDemo03Student(data) { // 更新学生 export function updateDemo03Student(data) { return request({ - url: '/infra/demo03-student/update', + url: '/infra/demo03-student-erp/update', method: 'put', data: data }) @@ -21,7 +21,15 @@ export function updateDemo03Student(data) { // 删除学生 export function deleteDemo03Student(id) { return request({ - url: '/infra/demo03-student/delete?id=' + id, + url: '/infra/demo03-student-erp/delete?id=' + id, + method: 'delete' + }) +} + +/** 批量删除学生 */ +export function deleteDemo03StudentList(ids) { + return request({ + url: `/infra/demo03-student-erp/delete-list?ids=${ids.join(',')}`, method: 'delete' }) } @@ -29,7 +37,7 @@ export function deleteDemo03Student(id) { // 获得学生 export function getDemo03Student(id) { return request({ - url: '/infra/demo03-student/get?id=' + id, + url: '/infra/demo03-student-erp/get?id=' + id, method: 'get' }) } @@ -37,7 +45,7 @@ export function getDemo03Student(id) { // 获得学生分页 export function getDemo03StudentPage(params) { return request({ - url: '/infra/demo03-student/page', + url: '/infra/demo03-student-erp/page', method: 'get', params }) @@ -45,7 +53,7 @@ export function getDemo03StudentPage(params) { // 导出学生 Excel export function exportDemo03StudentExcel(params) { return request({ - url: '/infra/demo03-student/export-excel', + url: '/infra/demo03-student-erp/export-excel', method: 'get', params, responseType: 'blob' @@ -53,11 +61,10 @@ export function exportDemo03StudentExcel(params) { } // ==================== 子表(学生课程) ==================== - // 获得学生课程分页 export function getDemo03CoursePage(params) { return request({ - url: '/infra/demo03-student/demo03-course/page', + url: '/infra/demo03-student-erp/demo03-course/page', method: 'get', params }) @@ -65,43 +72,46 @@ export function getDemo03CoursePage(params) { // 新增学生课程 export function createDemo03Course(data) { return request({ - url: `/infra/demo03-student/demo03-course/create`, + url: '/infra/demo03-student-erp/demo03-course/create', method: 'post', data }) } - // 修改学生课程 export function updateDemo03Course(data) { return request({ - url: `/infra/demo03-student/demo03-course/update`, + url: '/infra/demo03-student-erp/demo03-course/update', method: 'post', data }) } - // 删除学生课程 export function deleteDemo03Course(id) { return request({ - url: `/infra/demo03-student/demo03-course/delete?id=` + id, + url: '/infra/demo03-student-erp/demo03-course/delete?id=' + id, + method: 'delete' + }) +} +/** 批量删除学生课程 */ +export function deleteDemo03CourseList(ids) { + return request({ + url: `/infra/demo03-student-erp/demo03-course/delete-list?ids=${ids.join(',')}`, method: 'delete' }) } - // 获得学生课程 export function getDemo03Course(id) { return request({ - url: `/infra/demo03-student/demo03-course/get?id=` + id, + url: '/infra/demo03-student-erp/demo03-course/get?id=' + id, method: 'get' }) } // ==================== 子表(学生班级) ==================== - // 获得学生班级分页 export function getDemo03GradePage(params) { return request({ - url: '/infra/demo03-student/demo03-grade/page', + url: '/infra/demo03-student-erp/demo03-grade/page', method: 'get', params }) @@ -109,33 +119,37 @@ export function getDemo03GradePage(params) { // 新增学生班级 export function createDemo03Grade(data) { return request({ - url: `/infra/demo03-student/demo03-grade/create`, + url: '/infra/demo03-student-erp/demo03-grade/create', method: 'post', data }) } - // 修改学生班级 export function updateDemo03Grade(data) { return request({ - url: `/infra/demo03-student/demo03-grade/update`, + url: '/infra/demo03-student-erp/demo03-grade/update', method: 'post', data }) } - // 删除学生班级 export function deleteDemo03Grade(id) { return request({ - url: `/infra/demo03-student/demo03-grade/delete?id=` + id, + url: '/infra/demo03-student-erp/demo03-grade/delete?id=' + id, + method: 'delete' + }) +} +/** 批量删除学生班级 */ +export function deleteDemo03GradeList(ids) { + return request({ + url: `/infra/demo03-student-erp/demo03-grade/delete-list?ids=${ids.join(',')}`, method: 'delete' }) } - // 获得学生班级 export function getDemo03Grade(id) { return request({ - url: `/infra/demo03-student/demo03-grade/get?id=` + id, + url: '/infra/demo03-student-erp/demo03-grade/get?id=' + id, method: 'get' }) } diff --git a/src/api/infra/demo03-inner.js b/src/api/infra/demo03-inner.js index 834522af03070f525cc2be763dcde3719c969956..d30c1537f062f766b76d653fa012ded6ef0c02cb 100644 --- a/src/api/infra/demo03-inner.js +++ b/src/api/infra/demo03-inner.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 创建学生 export function createDemo03Student(data) { return request({ - url: '/infra/demo03-student/create', + url: '/infra/demo03-student-inner/create', method: 'post', data: data }) @@ -12,7 +12,7 @@ export function createDemo03Student(data) { // 更新学生 export function updateDemo03Student(data) { return request({ - url: '/infra/demo03-student/update', + url: '/infra/demo03-student-inner/update', method: 'put', data: data }) @@ -21,7 +21,15 @@ export function updateDemo03Student(data) { // 删除学生 export function deleteDemo03Student(id) { return request({ - url: '/infra/demo03-student/delete?id=' + id, + url: '/infra/demo03-student-inner/delete?id=' + id, + method: 'delete' + }) +} + +/** 批量删除学生 */ +export function deleteDemo03StudentList(ids) { + return request({ + url: `/infra/demo03-student-inner/delete-list?ids=${ids.join(',')}`, method: 'delete' }) } @@ -29,7 +37,7 @@ export function deleteDemo03Student(id) { // 获得学生 export function getDemo03Student(id) { return request({ - url: '/infra/demo03-student/get?id=' + id, + url: '/infra/demo03-student-inner/get?id=' + id, method: 'get' }) } @@ -37,7 +45,7 @@ export function getDemo03Student(id) { // 获得学生分页 export function getDemo03StudentPage(params) { return request({ - url: '/infra/demo03-student/page', + url: '/infra/demo03-student-inner/page', method: 'get', params }) @@ -45,7 +53,7 @@ export function getDemo03StudentPage(params) { // 导出学生 Excel export function exportDemo03StudentExcel(params) { return request({ - url: '/infra/demo03-student/export-excel', + url: '/infra/demo03-student-inner/export-excel', method: 'get', params, responseType: 'blob' @@ -53,21 +61,19 @@ export function exportDemo03StudentExcel(params) { } // ==================== 子表(学生课程) ==================== - // 获得学生课程列表 export function getDemo03CourseListByStudentId(studentId) { return request({ - url: `/infra/demo03-student/demo03-course/list-by-student-id?studentId=` + studentId, + url: '/infra/demo03-student-inner/demo03-course/list-by-student-id?studentId=' + studentId, method: 'get' }) } // ==================== 子表(学生班级) ==================== - // 获得学生班级 export function getDemo03GradeByStudentId(studentId) { return request({ - url: `/infra/demo03-student/demo03-grade/get-by-student-id?studentId=` + studentId, + url: '/infra/demo03-student-inner/demo03-grade/get-by-student-id?studentId=' + studentId, method: 'get' }) } diff --git a/src/api/infra/demo03-normal.js b/src/api/infra/demo03-normal.js index 834522af03070f525cc2be763dcde3719c969956..4f3abc146e341b981c387a649fa41a2fa5a55609 100644 --- a/src/api/infra/demo03-normal.js +++ b/src/api/infra/demo03-normal.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 创建学生 export function createDemo03Student(data) { return request({ - url: '/infra/demo03-student/create', + url: '/infra/demo03-student-normal/create', method: 'post', data: data }) @@ -12,7 +12,7 @@ export function createDemo03Student(data) { // 更新学生 export function updateDemo03Student(data) { return request({ - url: '/infra/demo03-student/update', + url: '/infra/demo03-student-normal/update', method: 'put', data: data }) @@ -21,7 +21,15 @@ export function updateDemo03Student(data) { // 删除学生 export function deleteDemo03Student(id) { return request({ - url: '/infra/demo03-student/delete?id=' + id, + url: '/infra/demo03-student-normal/delete?id=' + id, + method: 'delete' + }) +} + +/** 批量删除学生 */ +export function deleteDemo03StudentList(ids) { + return request({ + url: `/infra/demo03-student-normal/delete-list?ids=${ids.join(',')}`, method: 'delete' }) } @@ -29,7 +37,7 @@ export function deleteDemo03Student(id) { // 获得学生 export function getDemo03Student(id) { return request({ - url: '/infra/demo03-student/get?id=' + id, + url: '/infra/demo03-student-normal/get?id=' + id, method: 'get' }) } @@ -37,7 +45,7 @@ export function getDemo03Student(id) { // 获得学生分页 export function getDemo03StudentPage(params) { return request({ - url: '/infra/demo03-student/page', + url: '/infra/demo03-student-normal/page', method: 'get', params }) @@ -45,7 +53,7 @@ export function getDemo03StudentPage(params) { // 导出学生 Excel export function exportDemo03StudentExcel(params) { return request({ - url: '/infra/demo03-student/export-excel', + url: '/infra/demo03-student-normal/export-excel', method: 'get', params, responseType: 'blob' @@ -53,21 +61,19 @@ export function exportDemo03StudentExcel(params) { } // ==================== 子表(学生课程) ==================== - // 获得学生课程列表 export function getDemo03CourseListByStudentId(studentId) { return request({ - url: `/infra/demo03-student/demo03-course/list-by-student-id?studentId=` + studentId, + url: '/infra/demo03-student-normal/demo03-course/list-by-student-id?studentId=' + studentId, method: 'get' }) } // ==================== 子表(学生班级) ==================== - // 获得学生班级 export function getDemo03GradeByStudentId(studentId) { return request({ - url: `/infra/demo03-student/demo03-grade/get-by-student-id?studentId=` + studentId, + url: '/infra/demo03-student-normal/demo03-grade/get-by-student-id?studentId=' + studentId, method: 'get' }) } diff --git a/src/api/infra/file.js b/src/api/infra/file.js index 2aeda2e9030b081bb6a25b021b2a3055c3f7cd0d..aa5f6d0649b0874f93749aadc36a70d34ecf5cd8 100644 --- a/src/api/infra/file.js +++ b/src/api/infra/file.js @@ -8,6 +8,14 @@ export function deleteFile(id) { }) } +// 批量删除文件 +export function deleteFileList(ids) { + return request({ + url: `/infra/file/delete-list?ids=${ids.join(',')}`, + method: 'delete' + }) +} + // 获得文件分页 export function getFilePage(query) { return request({ diff --git a/src/api/infra/fileConfig.js b/src/api/infra/fileConfig.js index 4b75773bf3a5beabb16280abdf4742347c76ea93..49a9c33f37c521e4e09a3552218b258f5632b2da 100755 --- a/src/api/infra/fileConfig.js +++ b/src/api/infra/fileConfig.js @@ -34,6 +34,14 @@ export function deleteFileConfig(id) { }) } +// 批量删除文件配置 +export function deleteFileConfigList(ids) { + return request({ + url: `/infra/file-config/delete-list?ids=${ids.join(',')}`, + method: 'delete' + }) +} + // 获得文件配置 export function getFileConfig(id) { return request({ diff --git a/src/api/infra/job.js b/src/api/infra/job.js index c2237c5198279914de0b05717f56e532e2b952e0..fd952d089ea36294c58b5408a132b2d570707217 100644 --- a/src/api/infra/job.js +++ b/src/api/infra/job.js @@ -43,6 +43,14 @@ export function delJob(jobId) { }) } +// 批量删除定时任务调度 +export function delJobList(ids) { + return request({ + url: `/infra/job/delete-list?ids=${ids.join(',')}`, + method: 'delete' + }) +} + // 导出定时任务调度 export function exportJob(query) { return request({ diff --git a/src/api/system/dept.js b/src/api/system/dept.js index 4ca13e36b97bec0d57a844a9e07e9662c96c1fe2..5f6f07bc55803d18f3a69032389a7bb3ce496394 100644 --- a/src/api/system/dept.js +++ b/src/api/system/dept.js @@ -58,3 +58,11 @@ export function delDept(id) { method: 'delete' }) } + +// 批量删除部门 +export function delDeptList(ids) { + return request({ + url: `/system/dept/delete-batch?ids=${ids.join(',')}`, + method: 'delete' + }) +} diff --git a/src/api/system/dict/type.js b/src/api/system/dict/type.js index 659f7023964600a9187e4ad99c0d7b52d9d56733..31183a76ef674ee81261f36dc59630992c23c71b 100644 --- a/src/api/system/dict/type.js +++ b/src/api/system/dict/type.js @@ -43,6 +43,14 @@ export function delType(dictId) { }) } +// 批量删除字典类型 +export function delTypeList(ids) { + return request({ + url: `/system/dict-type/delete-batch?ids=${ids.join(',')}`, + method: 'delete' + }) +} + // 导出字典类型 export function exportType(query) { return request({ diff --git a/src/api/system/menu.js b/src/api/system/menu.js index b378b01d910462832065b52858d619377e729941..75a2a5f1b9888ba7504a0d4707f9e2b54f0c452e 100644 --- a/src/api/system/menu.js +++ b/src/api/system/menu.js @@ -50,3 +50,11 @@ export function delMenu(id) { method: 'delete' }) } + +// 批量删除菜单 +export function delMenuList(ids) { + return request({ + url: `/system/menu/delete-batch?ids=${ids.join(',')}`, + method: 'delete' + }) +} diff --git a/src/api/system/notice.js b/src/api/system/notice.js index 14924f10fcd87ab2be7b790e5cbb66f616f01785..8b56feffbfe2405aea1d087d83f03177dc0c5705 100644 --- a/src/api/system/notice.js +++ b/src/api/system/notice.js @@ -43,6 +43,14 @@ export function delNotice(noticeId) { }) } +// 批量删除公告 +export function delNoticeList(ids) { + return request({ + url: `/system/notice/delete-batch?ids=${ids.join(',')}`, + method: 'delete' + }) +} + // 推送公告 export function pushNotice(noticeId) { return request({ diff --git a/src/api/system/oauth2/oauth2Client.js b/src/api/system/oauth2/oauth2Client.js index b392b573501de946695867f0b908f3302a861d7b..09033605c87d1405fdbd0a4fade8893d6fdb4049 100755 --- a/src/api/system/oauth2/oauth2Client.js +++ b/src/api/system/oauth2/oauth2Client.js @@ -26,6 +26,14 @@ export function deleteOAuth2Client(id) { }) } +// 批量删除 OAuth2 客户端 +export function deleteOAuth2ClientList(ids) { + return request({ + url: `/system/oauth2-client/delete-batch?ids=${ids.join(',')}`, + method: 'delete' + }) +} + // 获得 OAuth2 客户端 export function getOAuth2Client(id) { return request({ diff --git a/src/api/system/post.js b/src/api/system/post.js index df74d3fed94df614393876b9be81a06fbe83b75e..749066062221b48b2b860dbecddebcecac3da151 100644 --- a/src/api/system/post.js +++ b/src/api/system/post.js @@ -51,6 +51,14 @@ export function delPost(postId) { }) } +// 批量删除岗位 +export function delPostList(ids) { + return request({ + url: `/system/post/delete-batch?ids=${ids.join(',')}`, + method: 'delete' + }) +} + // 导出岗位 export function exportPost(query) { return request({ diff --git a/src/api/system/role.js b/src/api/system/role.js index 9f0772e34066869f184e64fa04a3642cffae1099..37409f05aa1a85e42d812fbf6bb9cd3a20fbe920 100644 --- a/src/api/system/role.js +++ b/src/api/system/role.js @@ -64,6 +64,14 @@ export function delRole(roleId) { }) } +// 批量删除角色 +export function delRoleList(ids) { + return request({ + url: `/system/role/delete-batch?ids=${ids.join(',')}`, + method: 'delete' + }) +} + // 导出角色 export function exportRole(query) { return request({ diff --git a/src/api/system/sms/smsChannel.js b/src/api/system/sms/smsChannel.js index 4e38de05f794050e207d09eb62812b2a269cca17..552893dda3d045d7a570e17f2b6a8dc92c32bee8 100644 --- a/src/api/system/sms/smsChannel.js +++ b/src/api/system/sms/smsChannel.js @@ -26,6 +26,14 @@ export function deleteSmsChannel(id) { }) } +// 批量删除短信渠道 +export function deleteSmsChannelList(ids) { + return request({ + url: `/system/sms-channel/delete-batch?ids=${ids.join(',')}`, + method: 'delete' + }) +} + // 获得短信渠道 export function getSmsChannel(id) { return request({ diff --git a/src/api/system/sms/smsTemplate.js b/src/api/system/sms/smsTemplate.js index 853784cd144d13fb8268d96aceec68fd22ad587d..b2162c0630165ddab47520b8bd9320c10dbaaabc 100644 --- a/src/api/system/sms/smsTemplate.js +++ b/src/api/system/sms/smsTemplate.js @@ -26,6 +26,14 @@ export function deleteSmsTemplate(id) { }) } +// 批量删除短信模板 +export function deleteSmsTemplateList(ids) { + return request({ + url: `/system/sms-template/delete-batch?ids=${ids.join(',')}`, + method: 'delete' + }) +} + // 获得短信模板 export function getSmsTemplate(id) { return request({ diff --git a/src/api/system/tenant.js b/src/api/system/tenant.js index bef02c54c203bd042e4f559ce31fe875fa3104ef..58b758c7d748b389dc10d9ac35f2c1015dd2ed30 100755 --- a/src/api/system/tenant.js +++ b/src/api/system/tenant.js @@ -37,6 +37,14 @@ export function deleteTenant(id) { }) } +// 批量删除租户 +export function deleteTenantList(ids) { + return request({ + url: `/system/tenant/delete-batch?ids=${ids.join(',')}`, + method: 'delete' + }) +} + // 获得租户 export function getTenant(id) { return request({ diff --git a/src/api/system/tenantPackage.js b/src/api/system/tenantPackage.js index d3d9c9c488a93e3b53de28bebafa006a80a48ab5..27de59e595bacab46f6b74d3c6b5eb4b495ceadc 100755 --- a/src/api/system/tenantPackage.js +++ b/src/api/system/tenantPackage.js @@ -26,6 +26,14 @@ export function deleteTenantPackage(id) { }) } +// 批量删除租户套餐 +export function deleteTenantPackageList(ids) { + return request({ + url: `/system/tenant-package/delete-batch?ids=${ids.join(',')}`, + method: 'delete' + }) +} + // 获得租户套餐 export function getTenantPackage(id) { return request({ diff --git a/src/api/system/user.js b/src/api/system/user.js index ffa08da096f2fc4a9b7089ad9cae8869bcbafc30..c681b39431dcfa9daf7d5fd93a35c387452b5f47 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -52,6 +52,14 @@ export function delUser(userId) { }) } +// 批量删除用户 +export function delUserList(ids) { + return request({ + url: `/system/user/delete-batch?ids=${ids.join(',')}`, + method: 'delete' + }) +} + // 导出用户 export function exportUser(query) { return request({ diff --git a/src/main.js b/src/main.js index 20617571a5aeae38a88a49d6e9e2ba61b0f893d5..2e5e210154e37fdc4ab26353968146a0789ae2c1 100644 --- a/src/main.js +++ b/src/main.js @@ -16,14 +16,15 @@ import './permission' // permission control import './tongji' // 百度统计 import { getDicts } from "@/api/system/dict/data"; import { getConfigKey } from "@/api/infra/config"; -import { parseTime, resetForm, handleTree, addBeginAndEndTime, divide} from "@/utils/ruoyi"; +import { parseTime, resetForm, handleTree, addBeginAndEndTime, divide } from "@/utils/ruoyi"; +import { isEmpty } from "@/utils"; import Pagination from "@/components/Pagination"; // 自定义表格工具扩展 import RightToolbar from "@/components/RightToolbar" // 代码高亮插件 // import hljs from 'highlight.js' // import 'highlight.js/styles/github-gist.css' -import {DICT_TYPE, getDictDataLabel, getDictDatas, getDictDatas2} from "@/utils/dict"; +import { DICT_TYPE, getDictDataLabel, getDictDatas, getDictDatas2 } from "@/utils/dict"; // 全局方法挂载 Vue.prototype.getDicts = getDicts @@ -37,6 +38,7 @@ Vue.prototype.DICT_TYPE = DICT_TYPE Vue.prototype.handleTree = handleTree Vue.prototype.addBeginAndEndTime = addBeginAndEndTime Vue.prototype.divide = divide +Vue.prototype.isEmpty = isEmpty // 全局组件挂载 Vue.component('DictTag', DictTag) @@ -56,6 +58,7 @@ Vue.use(VueMeta) // bpmnProcessDesigner 需要引入 import MyPD from "@/components/bpmnProcessDesigner/package/index.js"; + Vue.use(MyPD); import "@/components/bpmnProcessDesigner/package/theme/index.scss"; import "bpmn-js/dist/assets/diagram-js.css"; @@ -65,6 +68,7 @@ import "bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css"; // Form Generator 组件需要使用到 tinymce import Tinymce from '@/components/tinymce/index.vue' + Vue.component('tinymce', Tinymce) import '@/assets/icons' import request from "@/utils/request" // 实现 form generator 使用自己定义的 axios request 对象 @@ -74,6 +78,7 @@ import '@/styles/index.scss' // 默认点击背景不关闭弹窗 import ElementUI from 'element-ui' + ElementUI.Dialog.props.closeOnClickModal.default = false /** diff --git a/src/utils/index.js b/src/utils/index.js index 7a71498b521b888adb54252ccbaa4cd88925d63d..03d708a0d9e3a3bf7af24ef418ceef5af449b1bc 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -1,4 +1,4 @@ -import { parseTime } from './ruoyi' +import {parseTime} from './ruoyi' /** * 表格时间格式化 @@ -217,7 +217,7 @@ export function getTime(type) { export function debounce(func, wait, immediate) { let timeout, args, context, timestamp, result - const later = function() { + const later = function () { // 据上一次触发时间间隔 const last = +new Date() - timestamp @@ -234,7 +234,7 @@ export function debounce(func, wait, immediate) { } } - return function(...args) { + return function (...args) { context = this timestamp = +new Date() const callNow = immediate && !timeout @@ -294,9 +294,15 @@ export function deepClone(obj) { // RegExp if (_toString.call(obj) === '[object RegExp]') { const flags = [] - if (obj.global) { flags.push('g') } - if (obj.multiline) { flags.push('m') } - if (obj.ignoreCase) { flags.push('i') } + if (obj.global) { + flags.push('g') + } + if (obj.multiline) { + flags.push('m') + } + if (obj.ignoreCase) { + flags.push('i') + } return new RegExp(obj.source, flags.join('')) } @@ -438,3 +444,38 @@ export function toCamelCase(str, upperCaseFirst) { return str; } + +export const is = (val, type) => { + return toString.call(val) === `[object ${type}]` +} + +export function isString(val) { + return is(val, 'String') +} + +export function isArray(val) { + return val && Array.isArray(val) +} + +export function isObject(val) { + return val !== null && is(val, 'Object') +} + +export function isEmpty(val) { + if (val === null || val === undefined || typeof val === 'undefined') { + return true + } + if (isArray(val) || isString(val)) { + return val.length === 0 + } + + if (val instanceof Map || val instanceof Set) { + return val.size === 0 + } + + if (isObject(val)) { + return Object.keys(val).length === 0 + } + + return false +} diff --git a/src/views/infra/codegen/index.vue b/src/views/infra/codegen/index.vue index 252f1197f04277e106178a048f5acae7b3756d6d..5a01705f9b14a9a5475802de8e547700a861a3eb 100644 --- a/src/views/infra/codegen/index.vue +++ b/src/views/infra/codegen/index.vue @@ -28,11 +28,25 @@ 导入 + + + 批量删除 + + - + + @@ -85,7 +99,7 @@ diff --git a/src/views/infra/config/index.vue b/src/views/infra/config/index.vue index 0357c7e93277fb2e95922cb00f9d18868570f29e..2779ddc57e1c2e9705e4cddfdb1061d59f54b33d 100644 --- a/src/views/infra/config/index.vue +++ b/src/views/infra/config/index.vue @@ -36,10 +36,24 @@ 导出 + + + 批量删除 + + - + + @@ -107,7 +121,7 @@ diff --git a/src/views/infra/dataSourceConfig/index.vue b/src/views/infra/dataSourceConfig/index.vue index 576259cec9437dc6e99836c8c3bbc4dd1f7ff59f..51116cad85776abd380d818a9fc4bc8a01e33794 100755 --- a/src/views/infra/dataSourceConfig/index.vue +++ b/src/views/infra/dataSourceConfig/index.vue @@ -6,10 +6,24 @@ 新增 + + + 批量删除 + + - + + @@ -54,7 +68,7 @@ diff --git a/src/views/infra/demo/demo03/inner/components/Demo03GradeForm.vue b/src/views/infra/demo/demo03/inner/components/Demo03GradeForm.vue index ceef997278e70167a0f85bf9558f179d26a432c0..2a4d45781e4d71903650f3ed2ae3ce703e024bed 100644 --- a/src/views/infra/demo/demo03/inner/components/Demo03GradeForm.vue +++ b/src/views/infra/demo/demo03/inner/components/Demo03GradeForm.vue @@ -1,17 +1,17 @@ - + @@ -91,6 +115,7 @@ import * as Demo03StudentApi from '@/api/infra/demo03-inner'; import Demo03StudentForm from './Demo03StudentForm.vue'; import Demo03CourseList from './components/Demo03CourseList.vue'; import Demo03GradeList from './components/Demo03GradeList.vue'; + export default { name: "Demo03Student", components: { @@ -116,13 +141,13 @@ export default { refreshTable: true, // 选中行 currentRow: {}, + checkedIds: [], // 查询参数 queryParams: { pageNo: 1, pageSize: 10, name: null, sex: null, - birthday: null, description: null, createTime: [], }, @@ -165,15 +190,29 @@ export default { await Demo03StudentApi.deleteDemo03Student(id); await this.getList(); this.$modal.msgSuccess("删除成功"); - } catch {} + } catch { + } + }, + /** 批量删除学生 */ + async handleDeleteBatch() { + await this.$modal.confirm('是否确认删除?') + try { + await Demo03StudentApi.deleteDemo03StudentList(this.checkedIds); + await this.getList(); + this.$modal.msgSuccess("删除成功"); + } catch { + } + }, + handleRowCheckboxChange(records) { + this.checkedIds = records.map((item) => item.id); }, /** 导出按钮操作 */ async handleExport() { await this.$modal.confirm('是否确认导出所有学生数据项?'); try { this.exportLoading = true; - const res = await Demo03StudentApi.exportDemo03StudentExcel(this.queryParams); - this.$download.excel(res.data, '学生.xls'); + const data = await Demo03StudentApi.exportDemo03StudentExcel(this.queryParams); + this.$download.excel(data, '学生.xls'); } catch { } finally { this.exportLoading = false; diff --git a/src/views/infra/demo/demo03/normal/Demo03StudentForm.vue b/src/views/infra/demo/demo03/normal/Demo03StudentForm.vue index 908de362c734122f09ec60cd3bf448d45c88bd43..c8fc6681983833870aefdb3feff4fe49132a2caf 100644 --- a/src/views/infra/demo/demo03/normal/Demo03StudentForm.vue +++ b/src/views/infra/demo/demo03/normal/Demo03StudentForm.vue @@ -4,17 +4,19 @@ - + {{dict.label}} + >{{ dict.label }} + - + @@ -23,10 +25,10 @@ - + - +