diff --git a/snowy-admin-web/src/api/biz/bizGroupApi.js b/snowy-admin-web/src/api/biz/bizGroupApi.js index bd2b5c57..dbd40346 100644 --- a/snowy-admin-web/src/api/biz/bizGroupApi.js +++ b/snowy-admin-web/src/api/biz/bizGroupApi.js @@ -10,35 +10,35 @@ const request = (url, ...arg) => baseRequest(`/biz/group/` + url, ...arg) **/ export default { // 获取用户组分页 - bizGroupPage(data) { + groupPage(data) { return request('page', data, 'get') }, // 提交用户组表单 edit为true时为编辑,默认为新增 - bizGroupSubmitForm(data, edit = false) { + groupSubmitForm(data, edit = false) { return request(edit ? 'edit' : 'add', data) }, // 删除用户组 - bizGroupDelete(data) { + groupDelete(data) { return request('delete', data) }, // 获取用户组详情 - bizGroupDetail(data) { + groupDetail(data) { return request('detail', data, 'get') }, // 获取用户组下的用户 - bizGroupOwnUser(data) { + groupOwnUser(data) { return request('ownUser', data, 'get') }, // 获取机构树 - bizGroupOrgTreeSelector(data) { + groupOrgTreeSelector(data) { return request('orgTreeSelector', data, 'get') }, // 获取用户选择器 - bizGroupUserSelector(data) { + groupUserSelector(data) { return request('userSelector', data, 'get') }, // 给用户组授权用户 - bizGroupGrantUser(data) { + groupGrantUser(data) { return request('grantUser', data) } } diff --git a/snowy-admin-web/src/api/sys/groupApi.js b/snowy-admin-web/src/api/sys/groupApi.js index 6959bdb3..d8007069 100644 --- a/snowy-admin-web/src/api/sys/groupApi.js +++ b/snowy-admin-web/src/api/sys/groupApi.js @@ -10,35 +10,35 @@ const request = (url, ...arg) => baseRequest(`/sys/group/` + url, ...arg) **/ export default { // 获取用户组分页 - sysGroupPage(data) { + groupPage(data) { return request('page', data, 'get') }, // 提交用户组表单 edit为true时为编辑,默认为新增 - sysGroupSubmitForm(data, edit = false) { + groupSubmitForm(data, edit = false) { return request(edit ? 'edit' : 'add', data) }, // 删除用户组 - sysGroupDelete(data) { + groupDelete(data) { return request('delete', data) }, // 获取用户组详情 - sysGroupDetail(data) { + groupDetail(data) { return request('detail', data, 'get') }, // 获取用户组下的用户 - sysGroupOwnUser(data) { + groupOwnUser(data) { return request('ownUser', data, 'get') }, // 获取机构树 - sysGroupOrgTreeSelector(data) { + groupOrgTreeSelector(data) { return request('orgTreeSelector', data, 'get') }, // 获取用户选择器 - sysGroupUserSelector(data) { + groupUserSelector(data) { return request('userSelector', data, 'get') }, // 给用户组授权用户 - sysGroupGrantUser(data) { + groupGrantUser(data) { return request('grantUser', data) } } diff --git a/snowy-admin-web/src/views/biz/group/form.vue b/snowy-admin-web/src/views/biz/group/form.vue index 70f4bb58..d3249cba 100644 --- a/snowy-admin-web/src/views/biz/group/form.vue +++ b/snowy-admin-web/src/views/biz/group/form.vue @@ -69,7 +69,7 @@ submitLoading.value = true const formDataParam = cloneDeep(formData.value) bizGroupApi - .bizGroupSubmitForm(formDataParam, formDataParam.id) + .groupSubmitForm(formDataParam, formDataParam.id) .then(() => { onClose() emit('successful') diff --git a/snowy-admin-web/src/views/biz/group/index.vue b/snowy-admin-web/src/views/biz/group/index.vue index d0c7f56a..5ec13fa5 100644 --- a/snowy-admin-web/src/views/biz/group/index.vue +++ b/snowy-admin-web/src/views/biz/group/index.vue @@ -121,7 +121,7 @@ } const loadData = (parameter) => { const searchFormParam = cloneDeep(searchFormState.value) - return bizGroupApi.bizGroupPage(Object.assign(parameter, searchFormParam)).then((data) => { + return bizGroupApi.groupPage(Object.assign(parameter, searchFormParam)).then((data) => { return data }) } @@ -137,13 +137,13 @@ id: record.id } ] - bizGroupApi.bizGroupDelete(params).then(() => { + bizGroupApi.groupDelete(params).then(() => { tableRef.value.refresh(true) }) } // 批量删除 const deleteBatchBizGroup = (params) => { - bizGroupApi.bizGroupDelete(params).then(() => { + bizGroupApi.groupDelete(params).then(() => { tableRef.value.clearRefreshSelected() }) } @@ -155,7 +155,7 @@ const param = { id: record.id } - bizGroupApi.bizGroupOwnUser(param).then((data) => { + bizGroupApi.groupOwnUser(param).then((data) => { userSelectorRef.value.showUserPlusModal(data) }) } @@ -165,17 +165,17 @@ id: recordCacheData.value.id, grantInfoList: value } - bizGroupApi.bizGroupGrantUser(param).then(() => {}) + bizGroupApi.groupGrantUser(param).then(() => {}) } // 传递设计器需要的API const selectorApiFunction = { orgTreeApi: (param) => { - return bizGroupApi.bizGroupOrgTreeSelector(param).then((data) => { + return bizGroupApi.groupOrgTreeSelector(param).then((data) => { return Promise.resolve(data) }) }, userPageApi: (param) => { - return bizGroupApi.bizGroupUserSelector(param).then((data) => { + return bizGroupApi.groupUserSelector(param).then((data) => { return Promise.resolve(data) }) } diff --git a/snowy-admin-web/src/views/sys/group/form.vue b/snowy-admin-web/src/views/sys/group/form.vue index 7d8f165a..c2c1d4e9 100644 --- a/snowy-admin-web/src/views/sys/group/form.vue +++ b/snowy-admin-web/src/views/sys/group/form.vue @@ -72,7 +72,7 @@ submitLoading.value = true const formDataParam = cloneDeep(formData.value) sysGroupApi - .sysGroupSubmitForm(formDataParam, formDataParam.id) + .groupSubmitForm(formDataParam, formDataParam.id) .then(() => { onClose() emit('successful') diff --git a/snowy-admin-web/src/views/sys/group/index.vue b/snowy-admin-web/src/views/sys/group/index.vue index 60927f6c..54a3d11d 100644 --- a/snowy-admin-web/src/views/sys/group/index.vue +++ b/snowy-admin-web/src/views/sys/group/index.vue @@ -117,7 +117,7 @@ } const loadData = (parameter) => { const searchFormParam = cloneDeep(searchFormState.value) - return sysGroupApi.sysGroupPage(Object.assign(parameter, searchFormParam)).then((data) => { + return sysGroupApi.groupPage(Object.assign(parameter, searchFormParam)).then((data) => { return data }) } @@ -133,13 +133,13 @@ id: record.id } ] - sysGroupApi.sysGroupDelete(params).then(() => { + sysGroupApi.groupDelete(params).then(() => { tableRef.value.refresh(true) }) } // 批量删除 const deleteBatchSysGroup = (params) => { - sysGroupApi.sysGroupDelete(params).then(() => { + sysGroupApi.groupDelete(params).then(() => { tableRef.value.clearRefreshSelected() }) } @@ -151,7 +151,7 @@ const param = { id: record.id } - sysGroupApi.sysGroupOwnUser(param).then((data) => { + sysGroupApi.groupOwnUser(param).then((data) => { userSelectorRef.value.showUserPlusModal(data) }) } @@ -161,17 +161,17 @@ id: recordCacheData.value.id, grantInfoList: value } - sysGroupApi.sysGroupGrantUser(param).then(() => {}) + sysGroupApi.groupGrantUser(param).then(() => {}) } // 传递设计器需要的API const selectorApiFunction = { orgTreeApi: (param) => { - return sysGroupApi.sysGroupOrgTreeSelector(param).then((data) => { + return sysGroupApi.groupOrgTreeSelector(param).then((data) => { return Promise.resolve(data) }) }, userPageApi: (param) => { - return sysGroupApi.sysGroupUserSelector(param).then((data) => { + return sysGroupApi.groupUserSelector(param).then((data) => { return Promise.resolve(data) }) }