From 2ca94de8ede18ac07ccfd8dec7b6f6a707adde9b Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 01 Sep 2025 11:20:24 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v5.0/5.0.5' into patch_management
---
src/views/device/components/DeviceSettingPopover.vue | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/src/views/device/components/DeviceSettingPopover.vue b/src/views/device/components/DeviceSettingPopover.vue
index 224a689..fb90a89 100644
--- a/src/views/device/components/DeviceSettingPopover.vue
+++ b/src/views/device/components/DeviceSettingPopover.vue
@@ -1,41 +1,38 @@
<template>
- <a-popover
+ <el-popover
:visible="state.sVisible"
trigger="click"
- v-bind="$attrs"
:overlay-class-name="overlayClassName"
placement="bottom"
- @visibleChange=""
- v-on="$attrs"
+ width="200"
>
- <template #content>
+ <template #default>
<div class="title-content"></div>
<slot name="formContent" />
<div class="uranus-popconfirm-btns">
- <a-button size="sm" @click="onCancel">
+ <el-button @click="onCancel">
{{ cancelText || '取消' }}
- </a-button>
- <a-button
- size="sm"
+ </el-button>
+ <el-button
:loading="loading"
type="primary"
class="confirm-btn"
@click="onConfirm"
>
{{ okText || '确定' }}
- </a-button>
+ </el-button>
</div>
</template>
- <template v-if="$slots.default">
+ <template #reference>
<slot></slot>
</template>
- </a-popover>
+ </el-popover>
</template>
<script setup>
import { defineProps, defineEmits, reactive, watch, computed } from 'vue';
-const props = defineProps();
+const props = defineProps(['visible', 'loading', 'disabled', 'title', 'cancelText', 'okText', 'width']);
const emit = defineEmits(['cancel', 'confirm']);
--
Gitblit v1.9.3