dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2934 from dataease/pr@dev@fix_panel-canvas

Browse Source 
fix(仪表板): 修复富文本视图初始化延迟导致内容不显示的问题
This commit is contained in:
王嘉豪 2022-08-24 18:33:39 +08:00 committed by GitHub
commit 639aed022b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
frontend/src/components/canvas/custom-component/DeRichTextView.vue
View File

@ -131,9 +131,9 @@ export default {
viewInit(){ viewInit(){
bus.$on('fieldSelect-' + this.element.propValue.viewId, this.fieldSelect) bus.$on('fieldSelect-' + this.element.propValue.viewId, this.fieldSelect)
tinymce.init({}) tinymce.init({})
this.myValue = this.assignment(this.element.propValue.textValue)
bus.$on('initCurFields-' + this.element.id, this.initCurFieldsChange)
this.$nextTick(()=>{ this.$nextTick(()=>{
this.myValue = this.assignment(this.element.propValue.textValue)
bus.$on('initCurFields-' + this.element.id, this.initCurFieldsChange)
this.initReady=true this.initReady=true
}) })
}, },
@ -170,19 +170,21 @@ export default {
}, },
resetSelect(node){ resetSelect(node){
const edInner = tinymce.get(this.tinymceId); const edInner = tinymce.get(this.tinymceId);
const nodeArray = edInner.dom.select(".base-selected") if(edInner.dom){
if(nodeArray){ const nodeArray = edInner.dom.select(".base-selected")
nodeArray.forEach(nodeInner=>{ if(nodeArray){
nodeInner.removeAttribute('class') nodeArray.forEach(nodeInner=>{
}) nodeInner.removeAttribute('class')
} })
if(node){ }
const pNode = node.parentElement if(node){
if(pNode && pNode.id&& pNode.id.indexOf('changeText')>-1){ const pNode = node.parentElement
const innerId = '#'+pNode.id if(pNode && pNode.id&& pNode.id.indexOf('changeText')>-1){
const domTest = edInner.dom.select(innerId)[0] const innerId = '#'+pNode.id
domTest.setAttribute("class",'base-selected') const domTest = edInner.dom.select(innerId)[0]
edInner.selection.select(domTest) domTest.setAttribute("class",'base-selected')
edInner.selection.select(domTest)
}
} }
} }
}, },

1
frontend/src/views/panel/edit/index.vue
View File

@ -1399,7 +1399,6 @@ export default {
} }
.this_mobile_canvas_cell { .this_mobile_canvas_cell {
text-align: center;
height: 100%; height: 100%;
display: flex; display: flex;
align-items: center; align-items: center;