zydx-plus 1.32.299 → 1.32.301

package/package.json

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

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

@@ -131,6 +131,8 @@ import * as PdfJs from 'pdfjs-dist/legacy/build/pdf.js' // 注意导入的写法
 PdfJs.GlobalWorkerOptions.workerSrc = require('pdfjs-dist/build/pdf.worker.entry')
 const jsdelivr = '/zydx/static/cmaps/'
 
+let pdfs = null
+
 export default {
   name: "zydx-flip",
   data() {
@@ -188,7 +190,7 @@ export default {
       textHeight: 0,
       textDownX: 0,
       textDownY: 0,
-      textMoveStart: false,
+      textMoveStart: false
     }
   },
   props: {
@@ -241,7 +243,7 @@ export default {
     },
     source: {
       handler: function () {
-        this.readPdf()
+        this.sourceUrl()
       },
       deep: true,
       immediate: true
@@ -936,6 +938,7 @@ export default {
       }
     },
     flipLeft(e, v) {
+      console.log(e)
       if (e > this.pdfPages) {
         this.pageIndex = this.pdfPages
         return
@@ -952,6 +955,7 @@ export default {
       }
     },
     flipRight(e, v) {
+      console.log(e)
       if (e < 1) {
         this.pageIndex = 1
         return
@@ -967,65 +971,67 @@ export default {
         })
       }
     },
-    readPdf(n) {
-      this.mouse()
+    sourceUrl() {
       if (this.source === '' || this.source === undefined || this.source === null) return
       let that = this
-      if(n !== 1) that.loading = true
-      if (that.imgArr[that.pageIndex - 1] !== undefined) {
-        that.oneShow = that.pageIndex !== 1
-      }
+      that.loading = true
       const loadingTask = PdfJs.getDocument({
-        url: this.source,
+        url: that.source,
         cMapUrl: jsdelivr,
         cMapPacked: true
       })
       loadingTask.promise.then((pdf) => {
+        pdfs = pdf
         that.pdfPages = pdf.numPages // 获取pdf文件的总页数
-        pdf.getPage(that.pageIndex).then(function (page) {
-          let canvas = document.getElementById(that.id)
-          let canvas2 = document.getElementById(`${that.id}2`)
-          that.ctx = canvas.getContext('2d');
-          let ctx2 = canvas2.getContext('2d');
-          let viewport = page.getViewport({scale: that.scales})
-          canvas.width = viewport.width * that.sratio
-          canvas.height = viewport.height * that.sratio
-          canvas.style.width = viewport.width + 'px'
-          canvas.style.height = viewport.height + 'px'
-          canvas2.width = viewport.width * that.sratio
-          canvas2.height = viewport.height * that.sratio
-          canvas2.style.width = viewport.width + 'px'
-          canvas2.style.height = viewport.height + 'px'
-          that.canvasStyle = {
-            width: viewport.width + 'px',
-            height: viewport.height + 'px',
-            marginLeft: -(viewport.width / 2) + 'px',
-            widthCanvas: viewport.width * that.sratio,
-            heightCanvas: viewport.height * that.sratio
-          }
-          let renderContext = {
-            canvasContext: ctx2,
-            viewport: viewport,
-            transform: [2, 0, 0, 2, 0, 0] //这里会进行放大，解决模糊问题
-          }
-          page.render(renderContext)
-          that.loading = false
-          if (that.oneIndex === 'right') {
-            that.flipRights = true
-            that.flipLefts = false
-          } else {
-            that.flipRights = false
-            that.flipLefts = true
-          }
-          // 获取canvas的base64数据
-          setTimeout(() => {
-            that.flipRights = false
-            that.flipLefts = false
-            that.oneShow = false
-            that.imgArr[that.pageIndex] = canvas2.toDataURL('image/jpeg', 1)
-            that.processing()
-          }, 1000)
-        })
+        that.readPdf(pdf)
+      })
+    },
+    readPdf() {
+      let that = this
+      this.mouse()
+      pdfs.getPage(that.pageIndex).then(function (page) {
+        let canvas = document.getElementById(that.id)
+        let canvas2 = document.getElementById(`${that.id}2`)
+        that.ctx = canvas.getContext('2d');
+        let ctx2 = canvas2.getContext('2d');
+        let viewport = page.getViewport({scale: that.scales})
+        canvas.width = viewport.width * that.sratio
+        canvas.height = viewport.height * that.sratio
+        canvas.style.width = viewport.width + 'px'
+        canvas.style.height = viewport.height + 'px'
+        canvas2.width = viewport.width * that.sratio
+        canvas2.height = viewport.height * that.sratio
+        canvas2.style.width = viewport.width + 'px'
+        canvas2.style.height = viewport.height + 'px'
+        that.canvasStyle = {
+          width: viewport.width + 'px',
+          height: viewport.height + 'px',
+          marginLeft: -(viewport.width / 2) + 'px',
+          widthCanvas: viewport.width * that.sratio,
+          heightCanvas: viewport.height * that.sratio
+        }
+        let renderContext = {
+          canvasContext: ctx2,
+          viewport: viewport,
+          transform: [2, 0, 0, 2, 0, 0] //这里会进行放大，解决模糊问题
+        }
+        page.render(renderContext)
+        that.loading = false
+        if (that.oneIndex === 'right') {
+          that.flipRights = true
+          that.flipLefts = false
+        } else {
+          that.flipRights = false
+          that.flipLefts = true
+        }
+        // 获取canvas的base64数据
+        setTimeout(() => {
+          that.flipRights = false
+          that.flipLefts = false
+          that.oneShow = false
+          that.imgArr[that.pageIndex] = canvas2.toDataURL('image/jpeg', 1)
+          that.processing()
+        }, 1000)
       })
     }
   }
@@ -1251,7 +1257,7 @@ export default {
   display: inline-block;
   margin: 0 auto;
   position: relative;
-  //cursor: none;
+//cursor: none;
 }
 
 .but-wrap {

package/src/components/tipBox/index.js

@@ -8,7 +8,7 @@ render(divNode, document.body)
 const container = divNode.el
 
 // 导出函数可通过调用 Confirm() 函数动态创建 XtxConfirm 组件
-const Confirm = ({ type, url ,title,radioArr,checkboxArr,submitText,cancelText,closeShow, promptContent, middle, cancelShow, inputArr }) => {
+const Confirm = ({ type, url ,title,radioArr,checkboxArr,submitText,cancelText,closeShow, promptContent, middle, cancelShow, inputArr, countdown }) => {
     // 返回 Promise 对象
     return new Promise((resolve, reject) => {
         // 2. 点击确认按钮，触发resolve同时销毁组件
@@ -49,7 +49,7 @@ const Confirm = ({ type, url ,title,radioArr,checkboxArr,submitText,cancelText,c
             render(null, container)
         }
         // 1. 创建 XtxConfirm 组件
-        const VNode = createVNode(XtxConfirm, { type, url ,title, submitText, cancelText, closeShow,promptContent,radioArr,checkboxArr, middle, cancelShow, inputArr, submit, cancel, close })
+        const VNode = createVNode(XtxConfirm, { type, url ,title, submitText, cancelText, closeShow,promptContent,radioArr,checkboxArr, middle, cancelShow, inputArr,countdown, submit, cancel, close })
         render(VNode, container)
     })
 }

package/src/components/tipBox/src/main.vue

@@ -9,7 +9,7 @@
                 <div class="tip-boxContent">
                     <div class="tap-p" ref="tapP">
                         <div class="tip-title2" ref="tipTitle" v-if="type === 'text'"
-                             :style="{'text-align': (middles)? 'center': 'left', 'text-indent': indent? '2em': '0' }" v-html="promptContent"></div>
+                             :style="{'text-align': (middles)? 'center': 'left', 'text-indent': indent? '2em': '0' }">{{ promptContent }} {{ countdown === 0?'':`(${timeo}s)` }}</div>
                         <div class="tip-img" v-if="type === 'img'">
                             <img :src="url" alt=""/>
                         </div>
@@ -94,6 +94,8 @@ import Select from '../../select/src/select.vue'
 import Calendar from '../../calendar/src/Calendar'
 import Year from '../../year/src/year'
 
+let timeStop = null
+
 export default {
     name: 'zydx-tip-box',
     components: {Select, Calendar,Year},
@@ -103,7 +105,8 @@ export default {
             tipYear: false,
             fileName: '',
             middles: this.middle,
-            indent: false
+            indent: false,
+            timeo: 0
         }
     },
     props: {
@@ -123,6 +126,10 @@ export default {
             type: String,
             default: '默认文字'
         },
+      countdown: {  // 倒计时
+        type: Number,
+        default: 0
+      },
         middle: { // 弹窗中间的文字内容是居中 还是居左 默认居中
             type: Boolean,
             default: true
@@ -180,9 +187,26 @@ export default {
                     this.indent = true
                 }
             }
+            if(this.countdown > 0) {
+              this.timeo = this.countdown
+              this.countdownFun()
+            }
         })
     },
+  beforeUnmount() {
+    clearInterval(timeStop)
+  },
     methods: {
+      countdownFun() {
+        let that = this
+        timeStop = setInterval(function(){
+          that.timeo--;
+          if (that.timeo <= 0) {
+            clearInterval(timeStop)
+            that.cancel()
+          }
+        },1000)
+      },
         checkboxTao(index) {
             this.checkboxArr[index].checked = !this.checkboxArr[index].checked
         },

package/src/index.js

@@ -81,7 +81,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.32.299',
+    version: '1.32.301',
     install,
     Calendar,
     Message,