zydx-plus 1.34.458 → 1.34.460

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zydx-plus",
-  "version": "1.34.458",
+  "version": "1.34.460",
   "description": "Vue.js",
   "main": "src/index.js",
   "files": [

package/src/components/dragPopup/src/dragPopup.vue

@@ -19,13 +19,13 @@
       <div class="drag-cont-slot">
         <slot name="content"></slot>
       </div>
-      <div v-show="!fixedStart">
-        <i class="drag-down" :style="{'bottom': dragStatus&&dragTextShow&&!fixedStart? '-50px':'-30px'}" v-if="dragStatus" @mousedown.stop="footDown($event,'d')" @mouseup.stop="footUp"></i>
+      <div v-show="!fixedStart&&!autoHeight">
+        <i class="drag-down" v-if="dragStatus" @mousedown.stop="footDown($event,'d')" @mouseup.stop="footUp"></i>
         <i class="drag-in" v-if="dragStatus" @mousedown.stop="footDown($event,'in')" @mouseup.stop="footUp"></i>
         <i class="drag-right" v-if="dragStatus" @mousedown.stop="footDown($event,'r')" @mouseup.stop="footUp"></i>
       </div>
     </div>
-    <div class="down-text" v-if="dragStatus&&dragTextShow&&!fixedStart">
+    <div class="down-text" v-if="dragStatus&&dragTextShow&&!fixedStart&&!autoHeight">
       <div class="down-text-cont">
         <slot name="down"></slot>
 <!--        <img-->
@@ -60,6 +60,10 @@ export default {
     }
   },
   props: {
+    isInitShowBottomRight: {
+      type: Boolean,
+      default: false
+    },
     width: {
       type: Number,
       default: 600
@@ -123,6 +127,10 @@ export default {
     closeShow: {
       type: Boolean,
       default: true
+    },
+    autoHeight: {
+      type: Boolean,
+      default: false
     }
   },
   beforeUnmount() {
@@ -132,12 +140,20 @@ export default {
     width: {
       handler: function (val) {
         this.footRightOffset = val
+        if (this.isInitShowBottomRight) {
+          this.x = window.innerWidth - val
+          console.log('this.x', this.x)
+        }
       },
       immediate: true
     },
     height: {
       handler: function (val) {
         this.footDownOffset = val
+        if (this.isInitShowBottomRight) {
+          this.y = window.innerHeight - val
+          console.log('this.y', this.y)
+        }
       },
       immediate: true
     },
@@ -152,10 +168,16 @@ export default {
   },
   mounted() {
     this.id = Math.random().toString(36).substr(2);
+    this.init()
     // 全局监听鼠标抬起事件
     document.addEventListener('mouseup', this.mouseup);
     document.addEventListener('mouseup', this.footUp);
-    this.init()
+    this.$nextTick(() => {
+      this.$emit('updateDrag', {
+        width: this.footRightOffset,
+        height: this.footDownOffset - ((this.dragTextShow)?60:30)
+      })
+    })
     let popArr = []
     const pop = sessionStorage.getItem('pop')
     popArr = (pop === null)? [] : JSON.parse(pop)
@@ -179,10 +201,14 @@ export default {
   },
   computed: {
     position() {
-      return `top:${this.y}px;left:${this.x}px;width:${this.footRightOffset}px;height:${this.footDownOffset}px;`;
+      if(this.autoHeight) {
+        return `top:${this.y}px;left:${this.x}px;width:${this.footRightOffset}px;min-height:${this.footDownOffset}px;`;
+      } else {
+        return `top:${this.y}px;left:${this.x}px;width:${this.footRightOffset}px;height:${this.footDownOffset}px;`;
+      }
     },
   },
-  emits: ['dragStatus', 'close', 'enlarge','updateDrag','minimize','dragMouseup', 'updateDragInit'],
+  emits: ['dragStatus', 'close', 'enlarge','updateDrag','minimize','dragMouseup'],
   methods: {
     dragTap() {
       let pop = JSON.parse(sessionStorage.getItem('pop'))
@@ -211,20 +237,12 @@ export default {
         const wid = document.getElementById('app').offsetWidth
         this.x = this.left + (wid-this.initWidth)/2
         this.y = this.top - document.documentElement.scrollTop
-      }else {
+      } else {
         this.clientWidth = document.documentElement.clientWidth;
         this.clientHeight = document.documentElement.clientHeight;
         this.x = this.clientWidth / 2 - this.footRightOffset / 2;
         this.y = this.clientHeight / 2 - this.footDownOffset / 2;
       }
-      this.$nextTick(() => {
-        this.$emit('updateDrag', {
-          width: this.footRightOffset,
-          height: this.footDownOffset - ((this.dragTextShow)?60:30),
-          left: this.x,
-          top: this.y,
-        })
-      })
     },
     getWH(v) {
       this.transAll = true
@@ -373,6 +391,7 @@ export default {
 
 .drag-down {
   position: absolute;
+  bottom: -50px;
   right: 20px;
   width: calc(100% - 20px);
   height: 40px;
@@ -458,8 +477,8 @@ export default {
 
 .drag-pop {
   position: fixed;
-  top: 0;
-  left: 0;
+  /* top: 0;
+  left: 0; */
   background-color: #fff;
   border-radius: 3px;
   z-index: 9999;

package/src/components/upload/src/upload.vue

@@ -115,6 +115,8 @@ export default {
 
 .upload-centered {
   margin: 0 auto;
+  background: white;
+  padding: 20px;
 }
 
 .upload-schedule {

package/src/index.js

@@ -85,7 +85,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.34.458',
+    version: '1.34.460',
     install,
     Calendar,
     Message,