zydx-plus 1.17.77 → 1.17.78

package/package.json

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

package/src/components/biz_taskInfo/src/bizTaskInfo.vue

@@ -643,11 +643,6 @@
     align-items: center;
     justify-content: space-between;
 }
-
->>>.el-input__wrapper{
-        height: 30px;
-    }
-
 .el-select .el-input {
     width: 130px;
 }

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

@@ -107,6 +107,8 @@ export default {
             this.isMove = false;
         },
         close() {
+            this.isMove = false
+            this.footIsMove = false
             this.$emit('close');
         }
     }
@@ -140,6 +142,7 @@ export default {
     z-index: 1;
     display: inline-block;
     cursor: ns-resize;
+    user-select: none;
 }
 .in{
     position: absolute;
@@ -150,6 +153,7 @@ export default {
     z-index: 1;
     display: inline-block;
     cursor: nwse-resize;
+    user-select: none;
 }
 .right{
     position: absolute;
@@ -160,6 +164,7 @@ export default {
     z-index: 1;
     display: inline-block;
     cursor: ew-resize;
+    user-select: none;
 }
 .drag-head i {
     position: absolute;
@@ -191,6 +196,7 @@ export default {
     color: #fff;
     border-top-left-radius: 3px;
     border-top-right-radius: 3px;
+    user-select: none;
 }
 .drag-cont{
     height: calc(100% - 60px);

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

@@ -37,7 +37,7 @@ export default defineComponent({
     },
     readOnly: {
       type: Boolean,
-      default: true
+      default: false
     },
     butShow: {
       type: Boolean,
@@ -61,6 +61,11 @@ export default defineComponent({
     }
   },
   emits: ['confirm'],
+  watch: {
+    html() {
+       this.formData.html = this.html
+    }
+  },
   methods: {
     confirm() {
       this.syncContent() //强制同步数据

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

@@ -107,7 +107,13 @@ export default {
             default: false
         }
     },
-    emits: ['see','complete'],
+    emits: ['see','complete','update:data'],
+    watch:{
+        data(e) {
+            this.editor.commands.setContent(json2html({node: "root",child: (e.html === undefined)? [] : e.html}))
+            this.uploadAttData = (e.enclosure === undefined)? [] : e.enclosure
+        },
+    },
     mounted() {
         this.uploadAttData = (this.data.enclosure === undefined)? [] : this.data.enclosure
         this.heightStyle = (this.height === '100%')? {height: '100%'} : {'min-height': this.height}
@@ -162,7 +168,6 @@ export default {
             const file = e.target.files[0]
             if(this.uploadType) {
                 if(v === 'uploadAtt') {
-                    console.log(file)
                     this.uploadAttData.push(file)
                 }else {
                     this.uploadFile(file).then(r => {
@@ -219,7 +224,7 @@ export default {
         download(index) {
             const url = this.uploadImage.url + this.uploadAttData[index].filePath
             let a = document.createElement('a');
-            a.style = 'display: none';
+            a.style.display = 'none';
             a.download = this.uploadAttData[index].filename;
             a.href = url;
             document.body.appendChild(a);
@@ -308,7 +313,7 @@ export default {
 }
 .editor{
     border-radius: 3px;
-    padding: 20px;
+    padding: 10px;
     outline: none;
 }
 .editor img{

package/src/components/flip/src/flip.vue

@@ -1,16 +1,26 @@
 <template>
   <div id="docView">
-    <div class="pdf-container">
-      <canvas :id="'pdf-canvas'+ index" v-for="(item,index) in pdfPages" class="pdf-canvas"></canvas>
-    </div>
-    <div class="book">
-      <flipbook class="flipbook" :startPage="pageIndex" :pages="imgArr" @flip-left-end="flipLeft($event,false)" @flip-right-end="flipRight($event,false)" v-slot="flipbook" :singlePage="singlePage" :ambient="0" :gloss="1" :dragToFlip="false" :pagesHiRes="0">
-        <div class="but" v-if="butShow">
-          <button class="but-brown" :class="{'but-act': pageIndex === 1}" @click="flipbook.flipLeft">上一页</button>
-          <button class="but-brown" :class="{'but-act': pageIndex === pdfPages}" @click="flipbook.flipRight">下一页</button>
-        </div>
-      </flipbook>
-    </div>
+      <div v-show="show" class="load-pop">
+          <div class="load">
+              <span>文件较大耐心等待</span>
+              <div class="loading">
+                  <div class="loading-cont" :style="{'width': loadWidth +'%'}"></div>
+              </div>
+          </div>
+      </div>
+      <div v-show="!show" style="height: 100%;">
+          <div class="pdf-container">
+              <canvas :id="'pdf-canvas'+ index" v-for="(item,index) in pdfPages" class="pdf-canvas"></canvas>
+          </div>
+          <div class="book">
+              <flipbook class="flipbook" :startPage="pageIndex" :pages="imgArr" @flip-left-end="flipLeft($event,false)" @flip-right-end="flipRight($event,false)" v-slot="flipbook" :singlePage="singlePage" :ambient="0" :gloss="1" :dragToFlip="false" :pagesHiRes="0">
+                  <div class="but" v-if="butShow">
+                      <button class="but-brown" :class="{'but-act': pageIndex === 1}" @click="flipbook.flipLeft">上一页</button>
+                      <button class="but-brown" :class="{'but-act': pageIndex === pdfPages}" @click="flipbook.flipRight">下一页</button>
+                  </div>
+              </flipbook>
+          </div>
+      </div>
   </div>
 </template>
 
@@ -26,7 +36,10 @@ export default {
       pdfPages: 0,
       imgArr: [],
       hei: 0,
-      pageIndex: this.page
+      pageIndex: this.page,
+      show: false,
+      load: 0,
+      loadWidth: 0
     }
   },
   props: {
@@ -74,6 +87,7 @@ export default {
       },
       readPdf() {
           let that = this
+          if(that.pdfPages > 30) that.show = true
           const loadingTask = PdfJs.getDocument(this.source)
           loadingTask.promise.then((pdf) => {
               that.pdfPages = pdf.numPages // 获取pdf文件的总页数
@@ -95,13 +109,28 @@ export default {
                           viewport: viewport
                       }
                       page.render(renderContext)
+                      if(that.pdfPages > 30) {
+                          that.load = i + 1
+                          that.loadWidth = Math.floor(that.load / that.pdfPages * 100)
+                      }
                   });
               }
-              setTimeout(() => {
+              setTimeout(function () {
                   for (let i = 0; i < that.pdfPages; i++) {
                       const canvas = document.getElementById('pdf-canvas' + i)
                       const dataURL = canvas.toDataURL("image/jpeg", 1); //获取Base64编码
                       that.imgArr.push(dataURL)
+                      that.load = i + 1
+                      if(that.pdfPages > 30) {
+                          if(that.load >= that.pdfPages) {
+                              setTimeout(() => {
+                                  that.show = false
+                                  that.load = 0
+                              },100)
+                          }else {
+                              that.loadWidth = Math.floor(that.load / that.pdfPages * 100)
+                          }
+                      }
                   }
               }, 500)
           })
@@ -111,6 +140,40 @@ export default {
 </script>
 
 <style scoped>
+.load-pop{
+  width: 100%;
+  height: 100%;
+    display: flex;
+    align-items: center;
+}
+.load{
+  display: inline-block;
+    margin: 0 auto;
+}
+.load>span{
+    display: inline-block;
+    width: 100%;
+    text-align: center;
+    padding-bottom: 10px;
+    font-size: 14px;
+}
+.loading{
+    width: 200px;
+    height: 10px;
+    border-radius: 20px;
+    position: relative;
+    overflow: hidden;
+    background-color: #ccc;
+}
+.loading-cont{
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: 1;
+    background-color: #5daf34;
+    height: 100%;
+    border-radius: 20px;
+}
 #docView{
   height: 100%;
 }

package/src/components/tipBox/src/zydxStyle.css

@@ -5,7 +5,7 @@
   right: 0;
   bottom: 0;
   background-color: rgba(0, 0, 0, 0.2);
-  z-index: 200;
+  z-index: 2000;
   display: flex;
   align-items: center;
 }