zydx-plus 1.34.450 → 1.34.451

package/package.json

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

package/src/components/chat/src/chat.vue

@@ -1,5 +1,11 @@
 <template>
-  <div class="chat-content">
+  <div class="chat-content"
+  :style="{
+    top: `${y !== '' ? `${y}px` : '50%'}`,
+    left: `${x !== '' ? `${x}px` : '50%'}`,
+    marginTop: `${y === ''? '-325px' : '0'}`,
+    marginLeft: `${x === ''? '-300px' : '0'}`,
+    }">
     <div class="chat-header">
       <span class="chat-header-title"
             @mousedown.stop="chatMousedown"
@@ -60,8 +66,8 @@ export default {
       messages: [],
       userText: '',
       disabled: false,
-      x: 0,
-      y: 0,
+      x: '',
+      y: '',
       left: 0,
       top: 0,
       isMove: false,
@@ -88,17 +94,25 @@ export default {
         _this.vol = params.vol
       }
     }
-    document.addEventListener('mousemove', () => {
+    document.addEventListener('mousemove', (e) => {
       if (!this.isMove) return
-      this.x = event.clientX - this.left;
-      this.y = event.clientY - this.top;
+      this.x = e.clientX - this.left;
+      this.y = e.clientY - this.top;
       // 超出边界
       const w = document.documentElement.clientWidth;
       const h = document.documentElement.clientHeight;
-      if (this.x < 0) this.x = 0;
-      if (this.y < 0) this.y = 0;
-      if (this.x > w - 600) this.x = w - 600;
-      if (this.y > h - 650) this.y = h - 650;
+      if (this.x < 0) {
+        this.x = 0;
+      }
+      if (this.y < 0) {
+        this.y = 0;
+      }
+      if (this.x > (w - 600)) {
+        this.x = w - 600;
+      }
+      if (this.y > (h - 650)) {
+        this.y = h - 650;
+      }
       this.$emit('move', {x: this.x, y: this.y})
     })
     document.addEventListener('mouseup', (event) => {
@@ -307,7 +321,8 @@ export default {
   height: 650px;
   background: #fff;
   box-shadow: 0 0 10px rgba(0, 0, 0, .2);
-  position: relative;
+  position: fixed;
+  z-index: 10;
 }
 
 .chat-header {

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

@@ -58,6 +58,11 @@
           <span :class="{'but-name-color':voiceOpen}" v-html="voiceOpen?'关闭语音':'语音输入'"></span>
         </div>
       </div>
+      <div v-if='isShowAiTool' class="editor-but">
+        <div class="editor-but-name" @click="showAi">
+          <span>AI助手</span>
+        </div>
+      </div>
       <!--            <div class="editor-but">
                     <div class="editor-but-name">
                       <label>
@@ -67,6 +72,7 @@
                     </div>
                   </div>-->
     </div>
+    <zydx-chat v-if="isShowAi" @close='isShowAi = false'></zydx-chat>
     <div :class="{'editor-content-show': !editableShow}" class="editor-content">
       <div class="editing">
         <div v-if="signMenuShow" class="editing-header">
@@ -615,6 +621,7 @@ import MarginStandard from "../src/margin-standard.vue";
 import MarginWide from "../src/margin-wide.vue";
 import isSelect from "../src/isSelect.vue";
 import Paint from '../../paint/src/paint'
+import zydxChat from '../../chat/src/chat.vue'
 
 const img = require('./image/annotation.png')
 export default {
@@ -632,6 +639,7 @@ export default {
     zydxColoring,
     zydxDragPopup,
     zydxSelect,
+    zydxChat,
     delSvg, editSvg, viewSvg,Paint
   },
   beforeUnmount() {
@@ -794,6 +802,7 @@ export default {
       timeOut: null,
       isShowPageMargin: false,
       isShowHorizontalLine: false,
+      isShowAi: false,
       isShowSwitchingFormat: false,
       templateType: 'freeTypesetting',
       switchingFormat: [
@@ -870,6 +879,10 @@ export default {
     }
   },
   props: {
+    isShowAiTool: {
+      type: Boolean,
+      default: true
+    },
     html: {
       type: Array,
       default: () => []
@@ -1346,6 +1359,9 @@ export default {
   },
   emits: ['confirm', 'enclosure', 'enlDownload', 'enlSee'],
   methods: {
+    showAi() {
+      this.isShowAi = !this.isShowAi
+    },
     // 插入白板数据
     exportImg(e) {
       this.uploadFile(e, this.uploadImage).then(r => {
@@ -3723,8 +3739,8 @@ export default {
     },
 
     close() {
-      if (this.ws === null) return
       this.voiceOpen = false
+      if (this.ws === null) return
       this.ws?.send(JSON.stringify({"type": "CANCEL"}))
       this.ws?.close()
       this.ws = null

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

@@ -2,7 +2,7 @@
   <div class="read">
       <vue-office-docx v-if="fileType === 'docx'" :src="url" style="height: 100%;" @rendered="renderedHandler"  @error="errorHandler" />
       <vue-office-excel v-if="fileType === 'xlsx' && xlsx" :src="url" style="height: 100%;" @rendered="renderedHandler"  @error="errorHandler" />
-      <div class="view-pdf" v-if="fileType === 'pdf'">
+      <div class="view-pdf" @scroll="scroll" v-if="fileType === 'pdf'">
           <div class="pageContainer" v-for="(item,index) in idArr">
               <canvas :id="item"></canvas>
               <div class="pdfPage">{{ index + 1 }}/{{ pdfPages }}</div>
@@ -35,7 +35,7 @@ import '@vue-office/docx/lib/index.css'
 import '@vue-office/excel/lib/index.css'
 
 import Mess from '../../tipBox/index'
-
+let pdfs = null
 export default {
     name: "zydx-read",
     components: {VueOfficeDocx,VueOfficeExcel},
@@ -54,7 +54,8 @@ export default {
           pdf: null,
           page: 0,
           xlsx: true,
-          canvasArr: []
+          canvasArr: [],
+          pageIndex: 0
         }
     },
     props: {
@@ -148,10 +149,11 @@ export default {
                 cMapPacked: true
             })
             loadingTask.promise.then((pdf) => {
-                that.pdf = pdf
+                pdfs = pdf
                 that.pdfPages = pdf.numPages // 获取pdf文件的总页数
                 that.page = pdf.numPages
-                that.getPDF(pdf,that.page)
+                that.pageIndex = that.page > 1? 2:1
+                that.getPDF(pdf,that.pageIndex)
             }).catch(() => {
               that.loading = false
               Mess({
@@ -160,12 +162,29 @@ export default {
               })
             })
         },
+        scroll(e) {
+          const dom = e.target
+          var scrollTop = dom.scrollTop; //滑入屏幕上方的高度
+          var windowHeitht = dom.clientHeight; //能看到的页面的高度
+          var scrollHeight = dom.scrollHeight; //监控的整个div的高度（包括现在看到的和上下隐藏起来看不到的）
+          let total = scrollTop + windowHeitht
+          if(total === scrollHeight){
+            if(this.pageIndex >= this.page) return
+            if((this.page - this.pageIndex) > 2) {
+              this.pageIndex += 2
+              this.getPDF(pdfs,2)
+            }else {
+              this.pageIndex += 1
+              this.getPDF(pdfs,1)
+            }
+          }
+        },
         getPDF(pdf,page) {
             let that = this
             for (let i = 0; i < page; i++) {
                 const id = 'canvas' + Math.random().toString(36).substr(2)
                 that.idArr.push(id)
-                pdf.getPage(that.idArr.length).then(function (page) {
+                pdf.getPage(this.pageIndex === 1? 1:this.pageIndex + i - 1).then(function (page) {
                     let canvas = document.getElementById(id)
                     that.canvasArr.push(canvas)
                     let ctx = canvas.getContext('2d');

package/src/index.js

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