Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'
【924】 【资产视图】点击‘收藏’按钮页面报错-dialog组件增加一个属性 #1 See merge request !712
Showing
3 changed files
with
7 additions
and
2 deletions
1 | <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :fullscreen="fullscreen" :title="title" | 1 | <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :fullscreen="fullscreen" :title="title" |
2 | :top="top" :width="width" | 2 | :top="top" :width="width" |
3 | @before-close="hideElDialog" @close="hideElDialog" custom-class="config-dialog" destroy-on-close | 3 | @before-close="hideElDialog" @close="hideElDialog" custom-class="config-dialog" destroy-on-close |
4 | - v-model="show"> | 4 | + v-model="show" :append-to-body="appendToBody"> |
5 | <slot>弹框内容</slot> | 5 | <slot>弹框内容</slot> |
6 | 6 | ||
7 | <template #footer v-if="showFooter"> | 7 | <template #footer v-if="showFooter"> |
@@ -51,6 +51,11 @@ export default { | @@ -51,6 +51,11 @@ export default { | ||
51 | fullscreen: { | 51 | fullscreen: { |
52 | type: Boolean, | 52 | type: Boolean, |
53 | default: false | 53 | default: false |
54 | + }, | ||
55 | + //lsq Dialog 自身是否插入至 body 元素上。 嵌套的 Dialog 必须指定该属性并赋值为 true 2022-07-01 | ||
56 | + appendToBody:{ | ||
57 | + type: Boolean, | ||
58 | + default: false | ||
54 | } | 59 | } |
55 | 60 | ||
56 | }, | 61 | }, |
@@ -21,7 +21,7 @@ | @@ -21,7 +21,7 @@ | ||
21 | </template> | 21 | </template> |
22 | </el-dropdown> | 22 | </el-dropdown> |
23 | 23 | ||
24 | - <cm-dialog :showDialogVisible="dialogFlg" @hidedialog="showDialog" @okfunc="saveStart" title="收藏" width="500px"> | 24 | + <cm-dialog :showDialogVisible="dialogFlg" @hidedialog="showDialog" @okfunc="saveStart" title="收藏" width="500px" :appendToBody="true"> |
25 | <template v-slot> | 25 | <template v-slot> |
26 | <div style="text-align: center;"> | 26 | <div style="text-align: center;"> |
27 | <el-select placeholder="请选择" style="margin: 3px" v-model="favIds"> | 27 | <el-select placeholder="请选择" style="margin: 3px" v-model="favIds"> |
-
Please register or login to post a comment