用户角色改造

src/api/role.ts → src/domain/role/api.ts

@@ -1,28 +1,29 @@
 import request from '@/utils/request'
 
 // 角色管理列表
-export function getRoleList(data: any) {
+export function getList(data: any) {
   return request.post('/sys/role/data', data)
 }
 // 新增角色
-export function saveRole(data: any) {
+export function create(data: any) {
   return request.post('/sys/role/save', data)
 }
+//删除角色
+export function del(data: any) {
+  return request.get('/sys/role/delete', {
+    params: data
+  })
+}
+
 // 分配用户列表
-export function getRoleUser(data: any) {
+export function getRoleUserList(data: any) {
   return request.post('/sys/role/assign', data)
 }
 // 新增分配用户
-export function addRoleUser(data: any) {
+export function createRoleUser(data: any) {
   return request.post('/sys/role/assignrole', data)
 }
 // 移除用户
-export function deleteRoleUser(data: any) {
+export function delRoleUser(data: any) {
   return request.post('/sys/role/outrole', data)
 }
-//删除角色
-export function deleteRole(data: any) {
-  return request.get('/sys/role/delete', {
-    params: data
-  })
-}

src/domain/role/service.ts

@@ -0,0 +1,39 @@
+import * as api from './api'
+
+export const useRoleService = () => {
+  const create = (data: any) => {
+    return api.create(data)
+  }
+  const update = (data: any) => {
+    return api.create(data)
+  }
+  const del = (data: any) => {
+    return api.del(data)
+  }
+
+  const getList = (data: any) => {
+    return api.getList(data)
+  }
+
+  const createRoleUser = (data: any) => {
+    return api.createRoleUser(data)
+  }
+
+  const getRoleUserList = (data: any) => {
+    return api.getRoleUserList(data)
+  }
+
+  const delRoleUser = (data: any) => {
+    return api.delRoleUser(data)
+  }
+
+  return {
+    create,
+    update,
+    del,
+    getList,
+    createRoleUser,
+    getRoleUserList,
+    delRoleUser
+  }
+}

src/api/user.ts → src/domain/user/api.ts

@@ -9,15 +9,15 @@ export function getUserInfo() {
 }
 
 // 用户列表
-export function getUserList(data?: any) {
+export function getList(data?: any) {
   return request.post('/sys/user/list', data)
 }
 // 新增用户
-export function saveUser(data: any) {
+export function create(data: any) {
   return request.post('/sys/user/save', data)
 }
 //删除用户
-export function deleteUser(data: any) {
+export function del(data: any) {
   return request.get('/sys/user/deleteAll', {
     params: data
   })

src/domain/user/service.ts

@@ -0,0 +1,45 @@
+import * as api from './api'
+
+export const useUserService = () => {
+  const create = (data: any) => {
+    return api.create(data)
+  }
+  const update = (data: any) => {
+    if (data.password) {
+      data.newPassword = data.password
+    } else {
+      delete data.password
+    }
+    delete data.roleList
+    return api.create(data)
+  }
+  const del = (data: any) => {
+    return api.del(data)
+  }
+
+  const getList = (data: any) => {
+    return api.getList(data)
+  }
+
+  const checkLoginName = (data: any) => {
+    return api.checkLoginName(data)
+  }
+
+  const login = (data: any) => {
+    return api.login(data)
+  }
+
+  const getUserInfo = () => {
+    return api.getUserInfo()
+  }
+
+  return {
+    create,
+    update,
+    del,
+    getList,
+    checkLoginName,
+    login,
+    getUserInfo
+  }
+}

src/stores/user.ts

@@ -1,6 +1,7 @@
 import router from '@/router'
-import { login } from '@/api/user'
+import { useUserService } from '@/domain/user/service'
 
+const { login } = useUserService()
 export const useUserStore = defineStore({
   id: 'user',
   state: () => ({

src/stores/workflow.ts

@@ -1,48 +0,0 @@
-export const useWorkflow = defineStore({
-  id: 'work',
-  state: () => ({
-    isTried: false,
-    promoterDrawer: false,
-    approverDrawer: false,
-    approverConfig1: {
-      id: ''
-    },
-    approverConfig: {},
-    copyerDrawer: false,
-    copyerConfig1: {
-      id: ''
-    },
-    copyerConfig: {},
-    conditionDrawer: false,
-    conditionsConfig1: {
-      conditionNodes: [],
-      id: ''
-    }
-  }),
-  actions: {
-    setIsTried(isTried: any) {
-      this.isTried = isTried
-    },
-    setPromoter(promoterDrawer: any) {
-      this.promoterDrawer = promoterDrawer
-    },
-    setApprover(approverDrawer: any) {
-      this.approverDrawer = approverDrawer
-    },
-    setApproverConfig(approverConfig1: any) {
-      this.approverConfig1 = approverConfig1
-    },
-    setCopyer(copyerDrawer: any) {
-      this.copyerDrawer = copyerDrawer
-    },
-    setCopyerConfig(copyerConfig1: any) {
-      this.copyerConfig1 = copyerConfig1
-    },
-    setCondition(conditionDrawer: any) {
-      this.conditionDrawer = conditionDrawer
-    },
-    setConditionsConfig(conditionsConfig1: any) {
-      this.conditionsConfig1 = conditionsConfig1
-    }
-  }
-})

src/views/system/User.vue

@@ -1,47 +1,46 @@
 <script setup lang="ts">
 import type { BasicForm, ICRUD } from '@/types/form'
-import { getUserList, saveUser, deleteUser, checkLoginName } from '@/api/user'
-import { getRoleList } from '@/api/role'
+import { useUserService } from '@/domain/user/service'
+import { useRoleService } from '@/domain/role/service'
 
 const curRow = ref<any>(null)
 
+const userService = useUserService()
 const CRUD: ICRUD = {
   create(data: any) {
-    return saveUser(data)
+    return userService.create(data)
   },
   update(data: any) {
-    if (data.password) {
-      data.newPassword = data.password
-    } else {
-      delete data.password
-    }
-    delete data.roleList
     data.oldLoginName = curRow.value.loginName
-    return saveUser(data)
+    return userService.update(data)
   },
   getList(data: any) {
-    return getUserList(data)
+    return userService.getList(data)
   },
   delete(data: any) {
-    return deleteUser({ ids: data.id })
+    return userService.del({ ids: data.id })
   },
   deleteBatch(data: any) {
-    return deleteUser({ ids: data.id })
+    return userService.del({ ids: data.id })
   }
 }
 
 const duplicate = (rule: any, value: any, callback: any) => {
-  checkLoginName({
-    oldLoginName: curRow.value?.loginName || '',
-    loginName: value
-  }).then((res: any) => {
-    if (res === 'true') {
-      callback()
-    } else {
-      callback(new Error('此登录名已存在'))
-    }
-  })
+  userService
+    .checkLoginName({
+      oldLoginName: curRow.value?.loginName || '',
+      loginName: value
+    })
+    .then((res: any) => {
+      if (res === 'true') {
+        callback()
+      } else {
+        callback(new Error('此登录名已存在'))
+      }
+    })
 }
+
+const roleService = useRoleService()
 const formConfig = reactive<BasicForm>({
   formItems: [
     {
@@ -86,17 +85,19 @@ const formConfig = reactive<BasicForm>({
       name: 'roleIdList',
       type: 'select',
       request: () => {
-        return getRoleList({
-          pageSize: -1,
-          name: ''
-        }).then((res: any) => {
-          return res.rows.map((item: any) => {
-            return {
-              value: item.id,
-              label: item.name
-            }
+        return roleService
+          .getList({
+            pageSize: -1,
+            name: ''
+          })
+          .then((res: any) => {
+            return res.rows.map((item: any) => {
+              return {
+                value: item.id,
+                label: item.name
+              }
+            })
           })
-        })
       },
       rules: [{ required: true, message: '请选择角色', trigger: 'blur' }],
       props: {