节点详情页测试体验问题优化 (#7020)

TencentBlueKing · Aug 24, 2023 · e963827 · e963827
1 parent 090325c
commit e963827
Show file tree

Hide file tree

Showing 19 changed files with 377 additions and 189 deletions.
diff --git a/frontend/desktop/src/components/common/RenderForm/IpSelector/IpSelectorTable.vue b/frontend/desktop/src/components/common/RenderForm/IpSelector/IpSelectorTable.vue
@@ -118,7 +118,7 @@
                     {
                         name: 'IP',
                         id: 'bk_host_innerip',
-                        width: 120,
+                        width: 180,
                         fixed: true,
                         sortable: true,
                         checked: true
@@ -128,7 +128,7 @@
                         id: 'bk_host_innerip_v6',
                         width: 120,
                         fixed: true,
-                        checked: true
+                        checked: false
                     },
                     {
                         name: this.$t('管控区域'),
@@ -183,7 +183,6 @@
             }
         },
         created () {
-            console.log(this.listInPage)
             if (this.staticIpTableConfig.length) {
                 this.tableColumnList.forEach(item => {
                     item.checked = this.staticIpTableConfig.includes(item.id)

diff --git a/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/Subflow.vue b/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/Subflow.vue
@@ -25,7 +25,6 @@
         </div>
         <div class="node-name" :title="node.name">
             <div class="name-text">{{ node.name }}</div>
-            <div class="subflow-mark"></div>
         </div>
         <div class="node-options-icon">
             <template v-if="node.optional">
@@ -133,23 +132,18 @@
     }
 </script>
 <style lang="scss" scoped>
-    .node-name {
-        position: relative;
-        .subflow-mark {
-            &::before {
-                content: '';
-                position: absolute;
-                bottom: -1px;
-                right: -1px;
-                background: linear-gradient(to left top,
-                    #a2a5ad, #9fa3aa 40%, #82848a 50%, #ffffff 60%, #ffffff) 100% 0 no-repeat;
-                width: 11px;
-                height: 11px;
-                border-top: 1px solid #e5e5e5;
-                border-left: 1px solid #e5e5e5;
-                border-bottom-right-radius: 4px;
-                box-shadow: -1px -1px 2px -2px rgba(0, 0, 0, .5);
-            }
+    .task-node {
+        &::before {
+            content: '';
+            position: absolute;
+            bottom: -6px;
+            right: -6px;
+            width: 100%;
+            height: 100%;
+            background: #b5c0d599;
+            border: 1px solid #B5C0D5;
+            border-radius: 4px;
+            z-index: -1;
         }
     }
     .updated-dot {

diff --git a/frontend/desktop/src/config/i18n/cn.js b/frontend/desktop/src/config/i18n/cn.js
@@ -732,7 +732,6 @@ const cn = {
     '输出参数': '输出参数',
     '输出表单': '输出表单',
     '参数名': '参数名',
-    '执行记录': '执行记录',
     '节点日志': '节点日志',
     '日志': '日志',
     '第': '第',
@@ -1464,7 +1463,7 @@ const cn = {
     '请求异常（外部系统错误或非法操作）': '请求异常（外部系统错误或非法操作）',
     '请求异常（内部系统发生未知错误）': '请求异常（内部系统发生未知错误）',
     '节点基础信息': '节点基础信息',
-    '节点执行记录': '节点执行记录',
+    '节点执行详情': '节点执行详情',
     '节点操作记录': '节点操作记录',
     '参数Key': '参数Key',
     '详情': '详情',

diff --git a/frontend/desktop/src/config/i18n/en.js b/frontend/desktop/src/config/i18n/en.js
@@ -177,7 +177,7 @@ const en = {
     // 节点详情
     '节点详情': 'Task Detail',
     '查看节点详情': 'Task Detail',
-    '执行记录': 'Running Detail',
+    '执行详情': 'Running Detail',
     '配置快照': 'Setting Snapshot',
     '操作历史': 'Operation Logs',
     '调用日志': 'Call Logs',
@@ -1015,7 +1015,6 @@ const en = {
     '输入值不满足校验规则': 'Input does not match validation',
     '请求失败，点击重新加载': 'Request failed, click to reload',
     '没有更多了': 'No more',
-    '执行详情': 'Execution Detail',
     '查看子流程': 'View Subflow',
     '跳过失败': 'Skip Failed',
     '开始执行任务失败': 'Execution task failed',
@@ -1502,7 +1501,7 @@ const en = {
     '请求异常（外部系统错误或非法操作）': 'Request Exception (external system error or illegal operation)',
     '请求异常（内部系统发生未知错误）': 'Request Exception (an unknown error occurred in the internal system)',
     '节点基础信息': 'Node basic information',
-    '节点执行记录': 'Node execution record',
+    '节点执行详情': 'Node execution Detail',
     '节点操作记录': 'Node operation record',
     '参数Key': 'Parameter Key',
     '详情': 'Detail',

diff --git a/frontend/desktop/src/pages/task/TaskCreate/EditTaskScheme.vue b/frontend/desktop/src/pages/task/TaskCreate/EditTaskScheme.vue
@@ -644,10 +644,11 @@
                         scheme.isDefault = false
                         await this.onSaveDefaultExecuteScheme()
                     }
-                    await this.deleteTaskScheme({
+                    const resp = await this.deleteTaskScheme({
                         isCommon: this.isCommonProcess,
                         id: scheme.id
                     })
+                    if (!resp.result) return
                     const index = this.schemeList.findIndex(item => item.id === scheme.id)
                     this.schemeList.splice(index, 1)
                     // 删除方案后，画布按编辑前选中的方案来勾选节点