From f5dc2bd96e5278a415a96a548e9e1ee965858a59 Mon Sep 17 00:00:00 2001 From: "liu.shiyi" Date: Thu, 12 Oct 2023 17:29:41 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=95=B0=E5=AD=97=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=88=9D=E6=AD=A5=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BasicComponents/Numbers/index.vue | 80 +++++++++ .../BasicComponents/Numbers/setting.vue | 170 ++++++++++++++++++ .../BasicComponents/Numbers/settingConfig.js | 64 +++++++ .../images/bigScreenIcon/svg/28number.svg | 1 + .../js/config/basicComponentsConfig.js | 1 + .../packages/js/utils/getComponentConfig.js | 13 ++ 6 files changed, 329 insertions(+) create mode 100644 data-room-ui/packages/BasicComponents/Numbers/index.vue create mode 100644 data-room-ui/packages/BasicComponents/Numbers/setting.vue create mode 100644 data-room-ui/packages/BasicComponents/Numbers/settingConfig.js create mode 100644 data-room-ui/packages/assets/images/bigScreenIcon/svg/28number.svg diff --git a/data-room-ui/packages/BasicComponents/Numbers/index.vue b/data-room-ui/packages/BasicComponents/Numbers/index.vue new file mode 100644 index 00000000..d55e9ad9 --- /dev/null +++ b/data-room-ui/packages/BasicComponents/Numbers/index.vue @@ -0,0 +1,80 @@ + + + + diff --git a/data-room-ui/packages/BasicComponents/Numbers/setting.vue b/data-room-ui/packages/BasicComponents/Numbers/setting.vue new file mode 100644 index 00000000..d442a514 --- /dev/null +++ b/data-room-ui/packages/BasicComponents/Numbers/setting.vue @@ -0,0 +1,170 @@ + + + + + diff --git a/data-room-ui/packages/BasicComponents/Numbers/settingConfig.js b/data-room-ui/packages/BasicComponents/Numbers/settingConfig.js new file mode 100644 index 00000000..8a151a48 --- /dev/null +++ b/data-room-ui/packages/BasicComponents/Numbers/settingConfig.js @@ -0,0 +1,64 @@ +/* + * @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 // 是否多选 + }, + text: { // 文本占位符 + label: '占位内容', // 维度/查询字段 + enable: true + }, + expression: { // 文本占位符 + label: '表达式', // 维度/查询字段 + enable: true + } + } +} +const customConfig = { + type: 'numbers', + root: { + version: '2023071001', + url: 'https://www.runoob.com/', + expression: 'return ', + expressionCodes: [], + // 绕x轴旋转角度 + rotateX: 0, + // 绕y轴旋转角度 + rotateY: 0, + // 绕z轴旋转角度 + rotateZ: 0, + // 透视距离 + perspective: 500 + }, + customize: { + title: '数字标签占位符', + fontSize: 20, + fontWeight: 700, + fontFamily: '', // 字体类型 + color: 'left,#ffffff,#ffffff' + } + +} +export const dataConfig = { + ...commonConfig(customConfig) +} diff --git a/data-room-ui/packages/assets/images/bigScreenIcon/svg/28number.svg b/data-room-ui/packages/assets/images/bigScreenIcon/svg/28number.svg new file mode 100644 index 00000000..9da8929d --- /dev/null +++ b/data-room-ui/packages/assets/images/bigScreenIcon/svg/28number.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data-room-ui/packages/js/config/basicComponentsConfig.js b/data-room-ui/packages/js/config/basicComponentsConfig.js index ef83d795..ed4c4bf6 100644 --- a/data-room-ui/packages/js/config/basicComponentsConfig.js +++ b/data-room-ui/packages/js/config/basicComponentsConfig.js @@ -13,6 +13,7 @@ import getComponentConfig from 'data-room-ui/js/utils/getComponentConfig' import { setModules, dataModules } from 'data-room-ui/js/utils/configImport' const typeList = [ 'texts', + 'numbers', 'linkChart', 'horizontalLine', // 横线 'verticalLine', // 竖线 diff --git a/data-room-ui/packages/js/utils/getComponentConfig.js b/data-room-ui/packages/js/utils/getComponentConfig.js index 3e70cc89..e34be6ea 100644 --- a/data-room-ui/packages/js/utils/getComponentConfig.js +++ b/data-room-ui/packages/js/utils/getComponentConfig.js @@ -15,6 +15,19 @@ export default function getComponentConfig (type) { y: 0, type } + case 'numbers': + return { + name: '数字', + title: '数字', + icon: Icon.getNameList()[28], + className: + 'com.gccloud.dataroom.core.module.chart.components.ScreenNumbersChart', + w: 200, + h: 60, + x: 0, + y: 0, + type + } case 'linkChart': return { name: '超链接',