From 6feb890e5da515d9edd367fe7b210066c19c1dbe Mon Sep 17 00:00:00 2001 From: "wu.jian2" Date: Fri, 18 Aug 2023 09:38:30 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E8=B7=91?= =?UTF-8?q?=E9=A9=AC=E7=81=AF=E7=BB=84=E4=BB=B6=EF=BC=8C=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E4=BB=8E=E5=B7=A6=E5=BE=80=E5=8F=B3=E5=92=8C=E4=BB=8E=E5=8F=B3?= =?UTF-8?q?=E5=BE=80=E5=B7=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BasicComponents/Marquee/index.vue | 84 +++++++++++++ .../BasicComponents/Marquee/setting.vue | 111 ++++++++++++++++++ .../BasicComponents/Marquee/settingConfig.js | 45 +++++++ .../js/config/basicComponentsConfig.js | 1 + .../packages/js/utils/getComponentConfig.js | 13 ++ 5 files changed, 254 insertions(+) create mode 100644 data-room-ui/packages/BasicComponents/Marquee/index.vue create mode 100644 data-room-ui/packages/BasicComponents/Marquee/setting.vue create mode 100644 data-room-ui/packages/BasicComponents/Marquee/settingConfig.js diff --git a/data-room-ui/packages/BasicComponents/Marquee/index.vue b/data-room-ui/packages/BasicComponents/Marquee/index.vue new file mode 100644 index 00000000..40814123 --- /dev/null +++ b/data-room-ui/packages/BasicComponents/Marquee/index.vue @@ -0,0 +1,84 @@ + + + + + diff --git a/data-room-ui/packages/BasicComponents/Marquee/setting.vue b/data-room-ui/packages/BasicComponents/Marquee/setting.vue new file mode 100644 index 00000000..b90acbdd --- /dev/null +++ b/data-room-ui/packages/BasicComponents/Marquee/setting.vue @@ -0,0 +1,111 @@ + + + + + diff --git a/data-room-ui/packages/BasicComponents/Marquee/settingConfig.js b/data-room-ui/packages/BasicComponents/Marquee/settingConfig.js new file mode 100644 index 00000000..e7502fd2 --- /dev/null +++ b/data-room-ui/packages/BasicComponents/Marquee/settingConfig.js @@ -0,0 +1,45 @@ +/* + * @Descripttion: + * @Author: liu.shiyi + * @Date: 2022-10-13 11:18:03 + * @LastEditTime: 2022-10-13 13:55:11 + */ +import { commonConfig, displayOption } from 'data-room-ui/js/config' + +export const settingConfig = { + theme: 'dark', + text: '文本标签占位符', // text内容 + // 设置面板属性的显隐 + displayOption: { + ...displayOption, + metricField: { + // 指标 + label: '指标', + enable: true, + multiple: false // 是否多选 + }, + dimensionField: { + // 维度 + label: '维度', // 维度/查询字段 + enable: false, + multiple: true // 是否多选 + } + } +} +const customConfig = { + type: 'marquee', + root: { + version: '2023071001', + url: 'https://www.runoob.com/' + }, + customize: { + title: '文本标签占位符', + fontSize: 20, + fontWeight: 700, + color: 'left,#ffffff,#ffffff' + } + +} +export const dataConfig = { + ...commonConfig(customConfig) +} diff --git a/data-room-ui/packages/js/config/basicComponentsConfig.js b/data-room-ui/packages/js/config/basicComponentsConfig.js index 4c9b5019..af2db7ef 100644 --- a/data-room-ui/packages/js/config/basicComponentsConfig.js +++ b/data-room-ui/packages/js/config/basicComponentsConfig.js @@ -12,6 +12,7 @@ import getComponentConfig from 'data-room-ui/js/utils/getComponentConfig' // 批量引入配置文件 import { setModules, dataModules } from 'data-room-ui/js/utils/configImport' const typeList = [ + 'marquee', 'texts', 'linkChart', 'horizontalLine', // 横线 diff --git a/data-room-ui/packages/js/utils/getComponentConfig.js b/data-room-ui/packages/js/utils/getComponentConfig.js index 5b8d1c6e..cb27fd92 100644 --- a/data-room-ui/packages/js/utils/getComponentConfig.js +++ b/data-room-ui/packages/js/utils/getComponentConfig.js @@ -4,6 +4,19 @@ export default function getComponentConfig (type) { // const _type = _.upperFirst(type) // const className = `com.gccloud.starter.lowcode.page.bigscreen.components.${_type}Chart` switch (type) { + case 'marquee': + return { + name: '跑马灯', + title: '跑马灯', + icon: iconNames[0], + className: + 'com.gccloud.dataroom.core.module.chart.components.ScreenTextChart', + w: 150, + h: 30, + x: 0, + y: 0, + type + } case 'texts': return { name: '文本', From 2a7783c5b05dfcdbc7f7400a485c442ab23aea11 Mon Sep 17 00:00:00 2001 From: "wu.jian2" Date: Sat, 19 Aug 2023 18:21:43 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E8=B7=91?= =?UTF-8?q?=E9=A9=AC=E7=81=AF=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BasicComponents/Marquee/index.vue | 196 +++++++++---- .../BasicComponents/Marquee/setting.vue | 268 +++++++++++++++++- .../BasicComponents/Marquee/settingConfig.js | 40 ++- .../BigScreenDesign/PageDesignTop.vue | 5 + .../assets/symbols/bigScreenIcon/iconfont.js | 2 +- .../symbols/bigScreenIcon/iconfont.json | 7 + .../packages/js/utils/getComponentConfig.js | 4 +- 7 files changed, 457 insertions(+), 65 deletions(-) diff --git a/data-room-ui/packages/BasicComponents/Marquee/index.vue b/data-room-ui/packages/BasicComponents/Marquee/index.vue index 40814123..91fa6bdd 100644 --- a/data-room-ui/packages/BasicComponents/Marquee/index.vue +++ b/data-room-ui/packages/BasicComponents/Marquee/index.vue @@ -3,82 +3,178 @@
- {{ content }} + + + + + + + + + + + + + + + + + {{ config.customize.title }} + + +
diff --git a/data-room-ui/packages/BasicComponents/Marquee/setting.vue b/data-room-ui/packages/BasicComponents/Marquee/setting.vue index b90acbdd..4d545beb 100644 --- a/data-room-ui/packages/BasicComponents/Marquee/setting.vue +++ b/data-room-ui/packages/BasicComponents/Marquee/setting.vue @@ -34,7 +34,7 @@ 基础
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 纯色 + + + 渐变色 + + + + + + + + + + + + + + + + + + + + + 透明 + + + 纯色 + + + 渐变色 + + + + + + + + + + + + + + + + +
diff --git a/data-room-ui/packages/BasicComponents/Marquee/settingConfig.js b/data-room-ui/packages/BasicComponents/Marquee/settingConfig.js index e7502fd2..268fcc62 100644 --- a/data-room-ui/packages/BasicComponents/Marquee/settingConfig.js +++ b/data-room-ui/packages/BasicComponents/Marquee/settingConfig.js @@ -8,7 +8,7 @@ import { commonConfig, displayOption } from 'data-room-ui/js/config' export const settingConfig = { theme: 'dark', - text: '文本标签占位符', // text内容 + text: '跑马灯占位符', // text内容 // 设置面板属性的显隐 displayOption: { ...displayOption, @@ -29,14 +29,42 @@ export const settingConfig = { const customConfig = { type: 'marquee', root: { - version: '2023071001', - url: 'https://www.runoob.com/' + version: '2023071001' }, customize: { - title: '文本标签占位符', - fontSize: 20, + title: '跑马灯占位符', + fontSize: 40, fontWeight: 700, - color: 'left,#ffffff,#ffffff' + icon: { + name: '', + position: 'left', + color: '#fff' + }, + // 文字颜色类型: 纯色、渐变 + textColorType: 'pure', + // 文字颜色 + textColor: '#fff', + // 文字渐变开始颜色 + textGradientColor0: '#fff', + // 文字渐变结束颜色 + textGradientColor1: '#fff', + // 文字渐变方向 + textGradientDirection: 'to right', + // 滚动方向 + direction: 'right', + // 滚动间隔 + dur: '8', + // 背景色类型:纯色、渐变、透明 + backgroundColorType: 'transparent', + // 背景色 + backgroundColor: '#fff', + // 背景渐变色开始颜色 + bgGradientColor0: '#fff', + // 背景渐变色结束颜色 + bgGradientColor1: '#fff', + // 背景色渐变方向 + bgGradientDirection: 'to right' + } } diff --git a/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue b/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue index e7c6977e..0c7c2e94 100644 --- a/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue +++ b/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue @@ -93,6 +93,7 @@