zydx-plus 1.35.545 → 1.35.547

package/package.json

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

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

@@ -773,9 +773,18 @@ export default {
       } else {
         this.uploadFile(file, (v === 'uploadAtt') ? this.uploadAttachment : this.uploadImage).then(r => {
           if (v === 'uploadAtt') {
-            r.data.annex.active = true
-            this.uploadAttData.push(r.data.annex)
-            this.$emit('enclosureSuccess', r.data.annex, html2json(this.editor.getHTML()).child)
+            if (r.data.annex) {
+              r.data.annex.active = true
+              this.uploadAttData.push(r.data.annex)
+              this.$emit('enclosureSuccess', r.data.annex, html2json(this.editor.getHTML()).child)
+            } else {
+              file.active = true
+              this.uploadAttData.push(file)
+              this.$emit('updateData', {
+                html: html2json(this.editor.getHTML()).child,
+                enclosure: this.uploadAttData
+              })
+            }
           } else {
             this.imgHtml(r.data)
           }

package/src/components/flip/img/dingwei.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1750386274453" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14208" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M783.530667 740.864L512 1012.394667l-271.530667-271.530667a384 384 0 1 1 543.061334 0zM512 640a170.666667 170.666667 0 1 0 0-341.333333 170.666667 170.666667 0 0 0 0 341.333333z m0-85.333333a85.333333 85.333333 0 1 1 0-170.666667 85.333333 85.333333 0 0 1 0 170.666667z" fill="#4B0C77" p-id="14209"></path></svg>

package/src/components/flip/img/guanbi.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1750386430720" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14817" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M896.85645653 772.26033067L896.92194773 772.26033067 896.92194773 771.86628907Z" fill="#ffffff" p-id="14818"></path><path d="M955.56967253 511.99781653c0-244.60347307-199.00494827-443.56257813-443.56148586-443.56257813-244.61766293 0-443.576768 198.95910507-443.576768 443.56257813 0 244.58709973 198.95910507 443.56366933 443.576768 443.56366934C756.563632 955.56148587 955.56967253 756.58491733 955.56967253 511.99781653M512.00818667 891.916752c-209.46723093 0-379.91784427-170.48226667-379.91784427-379.91893547 0-209.46613973 170.45061227-379.90147093 379.91784427-379.90147093 209.43448533 0 379.88728107 170.4353312 379.88728106 379.90147093C891.89546773 721.43448533 721.442672 891.916752 512.00818667 891.916752" fill="#ffffff" p-id="14819"></path><path d="M693.73754347 650.9098592L556.58394987 513.3491264 693.61201813 377.84482987c12.4390368-12.28185707 12.5329088-32.35503147 0.24995947-44.79516054-12.28185707-12.45541013-32.38668587-12.55037333-44.82790613-0.2368608L511.88156907 468.475376 376.77131413 332.93942507c-12.37572907-12.37682027-32.41943147-12.4390368-44.82681493-0.0633088-12.37682027 12.3931936-12.37682027 32.4347136-0.0633088 44.81262506l134.9530752 135.3471168L330.81367787 647.57852053c-12.44012907 12.31351147-12.5656544 32.32556053-0.25105067 44.767872 6.21951893 6.28282667 14.32519573 9.4220576 22.49199787 9.4220576 8.042368 0 16.14586133-3.07701333 22.30425493-9.14044373l136.20833173-134.73258773L648.84632853 695.6755488c6.18895573 6.18677333 14.32410347 9.29871573 22.46034347 9.29871573 8.1056768 0 16.17642453-3.1119424 22.36647147-9.23649813C706.05105493 683.39369173 706.08052693 663.34889707 693.73754347 650.9098592" fill="#ffffff" p-id="14820"></path></svg>

package/src/components/flip/img/qubiezhen.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1750386362780" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14614" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M902.8 192.9c-36.8-39-86.9-60.8-139.1-60.7h-0.2c-52-0.1-102 21.6-138.7 60.4l-0.1 0.1-362.3 381.2c-33.7 35.6-43.7 89-25.4 135.4 18.3 46.4 61.4 76.6 109.2 76.5 30.2 0 60.3-12 83.2-36.2l362.3-381.2c15.4-16.2 15.4-42.4 0-58.6-15.4-16.2-40.3-16.2-55.7 0L373.8 691c-7.4 7.7-17.4 12-27.8 12-10.4 0-20.4-4.4-27.7-12.2-7.5-7.6-11.7-18.1-11.8-29.1 0-11 4.1-21.5 11.5-29.2l362.3-381.2c22-23.3 52-36.3 83.2-36.2h0.1c31.3-0.1 61.4 13.1 83.5 36.4 22.3 23.4 34.6 54.7 34.6 87.8 0.1 32.9-12.3 64.5-34.4 87.7l-97.8 102.9-0.6 0.6-271.1 285.4c-76.9 80.8-201.5 80.9-278.5 0.1-37-38.8-57.7-91.5-57.5-146.4 0-55.4 20.5-107.5 57.7-146.6l369.4-388.7c15.4-16.2 15.4-42.4 0-58.6-15.4-16.2-40.3-16.2-55.7 0L143.8 464.4c-51.9 54.3-81 128.2-80.8 205.2 0 77.5 28.6 150.4 80.6 205 51.6 54.4 121.7 84.9 194.8 84.7 73.2 0.1 143.4-30.4 195.1-84.9l383.1-403.1c3.8-4.1 6.8-9 8.7-14.3 22.8-34.4 35.2-75 35.2-117.8 0.1-54.9-20.7-107.6-57.7-146.3" p-id="14615" fill="#ffffff"></path></svg>

package/src/components/flip/img/shanchu.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1750386795145" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="30056" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M358.925672 596.814688v30.450522c0 17.248849 13.985526 31.233352 31.233352 31.233352 17.248849 0 31.233352-13.985526 31.233352-31.233352v-30.450522c0-17.248849-13.985526-31.233352-31.233352-31.233352-17.248849 0-31.233352 13.985526-31.233352 31.233352zM602.506317 596.814688v30.450522c0 17.248849 13.985526 31.233352 31.233352 31.233352s31.233352-13.985526 31.233351-31.233352v-30.450522c0-17.248849-13.984503-31.233352-31.233351-31.233352s-31.233352 13.985526-31.233352 31.233352zM437.047937 699.686636c-14.650675 9.104355-19.155269 28.360931-10.04989 43.01263 11.015891 17.73185 41.238216 47.740304 84.651982 47.740304 43.195801 0 73.79368-29.780257 85.059258-47.379077 9.216919-14.391778 5.03262-33.338293-9.237385-42.742477-14.270005-9.393951-33.576723-5.409197-43.159985 8.739035-0.12689 0.188288-13.049201 18.915815-32.661888 18.915815-19.028379 0-30.93864-17.274432-31.772634-18.530028-9.175987-14.412244-28.259624-18.788925-42.829458-9.756202zM907.576407 160.082952H699.352015v-26.882254c0-40.145325-32.692586-72.807213-72.878844-72.807213h-229.046626c-40.186258 0-72.878844 32.661887-72.878844 72.807213v26.882254H116.323309c-17.248849 0-31.233352 13.984503-31.233352 31.233352s13.984503 31.233352 31.233352 31.233351h791.253098c17.248849 0 31.233352-13.984503 31.233352-31.233351s-13.985526-31.233352-31.233352-31.233352z m-270.692119 0H387.014404v-26.882254c0-5.607718 4.768607-10.340509 10.411117-10.340509h229.046627c5.64251 0 10.411117 4.732791 10.411117 10.340509v26.882254z" fill="#ffffff" p-id="30057"></path><path d="M824.286446 259.279185c-17.248849 0-31.233352 13.984503-31.233352 31.233352v530.07261c0 40.089044-32.692586 72.705905-72.878844 72.705906H303.725466c-40.186258 0-72.878844-32.616862-72.878844-72.705906v-530.07261c0-17.248849-13.984503-31.233352-31.233352-31.233352s-31.233352 13.984503-31.233352 31.233352v530.07261c0 74.535577 60.71378 135.172609 135.345548 135.172609h416.448784c74.632791 0 135.345548-60.637032 135.345548-135.172609v-530.07261c0-17.248849-13.984503-31.233352-31.233352-31.233352z" fill="#ffffff" p-id="30058"></path><path d="M355.781052 259.279185c-17.248849 0-31.233352 13.984503-31.233351 31.233352v167.494758c0 17.248849 13.985526 31.233352 31.233351 31.233352 17.248849 0 31.233352-13.985526 31.233352-31.233352v-167.494758c0-17.248849-13.984503-31.233352-31.233352-31.233352zM699.352015 458.007295v-167.494758c0-17.248849-13.984503-31.233352-31.233351-31.233352s-31.233352 13.984503-31.233352 31.233352v167.494758c0 17.248849 13.985526 31.233352 31.233352 31.233352s31.233352-13.984503 31.233351-31.233352zM511.949858 489.240647c17.248849 0 31.233352-13.985526 31.233352-31.233352v-167.494758c0-17.248849-13.985526-31.233352-31.233352-31.233352s-31.233352 13.984503-31.233352 31.233352v167.494758c-0.001023 17.248849 13.984503 31.233352 31.233352 31.233352z" fill="#ffffff" p-id="30059"></path></svg>

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

@@ -25,7 +25,10 @@
             <div class="wrap wrap-block" :ref="`wrap-${item.id}`" v-for="(item,index) in pageInfoArr" :key="index">
               <div class="wrap-can" v-show="!loading" ref="wrapCanBox">
                 <div class="extend-right" v-if="rightMenuShow" :style="extendStyle">
-                  <p @click.stop="extendRight(index)">链接扩展</p>
+                  <div class="extend-right-cont">
+                    <img src="../img/qubiezhen.svg" alt="">
+                    <p @click.stop="extendRight(null)">链接扩展</p>
+                  </div>
                 </div>
                 <div class="textLayer" ref="textLayer">
                   <span :dir="item2.dir" :style="styleText(item2,item.styles, item.id)" v-for="(item2) in item.items">{{ item2.str }}</span>
@@ -33,10 +36,16 @@
                 <div class="annotationLayer" ref="annotationLayer">
                   <template v-for="(item,index) in annotations">
                     <div :style="styleAnnotation(item)" class="magnifier" v-if="item.type === 'tag'">
-                      <img @click.stop="magnifierTap($event,item)" src="../img/fangdajing.png" alt="" />
-                      <div class="magnifier-list" v-if="item.show" :style="item.style">
+                      <div class="magnifier-head">
+                        <div class="magnifier-title">拓展阅读</div>
+                        <div class="magnifier-icon">
+                          <img v-if="rightClick&&!readOnly" @click.stop="annotationTap(item,'add')" src="../img/qubiezhen.svg" alt="" />
+                          <img v-if="!readOnly" @click.stop="annEmpty(item.list)" src="../img/shanchu.svg" alt="" />
+                          <img @click.stop="extendRightDel" src="../img/guanbi.svg" alt="" />
+                        </div>
+                      </div>
+                      <div class="magnifier-cont">
                         <div class="magnifier-list-item" @click="annotationTap(item2)" v-for="(item2,index2) in item.list">{{ index2+1 }}.{{ item2?.title }}</div>
-                        <div class="magnifier-list-add" @click="annotationTap(item,'add')">添加扩展链接</div>
                       </div>
                     </div>
                     <section v-else tabindex="1000" @click="annotationTap(item,item.id)" :style="styleAnnotation(item)">
@@ -68,7 +77,10 @@
           <div class="wrap" ref="wrap" v-show="!doublePage">
             <div class="wrap-can" v-show="!loading" ref="wrapCan">
               <div class="extend-right" v-if="rightMenuShow" :style="extendStyle">
-                <p @click.stop="extendRight(null)">链接扩展</p>
+                <div class="extend-right-cont">
+                  <img src="../img/qubiezhen.svg" alt="">
+                  <p @click.stop="extendRight(null)">链接扩展</p>
+                </div>
               </div>
               <div class="textLayer" ref="textLayer">
                 <span :dir="item.dir" :style="styleText(item,styles)" v-for="(item,index) in items">{{ item.str }}</span>
@@ -76,10 +88,19 @@
               <div class="annotationLayer" ref="annotationLayer">
                 <template v-for="(item,index) in annotations">
                   <div :style="styleAnnotation(item)" class="magnifier" v-if="item.type === 'tag'">
-                    <img @click.stop="magnifierTap($event,item)" src="../img/fangdajing.png" alt="" />
+                    <img @click.stop="magnifierTap($event,item)" src="../img/dingwei.svg" alt="" />
                     <div class="magnifier-list" v-if="item.show" :style="item.style">
-                      <div class="magnifier-list-item" @click="annotationTap(item2)" v-for="(item2,index2) in item.list">{{ index2+1 }}.{{ item2?.title }}</div>
-                      <div class="magnifier-list-add" @click="annotationTap(item,'add')">添加扩展链接</div>
+                      <div class="magnifier-head">
+                        <div class="magnifier-title">拓展阅读</div>
+                        <div class="magnifier-icon">
+                          <img v-if="rightClick&&!readOnly" @click.stop="annotationTap(item,'add')" src="../img/qubiezhen.svg" alt="" />
+                          <img v-if="!readOnly" @click.stop="annEmpty(item.list)" src="../img/shanchu.svg" alt="" />
+                          <img @click.stop="extendRightDel" src="../img/guanbi.svg" alt="" />
+                        </div>
+                      </div>
+                      <div class="magnifier-cont">
+                        <div class="magnifier-list-item" @click="annotationTap(item2)" v-for="(item2,index2) in item.list">{{ index2+1 }}.{{ item2?.title }}</div>
+                      </div>
                     </div>
                   </div>
                   <section v-else tabindex="1000" @click="annotationTap(item)" :style="styleAnnotation(item)">
@@ -277,6 +298,14 @@ export default {
     annotationsData: {
       type: Array,
       default: () => []
+    },
+    rightClick: {
+      type: Boolean,
+      default: true
+    },
+    readOnly: {
+      type: Boolean,
+      default: false
     }
   },
   watch: {
@@ -376,7 +405,7 @@ export default {
       immediate: true
     }
   },
-  emits: ['flip','annotationTap', 'annotationsSend'],
+  emits: ['flip','annotationTap', 'annotationsSend', 'empty'],
   mounted() {
     if (!this.doublePage) {
       this.id = 'canvas-wrap' + this.generateUniqueKey()
@@ -394,17 +423,19 @@ export default {
     this.cancelResizeObserver()
   },
   methods: {
+    annEmpty(v) {
+      this.$emit('empty',v)
+    },
     magnifierTap(e,v) {
       if(!v.show) this.extendRightDel()
       v.show = !v.show
       setTimeout(() => {
-        const w = e.target.nextSibling.offsetWidth
         const x = (v.rect[0] * this.scales / this.viewport?.width) * 100
         const y = ((this.viewport?.height - (v.rect[1] * this.scales)) / this.viewport?.height) * 100
         if(x > 50) {
-          v.style.left = `-${w?w + 5:0}px`
+          v.style.left = `-205px`
         }else {
-          v.style.right = `-${w?w + 5:0}px`
+          v.style.right = `-205px`
         }
         if(y > 40) {
           v.style.bottom = '0px'
@@ -446,6 +477,7 @@ export default {
     // 右键菜单
     rightMenu(e) {
       e.preventDefault()
+      if(!this.rightClick) return;
       if(this.doublePage) return;
       if(e.target.nodeName === 'SPAN') {
         const wid = this.$refs.wrap.offsetWidth - 10
@@ -454,7 +486,7 @@ export default {
         const style = e.target.attributes.style.value
         const size = style.match(/font-size:\s*([^;]+)/)[1].trim().replace(/px/g, "")
         const topMatch = style.match(/top:\s*([^;]+)/)[1].trim().replace(/%/g, "");
-        const x1 = this.viewport.width * (e.target.offsetLeft + (endOffset * Number(size)))/wid
+        const x1 = (this.viewport.width * (e.target.offsetLeft + (endOffset * Number(size)))/wid) - 3
         const y1 = this.viewport.height * (1 - (Number(topMatch/100))) - 3
         const x2 = x1 + 15
         const y2 = y1 + 15
@@ -462,7 +494,7 @@ export default {
         this.rightMenuShow = true
         this.extendStyle = {
           left: left + 'px',
-          top: Number(topMatch) + ((size/hei)*100) + '%'
+          top: Number(topMatch) - ((size/hei)*240) + '%'
         }
         this.annData = {
           rect: [x1/this.scales,y1/this.scales,x2/this.scales,y2/this.scales],
@@ -1658,51 +1690,95 @@ export default {
 }
 .magnifier-list{
   position: absolute;
-  max-width: 300px;
+  width: 200px;
   background-color: #fff;
-  border-radius: 5px;
+  border-radius: 6px;
   box-shadow: 0 0 10px rgba(0, 0, 0, 0.25);
-  padding: 10px 20px;
   font-size: 14px;
   z-index: 1;
   animation: linkDown .4s linear forwards;
   opacity: 0;
+  overflow: hidden;
+}
+.magnifier-head{
+  height: 30px;
+  width: 100%;
+  background: #4B0C77;
+  line-height: 30px;
+  display: flex;
+  justify-content: space-between;
+  padding: 0 5px;
+  box-sizing: border-box;
+}
+.magnifier-icon>img{
+  width: 16px !important;
+  height: 16px !important;
+  margin-left: 10px;
+  position: relative;
+  top: 2px;
+}
+.magnifier-title{
+  font-size: 14px;
+  color: #fff;
+}
+.magnifier-cont{
+  padding: 5px;
 }
 .magnifier-list-item{
+  border-bottom: 1px dashed #ccc;
+  font-size: 12px;
   line-height: 24px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
+}
+.magnifier-list-item:last-child{
+  border-bottom: 0;
 }
 .magnifier-list-item:hover{
   color: #4B0C77 !important;
+  background: #eeeeee;
 }
 @keyframes linkDown {
   0% {
     opacity: 0;
   }
-  50% {
-    opacity: 0;
-  }
   100% {
     opacity: 1;
   }
 }
-.magnifier-list-add{
-  color: #666;
-  font-size: 12px;
-  padding: 5px 0;
-}
 .extend-right{
   position: absolute;
   z-index: 5;
-  background-color: #fff;
-  border-radius: 5px;
+  border-radius: 20px;
   box-shadow: 0 0 10px rgba(0, 0, 0, 0.25);
-  padding: 10px 20px;
-}
-.extend-right>p{
+  padding: 10px;
+  background-color: #4B0C77;
   cursor: pointer;
+  transform: scaleX(-1);
+}
+.extend-right-cont{
+  display: flex;
+  transform: scaleX(-1);
+}
+.extend-right:after {
+  content: '';
+  position: absolute;
+  top: 54%;
+  right: 0;
+  width: 30px;
+  height: 30px;
+  background: url("../img/sanjiao.png") no-repeat 0 0;
+  background-size: 100% 100%;
+  transform: rotate(-85deg) scaleY(-1);
+}
+.extend-right-cont>img{
+  width: 14px !important;
+  height: 14px !important;
+  position: relative;
+  top: 2px;
+}
+.extend-right-cont>p{
+  font-size: 12px;
+  color: #fff;
+  padding-left: 5px;
 }
 .isPointer{
   pointer-events: none;

package/src/index.js

@@ -89,7 +89,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.35.545',
+    version: '1.35.547',
     install,
     Calendar,
     Message,