feat: 删除连线时增加二次确认弹窗 (#1448)

* feat: 删除连线时增加二次确认弹窗 --story=120088112 # Reviewed, transaction id: 24064 * refactor: 更新项目版本及日志 --bug=131961417
TencentBlueKing · Nov 18, 2024 · ef4e68a · ef4e68a
1 parent cb6ae54
commit ef4e68a
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 43 deletions.
diff --git 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
@@ -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
@@ -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.  

diff --git 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
@@ -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() {