Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Nov 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app_desc.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 5 additions & 0 deletions docs/RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# Changelog

## [Version: 2.7.2] - 2024-11-18
【新增】画布删除线条时增加弹窗提醒
【优化】API列表选择全部系统时,去掉新建和导入API入口

## [Version: 2.7.1] - 2024-11-06
【新增】pipeline管理工具集成
【优化】多行文本兼容 JSON、Markdown 格式
Expand Down
4 changes: 4 additions & 0 deletions docs/RELEASE_EN.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
83 changes: 42 additions & 41 deletions frontend/pc/src/views/processManagement/apiConfigure/apiTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Loading