升级组件依赖到最新版本

RuoYi

2022-11-17 750a09d5b702f8e857f09ccc124565796f601d3f

 src/views/system/role/index.vue

@@ -1,12 +1,11 @@
<template>

   <div class="app-container">

      <el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true">

      <el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true" label-width="68px">

         <el-form-item label="角色名称" prop="roleName">

            <el-input

               v-model="queryParams.roleName"

               placeholder="请输入角色名称"

               clearable

               size="small"

               style="width: 240px"

               @keyup.enter="handleQuery"

            />

@@ -16,7 +15,6 @@
               v-model="queryParams.roleKey"

               placeholder="请输入权限字符"

               clearable

               size="small"

               style="width: 240px"

               @keyup.enter="handleQuery"

            />

@@ -26,7 +24,6 @@
               v-model="queryParams.status"

               placeholder="角色状态"

               clearable

               size="small"

               style="width: 240px"

            >

               <el-option

@@ -37,11 +34,9 @@
               />

            </el-select>

         </el-form-item>

         <el-form-item label="创建时间">

         <el-form-item label="创建时间" style="width: 308px">

            <el-date-picker

               v-model="dateRange"

               size="small"

               style="width: 240px"

               value-format="YYYY-MM-DD"

               type="daterange"

               range-separator="-"

@@ -50,8 +45,8 @@
            ></el-date-picker>

         </el-form-item>

         <el-form-item>

            <el-button type="primary" icon="Search" size="mini" @click="handleQuery">搜索</el-button>

            <el-button icon="Refresh" size="mini" @click="resetQuery">重置</el-button>

            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>

            <el-button icon="Refresh" @click="resetQuery">重置</el-button>

         </el-form-item>

      </el-form>

      <el-row :gutter="10" class="mb8">

@@ -60,7 +55,6 @@
               type="primary"

               plain

               icon="Plus"

               size="mini"

               @click="handleAdd"

               v-hasPermi="['system:role:add']"

            >新增</el-button>

@@ -70,7 +64,6 @@
               type="success"

               plain

               icon="Edit"

               size="mini"

               :disabled="single"

               @click="handleUpdate"

               v-hasPermi="['system:role:edit']"

@@ -81,7 +74,6 @@
               type="danger"

               plain

               icon="Delete"

               size="mini"

               :disabled="multiple"

               @click="handleDelete"

               v-hasPermi="['system:role:remove']"

@@ -92,7 +84,6 @@
               type="warning"

               plain

               icon="Download"

               size="mini"

               @click="handleExport"

               v-hasPermi="['system:role:export']"

            >导出</el-button>

@@ -117,42 +108,45 @@
               ></el-switch>

            </template>

         </el-table-column>

         <el-table-column label="创建时间" align="center" prop="createTime" width="180">

         <el-table-column label="创建时间" align="center" prop="createTime">

            <template #default="scope">

               <span>{{ parseTime(scope.row.createTime) }}</span>

            </template>

         </el-table-column>

         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

            <template #default="scope">

               <el-button

                  size="mini"

                  v-if="scope.row.roleId !== 1"

              <el-tooltip content="修改" placement="top" v-if="scope.row.roleId !== 1">

                <el-button

                  type="text"

                  icon="Edit"

                  @click="handleUpdate(scope.row)"

                  v-hasPermi="['system:role:edit']"

               >修改</el-button>

               <el-button

                  size="mini"

                  v-if="scope.row.roleId !== 1"

                ></el-button>

              </el-tooltip>

              <el-tooltip content="删除" placement="top" v-if="scope.row.roleId !== 1">

                <el-button

                  type="text"

                  icon="Delete"

                  @click="handleDelete(scope.row)"

                  v-hasPermi="['system:role:remove']"

               >删除</el-button>

               <el-dropdown size="mini" v-if="scope.row.roleId !== 1" @command="(command) => handleCommand(command, scope.row)">

                  <span class="el-dropdown-link" v-hasPermi="['system:role:edit']">

                     <el-icon><d-arrow-right /></el-icon>更多

                  </span>

                  <template #dropdown>

                     <el-dropdown-menu>

                        <el-dropdown-item command="handleDataScope" icon="CircleCheck"

                           v-hasPermi="['system:role:edit']">数据权限</el-dropdown-item>

                        <el-dropdown-item command="handleAuthUser" icon="User"

                           v-hasPermi="['system:role:edit']">分配用户</el-dropdown-item>

                     </el-dropdown-menu>

                  </template>

               </el-dropdown>

                ></el-button>

              </el-tooltip>

              <el-tooltip content="数据权限" placement="top" v-if="scope.row.roleId !== 1">

                <el-button

                  type="text"

                  icon="CircleCheck"

                  @click="handleDataScope(scope.row)"

                  v-hasPermi="['system:role:edit']"

                ></el-button>

              </el-tooltip>

              <el-tooltip content="分配用户" placement="top" v-if="scope.row.roleId !== 1">

                <el-button

                  type="text"

                  icon="User"

                  @click="handleAuthUser(scope.row)"

                  v-hasPermi="['system:role:edit']"

                ></el-button>

              </el-tooltip>

            </template>

         </el-table-column>

      </el-table>

@@ -175,7 +169,7 @@
               <template #label>

                  <span>

                     <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">

                        <i class="el-icon-question"></i>

                        <el-icon><question-filled /></el-icon>

                     </el-tooltip>

                     权限字符

                  </span>

@@ -268,9 +262,8 @@
</template>



<script setup name="Role">

import { addRole, changeRoleStatus, dataScope, delRole, getRole, listRole, updateRole } from "@/api/system/role";

import { addRole, changeRoleStatus, dataScope, delRole, getRole, listRole, updateRole, deptTreeSelect } from "@/api/system/role";

import { roleMenuTreeselect, treeselect as menuTreeselect } from "@/api/system/menu";

import { treeselect as deptTreeselect, roleDeptTreeselect } from "@/api/system/dept";



const router = useRouter();

const { proxy } = getCurrentInstance();

@@ -468,8 +461,8 @@
  });

}

/** 根据角色ID查询部门树结构 */

function getRoleDeptTreeselect(roleId) {

  return roleDeptTreeselect(roleId).then(response => {

function getDeptTree(roleId) {

  return deptTreeSelect(roleId).then(response => {

    deptOptions.value = response.depts;

    return response;

  });

@@ -549,12 +542,12 @@
/** 分配数据权限操作 */

function handleDataScope(row) {

  reset();

  const roleDeptTreeselect = getRoleDeptTreeselect(row.roleId);

  const deptTreeSelect = getDeptTree(row.roleId);

  getRole(row.roleId).then(response => {

    form.value = response.data;

    openDataScope.value = true;

    nextTick(() => {

      roleDeptTreeselect.then(res => {

      deptTreeSelect.then(res => {

        nextTick(() => {

          if (deptRef.value) {

            deptRef.value.setCheckedKeys(res.checkedKeys);