From 02bcadae107276506805355a01b48684c39c636b Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 29 Nov 2021 19:18:12 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=BF=87=E6=BB=A4=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=A0=B7=E5=BC=8F=E8=BE=B9=E7=95=8C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/DeDrag/index.vue      |  4 +-
 .../components/Editor/ComponentWrapper.vue    |  2 +-
 .../canvas/components/Editor/index.vue        | 55 +++++------------
 .../canvas/custom-component/DeVideo.vue       |  2 +-
 .../src/components/dataease/DeOutWidget.vue   | 60 +++++++++----------
 frontend/src/views/chart/group/Group.vue      |  4 +-
 frontend/src/views/panel/edit/index.vue       | 11 ++--
 .../src/views/panel/filter/filterDialog.vue   |  1 +
 .../src/views/panel/list/PanelViewShow.vue    |  2 +-
 9 files changed, 56 insertions(+), 85 deletions(-)

diff --git a/frontend/src/components/DeDrag/index.vue b/frontend/src/components/DeDrag/index.vue
index 20dd0b5074..3991959526 100644
--- a/frontend/src/components/DeDrag/index.vue
+++ b/frontend/src/components/DeDrag/index.vue
@@ -30,7 +30,7 @@
       :style="mainSlotStyle"
     >
       <edit-bar v-if="editBarShow" style="transform: translateZ(10px)" :active-model="'edit'" :element="element" @showViewDetails="showViewDetails" @amRemoveItem="amRemoveItem" @amAddItem="amAddItem" @resizeView="resizeView" @linkJumpSet="linkJumpSet" />
-      <mobile-check-bar v-if="mobileCheckBarShow" :element="element"  @amRemoveItem="amRemoveItem" />
+      <mobile-check-bar v-if="mobileCheckBarShow" :element="element" @amRemoveItem="amRemoveItem" />
       <div v-if="resizing" style="transform: translateZ(11px);position: absolute; z-index: 3" :style="resizeShadowStyle" />
       <div
         v-for="(handlei, indexi) in actualHandles"
@@ -536,7 +536,7 @@ export default {
       return this.$store.state.curComponent
     },
     curGap() {
-      return this.canvasStyleData.panel.gap === 'yes' && this.element.auxiliaryMatrix ? this.componentGap : 0
+      return this.element.auxiliaryMatrix && this.element.type !== 'custom' ? this.componentGap : 0
     },
     ...mapState([
       'editor',
diff --git a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
index 80e62ee3bb..c2a434f94c 100644
--- a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
+++ b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
@@ -69,7 +69,7 @@ export default {
       return this.curComponent && this.config === this.curComponent
     },
     curGap() {
-      return this.canvasStyleData.panel.gap === 'yes' && this.config.auxiliaryMatrix ? this.componentGap : 0
+      return  this.config.auxiliaryMatrix ? this.componentGap : 0
     },
     ...mapState([
       'mobileLayoutStatus',
diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue
index 4dbfb37a78..e6a931b81d 100644
--- a/frontend/src/components/canvas/components/Editor/index.vue
+++ b/frontend/src/components/canvas/components/Editor/index.vue
@@ -58,7 +58,7 @@
     >
       <component
         :is="item.component"
-        v-if="item.type==='v-text'"
+        v-if="renderOk&&item.type==='v-text'"
         :id="'component' + item.id"
         ref="wrapperChild"
         class="component"
@@ -71,7 +71,7 @@
         @input="handleInput"
       />
       <de-out-widget
-        v-else-if="item.type==='custom'"
+        v-else-if="renderOk&&item.type==='custom'"
         :id="'component' + item.id"
         ref="wrapperChild"
         class="component"
@@ -83,7 +83,7 @@
       />
       <component
         :is="item.component"
-        v-else-if="item.type==='other'"
+        v-else-if="renderOk&&item.type==='other'"
         :id="'component' + item.id"
         ref="wrapperChild"
         class="component"
@@ -95,7 +95,7 @@
       />
       <component
         :is="item.component"
-        v-else
+        v-else-if="renderOk"
         :id="'component' + item.id"
         ref="wrapperChild"
         class="component"
@@ -327,6 +327,7 @@ function init() {
   const vm = this
   recalcCellWidth.call(this)
   resetPositionBox.call(this)
+  // initPosition(this)
   let i = 0
   const timeid = setInterval(function() {
     if (i >= vm.yourList.length) {
@@ -470,6 +471,15 @@ function removeItem(index) {
   this.yourList.splice(index, 1, {})
 }
 
+function initPosition(_this) {
+  _this.yourList.forEach(item => {
+    checkItemPosition.call(_this, item, {
+      x: item.x,
+      y: item.y
+    })
+  })
+}
+
 function addItem(item, index) {
   // console.log('addItem')
   if (index < 0) {
@@ -807,7 +817,7 @@ export default {
   },
   data() {
     return {
-      psDebug: false, // 定位调试模式
+      psDebug: true, // 定位调试模式
       editorX: 0,
       editorY: 0,
       start: { // 选中区域的起点
@@ -995,41 +1005,6 @@ export default {
         e.preventDefault()
       }
       this.hideArea()
-      // 获取编辑器的位移信息，每次点击时都需要获取一次。主要是为了方便开发时调试用。
-      const rectInfo = this.editor.getBoundingClientRect()
-      this.editorX = rectInfo.x
-      this.editorY = rectInfo.y
-
-      const startX = e.clientX
-      const startY = e.clientY
-      this.start.x = startX - this.editorX
-      this.start.y = startY - this.editorY
-      // 展示选中区域
-      this.isShowArea = true
-
-      const move = (moveEvent) => {
-        this.width = Math.abs(moveEvent.clientX - startX)
-        this.height = Math.abs(moveEvent.clientY - startY)
-        if (moveEvent.clientX < startX) {
-          this.start.x = moveEvent.clientX - this.editorX
-        }
-
-        if (moveEvent.clientY < startY) {
-          this.start.y = moveEvent.clientY - this.editorY
-        }
-      }
-      const up = (e) => {
-        document.removeEventListener('mousemove', move)
-        document.removeEventListener('mouseup', up)
-        if (e.clientX === startX && e.clientY === startY) {
-          this.hideArea()
-          return
-        }
-        this.createGroup()
-      }
-      document.addEventListener('mousemove', move)
-      document.addEventListener('mouseup', up)
-
       // 挤占式画布设计
       this.containerMouseDown(e)
     },
diff --git a/frontend/src/components/canvas/custom-component/DeVideo.vue b/frontend/src/components/canvas/custom-component/DeVideo.vue
index 8d6315cf72..19dd595701 100644
--- a/frontend/src/components/canvas/custom-component/DeVideo.vue
+++ b/frontend/src/components/canvas/custom-component/DeVideo.vue
@@ -66,7 +66,7 @@ export default {
       return (this.element.optStatus.dragging || this.element.optStatus.resizing)
     },
     curGap() {
-      return this.canvasStyleData.panel.gap === 'yes' && this.element.auxiliaryMatrix ? this.componentGap : 0
+      return this.element.auxiliaryMatrix ? this.componentGap : 0
     },
     player() {
       return this.$refs.videoPlayer.player
diff --git a/frontend/src/components/dataease/DeOutWidget.vue b/frontend/src/components/dataease/DeOutWidget.vue
index b3057257d0..47316d13da 100644
--- a/frontend/src/components/dataease/DeOutWidget.vue
+++ b/frontend/src/components/dataease/DeOutWidget.vue
@@ -1,31 +1,29 @@
 <template>
-  <div class="outside-container">
-    <div ref="myContainer" class="my-container">
-      <div ref="conditionMain" class="condition-main" :class="mainClass">
-        <div v-if="element.options.attrs.title" ref="deTitleContainer" class="condition-title">
-          <div class="condition-title-absolute">
-            <div class="first-title">
-              <div class="span-container">
-                <span ref="deTitle">{{ element.options.attrs.title }}</span>
-              </div>
+  <div ref="myContainer" class="my-container">
+    <div ref="conditionMain" class="condition-main" :class="mainClass">
+      <div v-if="element.options.attrs.title" ref="deTitleContainer" class="condition-title">
+        <div class="condition-title-absolute">
+          <div class="first-title">
+            <div class="span-container">
+              <span ref="deTitle">{{ element.options.attrs.title }}</span>
             </div>
           </div>
         </div>
-        <div ref="deContentContainer" class="condition-content" :class="element.options.attrs.title ? '' : 'condition-content-default'">
-          <div class="condition-content-container">
-            <div class="first-element">
-              <div :class="element.component === 'de-select-grid' ? 'first-element-grid-contaner': ''" class="first-element-contaner">
-                <component
-                  :is="element.component"
-                  v-if="element.type==='custom'"
-                  :id="'component' + element.id"
-                  class="component-custom"
-                  :out-style="element.style"
-                  :element="element"
-                  :in-draw="inDraw"
-                  :in-screen="inScreen"
-                />
-              </div>
+      </div>
+      <div ref="deContentContainer" class="condition-content" :class="element.options.attrs.title ? '' : 'condition-content-default'">
+        <div class="condition-content-container">
+          <div class="first-element">
+            <div :class="element.component === 'de-select-grid' ? 'first-element-grid-contaner': ''" class="first-element-contaner">
+              <component
+                :is="element.component"
+                v-if="element.type==='custom'"
+                :id="'component' + element.id"
+                class="component-custom"
+                :out-style="element.style"
+                :element="element"
+                :in-draw="inDraw"
+                :in-screen="inScreen"
+              />
             </div>
           </div>
         </div>
@@ -99,16 +97,12 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  .outside-container {
-    width: 100%;
-    height: 100%;
-  }
   .my-container {
     position: absolute;
     overflow: auto;
     inset: 0px;
   }
-  .condition-main {
+  .ccondition-main {
     position: absolute;
     overflow: auto;
     inset: 0px;
@@ -162,11 +156,11 @@ export default {
     height: 100%;
   }
   .first-element-contaner {
-      width: 100%;
+      width: calc(100% - 10px);
       background: initial;
       position:absolute;
-      bottom: 0px;
-      margin: 0 0px;
+      bottom: 5px;
+      margin: 0 4px;
       div {
           width: 100%;
       }
@@ -174,7 +168,7 @@ export default {
   .first-element-grid-contaner {
       background: #fff;
       border: 1px solid #d7dae2;
-      top: 0px;
+      top: 5px;
   }
   .condition-main-line {
       height: 40px !important;
diff --git a/frontend/src/views/chart/group/Group.vue b/frontend/src/views/chart/group/Group.vue
index 68a651f93f..1f837baf53 100644
--- a/frontend/src/views/chart/group/Group.vue
+++ b/frontend/src/views/chart/group/Group.vue
@@ -447,9 +447,9 @@ export default {
   mounted() {
     if (this.mountedInit) {
       this.treeNode(true)
-      this.refresh()
-      this.getChartGroupTree()
     }
+    this.refresh()
+    this.getChartGroupTree()
   },
   methods: {
     clickAdd(param) {
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 77108fb9a2..265cf18f9f 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -523,7 +523,7 @@ export default {
       const xuanfuanniu = evt.target.closest('.icon-xuanfuanniu')
       const shujujuzhen = evt.target.closest('.icon-shujujuzhen')
       const suffix = evt.target.closest('.el-input__suffix')
-      if (!parent && !self && !stick && !xuanfuanniu && !shujujuzhen&&!suffix) {
+      if (!parent && !self && !stick && !xuanfuanniu && !shujujuzhen && !suffix) {
         this.show = false
         window.removeEventListener('click', this.closeSidebar)
         this.showIndex = -1
@@ -649,21 +649,22 @@ export default {
       this.beforeDialogValue = []
       this.filterVisible = true
     },
-    cancelFilter() {
+    closeFilter() {
       this.beforeDialogValue = []
       this.filterVisible = false
       this.currentWidget = null
       this.clearCurrentInfo()
+    },
+    cancelFilter() {
+      this.closeFilter()
       bus.$emit('onRemoveLastItem')
     },
     sureFilter() {
       this.currentFilterCom.options.value = []
       const component = deepCopy(this.currentFilterCom)
-
-      //   this.$store.commit('addComponent', { component })
       this.$store.commit('setComponentWithId', component)
       this.$store.commit('recordSnapshot', 'sureFilter')
-      this.cancelFilter()
+      this.closeFilter()
     },
     reFreshComponent(component) {
       this.currentFilterCom = component
diff --git a/frontend/src/views/panel/filter/filterDialog.vue b/frontend/src/views/panel/filter/filterDialog.vue
index 27d429b3c1..55f48b9219 100644
--- a/frontend/src/views/panel/filter/filterDialog.vue
+++ b/frontend/src/views/panel/filter/filterDialog.vue
@@ -663,6 +663,7 @@ export default {
     showTitleChange(value) {
       if (!value) {
         this.componentInfo.options.attrs.title = ''
+        this.componentInfo.style.backgroundColor = ''
       }
       this.$emit('re-fresh-component', this.componentInfo)
     }
diff --git a/frontend/src/views/panel/list/PanelViewShow.vue b/frontend/src/views/panel/list/PanelViewShow.vue
index bb55c3e27f..4a662aea1d 100644
--- a/frontend/src/views/panel/list/PanelViewShow.vue
+++ b/frontend/src/views/panel/list/PanelViewShow.vue
@@ -304,7 +304,7 @@ export default {
       }
     },
     changePdfTemplate() {
-      this.pdfTemplateContent = this.pdfTemplateAll[this.pdfTemplateSelectedIndex].templateContent
+      this.pdfTemplateContent = this.pdfTemplateAll[this.pdfTemplateSelectedIndex] ? this.pdfTemplateAll[this.pdfTemplateSelectedIndex].templateContent : ''
     },
     closePreExport() {
       this.pdfExportShow = false