From c6dd3d589ffac8be7025bdb498ec29cedc841fc1 Mon Sep 17 00:00:00 2001 From: zq <136432190602163.com> Date: Thu, 17 Jul 2025 10:24:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E6=8C=89=E9=92=AE=E5=BC=B9=E5=87=BA=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/GuipDialog.vue | 1 - src/views/elementGroups.vue | 33 +++++++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/src/components/GuipDialog.vue b/src/components/GuipDialog.vue index 88578cd..68112e7 100644 --- a/src/components/GuipDialog.vue +++ b/src/components/GuipDialog.vue @@ -11,7 +11,6 @@ > - {{ cancelText }} diff --git a/src/views/elementGroups.vue b/src/views/elementGroups.vue index 285e805..e7ddb92 100644 --- a/src/views/elementGroups.vue +++ b/src/views/elementGroups.vue @@ -521,6 +521,8 @@ 打开弹框(标题巨中、按钮居中) + 打开弹框-放弃原按钮,自定义 + 展示加载动画 2s @@ -554,12 +556,27 @@

这是一个自定义内容的弹框。

- + +
+

这是一个自定义内容的弹框。

+
+
+

这是一个自定义内容的弹框。

+

这是一个自定义内容的弹框。

+

这是一个自定义内容的弹框。

+

这是一个自定义内容的弹框。

+ +
+ 取消 + ⚡️咖啡不加糖喔 +
@@ -672,6 +689,7 @@ export default { switchValue1: 1, switchValue2: '0', dialogVisible1: false, + dialogVisible2: false, dialogVisible: false,//是否展示弹框 showCancelButton: true, // 控制是否显示取消按钮 showCloseButton: true, // 控制是否显示关闭按钮 @@ -1110,6 +1128,9 @@ export default { openDialog1() { this.dialogVisible1 = true; }, + openDialog2() { + this.dialogVisible2 = true; + }, // 确认按钮事件 handleConfirm() { this.$message.success('点击了确认按钮'); @@ -1120,11 +1141,14 @@ export default { this.$message.warning('点击了取消按钮'); this.dialogVisible = false; this.dialogVisible1 = false; + this.dialogVisible2 = false; }, // 关闭弹框事件 handleClose() { this.$message.info('弹框已关闭'); this.dialogVisible = false; + this.dialogVisible1 = false; + this.dialogVisible2 = false; }, dialogVisibleChange(data) { console.log(data, 'data098908090'); @@ -1349,4 +1373,9 @@ export default { background: linear-gradient(290deg, #FF4143 4%, #FF768B 92%); } } +.btns{ + display: flex; + justify-content: flex-end; + align-items: center; +} \ No newline at end of file From 50d55e7086db86e4a305bc66c6da7c56c5250d59 Mon Sep 17 00:00:00 2001 From: zq <136432190602163.com> Date: Thu, 17 Jul 2025 11:27:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?select=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E7=B1=BB=E5=9E=8B=E3=80=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/GuipSelect.vue | 7 +++++++ src/views/elementGroups.vue | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/components/GuipSelect.vue b/src/components/GuipSelect.vue index d0e5667..e43a309 100644 --- a/src/components/GuipSelect.vue +++ b/src/components/GuipSelect.vue @@ -61,6 +61,13 @@ export default { processedOptions() { // 处理options为空的情况 let options = this.options || []; + // 如果是 [1,12,22] 格式 + if (Array.isArray(options) && options.every(item => typeof item !== 'object')) { + return options.map((item, index) => ({ + [this.valueKey]: index, + [this.labelKey]: item + })); + } // 如果是对象格式,转换为数组 if (options && !Array.isArray(options)) { diff --git a/src/views/elementGroups.vue b/src/views/elementGroups.vue index e7ddb92..c2be0a3 100644 --- a/src/views/elementGroups.vue +++ b/src/views/elementGroups.vue @@ -75,12 +75,17 @@ value-key="id" />
- +
+ + +
+