From 127f4df3027af40089dffe9a86df403c3c1ab9af Mon Sep 17 00:00:00 2001 From: lijiahangmax Date: Sun, 17 Mar 2024 21:25:38 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E5=A4=8D=E5=88=B6=E6=A8=A1=E5=9D=97.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/exec/template/modal/index.vue | 3 +- .../components/meta/history/modal/index.vue | 11 ++-- .../components/connect-log-detail-drawer.vue | 3 +- .../components/connect-log-table.vue | 3 +- .../sftp-log/components/sftp-log-table.vue | 3 +- .../components/host-identity-card-list.vue | 4 +- .../components/host-identity-table.vue | 8 +-- .../host-list/components/host-card-list.vue | 4 +- .../asset/host-list/components/host-table.vue | 12 ++-- .../components/exec-template-table.vue | 3 +- .../components/command-snippet-list-item.vue | 59 +++++++++---------- .../terminal/components/sftp/sftp-table.vue | 12 ++-- .../host/terminal/components/ssh/ssh-view.vue | 5 +- .../components/dict-value-table.vue | 3 +- .../components/operator-log-simple-table.vue | 3 +- .../components/operator-log-table.vue | 3 +- 16 files changed, 62 insertions(+), 77 deletions(-) diff --git a/orion-ops-ui/src/components/exec/template/modal/index.vue b/orion-ops-ui/src/components/exec/template/modal/index.vue index 4a10f50c..53d32f3d 100644 --- a/orion-ops-ui/src/components/exec/template/modal/index.vue +++ b/orion-ops-ui/src/components/exec/template/modal/index.vue @@ -92,7 +92,7 @@ import { usePagination } from '@/types/table'; import useVisible from '@/hooks/visible'; import useLoading from '@/hooks/loading'; - import useCopy from '@/hooks/copy'; + import { copy } from '@/hooks/copy'; import columns from './table.columns'; import { getExecTemplatePage } from '@/api/exec/exec-template'; @@ -100,7 +100,6 @@ const { visible, setVisible } = useVisible(); const { loading, setLoading } = useLoading(); - const { copy } = useCopy(); const pagination = usePagination(); const tableRenderData = ref([]); diff --git a/orion-ops-ui/src/components/meta/history/modal/index.vue b/orion-ops-ui/src/components/meta/history/modal/index.vue index 81dc5902..db4cd655 100644 --- a/orion-ops-ui/src/components/meta/history/modal/index.vue +++ b/orion-ops-ui/src/components/meta/history/modal/index.vue @@ -38,14 +38,18 @@ :bordered="false"> @@ -147,7 +148,7 @@ import { useRowSelection } from '@/types/table'; import { dateFormat } from '@/utils'; import { setAutoFocus } from '@/utils/dom'; - import useCopy from '@/hooks/copy'; + import { copy } from '@/hooks/copy'; import columns from './types/table.columns'; import { FILE_TYPE, openSftpChmodModalKey, openSftpMoveModalKey } from '../../types/terminal.const'; @@ -166,7 +167,6 @@ const openSftpChmodModal = inject(openSftpChmodModalKey) as (sessionId: string, path: string, permission: number) => void; const rowSelection = useRowSelection({ width: 40 }); - const { copy } = useCopy(); // 切换页面自动清空过滤 watch(() => props.list, () => { diff --git a/orion-ops-ui/src/views/host/terminal/components/ssh/ssh-view.vue b/orion-ops-ui/src/views/host/terminal/components/ssh/ssh-view.vue index 3c0a1e50..5a43c4e5 100644 --- a/orion-ops-ui/src/views/host/terminal/components/ssh/ssh-view.vue +++ b/orion-ops-ui/src/views/host/terminal/components/ssh/ssh-view.vue @@ -70,10 +70,10 @@ import type { ISshSession, TerminalTabItem, SidebarAction } from '../../types/terminal.type'; import { computed, onMounted, onUnmounted, ref } from 'vue'; import { useDictStore, useTerminalStore } from '@/store'; - import useCopy from '@/hooks/copy'; + import { copy } from '@/hooks/copy'; import { ActionBarItems, connectStatusKey } from '../../types/terminal.const'; - import IconActions from '../layout/icon-actions.vue'; import ShellEditorModal from '@/components/view/shell-editor/modal/index.vue'; + import IconActions from '../layout/icon-actions.vue'; import SshSearchModal from './ssh-search-modal.vue'; import SshContextMenu from './ssh-context-menu.vue'; @@ -81,7 +81,6 @@ tab: TerminalTabItem }>(); - const { copy } = useCopy(); const { getDictValue } = useDictStore(); const { preference, sessionManager } = useTerminalStore(); diff --git a/orion-ops-ui/src/views/system/dict-value/components/dict-value-table.vue b/orion-ops-ui/src/views/system/dict-value/components/dict-value-table.vue index d62e0785..03c22acc 100644 --- a/orion-ops-ui/src/views/system/dict-value/components/dict-value-table.vue +++ b/orion-ops-ui/src/views/system/dict-value/components/dict-value-table.vue @@ -137,7 +137,7 @@ import useLoading from '@/hooks/loading'; import columns from '../types/table.columns'; import { usePagination, useRowSelection } from '@/types/table'; - import useCopy from '@/hooks/copy'; + import { copy } from '@/hooks/copy'; import DictKeySelector from '@/components/system/dict-key/selector/index.vue'; const emits = defineEmits(['openAdd', 'openUpdate', 'openHistory']); @@ -145,7 +145,6 @@ const selectedKeys = ref([]); const tableRenderData = ref([]); - const { copy } = useCopy(); const pagination = usePagination(); const rowSelection = useRowSelection(); const { loading, setLoading } = useLoading(); diff --git a/orion-ops-ui/src/views/user/operator-log/components/operator-log-simple-table.vue b/orion-ops-ui/src/views/user/operator-log/components/operator-log-simple-table.vue index 3a4b9404..fa0ac059 100644 --- a/orion-ops-ui/src/views/user/operator-log/components/operator-log-simple-table.vue +++ b/orion-ops-ui/src/views/user/operator-log/components/operator-log-simple-table.vue @@ -72,7 +72,7 @@ import { operatorLogModuleKey, operatorLogTypeKey, operatorRiskLevelKey, operatorLogResultKey, dictKeys } from '../types/const'; import columns from '../types/table.columns'; import { getLogDetail } from '../types/const'; - import useCopy from '@/hooks/copy'; + import { copy } from '@/hooks/copy'; import useLoading from '@/hooks/loading'; import { usePagination } from '@/types/table'; import { useDictStore } from '@/store'; @@ -101,7 +101,6 @@ const pagination = usePagination(); const { loading, setLoading } = useLoading(); const { getDictValue } = useDictStore(); - const { copy } = useCopy(); const jsonView = ref(); const tableColumns = ref(); diff --git a/orion-ops-ui/src/views/user/operator-log/components/operator-log-table.vue b/orion-ops-ui/src/views/user/operator-log/components/operator-log-table.vue index 22a059b7..dc7dbf15 100644 --- a/orion-ops-ui/src/views/user/operator-log/components/operator-log-table.vue +++ b/orion-ops-ui/src/views/user/operator-log/components/operator-log-table.vue @@ -134,7 +134,7 @@ import { ref, onMounted } from 'vue'; import { operatorLogModuleKey, operatorLogTypeKey, operatorRiskLevelKey, operatorLogResultKey, getLogDetail } from '../types/const'; import columns from '../types/table.columns'; - import useCopy from '@/hooks/copy'; + import { copy } from '@/hooks/copy'; import useLoading from '@/hooks/loading'; import { usePagination, useRowSelection } from '@/types/table'; import { useDictStore } from '@/store'; @@ -149,7 +149,6 @@ const rowSelection = useRowSelection(); const { loading, setLoading } = useLoading(); const { getDictValue } = useDictStore(); - const { copy } = useCopy(); const clearModal = ref(); const jsonView = ref();