抽屉关闭按钮位置

src/layout/components/Header/ProjectSetting.vue

@@ -1,5 +1,8 @@
 <template>
-  <a-drawer v-model:visible="isDrawer" :width="width" :placement="placement" :title="title">
+  <a-drawer v-model:visible="isDrawer" :width="width" :placement="placement" :title="title"  :closable="false">
+    <template #extra>
+        <CloseOutlined style="font-size: 16px;color:rgba(0, 0, 0, 0.45);cursor: pointer;" @click="isDrawer= false" />
+    </template>
     <div class="drawer">
       <a-divider>系统风格</a-divider>
 
@@ -187,6 +190,7 @@
   import { animates as animateOptions } from '@/settings/animateSetting';
   import { toggleTheme } from '@zougt/vite-plugin-theme-preprocessor/dist/browser-utils';
   import Watermark from '@/utils/wartermark';
+  import { CloseOutlined } from '@ant-design/icons-vue';
 
   defineProps({
     title: {

src/views/content/adSort/columns.ts

@@ -1,5 +1,4 @@
 import { h } from 'vue';
-import { ElTag } from 'element-plus';
 
 export const columns = [
   {

src/views/content/layoutItem/edit.vue

@@ -4,8 +4,12 @@
     :title="props.layoutId ? '编辑' : '新增'"
     width="800px"
     :footer-style="{ textAlign: 'right' }"
+    :closable="false"
     @close="dialogClose"
   >
+    <template #extra>
+        <CloseOutlined style="font-size: 16px;color:rgba(0, 0, 0, 0.45);cursor: pointer;" @click="dialogClose" />
+    </template>
     <a-form
       class="ls-form"
       ref="formRef"
@@ -80,6 +84,7 @@
 </template>
 <script lang="ts" setup>
   import type { FormInstance } from 'ant-design-vue';
+  import { CloseOutlined } from '@ant-design/icons-vue';
   import { getLayoutDetail, layoutAdd, layoutUpdate } from '@/api/content/layoutItem';
   import { getLayoutAllList } from '@/api/content/layout';
   import { onMounted, reactive, shallowRef, ref, defineAsyncComponent } from 'vue';

src/views/data/config/columns.ts

@@ -1,5 +1,4 @@
 import { h } from 'vue';
-import { ElTag } from 'element-plus';
 
 export const columns = [
   {

src/views/data/dict/columns.ts

@@ -1,5 +1,4 @@
 import { h } from 'vue';
-import { ElTag } from 'element-plus';
 
 export const columns = [
   {

src/views/data/notice/edit.vue

@@ -4,8 +4,11 @@
     :title="props.noticeId ? '编辑' : '新增'"
     :width="`${size}px`"
     :footer-style="{ textAlign: 'right' }"
+    :closable="false"
     @close="dialogClose">
-
+    <template #extra>
+        <CloseOutlined style="font-size: 16px;color:rgba(0, 0, 0, 0.45);cursor: pointer;" @click="dialogClose" />
+    </template>
     <a-form
       class="ls-form"
       ref="formRef"
@@ -66,7 +69,7 @@
   </a-drawer>
 </template>
 <script lang="ts" setup>
-  import type { FormInstance } from 'element-plus';
+  import { CloseOutlined } from '@ant-design/icons-vue';
   import { getNoticeDetail, noticeAdd, noticeUpdate } from '@/api/data/notice';
   import { onMounted, reactive, shallowRef, ref } from 'vue';
   import UploadImg from '@/components/Upload/Image.vue';
@@ -79,7 +82,7 @@
    */
   const size = document.body.clientWidth - 500;
   const emit = defineEmits(['success', 'update:visible']);
-  const formRef = shallowRef<FormInstance>();
+  const formRef = ref();
   const editorRef = ref();
 
   /**

src/views/logger/fileLog/columns.ts

@@ -1,5 +1,4 @@
 import { h } from 'vue';
-import { ElTag } from 'element-plus';
 
 export const columns = [
   {

src/views/monitor/job/edit.vue

@@ -126,9 +126,8 @@
   </a-modal>
 </template>
 <script lang="ts" setup>
-  import type { FormInstance } from 'element-plus';
   import { getJobDetail, jobAdd, jobUpdate } from '@/api/monitor/job';
-  import { onMounted, reactive, shallowRef } from 'vue';
+  import { onMounted, reactive, ref } from 'vue';
   import { message } from 'ant-design-vue';
   import { useLockFn } from '@/utils/useLockFn';
 
@@ -136,7 +135,7 @@
    * 定义参数变量
    */
   const emit = defineEmits(['success', 'update:visible']);
-  const formRef = shallowRef<FormInstance>();
+  const formRef = ref();
 
   /**
    * 定义表单参数

src/views/monitor/job/log/columns.ts

@@ -1,5 +1,4 @@
 import { h } from 'vue';
-import { ElTag } from 'element-plus';
 
 export const columns = [
   {

src/views/monitor/job/log/index.vue

@@ -1,5 +1,8 @@
 <template>
-  <a-drawer v-model:visible="props.visible" title="调度日志" :width="size" @close="dialogClose">
+  <a-drawer v-model:visible="props.visible" title="调度日志" :width="size" @close="dialogClose" :closable="false">
+    <template #extra>
+        <CloseOutlined style="font-size: 16px;color:rgba(0, 0, 0, 0.45);cursor: pointer;" @click="dialogClose" />
+    </template>
     <a-card :bordered="false" class="pt-3 mb-3 proCard">
       <BasicForm @register="register" @submit="handleSubmit" @reset="handleReset" />
     </a-card>
@@ -43,7 +46,7 @@
   import { reactive, ref, h, nextTick, defineAsyncComponent } from 'vue';
   import { schemas } from './querySchemas';
   import { useForm } from '@/components/Form/index';
-  import { PlusOutlined, EyeOutlined, DeleteOutlined } from '@ant-design/icons-vue';
+  import { EyeOutlined, DeleteOutlined,CloseOutlined } from '@ant-design/icons-vue';
   import { getJobLogList, jobLogDelete, jobLogBatchDelete } from '@/api/monitor/job';
   import { columns } from './columns';
   import { Modal, message } from 'ant-design-vue';

src/views/tool/generator/columns.ts

@@ -1,5 +1,4 @@
 import { h } from 'vue';
-import { ElTag } from 'element-plus';
 
 export const columns = [
   {