diff --git a/report-ui/src/views/bigscreenDesigner/designer/components/dynamicForm.vue b/report-ui/src/views/bigscreenDesigner/designer/components/dynamicForm.vue index 65375f49..0d4c9b24 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/components/dynamicForm.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/components/dynamicForm.vue @@ -192,6 +192,11 @@ :chart-type="item.chartType" @change="changed($event, item.name)" /> +
@@ -347,6 +352,7 @@ import dynamicAddRadar from "./dynamicAddRadar"; import MonacoEditor from "@/components/MonacoEditor/index"; import componentLinkage from './componentLinkage'; import imageSelect from './imageSelect'; +import multiIframeManager from './multiIframeManager.vue'; export default { name: "DynamicForm", components: { @@ -360,7 +366,8 @@ export default { customUpload, dynamicAddRadar, MonacoEditor, - componentLinkage + componentLinkage, + multiIframeManager }, model: { prop: "value", diff --git a/report-ui/src/views/bigscreenDesigner/designer/components/multiIframeManager.vue b/report-ui/src/views/bigscreenDesigner/designer/components/multiIframeManager.vue new file mode 100644 index 00000000..e92e70c1 --- /dev/null +++ b/report-ui/src/views/bigscreenDesigner/designer/components/multiIframeManager.vue @@ -0,0 +1,189 @@ + + + + + \ No newline at end of file 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 ab50309f..d0330ec8 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 @@ -24,12 +24,36 @@ export const widgetIframe = { value: 'iframe', }, { - type: 'el-input-text', - label: '地址', - name: 'iframeAdress', + type: 'el-select', + label: '切换动画', + name: 'transitionEffect', required: false, - placeholder: '', - value: 'https://ajreport.beliefteam.cn/index.html', + placeholder: '请选择切换动画效果', + selectOptions: [ + {name: '无动画', code: 'none'}, + {name: '淡入淡出', code: 'fade'}, + {name: '滑动', code: 'slide'}, + {name: '缩放', code: 'zoom'} + ], + value: 'none', + }, + { + type: 'el-input-number', + label: '切换间隔(秒)', + name: 'autoSwitchInterval', + required: false, + placeholder: '0表示不自动切换', + value: 0, + }, + { + type: 'multiIframeManager', + label: 'iframe地址管理', + name: 'iframeUrls', + required: false, + value: [{ + name: '默认地址', + url: 'https://ajreport.beliefteam.cn/index.html' + }], }, ], // 数据 diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetIframe.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetIframe.vue index de96836e..bafd72fb 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetIframe.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetIframe.vue @@ -1,10 +1,29 @@