fix(仪表板): 修复仪表板联动后需要清除联动条件才能进行下次联动的问题

frontend/public/tinymce/skins/ui/oxide-dark/skin.css

@@ -1815,7 +1815,7 @@ body.tox-dialog__disable-scroll {
 }
 
 .tox .tox-editor-header {
-  z-index: 1;
+  z-index: 1000;
 }
 
 .tox:not(.tox-tinymce-inline) .tox-editor-header {

frontend/public/tinymce/skins/ui/oxide/skin.css

@@ -1815,7 +1815,7 @@ body.tox-dialog__disable-scroll {
 }
 
 .tox .tox-editor-header {
-  z-index: 1;
+  z-index: 1000;
 }
 
 .tox:not(.tox-tinymce-inline) .tox-editor-header {

frontend/src/components/canvas/customComponent/DeRichTextView.vue

@@ -77,6 +77,8 @@ export default {
   },
   data() {
     return {
+      drawLeft: 'none',
+      drawRight: 'auto',
       initReady: false,
       editReady: false,
       editShow: true,
@@ -148,11 +150,21 @@ export default {
   },
   mounted() {
     this.viewInit()
+    bus.$on('change_panel_right_draw', this.changeRightDrawOpen)
   },
   beforeDestroy() {
     bus.$off('fieldSelect-' + this.element.propValue.viewId)
   },
   methods: {
+    changeRightDrawOpen(param){
+      if(param){
+        this.drawLeft = 'auto!important'
+        this.drawRight = '380px'
+      }else{
+        this.drawLeft = 'none'
+        this.drawRight = 'auto'
+      }
+    },
     viewInit() {
       bus.$on('fieldSelect-' + this.element.propValue.viewId, this.fieldSelect)
       tinymce.init({})
@@ -283,3 +295,11 @@ export default {
 }
 </style>
 
+<style lang="scss">
+.tox-tinymce-inline{
+  left: var(--drawLeft);
+  right: var(--drawRight);
+}
+</style>
+
+

frontend/src/utils/conditionUtil.js

@@ -17,8 +17,8 @@ export const isChange = (conditions1, conditions2) => {
   let arr1 = JSON.parse(JSON.stringify(conditions1))
   let arr2 = JSON.parse(JSON.stringify(conditions2))
   const strCodeAt = (str) => str[0].charCodeAt()
-  arr1 = arr1.sort((s1, s2) => strCodeAt(s1.componentId) - strCodeAt(s2.componentId))
+  arr1 = arr1.sort((s1, s2) => strCodeAt(s1.componentId.trim() || s1.filedId) - strCodeAt(s2.componentId.trim() || s2.filedId))
-  arr2 = arr2.sort((s1, s2) => strCodeAt(s1.componentId) - strCodeAt(s2.componentId))
+  arr2 = arr2.sort((s1, s2) => strCodeAt(s1.componentId.trim() || s1.filedId) - strCodeAt(s2.componentId.trim() || s2.filedId))
   return JSON.stringify(arr1) !== JSON.stringify(arr2)
 }