zydx-plus 1.19.94 → 1.19.96

package/package.json

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

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

@@ -80,12 +80,10 @@ export default defineComponent({
     }
   },
   mounted() {
-    setTimeout(() => {
       this.formData.html = this.html
       setTimeout(() => {
-        if(this.readOnly) this.opts.editable.config.readOnly = this.readOnly
+          if(this.readOnly) this.opts.editable.config.readOnly = this.readOnly
       },0)
-    },0)
   },
   setup(props) {
     const { opts, handle, instance, clearContent, syncContent, reloadEditor } = useWangEditor({

package/src/components/editor/src/menu.js

@@ -42,16 +42,14 @@ class signButtonMenu {
         let nodes = JSON.parse(JSON.stringify(node)) //拷贝一份
         if(typeCode(node,'attachment')) return
         const resume = {
-            type: 'paragraph',
-            children: [{
-                type: 'attachment',
-                fileName: signData.text,
-                link: signData.ico,
-                children: [{text:''}]
-            }]
+            type: 'attachment',
+            fileName: signData.text,
+            link: signData.ico,
+            children: [{text:''}]
         }
         nodes.unshift(resume)
         editor.clear()
+        console.log(nodes)
         for(let i = 0; i < nodes.length; i++){
             editor.insertNode(nodes[i])
         }
@@ -166,6 +164,64 @@ class titleButtonMenu {
     }
 }
 
+class literatureButtonMenu {
+    constructor(v) {
+        titleData = v
+        this.title = '参考文献' // 自定义菜单标题
+        this.tag = 'button'
+    }
+    // 获取菜单执行时的 value ，用不到则返回空 字符串或 false
+    getValue(editor) {
+        return false
+    }
+    // 菜单是否需要激活（如选中加粗文本，“加粗”菜单会激活），用不到则返回 false
+    isActive(editor) {
+        return false
+    }
+    // 菜单是否需要禁用（如选中 H1 ，“引用”菜单被禁用），用不到则返回 false
+    isDisabled(editor) {
+        return false
+    }
+    // 点击菜单时触发的函数
+    exec(editor, value) {
+        if (this.isDisabled(editor)) return
+        const resume = {
+            type: 'attachment',
+            text: '[1]作者.期刊论文名称IJ1.期刊名称,发表年份(第几期):页码',
+            color: '#000000',
+            fontSize: '14px',
+        }
+        const resume2 = {
+            type: 'paragraph',
+            children: [{
+                text: '[2]作者.学位论文名称[D1.毕业院校所在城市:毕业院校,论文提交年份:页码',
+                color: '#000000',
+                fontSize: '14px',
+            }]
+        }
+        const resume3 = {
+            type: 'paragraph',
+            children: [{
+                text: '[3]作者.著作名称[M.出版社所在城市:出版社名称,出版年份:页码.',
+                color: '#000000',
+                fontSize: '14px',
+            }]
+        }
+        const resume4 = {
+            type: 'paragraph',
+            children: [{
+                text: '[4]作者.文章名称[N].报纸名称,发行日期(版面)',
+                color: '#000000',
+                fontSize: '14px',
+            }]
+        }
+        editor.insertNode(resume)
+        editor.insertNode(resume2)
+        editor.insertNode(resume3)
+        editor.insertNode(resume4)
+    }
+}
+
 const signMenuConf = {
     key: 'signMenu',
     factory(v) {
@@ -186,7 +242,13 @@ const titleMenuConf = {
         return new titleButtonMenu(v)
     },
 }
+const literatureMenuConf = {
+    key: 'literatureMenu',
+    factory(v) {
+        return new literatureButtonMenu(v)
+    },
+}
 
 export const menuModule = {
-    menus: [signMenuConf,redMenuConf,titleMenuConf]
+    menus: [signMenuConf,redMenuConf,titleMenuConf,literatureMenuConf]
 }

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

@@ -14,7 +14,7 @@
             </div>
         </div>
         <div class="ed-cont" :style="heightStyleCont">
-            <div :style="{'border': (readOnly)? '1px solid #ccc': '0'}" v-if="editorShow">
+            <div :style="{'border': (borderShow)? '1px solid #ccc': '0'}" v-if="editorShow">
                 <editor-content class="editor" :editor="editor" :style="heightStyleCont" />
             </div>
             <div class="editor-but" v-if="butText !== ''&& readOnly">
@@ -154,6 +154,10 @@ export default {
         editorShow: {
             type: Boolean,
             default: true
+        },
+        borderShow: {
+            type: Boolean,
+            default: true
         }
     },
     emits: ['see','del','complete','update:data'],
@@ -297,7 +301,7 @@ export default {
             const url = this.uploadImage.url + this.uploadAttData[index].filePath
             let a = document.createElement('a');
             a.style.display = 'none';
-            a.download = this.uploadAttData[index].filename;
+            a.download = this.uploadAttData[index].filename? this.uploadAttData[index].filename : this.uploadAttData[index].annexName;
             a.href = url;
             document.body.appendChild(a);
             a.click();

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

@@ -1,135 +1,136 @@
 <template>
-  <div id="docView">
-      <div style="height: 100%;">
-          <div class="book">
-              <div class="pages">
-                  <div class="wrap" id="canvas-wrap">
-                      <div class="wrap-can">
-                          <canvas id="the-canvas"></canvas>
-                      </div>
-                  </div>
-                  <div class="page-but-left" :style="{cursor: pageIndex === 1?'default':'pointer'}" @click="flipLeft(pageIndex-=1,false)"></div>
-                  <div class="page-but-right" :style="{cursor: pageIndex === pdfPages?'default':'pointer'}" @click="flipRight(pageIndex+=1,false)"></div>
-<!--                  <div class="paper z-in" :class="{'data-right': pages}">-->
-<!--                      <div class="page page-2" id="canvas-wrap1"></div>-->
-<!--                      <div class="page page-2-back" id="canvas-wrap2"></div>-->
-<!--                  </div>-->
-<!--                  <div class="paper z-in-ac">-->
-<!--                      <div class="page page-2" id="canvas-wrap3"></div>-->
-<!--                      <div class="page page-2-back" id="canvas-wrap4"></div>-->
-<!--                  </div>-->
-              </div>
-          </div>
-          <div class="but-wrap" v-if="butShow">
-              <button class="but-brown" :disabled="pageIndex === 1" :class="{'but-act': pageIndex === 1}" @click="flipLeft(pageIndex-=1,false)">上一页</button>
-              <button class="but-brown" :disabled="pageIndex === pdfPages" :class="{'but-act': pageIndex === pdfPages}" @click="flipRight(pageIndex+=1,false)">下一页</button>
-          </div>
-      </div>
-  </div>
+    <div class="docView">
+        <div style="height: 100%;">
+            <div class="book">
+                <div class="pages">
+                    <div class="wrap">
+                        <div class="wrap-can">
+                            <canvas :id="id"></canvas>
+                        </div>
+                    </div>
+                    <div class="page-but-left" :style="{cursor: pageIndex === 1?'default':'pointer'}" @click="flipLeft(pageIndex-=1,false)"></div>
+                    <div class="page-but-right" :style="{cursor: pageIndex === pdfPages?'default':'pointer'}" @click="flipRight(pageIndex+=1,false)"></div>
+                    <!--                  <div class="paper z-in" :class="{'data-right': pages}">-->
+                    <!--                      <div class="page page-2" id="canvas-wrap1"></div>-->
+                    <!--                      <div class="page page-2-back" id="canvas-wrap2"></div>-->
+                    <!--                  </div>-->
+                    <!--                  <div class="paper z-in-ac">-->
+                    <!--                      <div class="page page-2" id="canvas-wrap3"></div>-->
+                    <!--                      <div class="page page-2-back" id="canvas-wrap4"></div>-->
+                    <!--                  </div>-->
+                </div>
+            </div>
+            <div class="but-wrap" v-if="butShow">
+                <button class="but-brown" :disabled="pageIndex === 1" :class="{'but-act': pageIndex === 1}" @click="flipLeft(pageIndex-=1,false)">上一页</button>
+                <button class="but-brown" :disabled="pageIndex === pdfPages" :class="{'but-act': pageIndex === pdfPages}" @click="flipRight(pageIndex+=1,false)">下一页</button>
+            </div>
+        </div>
+    </div>
 </template>
 
 <script>
-import * as PdfJs from 'pdfjs-dist/legacy/build/pdf.js' // 注意导入的写法
-import { TextLayerBuilder } from 'pdfjs-dist/web/pdf_viewer'
+import * as PdfJs from 'pdfjs-dist/legacy/build/pdf.js' // 注意导入的写法d
 PdfJs.GlobalWorkerOptions.workerSrc = require('pdfjs-dist/build/pdf.worker.entry')
 export default {
-  name: "zydx-flip",
-  data() {
-    return {
-      pdfPages: 0,
-      imgArr: {},
-      hei: 0,
-      pageIndex: this.page,
-      show: false,
-      load: 0,
-      loadWidth: 0,
-      pages: false,
-      pagesData: [],
-      opacity: 1
-    }
-  },
-  props: {
-    source: {
-      type: String,
-      default: ''
+    name: "zydx-flip",
+    data() {
+        return {
+            pdfPages: 0,
+            imgArr: {},
+            hei: 0,
+            pageIndex: this.page,
+            show: false,
+            load: 0,
+            loadWidth: 0,
+            pages: false,
+            pagesData: [],
+            opacity: 1,
+            id: null
+        }
+    },
+    props: {
+        source: {
+            type: String,
+            default: ''
+        },
+        singlePage: {
+            type: Boolean,
+            default: false
+        },
+        butShow: {
+            type: Boolean,
+            default: true
+        },
+        page: {
+            type: Number,
+            default: 1
+        }
     },
-    singlePage: {
-      type: Boolean,
-      default: false
+    watch: {
+        page: {
+            handler: function (val, oldVal) {
+                this.pageIndex = val
+            },
+            immediate: true
+        }
     },
-    butShow: {
-      type: Boolean,
-      default: true
+    emits: ['flip'],
+    mounted() {
+        this.readPdf()
+        this.id = 'canvas-wrap' + Math.random().toString(36).substr(2)
     },
-    page: {
-      type: Number,
-      default: 1
+    methods: {
+        flipLeft(e,v) {
+            if(e <= 1) {
+                this.pageIndex = 1
+            }else {
+                this.pageIndex = e
+            }
+            this.readPdf()
+            if(!v) {
+                this.$emit('flip', {
+                    page: this.pageIndex,
+                    total: this.pdfPages
+                })
+            }
+        },
+        flipRight(e,v) {
+            if(e >= this.pdfPages) {
+                this.pageIndex = this.pdfPages
+            }else {
+                this.pageIndex = e
+            }
+            this.readPdf()
+            if(!v) {
+                this.$emit('flip', {
+                    page: this.pageIndex,
+                    total: this.pdfPages
+                })
+            }
+        },
+        readPdf() {
+            let that = this
+            const loadingTask = PdfJs.getDocument(this.source)
+            loadingTask.promise.then((pdf) => {
+                that.pdfPages = pdf.numPages // 获取pdf文件的总页数
+                pdf.getPage(that.pageIndex).then(function (page) {
+                    let canvas = document.getElementById(that.id)
+                    let ctx = canvas.getContext('2d');
+                    let viewport = page.getViewport({scale: 1})
+                    canvas.width = viewport.width * 2
+                    canvas.height = viewport.height * 2
+                    canvas.style.width = viewport.width + 'px'
+                    canvas.style.height = viewport.height + 'px'
+                    let renderContext = {
+                        canvasContext: ctx,
+                        viewport: viewport,
+                        transform: [2, 0, 0, 2, 0, 0]//这里会进行放大，解决模糊问题
+                    }
+                    page.render(renderContext)
+                })
+            })
+        }
     }
-  },
-  watch: {
-      page: {
-         handler: function (val, oldVal) {
-            this.pageIndex = val
-         },
-         immediate: true
-      }
-  },
-  emits: ['flip'],
-  mounted() {
-     this.readPdf()
-  },
-  methods: {
-      flipLeft(e,v) {
-          if(e <= 1) {
-              this.pageIndex = 1
-          }else {
-              this.pageIndex = e
-          }
-          this.readPdf()
-          if(!v) {
-              this.$emit('flip', {
-                  page: this.pageIndex,
-                  total: this.pdfPages
-              })
-          }
-      },
-      flipRight(e,v) {
-          if(e >= this.pdfPages) {
-              this.pageIndex = this.pdfPages
-          }else {
-              this.pageIndex = e
-          }
-          this.readPdf()
-          if(!v) {
-              this.$emit('flip', {
-                  page: this.pageIndex,
-                  total: this.pdfPages
-              })
-          }
-      },
-      readPdf() {
-          let that = this
-          const loadingTask = PdfJs.getDocument(this.source)
-          loadingTask.promise.then((pdf) => {
-              that.pdfPages = pdf.numPages // 获取pdf文件的总页数
-              pdf.getPage(that.pageIndex).then(function (page) {
-                  let canvas = document.getElementById('the-canvas')
-                  let ctx = canvas.getContext('2d');
-                  let viewport = page.getViewport({scale: 1})
-                  canvas.width = viewport.width * 2
-                  canvas.height = viewport.height * 2
-                  canvas.style.width = viewport.width + 'px'
-                  canvas.style.height = viewport.height + 'px'
-                  let renderContext = {
-                      canvasContext: ctx,
-                      viewport: viewport,
-                      transform: [2, 0, 0, 2, 0, 0]//这里会进行放大，解决模糊问题
-                  }
-                  page.render(renderContext)
-              })
-          })
-      }
-  }
 }
 </script>
 
@@ -176,27 +177,27 @@ export default {
     padding-bottom: 10px;
     font-size: 14px;
 }
-#docView{
-  height: 100%;
+.docView{
+    height: 100%;
 }
 .but-brown{
-  background-color: #c64c10;
-  padding: 0 20px;
-  font-size: 12px;
-  color: #fff;
-  height: 24px;
-  line-height: 24px;
-  border-radius: 5px;
-  border: 0;
-  cursor: pointer;
-  margin-left: 10px;
+    background-color: #c64c10;
+    padding: 0 20px;
+    font-size: 12px;
+    color: #fff;
+    height: 24px;
+    line-height: 24px;
+    border-radius: 5px;
+    border: 0;
+    cursor: pointer;
+    margin-left: 10px;
 }
 .book{
-  width: 100%;
-  height: 100%;
+    width: 100%;
+    height: 100%;
 }
-  .but-act{
+.but-act{
     background-color: #bbbbbb;
     color: #fff;
-  }
+}
 </style>

package/src/components/menuTree/src/ZydxMenuTree.vue

@@ -53,6 +53,11 @@ export default {
       required: true,
     },
   },
+  data () {
+      return {
+          pcatalogIds: ''
+      }
+  },
   computed: {
     targetTree: function () {
       let that = this;
@@ -109,7 +114,10 @@ export default {
     },
     // 点击回调事件
     clickItem(item) {
+      this.getPcatalogIds(item.pcatalogId);
+      item["catalogPIds"] = this.pcatalogIds.split("").reverse().join("");
       this.$emit("clickItem", item);
+      this.pcatalogIds = '';
     },
     // 递归调用修改状态
     setIsShowUpDown(item, index) {
@@ -123,6 +131,20 @@ export default {
         }
       }
     },
+    // 获取当前节点的父级id
+    getPcatalogIds: function (pcatalogId) {
+        let that = this
+        if (pcatalogId === '-1') {
+            that.pcatalogIds += ','
+        } else {
+            this.treeData.some(function (item) {
+                if (item.catalogId === pcatalogId) {
+                    that.pcatalogIds += ',' + item.catalogId
+                    that.getPcatalogIds(item.pcatalogId)
+                }
+            })
+        }
+    },
   },
 };
 </script>
@@ -134,6 +156,7 @@ export default {
   text-overflow: ellipsis;
   padding: 0px 10px;
   width: 100%;
+  box-sizing: border-box;
 }
 
 </style>

package/src/components/menuTree/src/ZydxMenuTreeInfo.vue

@@ -24,6 +24,7 @@ selectItem 传入当前选择的节点，是一个对象
           class="widthB100 ellipse cursor "
           :class="menuTitleStyle"
           @click.stop="clickItem(menuInfo)"
+          :title="menuInfo.title"
         >
           <template v-if="menuConfig.isCheckBox">
             <checkBox v-model="menuConfig.checkBoxValue" :value="menuInfo.catalogId"></checkBox>

package/src/components/select/src/select.vue

@@ -21,12 +21,14 @@
         </svg>
       </span>
       <transition>
-        <ul v-if="isOpen"
-            :class="{ 'custom-select-options': true, 'scroll': maxHeight > 0 }">
-          <li v-for="(option, idx) in options"
-              :key="idx"
-              @click="handleClick(option)">{{ option.label }}</li>
-        </ul>
+        <template v-if="options.length">
+          <ul v-if="isOpen"
+              :class="{ 'custom-select-options': true, 'scroll': maxHeight > 0 }">
+            <li v-for="(option, idx) in options"
+                :key="idx"
+                @click="handleClick(option)">{{ option.label }}</li>
+          </ul>
+        </template>
       </transition>
     </div>
   </div>

package/src/components/textarea/src/textarea.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="text" :style="{'min-height': height + 'px'}" contenteditable="true" ref="textarea"></div>
+    <div class="text" :style="{'min-height': height + 'px'}" :contenteditable="true" ref="textarea"></div>
 </template>
 
 <script>
@@ -16,7 +16,7 @@ export default {
         height: {
             type: Number,
             default: 200
-        },
+        }
     },
     watch: {
         value(val) {

package/src/index.js

@@ -57,7 +57,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.19.94',
+    version: '1.19.96',
     install,
     Calendar,
     Message,