From 2d5e75bbc04d8c4c5c7dc6bb141ad16ffa2d9936 Mon Sep 17 00:00:00 2001
From: XingChuan <m17600301067@163.com>
Date: 星期日, 30 五月 2021 12:24:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 src/components/layer/src/layer.vue |  131 ++++++++++++++++++++++++-------------------
 1 files changed, 73 insertions(+), 58 deletions(-)

diff --git a/src/components/layer/src/layer.vue b/src/components/layer/src/layer.vue
index b29753a..56522c5 100644
--- a/src/components/layer/src/layer.vue
+++ b/src/components/layer/src/layer.vue
@@ -1,24 +1,22 @@
 <template>
-  <div class="public-bounced map-background" v-drag>
+  <div class="public-bounced map-background" v-drag :style="style">
     <div class="public-bounced-title panel-title" ref="publicBounced">
-      <span>{{title}}</span>
-      <i class="el-icon-circle-close" @click="close"></i>
+      <span>{{ title }}</span>
+      <i class="el-icon-close" style="font-size: 16px;" @click="close"></i>
     </div>
-    <div class="public-bounced-content" :id="id">
-    </div>
+    <div class="public-bounced-content" :id="id"></div>
   </div>
 </template>
 
 <script>
 import helper from './helper/helper.js'
+import '../../../utils/dragBoxes'
 
 export default {
   data () {
     return {
-      cls: {
-        'vl-notify-iframe': true
-      },
-      id: 'vlip' + new Date().getTime()
+      style: {},
+      id: 'sewer_layeropen_' + new Date().getTime()
     }
   },
   props: {
@@ -29,86 +27,103 @@
       }
     }
   },
-  computed: {
-    contentStyle () {
-      return {
-        height: 'calc(100% - 50px)', // parseInt(this.options.area[1]) - 50 + "px",
-        minHeight: '20px',
-        overflow: 'auto'
-      }
+  computed: {},
+  mounted () {
+    let left = this.left
+    let top = this.top
+    if (left > 0) {
+      left = left + 'px'
     }
-  },
-  async mounted () {
-    helper.hiddenScrollBar(this.options)
+    if (top > 0) {
+      top = top + 'px'
+    }
+    this.style = {
+      left: left || '25%',
+      top: top || '35%'
+    }
   },
   methods: {
     close () {
       this.layer.close(this.id)
     },
     init () {
-      const propsData = helper.deepClone(this.content.content.data) || {}
-      propsData.layerid = this.id
-      propsData.lydata = this.content.data
-      propsData.lyoption = this.options
-      const instance = new this.content.content({
-        // 鍏蜂綋鍙傛暟淇℃伅锛岃鍙傝�僾ue婧愮爜
-        parent: this.content.parent,
+      const propsData = helper.deepClone(this.content.data) || {}
+      // console.log(propsData)
+      const instance = new this.content.comp({
+        // parent: this.content.parent,
         propsData: propsData
       })
       instance.vm = instance.$mount()
       document.getElementById(this.id).appendChild(instance.vm.$el)
+    },
+    max () {
+      // 鏈�澶у寲绐楀彛
+      let height = document.documentElement.clientHeight
+      if (height % 2 === 1) {
+        height += 1
+      }
+      this.style = {
+        overflow: 'hidden',
+        left: '50%',
+        width: '100%',
+        height: height + 'px',
+        minHeight: '42px'
+      }
+      this.maxMiniState = 2
+    },
+    maxmini () { // 杩樺師
+      document.getElementById(this.options.id).removeAttribute('style')
+      this.maxMiniState = 0
     }
   }
 }
 </script>
 
 <style lang="less" scoped>
-  .public-bounced {
-    z-index: 2000;
-    position: absolute;
-    top: 35%;
-    left: 20%;
+.public-bounced {
+  z-index: 2000;
+  position: absolute;
 
   .public-bounced-title {
     cursor: move;
-    height: 0.1rem;
-    padding: 10px 0;
+    //height: 0.1rem;
+    //padding: 10px 0;
     display: flex;
     align-items: center;
     justify-content: space-between;
 
-  span {
-    color: #f4f7ff;
-    margin: 0 15px;
-    font-size: 14px;
-  }
+    span {
+      color: #f4f7ff;
+      margin: 0 15px;
+      font-size: 16px;
+    }
 
-  i {
-    color: #C0C4CC;
-    margin: 0 15px;
-    font-size: 22px;
-    cursor: pointer;
-  }
+    i {
+      color: #C0C4CC;
+      margin: 0 15px;
+      font-size: 22px;
+      cursor: pointer;
+    }
 
-  i:hover {
-    color: #00fff6;
-  }
+    i:hover {
+      color: #00fff6;
+    }
   }
 
   .public-bounced-content {
-    padding: 0.1rem;
+    //padding: 0.1rem;
     display: flex;
-  //align-items: center;
-  //justify-content: space-around;
+    //align-items: center;
+    //justify-content: space-around;
 
-  .public-bounced-content-left {
-  //width: 4.8rem;
-  }
+    .public-bounced-content-left {
+      //width: 4.8rem;
+    }
 
-  .public-bounced-content-right {
-  //width: 3rem;
-    margin-left: 0.1rem;
+    .public-bounced-content-right {
+      //width: 3rem;
+      margin-left: 0.1rem;
+    }
   }
-  }
-  }
+}
 </style>

--
Gitblit v1.8.0