fix: 移除拖拽组件，全局注册ProModal替换默认AModal

src/components/CronModal/index.vue

@@ -1,9 +1,10 @@
 <template>
-  <a-modal
+  <ProModal
+    :drag="true"
+    :destroyOnClose="true"
     :title="t('components.CronModal.title')"
     :visible="props.visible"
     :body-style="{ padding: '0 24px' }"
-    :destroy-on-close="true"
     @cancel="fnCronModal(false)"
     @ok="fnCronModal(true)"
   >
@@ -31,7 +32,7 @@
       v-model:value="cronStr"
       disabled
     />
-  </a-modal>
+  </ProModal>
 </template>
 <script lang="ts" setup>
 import CronSecond from './components/Second.vue';

src/components/DraggableModal/index.vue

@@ -1,168 +0,0 @@
-<script setup lang="ts">
-import { ref, watch, watchEffect, CSSProperties, computed } from 'vue';
-import { useDraggable } from '@vueuse/core';
-const emit = defineEmits(['update:visible', 'ok', 'cancel']);
-/**于a-modal保持一致 */
-const props = defineProps({
-  /**是否弹出显示，必传 */
-  visible: {
-    type: Boolean,
-    required: true,
-  },
-  /**窗口标题 */
-  title: {
-    type: String,
-    default: '',
-  },
-  /**窗口宽度 */
-  width: {
-    type: [String, Number],
-    default: '520px',
-  },
-  bodyStyle: {
-    type: Object,
-    default: {},
-  },
-  keyboard: {
-    type: Boolean,
-    default: true,
-  },
-  mask: {
-    type: Boolean,
-    default: true,
-  },
-  maskClosable: {
-    type: Boolean,
-    default: true,
-  },
-  maskStyle: {
-    type: Object,
-    default: {},
-  },
-  destroyOnClose: {
-    type: Boolean,
-    default: false,
-  },
-  confirmLoading: {
-    type: Boolean,
-    default: false,
-  },
-  footer: {
-    type: Object as any,
-  },
-});
-
-// 对标题进行监听
-const modalTitleRef = ref<HTMLElement | null>(null);
-const { x, y, isDragging } = useDraggable(modalTitleRef);
-
-const startX = ref<number>(0);
-const startY = ref<number>(0);
-const startedDrag = ref(false);
-const transformX = ref(0);
-const transformY = ref(0);
-const preTransformX = ref(0);
-const preTransformY = ref(0);
-const dragRect = ref({ left: 0, right: 0, top: 0, bottom: 0 });
-
-watch([x, y], () => {
-  if (!startedDrag.value) {
-    startX.value = x.value;
-    startY.value = y.value;
-    const bodyRect = document.body.getBoundingClientRect();
-    const titleRectEl = modalTitleRef.value;
-    if (titleRectEl) {
-      const titleRect = titleRectEl.getBoundingClientRect();
-      dragRect.value.right = bodyRect.width - (titleRect.width + 24);
-      dragRect.value.bottom = bodyRect.height - (titleRect.height + 16);
-    }
-    preTransformX.value = transformX.value;
-    preTransformY.value = transformY.value;
-  }
-  startedDrag.value = true;
-});
-
-watchEffect(() => {
-  if (!isDragging.value) {
-    startedDrag.value = false;
-  }
-  if (startedDrag.value) {
-    const dragRectX = Math.min(
-      Math.max(dragRect.value.left + 24, x.value),
-      dragRect.value.right
-    );
-    transformX.value = preTransformX.value + dragRectX - startX.value;
-
-    const dragRectY = Math.min(
-      Math.max(dragRect.value.top + 16, y.value),
-      dragRect.value.bottom
-    );
-    transformY.value = preTransformY.value + dragRectY - startY.value;
-  }
-});
-
-// 位移
-const transformStyle = computed<CSSProperties>(() => {
-  return {
-    transform: `translate(${transformX.value}px, ${transformY.value}px)`,
-  };
-});
-
-/**监听是否显示，位置还原 */
-watch(
-  () => props.visible,
-  val => {
-    if (val) {
-      transformX.value = 0;
-      transformY.value = 0;
-    }
-  }
-);
-</script>
-
-<template>
-  <a-modal
-    wrapClassName="draggable-modal"
-    :width="props.width"
-    :keyboard="props.keyboard"
-    :mask="props.mask"
-    :mask-closable="props.maskClosable"
-    :visible="props.visible"
-    :confirm-loading="props.confirmLoading"
-    :body-style="props.bodyStyle"
-    :mask-style="props.maskStyle"
-    :destroy-on-close="props.destroyOnClose"
-    :footer="props.footer"
-    @ok="(e:any) => emit('ok', e)"
-    @cancel="(e:any) => emit('cancel', e)"
-  >
-    <template #title>
-      <div
-        ref="modalTitleRef"
-        class="draggable-modal-title"
-        v-text="title"
-      ></div>
-    </template>
-    <template #modalRender="{ originVNode }">
-      <div :style="transformStyle">
-        <component :is="originVNode" />
-      </div>
-    </template>
-    <slot></slot>
-  </a-modal>
-</template>
-
-<style lang="less">
-.draggable-modal {
-  // 穿透选择文字
-  // 给a-modal设置 get-container=".ant-pro-page-container"
-  // 防止跳转显示
-  // &.ant-modal-wrap {
-  //   pointer-events: none;
-  // }
-  &-title {
-    width: 100%;
-    cursor: move;
-  }
-}
-</style>

src/components/UploadModal/index.vue

@@ -35,19 +35,22 @@ const props = defineProps({
 
 /**弹框关闭事件 */
 function fnModalClose() {
-  if(props.loading) return
+  if (props.loading) return;
   emit('close');
 }
 
 /**上传前检查或转换压缩 */
 function fnBeforeUpload(file: FileType) {
   if (props.loading) return false;
-    // 检查文件大小
+  // 检查文件大小
-    if (props.size > 0) {
+  if (props.size > 0) {
     const fileSize = file.size;
     const isLtM = fileSize / 1024 / 1024 < props.size;
     if (!isLtM) {
-      message.error(`${t('components.UploadModal.allowFilter')} ${props.size}MB`, 3);
+      message.error(
+        `${t('components.UploadModal.allowFilter')} ${props.size}MB`,
+        3
+      );
       return false;
     }
   }
@@ -56,7 +59,10 @@ function fnBeforeUpload(file: FileType) {
     const fileName = file.name;
     const isAllowType = props.ext.some(v => fileName.endsWith(v));
     if (!isAllowType) {
-      message.error(`${t('components.UploadModal.onlyAllow')} ${props.ext.join('、')}`, 3);
+      message.error(
+        `${t('components.UploadModal.onlyAllow')} ${props.ext.join('、')}`,
+        3
+      );
       return false;
     }
   }
@@ -65,13 +71,14 @@ function fnBeforeUpload(file: FileType) {
 
 /**上传请求发出 */
 function fnUpload(up: UploadRequestOption) {
-  emit('upload', up.file)
+  emit('upload', up.file);
 }
 </script>
 
 <template>
-  <a-modal
+  <ProModal
-    width="500px"
+    :drag="true"
+    :destroyOnClose="true"
     :title="props.title"
     :visible="props.visible"
     :keyboard="false"
@@ -93,20 +100,26 @@ function fnUpload(up: UploadRequestOption) {
         <p class="ant-upload-drag-icon">
           <inbox-outlined></inbox-outlined>
         </p>
-        <p class="ant-upload-text">{{t('components.UploadModal.uploadTip')}}</p>
+        <p class="ant-upload-text">
+          {{ t('components.UploadModal.uploadTip') }}
+        </p>
         <p class="ant-upload-hint">
-          <div v-if="props.size > 0">
+          <template v-if="props.size > 0">
-            {{t('components.UploadModal.allowSize')}} {{ props.size }} MB
+            <div>
-          </div>
+              {{ t('components.UploadModal.allowSize') }} {{ props.size }} MB
-          <div v-if="props.ext.length > 0">
+            </div>
-            {{t('components.UploadModal.allowFormat')}}  {{ props.ext.join('、') }}
+          </template>
-          
+          <template v-if="props.ext.length > 0">
-          </div>
+            <div>
+              {{ t('components.UploadModal.allowFormat') }}
+              {{ props.ext.join('、') }}
+            </div>
+          </template>
         </p>
       </a-upload-dragger>
       <slot></slot>
     </a-space>
-  </a-modal>
+  </ProModal>
 </template>
 
 <style lang="less" scoped></style>

src/layouts/components/RightContent.vue

@@ -96,8 +96,10 @@ function fnChangeLocale(e: any) {
           <LockOutlined />
         </template>
       </a-button>
-      <a-modal
+      <ProModal
+        :drag="true"
         :width="400"
+        :minHeight="200"
         :mask-closable="false"
         v-model:visible="lockConfirm"
         :title="t('loayouts.rightContent.lockTip')"
@@ -119,7 +121,7 @@ function fnChangeLocale(e: any) {
             </template>
           </a-input-password>
         </a-space>
-      </a-modal>
+      </ProModal>
     </a-tooltip>
 
     <a-tooltip placement="bottom">

src/main.ts

@@ -4,7 +4,9 @@ import App from './App.vue';
 import router from './router';
 import directive from './directive';
 import i18n from './i18n';
+import ProModal from "antdv-pro-modal";
 import 'antdv-pro-layout/dist/style.css';
+import 'antdv-pro-modal/dist/style.css';
 import 'ant-design-vue/dist/antd.variable.min.css';
 
 const app = createApp(App);
@@ -12,5 +14,6 @@ app.use(store);
 app.use(router);
 app.use(directive);
 app.use(i18n);
+app.use(ProModal);
 
 app.mount('#app');

src/views/account/components/base-info.vue

@@ -15,9 +15,9 @@ const { getDict } = useDictStore();
 
 /**用户性别字典 */
 let sysUserSex = ref<DictType[]>([
-  { label: '未知', value: '0', elTagType: '', elTagClass: '' },
+  { label: '未知', value: '0', tagType: '', tagClass: '' },
-  { label: '男', value: '1', elTagType: '', elTagClass: '' },
+  { label: '男', value: '1', tagType: '', tagClass: '' },
-  { label: '女', value: '2', elTagType: '', elTagClass: '' },
+  { label: '女', value: '2', tagType: '', tagClass: '' },
 ]);
 
 /**表单数据状态 */

src/views/configManage/backupManage/index.vue

@@ -481,8 +481,10 @@ onMounted(() => {
     </a-card>
 
     <!-- 新增框或修改框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
+      :destroyOnClose="true"
       :keyboard="false"
       :mask-closable="false"
       :visible="modalState.visibleByEdit"
@@ -505,7 +507,7 @@ onMounted(() => {
           />
         </a-form-item>
       </a-form>
-    </a-modal>
+    </ProModal>
   </PageContainer>
 </template>
 

src/views/configManage/configParamTreeTable/index.vue

@@ -1455,8 +1455,10 @@ onMounted(() => {
     </a-row>
 
     <!-- 新增框或修改框 -->
-    <DraggableModal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
+      :destroyOnClose="true"
       :body-style="{ maxHeight: '650px', 'overflow-y': 'auto' }"
       :keyboard="false"
       :mask-closable="false"
@@ -1549,7 +1551,7 @@ onMounted(() => {
           </a-tooltip>
         </a-form-item>
       </a-form>
-    </DraggableModal>
+    </ProModal>
   </PageContainer>
 </template>
 

src/views/configManage/license/index.vue

@@ -430,8 +430,10 @@ onMounted(() => {
     </a-card>
 
     <!-- 上传框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
+      :destroyOnClose="true"
       :keyboard="false"
       :mask-closable="false"
       :visible="modalState.visibleByEdit"
@@ -487,7 +489,7 @@ onMounted(() => {
           </a-upload>
         </a-form-item>
       </a-form>
-    </a-modal>
+    </ProModal>
   </PageContainer>
 </template>
 

src/views/configManage/neManage/index.vue

@@ -972,8 +972,10 @@ onMounted(() => {
     </a-card>
 
     <!-- 新增框或修改框 -->
-    <DraggableModal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
+      :destroyOnClose="true"
       :keyboard="false"
       :mask-closable="false"
       :visible="modalState.visibleByEdit"
@@ -1168,11 +1170,13 @@ onMounted(() => {
           </a-col>
         </a-row>
       </a-form>
-    </DraggableModal>
+    </ProModal>
 
     <!-- 导入框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
+      :destroyOnClose="true"
       :keyboard="false"
       :mask-closable="false"
       :visible="modalState.visibleByImport"
@@ -1259,7 +1263,7 @@ onMounted(() => {
           </a-upload>
         </a-form-item>
       </a-form>
-    </a-modal>
+    </ProModal>
   </PageContainer>
 </template>
 

src/views/configManage/softwareManage/components/software-history.vue

@@ -167,7 +167,11 @@ function fnGetList(pageNum?: number) {
     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
       tablePagination.total = res.total;
       tableState.data = res.rows;
-      if (tablePagination.total <=(queryParams.pageNum - 1) * tablePagination.pageSize &&queryParams.pageNum !== 1) {
+      if (
+        tablePagination.total <=
+          (queryParams.pageNum - 1) * tablePagination.pageSize &&
+        queryParams.pageNum !== 1
+      ) {
         tableState.loading = false;
         fnGetList(queryParams.pageNum - 1);
       }
@@ -197,9 +201,10 @@ watch(
 </script>
 
 <template>
-  <a-modal
+  <ProModal
-    width="100%"
+    :drag="true"
-    wrap-class-name="full-modal"
+    :forceFullscreen="true"
+    :destroyOnClose="true"
     :title="props.title"
     :visible="props.visible"
     :keyboard="false"
@@ -265,7 +270,7 @@ watch(
       :pagination="tablePagination"
     >
     </a-table>
-  </a-modal>
+  </ProModal>
 </template>
 
 <style lang="less" scoped>
@@ -273,22 +278,3 @@ watch(
   padding: 0 24px;
 }
 </style>
-
-<style lang="less">
-.full-modal {
-  .ant-modal {
-    max-width: 100%;
-    top: 0;
-    padding-bottom: 0;
-    margin: 0;
-  }
-  .ant-modal-content {
-    display: flex;
-    flex-direction: column;
-    height: calc(100vh);
-  }
-  .ant-modal-body {
-    flex: 1;
-  }
-}
-</style>

src/views/configManage/softwareManage/index.vue

@@ -919,8 +919,9 @@ onMounted(() => {
     </a-card>
 
     <!-- 上传框 -->
-    <DraggableModal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
       :keyboard="false"
       :mask-closable="false"
       :visible="modalState.visibleByEdit"
@@ -1012,7 +1013,7 @@ onMounted(() => {
           </a-upload>
         </a-form-item>
       </a-form>
-    </DraggableModal>
+    </ProModal>
 
     <!-- 上传激活历史 -->
     <SoftwareHistory
@@ -1022,8 +1023,8 @@ onMounted(() => {
     />
 
     <!-- 文件框 下发激活 -->
-    <a-modal
+    <ProModal
-      width="600px"
+      :drag="true"
       :keyboard="false"
       :mask-closable="false"
       :visible="fileModalState.visible"
@@ -1051,11 +1052,11 @@ onMounted(() => {
           />
         </a-form-item>
       </a-form>
-    </a-modal>
+    </ProModal>
 
     <!-- 回退框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
       :keyboard="false"
       :mask-closable="false"
       :visible="fileModalState.visibleByBack"
@@ -1086,7 +1087,7 @@ onMounted(() => {
           />
         </a-form-item>
       </a-form>
-    </a-modal>
+    </ProModal>
   </PageContainer>
 </template>
 

src/views/dashboard/imsCDR/index.vue

@@ -659,7 +659,7 @@ onBeforeUnmount(() => {
               <DictTag
                 :options="dict.cdrSipCode"
                 :value="record.cdrJSON.cause"
-                value-option="0"
+                value-default="0"
               />
             </span>
             <span v-else>
@@ -730,7 +730,7 @@ onBeforeUnmount(() => {
                 <DictTag
                   :options="dict.cdrSipCode"
                   :value="record.cdrJSON.cause"
-                  value-option="0"
+                  value-default="0"
                 />
               </span>
               <span v-else>

src/views/dashboard/mocn/components/setting.vue

@@ -56,8 +56,9 @@ watch(
 </script>
 
 <template>
-  <a-modal
+  <ProModal
-    width="800px"
+    :drag="true"
+    :width="800"
     :title="props.title"
     :visible="props.visible"
     :keyboard="false"
@@ -82,7 +83,7 @@ watch(
         </a-input-number>
       </a-form-item>
     </a-form>
-  </a-modal>
+  </ProModal>
 </template>
 
 <style lang="less" scoped></style>

src/views/dashboard/overview/components/UserActivity/index.vue

@@ -121,7 +121,7 @@ onMounted(() => {
             <DictTag
               :options="dict.cdrSipCode"
               :value="item.data.cause"
-              value-option="0"
+              value-default="0"
             />
           </span>
           <span v-else>

src/views/faultManage/active-alarm/index.vue

@@ -1045,9 +1045,10 @@ onMounted(() => {
     </a-card>
 
     <!-- 帮助文档 -->
-    <a-modal
+    <ProModal
-      width="100%"
+      :drag="true"
-      wrap-class-name="full-modal"
+      :forceFullscreen="true"
+      :destroyOnClose="true"
       :keyboard="false"
       :mask-closable="false"
       :visible="modalState.helpShowView"
@@ -1067,11 +1068,12 @@ onMounted(() => {
         :scroll="{ x: 1700, y: '82vh' }"
       >
       </a-table>
-    </a-modal>
+    </ProModal>
 
     <!-- 详情框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
       :body-style="{ height: '520px', overflowY: 'scroll' }"
       :keyboard="false"
       :mask-closable="false"
@@ -1274,11 +1276,12 @@ onMounted(() => {
           </a-col>
         </a-row>
       </a-form>
-    </a-modal>
+    </ProModal>
 
     <!-- 显示过滤框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
       :keyboard="false"
       :mask-closable="false"
       :visible="modalState.visibleByShowSet"
@@ -1373,11 +1376,12 @@ onMounted(() => {
           </a-col>
         </a-row>
       </a-form>
-    </a-modal>
+    </ProModal>
 
     <!-- 个性化设置框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
       :keyboard="false"
       :mask-closable="false"
       :visible="modalState.visibleByMyselfSet"
@@ -1471,7 +1475,7 @@ onMounted(() => {
           </a-col>
         </a-row>
       </a-form>
-    </a-modal>
+    </ProModal>
   </PageContainer>
 </template>
 

src/views/faultManage/event/index.vue

@@ -673,8 +673,9 @@ onMounted(() => {
     </a-card>
 
     <!-- 详情框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
       :body-style="{ height: '520px', overflowY: 'scroll' }"
       :keyboard="false"
       :mask-closable="false"
@@ -836,7 +837,7 @@ onMounted(() => {
           {{ modalState.from.specificProblem }}
         </a-form-item>
       </a-form>
-    </a-modal>
+    </ProModal>
   </PageContainer>
 </template>
 

src/views/faultManage/history-alarm/index.vue

@@ -824,8 +824,8 @@ onMounted(() => {
     </a-card>
 
     <!-- 详情框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
       :body-style="{ height: '520px', overflowY: 'scroll' }"
       :keyboard="false"
       :mask-closable="false"
@@ -1042,7 +1042,7 @@ onMounted(() => {
           </a-col>
         </a-row>
       </a-form>
-    </a-modal>
+    </ProModal>
   </PageContainer>
 </template>
 

src/views/monitor/job/index.vue

@@ -551,7 +551,11 @@ function fnGetList(pageNum?: number) {
       }
       tablePagination.total = res.total;
       tableState.data = res.rows;
-      if (tablePagination.total <=(queryParams.pageNum - 1) * tablePagination.pageSize &&queryParams.pageNum !== 1) {
+      if (
+        tablePagination.total <=
+          (queryParams.pageNum - 1) * tablePagination.pageSize &&
+        queryParams.pageNum !== 1
+      ) {
         tableState.loading = false;
         fnGetList(queryParams.pageNum - 1);
       }
@@ -841,8 +845,9 @@ onMounted(() => {
     </a-card>
 
     <!-- 详情框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
       :visible="modalState.visibleByView"
       :title="modalState.title"
       @cancel="fnModalCancel"
@@ -949,11 +954,13 @@ onMounted(() => {
           {{ t('common.close') }}
         </a-button>
       </template>
-    </a-modal>
+    </ProModal>
 
     <!-- 新增框或修改框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
+      :destroyOnClose="true"
       :keyboard="false"
       :mask-closable="false"
       :visible="modalState.visibleByEdit"
@@ -1110,7 +1117,7 @@ onMounted(() => {
           />
         </a-form-item>
       </a-form>
-    </a-modal>
+    </ProModal>
 
     <!-- 生成cron表达式 -->
     <CronModal

src/views/monitor/job/log.vue

@@ -373,12 +373,16 @@ function fnGetList(pageNum?: number) {
       }
       tablePagination.total = res.total;
       tableState.data = res.rows;
-      if (tablePagination.total <=(queryParams.pageNum - 1) * tablePagination.pageSize &&queryParams.pageNum !== 1) {
+      if (
+        tablePagination.total <=
+          (queryParams.pageNum - 1) * tablePagination.pageSize &&
+        queryParams.pageNum !== 1
+      ) {
         tableState.loading = false;
         fnGetList(queryParams.pageNum - 1);
       }
     }
-     tableState.loading = false;
+    tableState.loading = false;
   });
 }
 
@@ -628,8 +632,9 @@ onMounted(() => {
     </a-card>
 
     <!-- 详情框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
       :visible="modalState.visibleByView"
       :title="modalState.title"
       @cancel="fnModalCancel"
@@ -728,7 +733,7 @@ onMounted(() => {
           {{ t('common.close') }}
         </a-button>
       </template>
-    </a-modal>
+    </ProModal>
   </PageContainer>
 </template>
 

src/views/monitor/topologyBuild/components/GraphEditModal.vue

@@ -175,8 +175,10 @@ function fnModalCancel() {
 </script>
 
 <template>
-  <DraggableModal
+  <ProModal
-    width="800px"
+    :drag="true"
+    :width="800"
+    :destroyOnClose="true"
     :body-style="{ maxHeight: '650px', 'overflow-y': 'auto' }"
     :keyboard="false"
     :mask-closable="false"
@@ -1269,7 +1271,7 @@ function fnModalCancel() {
         </a-col>
       </a-row>
     </a-form>
-  </DraggableModal>
+  </ProModal>
 </template>
 
 <style lang="less" scoped></style>

src/views/monitor/topologyBuild/index.vue

@@ -142,7 +142,7 @@ function fnModalOk() {
       modalState.confirmLoading = true;
       const hide = message.loading(t('common.loading'), 0);
       // 根据类型选择函数
-      const groupName = from.group.trim()
+      const groupName = from.group.trim();
       saveGraphData(groupName, graphG6.value.save())
         .then((res: any) => {
           if (res.code === RESULT_CODE_SUCCESS) {
@@ -325,8 +325,8 @@ onMounted(() => {
     <GraphEditModal></GraphEditModal>
 
     <!-- 图保存图组名修改框 -->
-    <a-modal
+    <ProModal
-      width="500px"
+      :drag="true"
       :keyboard="false"
       :mask-closable="false"
       :visible="modalState.visible"
@@ -359,7 +359,7 @@ onMounted(() => {
           </a-col>
         </a-row>
       </a-form>
-    </a-modal>
+    </ProModal>
   </PageContainer>
 </template>
 

src/views/ne/neConfPara5G/index.vue

@@ -231,8 +231,8 @@ onMounted(() => {
     </a-card>
 
     <!-- 保存选择同步网元 -->
-    <a-modal
+    <ProModal
-      width="500px"
+      :drag="true"
       :keyboard="false"
       :mask-closable="false"
       :visible="state.visible"
@@ -281,7 +281,7 @@ onMounted(() => {
           />
         </a-form-item>
       </a-form>
-    </a-modal>
+    </ProModal>
   </PageContainer>
 </template>
 

src/views/ne/neHost/index.vue

@@ -626,8 +626,10 @@ onMounted(() => {
       </a-table>
 
       <!-- 新增框或修改框 -->
-      <a-modal
+      <ProModal
-        width="800px"
+        :drag="true"
+        :width="800"
+        :destroyOnClose="true"
         :keyboard="false"
         :mask-closable="false"
         :visible="modalState.visibleByEdit"
@@ -828,7 +830,7 @@ onMounted(() => {
             </a-button>
           </a-form-item>
         </a-form>
-      </a-modal>
+      </ProModal>
     </a-card>
   </PageContainer>
 </template>

src/views/ne/neHostCommand/index.vue

@@ -497,8 +497,10 @@ onMounted(() => {
       </a-table>
 
       <!-- 新增框或修改框 -->
-      <a-modal
+      <ProModal
-        width="800px"
+        :drag="true"
+        :width="800"
+        :destroyOnClose="true"
         :keyboard="false"
         :mask-closable="false"
         :visible="modalState.visibleByEdit"
@@ -586,7 +588,7 @@ onMounted(() => {
             />
           </a-form-item>
         </a-form>
-      </a-modal>
+      </ProModal>
     </a-card>
   </PageContainer>
 </template>

src/views/ne/neInfo/components/BackConfModal.vue

@@ -244,8 +244,9 @@ defineExpose({
 </script>
 
 <template>
-  <a-modal
+  <ProModal
-    width="800px"
+    :drag="true"
+    :width="800"
     :keyboard="false"
     :mask-closable="false"
     :visible="modalState.visibleByEdit"
@@ -331,7 +332,7 @@ defineExpose({
         </a-col>
       </a-row>
     </a-form>
-  </a-modal>
+  </ProModal>
 </template>
 
 <style lang="less" scoped></style>

src/views/ne/neInfo/components/EditModal.vue

@@ -347,8 +347,10 @@ onMounted(() => {
 </script>
 
 <template>
-  <DraggableModal
+  <ProModal
-    width="800px"
+    :drag="true"
+    :width="800"
+    :destroyOnClose="true"
     :body-style="{ maxHeight: '650px', 'overflow-y': 'auto' }"
     :keyboard="false"
     :mask-closable="false"
@@ -753,7 +755,7 @@ onMounted(() => {
         </a-collapse-panel>
       </a-collapse>
     </a-form>
-  </DraggableModal>
+  </ProModal>
 </template>
 
 <style lang="less" scoped>

src/views/ne/neInfo/components/OAMModal.vue

@@ -161,8 +161,9 @@ watch(
 </script>
 
 <template>
-  <DraggableModal
+  <ProModal
-    width="500px"
+    :drag="true"
+    :destroyOnClose="true"
     :body-style="{ maxHeight: '650px', 'overflow-y': 'auto' }"
     :keyboard="false"
     :mask-closable="false"
@@ -290,7 +291,7 @@ watch(
         </a-collapse-panel>
       </a-collapse>
     </a-form>
-  </DraggableModal>
+  </ProModal>
 </template>
 
 <style lang="less" scoped>

src/views/ne/neLicense/components/EditModal.vue

@@ -282,8 +282,10 @@ onMounted(() => {});
 </script>
 
 <template>
-  <a-modal
+  <ProModal
-    width="800px"
+    :drag="true"
+    :width="800"
+    :destroyOnClose="true"
     :keyboard="false"
     :mask-closable="false"
     :visible="modalState.visibleByEdit"
@@ -387,7 +389,7 @@ onMounted(() => {});
         />
       </a-form-item>
     </a-form>
-  </a-modal>
+  </ProModal>
 </template>
 
 <style lang="less" scoped></style>

src/views/ne/neLicense/components/UploadLicenseFile.vue

@@ -185,8 +185,9 @@ onMounted(() => {});
 </script>
 
 <template>
-  <a-modal
+  <ProModal
-    width="500px"
+    :drag="true"
+    :destroyOnClose="true"
     :keyboard="false"
     :mask-closable="false"
     :visible="modalState.visibleByUploadFile"
@@ -242,7 +243,7 @@ onMounted(() => {});
         </a-upload>
       </a-form-item>
     </a-form>
-  </a-modal>
+  </ProModal>
 </template>
 
 <style lang="less" scoped></style>

src/views/ne/neSoftware/components/EditModal.vue

@@ -344,8 +344,9 @@ onMounted(() => {});
 </script>
 
 <template>
-  <a-modal
+  <ProModal
-    width="550px"
+    :drag="true"
+    :destroyOnClose="true"
     :keyboard="false"
     :mask-closable="false"
     :visible="modalState.visibleByEdit"
@@ -464,7 +465,7 @@ onMounted(() => {});
         />
       </a-form-item>
     </a-form>
-  </a-modal>
+  </ProModal>
 </template>
 
 <style lang="less" scoped></style>

src/views/ne/neSoftware/components/UploadMoreFile.vue

@@ -348,8 +348,9 @@ onMounted(() => {});
 </script>
 
 <template>
-  <a-modal
+  <ProModal
-    width="800px"
+    :drag="true"
+    :width="800"
     :keyboard="false"
     :mask-closable="false"
     :visible="modalState.visibleByMoreFile"
@@ -478,7 +479,7 @@ onMounted(() => {});
         </a-form-item>
       </template>
     </a-form>
-  </a-modal>
+  </ProModal>
 </template>
 
 <style lang="less" scoped></style>

src/views/ne/neVersion/index.vue

@@ -657,8 +657,10 @@ onMounted(() => {
     ></UploadMoreFile>
 
     <!-- 勾选网元版本进行升级框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
+      :destroyOnClose="true"
       :body-style="{ height: '520px', overflowY: 'scroll' }"
       :keyboard="false"
       :mask-closable="false"
@@ -705,7 +707,7 @@ onMounted(() => {
           </template>
         </a-alert>
       </p>
-    </a-modal>
+    </ProModal>
   </PageContainer>
 </template>
 

src/views/neUser/auth/index.vue

@@ -998,8 +998,10 @@ onMounted(() => {
     </a-card>
 
     <!-- 新增框或修改框 -->
-    <DraggableModal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
+      :destroyOnClose="true"
       :keyboard="false"
       :mask-closable="false"
       :visible="modalState.visibleByEdit"
@@ -1148,11 +1150,13 @@ onMounted(() => {
           </a-col>
         </a-row>
       </a-form>
-    </DraggableModal>
+    </ProModal>
 
     <!-- 批量新增框 -->
-    <DraggableModal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
+      :destroyOnClose="true"
       :keyboard="false"
       :mask-closable="false"
       :visible="modalState.visibleByBatch"
@@ -1313,11 +1317,12 @@ onMounted(() => {
           </a-col>
         </a-row>
       </a-form>
-    </DraggableModal>
+    </ProModal>
 
     <!-- 批量删除框 -->
-    <DraggableModal
+    <ProModal
-      width="500px"
+      :drag="true"
+      :destroyOnClose="true"
       :keyboard="false"
       :mask-closable="false"
       :visible="modalState.visibleByBatchDel"
@@ -1371,7 +1376,7 @@ onMounted(() => {
           </a-col>
         </a-row>
       </a-form>
-    </DraggableModal>
+    </ProModal>
 
     <!-- 上传导入表格数据文件框 -->
     <UploadModal

src/views/neUser/pcf/index.vue

@@ -886,8 +886,10 @@ onMounted(() => {
     </a-card>
 
     <!-- 新增框或修改框 -->
-    <DraggableModal
+    <ProModal
-      :width="modalState.type === 'delete' ? '500px' : '800px'"
+      :drag="true"
+      :width="modalState.type === 'delete' ? 520 : 800"
+      :destroyOnClose="true"
       :keyboard="false"
       :mask-closable="false"
       :visible="modalState.visibleByEdit"
@@ -1127,7 +1129,7 @@ onMounted(() => {
           </a-row>
         </template>
       </a-form>
-    </DraggableModal>
+    </ProModal>
 
     <!-- 上传导入表格数据文件框 -->
     <UploadModal

src/views/neUser/sub/index.vue

@@ -1487,9 +1487,10 @@ onMounted(() => {
     </a-card>
 
     <!-- 新增框或修改框 -->
-    <DraggableModal
+    <ProModal
-      style="top: 0px"
+      :drag="true"
-      width="800px"
+      :width="800"
+      :destroyOnClose="true"
       :body-style="{ maxHeight: '650px', 'overflow-y': 'auto' }"
       :keyboard="false"
       :mask-closable="false"
@@ -2002,12 +2003,13 @@ onMounted(() => {
           </a-collapse-panel>
         </a-collapse>
       </a-form>
-    </DraggableModal>
+    </ProModal>
 
     <!-- 批量增加框 -->
-    <DraggableModal
+    <ProModal
-      style="top: 0px"
+      :drag="true"
-      width="800px"
+      :width="800"
+      :destroyOnClose="true"
       :body-style="{ maxHeight: '650px', 'overflow-y': 'auto' }"
       :keyboard="false"
       :mask-closable="false"
@@ -2543,12 +2545,12 @@ onMounted(() => {
           </a-collapse-panel>
         </a-collapse>
       </a-form>
-    </DraggableModal>
+    </ProModal>
 
     <!-- 批量删除框 -->
-    <DraggableModal
+    <ProModal
-      style="top: 0px"
+      :drag="true"
-      width="500px"
+      :destroyOnClose="true"
       :keyboard="false"
       :mask-closable="false"
       :visible="modalState.visibleByBatchDel"
@@ -2602,7 +2604,7 @@ onMounted(() => {
           </a-col>
         </a-row>
       </a-form>
-    </DraggableModal>
+    </ProModal>
 
     <!-- 上传导入表格数据文件框 -->
     <UploadModal

src/views/neUser/ue/index.vue

@@ -407,8 +407,9 @@ onMounted(() => {
     </a-card>
 
     <!-- 详情框 -->
-    <DraggableModal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
       :visible="modalState.visibleByView"
       :title="modalState.title"
       @cancel="fnModalCancel"
@@ -464,7 +465,7 @@ onMounted(() => {
           </a-descriptions-item>
         </a-descriptions>
       </a-form>
-    </DraggableModal>
+    </ProModal>
   </PageContainer>
 </template>
 

src/views/perfManage/customTarget/index.vue

@@ -295,7 +295,7 @@ function fnSelectPerformanceInit(value: any) {
     i => i.neType === value
   );
   if (modalState.from.objectType) modalState.from.objectType = '';
-  if(modalState.selectedPre.length > 0) modalState.selectedPre = [];
+  if (modalState.selectedPre.length > 0) modalState.selectedPre = [];
 
   modalState.from.expression = '';
   const arrSet = new Set<string>();
@@ -598,8 +598,10 @@ onMounted(() => {
     </a-card>
 
     <!-- 新增框或修改框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
+      :destroyOnClose="true"
       :keyboard="false"
       :mask-closable="false"
       :visible="modalState.visibleByEdit"
@@ -689,7 +691,7 @@ onMounted(() => {
           name="expression"
           v-bind="modalStateFrom.validateInfos.expression"
         >
-          <a-input v-model:value="modalState.from.expression" allow-clear >
+          <a-input v-model:value="modalState.from.expression" allow-clear>
           </a-input>
         </a-form-item>
         <a-row :gutter="16">
@@ -721,7 +723,7 @@ onMounted(() => {
           />
         </a-form-item>
       </a-form>
-    </a-modal>
+    </ProModal>
   </PageContainer>
 </template>
 

src/views/perfManage/perfReport/index.vue

@@ -151,14 +151,18 @@ function fnTableSize({ key }: MenuInfo) {
 function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
-  if(pageNum){
+  if (pageNum) {
     queryParams.pageNum = pageNum;
   }
   listTraceData(toRaw(queryParams)).then(res => {
     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
       tablePagination.total = res.total;
       tableState.data = res.rows;
-      if (tablePagination.total <=(queryParams.pageNum - 1) * tablePagination.pageSize &&queryParams.pageNum !== 1) {
+      if (
+        tablePagination.total <=
+          (queryParams.pageNum - 1) * tablePagination.pageSize &&
+        queryParams.pageNum !== 1
+      ) {
         tableState.loading = false;
         fnGetList(queryParams.pageNum - 1);
       }
@@ -470,8 +474,9 @@ onMounted(() => {
     </a-card>
 
     <!-- 详情框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
       :title="modalState.title"
       :visible="modalState.visible"
       @cancel="fnModalVisibleClose"
@@ -505,7 +510,7 @@ onMounted(() => {
         </a-button>
       </div>
       <div class="raw-html" v-html="modalState.from.rawDataHTML"></div>
-    </a-modal>
+    </ProModal>
   </PageContainer>
 </template>
 

src/views/perfManage/perfSet/index.vue

@@ -158,7 +158,11 @@ function fnGetList(pageNum?: number) {
     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
       tablePagination.total = res.total;
       tableState.data = res.rows;
-      if (tablePagination.total <=(queryParams.pageNum - 1) * tablePagination.pageSize &&queryParams.pageNum !== 1) {
+      if (
+        tablePagination.total <=
+          (queryParams.pageNum - 1) * tablePagination.pageSize &&
+        queryParams.pageNum !== 1
+      ) {
         tableState.loading = false;
         fnGetList(queryParams.pageNum - 1);
       }
@@ -470,8 +474,9 @@ onMounted(() => {
     </a-card>
 
     <!-- 详情框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
       :title="modalState.title"
       :visible="modalState.visible"
       @cancel="fnModalVisibleClose"
@@ -505,7 +510,7 @@ onMounted(() => {
         </a-button>
       </div>
       <div class="raw-html" v-html="modalState.from.rawDataHTML"></div>
-    </a-modal>
+    </ProModal>
   </PageContainer>
 </template>
 

src/views/perfManage/perfThreshold/index.vue

@@ -670,8 +670,10 @@ onMounted(() => {
     </a-card>
 
     <!-- 新增框或修改框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
+      :destroyOnClose="true"
       :keyboard="false"
       :mask-closable="false"
       :visible="modalState.visibleByEdit"
@@ -740,7 +742,7 @@ onMounted(() => {
           </a-col>
         </a-row>
       </a-form>
-    </a-modal>
+    </ProModal>
   </PageContainer>
 </template>
 

src/views/perfManage/taskManage/index.vue

@@ -880,8 +880,9 @@ onMounted(() => {
     </a-card>
 
     <!-- 详情框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
       :visible="modalState.visibleByView"
       :title="modalState.title"
       @cancel="fnModalCancel"
@@ -987,11 +988,13 @@ onMounted(() => {
           t('common.close')
         }}</a-button>
       </template>
-    </a-modal>
+    </ProModal>
 
     <!-- 新增框或修改框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
+      :destroyOnClose="true"
       :keyboard="false"
       :mask-closable="false"
       :visible="modalState.visibleByEdit"
@@ -1137,7 +1140,7 @@ onMounted(() => {
           />
         </a-form-item>
       </a-form>
-    </a-modal>
+    </ProModal>
   </PageContainer>
 </template>
 

src/views/system/config/index.vue

@@ -449,7 +449,11 @@ function fnGetList(pageNum?: number) {
       }
       tablePagination.total = res.total;
       tableState.data = res.rows;
-      if (tablePagination.total <=(queryParams.pageNum - 1) * tablePagination.pageSize &&queryParams.pageNum !== 1) {
+      if (
+        tablePagination.total <=
+          (queryParams.pageNum - 1) * tablePagination.pageSize &&
+        queryParams.pageNum !== 1
+      ) {
         tableState.loading = false;
         fnGetList(queryParams.pageNum - 1);
       }
@@ -698,8 +702,9 @@ onMounted(() => {
     </a-card>
 
     <!-- 详情框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
       :visible="modalState.visibleByView"
       :title="modalState.title"
       @cancel="fnModalCancel"
@@ -762,11 +767,13 @@ onMounted(() => {
           {{ t('common.close') }}
         </a-button>
       </template>
-    </a-modal>
+    </ProModal>
 
     <!-- 新增框或修改框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
+      :destroyOnClose="true"
       :keyboard="false"
       :mask-closable="false"
       :visible="modalState.visibleByEdit"
@@ -855,7 +862,7 @@ onMounted(() => {
           />
         </a-form-item>
       </a-form>
-    </a-modal>
+    </ProModal>
   </PageContainer>
 </template>
 

src/views/system/dept/index.vue

@@ -602,8 +602,9 @@ onMounted(() => {
     </a-card>
 
     <!-- 详情框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
       :visible="modalState.visibleByView"
       :title="modalState.title"
       @cancel="fnModalCancel"
@@ -691,11 +692,13 @@ onMounted(() => {
           t('common.cancel')
         }}</a-button>
       </template>
-    </a-modal>
+    </ProModal>
 
     <!-- 新增框或修改框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
+      :destroyOnClose="true"
       :keyboard="false"
       :mask-closable="false"
       :visible="modalState.visibleByEdit"
@@ -818,7 +821,7 @@ onMounted(() => {
           </a-col>
         </a-row>
       </a-form>
-    </a-modal>
+    </ProModal>
   </PageContainer>
 </template>
 

src/views/system/dict/data.vue

@@ -463,7 +463,11 @@ function fnGetList(pageNum?: number) {
       }
       tablePagination.total = res.total;
       tableState.data = res.rows;
-      if (tablePagination.total <=(queryParams.pageNum - 1) * tablePagination.pageSize &&queryParams.pageNum !== 1) {
+      if (
+        tablePagination.total <=
+          (queryParams.pageNum - 1) * tablePagination.pageSize &&
+        queryParams.pageNum !== 1
+      ) {
         tableState.loading = false;
         fnGetList(queryParams.pageNum - 1);
       }
@@ -714,8 +718,9 @@ onMounted(() => {
     </a-card>
 
     <!-- 详情框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
       :visible="modalState.visibleByView"
       :title="modalState.title"
       @cancel="fnModalCancel"
@@ -844,11 +849,13 @@ onMounted(() => {
           {{ t('common.close') }}
         </a-button>
       </template>
-    </a-modal>
+    </ProModal>
 
     <!-- 新增框或修改框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
+      :destroyOnClose="true"
       :keyboard="false"
       :mask-closable="false"
       :visible="modalState.visibleByEdit"
@@ -999,7 +1006,7 @@ onMounted(() => {
           />
         </a-form-item>
       </a-form>
-    </a-modal>
+    </ProModal>
   </PageContainer>
 </template>
 

src/views/system/dict/index.vue

@@ -452,7 +452,11 @@ function fnGetList(pageNum?: number) {
       }
       tablePagination.total = res.total;
       tableState.data = res.rows;
-      if (tablePagination.total <=(queryParams.pageNum - 1) * tablePagination.pageSize &&queryParams.pageNum !== 1) {
+      if (
+        tablePagination.total <=
+          (queryParams.pageNum - 1) * tablePagination.pageSize &&
+        queryParams.pageNum !== 1
+      ) {
         tableState.loading = false;
         fnGetList(queryParams.pageNum - 1);
       }
@@ -718,8 +722,9 @@ onMounted(() => {
     </a-card>
 
     <!-- 详情框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
       :visible="modalState.visibleByView"
       :title="modalState.title"
       @cancel="fnModalCancel"
@@ -753,11 +758,13 @@ onMounted(() => {
           t('common.cancel')
         }}</a-button>
       </template>
-    </a-modal>
+    </ProModal>
 
     <!-- 新增框或修改框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
+      :destroyOnClose="true"
       :keyboard="false"
       :mask-closable="false"
       :visible="modalState.visibleByEdit"
@@ -810,7 +817,7 @@ onMounted(() => {
           />
         </a-form-item>
       </a-form>
-    </a-modal>
+    </ProModal>
   </PageContainer>
 </template>
 

src/views/system/log/operate/index.vue

@@ -606,8 +606,9 @@ onMounted(() => {
     </a-card>
 
     <!-- 详情框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
       :visible="modalState.visibleByView"
       :title="modalState.title"
       @cancel="fnModalCancel"
@@ -729,7 +730,7 @@ onMounted(() => {
           {{ t('common.cancel') }}
         </a-button>
       </template>
-    </a-modal>
+    </ProModal>
   </PageContainer>
 </template>
 

src/views/system/menu/index.vue

@@ -717,8 +717,9 @@ onMounted(() => {
     </a-card>
 
     <!-- 详情框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
       :visible="modalState.visibleByView"
       :title="modalState.title"
       @cancel="fnModalCancel"
@@ -907,11 +908,13 @@ onMounted(() => {
           t('common.cancel')
         }}</a-button>
       </template>
-    </a-modal>
+    </ProModal>
 
     <!-- 新增框或修改框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
+      :destroyOnClose="true"
       :keyboard="false"
       :mask-closable="false"
       :visible="modalState.visibleByEdit"
@@ -1182,7 +1185,7 @@ onMounted(() => {
           />
         </a-form-item>
       </a-form>
-    </a-modal>
+    </ProModal>
   </PageContainer>
 </template>
 

src/views/system/post/index.vue

@@ -631,8 +631,9 @@ onMounted(() => {
     </a-card>
 
     <!-- 详情框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
       :visible="modalState.visibleByView"
       :title="modalState.title"
       @cancel="fnModalCancel"
@@ -715,11 +716,13 @@ onMounted(() => {
           t('common.cancel')
         }}</a-button>
       </template>
-    </a-modal>
+    </ProModal>
 
     <!-- 新增框或修改框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
+      :destroyOnClose="true"
       :keyboard="false"
       :mask-closable="false"
       :visible="modalState.visibleByEdit"
@@ -804,7 +807,7 @@ onMounted(() => {
           />
         </a-form-item>
       </a-form>
-    </a-modal>
+    </ProModal>
   </PageContainer>
 </template>
 

src/views/system/quick-start/components/NeInfoSoftwareInstall.vue

@@ -151,7 +151,7 @@ async function fnRecordInstall() {
     // 开始安装
     let preinput = {};
     if (row.neType.toUpperCase() === 'IMS') {
-      preinput = { pisCSCF: 'y', updateMFetc: 'No', updateMFshare: 'No' }
+      preinput = { pisCSCF: 'y', updateMFetc: 'No', updateMFshare: 'No' };
     }
     const installData = {
       neType: row.neType,
@@ -315,8 +315,9 @@ onMounted(() => {
   ></UploadMoreFile>
 
   <!-- 勾选网元版本进行安装框 -->
-  <a-modal
+  <ProModal
-    width="800px"
+    :drag="true"
+    :destroyOnClose="true"
     :body-style="{ height: '520px', overflowY: 'scroll' }"
     :keyboard="false"
     :mask-closable="false"
@@ -363,7 +364,7 @@ onMounted(() => {
         </template>
       </a-alert>
     </p>
-  </a-modal>
+  </ProModal>
 </template>
 
 <style lang="less" scoped>

src/views/system/role/components/auth-user-select.vue

@@ -183,7 +183,11 @@ function fnGetList(pageNum?: number) {
       }
       tablePagination.total = res.total;
       tableState.data = res.rows;
-      if (tablePagination.total <=(queryParams.pageNum - 1) * tablePagination.pageSize &&queryParams.pageNum !== 1) {
+      if (
+        tablePagination.total <=
+          (queryParams.pageNum - 1) * tablePagination.pageSize &&
+        queryParams.pageNum !== 1
+      ) {
         tableState.loading = false;
         fnGetList(queryParams.pageNum - 1);
       }
@@ -231,8 +235,11 @@ watch(
 </script>
 
 <template>
-  <a-modal
+  <ProModal
-    width="800px"
+    :drag="true"
+    :width="800"
+    :destroyOnClose="true"
+    :forceFullscreen="true"
     :title="props.title"
     :visible="props.visible"
     :keyboard="false"
@@ -309,7 +316,7 @@ watch(
         </template>
       </template>
     </a-table>
-  </a-modal>
+  </ProModal>
 </template>
 
 <style lang="less" scoped>

src/views/system/role/index.vue

@@ -999,8 +999,10 @@ onMounted(() => {
     </a-card>
 
     <!-- 详情框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
+      :destroyOnClose="false"
       :visible="modalState.visibleByView"
       :title="modalState.title"
       @cancel="fnModalCancel"
@@ -1098,14 +1100,15 @@ onMounted(() => {
           t('common.cancel')
         }}</a-button>
       </template>
-    </a-modal>
+    </ProModal>
 
     <!-- 新增框或修改框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
+      :destroyOnClose="true"
       :keyboard="false"
       :mask-closable="false"
-      :destroy-on-close="true"
       :visible="modalState.visibleByEdit"
       :title="modalState.title"
       :confirm-loading="modalState.confirmLoading"
@@ -1242,14 +1245,15 @@ onMounted(() => {
           </a-tree>
         </a-form-item>
       </a-form>
-    </a-modal>
+    </ProModal>
 
     <!-- 分配角色数据权限修改框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
+      :destroyOnClose="true"
       :keyboard="false"
       :mask-closable="false"
-      :destroy-on-close="true"
       :visible="modalState.visibleByDataScope"
       :title="modalState.title"
       :confirm-loading="modalState.confirmLoading"
@@ -1388,7 +1392,7 @@ onMounted(() => {
           </a-tree>
         </a-form-item>
       </a-form>
-    </a-modal>
+    </ProModal>
   </PageContainer>
 </template>
 

src/views/system/setting/components/system-reset.vue

@@ -66,7 +66,11 @@ function fnModalCancel() {
         {{ t('common.reset') }}
       </a-button>
     </a-col>
-    <a-modal
+    <ProModal
+      :drag="true"
+      :width="400"
+      :minHeight="200"
+      :destroyOnClose="true"
       :mask-closable="false"
       v-model:visible="state.visible"
       :title="t('common.tipTitle')"
@@ -80,7 +84,7 @@ function fnModalCancel() {
       <div style="color: #f5222d">
         {{ t('views.system.setting.resetTipContent') }}
       </div>
-    </a-modal>
+    </ProModal>
 
     <a-col :lg="12" :md="12" :xs="24">
       <a-typography>

src/views/system/user/index.vue

@@ -1070,8 +1070,10 @@ onMounted(() => {
     </a-card>
 
     <!-- 详情框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
+      :destroyOnClose="false"
       :visible="modalState.visibleByView"
       :title="modalState.title"
       @cancel="fnModalCancel"
@@ -1248,11 +1250,13 @@ onMounted(() => {
           {{ t('common.close') }}
         </a-button>
       </template>
-    </a-modal>
+    </ProModal>
 
     <!-- 新增框或修改框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
+      :destroyOnClose="true"
       :keyboard="false"
       :mask-closable="false"
       :visible="modalState.visibleByEdit"
@@ -1455,11 +1459,12 @@ onMounted(() => {
           />
         </a-form-item>
       </a-form>
-    </a-modal>
+    </ProModal>
 
     <!-- 重置密码修改框 -->
-    <a-modal
+    <ProModal
-      width="500px"
+      :drag="true"
+      :destroyOnClose="true"
       :keyboard="false"
       :mask-closable="false"
       :visible="modalState.visibleByResetPwd"
@@ -1495,7 +1500,7 @@ onMounted(() => {
           </a-input-password>
         </a-form-item>
       </a-form>
-    </a-modal>
+    </ProModal>
 
     <!-- 上传导入表格数据文件框 -->
     <UploadModal

src/views/traceManage/analysis/index.vue

@@ -151,14 +151,18 @@ function fnTableSize({ key }: MenuInfo) {
 function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
-  if(pageNum){
+  if (pageNum) {
     queryParams.pageNum = pageNum;
   }
   listTraceData(toRaw(queryParams)).then(res => {
     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
       tablePagination.total = res.total;
       tableState.data = res.rows;
-      if (tablePagination.total <=(queryParams.pageNum - 1) * tablePagination.pageSize &&queryParams.pageNum !== 1) {
+      if (
+        tablePagination.total <=
+          (queryParams.pageNum - 1) * tablePagination.pageSize &&
+        queryParams.pageNum !== 1
+      ) {
         tableState.loading = false;
         fnGetList(queryParams.pageNum - 1);
       }
@@ -470,8 +474,9 @@ onMounted(() => {
     </a-card>
 
     <!-- 详情框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
       :title="modalState.title"
       :visible="modalState.visible"
       @cancel="fnModalVisibleClose"
@@ -505,7 +510,7 @@ onMounted(() => {
         </a-button>
       </div>
       <div class="raw-html" v-html="modalState.from.rawDataHTML"></div>
-    </a-modal>
+    </ProModal>
   </PageContainer>
 </template>
 

src/views/traceManage/pcap/index.vue

@@ -535,8 +535,9 @@ onMounted(() => {
     </a-card>
 
     <!-- 详情框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
       :visible="modalState.visibleByView"
       :footer="null"
       :maskClosable="false"
@@ -550,7 +551,7 @@ onMounted(() => {
         :disabled="true"
         style="color: rgba(0, 0, 0, 0.85)"
       />
-    </a-modal>
+    </ProModal>
   </PageContainer>
 </template>
 

src/views/traceManage/task/index.vue

@@ -236,7 +236,11 @@ function fnGetList(pageNum?: number) {
       }
       tablePagination.total = res.total;
       tableState.data = res.rows;
-      if (tablePagination.total <=(queryParams.pageNum - 1) * tablePagination.pageSize &&queryParams.pageNum !== 1) {
+      if (
+        tablePagination.total <=
+          (queryParams.pageNum - 1) * tablePagination.pageSize &&
+        queryParams.pageNum !== 1
+      ) {
         tableState.loading = false;
         fnGetList(queryParams.pageNum - 1);
       }
@@ -727,8 +731,9 @@ onMounted(() => {
     </a-card>
 
     <!-- 详情框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
       :visible="modalState.visibleByView"
       :title="modalState.title"
       @cancel="fnModalCancel"
@@ -834,11 +839,13 @@ onMounted(() => {
           t('common.close')
         }}</a-button>
       </template>
-    </a-modal>
+    </ProModal>
 
     <!-- 新增框或修改框 -->
-    <a-modal
+    <ProModal
-      width="800px"
+      :drag="true"
+      :width="800"
+      :destroyOnClose="true"
       :keyboard="false"
       :mask-closable="false"
       :visible="modalState.visibleByEdit"
@@ -1041,7 +1048,7 @@ onMounted(() => {
           />
         </a-form-item>
       </a-form>
-    </a-modal>
+    </ProModal>
   </PageContainer>
 </template>