diff --git a/data-room-ui/packages/BasicComponents/CustomHtml/index.vue b/data-room-ui/packages/BasicComponents/CustomHtml/index.vue
new file mode 100644
index 00000000..40e298b0
--- /dev/null
+++ b/data-room-ui/packages/BasicComponents/CustomHtml/index.vue
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
diff --git a/data-room-ui/packages/BasicComponents/CustomHtml/setting.vue b/data-room-ui/packages/BasicComponents/CustomHtml/setting.vue
new file mode 100644
index 00000000..36dc73a4
--- /dev/null
+++ b/data-room-ui/packages/BasicComponents/CustomHtml/setting.vue
@@ -0,0 +1,104 @@
+
+
+
+
+ 标题
+
+
+
+
+
+ 位置
+
+ 边框
+
+
+
+ 旋转
+
+
+
+ 基础
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data-room-ui/packages/BasicComponents/CustomHtml/settingConfig.js b/data-room-ui/packages/BasicComponents/CustomHtml/settingConfig.js
new file mode 100644
index 00000000..b7d5afd8
--- /dev/null
+++ b/data-room-ui/packages/BasicComponents/CustomHtml/settingConfig.js
@@ -0,0 +1,37 @@
+import { commonConfig } from '../../js/config'
+
+export const settingConfig = {
+ time: '',
+ theme: 'dark',
+ // 设置面板属性的显隐
+ displayOption: {
+ dataAllocation: {
+ // 是否存在数据配置
+ enable: false
+ }
+ }
+}
+const customConfig = {
+
+ type: 'customHtml',
+ root: {
+ version: '2023071001',
+ // 绕x轴旋转角度
+ rotateX: 0,
+ // 绕y轴旋转角度
+ rotateY: 0,
+ // 绕z轴旋转角度
+ rotateZ: 0,
+ // 透视距离
+ perspective: 0,
+ skewX: 0,
+ skewY: 0
+ },
+ customize: {
+ htmlStr: '
我是自定义html内容
' // html的内容
+ }
+
+}
+export const dataConfig = {
+ ...commonConfig(customConfig)
+}
diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/ComponentBinding/index.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/ComponentBinding/index.vue
index 6a502d50..8458e289 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/ComponentBinding/index.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/ComponentBinding/index.vue
@@ -116,7 +116,7 @@ export default {
})
}
})
- layouts = layouts?.filter(item => item.code !== code && !['Tabs', 'titles', 'currentTime', 'timeCountDown', 'iframeChart', 'linkChart', 'carousel', 'themeSwitcher', 'themeSelect'].includes(item.type))
+ layouts = layouts?.filter(item => item.code !== code && !['Tabs', 'titles', 'currentTime', 'timeCountDown', 'iframeChart', 'linkChart', 'carousel', 'themeSwitcher', 'themeSelect', 'customHtml'].includes(item.type))
layouts = [...layouts, ...tabComponents]?.map(item => ({
name: item.code,
comment: item.title
diff --git a/data-room-ui/packages/assets/images/bigScreenIcon/svg/29html.svg b/data-room-ui/packages/assets/images/bigScreenIcon/svg/29html.svg
new file mode 100644
index 00000000..b5fb9652
--- /dev/null
+++ b/data-room-ui/packages/assets/images/bigScreenIcon/svg/29html.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 ed4c4bf6..f910c8b3 100644
--- a/data-room-ui/packages/js/config/basicComponentsConfig.js
+++ b/data-room-ui/packages/js/config/basicComponentsConfig.js
@@ -20,6 +20,7 @@ const typeList = [
'picture',
'timeCountDown',
'currentTime',
+ 'customHtml',
'iframeChart',
'digitalFlop',
'tables',
diff --git a/data-room-ui/packages/js/utils/getComponentConfig.js b/data-room-ui/packages/js/utils/getComponentConfig.js
index e34be6ea..03dd7f70 100644
--- a/data-room-ui/packages/js/utils/getComponentConfig.js
+++ b/data-room-ui/packages/js/utils/getComponentConfig.js
@@ -175,6 +175,19 @@ export default function getComponentConfig (type) {
y: 0,
type
}
+ case 'customHtml':
+ return {
+ name: '自定义html',
+ title: '自定义html',
+ icon: Icon.getNameList()[29],
+ className:
+ 'com.gccloud.dataroom.core.module.chart.components.ScreenCustomHtmlChart',
+ w: 600,
+ h: 150,
+ x: 0,
+ y: 0,
+ type
+ }
case 'video':
return {
name: '播放器',