From f8a7dfbd330b741cb67b3f61ec342d1365cadd73 Mon Sep 17 00:00:00 2001 From: Foming Date: Mon, 19 May 2025 16:51:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=A0=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{texts => form}/widget-button.js | 28 +++++++------------ .../tools/configure/texts/widget-iframe.js | 18 +++++++++--- .../bigscreenDesigner/designer/tools/main.js | 2 +- .../widget/{texts => form}/widgetButton.vue | 4 +-- .../designer/widget/temp.vue | 2 +- .../designer/widget/widget.vue | 2 +- 6 files changed, 29 insertions(+), 27 deletions(-) rename report-ui/src/views/bigscreenDesigner/designer/tools/configure/{texts => form}/widget-button.js (95%) rename report-ui/src/views/bigscreenDesigner/designer/widget/{texts => form}/widgetButton.vue (98%) diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-button.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/form/widget-button.js similarity index 95% rename from report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-button.js rename to report-ui/src/views/bigscreenDesigner/designer/tools/configure/form/widget-button.js index ba4ef85e..3b69c17d 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-button.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/form/widget-button.js @@ -8,8 +8,8 @@ */ export const widgetButton = { code: 'widget-button', - type: 'text', - tabName: '文本栏', + type: 'form', + tabName: '表单', label: '按钮', icon: 'iconanniu', options: { @@ -31,14 +31,6 @@ export const widgetButton = { placeholder: '', value: '按钮', }, - { - type: 'vue-color', - label: '背景颜色', - name: 'backgroundColor', - required: false, - placeholder: '', - value: '#0000FF', - }, { type: 'el-input-number', label: '字体字号', @@ -55,6 +47,14 @@ export const widgetButton = { placeholder: '', value: '#FAD400', }, + { + type: 'vue-color', + label: '字体背景', + name: 'backgroundColor', + required: false, + placeholder: '', + value: 'rgba(115,170,229,.5)', + }, { type: 'el-input-number', label: '字体间距', @@ -63,14 +63,6 @@ export const widgetButton = { placeholder: '', value: '0', }, - { - type: 'vue-color', - label: '字体背景', - name: 'background', - required: false, - placeholder: '', - value: 'rgba(115,170,229,.5)', - }, { type: 'el-select', label: '文字粗细', diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-iframe.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-iframe.js index d0330ec8..6f5dda5b 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-iframe.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-iframe.js @@ -50,10 +50,20 @@ export const widgetIframe = { label: 'iframe地址管理', name: 'iframeUrls', required: false, - value: [{ - name: '默认地址', - url: 'https://ajreport.beliefteam.cn/index.html' - }], + value: [ + { + name: '百度地图', + url: 'https://map.baidu.com/' + }, + { + name: 'gitee', + url: 'https://gitee.com/' + }, + { + name: 'deepseek', + url: 'https://chat.deepseek.com/' + } + ], }, ], // 数据 diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/main.js b/report-ui/src/views/bigscreenDesigner/designer/tools/main.js index 7cc914e2..1e7cf8be 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/main.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/main.js @@ -12,7 +12,7 @@ import {widgetMarquee} from "./configure/texts/widget-marquee" import {widgetHref} from "./configure/texts/widget-href" import {widgetTime} from "./configure/texts/widget-time" import {widgetImage} from "./configure/texts/widget-image" -import {widgetButton} from "./configure/texts/widget-button" +import {widgetButton} from "./configure/form/widget-button" import {widgetSliders} from "./configure/texts/widget-slider" import {widgetVideo} from "./configure/texts/widget-video" import {widgetTable} from "./configure/texts/widget-table" diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetButton.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/form/widgetButton.vue similarity index 98% rename from report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetButton.vue rename to report-ui/src/views/bigscreenDesigner/designer/widget/form/widgetButton.vue index 78e096e1..d513df96 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetButton.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/form/widgetButton.vue @@ -61,7 +61,7 @@ export default { styleColor() { return { position: this.ispreview ? "relative" : "static", - color: this.transStyle.color || "#00FF00", + color: this.transStyle.color, text: this.transStyle.text || "按钮", width: this.transStyle.width + "px", height: this.transStyle.height + "px", @@ -73,7 +73,7 @@ export default { "font-weight": this.transStyle.fontWeight || "600", "font-size": this.transStyle.fontSize + "px" || "12px", "letter-spacing": this.transStyle.letterSpacing + "em", - "background-color": this.transStyle.backgroundColor || "#0000ff", + "background-color": this.transStyle.backgroundColor || "rgba(115,170,229,.5)", display: this.transStyle.hideLayer === undefined ? "block" diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/temp.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/temp.vue index 5a8fca12..1cea3168 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/temp.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/temp.vue @@ -12,7 +12,7 @@