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

gaoluyang

2025-05-26 10d4c82e729694bd49a29f589d607690dc4b71f8

 src/views/system/menu/index.vue

@@ -6,11 +6,12 @@
               v-model="queryParams.menuName"

               placeholder="请输入菜单名称"

               clearable

               style="width: 200px"

               @keyup.enter="handleQuery"

            />

         </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 style="width: 200px">

               <el-option

                  v-for="dict in sys_normal_disable"

                  :key="dict.value"

@@ -68,69 +69,54 @@
               <dict-tag :options="sys_normal_disable" :value="scope.row.status" />

            </template>

         </el-table-column>

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

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

            <template #default="scope">

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

            </template>

         </el-table-column>

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

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

            <template #default="scope">

               <el-button

                  type="text"

                  icon="Edit"

                  @click="handleUpdate(scope.row)"

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

               >修改</el-button>

               <el-button

                  type="text"

                  icon="Plus"

                  @click="handleAdd(scope.row)"

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

               >新增</el-button>

               <el-button

                  type="text"

                  icon="Delete"

                  @click="handleDelete(scope.row)"

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

               >删除</el-button>

               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:menu:edit']">修改</el-button>

               <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['system:menu:add']">新增</el-button>

               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:menu:remove']">删除</el-button>

            </template>

         </el-table-column>

      </el-table>



      <!-- 添加或修改菜单对话框 -->

      <el-dialog :title="title" v-model="open" width="680px" :before-close="handleClose" append-to-body>

      <el-dialog :title="title" v-model="open" width="680px" append-to-body>

         <el-form ref="menuRef" :model="form" :rules="rules" label-width="100px">

            <el-row>

               <el-col :span="24">

                  <el-form-item label="上级菜单">

                     <tree-select

                        v-model:value="form.parentId"

                        :options="menuOptions"

                        :objMap="{ value: 'menuId', label: 'menuName', children: 'children' }"

                     <el-tree-select

                        v-model="form.parentId"

                        :data="menuOptions"

                        :props="{ value: 'menuId', label: 'menuName', children: 'children' }"

                        value-key="menuId"

                        placeholder="选择上级菜单"

                        check-strictly

                     />

                  </el-form-item>

               </el-col>

               <el-col :span="24">

                  <el-form-item label="菜单类型" prop="menuType">

                     <el-radio-group v-model="form.menuType">

                        <el-radio label="M">目录</el-radio>

                        <el-radio label="C">菜单</el-radio>

                        <el-radio label="F">按钮</el-radio>

                        <el-radio value="M">目录</el-radio>

                        <el-radio value="C">菜单</el-radio>

                        <el-radio value="F">按钮</el-radio>

                     </el-radio-group>

                  </el-form-item>

               </el-col>

               <el-col :span="24" v-if="form.menuType != 'F'">

               <el-col :span="12" v-if="form.menuType != 'F'">

                  <el-form-item label="菜单图标" prop="icon">

                     <el-popover

                        placement="bottom-start"

                        :width="540"

                        v-model:visible="showChooseIcon"

                        trigger="click"

                        @show="showSelectIcon"

                     >

                        <template #reference>

                           <el-input v-model="form.icon" placeholder="点击选择图标" @click="showSelectIcon" readonly>

                           <el-input v-model="form.icon" placeholder="点击选择图标" @blur="showSelectIcon" readonly>

                              <template #prefix>

                                 <svg-icon

                                    v-if="form.icon"

@@ -142,8 +128,13 @@
                              </template>

                           </el-input>

                        </template>

                        <icon-select ref="iconSelectRef" @selected="selected" />

                        <icon-select ref="iconSelectRef" @selected="selected" :active-icon="form.icon" />

                     </el-popover>

                  </el-form-item>

               </el-col>

               <el-col :span="12">

                  <el-form-item label="显示排序" prop="orderNum">

                     <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />

                  </el-form-item>

               </el-col>

               <el-col :span="12">

@@ -151,9 +142,17 @@
                     <el-input v-model="form.menuName" placeholder="请输入菜单名称" />

                  </el-form-item>

               </el-col>

               <el-col :span="12">

                  <el-form-item label="显示排序" prop="orderNum">

                     <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />

               <el-col :span="12" v-if="form.menuType == 'C'">

                  <el-form-item prop="routeName">

                     <template #label>

                        <span>

                           <el-tooltip content="默认不填则和路由地址相同：如地址为：`user`，则名称为`User`（注意：因为router会删除名称相同路由，为避免名字的冲突，特殊情况下请自定义，保证唯一性）" placement="top">

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

                           </el-tooltip>

                           路由名称

                        </span>

                     </template>

                     <el-input v-model="form.routeName" placeholder="请输入路由名称" />

                  </el-form-item>

               </el-col>

               <el-col :span="12" v-if="form.menuType != 'F'">

@@ -166,8 +165,8 @@
                        </span>

                     </template>

                     <el-radio-group v-model="form.isFrame">

                        <el-radio label="0">是</el-radio>

                        <el-radio label="1">否</el-radio>

                        <el-radio value="0">是</el-radio>

                        <el-radio value="1">否</el-radio>

                     </el-radio-group>

                  </el-form-item>

               </el-col>

@@ -234,8 +233,8 @@
                        </span>

                     </template>

                     <el-radio-group v-model="form.isCache">

                        <el-radio label="0">缓存</el-radio>

                        <el-radio label="1">不缓存</el-radio>

                        <el-radio value="0">缓存</el-radio>

                        <el-radio value="1">不缓存</el-radio>

                     </el-radio-group>

                  </el-form-item>

               </el-col>

@@ -253,12 +252,12 @@
                        <el-radio

                           v-for="dict in sys_show_hide"

                           :key="dict.value"

                           :label="dict.value"

                           :value="dict.value"

                        >{{ dict.label }}</el-radio>

                     </el-radio-group>

                  </el-form-item>

               </el-col>

               <el-col :span="12" v-if="form.menuType != 'F'">

               <el-col :span="12">

                  <el-form-item>

                     <template #label>

                        <span>

@@ -272,7 +271,7 @@
                        <el-radio

                           v-for="dict in sys_normal_disable"

                           :key="dict.value"

                           :label="dict.value"

                           :value="dict.value"

                        >{{ dict.label }}</el-radio>

                     </el-radio-group>

                  </el-form-item>

@@ -290,23 +289,22 @@
</template>



<script setup name="Menu">

import { addMenu, delMenu, getMenu, listMenu, updateMenu } from "@/api/system/menu";

import SvgIcon from "@/components/SvgIcon";

import IconSelect from "@/components/IconSelect";

import { addMenu, delMenu, getMenu, listMenu, updateMenu } from "@/api/system/menu"

import SvgIcon from "@/components/SvgIcon"

import IconSelect from "@/components/IconSelect"



const { proxy } = getCurrentInstance();

const { sys_show_hide, sys_normal_disable } = proxy.useDict("sys_show_hide", "sys_normal_disable");

const { proxy } = getCurrentInstance()

const { sys_show_hide, sys_normal_disable } = proxy.useDict("sys_show_hide", "sys_normal_disable")



const menuList = ref([]);

const open = ref(false);

const loading = ref(true);

const showSearch = ref(true);

const title = ref("");

const menuOptions = ref([]);

const isExpandAll = ref(false);

const refreshTable = ref(true);

const showChooseIcon = ref(false);

const iconSelectRef = ref(null);

const menuList = ref([])

const open = ref(false)

const loading = ref(true)

const showSearch = ref(true)

const title = ref("")

const menuOptions = ref([])

const isExpandAll = ref(false)

const refreshTable = ref(true)

const iconSelectRef = ref(null)



const data = reactive({

  form: {},

@@ -319,32 +317,35 @@
    orderNum: [{ required: true, message: "菜单顺序不能为空", trigger: "blur" }],

    path: [{ required: true, message: "路由地址不能为空", trigger: "blur" }]

  },

});

})



const { queryParams, form, rules } = toRefs(data);

const { queryParams, form, rules } = toRefs(data)



/** 查询菜单列表 */

function getList() {

  loading.value = true;

  loading.value = true

  listMenu(queryParams.value).then(response => {

    menuList.value = proxy.handleTree(response.data, "menuId");

    loading.value = false;

  });

    menuList.value = proxy.handleTree(response.data, "menuId")

    loading.value = false

  })

}



/** 查询菜单下拉树结构 */

async function getTreeselect() {

  menuOptions.value = [];

  await listMenu().then(response => {

    const menu = { menuId: 0, menuName: "主类目", children: [] };

    menu.children = proxy.handleTree(response.data, "menuId");

    menuOptions.value.push(menu);

  });

function getTreeselect() {

  menuOptions.value = []

  listMenu().then(response => {

    const menu = { menuId: 0, menuName: "主类目", children: [] }

    menu.children = proxy.handleTree(response.data, "menuId")

    menuOptions.value.push(menu)

  })

}



/** 取消按钮 */

function cancel() {

  open.value = false;

  reset();

  open.value = false

  reset()

}



/** 表单重置 */

function reset() {

  form.value = {

@@ -358,92 +359,94 @@
    isCache: "0",

    visible: "0",

    status: "0"

  };

  proxy.resetForm("menuRef");

  }

  proxy.resetForm("menuRef")

}



/** 展示下拉图标 */

function showSelectIcon() {

  iconSelectRef.value.reset();

  showChooseIcon.value = true;

  iconSelectRef.value.reset()

}



/** 选择图标 */

function selected(name) {

  form.value.icon = name;

  showChooseIcon.value = false;

  form.value.icon = name

}

/** 关闭弹窗隐藏图标选择 */

function handleClose() {

  cancel();

  showChooseIcon.value = false;

}



/** 搜索按钮操作 */

function handleQuery() {

  getList();

  getList()

}



/** 重置按钮操作 */

function resetQuery() {

  proxy.resetForm("queryRef");

  handleQuery();

  proxy.resetForm("queryRef")

  handleQuery()

}



/** 新增按钮操作 */

async function handleAdd(row) {

  reset();

  await getTreeselect();

function handleAdd(row) {

  reset()

  getTreeselect()

  if (row != null && row.menuId) {

    form.value.parentId = row.menuId;

    form.value.parentId = row.menuId

  } else {

    form.value.parentId = 0;

    form.value.parentId = 0

  }

  open.value = true;

  title.value = "添加菜单";

  open.value = true

  title.value = "添加菜单"

}



/** 展开/折叠操作 */

function toggleExpandAll() {

  refreshTable.value = false;

  isExpandAll.value = !isExpandAll.value;

  refreshTable.value = false

  isExpandAll.value = !isExpandAll.value

  nextTick(() => {

    refreshTable.value = true;

  });

    refreshTable.value = true

  })

}



/** 修改按钮操作 */

async function handleUpdate(row) {

  reset();

  await getTreeselect();

  reset()

  await getTreeselect()

  getMenu(row.menuId).then(response => {

    form.value = response.data;

    open.value = true;

    title.value = "修改菜单";

  });

    form.value = response.data

    open.value = true

    title.value = "修改菜单"

  })

}



/** 提交按钮 */

function submitForm() {

  proxy.$refs["menuRef"].validate(valid => {

    if (valid) {

      if (form.value.menuId != undefined) {

        updateMenu(form.value).then(response => {

          proxy.$modal.msgSuccess("修改成功");

          open.value = false;

          getList();

        });

          proxy.$modal.msgSuccess("修改成功")

          open.value = false

          getList()

        })

      } else {

        addMenu(form.value).then(response => {

          proxy.$modal.msgSuccess("新增成功");

          open.value = false;

          getList();

        });

          proxy.$modal.msgSuccess("新增成功")

          open.value = false

          getList()

        })

      }

    }

  });

  })

}



/** 删除按钮操作 */

function handleDelete(row) {

  proxy.$modal.confirm('是否确认删除名称为"' + row.menuName + '"的数据项?').then(function() {

    return delMenu(row.menuId);

    return delMenu(row.menuId)

  }).then(() => {

    getList();

    proxy.$modal.msgSuccess("删除成功");

  }).catch(() => {});

    getList()

    proxy.$modal.msgSuccess("删除成功")

  }).catch(() => {})

}



getList();

getList()

</script>