From dd37247e65374dd4ef7e8e8b9212d8f29023e301 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 27 十二月 2021 09:50:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-ui/src/views/system/menu/index.vue | 92 ++++++++++++++++++++--------------------------
1 files changed, 40 insertions(+), 52 deletions(-)
diff --git a/ruoyi-ui/src/views/system/menu/index.vue b/ruoyi-ui/src/views/system/menu/index.vue
index 0f4296c..5c1f85a 100644
--- a/ruoyi-ui/src/views/system/menu/index.vue
+++ b/ruoyi-ui/src/views/system/menu/index.vue
@@ -13,10 +13,10 @@
<el-form-item label="鐘舵��" prop="status">
<el-select v-model="queryParams.status" placeholder="鑿滃崟鐘舵��" clearable size="small">
<el-option
- v-for="dict in statusOptions"
- :key="dict.dictValue"
- :label="dict.dictLabel"
- :value="dict.dictValue"
+ v-for="dict in dict.type.sys_normal_disable"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
/>
</el-select>
</el-form-item>
@@ -68,7 +68,7 @@
<el-table-column prop="component" label="缁勪欢璺緞" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="status" label="鐘舵��" width="80">
<template slot-scope="scope">
- <dict-tag :options="statusOptions" :value="scope.row.status"/>
+ <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime">
@@ -78,7 +78,8 @@
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
- <el-button size="mini"
+ <el-button
+ size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
@@ -126,8 +127,8 @@
</el-radio-group>
</el-form-item>
</el-col>
- <el-col :span="24">
- <el-form-item v-if="form.menuType != 'F'" label="鑿滃崟鍥炬爣">
+ <el-col :span="24" v-if="form.menuType != 'F'">
+ <el-form-item label="鑿滃崟鍥炬爣" prop="icon">
<el-popover
placement="bottom-start"
width="460"
@@ -158,8 +159,8 @@
<el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item v-if="form.menuType != 'F'">
+ <el-col :span="12" v-if="form.menuType != 'F'">
+ <el-form-item>
<span slot="label">
<el-tooltip content="閫夋嫨鏄閾惧垯璺敱鍦板潃闇�瑕佷互`http(s)://`寮�澶�" placement="top">
<i class="el-icon-question"></i>
@@ -172,8 +173,8 @@
</el-radio-group>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item v-if="form.menuType != 'F'" prop="path">
+ <el-col :span="12" v-if="form.menuType != 'F'">
+ <el-form-item prop="path">
<span slot="label">
<el-tooltip content="璁块棶鐨勮矾鐢卞湴鍧�锛屽锛歚user`锛屽澶栫綉鍦板潃闇�鍐呴摼璁块棶鍒欎互`http(s)://`寮�澶�" placement="top">
<i class="el-icon-question"></i>
@@ -194,8 +195,8 @@
<el-input v-model="form.component" placeholder="璇疯緭鍏ョ粍浠惰矾寰�" />
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item v-if="form.menuType != 'M'">
+ <el-col :span="12" v-if="form.menuType != 'M'">
+ <el-form-item>
<el-input v-model="form.perms" placeholder="璇疯緭鍏ユ潈闄愭爣璇�" maxlength="100" />
<span slot="label">
<el-tooltip content="鎺у埗鍣ㄤ腑瀹氫箟鐨勬潈闄愬瓧绗︼紝濡傦細@PreAuthorize(`@ss.hasPermi('system:user:list')`)" placement="top">
@@ -205,8 +206,8 @@
</span>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item v-if="form.menuType == 'C'">
+ <el-col :span="12" v-if="form.menuType == 'C'">
+ <el-form-item>
<el-input v-model="form.query" placeholder="璇疯緭鍏ヨ矾鐢卞弬鏁�" maxlength="255" />
<span slot="label">
<el-tooltip content='璁块棶璺敱鐨勯粯璁や紶閫掑弬鏁帮紝濡傦細`{"id": 1, "name": "ry"}`' placement="top">
@@ -216,8 +217,8 @@
</span>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item v-if="form.menuType == 'C'">
+ <el-col :span="12" v-if="form.menuType == 'C'">
+ <el-form-item>
<span slot="label">
<el-tooltip content="閫夋嫨鏄垯浼氳`keep-alive`缂撳瓨锛岄渶瑕佸尮閰嶇粍浠剁殑`name`鍜屽湴鍧�淇濇寔涓�鑷�" placement="top">
<i class="el-icon-question"></i>
@@ -230,8 +231,8 @@
</el-radio-group>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item v-if="form.menuType != 'F'">
+ <el-col :span="12" v-if="form.menuType != 'F'">
+ <el-form-item>
<span slot="label">
<el-tooltip content="閫夋嫨闅愯棌鍒欒矾鐢卞皢涓嶄細鍑虹幇鍦ㄤ晶杈规爮锛屼絾浠嶇劧鍙互璁块棶" placement="top">
<i class="el-icon-question"></i>
@@ -240,15 +241,15 @@
</span>
<el-radio-group v-model="form.visible">
<el-radio
- v-for="dict in visibleOptions"
- :key="dict.dictValue"
- :label="dict.dictValue"
- >{{dict.dictLabel}}</el-radio>
+ v-for="dict in dict.type.sys_show_hide"
+ :key="dict.value"
+ :label="dict.value"
+ >{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item v-if="form.menuType != 'F'">
+ <el-col :span="12" v-if="form.menuType != 'F'">
+ <el-form-item>
<span slot="label">
<el-tooltip content="閫夋嫨鍋滅敤鍒欒矾鐢卞皢涓嶄細鍑虹幇鍦ㄤ晶杈规爮锛屼篃涓嶈兘琚闂�" placement="top">
<i class="el-icon-question"></i>
@@ -257,10 +258,10 @@
</span>
<el-radio-group v-model="form.status">
<el-radio
- v-for="dict in statusOptions"
- :key="dict.dictValue"
- :label="dict.dictValue"
- >{{dict.dictLabel}}</el-radio>
+ v-for="dict in dict.type.sys_normal_disable"
+ :key="dict.value"
+ :label="dict.value"
+ >{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -282,6 +283,7 @@
export default {
name: "Menu",
+ dicts: ['sys_show_hide', 'sys_normal_disable'],
components: { Treeselect, IconSelect },
data() {
return {
@@ -301,10 +303,6 @@
isExpandAll: false,
// 閲嶆柊娓叉煋琛ㄦ牸鐘舵��
refreshTable: true,
- // 鏄剧ず鐘舵�佹暟鎹瓧鍏�
- visibleOptions: [],
- // 鑿滃崟鐘舵�佹暟鎹瓧鍏�
- statusOptions: [],
// 鏌ヨ鍙傛暟
queryParams: {
menuName: undefined,
@@ -328,12 +326,6 @@
},
created() {
this.getList();
- this.getDicts("sys_show_hide").then(response => {
- this.visibleOptions = response.data;
- });
- this.getDicts("sys_normal_disable").then(response => {
- this.statusOptions = response.data;
- });
},
methods: {
// 閫夋嫨鍥炬爣
@@ -434,13 +426,13 @@
if (valid) {
if (this.form.menuId != undefined) {
updateMenu(this.form).then(response => {
- this.msgSuccess("淇敼鎴愬姛");
+ this.$modal.msgSuccess("淇敼鎴愬姛");
this.open = false;
this.getList();
});
} else {
addMenu(this.form).then(response => {
- this.msgSuccess("鏂板鎴愬姛");
+ this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
this.getList();
});
@@ -450,16 +442,12 @@
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
- this.$confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.menuName + '"鐨勬暟鎹」?', "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- }).then(function() {
- return delMenu(row.menuId);
- }).then(() => {
- this.getList();
- this.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
+ this.$modal.confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.menuName + '"鐨勬暟鎹」锛�').then(function() {
+ return delMenu(row.menuId);
+ }).then(() => {
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ }).catch(() => {});
}
}
};
--
Gitblit v1.9.3