From 817fd974961f4dfd7727b95f2675df1de2e64d1b Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 17 Apr 2024 14:32:06 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E8=A1=A8=E5=AD=97=E6=AE=B5=E5=88=97?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E7=BB=84=E4=BB=B6=E9=A6=96=E4=BD=8D=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E6=97=A0=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TableColumnsDnd/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/TableColumnsDnd/index.vue b/src/components/TableColumnsDnd/index.vue
index e4a3ab30..c1433926 100644
--- a/src/components/TableColumnsDnd/index.vue
+++ b/src/components/TableColumnsDnd/index.vue
@@ -62,7 +62,7 @@ function fnTableColumnsCheckAllChange(e: any) {
 /**表格字段列拖拽操作 */
 function fnTableColumnsDrop(dropResult: any) {
   const { removedIndex, addedIndex, payload } = dropResult;
-  if (!removedIndex || !addedIndex) {
+  if (removedIndex === null || addedIndex === null) {
     return;
   }
   let itemToAdd = payload;
@@ -184,6 +184,7 @@ onMounted(() => {
                 <a-button
                   v-if="c.fixed !== undefined"
                   size="small"
+                  :title="c.fixed ? `Fixed ${c.fixed} side` : ''"
                   :type="c.fixed ? 'primary' : 'dashed'"
                   @click="fnTableColumnsFixed(c)"
                 >

From 9a168d2ba0d41e93bdd13372df5a13a6cd62e24c Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 17 Apr 2024 15:32:07 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E7=99=BB=E5=BD=95=E9=A1=B5=E6=97=A0?=
 =?UTF-8?q?=E7=BD=91=E7=BB=9C=E9=9A=90=E8=97=8F=E5=A4=9A=E8=A8=80=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/app.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts
index 2eb5b5a8..e29f6a86 100644
--- a/src/store/modules/app.ts
+++ b/src/store/modules/app.ts
@@ -57,7 +57,7 @@ const useAppStore = defineStore('app', {
     loginBackground: '',
     helpDoc: '',
     officialUrl: '',
-    i18nOpen: true,
+    i18nOpen: false,
     i18nDefault: 'en_US',
   }),
   getters: {},

From 5a67a1a51c236c9c842a2acddd972fe507ae26ee Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 17 Apr 2024 15:32:42 +0800
Subject: [PATCH 3/3] =?UTF-8?q?chore:=20=E6=8E=A7=E5=88=B6=E5=8F=B0?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7240418?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development | 2 +-
 .env.production  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.development b/.env.development
index 2c3d5f1b..aafdecb5 100644
--- a/.env.development
+++ b/.env.development
@@ -11,7 +11,7 @@ VITE_APP_NAME = "Core Network EMS"
 VITE_APP_CODE = "CN EMS"
 
 # 应用版本
-VITE_APP_VERSION = "2.240330.1"
+VITE_APP_VERSION = "2.240418.1"
 
 # 接口基础URL地址-不带/后缀
 VITE_API_BASE_URL = "/omc-api"
diff --git a/.env.production b/.env.production
index 9b719864..4e7562ef 100644
--- a/.env.production
+++ b/.env.production
@@ -11,7 +11,7 @@ VITE_APP_NAME = "Core Network EMS"
 VITE_APP_CODE = "CN EMS"
 
 # 应用版本
-VITE_APP_VERSION = "2.240330.1"
+VITE_APP_VERSION = "2.240418.1"
 
 # 接口基础URL地址-不带/后缀
 VITE_API_BASE_URL = "/omc-api"