diff --git a/core/frontend/src/components/deDrag/index.vue b/core/frontend/src/components/deDrag/index.vue
index f005d035a2..70df8c1330 100644
--- a/core/frontend/src/components/deDrag/index.vue
+++ b/core/frontend/src/components/deDrag/index.vue
@@ -878,12 +878,16 @@ export default {
     // 获取父元素大小
     getParentSize() {
       if (this.parent === true) {
-        const style = window.getComputedStyle(this.$el.parentNode, null)
-        const rect = this.$el.parentNode.getBoundingClientRect()
-        this.parentX = rect.x
-        this.parentY = rect.y
-        // 高度不设置上限100000 宽度增加左右 60px
-        return [Math.round(parseFloat(style.getPropertyValue('width'), 10)) + 6, 100000]
+        try {
+          const style = window.getComputedStyle(this.$el.parentNode, null)
+          const rect = this.$el.parentNode.getBoundingClientRect()
+          this.parentX = rect.x
+          this.parentY = rect.y
+          // 高度不设置上限100000 宽度增加左右 60px
+          return [Math.round(parseFloat(style.getPropertyValue('width'), 10)) + 6, 100000]
+        } catch (e) {
+          console.warn('custom:getParentSize')
+        }
       }
       if (typeof this.parent === 'string') {
         const parentNode = document.querySelector(this.parent)
diff --git a/core/frontend/src/views/panel/edit/index.vue b/core/frontend/src/views/panel/edit/index.vue
index 99447afee8..26e9d9fb14 100644
--- a/core/frontend/src/views/panel/edit/index.vue
+++ b/core/frontend/src/views/panel/edit/index.vue
@@ -1790,6 +1790,10 @@ export default {
   font-size: 14px;
 }
 
+.dialog-css ::v-deep .el-dialog__headerbtn {
+  z-index: 2;
+}
+
 .dialog-css ::v-deep .el-dialog__header {
   padding: 20px 20px 0;
 }