From a75c89c4514183153706c08d8e9f194270b9ebc8 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Mon, 19 Feb 2024 10:44:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20MML=E5=91=BD=E4=BB=A4=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E6=A1=86shift+=E5=9B=9E=E8=BD=A6=E8=BF=9B=E8=A1=8C=E6=8D=A2?=
 =?UTF-8?q?=E8=A1=8C=EF=BC=8C=E5=9B=9E=E8=BD=A6=E7=9B=B4=E6=8E=A5=E5=8F=91?=
 =?UTF-8?q?=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CodemirrorEdite/index.vue |  2 +-
 src/views/mmlManage/neOperate/index.vue  | 57 ++++++++++++++++++------
 src/views/mmlManage/omcOperate/index.vue | 57 ++++++++++++++++++------
 src/views/mmlManage/udmOperate/index.vue | 57 ++++++++++++++++++------
 4 files changed, 133 insertions(+), 40 deletions(-)

diff --git a/src/components/CodemirrorEdite/index.vue b/src/components/CodemirrorEdite/index.vue
index 1af42895..98feb1a0 100644
--- a/src/components/CodemirrorEdite/index.vue
+++ b/src/components/CodemirrorEdite/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <codemirror
+  <Codemirror
     :model-value="modelValue"
     :placeholder="props.placeholder"
     :style="props.editorStyle"
diff --git a/src/views/mmlManage/neOperate/index.vue b/src/views/mmlManage/neOperate/index.vue
index 49bfa24b..fb94cad5 100644
--- a/src/views/mmlManage/neOperate/index.vue
+++ b/src/views/mmlManage/neOperate/index.vue
@@ -175,20 +175,28 @@ function fnSendMML() {
   // 发送
   state.from.sendLoading = true;
   const [neType, neId] = state.neType;
-  sendMMlByNE(neType, neId, cmdArr).then(res => {
-    state.from.sendLoading = false;
-    if (res.code === RESULT_CODE_SUCCESS) {
-      let resultArr = res.data;
-      for (let i = 0; i < resultArr.length; i++) {
-        const str = resultArr[i];
-        const logStr = str.replace(/(\r\n|\n)/g, '\n');
-        const cmdStr = cmdArr[i];
-        state.mmlCmdLog += `${cmdStr}\n${logStr}\n`;
+  sendMMlByNE(neType, neId, cmdArr)
+    .then(res => {
+      state.from.sendLoading = false;
+      if (res.code === RESULT_CODE_SUCCESS) {
+        let resultArr = res.data;
+        for (let i = 0; i < resultArr.length; i++) {
+          const str = resultArr[i];
+          const logStr = str.replace(/(\r\n|\n)/g, '\n');
+          const cmdStr = cmdArr[i];
+          state.mmlCmdLog += `${cmdStr}\n${logStr}\n`;
+        }
+      } else {
+        state.mmlCmdLog += `${res.msg}\n`;
       }
-    } else {
-      state.mmlCmdLog += `${res.msg}\n`;
-    }
-  });
+    })
+    .finally(() => {
+      // 控制台滚动底部
+      const container = document.getElementsByClassName('cm-scroller')[0];
+      if (container) {
+        container.scrollTop = container.scrollHeight;
+      }
+    });
 }
 
 /**上传变更 */
@@ -475,6 +483,28 @@ function fnAutoCompleteChange(value: any, _: any) {
   }
 }
 
+/**自动完成按键触发 */
+function fnAutoCompleteKeydown(evt: any) {
+  if (evt.key === 'Enter') {
+    // 阻止默认的换行行为
+    evt.preventDefault();
+    // 按下 Shift + Enter 键时换行
+    if (evt.shiftKey) {
+      // 插入换行符
+      const textarea = evt.target;
+      const start = textarea.selectionStart;
+      const end = textarea.selectionEnd;
+      const text = textarea.value;
+      textarea.value = text.substring(0, start) + '\n' + text.substring(end);
+      state.autoCompleteValue = textarea.value;
+      // 更新光标位置
+      textarea.selectionStart = textarea.selectionEnd = start + 1;
+    } else {
+      fnSendMML();
+    }
+  }
+}
+
 onMounted(() => {
   // 获取网元网元列表
   neInfoStore.fnNelist().then(res => {
@@ -599,6 +629,7 @@ onMounted(() => {
                 @search="fnAutoCompleteSearch"
                 @select="fnAutoCompleteSelect"
                 @change="fnAutoCompleteChange"
+                @keydown="fnAutoCompleteKeydown"
               >
                 <a-textarea :placeholder="t('common.inputPlease')" auto-size />
               </a-auto-complete>
diff --git a/src/views/mmlManage/omcOperate/index.vue b/src/views/mmlManage/omcOperate/index.vue
index 74bfeede..701129b8 100644
--- a/src/views/mmlManage/omcOperate/index.vue
+++ b/src/views/mmlManage/omcOperate/index.vue
@@ -170,20 +170,28 @@ function fnSendMML() {
 
   // 发送
   state.from.sendLoading = true;
-  sendMMlByOMC(state.neId, cmdArr).then(res => {
-    state.from.sendLoading = false;
-    if (res.code === RESULT_CODE_SUCCESS) {
-      let resultArr = res.data;
-      for (let i = 0; i < resultArr.length; i++) {
-        const str = resultArr[i];
-        const logStr = str.replace(/(\r\n|\n)/g, '\n');
-        const cmdStr = cmdArr[i];
-        state.mmlCmdLog += `${cmdStr}\n${logStr}\n`;
+  sendMMlByOMC(state.neId, cmdArr)
+    .then(res => {
+      state.from.sendLoading = false;
+      if (res.code === RESULT_CODE_SUCCESS) {
+        let resultArr = res.data;
+        for (let i = 0; i < resultArr.length; i++) {
+          const str = resultArr[i];
+          const logStr = str.replace(/(\r\n|\n)/g, '\n');
+          const cmdStr = cmdArr[i];
+          state.mmlCmdLog += `${cmdStr}\n${logStr}\n`;
+        }
+      } else {
+        state.mmlCmdLog += `${res.msg}\n`;
       }
-    } else {
-      state.mmlCmdLog += `${res.msg}\n`;
-    }
-  });
+    })
+    .finally(() => {
+      // 控制台滚动底部
+      const container = document.getElementsByClassName('cm-scroller')[0];
+      if (container) {
+        container.scrollTop = container.scrollHeight;
+      }
+    });
 }
 
 /**上传变更 */
@@ -449,6 +457,28 @@ function fnAutoCompleteChange(value: any, _: any) {
   }
 }
 
+/**自动完成按键触发 */
+function fnAutoCompleteKeydown(evt: any) {
+  if (evt.key === 'Enter') {
+    // 阻止默认的换行行为
+    evt.preventDefault();
+    // 按下 Shift + Enter 键时换行
+    if (evt.shiftKey) {
+      // 插入换行符
+      const textarea = evt.target;
+      const start = textarea.selectionStart;
+      const end = textarea.selectionEnd;
+      const text = textarea.value;
+      textarea.value = text.substring(0, start) + '\n' + text.substring(end);
+      state.autoCompleteValue = textarea.value;
+      // 更新光标位置
+      textarea.selectionStart = textarea.selectionEnd = start + 1;
+    } else {
+      fnSendMML();
+    }
+  }
+}
+
 onMounted(() => {
   // 获取网元网元列表
   useNeInfoStore()
@@ -567,6 +597,7 @@ onMounted(() => {
                 @search="fnAutoCompleteSearch"
                 @select="fnAutoCompleteSelect"
                 @change="fnAutoCompleteChange"
+                @keydown="fnAutoCompleteKeydown"
               >
                 <a-textarea :placeholder="t('common.inputPlease')" auto-size />
               </a-auto-complete>
diff --git a/src/views/mmlManage/udmOperate/index.vue b/src/views/mmlManage/udmOperate/index.vue
index 436e57db..ef0af865 100644
--- a/src/views/mmlManage/udmOperate/index.vue
+++ b/src/views/mmlManage/udmOperate/index.vue
@@ -170,20 +170,28 @@ function fnSendMML() {
 
   // 发送
   state.from.sendLoading = true;
-  sendMMlByUDM(state.neId, cmdArr).then(res => {
-    state.from.sendLoading = false;
-    if (res.code === RESULT_CODE_SUCCESS) {
-      let resultArr = res.data;
-      for (let i = 0; i < resultArr.length; i++) {
-        const str = resultArr[i];
-        const logStr = str.replace(/(\r\n|\n)/g, '\n');
-        const cmdStr = cmdArr[i];
-        state.mmlCmdLog += `${cmdStr}\n${logStr}\n`;
+  sendMMlByUDM(state.neId, cmdArr)
+    .then(res => {
+      state.from.sendLoading = false;
+      if (res.code === RESULT_CODE_SUCCESS) {
+        let resultArr = res.data;
+        for (let i = 0; i < resultArr.length; i++) {
+          const str = resultArr[i];
+          const logStr = str.replace(/(\r\n|\n)/g, '\n');
+          const cmdStr = cmdArr[i];
+          state.mmlCmdLog += `${cmdStr}\n${logStr}\n`;
+        }
+      } else {
+        state.mmlCmdLog += `${res.msg}\n`;
       }
-    } else {
-      state.mmlCmdLog += `${res.msg}\n`;
-    }
-  });
+    })
+    .finally(() => {
+      // 控制台滚动底部
+      const container = document.getElementsByClassName('cm-scroller')[0];
+      if (container) {
+        container.scrollTop = container.scrollHeight;
+      }
+    });
 }
 
 /**上传变更 */
@@ -449,6 +457,28 @@ function fnAutoCompleteChange(value: any, _: any) {
   }
 }
 
+/**自动完成按键触发 */
+function fnAutoCompleteKeydown(evt: any) {
+  if (evt.key === 'Enter') {
+    // 阻止默认的换行行为
+    evt.preventDefault();
+    // 按下 Shift + Enter 键时换行
+    if (evt.shiftKey) {
+      // 插入换行符
+      const textarea = evt.target;
+      const start = textarea.selectionStart;
+      const end = textarea.selectionEnd;
+      const text = textarea.value;
+      textarea.value = text.substring(0, start) + '\n' + text.substring(end);
+      state.autoCompleteValue = textarea.value;
+      // 更新光标位置
+      textarea.selectionStart = textarea.selectionEnd = start + 1;
+    } else {
+      fnSendMML();
+    }
+  }
+}
+
 onMounted(() => {
   // 获取网元网元列表
   useNeInfoStore()
@@ -572,6 +602,7 @@ onMounted(() => {
                 @search="fnAutoCompleteSearch"
                 @select="fnAutoCompleteSelect"
                 @change="fnAutoCompleteChange"
+                @keydown="fnAutoCompleteKeydown"
               >
                 <a-textarea :placeholder="t('common.inputPlease')" auto-size />
               </a-auto-complete>