BJ_ZTEITS-Developers / parking-cloud-yudao

Commit c5075dad3b1212a3fb7c07b2bfa93e88f027c0dd

Authored by xingyu4j
1 parent 29f2f994

refactor: use XModel

Inline Side-by-side
Showing 37 changed files with 88 additions and 86 deletions
yudao-ui-admin-vue3/src/components/XModal/src/XModal.vue
  View file @c5075da
1 <script setup lang="ts"> 1 <script setup lang="ts">
2 import { propTypes } from '@/utils/propTypes' 2 import { propTypes } from '@/utils/propTypes'
3 import { computed, useAttrs, useSlots } from 'vue' 3 import { computed, useAttrs, useSlots } from 'vue'
4 - 4 +import { ElScrollbar } from 'element-plus'
5 const slots = useSlots() 5 const slots = useSlots()
6 6
7 const props = defineProps({ 7 const props = defineProps({
@@ -29,9 +29,11 @@ const getBindValue = computed(() =&gt; { @@ -29,9 +29,11 @@ const getBindValue = computed(() =&gt; {
29 <template v-if="slots.header" #header> 29 <template v-if="slots.header" #header>
30 <slot name="header"></slot> 30 <slot name="header"></slot>
31 </template> 31 </template>
32 - <template v-if="slots.default" #default>  
33 - <slot name="default"></slot>  
34 - </template> 32 + <ElScrollbar>
  33 + <template v-if="slots.default" #default>
  34 + <slot name="default"></slot>
  35 + </template>
  36 + </ElScrollbar>
35 <template v-if="slots.corner" #corner> 37 <template v-if="slots.corner" #corner>
36 <slot name="corner"></slot> 38 <slot name="corner"></slot>
37 </template> 39 </template>
yudao-ui-admin-vue3/src/views/bpm/form/index.vue
  View file @c5075da
@@ -136,7 +136,7 @@ getList() @@ -136,7 +136,7 @@ getList()
136 </Table> 136 </Table>
137 </ContentWrap> 137 </ContentWrap>
138 138
139 - <Dialog v-model="dialogVisible" :title="dialogTitle"> 139 + <XModal v-model="dialogVisible" :title="dialogTitle">
140 <!-- 对话框(添加 / 修改) --> 140 <!-- 对话框(添加 / 修改) -->
141 <Form 141 <Form
142 v-if="['create', 'update'].includes(actionType)" 142 v-if="['create', 'update'].includes(actionType)"
@@ -169,5 +169,5 @@ getList() @@ -169,5 +169,5 @@ getList()
169 </el-button> 169 </el-button>
170 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button> 170 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button>
171 </template> 171 </template>
172 - </Dialog> 172 + </XModal>
173 </template> 173 </template>
yudao-ui-admin-vue3/src/views/bpm/group/index.vue
  View file @c5075da
@@ -175,7 +175,7 @@ onMounted(async () =&gt; { @@ -175,7 +175,7 @@ onMounted(async () =&gt; {
175 </Table> 175 </Table>
176 </ContentWrap> 176 </ContentWrap>
177 177
178 - <Dialog v-model="dialogVisible" :title="dialogTitle"> 178 + <XModal v-model="dialogVisible" :title="dialogTitle">
179 <!-- 对话框(添加 / 修改) --> 179 <!-- 对话框(添加 / 修改) -->
180 <Form 180 <Form
181 v-if="['create', 'update'].includes(actionType)" 181 v-if="['create', 'update'].includes(actionType)"
@@ -224,5 +224,5 @@ onMounted(async () =&gt; { @@ -224,5 +224,5 @@ onMounted(async () =&gt; {
224 </el-button> 224 </el-button>
225 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button> 225 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button>
226 </template> 226 </template>
227 - </Dialog> 227 + </XModal>
228 </template> 228 </template>
yudao-ui-admin-vue3/src/views/bpm/model/index.vue
  View file @c5075da
@@ -186,7 +186,7 @@ getList() @@ -186,7 +186,7 @@ getList()
186 </Table> 186 </Table>
187 </ContentWrap> 187 </ContentWrap>
188 188
189 - <Dialog v-model="dialogVisible" :title="dialogTitle"> 189 + <XModal v-model="dialogVisible" :title="dialogTitle">
190 <!-- 对话框(添加 / 修改) --> 190 <!-- 对话框(添加 / 修改) -->
191 <Form 191 <Form
192 v-if="['create', 'update'].includes(actionType)" 192 v-if="['create', 'update'].includes(actionType)"
@@ -216,5 +216,5 @@ getList() @@ -216,5 +216,5 @@ getList()
216 </el-button> 216 </el-button>
217 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button> 217 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button>
218 </template> 218 </template>
219 - </Dialog> 219 + </XModal>
220 </template> 220 </template>
yudao-ui-admin-vue3/src/views/bpm/processInstance/index.vue
  View file @c5075da
@@ -103,7 +103,7 @@ getList() @@ -103,7 +103,7 @@ getList()
103 </Table> 103 </Table>
104 </ContentWrap> 104 </ContentWrap>
105 105
106 - <Dialog v-model="dialogVisible" :title="t('action.detail')"> 106 + <XModal v-model="dialogVisible" :title="t('action.detail')">
107 <!-- 对话框(详情) --> 107 <!-- 对话框(详情) -->
108 <Descriptions :schema="allSchemas.detailSchema" :data="detailRef"> 108 <Descriptions :schema="allSchemas.detailSchema" :data="detailRef">
109 <template #status="{ row }"> 109 <template #status="{ row }">
@@ -117,5 +117,5 @@ getList() @@ -117,5 +117,5 @@ getList()
117 <template #footer> 117 <template #footer>
118 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button> 118 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button>
119 </template> 119 </template>
120 - </Dialog> 120 + </XModal>
121 </template> 121 </template>
yudao-ui-admin-vue3/src/views/infra/apiAccessLog/index.vue
  View file @c5075da
@@ -75,7 +75,7 @@ getList() @@ -75,7 +75,7 @@ getList()
75 </Table> 75 </Table>
76 </ContentWrap> 76 </ContentWrap>
77 77
78 - <Dialog v-model="dialogVisible" :title="dialogTitle"> 78 + <XModal v-model="dialogVisible" :title="dialogTitle">
79 <!-- 对话框(详情) --> 79 <!-- 对话框(详情) -->
80 <Descriptions :schema="allSchemas.detailSchema" :data="detailRef"> 80 <Descriptions :schema="allSchemas.detailSchema" :data="detailRef">
81 <template #userType="{ row }"> 81 <template #userType="{ row }">
@@ -95,5 +95,5 @@ getList() @@ -95,5 +95,5 @@ getList()
95 <template #footer> 95 <template #footer>
96 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button> 96 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button>
97 </template> 97 </template>
98 - </Dialog> 98 + </XModal>
99 </template> 99 </template>
yudao-ui-admin-vue3/src/views/infra/apiErrorLog/index.vue
  View file @c5075da
@@ -114,7 +114,7 @@ getList() @@ -114,7 +114,7 @@ getList()
114 </Table> 114 </Table>
115 </ContentWrap> 115 </ContentWrap>
116 116
117 - <Dialog v-model="dialogVisible" :title="dialogTitle"> 117 + <XModal v-model="dialogVisible" :title="dialogTitle">
118 <!-- 对话框(详情) --> 118 <!-- 对话框(详情) -->
119 <Descriptions :schema="allSchemas.detailSchema" :data="detailRef"> 119 <Descriptions :schema="allSchemas.detailSchema" :data="detailRef">
120 <template #userType="{ row }"> 120 <template #userType="{ row }">
@@ -131,5 +131,5 @@ getList() @@ -131,5 +131,5 @@ getList()
131 <template #footer> 131 <template #footer>
132 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button> 132 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button>
133 </template> 133 </template>
134 - </Dialog> 134 + </XModal>
135 </template> 135 </template>
yudao-ui-admin-vue3/src/views/infra/codegen/components/ImportTable.vue
  View file @c5075da
@@ -79,7 +79,7 @@ defineExpose({ @@ -79,7 +79,7 @@ defineExpose({
79 </script> 79 </script>
80 <template> 80 <template>
81 <!-- 导入表 --> 81 <!-- 导入表 -->
82 - <Dialog title="导入表" v-model="visible" maxHeight="500px" width="50%"> 82 + <XModal title="导入表" v-model="visible" maxHeight="500px" width="50%">
83 <el-form :model="queryParams" ref="queryRef" :inline="true"> 83 <el-form :model="queryParams" ref="queryRef" :inline="true">
84 <el-form-item label="数据源" prop="dataSourceConfigId"> 84 <el-form-item label="数据源" prop="dataSourceConfigId">
85 <el-select v-model="queryParams.dataSourceConfigId" placeholder="请选择数据源" clearable> 85 <el-select v-model="queryParams.dataSourceConfigId" placeholder="请选择数据源" clearable>
@@ -125,5 +125,5 @@ defineExpose({ @@ -125,5 +125,5 @@ defineExpose({
125 <el-button @click="visible = false">{{ t('dialog.close') }}</el-button> 125 <el-button @click="visible = false">{{ t('dialog.close') }}</el-button>
126 </div> 126 </div>
127 </template> 127 </template>
128 - </Dialog> 128 + </XModal>
129 </template> 129 </template>
yudao-ui-admin-vue3/src/views/infra/codegen/components/Preview.vue
  View file @c5075da
@@ -114,7 +114,7 @@ defineExpose({ @@ -114,7 +114,7 @@ defineExpose({
114 }) 114 })
115 </script> 115 </script>
116 <template> 116 <template>
117 - <Dialog title="预览" v-model="preview.open" top="5vh" maxHeight="800px" width="90%"> 117 + <XModal title="预览" v-model="preview.open" top="5vh" maxHeight="800px" width="90%">
118 <div class="flex"> 118 <div class="flex">
119 <el-card class="w-1/4" :gutter="12" shadow="hover"> 119 <el-card class="w-1/4" :gutter="12" shadow="hover">
120 <el-tree 120 <el-tree
@@ -144,5 +144,5 @@ defineExpose({ @@ -144,5 +144,5 @@ defineExpose({
144 </el-tabs> 144 </el-tabs>
145 </el-card> 145 </el-card>
146 </div> 146 </div>
147 - </Dialog> 147 + </XModal>
148 </template> 148 </template>
yudao-ui-admin-vue3/src/views/infra/config/index.vue
  View file @c5075da
@@ -158,7 +158,7 @@ getList() @@ -158,7 +158,7 @@ getList()
158 </Table> 158 </Table>
159 </ContentWrap> 159 </ContentWrap>
160 160
161 - <Dialog v-model="dialogVisible" :title="dialogTitle"> 161 + <XModal v-model="dialogVisible" :title="dialogTitle">
162 <!-- 对话框(添加 / 修改) --> 162 <!-- 对话框(添加 / 修改) -->
163 <Form 163 <Form
164 v-if="['create', 'update'].includes(actionType)" 164 v-if="['create', 'update'].includes(actionType)"
@@ -194,5 +194,5 @@ getList() @@ -194,5 +194,5 @@ getList()
194 </el-button> 194 </el-button>
195 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button> 195 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button>
196 </template> 196 </template>
197 - </Dialog> 197 + </XModal>
198 </template> 198 </template>
yudao-ui-admin-vue3/src/views/infra/dataSourceConfig/index.vue
  View file @c5075da
@@ -131,7 +131,7 @@ onMounted(async () =&gt; { @@ -131,7 +131,7 @@ onMounted(async () =&gt; {
131 </template> 131 </template>
132 </Table> 132 </Table>
133 </ContentWrap> 133 </ContentWrap>
134 - <Dialog v-model="dialogVisible" :title="dialogTitle"> 134 + <XModal v-model="dialogVisible" :title="dialogTitle">
135 <!-- 对话框(添加 / 修改) --> 135 <!-- 对话框(添加 / 修改) -->
136 <Form 136 <Form
137 v-if="['create', 'update'].includes(actionType)" 137 v-if="['create', 'update'].includes(actionType)"
@@ -161,5 +161,5 @@ onMounted(async () =&gt; { @@ -161,5 +161,5 @@ onMounted(async () =&gt; {
161 </el-button> 161 </el-button>
162 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button> 162 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button>
163 </template> 163 </template>
164 - </Dialog> 164 + </XModal>
165 </template> 165 </template>
yudao-ui-admin-vue3/src/views/infra/fileConfig/index.vue
  View file @c5075da
@@ -176,7 +176,7 @@ getList() @@ -176,7 +176,7 @@ getList()
176 </Table> 176 </Table>
177 </ContentWrap> 177 </ContentWrap>
178 178
179 - <Dialog v-model="dialogVisible" :title="dialogTitle"> 179 + <XModal v-model="dialogVisible" :title="dialogTitle">
180 <!-- 对话框(添加 / 修改) --> 180 <!-- 对话框(添加 / 修改) -->
181 <Form 181 <Form
182 v-if="['create', 'update'].includes(actionType)" 182 v-if="['create', 'update'].includes(actionType)"
@@ -212,5 +212,5 @@ getList() @@ -212,5 +212,5 @@ getList()
212 </el-button> 212 </el-button>
213 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button> 213 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button>
214 </template> 214 </template>
215 - </Dialog> 215 + </XModal>
216 </template> 216 </template>
yudao-ui-admin-vue3/src/views/infra/fileList/index.vue
  View file @c5075da
@@ -148,7 +148,7 @@ getList() @@ -148,7 +148,7 @@ getList()
148 </Table> 148 </Table>
149 </ContentWrap> 149 </ContentWrap>
150 150
151 - <Dialog v-model="dialogVisible" :title="dialogTitle"> 151 + <XModal v-model="dialogVisible" :title="dialogTitle">
152 <!-- 对话框(详情) --> 152 <!-- 对话框(详情) -->
153 <Descriptions :schema="allSchemas.detailSchema" :data="detailRef"> 153 <Descriptions :schema="allSchemas.detailSchema" :data="detailRef">
154 <template #url="{ row }"> 154 <template #url="{ row }">
@@ -169,8 +169,8 @@ getList() @@ -169,8 +169,8 @@ getList()
169 <template #footer> 169 <template #footer>
170 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button> 170 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button>
171 </template> 171 </template>
172 - </Dialog>  
173 - <Dialog v-model="uploadDialogVisible" :title="uploadDialogTitle" :destroy-on-close="true"> 172 + </XModal>
  173 + <XModal v-model="uploadDialogVisible" :title="uploadDialogTitle" :destroy-on-close="true">
174 <el-upload 174 <el-upload
175 ref="uploadRef" 175 ref="uploadRef"
176 :action="updateUrl + '?updateSupport=' + updateSupport" 176 :action="updateUrl + '?updateSupport=' + updateSupport"
@@ -200,5 +200,5 @@ getList() @@ -200,5 +200,5 @@ getList()
200 </el-button> 200 </el-button>
201 <el-button @click="uploadDialogVisible = false">{{ t('dialog.close') }}</el-button> 201 <el-button @click="uploadDialogVisible = false">{{ t('dialog.close') }}</el-button>
202 </template> 202 </template>
203 - </Dialog> 203 + </XModal>
204 </template> 204 </template>
yudao-ui-admin-vue3/src/views/infra/job/JobLog.vue
  View file @c5075da
@@ -95,7 +95,7 @@ onMounted(() =&gt; { @@ -95,7 +95,7 @@ onMounted(() =&gt; {
95 </template> 95 </template>
96 </Table> 96 </Table>
97 </ContentWrap> 97 </ContentWrap>
98 - <Dialog v-model="dialogVisible" :title="dialogTitle"> 98 + <XModal v-model="dialogVisible" :title="dialogTitle">
99 <!-- 对话框(详情) --> 99 <!-- 对话框(详情) -->
100 <Descriptions :schema="allSchemas.detailSchema" :data="detailRef"> 100 <Descriptions :schema="allSchemas.detailSchema" :data="detailRef">
101 <template #status="{ row }"> 101 <template #status="{ row }">
@@ -112,5 +112,5 @@ onMounted(() =&gt; { @@ -112,5 +112,5 @@ onMounted(() =&gt; {
112 <template #footer> 112 <template #footer>
113 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button> 113 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button>
114 </template> 114 </template>
115 - </Dialog> 115 + </XModal>
116 </template> 116 </template>
yudao-ui-admin-vue3/src/views/infra/job/index.vue
  View file @c5075da
@@ -208,7 +208,7 @@ getList() @@ -208,7 +208,7 @@ getList()
208 </template> 208 </template>
209 </Table> 209 </Table>
210 </ContentWrap> 210 </ContentWrap>
211 - <Dialog v-model="dialogVisible" :title="dialogTitle"> 211 + <XModal v-model="dialogVisible" :title="dialogTitle">
212 <!-- 对话框(添加 / 修改) --> 212 <!-- 对话框(添加 / 修改) -->
213 <Form 213 <Form
214 v-if="['create', 'update'].includes(actionType)" 214 v-if="['create', 'update'].includes(actionType)"
@@ -248,5 +248,5 @@ getList() @@ -248,5 +248,5 @@ getList()
248 </el-button> 248 </el-button>
249 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button> 249 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button>
250 </template> 250 </template>
251 - </Dialog> 251 + </XModal>
252 </template> 252 </template>
yudao-ui-admin-vue3/src/views/infra/redis/index.vue
  View file @c5075da
@@ -233,7 +233,7 @@ onBeforeMount(() =&gt; { @@ -233,7 +233,7 @@ onBeforeMount(() =&gt; {
233 </el-col> 233 </el-col>
234 </el-row> 234 </el-row>
235 </el-scrollbar> 235 </el-scrollbar>
236 - <Dialog v-model="dialogVisible" :title="keyTemplate + ' 模板'" width="60%" maxHeight="800px"> 236 + <XModal v-model="dialogVisible" :title="keyTemplate + ' 模板'" width="60%" maxHeight="800px">
237 <el-row> 237 <el-row>
238 <el-col :span="14" style="margin-top: 10px"> 238 <el-col :span="14" style="margin-top: 10px">
239 <el-card shadow="always"> 239 <el-card shadow="always">
@@ -280,7 +280,7 @@ onBeforeMount(() =&gt; { @@ -280,7 +280,7 @@ onBeforeMount(() =&gt; {
280 </el-card> 280 </el-card>
281 </el-col> 281 </el-col>
282 </el-row> 282 </el-row>
283 - </Dialog> 283 + </XModal>
284 </template> 284 </template>
285 <style scoped> 285 <style scoped>
286 .redis { 286 .redis {
yudao-ui-admin-vue3/src/views/pay/app/index.vue
  View file @c5075da
@@ -155,7 +155,7 @@ getList() @@ -155,7 +155,7 @@ getList()
155 </Table> 155 </Table>
156 </ContentWrap> 156 </ContentWrap>
157 157
158 - <Dialog v-model="dialogVisible" :title="dialogTitle"> 158 + <XModal v-model="dialogVisible" :title="dialogTitle">
159 <!-- 对话框(添加 / 修改) --> 159 <!-- 对话框(添加 / 修改) -->
160 <Form 160 <Form
161 v-if="['create', 'update'].includes(actionType)" 161 v-if="['create', 'update'].includes(actionType)"
@@ -188,5 +188,5 @@ getList() @@ -188,5 +188,5 @@ getList()
188 </el-button> 188 </el-button>
189 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button> 189 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button>
190 </template> 190 </template>
191 - </Dialog> 191 + </XModal>
192 </template> 192 </template>
yudao-ui-admin-vue3/src/views/pay/merchant/index.vue
  View file @c5075da
@@ -155,7 +155,7 @@ getList() @@ -155,7 +155,7 @@ getList()
155 </Table> 155 </Table>
156 </ContentWrap> 156 </ContentWrap>
157 157
158 - <Dialog v-model="dialogVisible" :title="dialogTitle"> 158 + <XModal v-model="dialogVisible" :title="dialogTitle">
159 <!-- 对话框(添加 / 修改) --> 159 <!-- 对话框(添加 / 修改) -->
160 <Form 160 <Form
161 v-if="['create', 'update'].includes(actionType)" 161 v-if="['create', 'update'].includes(actionType)"
@@ -188,5 +188,5 @@ getList() @@ -188,5 +188,5 @@ getList()
188 </el-button> 188 </el-button>
189 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button> 189 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button>
190 </template> 190 </template>
191 - </Dialog> 191 + </XModal>
192 </template> 192 </template>
yudao-ui-admin-vue3/src/views/pay/order/index.vue
  View file @c5075da
@@ -140,7 +140,7 @@ getList() @@ -140,7 +140,7 @@ getList()
140 </Table> 140 </Table>
141 </ContentWrap> 141 </ContentWrap>
142 142
143 - <Dialog v-model="dialogVisible" :title="dialogTitle"> 143 + <XModal v-model="dialogVisible" :title="dialogTitle">
144 <!-- 对话框(添加 / 修改) --> 144 <!-- 对话框(添加 / 修改) -->
145 <Form 145 <Form
146 v-if="['create', 'update'].includes(actionType)" 146 v-if="['create', 'update'].includes(actionType)"
@@ -173,5 +173,5 @@ getList() @@ -173,5 +173,5 @@ getList()
173 </el-button> 173 </el-button>
174 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button> 174 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button>
175 </template> 175 </template>
176 - </Dialog> 176 + </XModal>
177 </template> 177 </template>
yudao-ui-admin-vue3/src/views/pay/refund/index.vue
  View file @c5075da
@@ -93,7 +93,7 @@ getList() @@ -93,7 +93,7 @@ getList()
93 </Table> 93 </Table>
94 </ContentWrap> 94 </ContentWrap>
95 95
96 - <Dialog v-model="dialogVisible" :title="dialogTitle"> 96 + <XModal v-model="dialogVisible" :title="dialogTitle">
97 <!-- 对话框(详情) --> 97 <!-- 对话框(详情) -->
98 <Descriptions :schema="allSchemas.detailSchema" :data="detailRef"> 98 <Descriptions :schema="allSchemas.detailSchema" :data="detailRef">
99 <template #status="{ row }"> 99 <template #status="{ row }">
@@ -107,5 +107,5 @@ getList() @@ -107,5 +107,5 @@ getList()
107 <template #footer> 107 <template #footer>
108 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button> 108 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button>
109 </template> 109 </template>
110 - </Dialog> 110 + </XModal>
111 </template> 111 </template>
yudao-ui-admin-vue3/src/views/system/dict/index.vue
  View file @c5075da
@@ -113,7 +113,7 @@ @@ -113,7 +113,7 @@
113 </Table> 113 </Table>
114 </div> 114 </div>
115 </el-card> 115 </el-card>
116 - <Dialog id="dictModel" v-model="dialogVisible" :title="dialogTitle"> 116 + <XModal id="dictModel" v-model="dialogVisible" :title="dialogTitle">
117 <Form 117 <Form
118 v-if="['typeCreate', 'typeUpdate'].includes(actionType)" 118 v-if="['typeCreate', 'typeUpdate'].includes(actionType)"
119 :schema="DictTypeSchemas.allSchemas.formSchema" 119 :schema="DictTypeSchemas.allSchemas.formSchema"
@@ -144,7 +144,7 @@ @@ -144,7 +144,7 @@
144 /> 144 />
145 <XButton :title="t('dialog.close')" @click="dialogVisible = false" /> 145 <XButton :title="t('dialog.close')" @click="dialogVisible = false" />
146 </template> 146 </template>
147 - </Dialog> 147 + </XModal>
148 </div> 148 </div>
149 </template> 149 </template>
150 <script setup lang="ts"> 150 <script setup lang="ts">
yudao-ui-admin-vue3/src/views/system/errorCode/index.vue
  View file @c5075da
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 </vxe-grid> 38 </vxe-grid>
39 </ContentWrap> 39 </ContentWrap>
40 <!-- 弹窗 --> 40 <!-- 弹窗 -->
41 - <Dialog id="errorCodeModel" v-model="dialogVisible" :title="dialogTitle"> 41 + <XModal id="errorCodeModel" v-model="dialogVisible" :title="dialogTitle">
42 <!-- 对话框(添加 / 修改) --> 42 <!-- 对话框(添加 / 修改) -->
43 <Form 43 <Form
44 v-if="['create', 'update'].includes(actionType)" 44 v-if="['create', 'update'].includes(actionType)"
@@ -64,7 +64,7 @@ @@ -64,7 +64,7 @@
64 <!-- 按钮：关闭 --> 64 <!-- 按钮：关闭 -->
65 <XButton :loading="actionLoading" :title="t('dialog.close')" @click="dialogVisible = false" /> 65 <XButton :loading="actionLoading" :title="t('dialog.close')" @click="dialogVisible = false" />
66 </template> 66 </template>
67 - </Dialog> 67 + </XModal>
68 </template> 68 </template>
69 69
70 <script setup lang="ts"> 70 <script setup lang="ts">
yudao-ui-admin-vue3/src/views/system/loginlog/index.vue
  View file @c5075da
@@ -17,14 +17,14 @@ @@ -17,14 +17,14 @@
17 </vxe-grid> 17 </vxe-grid>
18 </ContentWrap> 18 </ContentWrap>
19 <!-- 弹窗 --> 19 <!-- 弹窗 -->
20 - <Dialog id="postModel" v-model="dialogVisible" :title="dialogTitle"> 20 + <XModal id="postModel" v-model="dialogVisible" :title="dialogTitle">
21 <!-- 表单：详情 --> 21 <!-- 表单：详情 -->
22 <Descriptions :schema="allSchemas.detailSchema" :data="detailRef" /> 22 <Descriptions :schema="allSchemas.detailSchema" :data="detailRef" />
23 <template #footer> 23 <template #footer>
24 <!-- 按钮：关闭 --> 24 <!-- 按钮：关闭 -->
25 <XButton :title="t('dialog.close')" @click="dialogVisible = false" /> 25 <XButton :title="t('dialog.close')" @click="dialogVisible = false" />
26 </template> 26 </template>
27 - </Dialog> 27 + </XModal>
28 </template> 28 </template>
29 <script setup lang="ts"> 29 <script setup lang="ts">
30 // 全局相关的 import 30 // 全局相关的 import
yudao-ui-admin-vue3/src/views/system/menu/index.vue
  View file @c5075da
@@ -97,7 +97,7 @@ @@ -97,7 +97,7 @@
97 </vxe-table> 97 </vxe-table>
98 </ContentWrap> 98 </ContentWrap>
99 <!-- 添加或修改菜单对话框 --> 99 <!-- 添加或修改菜单对话框 -->
100 - <Dialog v-model="dialogVisible" id="menuModel" :title="dialogTitle"> 100 + <XModal v-model="dialogVisible" id="menuModel" :title="dialogTitle">
101 <!-- 对话框(添加 / 修改) --> 101 <!-- 对话框(添加 / 修改) -->
102 <el-form 102 <el-form
103 ref="formRef" 103 ref="formRef"
@@ -240,7 +240,7 @@ @@ -240,7 +240,7 @@
240 <!-- 按钮：关闭 --> 240 <!-- 按钮：关闭 -->
241 <XButton :loading="actionLoading" @click="dialogVisible = false" :title="t('dialog.close')" /> 241 <XButton :loading="actionLoading" @click="dialogVisible = false" :title="t('dialog.close')" />
242 </template> 242 </template>
243 - </Dialog> 243 + </XModal>
244 </template> 244 </template>
245 <script setup lang="ts"> 245 <script setup lang="ts">
246 // 全局相关的 import 246 // 全局相关的 import
yudao-ui-admin-vue3/src/views/system/notice/index.vue
  View file @c5075da
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 </vxe-grid> 38 </vxe-grid>
39 </ContentWrap> 39 </ContentWrap>
40 <!-- 弹窗 --> 40 <!-- 弹窗 -->
41 - <Dialog id="noticeModel" v-model="dialogVisible" :title="dialogTitle"> 41 + <XModal id="noticeModel" v-model="dialogVisible" :title="dialogTitle">
42 <!-- 对话框(添加 / 修改) --> 42 <!-- 对话框(添加 / 修改) -->
43 <Form 43 <Form
44 ref="formRef" 44 ref="formRef"
@@ -64,7 +64,7 @@ @@ -64,7 +64,7 @@
64 <!-- 按钮：关闭 --> 64 <!-- 按钮：关闭 -->
65 <XButton :loading="actionLoading" :title="t('dialog.close')" @click="dialogVisible = false" /> 65 <XButton :loading="actionLoading" :title="t('dialog.close')" @click="dialogVisible = false" />
66 </template> 66 </template>
67 - </Dialog> 67 + </XModal>
68 </template> 68 </template>
69 <script setup lang="ts"> 69 <script setup lang="ts">
70 // 全局相关的 import 70 // 全局相关的 import
yudao-ui-admin-vue3/src/views/system/oauth2/client/index.vue
  View file @c5075da
@@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@
48 </vxe-grid> 48 </vxe-grid>
49 </ContentWrap> 49 </ContentWrap>
50 <!-- 弹窗 --> 50 <!-- 弹窗 -->
51 - <Dialog id="postModel" v-model="dialogVisible" :title="dialogTitle"> 51 + <XModal id="postModel" v-model="dialogVisible" :title="dialogTitle">
52 <!-- 表单：添加/修改 --> 52 <!-- 表单：添加/修改 -->
53 <Form 53 <Form
54 ref="formRef" 54 ref="formRef"
@@ -74,7 +74,7 @@ @@ -74,7 +74,7 @@
74 <!-- 按钮：关闭 --> 74 <!-- 按钮：关闭 -->
75 <XButton :loading="actionLoading" :title="t('dialog.close')" @click="dialogVisible = false" /> 75 <XButton :loading="actionLoading" :title="t('dialog.close')" @click="dialogVisible = false" />
76 </template> 76 </template>
77 - </Dialog> 77 + </XModal>
78 </template> 78 </template>
79 <script setup lang="ts"> 79 <script setup lang="ts">
80 // 全局相关的 import 80 // 全局相关的 import
yudao-ui-admin-vue3/src/views/system/oauth2/token/index.vue
  View file @c5075da
@@ -15,14 +15,14 @@ @@ -15,14 +15,14 @@
15 </template> 15 </template>
16 </vxe-grid> 16 </vxe-grid>
17 </ContentWrap> 17 </ContentWrap>
18 - <Dialog v-model="dialogVisible" :title="dialogTitle"> 18 + <XModal v-model="dialogVisible" :title="dialogTitle">
19 <!-- 对话框(详情) --> 19 <!-- 对话框(详情) -->
20 <Descriptions :schema="allSchemas.detailSchema" :data="detailRef" /> 20 <Descriptions :schema="allSchemas.detailSchema" :data="detailRef" />
21 <!-- 操作按钮 --> 21 <!-- 操作按钮 -->
22 <template #footer> 22 <template #footer>
23 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button> 23 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button>
24 </template> 24 </template>
25 - </Dialog> 25 + </XModal>
26 </template> 26 </template>
27 27
28 <script setup lang="ts"> 28 <script setup lang="ts">
yudao-ui-admin-vue3/src/views/system/operatelog/index.vue
  View file @c5075da
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 </vxe-grid> 25 </vxe-grid>
26 </ContentWrap> 26 </ContentWrap>
27 <!-- 弹窗 --> 27 <!-- 弹窗 -->
28 - <Dialog id="postModel" v-model="dialogVisible" :title="dialogTitle"> 28 + <XModal id="postModel" v-model="dialogVisible" :title="dialogTitle">
29 <!-- 对话框(详情) --> 29 <!-- 对话框(详情) -->
30 <Descriptions :schema="allSchemas.detailSchema" :data="detailRef"> 30 <Descriptions :schema="allSchemas.detailSchema" :data="detailRef">
31 <template #resultCode="{ row }"> 31 <template #resultCode="{ row }">
@@ -39,7 +39,7 @@ @@ -39,7 +39,7 @@
39 <!-- 按钮：关闭 --> 39 <!-- 按钮：关闭 -->
40 <XButton :loading="actionLoading" :title="t('dialog.close')" @click="dialogVisible = false" /> 40 <XButton :loading="actionLoading" :title="t('dialog.close')" @click="dialogVisible = false" />
41 </template> 41 </template>
42 - </Dialog> 42 + </XModal>
43 </template> 43 </template>
44 <script setup lang="ts"> 44 <script setup lang="ts">
45 // 全局相关的 import 45 // 全局相关的 import
yudao-ui-admin-vue3/src/views/system/post/index.vue
  View file @c5075da
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
45 </vxe-grid> 45 </vxe-grid>
46 </ContentWrap> 46 </ContentWrap>
47 <!-- 弹窗 --> 47 <!-- 弹窗 -->
48 - <Dialog id="postModel" v-model="dialogVisible" :title="dialogTitle"> 48 + <XModal id="postModel" v-model="dialogVisible" :title="dialogTitle">
49 <!-- 表单：添加/修改 --> 49 <!-- 表单：添加/修改 -->
50 <Form 50 <Form
51 ref="formRef" 51 ref="formRef"
@@ -71,7 +71,7 @@ @@ -71,7 +71,7 @@
71 <!-- 按钮：关闭 --> 71 <!-- 按钮：关闭 -->
72 <XButton :loading="actionLoading" :title="t('dialog.close')" @click="dialogVisible = false" /> 72 <XButton :loading="actionLoading" :title="t('dialog.close')" @click="dialogVisible = false" />
73 </template> 73 </template>
74 - </Dialog> 74 + </XModal>
75 </template> 75 </template>
76 <script setup lang="ts"> 76 <script setup lang="ts">
77 // 全局相关的 import 77 // 全局相关的 import
yudao-ui-admin-vue3/src/views/system/role/index.vue
  View file @c5075da
@@ -263,7 +263,7 @@ onMounted(() =&gt; { @@ -263,7 +263,7 @@ onMounted(() =&gt; {
263 </Table> 263 </Table>
264 </ContentWrap> 264 </ContentWrap>
265 265
266 - <Dialog v-model="dialogVisible" :title="dialogTitle"> 266 + <XModal v-model="dialogVisible" :title="dialogTitle">
267 <!-- 对话框(添加 / 修改) --> 267 <!-- 对话框(添加 / 修改) -->
268 <Form 268 <Form
269 v-if="['create', 'update'].includes(actionType)" 269 v-if="['create', 'update'].includes(actionType)"
@@ -299,8 +299,8 @@ onMounted(() =&gt; { @@ -299,8 +299,8 @@ onMounted(() =&gt; {
299 </el-button> 299 </el-button>
300 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button> 300 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button>
301 </template> 301 </template>
302 - </Dialog>  
303 - <Dialog v-model="dialogScopeVisible" :title="dialogScopeTitle" max-height="600px"> 302 + </XModal>
  303 + <XModal v-model="dialogScopeVisible" :title="dialogScopeTitle" max-height="600px">
304 <el-form :model="dataScopeForm"> 304 <el-form :model="dataScopeForm">
305 <el-form-item label="角色名称"> 305 <el-form-item label="角色名称">
306 <el-input v-model="dataScopeForm.name" :disabled="true" /> 306 <el-input v-model="dataScopeForm.name" :disabled="true" />
@@ -359,5 +359,5 @@ onMounted(() =&gt; { @@ -359,5 +359,5 @@ onMounted(() =&gt; {
359 </el-button> 359 </el-button>
360 <el-button @click="dialogScopeVisible = false">{{ t('dialog.close') }}</el-button> 360 <el-button @click="dialogScopeVisible = false">{{ t('dialog.close') }}</el-button>
361 </template> 361 </template>
362 - </Dialog> 362 + </XModal>
363 </template> 363 </template>
yudao-ui-admin-vue3/src/views/system/sensitiveWord/index.vue
  View file @c5075da
@@ -174,7 +174,7 @@ onMounted(async () =&gt; { @@ -174,7 +174,7 @@ onMounted(async () =&gt; {
174 </Table> 174 </Table>
175 </ContentWrap> 175 </ContentWrap>
176 176
177 - <Dialog v-model="dialogVisible" :title="dialogTitle"> 177 + <XModal v-model="dialogVisible" :title="dialogTitle">
178 <!-- 对话框(添加 / 修改) --> 178 <!-- 对话框(添加 / 修改) -->
179 <Form 179 <Form
180 v-if="['create', 'update'].includes(actionType)" 180 v-if="['create', 'update'].includes(actionType)"
@@ -213,5 +213,5 @@ onMounted(async () =&gt; { @@ -213,5 +213,5 @@ onMounted(async () =&gt; {
213 </el-button> 213 </el-button>
214 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button> 214 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button>
215 </template> 215 </template>
216 - </Dialog> 216 + </XModal>
217 </template> 217 </template>
yudao-ui-admin-vue3/src/views/system/sms/smsChannel/index.vue
  View file @c5075da
@@ -149,7 +149,7 @@ getList() @@ -149,7 +149,7 @@ getList()
149 </Table> 149 </Table>
150 </ContentWrap> 150 </ContentWrap>
151 151
152 - <Dialog v-model="dialogVisible" :title="dialogTitle"> 152 + <XModal v-model="dialogVisible" :title="dialogTitle">
153 <!-- 对话框(添加 / 修改) --> 153 <!-- 对话框(添加 / 修改) -->
154 <Form 154 <Form
155 v-if="['create', 'update'].includes(actionType)" 155 v-if="['create', 'update'].includes(actionType)"
@@ -185,5 +185,5 @@ getList() @@ -185,5 +185,5 @@ getList()
185 </el-button> 185 </el-button>
186 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button> 186 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button>
187 </template> 187 </template>
188 - </Dialog> 188 + </XModal>
189 </template> 189 </template>
yudao-ui-admin-vue3/src/views/system/sms/smsLog/index.vue
  View file @c5075da
@@ -74,7 +74,7 @@ getList() @@ -74,7 +74,7 @@ getList()
74 </Table> 74 </Table>
75 </ContentWrap> 75 </ContentWrap>
76 76
77 - <Dialog v-model="dialogVisible" :title="dialogTitle"> 77 + <XModal v-model="dialogVisible" :title="dialogTitle">
78 <!-- 对话框(详情) --> 78 <!-- 对话框(详情) -->
79 <Descriptions 79 <Descriptions
80 v-if="actionType === 'detail'" 80 v-if="actionType === 'detail'"
@@ -95,5 +95,5 @@ getList() @@ -95,5 +95,5 @@ getList()
95 <template #footer> 95 <template #footer>
96 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button> 96 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button>
97 </template> 97 </template>
98 - </Dialog> 98 + </XModal>
99 </template> 99 </template>
yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/index.vue
  View file @c5075da
@@ -197,7 +197,7 @@ getList() @@ -197,7 +197,7 @@ getList()
197 </Table> 197 </Table>
198 </ContentWrap> 198 </ContentWrap>
199 199
200 - <Dialog v-model="dialogVisible" :title="dialogTitle"> 200 + <XModal v-model="dialogVisible" :title="dialogTitle">
201 <!-- 对话框(添加 / 修改) --> 201 <!-- 对话框(添加 / 修改) -->
202 <Form 202 <Form
203 v-if="['create', 'update'].includes(actionType)" 203 v-if="['create', 'update'].includes(actionType)"
@@ -233,8 +233,8 @@ getList() @@ -233,8 +233,8 @@ getList()
233 </el-button> 233 </el-button>
234 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button> 234 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button>
235 </template> 235 </template>
236 - </Dialog>  
237 - <Dialog v-model="sendVisible" title="测试"> 236 + </XModal>
  237 + <XModal v-model="sendVisible" title="测试">
238 <el-form :model="sendSmsForm" :rules="sendSmsRules" label-width="140px"> 238 <el-form :model="sendSmsForm" :rules="sendSmsRules" label-width="140px">
239 <el-form-item label="模板内容" prop="content"> 239 <el-form-item label="模板内容" prop="content">
240 <el-input 240 <el-input
@@ -266,5 +266,5 @@ getList() @@ -266,5 +266,5 @@ getList()
266 </el-button> 266 </el-button>
267 <el-button @click="sendVisible = false">{{ t('dialog.close') }}</el-button> 267 <el-button @click="sendVisible = false">{{ t('dialog.close') }}</el-button>
268 </template> 268 </template>
269 - </Dialog> 269 + </XModal>
270 </template> 270 </template>
yudao-ui-admin-vue3/src/views/system/tenant/index.vue
  View file @c5075da
@@ -193,7 +193,7 @@ onMounted(async () =&gt; { @@ -193,7 +193,7 @@ onMounted(async () =&gt; {
193 </Table> 193 </Table>
194 </ContentWrap> 194 </ContentWrap>
195 195
196 - <Dialog v-model="dialogVisible" :title="dialogTitle"> 196 + <XModal v-model="dialogVisible" :title="dialogTitle">
197 <!-- 对话框(添加 / 修改) --> 197 <!-- 对话框(添加 / 修改) -->
198 <Form 198 <Form
199 v-if="['create', 'update'].includes(actionType)" 199 v-if="['create', 'update'].includes(actionType)"
@@ -244,5 +244,5 @@ onMounted(async () =&gt; { @@ -244,5 +244,5 @@ onMounted(async () =&gt; {
244 </el-button> 244 </el-button>
245 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button> 245 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button>
246 </template> 246 </template>
247 - </Dialog> 247 + </XModal>
248 </template> 248 </template>
yudao-ui-admin-vue3/src/views/system/tenantPackage/index.vue
  View file @c5075da
@@ -150,7 +150,7 @@ onMounted(async () =&gt; { @@ -150,7 +150,7 @@ onMounted(async () =&gt; {
150 </Table> 150 </Table>
151 </ContentWrap> 151 </ContentWrap>
152 152
153 - <Dialog v-model="dialogVisible" :title="dialogTitle" maxHeight="500px" width="50%"> 153 + <XModal v-model="dialogVisible" :title="dialogTitle" maxHeight="500px" width="50%">
154 <!-- 对话框(添加 / 修改) --> 154 <!-- 对话框(添加 / 修改) -->
155 <Form 155 <Form
156 v-if="['create', 'update'].includes(actionType)" 156 v-if="['create', 'update'].includes(actionType)"
@@ -195,5 +195,5 @@ onMounted(async () =&gt; { @@ -195,5 +195,5 @@ onMounted(async () =&gt; {
195 </el-button> 195 </el-button>
196 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button> 196 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button>
197 </template> 197 </template>
198 - </Dialog> 198 + </XModal>
199 </template> 199 </template>
yudao-ui-admin-vue3/src/views/system/user/index.vue
  View file @c5075da
@@ -413,7 +413,7 @@ onMounted(async () =&gt; { @@ -413,7 +413,7 @@ onMounted(async () =&gt; {
413 </Table> 413 </Table>
414 </el-card> 414 </el-card>
415 </div> 415 </div>
416 - <Dialog v-model="dialogVisible" :title="dialogTitle"> 416 + <XModal v-model="dialogVisible" :title="dialogTitle">
417 <!-- 对话框(添加 / 修改) --> 417 <!-- 对话框(添加 / 修改) -->
418 <Form 418 <Form
419 v-if="['create', 'update'].includes(actionType)" 419 v-if="['create', 'update'].includes(actionType)"
@@ -476,9 +476,9 @@ onMounted(async () =&gt; { @@ -476,9 +476,9 @@ onMounted(async () =&gt; {
476 </el-button> 476 </el-button>
477 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button> 477 <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button>
478 </template> 478 </template>
479 - </Dialog> 479 + </XModal>
480 <!-- 分配用户角色 --> 480 <!-- 分配用户角色 -->
481 - <Dialog v-model="roleDialogVisible" title="分配角色" maxHeight="450px"> 481 + <XModal v-model="roleDialogVisible" title="分配角色" maxHeight="450px">
482 <el-form :model="userRole" label-width="80px"> 482 <el-form :model="userRole" label-width="80px">
483 <el-form-item label="用户名称"> 483 <el-form-item label="用户名称">
484 <el-input v-model="userRole.username" :disabled="true" /> 484 <el-input v-model="userRole.username" :disabled="true" />
@@ -505,9 +505,9 @@ onMounted(async () =&gt; { @@ -505,9 +505,9 @@ onMounted(async () =&gt; {
505 </el-button> 505 </el-button>
506 <el-button @click="roleDialogVisible = false">{{ t('dialog.close') }}</el-button> 506 <el-button @click="roleDialogVisible = false">{{ t('dialog.close') }}</el-button>
507 </template> 507 </template>
508 - </Dialog> 508 + </XModal>
509 <!-- 导入 --> 509 <!-- 导入 -->
510 - <Dialog 510 + <XModal
511 v-model="importDialogVisible" 511 v-model="importDialogVisible"
512 :title="importDialogTitle" 512 :title="importDialogTitle"
513 :destroy-on-close="true" 513 :destroy-on-close="true"
@@ -555,7 +555,7 @@ onMounted(async () =&gt; { @@ -555,7 +555,7 @@ onMounted(async () =&gt; {
555 </el-button> 555 </el-button>
556 <el-button @click="importDialogVisible = false">{{ t('dialog.close') }}</el-button> 556 <el-button @click="importDialogVisible = false">{{ t('dialog.close') }}</el-button>
557 </template> 557 </template>
558 - </Dialog> 558 + </XModal>
559 </template> 559 </template>
560 560
561 <style scoped> 561 <style scoped>