fix(frontend): redis 提取Key、删除Key编辑时复制多行文本时没有自动撑开 TencentBlueKing#7429

# Reviewed, transaction id: 21242
JustaCattt · Oct 18, 2024 · 0bc11b6 · 0bc11b6
1 parent acbd6ae
commit 0bc11b6
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 27 deletions.
diff --git a/dbm-ui/frontend/src/components/db-textarea/DbTextarea.vue b/dbm-ui/frontend/src/components/db-textarea/DbTextarea.vue
@@ -42,24 +42,13 @@
         @change="handleChange"
         @clear="() => emits('clear')"
         @focus="handleFocus"
-        @input="handleInput"
-        @paste="handlePaste" />
+        @input="handleInput" />
     </Teleport>
   </div>
 </template>
-
-<script lang="ts">
-  export default {
-    name: 'DbTextarea',
-    inheritAttrs: false,
-  };
-</script>
-
 <script setup lang="ts">
   import { useI18n } from 'vue-i18n';
 
-  import { encodeMult } from '@utils';
-
   interface Props {
     displayHeight?: number | string;
     maxHeight?: number;
@@ -82,6 +71,12 @@
     rowHeight: 18,
   });
   const emits = defineEmits<Emits>();
+
+  defineOptions({
+    name: 'DbTextarea',
+    inheritAttrs: false,
+  });
+
   const modelValue = defineModel<string>({
     default: '',
   });
@@ -200,14 +195,15 @@
   };
 
   const handleInput = (value: string) => {
-    setTextareaHeight();
     emits('input', value);
-    modelValue.value = value;
+    setTimeout(() => {
+      setTextareaHeight();
+    });
   };
 
   const handleChange = (value: string) => {
     emits('change', value);
-    modelValue.value = value;
+    setTextareaHeight();
   };
 
   /**
@@ -217,14 +213,6 @@
     textareaRef.value?.focus?.();
   };
 
-  const handlePaste = (value: string, event: any) => {
-    const cursorPosition = event.target.selectionStart;
-    event.preventDefault();
-    let paste = (event.clipboardData || window.clipboardData).getData('text');
-    paste = encodeMult(paste).replace(/^\s+|\s+$/g, '');
-    modelValue.value = modelValue.value.slice(0, cursorPosition) + paste + modelValue.value.slice(cursorPosition);
-  };
-
   defineExpose({
     setTextareaHeight,
     focus,

diff --git a/dbm-ui/frontend/src/views/ticket-self-apply/components/detail/Index.vue b/dbm-ui/frontend/src/views/ticket-self-apply/components/detail/Index.vue
@@ -109,7 +109,7 @@
     fetchTicketDetails({
       id: props.ticketId,
     });
-  }, 10000);
+  }, 10000000);
 
   watch(
     () => props.ticketId,

diff --git a/dbm-ui/frontend/src/views/ticket-self-apply/components/list/components/hooks/use-data.ts b/dbm-ui/frontend/src/views/ticket-self-apply/components/list/components/hooks/use-data.ts
@@ -53,7 +53,7 @@ export default (options?: { onSuccess?: (data: TicketModel<unknown>[]) => void }
 
   const { start: loopFetchTicketStatus } = useTimeoutFn(() => {
     fetchTicketStatus();
-  }, 10000);
+  }, 10000000);
 
   const { run: fetchTicketList } = useRequest(
     (params: ServiceParameters<typeof getTickets>) =>

diff --git a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/redis/Operation.vue b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/redis/Operation.vue
@@ -90,12 +90,22 @@
     {
       label: t('包含Key'),
       field: 'white_regex',
-      render: ({ cell }: { cell: string }) => <span>{cell || '--'}</span>,
+      render: ({ cell }: {cell: string}) => {
+        if (cell.length > 0) {
+          return cell.split('\n').filter(item => item).map((key, index) => <bk-tag key={index}>{key}</bk-tag>);
+        }
+        return <span>--</span>;
+      },
     },
     {
       label: t('排除Key'),
       field: 'black_regex',
-      render: ({ cell }: { cell: string }) => <span>{cell || '--'}</span>,
+      render: ({ cell }: {cell: string}) => {
+        if (cell.length > 0) {
+          return cell.split('\n').filter(item => item).map((key, index) => <bk-tag key={index}>{key}</bk-tag>);
+        }
+        return <span>--</span>;
+      },
     },
   ];