Merge remote-tracking branch 'upstream/master' into develop

# Conflicts:
#	packages/gui/src/view/pages/proxy.vue
release-2.0.0.2
王良 2025-02-26 11:43:34 +08:00
commit 90a4319db6
1 changed files with 9 additions and 2 deletions

View File

@ -166,8 +166,8 @@ export default {
<a-button type="primary" icon="plus" @click="addExcludeIp()" />
</a-col>
</a-row>
<a-row v-for="(item, index) of excludeIpList" :key="index" :gutter="10">
<a-col :span="17" class="fine-tuning">
<a-row v-for="(item, index) of excludeIpList" :key="index" :gutter="10" class="fine-tuning">
<a-col :span="17">
<MockInput v-model="item.key" />
</a-col>
<a-col :span="5">
@ -218,3 +218,10 @@ export default {
</a-drawer>
</ds-container>
</template>
<style lang="scss">
/*样式微调*/
.fine-tuning .ant-btn-danger {
margin-top: 3px;
}
</style>