diff --git a/src/components/common/custom-module/model-icon/index.vue b/src/components/common/custom-module/model-icon/index.vue
new file mode 100644
index 00000000..3528a066
--- /dev/null
+++ b/src/components/common/custom-module/model-icon/index.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
diff --git a/src/components/common/custom-module/model-icon/model-icon-style.vue b/src/components/common/custom-module/model-icon/model-icon-style.vue
new file mode 100644
index 00000000..5765b6cc
--- /dev/null
+++ b/src/components/common/custom-module/model-icon/model-icon-style.vue
@@ -0,0 +1,148 @@
+
+
+
+
+ 文本设置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 容器设置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 边框设置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/common/custom-module/model-image/model-image-style.vue b/src/components/common/custom-module/model-image/model-image-style.vue
index e0a7c173..0fb6a79a 100644
--- a/src/components/common/custom-module/model-image/model-image-style.vue
+++ b/src/components/common/custom-module/model-image/model-image-style.vue
@@ -7,7 +7,7 @@
-
+
diff --git a/src/components/common/custom-module/model-lines/model-lines-style.vue b/src/components/common/custom-module/model-lines/model-lines-style.vue
index 1dc49af5..bfa17240 100644
--- a/src/components/common/custom-module/model-lines/model-lines-style.vue
+++ b/src/components/common/custom-module/model-lines/model-lines-style.vue
@@ -29,7 +29,7 @@
-
+
diff --git a/src/components/common/custom-module/model-text/model-text-style.vue b/src/components/common/custom-module/model-text/model-text-style.vue
index 276ec3d3..cb758d34 100644
--- a/src/components/common/custom-module/model-text/model-text-style.vue
+++ b/src/components/common/custom-module/model-text/model-text-style.vue
@@ -7,7 +7,7 @@
-
+
@@ -73,7 +73,7 @@
-
+
diff --git a/src/components/model-carousel/index.vue b/src/components/model-carousel/index.vue
index cfa01c7f..cc1bc1dc 100644
--- a/src/components/model-carousel/index.vue
+++ b/src/components/model-carousel/index.vue
@@ -34,7 +34,7 @@
- {{ item.video_title }}
+ {{ item.video_title }}
@@ -48,7 +48,7 @@
- {{ item.video_title }}
+ {{ item.video_title }}
@@ -309,5 +309,7 @@ const slideChange = (swiper: { realIndex: number }) => {
}
.video-class {
max-width: 100%;
+ margin-right: 10px;
+ margin-left: 10px;
}
diff --git a/src/components/model-custom/components/index-default.ts b/src/components/model-custom/components/index-default.ts
index 9c6535ea..0f90dacc 100644
--- a/src/components/model-custom/components/index-default.ts
+++ b/src/components/model-custom/components/index-default.ts
@@ -82,6 +82,44 @@ export const line_com_data = {
bottom_up: '1',
}
+// icon的默认值
+export const icon_com_data = {
+ com_width: 36,
+ com_height: 36,
+ staging_height: 36,
+ icon_class: '',
+ data_source_id: '',
+ data_source_list: {},
+ icon_link: {},
+ is_rich_icon: '0',
+ is_up_down: '1',
+ icon_color: '#000',
+ icon_weight: 'normal',
+ icon_size: 12,
+ icon_option: 'none',
+ icon_location: 'left',
+ icon_padding: {
+ padding: 0,
+ padding_top: 0,
+ padding_bottom: 0,
+ padding_left: 0,
+ padding_right: 0,
+ },
+ icon_rotate: 0,
+ border_show: '0',
+ border_color: '#FF5D5D',
+ border_style: 'solid',
+ bg_radius: {
+ radius: 0,
+ radius_top_left: 0,
+ radius_top_right: 0,
+ radius_bottom_left: 0,
+ radius_bottom_right: 0,
+ },
+ border_size: 1,
+ com_bg: '',
+ bottom_up: '1',
+}
// 判断两个矩形是否有交集或者被包裹
export const isRectangleIntersecting = (rect1: react1, rect2: react1) => {
// 矩形的格式为 { x, y, width, height }
diff --git a/src/components/model-custom/components/index.scss b/src/components/model-custom/components/index.scss
index 4b2e090e..f041a7d6 100644
--- a/src/components/model-custom/components/index.scss
+++ b/src/components/model-custom/components/index.scss
@@ -66,7 +66,20 @@
.vdr-handle.vdr-handle-bm,
.vdr-handle.vdr-handle-br {
display: block !important;
- z-index: 2;
+ z-index: 1;
+ }
+ }
+ :deep(.plug-in-show-tabs.vdr-handle-z-index.vdr-container) {
+ .vdr-handle.vdr-handle-tl,
+ .vdr-handle.vdr-handle-tr,
+ .vdr-handle.vdr-handle-tm,
+ .vdr-handle.vdr-handle-ml,
+ .vdr-handle.vdr-handle-mr,
+ .vdr-handle.vdr-handle-bl,
+ .vdr-handle.vdr-handle-bm,
+ .vdr-handle.vdr-handle-br {
+ display: block !important;
+ z-index: 0;
}
}
.plug-in-border {
diff --git a/src/components/model-custom/components/index.vue b/src/components/model-custom/components/index.vue
index ddb05b21..83dbb2a4 100644
--- a/src/components/model-custom/components/index.vue
+++ b/src/components/model-custom/components/index.vue
@@ -41,7 +41,7 @@
-
+
@@ -56,6 +56,9 @@
+
+
+
@@ -82,7 +85,7 @@