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.

Sign up for GitHub

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

fix: 修复点击删除插件时会触发面板折叠的问题 #958

Merged
merged 3 commits into from
Sep 24, 2024
+19 −12
Merged

fix: 修复点击删除插件时会触发面板折叠的问题 #958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4209d15
fix: 修复点击删除插件时会触发面板折叠的问题
Carlmac Sep 23, 2024
b2c3d42
fix: 修复版本diff中展示资源全部插件配置的问题
Carlmac Sep 24, 2024
6c5cc6b
fix: 修复编辑插件时查看示例后宽度不变化的问题
Carlmac Sep 24, 2024
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
10 changes: 6 additions & 4 deletions src/dashboard-front/src/components/resource-detail/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,16 +662,18 @@
</bk-row>
</bk-container>

<!-- <template v-if="localData.proxy?.banckend_id"> -->
<div :class="{ 'container-diff': checkPluginsDiff() }" v-if="localData.plugins?.length">
<template v-for="plugin in localData.plugins" :key="plugin.id">
<!-- 插件 -->
<div
v-if="props.diffData?.plugins && Object.keys(props.diffData.plugins).length"
:class="{ 'container-diff': checkPluginsDiff() }"
>
<template v-for="plugin in props.diffData.plugins" :key="plugin.id">
<p class="title mt15" :class="{ 'ag-diff': checkPluginsDiff() }">
{{ $t('插件:{name}', { name: plugin.name }) }}
</p>
<ConfigDisplayTable :plugin="plugin" first-col-width="auto" />
</template>
</div>
<!-- </template> -->
</div>
</template>

Expand Down
21 changes: 13 additions & 8 deletions src/dashboard-front/src/views/components/plugin-manage/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
v-if="slotProps.name === curHoverHead">
</span>
<span
class="icon apigateway-icon icon-ag-delet " @click="handleDeletePlugin(slotProps)"
class="icon apigateway-icon icon-ag-delet " @click.stop="handleDeletePlugin(slotProps)"
v-if="slotProps.name === curHoverHead">
</span>
</span>
Expand Down Expand Up @@ -173,8 +173,7 @@
@choose-plugin="handleChoosePlugin"
@on-change="handleOperate"
@show-example="handlePluginExampleToggle"
>
</pluginInfo>
/>
</div>
</div>
</template>
Expand All @@ -194,14 +193,20 @@
<bk-sideslider
v-model:isShow="isEditVisible"
:title="t('修改插件')"
quick-close ext-cls="plugin-add-slider"
width="960">
quick-close
ext-cls="plugin-add-slider"
:width="pluginSliderWidth"
>
<template #default>
<div class="plugin-config pl40 pr40 pt20 pb20">
<pluginInfo
:cur-plugin="curChoosePlugin" :scope-info="curScopeInfo" :edit-plugin="curEditPlugin"
:type="curType" @on-change="handleOperate">
</pluginInfo>
:cur-plugin="curChoosePlugin"
:scope-info="curScopeInfo"
:edit-plugin="curEditPlugin"
:type="curType"
@on-change="handleOperate"
@show-example="handlePluginExampleToggle"
/>
</div>
</template>
</bk-sideslider>
Expand Down
Loading