zydx-plus 1.30.161 → 1.30.163

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zydx-plus",
-  "version": "1.30.161",
+  "version": "1.30.163",
   "description": "Vue.js",
   "main": "src/index.js",
   "files": [
@@ -22,19 +22,22 @@
   "dependencies": {
     "vue-draggable-next": "^2.1.1",
     "pdfjs-dist": "^2.0.943",
-    "@wangeditor/editor": "^5.1.23",
     "snabbdom": "^3.5.1",
-    "@wangeditor/plugin-formula": "^1.0.11",
     "katex": "^0.15.6",
     "simple-mind-map": "^0.5.11",
     "html2json": "^1.0.2",
     "@tiptap/extension-image": "^2.0.3",
     "@tiptap/starter-kit": "^2.0.3",
     "@tiptap/vue-3": "^2.0.3",
-    "@tiptap/extension-text-align": "^2.0.3",
+    "@tiptap/extension-color": "^2.0.3",
+    "@tiptap/extension-font-family": "^2.0.3",
+    "@tiptap/extension-horizontal-rule": "^2.0.3",
+    "@tiptap/extension-paragraph": "^2.0.3",
     "@tiptap/extension-placeholder": "^2.0.3",
+    "@tiptap/extension-superscript": "^2.0.3",
+    "@tiptap/extension-text-align": "^2.0.3",
     "@tiptap/extension-text-style": "^2.0.3",
-    "@tiptap/extension-color": "^2.0.3",
+    "@tiptap/extension-link": "^2.0.3",
     "@vue-office/docx": "^1.1.3",
     "@vue-office/excel": "^1.1.3",
     "fabric": "^5.3.0"

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

@@ -15,9 +15,9 @@
            <div class="drag-cont-slot">
                <slot name="content"></slot>
            </div>
-           <i class="down" v-if="dragStatus" @mousedown="footDown($event,'d')" @mouseup="footUp"></i>
-           <i class="in" v-if="dragStatus" @mousedown="footDown($event,'in')" @mouseup="footUp"></i>
-           <i class="right" v-if="dragStatus" @mousedown="footDown($event,'r')" @mouseup="footUp"></i>
+           <i class="drag-down" v-if="dragStatus" @mousedown="footDown($event,'d')" @mouseup="footUp"></i>
+           <i class="drag-in" v-if="dragStatus" @mousedown="footDown($event,'in')" @mouseup="footUp"></i>
+           <i class="drag-right" v-if="dragStatus" @mousedown="footDown($event,'r')" @mouseup="footUp"></i>
        </div>
        <div class="down-text" v-if="dragStatus">
            <div class="down-text-cont">
@@ -98,7 +98,7 @@ export default {
     },
     computed: {
         position() {
-            return `top:${this.y}px;left:${this.x}px;width:${this.footRightOffset}px;height:${this.footDownOffset}px;`;
+            return `transform: translate(${this.x}px, ${this.y}px);width:${this.footRightOffset}px;height:${this.footDownOffset}px;`;
         },
     },
     emits: ['dragStatus','close'],
@@ -201,7 +201,7 @@ export default {
     padding: 0 10px;
     text-align: right;
 }
-.down{
+.drag-down{
     position: absolute;
     bottom: -50px;
     right: 20px;
@@ -212,7 +212,7 @@ export default {
     cursor: ns-resize;
     user-select: none;
 }
-.in{
+.drag-in{
     position: absolute;
     bottom: -40px;
     right: -20px;
@@ -223,7 +223,7 @@ export default {
     cursor: nwse-resize;
     user-select: none;
 }
-.right{
+.drag-right{
     position: absolute;
     bottom: 0;
     right: -20px;
@@ -272,6 +272,8 @@ export default {
 }
 .drag-pop {
     position: fixed;
+    top: 0;
+    left: 0;
     box-shadow: 0 0 3px 2px #ccc;
     background-color: #fff;
     border-radius: 3px;

package/src/components/editor/src/butJson.js

@@ -0,0 +1,143 @@
+
+const num = {1: '①', 2: '②', 3: '③', 4: '④', 5: '⑤', 6: '⑥', 7: '⑦', 8: '⑧', 9: '⑨', 10: '⑩', 11: '⑪', 12: '⑫', 13: '⑬', 14: '⑭', 15: '⑮', 16: '⑯', 17: '⑰', 18: '⑱', 19: '⑲', 20: '⑳',}
+
+export function butJson (editor,data) {
+    return {
+        signMenu: {
+            name: '添加标志',
+            key: 'signMenu',
+            menuKeys: []
+        },
+        titleMenu: {
+            name: '添加标题',
+            key: 'titleMenu',
+            menuKeys: [
+                {name: '(中)黑体小4号', key: 'blackCenter4'},
+                {name: '(左)黑体小4号', key: 'blackLeft4'},
+                {name: '(中)黑体5号', key: 'blackCenter5'},
+                {name: '(左)黑体5号', key: 'blackLeft5'},
+            ],
+            html: {
+                blackCenter4: `<p data-signId="title" style="text-align: center;"><span style="font-weight: 700;color: rgb(0, 0, 0);font-size: 16px;font-family: SimHei">${menusData(data,'titleMenu')?.text}</span></p>`,
+                blackLeft4: `<p data-signId="title" style="text-align: left;"><span style="font-weight: 700;color: rgb(0, 0, 0);font-size: 16px;font-family: SimHei">${menusData(data,'titleMenu')?.text}</span></p>`,
+                blackCenter5: `<p data-signId="title" style="text-align: center;"><span style="font-weight: 700;color: rgb(0, 0, 0);font-size: 14px;font-family: SimHei">${menusData(data,'titleMenu')?.text}</span></p>`,
+                blackLeft5: `<p data-signId="title" style="text-align: left;"><span style="font-weight: 700;color: rgb(0, 0, 0);font-size: 14px;font-family: SimHei">${menusData(data,'titleMenu')?.text}</span></p>`,
+            }
+        },
+        textMenu: {
+            name: '添加正文',
+            key: 'textMenu',
+            menuKeys: [
+                {name: '宋体5号', key: 'Song5'},
+                {name: '楷体5号', key: 'regular5'},
+            ],
+            html: {
+                Song5: `<p style="text-align: left;"><span style="color: rgb(0, 0, 0);font-size: 14px;font-family: SimSun">请输入正文</span></p>`,
+                regular5: `<p style="text-align: left;"><span style="color: rgb(0, 0, 0);font-size: 14px;font-family: KaiTi">请输入正文</span></p>`,
+            }
+        },
+        redMenu: {
+            name: '添加红头',
+            key: 'redMenu',
+            menuKeys: [],
+            html: `<p style="text-align: center;"><span style="color: rgb(225, 60, 57);font-size: 48px;">XXXXXXX(单位)文件</span></p><p data-signId="red" style="text-align: center;"><span style="color: rgb(0, 0, 0);font-size: 16px;">xxx〔xx〕xxxx 号</span></p>`
+        },
+        authorMenu: {
+            name: '添加作者',
+            key: 'authorMenu',
+            menuKeys: [],
+            html: `<p <p contenteditable="false" data-signId="author" style="text-align: center;"><span style="color: rgb(0, 0, 0);font-size: 14px;">${menusData(data,'authorMenu')?.text}</span></p>`
+        },
+        subjectMenu: {
+            name: '添加题目',
+            key: 'subjectMenu',
+            menuKeys: [],
+            html: `<p contenteditable="false" data-signId="subject" style="text-align: center;"><span style="color: rgb(0, 0, 0);font-size: 24px;">${menusData(data,'subjectMenu')?.text}</span></p>`
+        },
+        paragraphMenu: {
+            name: '添加落款',
+            key: 'paragraphMenu',
+            menuKeys: [],
+            html: `<p data-signId="paragraph" style="text-align: right;"><span style="color: rgb(0, 0, 0);font-size: 14px;font-weight: 700;">落款人名</span></p><p style="text-align: right;"><span style="color: rgb(0, 0, 0);font-size: 14px;font-weight: 700">${getTime()}</span></p>`
+        },
+        numberMenu: {
+            name: '标注编号',
+            key: 'numberMenu',
+            menuKeys: [],
+            html: `<sup>【${menusData(data,'numberMenu')?.text}】</sup>`
+        },
+        keywordMenu: {
+            name: '关键词',
+            key: 'keywordMenu',
+            menuKeys: [],
+            html: `<p><span style="color: rgb(0, 0, 0);font-size: 14px;font-weight: 700;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;关键词：</span><span style="color: rgb(0, 0, 0);font-size: 14px;font-family: KaiTi">关键词内容...</span></p>`
+        },
+        abstractMenu: {
+            name: '添加摘要',
+            key: 'abstractMenu',
+            menuKeys: [],
+            html: `<p><span style="color: rgb(0, 0, 0);font-size: 14px;font-weight: 700;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;摘要：</span><span style="color: rgb(0, 0, 0);font-size: 14px;font-family: KaiTi">摘要内容...</span></p>`
+        },
+        literatureMenu: {
+            name: '添加文献',
+            key: 'literatureMenu',
+            menuKeys: [],
+            html: `<p><span style="color: rgb(0, 0, 0);font-size: 14px;font-family: KaiTi">[1]作者.期刊论文名称IJ1.期刊名称,发表年份(第几期):页码</span></p><p><span style="color: rgb(0, 0, 0);font-size: 14px;font-family: KaiTi">[2]作者.学位论文名称[D1.毕业院校所在城市:毕业院校,论文提交年份:页码</span></p><p><span style="color: rgb(0, 0, 0);font-size: 14px;font-family: KaiTi">[3]作者.著作名称[M.出版社所在城市:出版社名称,出版年份:页码.</span></p><p data-signId="literature"><span style="color: rgb(0, 0, 0);font-size: 14px;font-family: KaiTi">[4]作者.文章名称[N].报纸名称,发行日期(版面)</span></p>`
+        },
+        taggingMenu: {
+            name: '添加标注',
+            key: 'taggingMenu',
+            menuKeys: [],
+            html: [
+                `<sup>${num[numSort(editor)]}</sup>`,
+                `<hr class="custom-link" contenteditable="false">`,
+                `<p data-signId="s-${numSort(editor)}"><span style="font-family: KaiTi">${num[numSort(editor)]}填写标注内容<span></p>`
+            ],
+            index: numSort(editor)
+        },
+        'group-image': {
+            name: '上传图片',
+            key: 'group-image',
+            menuKeys: [
+                {name: '网络图片', key: 'insertImage'},
+                {name: '上传图片', key: 'uploadImage'},
+            ],
+        },
+        'group-upload': {
+            name: '上传文件',
+            key: 'group-upload',
+            menuKeys: [],
+            html: `<p contenteditable="false" data-signId="enclosure"><span style="font-weight: 700;font-size: 16px;">附件列表：</span></p>`
+        }
+    }
+}
+
+function numSort(editor) {
+    let num = 1
+    const data = editor.getJSON().content
+    data.forEach((item, index) => {
+        const id = item?.attrs?.signId
+        if(id) {
+            let arr = item.attrs.signId.split('-')[1]
+            num = Number(arr) + 1 > num ? Number(arr) + 1 : num
+        }
+    })
+    return num
+}
+
+function menusData(data,key) {
+    let arr = {}
+    data.forEach(item => {
+        if (item.key === key) arr = item
+    })
+    return arr
+}
+
+// 时间
+function getTime() {
+    let date = new Date()
+    let year = date.getFullYear()
+    let month = date.getMonth() + 1
+    let day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
+    return year + '年' + month + '月' + day + '日'
+}