From 226077f8db4e826b1c13db01995bd42fe116dc94 Mon Sep 17 00:00:00 2001
From: luofann <fannluowork@gmail.com>
Date: Mon, 18 Nov 2024 15:19:05 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E5=88=A0=E9=99=A4=E8=BF=9E?=
 =?UTF-8?q?=E7=BA=BF=E6=97=B6=E5=A2=9E=E5=8A=A0=E4=BA=8C=E6=AC=A1=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E5=BC=B9=E7=AA=97=20--story=3D120088112=20#=20Reviewe?=
 =?UTF-8?q?d,=20transaction=20id:=2024064?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apiConfigure/apiTable.vue                 | 83 ++++++++++---------
 .../editService/lineConfigue/index.vue        |  9 +-
 2 files changed, 50 insertions(+), 42 deletions(-)

diff --git a/frontend/pc/src/views/processManagement/apiConfigure/apiTable.vue b/frontend/pc/src/views/processManagement/apiConfigure/apiTable.vue
index af5f34151..8d0b4d708 100644
--- a/frontend/pc/src/views/processManagement/apiConfigure/apiTable.vue
+++ b/frontend/pc/src/views/processManagement/apiConfigure/apiTable.vue
@@ -25,47 +25,48 @@
     <div class="bk-api-button mb20">
       <p class="bk-api-title">{{ $t(`m.systemConfig["API列表"]`) }}</p>
       <div class="bk-api-button">
-        <bk-dropdown-menu class="mr10 access-btn" @show="dropdownShow" @hide="dropdownHide" ref="apiDropdown" :disabled="disableImport">
-          <div
-            slot="dropdown-trigger"
-            class="dropdown-trigger-btn"
-            style="padding-left: 12px;">
-            <span style="font-size: 14px;">{{ $t(`m.systemConfig['API接入']`)}}</span>
-            <i :class="['bk-icon icon-angle-down',{ 'icon-flip': isDropdownShow }]"></i>
-          </div>
-          <ul class="bk-dropdown-list" slot="dropdown-content">
-            <li>
-              <a href="javascript:;"
-                v-cursor="{ active: !hasPermission(targetPerms, curPerms) }"
-                :class="{ 'text-permission-disable': !hasPermission(targetPerms, curPerms) }"
-                :title="$t(`m.systemConfig['接入API']`)"
-                data-test-id="api_a_apiTableAccessApi"
-                @click="openShade('JOIN')">
-                {{ $t(`m.systemConfig['接入API']`) }}
-              </a>
-            </li>
-            <li>
-              <a href="javascript:;"
-                data-test-id="api_a_apiTableCreateApi"
-                v-cursor="{ active: !hasPermission(targetPerms, curPerms) }"
-                :class="{ 'text-permission-disable': !hasPermission(targetPerms, curPerms) }"
-                :title="$t(`m.systemConfig['新增API']`)"
-                @click="openShade('ADD')">
-                {{$t(`m.systemConfig['新增API']`)}}
-              </a>
-            </li>
-          </ul>
-        </bk-dropdown-menu>
-        <bk-button
-          data-test-id="api_button_apiTableuploadApi"
-          :theme="'default'"
-          :disabled="disableImport"
-          v-cursor="{ active: !hasPermission(targetPerms, curPerms) }"
-          :class="['mr10 bk-btn-file', { 'btn-permission-disable': !hasPermission(targetPerms, curPerms) }]"
-          :title="$t(`m.systemConfig['点击上传']`)">
-          <input :disabled="disableImport" :type="!hasPermission(targetPerms, curPerms) ? 'button' : 'file'" :value="fileVal" class="bk-input-file" @change="handleFile" @click="hasImportPermission">
-          {{$t(`m.systemConfig['导入']`)}}
-        </bk-button>
+        <template v-if="!disableImport">
+          <bk-dropdown-menu class="mr10 access-btn" @show="dropdownShow" @hide="dropdownHide" ref="apiDropdown">
+            <div
+              slot="dropdown-trigger"
+              class="dropdown-trigger-btn"
+              style="padding-left: 12px;">
+              <span style="font-size: 14px;">{{ $t(`m.systemConfig['API接入']`)}}</span>
+              <i :class="['bk-icon icon-angle-down',{ 'icon-flip': isDropdownShow }]"></i>
+            </div>
+            <ul class="bk-dropdown-list" slot="dropdown-content">
+              <li>
+                <a href="javascript:;"
+                  v-cursor="{ active: !hasPermission(targetPerms, curPerms) }"
+                  :class="{ 'text-permission-disable': !hasPermission(targetPerms, curPerms) }"
+                  :title="$t(`m.systemConfig['接入API']`)"
+                  data-test-id="api_a_apiTableAccessApi"
+                  @click="openShade('JOIN')">
+                  {{ $t(`m.systemConfig['接入API']`) }}
+                </a>
+              </li>
+              <li>
+                <a href="javascript:;"
+                  data-test-id="api_a_apiTableCreateApi"
+                  v-cursor="{ active: !hasPermission(targetPerms, curPerms) }"
+                  :class="{ 'text-permission-disable': !hasPermission(targetPerms, curPerms) }"
+                  :title="$t(`m.systemConfig['新增API']`)"
+                  @click="openShade('ADD')">
+                  {{$t(`m.systemConfig['新增API']`)}}
+                </a>
+              </li>
+            </ul>
+          </bk-dropdown-menu>
+          <bk-button
+            data-test-id="api_button_apiTableuploadApi"
+            :theme="'default'"
+            v-cursor="{ active: !hasPermission(targetPerms, curPerms) }"
+            :class="['mr10 bk-btn-file', { 'btn-permission-disable': !hasPermission(targetPerms, curPerms) }]"
+            :title="$t(`m.systemConfig['点击上传']`)">
+            <input :type="!hasPermission(targetPerms, curPerms) ? 'button' : 'file'" :value="fileVal" class="bk-input-file" @change="handleFile" @click="hasImportPermission">
+            {{$t(`m.systemConfig['导入']`)}}
+          </bk-button>
+        </template>
         <bk-button :theme="'default'"
           v-cursor="{ active: !hasPermission(targetPerms, curPerms) }"
           data-test-id="api_button_apiTableBatchDeleteApi"
diff --git a/frontend/pc/src/views/service/editService/lineConfigue/index.vue b/frontend/pc/src/views/service/editService/lineConfigue/index.vue
index 86ebb6fc6..622fac475 100644
--- a/frontend/pc/src/views/service/editService/lineConfigue/index.vue
+++ b/frontend/pc/src/views/service/editService/lineConfigue/index.vue
@@ -663,7 +663,14 @@
         this.$emit('closeLine');
       },
       deleteLine() {
-        this.$emit('deleteLine');
+        const _this = this;
+        this.$bkInfo({
+          type: 'warning',
+          title: this.$t('m[\'此操作不可撤销，确定要删除吗？\']'),
+          confirmFn() {
+            _this.$emit('deleteLine');
+          },
+        });
       },
       // 存为模板
       submitTemplate() {

From a3e5366ba3877f54b7efc3bcd4fd2f6ab01958b7 Mon Sep 17 00:00:00 2001
From: luofann <fannluowork@gmail.com>
Date: Mon, 18 Nov 2024 15:44:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=89=88=E6=9C=AC=E5=8F=8A=E6=97=A5=E5=BF=97=20--bug?=
 =?UTF-8?q?=3D131961417?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app_desc.yaml      | 2 +-
 docs/RELEASE.md    | 5 +++++
 docs/RELEASE_EN.md | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app_desc.yaml b/app_desc.yaml
index 2c1708553..e0f60b159 100644
--- a/app_desc.yaml
+++ b/app_desc.yaml
@@ -1,5 +1,5 @@
 spec_version: 2
-app_version: "2.7.1"
+app_version: "2.7.2"
 app:
     region: default
     bk_app_code: bk_itsm
diff --git a/docs/RELEASE.md b/docs/RELEASE.md
index be9be8b0a..7a481a201 100644
--- a/docs/RELEASE.md
+++ b/docs/RELEASE.md
@@ -1,4 +1,9 @@
 # Changelog
+
+## [Version: 2.7.2] - 2024-11-18
+【新增】画布删除线条时增加弹窗提醒  
+【优化】API列表选择全部系统时，去掉新建和导入API入口  
+
 ## [Version: 2.7.1] - 2024-11-06
 【新增】pipeline管理工具集成  
 【优化】多行文本兼容 JSON、Markdown 格式  
diff --git a/docs/RELEASE_EN.md b/docs/RELEASE_EN.md
index c3e7d4494..37be6ac20 100644
--- a/docs/RELEASE_EN.md
+++ b/docs/RELEASE_EN.md
@@ -1,4 +1,8 @@
 # Changelog
+## [Version: 2.7.2] - 2024-11-18
+【Feature】Add a popup confirmation when deleting lines on the canvas.  
+【Improved】When selecting ‘All Systems’ in the API list, remove the options for creating new and importing APIs.  
+
 ## [Version: 2.7.1] - 2024-11-06
 【Feature】Integrated pipeline management tool.  
 【Improved】Ensure TEXT compatibility with JSON and Markdown formats.