From 05cf6324ea8322164d99a3d3d4161fe374534b3b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 18 二月 2024 15:22:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
platform/src/components/system/menu/OperaMenuWindow.vue | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/platform/src/components/system/menu/OperaMenuWindow.vue b/platform/src/components/system/menu/OperaMenuWindow.vue
index 2cb4691..ce5645a 100644
--- a/platform/src/components/system/menu/OperaMenuWindow.vue
+++ b/platform/src/components/system/menu/OperaMenuWindow.vue
@@ -9,7 +9,7 @@
<p class="tip" v-if="form.parent != null && form.id == null">涓� <em>{{parentName}}</em> 鏂板缓瀛愯彍鍗�</p>
<el-form :model="form" ref="form" :rules="rules">
<el-form-item label="涓婄骇鑿滃崟" prop="parentId">
- <MenuSelect v-if="visible" v-model="form.parentId" :type="type" placeholder="璇烽�夋嫨涓婄骇鑿滃崟" :exclude-id="excludeMenuId" clearable :inline="false"/>
+ <MenuSelect v-if="visible" v-model="form.parentId" placeholder="璇烽�夋嫨涓婄骇鑿滃崟" :exclude-id="excludeMenuId" clearable :inline="false"/>
</el-form-item>
<el-form-item label="鑿滃崟鍚嶇О" prop="name" required>
<el-input v-model="form.name" placeholder="璇疯緭鍏ヨ彍鍗曞悕绉�" v-trim maxlength="50"/>
@@ -40,12 +40,6 @@
name: 'OperaMenuWindow',
extends: BaseOpera,
components: { MenuSelect, GlobalWindow },
- props: {
- type: {
- type: String|Number,
- default: 0
- }
- },
data () {
return {
icons,
@@ -60,8 +54,8 @@
name: '',
path: '',
icon: '',
- type: '',
- remark: ''
+ remark: '',
+ type: ''
},
// 楠岃瘉瑙勫垯
rules: {
@@ -85,8 +79,8 @@
this.excludeMenuId = null
this.$nextTick(() => {
this.$refs.form.resetFields()
- this.form.type = this.type
this.form.id = null
+ this.form.type = parent.type
this.form.parentId = parent == null ? null : parent.id
this.parentName = parent == null ? null : parent.name
})
--
Gitblit v1.9.3