+
+
+
+
+
+
diff --git a/frontend/src/components/canvas/custom-component/PanelTextEditor.vue b/frontend/src/components/canvas/custom-component/PanelTextEditor.vue
deleted file mode 100644
index a58c6e0e61..0000000000
--- a/frontend/src/components/canvas/custom-component/PanelTextEditor.vue
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
diff --git a/frontend/src/components/canvas/custom-component/VTextBack.vue b/frontend/src/components/canvas/custom-component/VTextBack.vue
deleted file mode 100644
index 8106661306..0000000000
--- a/frontend/src/components/canvas/custom-component/VTextBack.vue
+++ /dev/null
@@ -1,150 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/frontend/src/components/canvas/custom-component/component-list.js b/frontend/src/components/canvas/custom-component/component-list.js
index 4d353d9f15..3364ed5f20 100644
--- a/frontend/src/components/canvas/custom-component/component-list.js
+++ b/frontend/src/components/canvas/custom-component/component-list.js
@@ -126,6 +126,14 @@ export const assistList = [
icon: 'iconfont icon-text',
defaultClass: 'text-filter'
},
+ {
+ id: '10002',
+ component: 'de-rich-text',
+ type: 'de-rich-text',
+ label: '富文本',
+ icon: 'iconfont icon-fuwenbenkuang',
+ defaultClass: 'text-filter'
+ },
{
id: '10004',
component: 'rect-shape',
@@ -249,26 +257,28 @@ const list = [
},
{
id: '10002',
- component: 'v-button',
- label: '按钮',
- propValue: '按钮',
- icon: 'button',
- type: 'v-button',
+ component: 'de-rich-text',
+ label: '富文本',
+ propValue: '双击输入文字',
+ icon: 'icon-fuwenbenkuang',
+ type: 'de-rich-text',
mobileStyle: BASE_MOBILE_STYLE,
+ hyperlinks: HYPERLINKS,
style: {
- width: 100,
- height: 34,
- borderWidth: '',
- borderColor: '',
- borderRadius: '',
- fontSize: 14,
+ width: 400,
+ height: 100,
+ fontSize: 22,
fontWeight: 400,
lineHeight: '',
letterSpacing: 0,
- textAlign: '',
- color: '',
- backgroundColor: ''
+ textAlign: 'center',
+ color: '#000000',
+ verticalAlign: 'middle'
},
+ x: 1,
+ y: 1,
+ sizex: 10,
+ sizey: 2,
miniSizex: 1,
miniSizey: 1
},
diff --git a/frontend/src/components/canvas/custom-component/index.js b/frontend/src/components/canvas/custom-component/index.js
index 6d9145a740..acb5fb3bb2 100644
--- a/frontend/src/components/canvas/custom-component/index.js
+++ b/frontend/src/components/canvas/custom-component/index.js
@@ -9,7 +9,8 @@ import UserView from '@/components/canvas/custom-component/UserView'
import DeVideo from '@/components/canvas/custom-component/DeVideo'
import DeFrame from '@/components/canvas/custom-component/DeFrame'
import DeStreamMedia from '@/components/canvas/custom-component/DeStreamMedia'
-
+import DeRichText from '@/components/canvas/custom-component/DeRichText'
+Vue.component('DeRichText', DeRichText)
Vue.component('DeStreamMedia', DeStreamMedia)
Vue.component('Picture', Picture)
Vue.component('VText', VText)
diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js
index 87409ebf58..f5a17a6d1f 100644
--- a/frontend/src/store/index.js
+++ b/frontend/src/store/index.js
@@ -159,6 +159,12 @@ const data = {
dragging: false,
resizing: false
}
+ // Is the current component in editing status
+ if (!state.curComponent) {
+ component['editing'] = false
+ } else if (component.id !== state.curComponent.id) {
+ component['editing'] = false
+ }
}
state.styleChangeTimes = 0
state.curComponent = component
diff --git a/frontend/src/styles/deicon/demo_index.html b/frontend/src/styles/deicon/demo_index.html
index 7b67011ac0..6c8ed8f898 100644
--- a/frontend/src/styles/deicon/demo_index.html
+++ b/frontend/src/styles/deicon/demo_index.html
@@ -54,6 +54,12 @@
+ -
+
+
富文本框
+ 
+
+
-
下架
@@ -588,9 +594,9 @@
@font-face {
font-family: 'iconfont';
- src: url('iconfont.woff2?t=1652670008819') format('woff2'),
- url('iconfont.woff?t=1652670008819') format('woff'),
- url('iconfont.ttf?t=1652670008819') format('truetype');
+ src: url('iconfont.woff2?t=1652937715816') format('woff2'),
+ url('iconfont.woff?t=1652937715816') format('woff'),
+ url('iconfont.ttf?t=1652937715816') format('truetype');
}
第二步：定义使用 iconfont 的样式
@@ -616,6 +622,15 @@
+ -
+
+
+ 富文本框
+
+ .icon-fuwenbenkuang
+
+
+
-
@@ -1417,6 +1432,14 @@
+ -
+
+
富文本框
+ #icon-fuwenbenkuang
+
+
-