From 34e7350da5e3b7b7a03a21e0b841942d22c40c38 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Sun, 4 Jan 2026 16:11:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=84=A1=E7=94=A8=E7=9A=84?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/appConfig/DataRuleList.vue          | 144 ---------
 src/views/appConfig/DataRuleModal.vue         |  54 ----
 src/views/appConfig/NuAppPermissionList.vue   |   8 -
 .../components/NuAppPermissionForm.vue        |   4 +-
 .../components/RoleDataRuleDrawer.vue         |  85 -----
 src/views/appConfig/components/RoleDesc.vue   |  18 --
 src/views/appConfig/components/RoleDrawer.vue |  53 ---
 .../appConfig/components/RoleIndexModal.vue   |  55 ----
 .../components/RolePermissionDrawer.vue       | 304 ------------------
 .../appConfig/components/RoleUserTable.vue    | 200 ------------
 .../appConfig/components/UseSelectModal.vue   |  67 ----
 11 files changed, 2 insertions(+), 990 deletions(-)
 delete mode 100644 src/views/appConfig/DataRuleList.vue
 delete mode 100644 src/views/appConfig/DataRuleModal.vue
 delete mode 100644 src/views/appConfig/components/RoleDataRuleDrawer.vue
 delete mode 100644 src/views/appConfig/components/RoleDesc.vue
 delete mode 100644 src/views/appConfig/components/RoleDrawer.vue
 delete mode 100644 src/views/appConfig/components/RoleIndexModal.vue
 delete mode 100644 src/views/appConfig/components/RolePermissionDrawer.vue
 delete mode 100644 src/views/appConfig/components/RoleUserTable.vue
 delete mode 100644 src/views/appConfig/components/UseSelectModal.vue

diff --git a/src/views/appConfig/DataRuleList.vue b/src/views/appConfig/DataRuleList.vue
deleted file mode 100644
index d3e9a4a..0000000
--- a/src/views/appConfig/DataRuleList.vue
+++ /dev/null
@@ -1,144 +0,0 @@
-<template>
-  <BasicDrawer v-bind="$attrs" @register="registerDrawer" title="数据权限规则" :width="adaptiveWidth" :rootClassName="prefixCls">
-    <BasicTable @register="registerTable">
-      <template #tableTitle>
-        <a-button type="primary" @click="handleCreate"> 新增</a-button>
-      </template>
-      <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" />
-      </template>
-    </BasicTable>
-  </BasicDrawer>
-  <DataRuleModal @register="registerModal" @success="reload" :permissionId="permissionId" />
-</template>
-<script lang="ts" setup>
-  import { ref, unref } from 'vue';
-  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  import { useModal } from '/@/components/Modal';
-  import DataRuleModal from './DataRuleModal.vue';
-  import { dataRuleColumns, dataRuleSearchFormSchema } from './NuAppPermission.data';
-  import { dataRuleList, deleteRule } from './NuAppPermission.api';
-  import { ColEx } from '/@/components/Form/src/types';
-  import { useDrawerAdaptiveWidth } from '/@/hooks/jeecg/useAdaptiveWidth';
-  import { useDesign } from '/@/hooks/web/useDesign';
-  const permissionId = ref('');
-  const { adaptiveWidth } = useDrawerAdaptiveWidth();
-  const { prefixCls } = useDesign('sys-menu-dataRulelist');
-  //权限规则model
-  const [registerModal, { openModal }] = useModal();
-  const [registerDrawer] = useDrawerInner(async (data) => {
-    permissionId.value = data.id;
-    setProps({ searchInfo: { permissionId: unref(permissionId) } });
-    reload();
-  });
-  // 自适应列配置
-  const adaptiveColProps: Partial<ColEx> = {
-    xs: 24, // <576px
-    sm: 24, // ≥576px
-    md: 24, // ≥768px
-    lg: 12, // ≥992px
-    xl: 8, // ≥1200px
-    xxl: 8, // ≥1600px
-  };
-  const [registerTable, { reload, setProps }] = useTable({
-    api: dataRuleList,
-    columns: dataRuleColumns,
-    size: 'small',
-    formConfig: {
-      baseColProps: adaptiveColProps,
-      labelAlign: 'right',
-      labelCol: {
-        offset: 1,
-        xs: 24,
-        sm: 24,
-        md: 24,
-        lg: 8,
-        xl: 8,
-        xxl: 8,
-      },
-      wrapperCol: {},
-      schemas: dataRuleSearchFormSchema,
-      autoSubmitOnEnter: true,
-    },
-    striped: true,
-    useSearchForm: true,
-    bordered: true,
-    showIndexColumn: false,
-    showTableSetting: false,
-    canResize: false,
-    immediate: false,
-    actionColumn: {
-      width: 100,
-      title: '操作',
-      dataIndex: 'action',
-      slots: { customRender: 'action' },
-      fixed: undefined,
-    },
-  });
-
-  /**
-   * 新增
-   */
-  function handleCreate() {
-    openModal(true, {
-      isUpdate: false,
-    });
-  }
-
-  /**
-   * 编辑
-   */
-  function handleEdit(record) {
-    openModal(true, {
-      record,
-      isUpdate: true,
-    });
-  }
-
-  /**
-   * 删除
-   */
-  async function handleDelete(record) {
-    await deleteRule({ id: record.id }, reload);
-  }
-
-  /**
-   * 操作栏
-   */
-  function getTableAction(record) {
-    return [
-      {
-        label: '编辑',
-        onClick: handleEdit.bind(null, record),
-      },
-      {
-        label: '删除',
-        popConfirm: {
-          title: '是否确认删除',
-          confirm: handleDelete.bind(null, record),
-        },
-      },
-    ];
-  }
-</script>
-<style lang="less">
-  // -update-begin--author:liaozhiyang---date:20240702---for：【TV360X-1660】菜单管理-数据权限的查询和按钮没间隙
-  @prefix-cls: ~'@{namespace}-sys-menu-dataRulelist';
-  .@{prefix-cls} {
-    .jeecg-basic-table {
-      padding: 0;
-    }
-    .btnArea {
-      .ant-btn {
-        &:last-child {
-          margin-right: 0;
-        }
-        &:first-child {
-          margin-left: 8px;
-        }
-      }
-    }
-  }
-  // -update-end--author:liaozhiyang---date:20240702---for：【TV360X-1660】菜单管理-数据权限的查询和按钮没间隙
-</style>
diff --git a/src/views/appConfig/DataRuleModal.vue b/src/views/appConfig/DataRuleModal.vue
deleted file mode 100644
index 7a35a92..0000000
--- a/src/views/appConfig/DataRuleModal.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-<template>
-  <BasicModal v-bind="$attrs" @register="registerModal" :title="getTitle" @ok="handleSubmit" width="700px" destroyOnClose>
-    <BasicForm @register="registerForm" />
-  </BasicModal>
-</template>
-<script lang="ts" setup>
-  import { ref, computed, unref } from 'vue';
-  import { BasicModal, useModalInner } from '/@/components/Modal';
-  import { BasicForm, useForm } from '/@/components/Form/index';
-  import { dataRuleFormSchema } from './NuAppPermission.data';
-  import { saveOrUpdateRule } from './NuAppPermission.api';
-  // 声明Emits
-  const emit = defineEmits(['success', 'register']);
-  const props = defineProps({ permissionId: String });
-  const isUpdate = ref(true);
-  //表单配置
-  const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
-    schemas: dataRuleFormSchema,
-    showActionButtonGroup: false,
-  });
-  //表单赋值
-  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
-    //重置表单
-    await resetFields();
-    setModalProps({ confirmLoading: false });
-    isUpdate.value = !!data?.isUpdate;
-    if (unref(isUpdate)) {
-      //表单赋值
-      await setFieldsValue({
-        ...data.record,
-      });
-    }
-  });
-
-  //设置标题
-  const getTitle = computed(() => (!unref(isUpdate) ? '新增规则' : '编辑规则'));
-
-  //表单提交事件
-  async function handleSubmit() {
-    try {
-      const values = await validate();
-      values.permissionId = props.permissionId;
-      setModalProps({ confirmLoading: true });
-      //提交表单
-      await saveOrUpdateRule(values, isUpdate.value);
-      //关闭弹窗
-      closeModal();
-      //刷新列表
-      emit('success');
-    } finally {
-      setModalProps({ confirmLoading: false });
-    }
-  }
-</script>
diff --git a/src/views/appConfig/NuAppPermissionList.vue b/src/views/appConfig/NuAppPermissionList.vue
index 3fd568f..734c0fe 100644
--- a/src/views/appConfig/NuAppPermissionList.vue
+++ b/src/views/appConfig/NuAppPermissionList.vue
@@ -24,7 +24,6 @@
       </template>
     </BasicTable>
     <MenuDrawer @register="registerDrawer" @success="handleSuccess" :showFooter="showFooter" />
-    <DataRuleList @register="registerDrawer1" />
   </div>
 </template>
 <script lang="ts" name="system-menu" setup>
@@ -42,7 +41,6 @@
   const checkedKeys = ref<Array<string | number>>([]);
   const showFooter = ref(true);
   const [registerDrawer, { openDrawer }] = useDrawer();
-  const [registerDrawer1, { openDrawer: openDataRule }] = useDrawer();
   const { t } = useI18n();
 
   // 自定义菜单名称列渲染
@@ -148,12 +146,6 @@
       isUpdate: false,
     });
   }
-  /**
-   * 数据权限弹窗
-   */
-  function handleDataRule(record) {
-    openDataRule(true, { id: record.id });
-  }
 
   /**
    * 删除
diff --git a/src/views/appConfig/components/NuAppPermissionForm.vue b/src/views/appConfig/components/NuAppPermissionForm.vue
index c8e727e..f0960b4 100644
--- a/src/views/appConfig/components/NuAppPermissionForm.vue
+++ b/src/views/appConfig/components/NuAppPermissionForm.vue
@@ -121,7 +121,7 @@
   import { defHttp } from '/@/utils/http/axios';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { getValueType } from '/@/utils';
-  import { saveOrUpdate } from '../NuAppPermission.api';
+  import { saveOrUpdateRule } from '../NuAppPermission.api';
   import { Form } from 'ant-design-vue';
   import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
   const props = defineProps({
@@ -237,7 +237,7 @@
         }
       }
     }
-    await saveOrUpdate(model, isUpdate.value)
+    await saveOrUpdateRule(model, isUpdate.value)
       .then((res) => {
         if (res.success) {
           createMessage.success(res.message);
diff --git a/src/views/appConfig/components/RoleDataRuleDrawer.vue b/src/views/appConfig/components/RoleDataRuleDrawer.vue
deleted file mode 100644
index a5a9091..0000000
--- a/src/views/appConfig/components/RoleDataRuleDrawer.vue
+++ /dev/null
@@ -1,85 +0,0 @@
-<template>
-  <BasicDrawer v-bind="$attrs" @register="registerDrawer" title="数据规则配置" width="450px" destroyOnClose>
-    <a-tabs defaultActiveKey="1">
-      <a-tab-pane tab="数据规则" key="1">
-        <a-checkbox-group v-model:value="dataRuleChecked" v-if="dataRuleList.length > 0">
-          <a-row>
-            <a-col :span="24" v-for="(item, index) in dataRuleList" :key="'dr' + index">
-              <a-checkbox :value="item.id">{{ item.ruleName }}</a-checkbox>
-            </a-col>
-
-            <a-col :span="24">
-              <div style="width: 100%; margin-top: 15px">
-                <a-button @click="saveDataRuleForRole" type="primary" size="small"> <Icon icon="ant-design:save-outlined"></Icon>点击保存</a-button>
-              </div>
-            </a-col>
-          </a-row>
-        </a-checkbox-group>
-        <div v-else><h3>无配置信息!</h3></div>
-      </a-tab-pane>
-    </a-tabs>
-  </BasicDrawer>
-</template>
-<script lang="ts" setup>
-  import { ref, unref } from 'vue';
-  import { BasicDrawer, useDrawerInner } from '/src/components/Drawer';
-  import { useMessage } from '/src/hooks/web/useMessage';
-  import { queryDataRule, saveDataRule } from '../NuAppRole.api';
-  // 声明Emits
-  const emit = defineEmits(['success', 'register']);
-  const { createMessage } = useMessage();
-  // 声明数据
-  const functionId = ref('');
-  const roleId = ref('');
-  const dataRuleList = ref([]);
-  const dataRuleChecked = ref([]);
-
-  /**
-   * 数据
-   */
-  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-    await reset();
-    setDrawerProps({ confirmLoading: false });
-    //权限的id
-    functionId.value = data.functionId;
-    //角色的id
-    roleId.value = data.roleId;
-    //查询数据
-    const res = await queryDataRule({ functionId: unref(functionId), roleId: unref(roleId) });
-    if (res.success) {
-      dataRuleList.value = res.result.datarule;
-      if (res.result.drChecked) {
-        dataRuleChecked.value = res.result.drChecked.split(',');
-      }
-    }
-  });
-
-  /**
-   * 重置
-   */
-  function reset() {
-    functionId.value = '';
-    roleId.value = '';
-    dataRuleList.value = [];
-    dataRuleChecked.value = [];
-  }
-
-  /**
-   * 提交
-   */
-  async function saveDataRuleForRole() {
-    if (!unref(dataRuleChecked) || unref(dataRuleChecked).length == 0) {
-      createMessage.warning('请注意，现未勾选任何数据权限!');
-    }
-    let params = {
-      permissionId: unref(functionId),
-      roleId: unref(roleId),
-      dataRuleIds: unref(dataRuleChecked).join(','),
-    };
-    await saveDataRule(params);
-    //关闭弹窗
-    closeDrawer();
-    //刷新列表
-    emit('success');
-  }
-</script>
diff --git a/src/views/appConfig/components/RoleDesc.vue b/src/views/appConfig/components/RoleDesc.vue
deleted file mode 100644
index 094ccf5..0000000
--- a/src/views/appConfig/components/RoleDesc.vue
+++ /dev/null
@@ -1,18 +0,0 @@
-<template>
-  <BasicDrawer v-bind="$attrs" @register="registerDrawer" title="角色详情" width="500px" destroyOnClose>
-    <Description :column="1" :data="roleData" :schema="formDescSchema" />
-  </BasicDrawer>
-</template>
-<script lang="ts" setup>
-  import { ref, useAttrs } from 'vue';
-  import { BasicDrawer, useDrawerInner } from '/src/components/Drawer';
-  import { formDescSchema } from '../NuAppRole.data';
-  import { Description, useDescription } from '/@/components/Description/index';
-  const emit = defineEmits(['register']);
-  const attrs = useAttrs();
-  const roleData = ref({});
-  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-    setDrawerProps({ confirmLoading: false });
-    roleData.value = data.record;
-  });
-</script>
diff --git a/src/views/appConfig/components/RoleDrawer.vue b/src/views/appConfig/components/RoleDrawer.vue
deleted file mode 100644
index 5e72907..0000000
--- a/src/views/appConfig/components/RoleDrawer.vue
+++ /dev/null
@@ -1,53 +0,0 @@
-<template>
-  <BasicDrawer v-bind="$attrs" @register="registerDrawer" :title="getTitle" width="500px" @ok="handleSubmit" destroyOnClose>
-    <BasicForm @register="registerForm" />
-  </BasicDrawer>
-</template>
-<script lang="ts" setup>
-  import { ref, computed, unref, useAttrs } from 'vue';
-  import { BasicForm, useForm } from '/src/components/Form';
-  import { BasicDrawer, useDrawerInner } from '/src/components/Drawer';
-  import { BasicTree, TreeItem } from '/src/components/Tree';
-  import { formSchema } from '../NuAppRole.data';
-  import { saveOrUpdateRole } from '../NuAppRole.api';
-  // 声明Emits
-  const emit = defineEmits(['success', 'register']);
-  const attrs = useAttrs();
-  const isUpdate = ref(true);
-  const [registerForm, { setProps, resetFields, setFieldsValue, validate }] = useForm({
-    labelWidth: 90,
-    schemas: formSchema,
-    showActionButtonGroup: false,
-  });
-  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-    resetFields();
-    isUpdate.value = !!data?.isUpdate;
-    setDrawerProps({ confirmLoading: false });
-    if (unref(isUpdate)) {
-      setFieldsValue({
-        ...data.record,
-      });
-    }
-    //禁用表单
-    setProps({ disabled: !attrs.showFooter });
-  });
-  /**
-   * 标题
-   */
-  const getTitle = computed(() => (!unref(isUpdate) ? '新增角色' : '编辑角色'));
-  /**
-   * 提交
-   */
-  async function handleSubmit() {
-    try {
-      const values = await validate();
-      setDrawerProps({ confirmLoading: true });
-      //提交表单
-      await saveOrUpdateRole(values, isUpdate.value);
-      closeDrawer();
-      emit('success');
-    } finally {
-      setDrawerProps({ confirmLoading: false });
-    }
-  }
-</script>
diff --git a/src/views/appConfig/components/RoleIndexModal.vue b/src/views/appConfig/components/RoleIndexModal.vue
deleted file mode 100644
index 4db89ea..0000000
--- a/src/views/appConfig/components/RoleIndexModal.vue
+++ /dev/null
@@ -1,55 +0,0 @@
-<template>
-  <BasicModal v-bind="$attrs" @register="registerModal" title="首页配置" @ok="handleSubmit" width="40%">
-    <BasicForm @register="registerForm" />
-  </BasicModal>
-</template>
-
-<script lang="ts" setup>
-  import { ref, computed, unref } from 'vue';
-  import { BasicModal, useModalInner } from '/@/components/Modal';
-  import { BasicForm, useForm } from '/@/components/Form/index';
-  import { roleIndexFormSchema } from '../NuAppRole.data';
-  import { saveOrUpdateRoleIndex, queryIndexByCode } from '../NuAppRole.api';
-  // Emits声明
-  const emit = defineEmits(['register', 'success']);
-  const isUpdate = ref(true);
-  //表单配置
-  const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
-    labelWidth: 150,
-    schemas: roleIndexFormSchema,
-    showActionButtonGroup: false,
-  });
-  //表单赋值
-  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
-    //重置表单
-    await resetFields();
-    setModalProps({ confirmLoading: false });
-    setFieldsValue({ roleCode: data.roleCode });
-    let res = await queryIndexByCode({ roleCode: data.roleCode });
-    isUpdate.value = !!res.result?.id;
-    if (unref(isUpdate)) {
-      //表单赋值
-      await setFieldsValue({
-        ...res.result,
-      });
-    }
-  });
-
-  //表单提交事件
-  async function handleSubmit(v) {
-    try {
-      let values = await validate();
-      setModalProps({ confirmLoading: true });
-      //提交表单
-      await saveOrUpdateRoleIndex(values, isUpdate.value);
-      //关闭弹窗
-      closeModal();
-      //刷新列表
-      emit('success', { isUpdate: isUpdate.value, values });
-    } finally {
-      setModalProps({ confirmLoading: false });
-    }
-  }
-</script>
-
-<style lang="less" scoped></style>
diff --git a/src/views/appConfig/components/RolePermissionDrawer.vue b/src/views/appConfig/components/RolePermissionDrawer.vue
deleted file mode 100644
index 1dc98aa..0000000
--- a/src/views/appConfig/components/RolePermissionDrawer.vue
+++ /dev/null
@@ -1,304 +0,0 @@
-<template>
-  <BasicDrawer v-bind="$attrs" @register="registerDrawer" width="650px" destroyOnClose showFooter>
-    <template #title>
-      角色权限配置
-      <a-dropdown>
-        <Icon icon="ant-design:more-outlined" class="more-icon" />
-        <template #overlay>
-          <a-menu @click="treeMenuClick">
-            <a-menu-item key="checkAll">选择全部</a-menu-item>
-            <a-menu-item key="cancelCheck">取消选择</a-menu-item>
-            <div class="line"></div>
-            <a-menu-item key="openAll">展开全部</a-menu-item>
-            <a-menu-item key="closeAll">折叠全部</a-menu-item>
-            <div class="line"></div>
-            <a-menu-item key="relation">层级关联</a-menu-item>
-            <a-menu-item key="standAlone">层级独立</a-menu-item>
-          </a-menu>
-        </template>
-      </a-dropdown>
-    </template>
-    <BasicTree
-      ref="treeRef"
-      checkable
-      :treeData="treeData"
-      :checkedKeys="checkedKeys"
-      :expandedKeys="expandedKeys"
-      :selectedKeys="selectedKeys"
-      :clickRowToExpand="false"
-      :checkStrictly="true"
-      title="所拥有的的权限"
-      @check="onCheck"
-      @select="onTreeNodeSelect"
-    >
-      <template #title="{ slotTitle, ruleFlag }">
-        {{ slotTitle }}
-        <Icon v-if="ruleFlag" icon="ant-design:align-left-outlined" style="margin-left: 5px; color: red"></Icon>
-      </template>
-    </BasicTree>
-    <!--右下角按钮-->
-    <template #footer>
-      <!-- <PopConfirmButton title="确定放弃编辑？" @confirm="closeDrawer" okText="确定" cancelText="取消"></PopConfirmButton> -->
-      <a-button @click="closeDrawer">取消</a-button>
-      <a-button @click="handleSubmit(false)" type="primary" :loading="loading" ghost style="margin-right: 0.8rem">仅保存</a-button>
-      <a-button @click="handleSubmit(true)" type="primary" :loading="loading">保存并关闭</a-button>
-    </template>
-    <RoleDataRuleDrawer @register="registerDrawer1" />
-  </BasicDrawer>
-</template>
-<script lang="ts" setup>
-  import { ref, computed, unref, onMounted } from 'vue';
-  import { BasicDrawer, useDrawer, useDrawerInner } from '/@/components/Drawer';
-  import { BasicTree, TreeItem } from '/@/components/Tree';
-  import { PopConfirmButton } from '/@/components/Button';
-  import RoleDataRuleDrawer from './RoleDataRuleDrawer.vue';
-  import { queryTreeListForRole, queryRolePermission, saveRolePermission } from '../NuAppRole.api';
-  import { useI18n } from "/@/hooks/web/useI18n";
-  import { ROLE_AUTH_CONFIG_KEY } from '/@/enums/cacheEnum';
-  const emit = defineEmits(['register']);
-  //树的信息
-  const treeData = ref<TreeItem[]>([]);
-  //树的全部节点信息
-  const allTreeKeys = ref([]);
-  //树的选择节点信息
-  const checkedKeys = ref<any>([]);
-  const defaultCheckedKeys = ref([]);
-  //树的选中的节点信息
-  const selectedKeys = ref([]);
-  const roleId = ref('');
-  //树的实例
-  const treeRef = ref(null);
-  const loading = ref(false);
-
-  //展开折叠的key
-  const expandedKeys = ref<any>([]);
-  //父子节点选中状态是否关联 true不关联，false关联
-  const checkStrictly = ref<boolean>(false);
-  const [registerDrawer1, { openDrawer: openDataRuleDrawer }] = useDrawer();
-  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-    await reset();
-    setDrawerProps({ confirmLoading: false, loading: true });
-    roleId.value = data.roleId;
-    //初始化数据
-    const roleResult = await queryTreeListForRole();
-    // update-begin--author:liaozhiyang---date:20240228---for：【QQYUN-8355】角色权限配置的菜单翻译
-    treeData.value = translateTitle(roleResult.treeList);
-    // update-end--author:liaozhiyang---date:20240228---for：【QQYUN-8355】角色权限配置的菜单翻译
-    allTreeKeys.value = roleResult.ids;
-    // update-begin--author:liaozhiyang---date:20240531---for：【TV360X-590】角色授权弹窗操作缓存
-    const localData = localStorage.getItem(ROLE_AUTH_CONFIG_KEY);
-    if (localData) {
-      const obj = JSON.parse(localData);
-      obj.level && treeMenuClick({ key: obj.level });
-      obj.expand && treeMenuClick({ key: obj.expand });
-    } else {
-      expandedKeys.value = roleResult.ids;
-    }
-    // update-end--author:liaozhiyang---date:20240531---for：【TV360X-590】角色授权弹窗操作缓存
-    //初始化角色菜单数据
-    const permResult = await queryRolePermission({ roleId: unref(roleId) });
-    checkedKeys.value = permResult;
-    defaultCheckedKeys.value = permResult;
-    setDrawerProps({ loading: false });
-  });
-  /**
-  * 2024-02-28
-  * liaozhiyang
-  * 翻译菜单名称
-   */
-  function translateTitle(data) {
-    if (data?.length) {
-      data.forEach((item) => {
-        if (item.slotTitle) {
-          const { t } = useI18n();
-          if (item.slotTitle.includes("t('") && t) {
-            item.slotTitle = new Function('t', `return ${item.slotTitle}`)(t);
-          }
-        }
-        if (item.children?.length) {
-          translateTitle(item.children);
-        }
-      });
-    }
-    return data;
-  }
-  /**
-   * 点击选中
-   * 2024-04-26
-   * liaozhiyang
-   */
-  function onCheck(o, e) {
-    // checkStrictly: true=>层级独立，false=>层级关联.
-    if (checkStrictly.value) {
-      checkedKeys.value = o.checked ? o.checked : o;
-    } else {
-      const keys = getNodeAllKey(e.node, 'children', 'key');
-      if (e.checked) {
-        // 反复操作下可能会有重复的keys，得用new Set去重下
-        checkedKeys.value = [...new Set([...checkedKeys.value, ...keys])];
-      } else {
-        const result = removeMatchingItems(checkedKeys.value, keys);
-        checkedKeys.value = result;
-      }
-    }
-  }
-  /**
-   * 2024-04-26
-   * liaozhiyang
-   * 删除相匹配数组的项
-   */
-  function removeMatchingItems(arr1, arr2) {
-    // 使用哈希表记录 arr2 中的元素
-    const hashTable = {};
-    for (const item of arr2) {
-      hashTable[item] = true;
-    }
-    // 使用 filter 方法遍历第一个数组，过滤出不在哈希表中存在的项
-    return arr1.filter((item) => !hashTable[item]);
-  }
-  /**
-   * 2024-04-26
-   * liaozhiyang
-   * 获取当前节点及以下所有子孙级的key
-   */
-  function getNodeAllKey(node: any, children: any, key: string) {
-    const result: any = [];
-    result.push(node[key]);
-    const recursion = (data) => {
-      data.forEach((item: any) => {
-        result.push(item[key]);
-        if (item[children]?.length) {
-          recursion(item[children]);
-        }
-      });
-    };
-    node[children]?.length && recursion(node[children]);
-    return result;
-  }
-
-  /**
-   * 选中节点，打开数据权限抽屉
-   */
-  function onTreeNodeSelect(key) {
-    if (key && key.length > 0) {
-      selectedKeys.value = key;
-    }
-    openDataRuleDrawer(true, { functionId: unref(selectedKeys)[0], roleId: unref(roleId) });
-  }
-  /**
-   * 数据重置
-   */
-  function reset() {
-    treeData.value = [];
-    allTreeKeys.value = [];
-    checkedKeys.value = [];
-    defaultCheckedKeys.value = [];
-    selectedKeys.value = [];
-    roleId.value = '';
-  }
-  /**
-   * 获取tree实例
-   */
-  function getTree() {
-    const tree = unref(treeRef);
-    if (!tree) {
-      throw new Error('tree is null!');
-    }
-    return tree;
-  }
-  /**
-   * 提交
-   */
-  async function handleSubmit(exit) {
-    let params = {
-      roleId: unref(roleId),
-      permissionIds: unref(getTree().getCheckedKeys()).join(','),
-      lastpermissionIds: unref(defaultCheckedKeys).join(','),
-    };
-    //update-begin-author:taoyan date:2023-2-11 for: issues/352 VUE角色授权重复保存
-    if(loading.value===false){
-      await doSave(params)
-    }else{
-      console.log('请等待上次执行完毕!');
-    }
-    if(exit){
-      // 如果关闭
-      closeDrawer();
-    }else{
-      // 没有关闭需要重新获取选中数据
-      const permResult = await queryRolePermission({ roleId: unref(roleId) });
-      defaultCheckedKeys.value = permResult;
-    }
-  }
-  
-  // VUE角色授权重复保存 #352
-  async function doSave(params) {
-    loading.value = true;
-    await saveRolePermission(params);
-    setTimeout(()=>{
-      loading.value = false;
-    }, 500)
-  }
-  //update-end-author:taoyan date:2023-2-11 for: issues/352 VUE角色授权重复保存
-
-  /**
-   * 树菜单选择
-   * @param key
-   */
-  function treeMenuClick({ key }) {
-    if (key === 'checkAll') {
-      checkedKeys.value = allTreeKeys.value;
-    } else if (key === 'cancelCheck') {
-      checkedKeys.value = [];
-    } else if (key === 'openAll') {
-      expandedKeys.value = allTreeKeys.value;
-      saveLocalOperation('expand', 'openAll');
-    } else if (key === 'closeAll') {
-      expandedKeys.value = [];
-      saveLocalOperation('expand', 'closeAll');
-    } else if (key === 'relation') {
-      checkStrictly.value = false;
-      saveLocalOperation('level', 'relation');
-    } else {
-      checkStrictly.value = true;
-      saveLocalOperation('level', 'standAlone');
-    }
-  }
-  /**
-   * 2024-05-31
-   * liaozhiyang
-   * 【TV360X-590】角色授权弹窗操作缓存
-   * */
-  const saveLocalOperation = (key, value) => {
-    const localData = localStorage.getItem(ROLE_AUTH_CONFIG_KEY);
-    const obj = localData ? JSON.parse(localData) : {};
-    obj[key] = value;
-    localStorage.setItem(ROLE_AUTH_CONFIG_KEY, JSON.stringify(obj))
-  };
-</script>
-
-<style lang="less" scoped>
-  /** 固定操作按钮 */
-  .jeecg-basic-tree {
-    position: absolute;
-    width: 618px;
-  }
-  //update-begin---author:wangshuai ---date:20230202  for：抽屉弹窗标题图标下拉样式------------
-  .line {
-    height: 1px;
-    width: 100%;
-    border-bottom: 1px solid #f0f0f0;
-  }
-  .more-icon {
-    font-size: 20px !important;
-    color: black;
-    display: inline-flex;
-    float: right;
-    margin-right: 2px;
-    cursor: pointer;
-  }
-  :deep(.jeecg-tree-header) {
-    border-bottom: none;
-  }
-  //update-end---author:wangshuai ---date:20230202  for：抽屉弹窗标题图标下拉样式------------
-</style>
diff --git a/src/views/appConfig/components/RoleUserTable.vue b/src/views/appConfig/components/RoleUserTable.vue
deleted file mode 100644
index b9465a5..0000000
--- a/src/views/appConfig/components/RoleUserTable.vue
+++ /dev/null
@@ -1,200 +0,0 @@
-<template>
-  <BasicDrawer @register="registerBaseDrawer" title="角色用户" width="800" destroyOnClose>
-    <BasicTable @register="registerTable" :rowSelection="rowSelection">
-      <template #tableTitle>
-        <a-button type="primary" @click="handleCreate" v-if="!disableUserEdit"> 新增用户</a-button>
-        <a-button type="primary" @click="handleSelect"> 已有用户</a-button>
-
-        <a-dropdown v-if="checkedKeys.length > 0">
-          <template #overlay>
-            <a-menu>
-              <a-menu-item key="1" @click="batchHandleDelete">
-                <Icon icon="bx:bx-unlink"></Icon>
-                取消关联
-              </a-menu-item>
-            </a-menu>
-          </template>
-          <a-button
-            >批量操作
-            <Icon icon="ant-design:down-outlined"></Icon>
-          </a-button>
-        </a-dropdown>
-      </template>
-      <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" />
-      </template>
-    </BasicTable>
-    <!--用户操作抽屉-->
-    <UserDrawer @register="registerDrawer" @success="handleSuccess" />
-    <!--用户选择弹窗-->
-    <UseSelectModal @register="registerModal" @select="selectOk" />
-  </BasicDrawer>
-</template>
-<script lang="ts" setup>
-  import { ref, watch, unref } from 'vue';
-  import { BasicTable, useTable, TableAction } from '/src/components/Table';
-  import { BasicDrawer, useDrawer, useDrawerInner } from '/src/components/Drawer';
-  import { useModal } from '/src/components/Modal';
-  import UserDrawer from '/@/views/system/user/UserDrawer.vue';
-  import UseSelectModal from './UseSelectModal.vue';
-  import { userList, deleteUserRole, batchDeleteUserRole, addUserRole } from '../NuAppRole.api';
-  import { userColumns, searchUserFormSchema } from '../NuAppRole.data';
-  import { getUserRoles } from '/@/views/system/user/user.api';
-
-  const emit = defineEmits(['register', 'hideUserList']);
-  const props = defineProps({
-    disableUserEdit: {type:Boolean,default:false}
-  })
-  
-  const checkedKeys = ref<Array<string | number>>([]);
-  const roleId = ref('');
-  const [registerBaseDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-    roleId.value = data.id;
-    setProps({ searchInfo: { roleId: data.id } });
-    reload();
-  });
-  //注册drawer
-  const [registerDrawer, { openDrawer }] = useDrawer();
-  //注册drawer
-  const [registerModal, { openModal }] = useModal();
-  const [registerTable, { reload, updateTableDataRecord, setProps }] = useTable({
-    title: '用户列表',
-    api: userList,
-    columns: userColumns,
-    formConfig: {
-      //update-begin---author:wangshuai ---date:20230703  for：【QQYUN-5685】3、租户角色下,查询居左显示
-      labelWidth: 60,
-      //update-end---author:wangshuai ---date:20230703  for：【QQYUN-5685】3、租户角色下,查询居左显示
-      schemas: searchUserFormSchema,
-      autoSubmitOnEnter: true,
-    },
-    striped: true,
-    useSearchForm: true,
-    showTableSetting: true,
-    clickToRowSelect: false,
-    bordered: true,
-    showIndexColumn: false,
-    // 【issues/1064】列设置的 cacheKey
-    tableSetting: { fullScreen: true, cacheKey: 'role_user_table' },
-    canResize: false,
-    rowKey: 'id',
-    actionColumn: {
-      width: 180,
-      title: '操作',
-      dataIndex: 'action',
-      slots: { customRender: 'action' },
-      fixed: undefined,
-    },
-  });
-
-  /**
-   * 选择列配置
-   */
-  const rowSelection = {
-    type: 'checkbox',
-    columnWidth: 50,
-    selectedRowKeys: checkedKeys,
-    onChange: onSelectChange,
-  };
-
-  /**
-   * 选择事件
-   */
-  function onSelectChange(selectedRowKeys: (string | number)[], selectionRows) {
-    checkedKeys.value = selectedRowKeys;
-  }
-
-  /**
-   * 新增
-   */
-  function handleCreate() {
-    openDrawer(true, {
-      isUpdate: false,
-      selectedroles: [roleId.value],
-      isRole: true,
-    });
-  }
-  /**
-   * 编辑
-   */
-  async function handleEdit(record: Recordable) {
-    try {
-      const userRoles = await getUserRoles({ userid: record.id });
-      if (userRoles && userRoles.length > 0) {
-        record.selectedroles = userRoles;
-      }
-    } catch (e) {
-      console.log(e);
-    }
-    openDrawer(true, {
-      record,
-      isUpdate: true,
-      isRole: true,
-    });
-  }
-
-  /**
-   * 删除事件
-   */
-  async function handleDelete(record) {
-    await deleteUserRole({ userId: record.id, roleId: roleId.value }, reload);
-  }
-
-  /**
-   * 批量删除事件
-   */
-  async function batchHandleDelete() {
-    await batchDeleteUserRole({ userIds: checkedKeys.value.join(','), roleId: roleId.value }, () => {
-      // update-begin--author:liaozhiyang---date:20240701---for：【TV360X-1655】批量取消关联之后清空选中记录
-      reload();
-      checkedKeys.value = [];
-      // update-end--author:liaozhiyang---date:20240701---for：【TV360X-1655】批量取消关联之后清空选中记录
-    });
-  }
-
-  /**
-   * 成功回调
-   */
-  function handleSuccess({ isUpdate, values }) {
-    isUpdate ? updateTableDataRecord(values.id, values) : reload();
-  }
-  /**
-   * 选择已有用户
-   */
-  function handleSelect() {
-    openModal(true);
-  }
-  /**
-   * 添加已有用户
-   */
-  async function selectOk(val) {
-    await addUserRole({ roleId: roleId.value, userIdList: val }, reload);
-  }
-  /**
-   * 操作栏
-   */
-  function getTableAction(record) {
-    return [
-      {
-        label: '编辑',
-        onClick: handleEdit.bind(null, record),
-        ifShow: () => !props.disableUserEdit,
-      },
-      {
-        label: '取消关联',
-        popConfirm: {
-          title: '是否确认取消关联',
-          confirm: handleDelete.bind(null, record),
-        },
-      },
-    ];
-  }
-</script>
-
-<style scoped>
-  /*update-begin---author:wangshuai ---date:20230703  for：【QQYUN-5685】3、租户角色下,查询居左显示*/
-  :deep(.ant-form-item-control-input-content){
-    text-align: left;
-  }
-  /*update-end---author:wangshuai ---date:20230703  for：【QQYUN-5685】3、租户角色下,查询居左显示*/
-</style>
diff --git a/src/views/appConfig/components/UseSelectModal.vue b/src/views/appConfig/components/UseSelectModal.vue
deleted file mode 100644
index 3165a2e..0000000
--- a/src/views/appConfig/components/UseSelectModal.vue
+++ /dev/null
@@ -1,67 +0,0 @@
-<template>
-  <BasicModal v-bind="$attrs" @register="registerModal" title="用户选择列表" width="1000px" @ok="handleSubmit" destroyOnClose @openChange="handleOpenChange">
-    <BasicTable @register="registerTable" :rowSelection="rowSelection" />
-  </BasicModal>
-</template>
-<script lang="ts" setup>
-  import { ref, unref, toRaw } from 'vue';
-  import { BasicModal, useModalInner } from '/src/components/Modal';
-  import { BasicTable, useTable, TableAction } from '/src/components/Table';
-  import { userColumns, searchUserFormSchema } from '../NuAppRole.data';
-  import { list } from '/@/views/system/user/user.api';
-  // 声明Emits
-  const emit = defineEmits(['select', 'register']);
-  const checkedKeys = ref<Array<string | number>>([]);
-  const [registerModal, { setModalProps, closeModal }] = useModalInner();
-  //注册table数据
-  const [registerTable, { reload }] = useTable({
-    api: list,
-    rowKey: 'id',
-    columns: userColumns,
-    formConfig: {
-      labelWidth: 60,
-      schemas: searchUserFormSchema,
-      baseRowStyle: { maxHeight: '20px' },
-      autoSubmitOnEnter: true,
-    },
-    striped: true,
-    useSearchForm: true,
-    showTableSetting: false,
-    bordered: true,
-    showIndexColumn: false,
-    canResize: false,
-  });
-  /**
-   * 选择列配置
-   */
-  const rowSelection = {
-    type: 'checkbox',
-    columnWidth: 50,
-    selectedRowKeys: checkedKeys,
-    onChange: onSelectChange,
-  };
-  /**
-   * 选择事件
-   */
-  function onSelectChange(selectedRowKeys: (string | number)[]) {
-    checkedKeys.value = selectedRowKeys;
-  }
-
-  const handleOpenChange = (visible) => {
-    // -update-begin--author:liaozhiyang---date:20240702---for：【TV360X-1679】系统角色-角色用户再次打开弹窗重置之前选中的状态
-    if (visible) {
-      checkedKeys.value = [];
-    }
-    // -update-end--author:liaozhiyang---date:20240702---for：【TV360X-1679】系统角色-角色用户再次打开弹窗重置之前选中的状态
-  };
-
-  //提交事件
-  function handleSubmit() {
-    setModalProps({ confirmLoading: true });
-    //关闭弹窗
-    closeModal();
-    //刷新列表
-    emit('select', toRaw(unref(checkedKeys)));
-    setModalProps({ confirmLoading: false });
-  }
-</script>