From 089ae12dd1e0af23aefa46b6ff77c3963932b10b Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Mon, 28 Oct 2024 11:02:51 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=B1=9E=E6=80=A7=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CronModal/index.vue       | 11 +++++-----
 src/components/GlobalMask/index.vue      |  4 ++--
 src/components/IntlTelInput/index.vue    | 28 ++++++++++++++++++++++++
 src/components/TableColumnsDnd/index.vue |  7 +++---
 src/components/TerminalTelnet/index.vue  |  2 +-
 src/components/UploadModal/index.vue     | 13 ++++++-----
 6 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/src/components/CronModal/index.vue b/src/components/CronModal/index.vue
index abd76ff7..5a7adf60 100644
--- a/src/components/CronModal/index.vue
+++ b/src/components/CronModal/index.vue
@@ -3,7 +3,7 @@
     :drag="true"
     :destroyOnClose="true"
     :title="t('components.CronModal.title')"
-    :visible="props.visible"
+    :open="props.open"
     :body-style="{ padding: '0 24px' }"
     @cancel="fnCronModal(false)"
     @ok="fnCronModal(true)"
@@ -35,6 +35,7 @@
   </ProModal>
 </template>
 <script lang="ts" setup>
+import { ProModal } from 'antdv-pro-modal';
 import CronSecond from './components/Second.vue';
 import CronMinute from './components/Minute.vue';
 import CronHour from './components/Hour.vue';
@@ -44,9 +45,9 @@ import { reactive, computed, watch } from 'vue';
 import useI18n from '@/hooks/useI18n';
 const { t } = useI18n();
 
-const emit = defineEmits(['cancel', 'ok', 'update:visible']);
+const emit = defineEmits(['cancel', 'ok', 'update:open']);
 const props = defineProps({
-  visible: {
+  open: {
     type: Boolean,
     required: true,
   },
@@ -75,7 +76,7 @@ const cronStr = computed(() => {
 
 /**监听是否显示，初始cron属性 */
 watch(
-  () => props.visible,
+  () => props.open,
   val => {
     if (!val) return;
     const arr = props.cron.split(' ');
@@ -98,7 +99,7 @@ watch(
  * @param val modal触发事件
  */
 function fnCronModal(val: boolean) {
-  emit('update:visible', false);
+  emit('update:open', false);
   if (val) {
     emit('ok', cronStr.value);
   } else {
diff --git a/src/components/GlobalMask/index.vue b/src/components/GlobalMask/index.vue
index 8173500e..0166326f 100644
--- a/src/components/GlobalMask/index.vue
+++ b/src/components/GlobalMask/index.vue
@@ -12,7 +12,7 @@ const router = useRouter();
 const { t } = useI18n();
 
 /**显示遮罩 */
-const isVisible = computed(() => !['none', 'lock'].includes(maskStore.type));
+const isOpen = computed(() => !['none', 'lock'].includes(maskStore.type));
 
 // 用户无操作一段时间后进行锁屏
 function idleTimeout(time: number, callback: Function) {
@@ -67,7 +67,7 @@ onUnmounted(() => {});
 </script>
 <template>
   <a-modal
-    v-model:visible="isVisible"
+    v-model:open="isOpen"
     get-container="#app"
     :footer="null"
     :zIndex="1008"
diff --git a/src/components/IntlTelInput/index.vue b/src/components/IntlTelInput/index.vue
index c6137276..7a6d7d90 100644
--- a/src/components/IntlTelInput/index.vue
+++ b/src/components/IntlTelInput/index.vue
@@ -142,4 +142,32 @@ onBeforeUnmount(() => {
 .iti .iti__country-container .iti__search-input {
   padding: 4px 8px;
 }
+
+.iti .ant-input {
+  box-sizing: border-box;
+  margin: 0;
+  font-variant: tabular-nums;
+  list-style: none;
+  font-feature-settings: 'tnum';
+  position: relative;
+  display: inline-block;
+  width: 100%;
+  min-width: 0;
+  padding: 4px 11px;
+  color: #000000d9;
+  font-size: 14px;
+  line-height: 1.5715;
+  background-color: transparent;
+  background-image: none;
+  border: 1px solid #424242;
+  border-radius: 6px;
+  transition: all 0.3s;
+}
+.iti .ant-input:focus,
+.iti .ant-input-focused {
+  border-color: var(--ant-primary-color-hover);
+  box-shadow: 0 0 0 2px var(--ant-primary-color-outline);
+  border-right-width: 1px !important;
+  outline: 0;
+}
 </style>
diff --git a/src/components/TableColumnsDnd/index.vue b/src/components/TableColumnsDnd/index.vue
index c1433926..403af120 100644
--- a/src/components/TableColumnsDnd/index.vue
+++ b/src/components/TableColumnsDnd/index.vue
@@ -2,7 +2,6 @@
 import { reactive, watch, onMounted, PropType, nextTick } from 'vue';
 import { Container, Draggable } from 'vue3-smooth-dnd';
 import useI18n from '@/hooks/useI18n';
-import { type ColumnsType } from 'ant-design-vue/lib/table';
 import { dbGetJSON, dbSetJSON } from '@/utils/cache-db-utils';
 import { CACHE_DB_TABLE_DND } from '@/constants/cache-keys-constants';
 const { t, currentLocale } = useI18n();
@@ -37,7 +36,7 @@ const props = defineProps({
 });
 
 /**表格字段列 */
-const tableColumns = reactive<ColumnsType>(props.columns);
+const tableColumns = reactive(props.columns);
 
 /**表格字段列勾选状态 */
 const state = reactive<{
@@ -56,7 +55,9 @@ const state = reactive<{
 function fnTableColumnsCheckAllChange(e: any) {
   const checked = e.target.checked;
   state.indeterminate = false;
-  state.columnsTitleList = checked ? tableColumns.map(s => `${s.title}`) : [];
+  state.columnsTitleList = checked
+    ? tableColumns.map(s => `${s.title as string}`)
+    : [];
 }
 
 /**表格字段列拖拽操作 */
diff --git a/src/components/TerminalTelnet/index.vue b/src/components/TerminalTelnet/index.vue
index ef2625f3..cf4dca7d 100644
--- a/src/components/TerminalTelnet/index.vue
+++ b/src/components/TerminalTelnet/index.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { message } from 'ant-design-vue/lib';
+import { message } from 'ant-design-vue/es';
 import { ref, reactive, onMounted, onBeforeUnmount, nextTick } from 'vue';
 import { FitAddon } from '@xterm/addon-fit';
 import { Terminal } from '@xterm/xterm';
diff --git a/src/components/UploadModal/index.vue b/src/components/UploadModal/index.vue
index 662927d9..d7576177 100644
--- a/src/components/UploadModal/index.vue
+++ b/src/components/UploadModal/index.vue
@@ -1,10 +1,11 @@
 <script setup lang="ts">
-import { message } from 'ant-design-vue/lib';
-import { FileType } from 'ant-design-vue/lib/upload/interface';
-import { UploadRequestOption } from 'ant-design-vue/lib/vc-upload/interface';
+import { message } from 'ant-design-vue/es';
+import { FileType } from 'ant-design-vue/es/upload/interface';
+import { UploadRequestOption } from 'ant-design-vue/es/vc-upload/interface';
+import { ProModal } from 'antdv-pro-modal';
 import useI18n from '@/hooks/useI18n';
 const { t } = useI18n();
-const emit = defineEmits(['upload', 'close', 'update:visible']);
+const emit = defineEmits(['upload', 'close', 'update:open']);
 const props = defineProps({
   /**窗口标题 */
   title: {
@@ -17,7 +18,7 @@ const props = defineProps({
     default: false,
   },
   /**是否弹出显示，必传 */
-  visible: {
+  open: {
     type: Boolean,
     required: true,
   },
@@ -80,7 +81,7 @@ function fnUpload(up: UploadRequestOption) {
     :drag="true"
     :destroyOnClose="true"
     :title="props.title"
-    :visible="props.visible"
+    :open="props.open"
     :keyboard="false"
     :mask-closable="false"
     :confirm-loading="props.loading"