diff --git a/src/frontend/package.json b/src/frontend/package.json index 5084a0995b..86cdcf7ce3 100644 --- a/src/frontend/package.json +++ b/src/frontend/package.json @@ -14,8 +14,8 @@ "keywords": [], "license": "ISC", "dependencies": { - "@blueking/ai-blueking": "0.2.7", - "@blueking/ip-selector": "0.3.0-beta.35", + "@blueking/ai-blueking": "0.2.11", + "@blueking/ip-selector": "0.3.0-beta.39", "@blueking/login-modal": "1.0.5", "@blueking/notice-component-vue2": "2.0.0-beta.2", "@blueking/paas-login": "0.0.11", @@ -30,6 +30,7 @@ "core-js": "3.38.1", "cron-parser-custom": "2.13.0", "dayjs": "1.11.13", + "dexie": "4.0.9", "diff": "5.2.0", "diff2html": "3.4.48", "echarts": "5.5.1", @@ -38,6 +39,8 @@ "js-base64": "3.7.7", "js-cookie": "3.0.5", "lodash": "4.17.21", + "markdown-it": "14.1.0", + "markdown-it-code-copy": "0.2.1", "marked": "5.1.1", "marked-gfm-heading-id": "3.1.3", "marked-mangle": "1.1.9", diff --git a/src/frontend/src/components/app-select/index.vue b/src/frontend/src/components/app-select/index.vue index 5798a54fae..8d262a3dc9 100644 --- a/src/frontend/src/components/app-select/index.vue +++ b/src/frontend/src/components/app-select/index.vue @@ -27,20 +27,20 @@ + + diff --git a/src/frontend/src/views/executive-history/step-detail/components/result-task-list/components/host-list/index.vue b/src/frontend/src/views/executive-history/step-detail/components/result-task-list/components/host-list/index.vue index e55f0d45b2..c4e661f911 100644 --- a/src/frontend/src/views/executive-history/step-detail/components/result-task-list/components/host-list/index.vue +++ b/src/frontend/src/views/executive-history/step-detail/components/result-task-list/components/host-list/index.vue @@ -172,11 +172,15 @@ import Empty from '@components/empty'; + import { + messageWarn, + } from '@/common/bkmagic'; import I18n from '@/i18n'; import useList from '../hooks/use-list'; import ColumnSetting from './column-setting'; + import CopyMenu from './copy-menu.vue'; const COLUMN_CACHE_KEY = 'STEP_EXECUTE_IP_COLUMN3'; @@ -284,44 +288,36 @@ handleClearSearch, } = useList(props, columnList, allShowColumn); - const handleCopyIP = () => { + const handleCopyIP = (withNet = false) => { props.getAllTaskList() .then((data) => { const fieldDataList = data.reduce((result, item) => { if (item.host.ip) { - result.push(item.host.ip); + result.push(withNet ? `${item.host.cloudArea.id}:${item.host.ip}` : item.host.ip); } return result; }, []); if (fieldDataList.length < 1) { - this.$bkMessage({ - theme: 'warning', - message: I18n.t('history.没有可复制的 IPv4'), - limit: 1, - }); + messageWarn(I18n.t('history.没有可复制的 IPv4')); return; } const successMessage = `${I18n.t('history.复制成功')}(${fieldDataList.length} ${I18n.t('history.个')} IP)`; execCopy(fieldDataList.join('\n'), successMessage); }); }; - const handleCopyIpv6 = () => { + const handleCopyIpv6 = (withNet = false) => { props.getAllTaskList() .then((data) => { const fieldDataList = data.reduce((result, item) => { if (item.host.ipv6) { - result.push(item.host.ipv6); + result.push(withNet ? `${item.host.cloudArea.id}:${item.host.ipv6}` : item.host.ipv6); } return result; }, []); if (fieldDataList.length < 1) { - this.$bkMessage({ - theme: 'warning', - message: I18n.t('history.没有可复制的 IPv6'), - limit: 1, - }); + messageWarn(I18n.t('history.没有可复制的 IPv6')); return; } const successMessage = `${I18n.t('history.复制成功')}(${fieldDataList.length} ${I18n.t('history.个')} IPv6)`; @@ -335,12 +331,14 @@ const renderIpHeader = (h, { column }) => (
{column.label} - - - + +
handleCopyIP()}> + IPv4 +
+
handleCopyIP(true)}> + { I18n.t('history.管控区域_ID_IPv4')} +
+
); /** @@ -349,12 +347,14 @@ const renderIpv6Header = (h, { column }) => (
{column.label} - - - + +
handleCopyIpv6()}> + IPv6 +
+
handleCopyIpv6(true)}> + { I18n.t('history.管控区域_ID_IPv6')} +
+
); /** diff --git a/src/frontend/src/views/fast-execution/distro-file/index.vue b/src/frontend/src/views/fast-execution/distro-file/index.vue index 62ff49f639..aeab569bc6 100644 --- a/src/frontend/src/views/fast-execution/distro-file/index.vue +++ b/src/frontend/src/views/fast-execution/distro-file/index.vue @@ -187,7 +187,7 @@ // 源文件列表 fileSourceList: [], // 超时 - timeout: 7200, + timeout: 600, // 上传文件限速 uploadSpeedLimit: 0, // 传输模式: 1 - 严谨模式; 2 - 强制模式;3 - 安全模式 diff --git a/src/frontend/src/views/fast-execution/exec-script/index.vue b/src/frontend/src/views/fast-execution/exec-script/index.vue index 01e6eeea0e..751b9a9a5d 100644 --- a/src/frontend/src/views/fast-execution/exec-script/index.vue +++ b/src/frontend/src/views/fast-execution/exec-script/index.vue @@ -184,7 +184,7 @@ // 敏感参数 0-关闭 1-开启 secureParam: 0, // 超时 - timeout: 7200, + timeout: 300, // 账号 account: '', // 目标服务器 diff --git a/src/frontend/src/views/script-manage/list/index.vue b/src/frontend/src/views/script-manage/list/index.vue index 2155304851..f2075674b7 100644 --- a/src/frontend/src/views/script-manage/list/index.vue +++ b/src/frontend/src/views/script-manage/list/index.vue @@ -646,18 +646,18 @@ */ renderHeader(h, data) { return ( - - { data.column.label } - - -
-
{ I18n.t('script.显示被作业引用的次数') }
-
{ I18n.t('script.显示被执行方案引用的次数') }
-
-
-
+ + { data.column.label } + + +
+
{ I18n.t('script.显示被作业引用的次数') }
+
{ I18n.t('script.显示被执行方案引用的次数') }
+
+
+
); }, }, diff --git a/src/frontend/src/views/task-manage/common/plan/list/components/batch-edit-gobal-variable/edit-value/components/edit-global-variable/host.vue b/src/frontend/src/views/task-manage/common/plan/list/components/batch-edit-gobal-variable/edit-value/components/edit-global-variable/host.vue index 01a074024c..9a72727ef6 100644 --- a/src/frontend/src/views/task-manage/common/plan/list/components/batch-edit-gobal-variable/edit-value/components/edit-global-variable/host.vue +++ b/src/frontend/src/views/task-manage/common/plan/list/components/batch-edit-gobal-variable/edit-value/components/edit-global-variable/host.vue @@ -68,8 +68,6 @@