Merge remote-tracking branch 'origin/dev' into dev

2023-03-27 14:15:53 +08:00 · 2023-03-27 14:15:53 +08:00 · 0c71d0dd93
commit 0c71d0dd93
parent 636e07fcf6 1a4311309d
12 changed files with 87 additions and 127 deletions
--- a/src/api/system/role/index.ts
+++ b/src/api/system/role/index.ts
@ -10,20 +10,13 @@ export interface RoleVO {
  createTime: Date
 }

-export interface RolePageReqVO extends PageParam {
-  name?: string
-  code?: string
-  status?: number
-  createTime?: Date[]
-}
-
 export interface UpdateStatusReqVO {
  id: number
  status: number
 }

 // 查询角色列表
-export const getRolePageApi = async (params: RolePageReqVO) => {
+export const getRolePage = async (params: PageParam) => {
  return await request.get({ url: '/system/role/page', params })
 }

@ -33,26 +26,33 @@ export const getSimpleRoleList = async (): Promise<RoleVO[]> => {
 }

 // 查询角色详情
-export const getRoleApi = async (id: number) => {
+export const getRole = async (id: number) => {
  return await request.get({ url: '/system/role/get?id=' + id })
 }

 // 新增角色
-export const createRoleApi = async (data: RoleVO) => {
+export const createRole = async (data: RoleVO) => {
  return await request.post({ url: '/system/role/create', data })
 }

 // 修改角色
-export const updateRoleApi = async (data: RoleVO) => {
+export const updateRole = async (data: RoleVO) => {
  return await request.put({ url: '/system/role/update', data })
 }

 // 修改角色状态
-export const updateRoleStatusApi = async (data: UpdateStatusReqVO) => {
+export const updateRoleStatus = async (data: UpdateStatusReqVO) => {
  return await request.put({ url: '/system/role/update-status', data })
 }

 // 删除角色
-export const deleteRoleApi = async (id: number) => {
+export const deleteRole = async (id: number) => {
  return await request.delete({ url: '/system/role/delete?id=' + id })
 }
+// 导出角色
+export const exportRole = (params) => {
+  return request.download({
+    url: '/system/role/export-excel',
+    params
+  })
+}
--- a/src/types/auto-components.d.ts
+++ b/src/types/auto-components.d.ts
@ -100,7 +100,6 @@ declare module '@vue/runtime-core' {
    ScriptTask: typeof import('./../components/bpmnProcessDesigner/package/penal/task/task-components/ScriptTask.vue')['default']
    Search: typeof import('./../components/Search/src/Search.vue')['default']
    SignalAndMessage: typeof import('./../components/bpmnProcessDesigner/package/penal/signal-message/SignalAndMessage.vue')['default']
-    Src: typeof import('./../components/RightToolbar/src/index.vue')['default']
    Sticky: typeof import('./../components/Sticky/src/Sticky.vue')['default']
    Table: typeof import('./../components/Table/src/Table.vue')['default']
    Tooltip: typeof import('./../components/Tooltip/src/Tooltip.vue')['default']
--- a/src/views/system/notice/form.vue
+++ b/src/views/system/notice/form.vue
@ -46,7 +46,6 @@
 <script setup lang="ts">
 import { DICT_TYPE, getDictOptions } from '@/utils/dict'
 import * as NoticeApi from '@/api/system/notice'
-
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗

--- a/src/views/system/role/MenuPermissionForm.vue
+++ b/src/views/system/role/MenuPermissionForm.vue
@ -96,8 +96,8 @@ import type { FormExpose } from '@/components/Form'
 import { handleTree, defaultProps } from '@/utils/tree'
 import { SystemDataScopeEnum } from '@/utils/constants'
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
-import { listSimpleMenusApi } from '@/api/system/menu'
-import { listSimpleDeptApi } from '@/api/system/dept'
+import * as MenuApi from '@/api/system/menu'
+import * as DeptApi from '@/api/system/dept'
 import * as PermissionApi from '@/api/system/permission'
 // ========== CRUD 相关 ==========
 const actionLoading = ref(false) // 遮罩层
@ -131,7 +131,7 @@ const openModal = async (type: string, row: RoleApi.RoleVO) => {
  actionScopeType.value = type
  dialogScopeVisible.value = true
  if (type === 'menu') {
-    const menuRes = await listSimpleMenusApi()
+    const menuRes = await MenuApi.getSimpleMenusList()
    treeOptions.value = handleTree(menuRes)
    const role = await PermissionApi.listRoleMenusApi(row.id)
    if (role) {
@ -140,7 +140,7 @@ const openModal = async (type: string, row: RoleApi.RoleVO) => {
      })
    }
  } else if (type === 'data') {
-    const deptRes = await listSimpleDeptApi()
+    const deptRes = await DeptApi.getSimpleDeptList()
    treeOptions.value = handleTree(deptRes)
    const role = await RoleApi.getRole(row.id)
    dataScopeForm.dataScope = role.dataScope
--- a/src/views/system/role/RoleForm.vue
+++ b/src/views/system/role/RoleForm.vue
@ -1,5 +1,5 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="modelVisible" width="800">
+  <Dialog :title="modelTitle" v-model="modelVisible">
    <el-form
      ref="formRef"
      :model="formData"
@ -10,9 +10,6 @@
      <el-form-item label="角色名称" prop="name">
        <el-input v-model="formData.name" placeholder="请输入角色名称" />
      </el-form-item>
-      <el-form-item label="角色类型" prop="type">
-        <el-input :model-value="formData.type" placeholder="请输入角色类型" height="150px" />
-      </el-form-item>
      <el-form-item label="角色标识" prop="code">
        <el-input :model-value="formData.code" placeholder="请输入角色标识" height="150px" />
      </el-form-item>
@ -22,10 +19,10 @@
      <el-form-item label="状态" prop="status">
        <el-select v-model="formData.status" placeholder="请选择状态" clearable>
          <el-option
-            v-for="dict in getDictOptions(DICT_TYPE.COMMON_STATUS)"
-            :key="parseInt(dict.value)"
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
            :label="dict.label"
-            :value="parseInt(dict.value)"
+            :value="dict.value"
          />
        </el-select>
      </el-form-item>
@ -34,35 +31,25 @@
      </el-form-item>
    </el-form>
    <template #footer>
-      <div class="dialog-footer">
-        <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
-        <el-button @click="modelVisible = false">取 消</el-button>
-      </div>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="modelVisible = false">取 消</el-button>
    </template>
  </Dialog>
 </template>
 <script setup lang="ts">
-import { getDictOptions } from '@/utils/dict'
-import { CommonStatusEnum } from '@/utils/constants'
-import type { FormExpose } from '@/components/Form'
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { CommonStatusEnum } from '@/utils/constants'
 import * as RoleApi from '@/api/system/role'
-// ========== CRUD 相关 ==========
-const dialogTitle = ref('edit') // 弹出层标题
-const formRef = ref<FormExpose>() // 表单 Ref
 const { t } = useI18n() // 国际化
-const dataScopeDictDatas = ref()
 const message = useMessage() // 消息弹窗

 const modelVisible = ref(false) // 弹窗的是否展示
 const modelTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
-
 const formData = ref({
  id: undefined,
  name: '',
-  type: '',
  code: '',
  sort: undefined,
  status: CommonStatusEnum.ENABLE,
@ -75,9 +62,10 @@ const formRules = reactive({
  status: [{ required: true, message: '岗位状态不能为空', trigger: 'change' }],
  remark: [{ required: false, message: '岗位内容不能为空', trigger: 'blur' }]
 })
+const formRef = ref() // 表单 Ref

 /** 打开弹窗 */
-const openModal = async (type: string, id?: number) => {
+const open = async (type: string, id?: number) => {
  modelVisible.value = true
  modelTitle.value = t('action.' + type)
  formType.value = type
@ -92,6 +80,7 @@ const openModal = async (type: string, id?: number) => {
    }
  }
 }
+
 /** 重置表单 */
 const resetForm = () => {
  formData.value = {
@ -104,7 +93,8 @@ const resetForm = () => {
  }
  formRef.value?.resetFields()
 }
-defineExpose({ openModal }) // 提供 openModal 方法，用于打开弹窗
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
@ -130,19 +120,4 @@ const submitForm = async () => {
    formLoading.value = false
  }
 }
-
-const init = () => {
-  dataScopeDictDatas.value = getIntDictOptions(DICT_TYPE.SYSTEM_DATA_SCOPE)
-}
-// ========== 初始化 ==========
-onMounted(() => {
-  init()
-})
 </script>
-<style scoped>
-.card {
-  width: 100%;
-  max-height: 400px;
-  overflow-y: scroll;
-}
-</style>
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@ -14,6 +14,7 @@
          placeholder="请输入角色名称"
          clearable
          @keyup.enter="handleQuery"
+          class="!w-240px"
        />
      </el-form-item>
      <el-form-item label="角色标识" prop="code">
@ -22,10 +23,11 @@
          placeholder="请输入角色标识"
          clearable
          @keyup.enter="handleQuery"
+          class="!w-240px"
        />
      </el-form-item>
      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!w-240px">
          <el-option
            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
            :key="dict.value"
@ -48,7 +50,12 @@
      <el-form-item>
        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button type="primary" @click="openModal('create')" v-hasPermi="['system:role:create']">
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['system:role:create']"
+        >
          <Icon icon="ep:plus" class="mr-5px" /> 新增
        </el-button>
        <el-button
@ -66,7 +73,7 @@

  <!-- 列表 -->
  <ContentWrap>
-    <el-table v-loading="loading" :data="list" align="center">
+    <el-table v-loading="loading" :data="list">
      <el-table-column label="角色编号" align="center" prop="id" />
      <el-table-column label="角色名称" align="center" prop="name" />
      <el-table-column label="角色类型" align="center" prop="type" />
@ -90,12 +97,11 @@
          <el-button
            link
            type="primary"
-            @click="openModal('update', scope.row.id)"
+            @click="openForm('update', scope.row.id)"
            v-hasPermi="['system:role:update']"
          >
            编辑
          </el-button>
-          <!-- 操作：菜单权限 -->
          <el-button
            link
            type="primary"
@ -106,7 +112,6 @@
          >
            菜单权限
          </el-button>
-          <!-- 操作：数据权限 -->
          <el-button
            link
            type="primary"
@ -149,18 +154,12 @@ import MenuPermissionForm from './MenuPermissionForm.vue'
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
-
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
+
 const loading = ref(true) // 列表的加载中
 const total = ref(0) // 列表的总页数
 const list = ref([]) // 列表的数据
-const dialogTitle = ref('编辑') // 弹出层标题
-const actionType = ref('') // 操作按钮的类型
-const modelVisible = ref(false) // 是否显示弹出层
-const queryFormRef = ref() // 搜索的表单
-const exportLoading = ref(false) // 导出的加载中
-
 const queryParams = reactive({
  pageNo: 1,
  pageSize: 10,
@ -169,13 +168,8 @@ const queryParams = reactive({
  status: undefined,
  createTime: []
 })
-
-// 设置标题
-const setDialogTile = (type: string) => {
-  dialogTitle.value = t('action.' + type)
-  actionType.value = type
-  modelVisible.value = true
-}
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中

 /** 查询角色列表 */
 const getList = async () => {
@ -203,9 +197,14 @@ const resetQuery = () => {

 /** 添加/修改操作 */
 const formRef = ref()
-const openModal = (type: string, id?: number) => {
-  setDialogTile('编辑')
-  formRef.value.openModal(type, id)
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 数据权限操作 */
+const menuPermissionFormRef = ref()
+const handleScope = async (type: string, row: RoleApi.RoleVO) => {
+  menuPermissionFormRef.value.openForm(type, row)
 }

 /** 删除按钮操作 */
@ -228,20 +227,14 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
-    const data = await RoleApi.exportPostApi(queryParams)
+    const data = await RoleApi.exportRole(queryParams)
    download.excel(data, '角色列表.xls')
  } catch {
  } finally {
    exportLoading.value = false
  }
 }
-/** 数据权限操作 */
-const menuPermissionFormRef = ref()

-// 权限操作
-const handleScope = async (type: string, row: RoleApi.RoleVO) => {
-  menuPermissionFormRef.value.openModal(type, row)
-}
 /** 初始化 **/
 onMounted(() => {
  getList()
--- a/src/views/system/sms/template/SmsTemplateForm.vue
+++ b/src/views/system/sms/template/SmsTemplateForm.vue
@ -44,7 +44,7 @@
          <el-radio
            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
            :key="dict.value"
-            :label="parseInt(dict.value)"
+            :label="parseInt(dict.value as string)"
          >
            {{ dict.label }}
          </el-radio>
@ -96,7 +96,7 @@ const formRules = reactive({
  channelId: [{ required: true, message: '短信渠道编号不能为空', trigger: 'change' }]
 })
 const formRef = ref() // 表单 Ref
-const channelList = ref([]) // 短信渠道列表
+const channelList = ref<SmsChannelApi.SmsChannelVO[]>([]) // 短信渠道列表

 const open = async (type: string, id?: number) => {
  modelVisible.value = true
--- a/src/views/system/sms/template/index.vue
+++ b/src/views/system/sms/template/index.vue
@ -166,12 +166,7 @@
        width="180"
        :formatter="dateFormatter"
      />
-      <el-table-column
-        label="操作"
-        align="center"
-        width="210"
-        fixed="right"
-      >
+      <el-table-column label="操作" align="center" width="210" fixed="right">
        <template #default="scope">
          <el-button
            link
@ -241,7 +236,7 @@ const queryParams = reactive({
  createTime: []
 })
 const exportLoading = ref(false) // 导出的加载中
-const channelList = ref([]) // 短信渠道列表
+const channelList = ref<SmsChannelApi.SmsChannelVO[]>([]) // 短信渠道列表

 /** 查询列表 */
 const getList = async () => {
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@ -332,26 +332,24 @@ const getPostOptions = async () => {
  const res = await getSimplePostList()
  postOptions.value.push(...res)
 }
-const dataFormater = (val) => {
-  return deptFormater(deptOptions.value, val)
-}
+const dataFormater = computed(() => (deptId: number) => deptFormater(deptOptions.value, deptId))
+
 //部门回显
-const deptFormater = (ary, val: any) => {
-  var o = ''
-  if (ary && val) {
-    for (const v of ary) {
-      if (v.id == val) {
-        o = v.name
-        if (o) return o
-      } else if (v.children?.length) {
-        o = deptFormater(v.children, val)
-        if (o) return o
+const deptFormater = (arr: Tree[], deptId: number) => {
+  let deptName = ''
+  if (arr && deptId) {
+    for (const item of arr) {
+      if (item.id === deptId) {
+        deptName = item.name
+        break
+      }
+      if (item.children) {
+        deptName = deptFormater(item.children, deptId) ?? ''
+        break
      }
    }
-    return o
-  } else {
-    return val
  }
+  return deptName
 }

 // 设置标题
--- a/types/components.d.ts
+++ b/types/components.d.ts
@ -1,6 +1,7 @@
 declare module 'vue' {
  export interface GlobalComponents {
-    Icon: typeof import('../components/Icon/src/Icon.vue')['default']
+    Icon: typeof import('@/components/Icon')['Icon']
+    DictTag: typeof import('@/components/DictTag')['DictTag']
  }
 }

--- a/types/global.d.ts
+++ b/types/global.d.ts
@ -1,29 +1,29 @@
 export {}
 declare global {
-  declare interface Fn<T = any> {
+  interface Fn<T = any> {
    (...arg: T[]): T
  }

-  declare type Nullable<T> = T | null
+  type Nullable<T> = T | null

-  declare type ElRef<T extends HTMLElement = HTMLDivElement> = Nullable<T>
+  type ElRef<T extends HTMLElement = HTMLDivElement> = Nullable<T>

-  declare type Recordable<T = any, K = string> = Record<K extends null | undefined ? string : K, T>
+  type Recordable<T = any, K = string> = Record<K extends null | undefined ? string : K, T>

-  declare type ComponentRef<T> = InstanceType<T>
+  type ComponentRef<T> = InstanceType<T>

-  declare type LocaleType = 'zh-CN' | 'en'
+  type LocaleType = 'zh-CN' | 'en'

-  declare type AxiosHeaders =
+  type AxiosHeaders =
    | 'application/json'
    | 'application/x-www-form-urlencoded'
    | 'multipart/form-data'

-  declare type AxiosMethod = 'get' | 'post' | 'delete' | 'put' | 'GET' | 'POST' | 'DELETE' | 'PUT'
+  type AxiosMethod = 'get' | 'post' | 'delete' | 'put' | 'GET' | 'POST' | 'DELETE' | 'PUT'

-  declare type AxiosResponseType = 'arraybuffer' | 'blob' | 'document' | 'json' | 'text' | 'stream'
+  type AxiosResponseType = 'arraybuffer' | 'blob' | 'document' | 'json' | 'text' | 'stream'

-  declare interface AxiosConfig {
+  interface AxiosConfig {
    params?: any
    data?: any
    url?: string
@ -32,17 +32,17 @@ declare global {
    responseType?: AxiosResponseType
  }

-  declare interface IResponse<T = any> {
+  interface IResponse<T = any> {
    code: string
    data: T extends any ? T : T & any
  }

-  declare interface PageParam {
+  interface PageParam {
    pageSize?: number
    pageNo?: number
  }

-  declare interface Tree {
+  interface Tree {
    id: number
    name: string
    children?: Tree[] | any[]
--- a/types/router.d.ts
+++ b/types/router.d.ts
@ -54,7 +54,7 @@ type Component<T = any> =
  | (() => Promise<T>)

 declare global {
-  declare interface AppRouteRecordRaw extends Omit<RouteRecordRaw, 'meta'> {
+  interface AppRouteRecordRaw extends Omit<RouteRecordRaw, 'meta'> {
    name: string
    meta: RouteMeta
    component?: Component | string
@ -64,7 +64,7 @@ declare global {
    keepAlive?: boolean
  }

-  declare interface AppCustomRouteRecordRaw extends Omit<RouteRecordRaw, 'meta'> {
+  interface AppCustomRouteRecordRaw extends Omit<RouteRecordRaw, 'meta'> {
    icon: any
    name: string
    meta: RouteMeta