zydx-plus 1.35.607 → 1.35.609

package/package.json

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

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

@@ -62,7 +62,8 @@ export default {
       fixedStart: false,
       initWidth: 1280,
       draggableState: null,
-      draggableMove: false
+      draggableMove: false,
+      zIndex: 10000
     }
   },
   props: {
@@ -196,9 +197,8 @@ export default {
     let popArr = []
     const pop = sessionStorage.getItem('pop')
     popArr = (pop === null)? [] : JSON.parse(pop)
-    popArr.push(this.id)
+    popArr.push({id: this.id, zIndex: 10000})
     sessionStorage.setItem('pop', JSON.stringify(popArr))
-    document.getElementById(this.id).classList.add('zIndex10001')
     // 监听滚动
     window.onscroll = () => {
       const scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
@@ -220,13 +220,14 @@ export default {
     document.onmouseup = () => {
       this.isMove = false;
     }
+    this.dragTap()
   },
   computed: {
     position() {
       if(this.autoHeight) {
-        return `top:${this.y}px;left:${this.x}px;width:${this.footRightOffset}px;min-height:${this.footDownOffset}px;`;
+        return `top:${this.y}px;left:${this.x}px;width:${this.footRightOffset}px;min-height:${this.footDownOffset}px;z-index:${this.zIndex}`;
       } else {
-        return `top:${this.y}px;left:${this.x}px;width:${this.footRightOffset}px;height:${this.footDownOffset}px;`;
+        return `top:${this.y}px;left:${this.x}px;width:${this.footRightOffset}px;height:${this.footDownOffset}px;z-index:${this.zIndex}`;
       }
     },
   },
@@ -272,21 +273,21 @@ export default {
     dragTap() {
       let pop = JSON.parse(sessionStorage.getItem('pop'))
       for(let i = 0; i< pop.length; i++) {
-        if(document.getElementById(pop[i]) === null) continue
-        document.getElementById(pop[i]).classList.remove('zIndex10000')
-        document.getElementById(pop[i]).classList.remove('zIndex10001')
-        document.getElementById(pop[i]).classList.add('zIndex9999')
-        // 获取所有具有指定class的元素并删除它们
-      }
-      if(document.getElementById(this.id)){
-        document.getElementById(this.id).classList.remove('zIndex9999')
-        document.getElementById(this.id).classList.add('zIndex10000')
+        if(!document.getElementById(pop[i].id)) continue
+        if(pop[i].id === this.id) {
+          pop[i].zIndex = 10000
+          this.zIndex = pop[i].zIndex
+        }else {
+          pop[i].zIndex = 9999
+        }
+        document.getElementById(pop[i].id).style.zIndex = pop[i].zIndex
       }
+      sessionStorage.setItem('pop', JSON.stringify(pop))
     },
     clean() {
       let pop = JSON.parse(sessionStorage.getItem('pop'))
       pop.forEach((x,i) => {
-        if(x === this.id) {
+        if(x.id === this.id) {
           pop.splice(i, 1);
         }
       })
@@ -589,11 +590,8 @@ export default {
 
 .drag-pop {
   position: fixed;
-  /* top: 0;
-  left: 0; */
   background-color: #fff;
   border-radius: 3px;
-  z-index: 9999;
   animation: linkDown .3s linear forwards;
   opacity: 0;
 }

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

@@ -59,7 +59,8 @@ export default {
       fixedStart: false,
       initWidth: 1280,
       draggableState: null,
-      draggableMove: false
+      draggableMove: false,
+      zIndex: 10000
     }
   },
   props: {
@@ -141,10 +142,6 @@ export default {
       type: Boolean,
       default: false
     },
-    zIndex: {
-      type: Number,
-      default: 0
-    },
     share: {
       type: Boolean,
       default: false
@@ -199,7 +196,7 @@ export default {
     let popArr = []
     const pop = sessionStorage.getItem('pop')
     popArr = (pop === null)? [] : JSON.parse(pop)
-    popArr.push(this.id)
+    popArr.push({id: this.id, zIndex: 10000})
     sessionStorage.setItem('pop', JSON.stringify(popArr))
     // 监听滚动
     window.onscroll = () => {
@@ -220,9 +217,7 @@ export default {
         this.footRightOffset = wid
       }
     });
-    setTimeout(() => {
-      document.getElementById(this.id).classList.add('zIndex10000')
-    },0)
+    this.dragTap()
   },
   computed: {
     position() {
@@ -281,20 +276,18 @@ export default {
       this.state = false
     },
     dragTap() {
-      if(this.zIndex > 0) return
       let pop = JSON.parse(sessionStorage.getItem('pop'))
       for(let i = 0; i< pop.length; i++) {
-        if(document.getElementById(pop[i]) === null) continue
-        document.getElementById(pop[i]).classList.remove('zIndex10000')
-        // document.getElementById(pop[i]).style.zIndex = '9999'
-        document.getElementById(pop[i]).classList.add('zIndex9999')
-        // 获取所有具有指定class的元素并删除它们
-      }
-      if(document.getElementById(this.id)){
-        // document.getElementById(this.id).style.zIndex = '10000'
-        document.getElementById(this.id).classList.remove('zIndex9999')
-        document.getElementById(this.id).classList.add('zIndex10000')
+        if(!document.getElementById(pop[i].id)) continue
+        if(pop[i].id === this.id) {
+          pop[i].zIndex = 10000
+          this.zIndex = pop[i].zIndex
+        }else {
+          pop[i].zIndex = 9999
+        }
+        document.getElementById(pop[i].id).style.zIndex = pop[i].zIndex
       }
+      sessionStorage.setItem('pop', JSON.stringify(pop))
     },
     clean() {
       let pop = JSON.parse(sessionStorage.getItem('pop'))

package/src/components/select/src/select.vue

@@ -8,6 +8,7 @@
                :placeholder="placeholder"
                :readonly="true"
                @click.stop="toggleDropDown"
+               :class="{'select-css-focus': isOpen}"
                class="select-css" />
 
         <span class="custom-select-icons" v-if="!readonly" @click.stop="toggleDropDown">
@@ -25,13 +26,19 @@
           <template v-if="!readonly">
             <template v-if="options.length">
               <ul v-if="isOpen"
+                  @mouseleave="mouseleave"
                   class="custom-select-options scroll"
                   ref="dropdown"
                   :style="{position: 'fixed', 'z-index': '30000', left: x + 'px', top: y + 'px', width: width + 'px', maxHeight: height + 'px'}">
                 <li v-for="(option, idx) in options"
                     :key="idx"
                     :class="option.disable ? 'disable': ''"
-                    @click.stop="handleClick(option)">{{ option.label }}</li>
+                    @click.stop="handleClick(option)">
+                  <div class="countersign-image" v-if="multiple">
+                    <img v-if="option.active" :src="countersign"  alt=""/>
+                  </div>
+                  <span>{{ option.label }}</span>
+                </li>
               </ul>
             </template>
           </template>
@@ -59,6 +66,10 @@ export default defineComponent({
       type: String,
       default: ''
     },
+    multiple: {
+      type: Boolean,
+      default: false
+    },
     placeholder: {
       type: String,
       default: ''
@@ -87,11 +98,16 @@ export default defineComponent({
       x: 0,
       y: 0,
       width: 0,
-      height: 300
+      height: 300,
+      countersign: 'data:image/png;base64,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'
     }
   },
   emits: ['update:value', 'select'],
   methods: {
+    mouseleave() {
+      this.isOpen = false
+      window.removeEventListener('scroll', this.handler)
+    },
     toggleDropDown: function () {
       const winHeight = window.innerHeight
       const { x, y, width, height } = this.$refs.selectRef.getBoundingClientRect()
@@ -108,10 +124,19 @@ export default defineComponent({
     },
     handleClick: function (option) {
       if(option.disable) return
-      this.$emit('update:value', option.value)
-      this.$emit('select', option)
-      this.selected = option.label
-      this.isOpen = false
+      if(this.multiple) {
+        option.active = !option.active
+        let value = ''
+        this.options.forEach(x => {
+          if(x.active) value += `${x.value},`
+        })
+        this.$emit('update:value', value.slice(0, -1))
+        this.$emit('select', option)
+      }else {
+        this.$emit('update:value', option.value)
+        this.$emit('select', option)
+        this.isOpen = false
+      }
     },
     handler: function () {
       if (this.isOpen) {
@@ -136,8 +161,17 @@ export default defineComponent({
           this.selected = ''
           return
         }
-        const { label } = this.options.find(option => option.value === v) || { label: '' }
-        this.selected = label
+        const data = this.multiple? v.split(',') : v.split(',')[0]
+        let label = ''
+        this.options.forEach(x => {
+          if(data.includes(x.value)) {
+            x.active = true
+            label += `${x.label}、`
+          }else {
+            x.active = false
+          }
+        })
+        this.selected = label.slice(0, -1)
       },
       immediate: true,
       deep: true
@@ -169,6 +203,19 @@ export default defineComponent({
   margin-bottom: 1em;
 }
 
+.countersign-image{
+  width: 14px;
+  height: 14px;
+  margin-right: 5px;
+  position: relative;
+  top: 2px;
+  display: inline-block;
+}
+.countersign-image>img{
+  width: 100%;
+  height: 100%;
+}
+
 .custom-select {
   position: relative;
 }
@@ -213,7 +260,7 @@ export default defineComponent({
   border-color: #888;
 }
 
-.select-css:focus {
+.select-css-focus {
   border-color: v-bind(hover);
 }
 

package/src/components/tagging/src/tagging.vue

@@ -1,7 +1,8 @@
 <template>
     <div class="tagging" @click="leftClick">
         <div id="htmlText"></div>
-        <div class="link" v-for="item in linkData"
+        <div class="link" v-for="(item,index) in linkData"
+             :key="index"
              :style="{width: item.width + 'px',
              top: item.leftY + 'px',
              left: item.leftX + 'px',
@@ -30,7 +31,7 @@
         <div class="tagging-right">
             <div class="tagging-title">批注指导</div>
             <div class="annotation" ref="scrollBox">
-                <div class="annotation-list" @click="guidance(item.id,index)" :id="item.id" v-for="(item, index) in annotationsArr">
+                <div class="annotation-list" @click="guidance(item.id,index)" :id="item.id" v-for="(item, index) in annotationsArr" :key="index">
                     <div class="list-title">
                         <div class="list-left">
                             <span>{{ teacher }}</span>

package/src/index.js

@@ -87,7 +87,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.35.607',
+    version: '1.35.609',
     install,
     Calendar,
     Message,