refactor: use Dialog

yudao-ui-admin-vue3/src/views/system/dict/index.vue

@@ -113,8 +113,7 @@
         </Table>
       </div>
     </el-card>
-    <XModal id="dictModel" v-model="dialogVisible" :title="dialogTitle">
+    <Dialog id="dictModel" v-model="dialogVisible" :title="dialogTitle">
-      <template #default>
       <Form
         v-if="['typeCreate', 'typeUpdate'].includes(actionType)"
         :schema="DictTypeSchemas.allSchemas.formSchema"
@@ -127,7 +126,6 @@
         :rules="DictDataSchemas.dictDataRules"
         ref="dataFormRef"
       />
-      </template>
       <!-- 操作按钮 -->
       <template #footer>
         <XButton
@@ -146,7 +144,7 @@
         />
         <XButton :title="t('dialog.close')" @click="dialogVisible = false" />
       </template>
-    </XModal>
+    </Dialog>
   </div>
 </template>
 <script setup lang="ts">

yudao-ui-admin-vue3/src/views/system/errorCode/index.vue

@@ -38,8 +38,7 @@
     </vxe-grid>
   </ContentWrap>
   <!-- 弹窗 -->
-  <XModal id="errorCodeModel" v-model="dialogVisible" :title="dialogTitle">
+  <Dialog id="errorCodeModel" v-model="dialogVisible" :title="dialogTitle">
-    <template #default>
     <!-- 对话框(添加 / 修改) -->
     <Form
       v-if="['create', 'update'].includes(actionType)"
@@ -53,7 +52,6 @@
       :schema="allSchemas.detailSchema"
       :data="detailRef"
     />
-    </template>
     <template #footer>
       <!-- 按钮：保存 -->
       <XButton
@@ -66,7 +64,7 @@
       <!-- 按钮：关闭 -->
       <XButton :loading="actionLoading" :title="t('dialog.close')" @click="dialogVisible = false" />
     </template>
-  </XModal>
+  </Dialog>
 </template>
 
 <script setup lang="ts">

yudao-ui-admin-vue3/src/views/system/loginlog/index.vue

@@ -17,21 +17,20 @@
     </vxe-grid>
   </ContentWrap>
   <!-- 弹窗 -->
-  <XModal id="postModel" v-model="dialogVisible" :title="dialogTitle">
+  <Dialog id="postModel" v-model="dialogVisible" :title="dialogTitle">
-    <template #default>
     <!-- 表单：详情 -->
     <Descriptions :schema="allSchemas.detailSchema" :data="detailRef" />
-    </template>
     <template #footer>
       <!-- 按钮：关闭 -->
       <XButton :title="t('dialog.close')" @click="dialogVisible = false" />
     </template>
-  </XModal>
+  </Dialog>
 </template>
 <script setup lang="ts">
 // 全局相关的 import
 import { ref } from 'vue'
 import { useI18n } from '@/hooks/web/useI18n'
+import { useMessage } from '@/hooks/web/useMessage'
 import { useVxeGrid } from '@/hooks/web/useVxeGrid'
 import { VxeGridInstance } from 'vxe-table'
 // 业务相关的 import
@@ -40,6 +39,7 @@ import { getLoginLogPageApi, exportLoginLogApi, LoginLogVO } from '@/api/system/
 import download from '@/utils/download'
 
 const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
 // 列表相关的变量
 const xGrid = ref<VxeGridInstance>() // 列表 Grid Ref
 const { gridOptions } = useVxeGrid<LoginLogVO>({
@@ -59,13 +59,14 @@ const handleDetail = async (row: LoginLogVO) => {
 }
 
 // 导出操作
-// TODO @星语：导出需要有二次确认哈
 const handleExport = async () => {
+  message.exportConfirm().then(async () => {
     const queryParams = Object.assign(
       {},
       JSON.parse(JSON.stringify(xGrid.value?.getRefMaps().refForm.value.data)) // TODO @星语：这个有没办法，封装个 util 获取哈？
     )
     const res = await exportLoginLogApi(queryParams)
     download.excel(res, '登录列表.xls')
+  })
 }
 </script>

yudao-ui-admin-vue3/src/views/system/menu/index.vue

@@ -97,8 +97,7 @@
     </vxe-table>
   </ContentWrap>
   <!-- 添加或修改菜单对话框 -->
-  <XModal v-model="dialogVisible" id="menuModel" :title="dialogTitle">
+  <Dialog v-model="dialogVisible" id="menuModel" :title="dialogTitle">
-    <template #default>
     <!-- 对话框(添加 / 修改) -->
     <el-form
       ref="formRef"
@@ -179,12 +178,7 @@
         </template>
         <el-col :span="12">
           <el-form-item label="显示排序" prop="sort">
-              <el-input-number
+            <el-input-number v-model="menuForm.sort" controls-position="right" :min="0" clearable />
-                v-model="menuForm.sort"
-                controls-position="right"
-                :min="0"
-                clearable
-              />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -234,7 +228,6 @@
         </template>
       </el-row>
     </el-form>
-    </template>
     <template #footer>
       <!-- 按钮：保存 -->
       <XButton
@@ -247,7 +240,7 @@
       <!-- 按钮：关闭 -->
       <XButton :loading="actionLoading" @click="dialogVisible = false" :title="t('dialog.close')" />
     </template>
-  </XModal>
+  </Dialog>
 </template>
 <script setup lang="ts">
 // 全局相关的 import

yudao-ui-admin-vue3/src/views/system/notice/index.vue

@@ -38,8 +38,7 @@
     </vxe-grid>
   </ContentWrap>
   <!-- 弹窗 -->
-  <XModal id="noticeModel" v-model="dialogVisible" :title="dialogTitle">
+  <Dialog id="noticeModel" v-model="dialogVisible" :title="dialogTitle">
-    <template #default>
     <!-- 对话框(添加 / 修改) -->
     <Form
       ref="formRef"
@@ -53,7 +52,6 @@
       :schema="allSchemas.detailSchema"
       :data="detailRef"
     />
-    </template>
     <template #footer>
       <!-- 按钮：保存 -->
       <XButton
@@ -66,7 +64,7 @@
       <!-- 按钮：关闭 -->
       <XButton :loading="actionLoading" :title="t('dialog.close')" @click="dialogVisible = false" />
     </template>
-  </XModal>
+  </Dialog>
 </template>
 <script setup lang="ts">
 // 全局相关的 import

yudao-ui-admin-vue3/src/views/system/oauth2/client/index.vue

@@ -48,8 +48,7 @@
     </vxe-grid>
   </ContentWrap>
   <!-- 弹窗 -->
-  <XModal id="postModel" v-model="dialogVisible" :title="dialogTitle">
+  <Dialog id="postModel" v-model="dialogVisible" :title="dialogTitle">
-    <template #default>
     <!-- 表单：添加/修改 -->
     <Form
       ref="formRef"
@@ -64,7 +63,6 @@
       :schema="allSchemas.detailSchema"
       :data="detailRef"
     />
-    </template>
     <template #footer>
       <!-- 按钮：保存 -->
       <XButton
@@ -77,7 +75,7 @@
       <!-- 按钮：关闭 -->
       <XButton :loading="actionLoading" :title="t('dialog.close')" @click="dialogVisible = false" />
     </template>
-  </XModal>
+  </Dialog>
 </template>
 <script setup lang="ts">
 // 全局相关的 import

yudao-ui-admin-vue3/src/views/system/operatelog/index.vue

@@ -25,8 +25,7 @@
     </vxe-grid>
   </ContentWrap>
   <!-- 弹窗 -->
-  <XModal id="postModel" v-model="dialogVisible" :title="dialogTitle">
+  <Dialog id="postModel" v-model="dialogVisible" :title="dialogTitle">
-    <template #default>
     <!-- 对话框(详情) -->
     <Descriptions :schema="allSchemas.detailSchema" :data="detailRef">
       <template #resultCode="{ row }">
@@ -36,12 +35,11 @@
         <span>{{ row.duration + 'ms' }}</span>
       </template>
     </Descriptions>
-    </template>
     <template #footer>
       <!-- 按钮：关闭 -->
       <XButton :loading="actionLoading" :title="t('dialog.close')" @click="dialogVisible = false" />
     </template>
-  </XModal>
+  </Dialog>
 </template>
 <script setup lang="ts">
 // 全局相关的 import

yudao-ui-admin-vue3/src/views/system/post/index.vue

@@ -45,8 +45,7 @@
     </vxe-grid>
   </ContentWrap>
   <!-- 弹窗 -->
-  <XModal id="postModel" v-model="dialogVisible" :title="dialogTitle">
+  <Dialog id="postModel" v-model="dialogVisible" :title="dialogTitle">
-    <template #default>
     <!-- 表单：添加/修改 -->
     <Form
       ref="formRef"
@@ -60,7 +59,6 @@
       :schema="allSchemas.detailSchema"
       :data="detailRef"
     />
-    </template>
     <template #footer>
       <!-- 按钮：保存 -->
       <XButton
@@ -73,7 +71,7 @@
       <!-- 按钮：关闭 -->
       <XButton :loading="actionLoading" :title="t('dialog.close')" @click="dialogVisible = false" />
     </template>
-  </XModal>
+  </Dialog>
 </template>
 <script setup lang="ts">
 // 全局相关的 import