From eee38183325970088ad3261f632e30a70814a30f Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 24 Feb 2023 16:54:17 +0800
Subject: [PATCH 1/3] =?UTF-8?q?Dialog=E5=8D=87=E7=BA=A7,=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E5=8F=AF=E6=8B=96=E5=8A=A8,=E6=94=AF=E6=8C=81v-model=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E6=98=BE=E9=9A=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/packages/basic/AiDialog.vue | 161 ++++++++++++++++-----------------
 1 file changed, 78 insertions(+), 83 deletions(-)

diff --git a/ui/packages/basic/AiDialog.vue b/ui/packages/basic/AiDialog.vue
index 3924578e..e5dc6b46 100644
--- a/ui/packages/basic/AiDialog.vue
+++ b/ui/packages/basic/AiDialog.vue
@@ -1,112 +1,103 @@
 <template>
   <section class="ai-dialog__wrapper">
-    <el-dialog
-        custom-class="ai-dialog"
-        v-on="$listeners"
-        v-if="isEmpty"
-        :close-on-click-modal="closeOnClickModal"
-        v-bind="$attrs"
-        :destroy-on-close="destroyOnClose"
-        :visible.sync="dialogVisible">
-      <div class="ai-dialog__header" slot="title">
-        <h2>{{ title }}</h2>
-      </div>
-      <div class="ai-dialog__content" :style="{'max-height': isScrool ? '500px' : 'auto'}">
-        <div class="ai-dialog__content--wrapper" :style="{'padding-right': isScrool ? '8px' : '0'}">
-          <slot></slot>
+    <el-dialog custom-class="ai-dialog" v-on="$listeners" v-bind="$attrs" :visible.sync="dialog">
+      <div class="ai-dialog__header fill" slot="title" v-text="title"/>
+      <div class="ai-dialog__content">
+        <div class="ai-dialog__content--wrapper pad-r8">
+          <slot/>
         </div>
       </div>
       <template v-if="customFooter" slot="footer">
-        <slot name="footer"></slot>
+        <slot name="footer"/>
       </template>
       <div v-else class="dialog-footer" slot="footer">
         <el-button @click="onCancel">取消</el-button>
-        <el-button @click="onConfirm" type="primary" style="width: 92px;">确认</el-button>
+        <el-button @click="onConfirm" type="primary">确认</el-button>
       </div>
     </el-dialog>
   </section>
 </template>
 
 <script>
+
 export default {
   name: 'AiDialog',
-  props: {
-    visible: {
-      type: Boolean,
-      default: false
-    },
-    title: {
-      type: String,
-      default: ''
-    },
-    customFooter: {
-      type: Boolean,
-      default: false
-    },
-    'close-on-click-modal': {
-      type: Boolean,
-      default: false
-    },
-    destroyOnClose: {
-      type: Boolean,
-      default: true
-    }
+  model: {
+    prop: "visible",
+    event: "input"
+  },
+  props: {
+    visible: Boolean,
+    title: {type: String, default: ''},
+    customFooter: Boolean,
+    isDrag: {type: Boolean, default: true}
   },
-
   data() {
     return {
-      dialogVisible: false,
-      isScrool: true,
-      isEmpty: true
+      dialog: false,
     }
   },
-
   watch: {
-    visible: {
-      handler(val) {
-        this.dialogVisible = val
-
-        // if (val) {
-        // 	this.$nextTick(() => {
-        // 		setTimeout(() => {
-        // 			this.isScrool = document.querySelector('.ai-dialog__content') && document.querySelector('.ai-dialog__content').clientHeight >= 500
-        // 		}, 100)
-        // 	})
-        // }
-
-        if (this.destroyOnClose && !val) {
-          setTimeout(() => {
-            this.isEmpty = false
-
-            setTimeout(() => {
-              this.isEmpty = true
-            }, 50)
-          }, 500)
-        }
-      }
+    dialog(v) {
+      this.visible != v && this.$emit("input", v)
+    },
+    visible(v) {
+      this.dialog = v
     }
   },
-
-  mounted() {
-  },
-
   methods: {
     onCancel() {
-      this.$emit('update:visible', false)
-      this.$emit('onCancel')
+      this.dialog = false
       this.$emit('cancel')
     },
-
     onConfirm() {
-      this.$emit('onConfirm')
       this.$emit('confirm')
-    }
+    },
+    initDraggable() {
+      const dialogHeaderEl = this.$el.querySelector('.el-dialog__header')
+      const dragDom = this.$el.querySelector('.el-dialog')
+      const sty = dragDom.currentStyle || window.getComputedStyle(dragDom, null)
+
+      dialogHeaderEl.onmousedown = e => {
+        console.log(e)
+        // 鼠标按下，获得鼠标在盒子内的坐标（鼠标在页面的坐标 减去 对话框的坐标），计算当前元素距离可视区的距离
+        const disX = e.clientX - dialogHeaderEl.offsetLeft
+        const disY = e.clientY - dialogHeaderEl.offsetTop
+        // 获取到的值带px 正则匹配替换
+        let styL, styT
+        // 注意在ie中 第一次获取到的值为组件自带50% 移动之后赋值为px
+        if (sty.left.includes('%')) {
+          styL = +document.body.clientWidth * (+sty.left.replace(/%/g, '') / 100)
+          styT = +document.body.clientHeight * (+sty.top.replace(/%/g, '') / 100)
+        } else {
+          styL = +sty.left.replace(/px/g, '')
+          styT = +sty.top.replace(/px/g, '')
+        }
+        document.onmousemove = function (e) {
+          // 鼠标移动，用鼠标在页面的坐标 减去 鼠标在盒子里的坐标，获得模态框的left和top值
+          // 通过事件委托，计算移动的距离
+          const l = e.clientX - disX
+          const t = e.clientY - disY
+          // 移动当前元素
+          dragDom.style.left = `${l + styL}px`
+          dragDom.style.top = `${t + styT}px`
+        }
+        document.onmouseup = function () {
+          //  鼠标弹起，移除鼠标移动事件
+          document.onmousemove = null
+          document.onmouseup = null
+        }
+      }
+    },
+  },
+  mounted() {
+    this.isDrag && this.initDraggable()
   }
 }
 </script>
 <style lang="scss">
 .ai-dialog {
-  margin: 0 !important;
+  margin: unset !important;
   top: 50%;
   left: 50%;
   transform: translate(-50%, -50%);
@@ -118,11 +109,12 @@ export default {
   .ai-dialog__content {
     overflow-y: auto;
     padding-bottom: 4px;
+    max-height: 500px;
 
     .ai-dialog__content--wrapper {
       height: 100%;
       overflow-x: hidden;
-      overflow-y: overlay;
+      overflow-y: auto;
     }
   }
 
@@ -130,12 +122,9 @@ export default {
     height: 48px;
     line-height: 48px;
     padding: 0 16px;
-    border-bottom: 1px solid #eee;
-
-    h2 {
-      font-size: 16px;
-      font-weight: 700;
-    }
+    cursor: move;
+    font-size: 16px;
+    font-weight: 700;
   }
 
   .el-dialog__footer {
@@ -155,11 +144,17 @@ export default {
 
   .el-dialog__header {
     padding: 0;
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid #eee;
   }
 
   .el-dialog__headerbtn {
-    top: 24px;
-    transform: translateY(-50%);
+    position: relative;
+    flex-shrink: 0;
+    top: unset;
+    right: unset;
+    margin: 0 16px;
   }
 }
 </style>

From 8539bd5d757777fdf2d1733a351726462ffbcf4b Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 24 Feb 2023 17:06:29 +0800
Subject: [PATCH 2/3] =?UTF-8?q?Dialog=E5=8D=87=E7=BA=A7,=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E5=8F=AF=E6=8B=96=E5=8A=A8,=E6=94=AF=E6=8C=81v-model=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E6=98=BE=E9=9A=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/packages/basic/AiDialog.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ui/packages/basic/AiDialog.vue b/ui/packages/basic/AiDialog.vue
index e5dc6b46..7653c1fa 100644
--- a/ui/packages/basic/AiDialog.vue
+++ b/ui/packages/basic/AiDialog.vue
@@ -59,7 +59,6 @@ export default {
       const sty = dragDom.currentStyle || window.getComputedStyle(dragDom, null)
 
       dialogHeaderEl.onmousedown = e => {
-        console.log(e)
         // 鼠标按下，获得鼠标在盒子内的坐标（鼠标在页面的坐标 减去 对话框的坐标），计算当前元素距离可视区的距离
         const disX = e.clientX - dialogHeaderEl.offsetLeft
         const disY = e.clientY - dialogHeaderEl.offsetTop

From bf784f05ea94c64add0f7093a587f43038b05d59 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 28 Feb 2023 10:12:01 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=B6=88=E9=99=A4=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/grid/AppGridMap/components/list.vue | 22 ++------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/packages/grid/AppGridMap/components/list.vue b/packages/grid/AppGridMap/components/list.vue
index df6ea79d..c70d9050 100644
--- a/packages/grid/AppGridMap/components/list.vue
+++ b/packages/grid/AppGridMap/components/list.vue
@@ -103,24 +103,7 @@ export default {
     getTreeList() {
       this.instance.post(`/app/appgirdinfo/listAll3`).then((res) => {
         if (res?.data) {
-          this.$nextTick(() => {
-            this.$refs.tree.setCurrentKey(res.data.id)
-          })
-
-          this.treeObj.treeList = res.data.filter(e => !e.parentGirdId)
-          const parentGirdId = this.treeObj.treeList[0].id
-
-          this.treeObj.treeList.map(p => this.addChild(p, res.data.map(v => {
-            if (v.id === parentGirdId) {
-              this.treeObj.defaultExpandedKeys.push(v.id)
-            }
-
-            return {
-              ...v
-            }
-          }), {
-            parent: 'parentGirdId'
-          }))
+          this.treeObj.treeList = this.$arr2tree(res.data,{parent:"parentGirdId"})
           this.getLeafNodes()
         }
       });
@@ -128,7 +111,7 @@ export default {
 
     onMapInit() {
       this.instance.post("/app/appdvcpconfig/getCorpLocation").then(res => {
-        if (res.code === 0) {
+        if (res?.data) {
           this.map.setCenter(new this.mapLib.LatLng(res.data.lat, res.data.lng))
         }
       })
@@ -144,7 +127,6 @@ export default {
               points: v.points ? v.points.map(p => [p.lng, p.lat]) : []
             }
           }).filter(v => v.points.length)
-
           this.renderGridMap(arr)
         }
       })