chore: push latest changes

admin-vben/src/app/views/member/components/edit-member.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog v-model="showDialog" :title="title || t('updateMember')" width="500px" :destroy-on-close="true">
+    <ModalEditMember :class="'w-[500px]'" :title="title || t('updateMember')">
 
         <el-form :model="saveData" label-width="90px" :rules="formRules" ref="formRef" class="page-form" @submit.prevent v-loading="loading">
             <el-form-item :label="t('headimg')" v-if="type == 'headimg'">
@@ -43,12 +43,12 @@
 
         <template #footer>
             <span class="dialog-footer">
-                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button @click="cancel">{{ t('cancel') }}</el-button>
                 <el-button type="primary" :loading="loading" v-if="method=='batchSet'" @click="batchSetConfirm(formRef)">{{t('confirm')}}</el-button>
                 <el-button type="primary" :loading="loading" v-else @click="confirm(formRef)">{{t('confirm')}}</el-button>
             </span>
         </template>
-    </el-dialog>
+    </ModalEditMember>
 </template>
 
 <script lang="ts" setup>
@@ -64,6 +64,7 @@ const type = ref('')
 const title = ref('')
 // 会员id
 const memberId = ref('')
+const [ModalEditMember, editMemberModalApi] = useVbenModal()
 const showDialog = ref(false)
 const loading = ref(false)
 const repeat = ref(false)
@@ -187,6 +188,7 @@ const confirm = async (formEl: FormInstance | undefined) => {
                 loading.value = false
                 repeat.value = false
                 showDialog.value = false
+                editMemberModalApi.close()
                 emit('complete')
             }).catch(() => {
                 loading.value = false
@@ -265,6 +267,7 @@ const batchSetConfirm = async (formEl: FormInstance | undefined) => {
                 loading.value = false
                 repeat.value = false
                 showDialog.value = false
+                editMemberModalApi.close()
                 emit('complete')
             }).catch(() => {
                 loading.value = false
@@ -279,6 +282,9 @@ defineExpose({
     setDialogType,
     batchSetDialogType
 })
+
+const cancel = () => { showDialog.value = false; editMemberModalApi.close() }
 </script>
 
 <style lang="scss" scoped></style>
+import { useVbenModal } from '@vben/common-ui'