zydx-plus 1.28.130 → 1.28.132

package/package.json

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

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

@@ -10,7 +10,9 @@
            <i @click.stop="close"></i>
        </div>
        <div class="drag-cont" @mousemove="footMove" @mouseleave="footMove">
-           <slot name="content"></slot>
+           <div class="drag-cont-slot">
+               <slot name="content"></slot>
+           </div>
            <i class="down" v-if="dragStatus" @mousedown="footDown($event,'d')" @mouseup="footUp"></i>
            <i class="in" v-if="dragStatus" @mousedown="footDown($event,'in')" @mouseup="footUp"></i>
            <i class="right" v-if="dragStatus" @mousedown="footDown($event,'r')" @mouseup="footUp"></i>
@@ -51,7 +53,7 @@ export default {
         },
         titleColor: {
             type: String,
-            default: '#5daf34'
+            default: 'rgba(19, 191, 108, 1)'
         },
         dragStatus: {
             type: Boolean,
@@ -116,6 +118,11 @@ export default {
 </script>
 
 <style scoped>
+.drag-cont-slot{
+    width: 100%;
+    height: 100%;
+    overflow: auto;
+}
 .down-text-cont{
     display: inline-block;
 }

package/src/components/editor2/src/editor.vue

@@ -6,7 +6,7 @@
                 <div class="ed-head-but" v-for="(item,index) in toolbar">
                     <button v-if="item.key === 'but'" class="but" @click="item.onClick(item,info)" :style="{color: (item.active)? '#00ff00' :'#000'}">{{ item.title }}</button>
                     <label v-else-if="item.key === 'upImg' || item.key === 'uploadAtt'">
-                        <input type="file" @change="upload($event,item.key)" :accept="(item.key === 'upImg')?'image/*':'application/*'" style="display: none;">
+                        <input type="file" @change="upload($event,item.key)" :accept="(item.key === 'upImg')?'image/*':'.docx,.pptx,.pdf,.xlsx,.mp3,.mp4'" style="display: none;">
                         <span class="but">{{ item.title }}</span>
                     </label>
                     <button v-else class="but" @click="toolTap(item.key)">{{ item.title }}</button>
@@ -298,6 +298,10 @@ export default {
                 if(v === 'uploadAtt') {
                     file.active = true
                     this.uploadAttData.push(file)
+                    this.$emit('updateData', {
+                        html: html2json(this.editor.getHTML()).child,
+                        enclosure: this.uploadAttData
+                    })
                 }else {
                     this.uploadFile(file,this.uploadImage).then(r => {
                         this.imgHtml(r.data)
@@ -342,14 +346,6 @@ export default {
         },
         download(index) {
             this.$emit('download', this.uploadAttData[index])
-            // const url = this.uploadImage.url + this.uploadAttData[index].filePath
-            // let a = document.createElement('a');
-            // a.style.display = 'none';
-            // a.download = this.uploadAttData[index].filename? this.uploadAttData[index].filename : this.uploadAttData[index].annexName;
-            // a.href = url;
-            // document.body.appendChild(a);
-            // a.click();
-            // document.body.removeChild(a);
         },
         selection() {
             const { from } = this.editor.state.selection

package/src/components/read/src/read.vue

@@ -81,7 +81,7 @@ export default {
                 for (let i = 0; i < that.pdfPages; i++) {
                     let inx = i+1
                     pdf.getPage(inx).then(function (page) {
-                        let viewport = page.getViewport({scale: 1})
+                        let viewport = page.getViewport({scale: 1.3})
                         return page.getOperatorList().then(function(opList) {
                             let svgGfx = new PdfJs.SVGGraphics(page.commonObjs, page.objs)
                             return svgGfx.getSVG(opList, viewport).then(function(svg) {

package/src/components/tree/src/tree.vue

@@ -192,7 +192,8 @@ export default {
   height: v-bind(height);
   cursor: grabbing;
   gap: 16px;
-  border-bottom: v-bind(border)
+  border-bottom: v-bind(border);
+  position:relative;
 }
 
 .tree_text_active {
@@ -245,6 +246,9 @@ export default {
   font-size: 16px;
   line-height: 30px;
   letter-spacing: 0px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
 .children {

package/src/index.js

@@ -67,7 +67,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.28.130',
+    version: '1.28.132',
     install,
     Calendar,
     Message,