zydx-plus 1.32.183 → 1.32.184

package/package.json

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

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

@@ -64,7 +64,7 @@ export function butJson (editor,data) {
             name: '标注编号',
             key: 'numberMenu',
             menuKeys: [],
-            html: `<sup>【${menusData(data,'numberMenu').text}】</sup>`
+            html: `<sup>[${menusData(data,'numberMenu').text}]</sup>`
         },
         keywordMenu: {
             name: '关键词',
@@ -95,6 +95,15 @@ export function butJson (editor,data) {
             ],
             index: numSort(editor)
         },
+        ackMenu: {
+            name: '致谢',
+            key: 'ackMenu',
+            menuKeys: [],
+            html: [
+                `<p data-signId="ack" contenteditable="false" style="text-align: center;"><span style="color: rgb(0, 0, 0);font-size: 24px;font-weight: bold;">致谢</span></p>`,
+                `<p><span style="color: rgb(0, 0, 0);font-size: 14px;">致谢内容...</span></p>`
+            ]
+        },
         'group-image': {
             name: '上传图片',
             key: 'group-image',

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

@@ -5,11 +5,11 @@
                 <div class="editor-but-name" v-if="item.key === 'group-upload'">
                     <label>
                         <input type="file" @change="upload($event,item.key)" accept=".docx,.pptx,.pdf,.xlsx" style="display: none;">
-                        <span>{{ item.name }}</span>
+                        <span v-html="item.name"></span>
                     </label>
                 </div>
                 <div v-else class="editor-but-name" @click="butTap(item,0)">
-                    <span>{{ item.name }}</span>
+                    <span v-html="item.name"></span>
                     <img v-if="item.menuKeys.length > 0" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAYAAACtWK6eAAAAAXNSR0IArs4c6QAADL5JREFUeF7tnXvIZlUVxn9iSZQlYomEJdEFSTMsS9EuSEZhWSOapmQZkplUNoqWJkmKZSpKTmKkGJWS6BgOaTdSklJRcsokRUmMIikQBKEwjIxn5oTfvMz3vfvd77nsvdez/pl/9mWt39rPnO/sd529d8BmAiawKoEdzMYETGB1AhaIV4cJrEHAAvHyMAELxGvABPII+AmSx829ghCwQIIk2mHmEbBA8ri5VxACFkiQRDvMPAIWSB439wpCwAIJkmiHmUfAAsnj5l5BCFggQRLtMPMIWCB53NwrCAELJEiiHWYeAQskj5t7BSFggQRJtMPMI2CB5HFzryAELJAgiXaYeQQskDxu7hWEgAUSJNEOM4+ABZLHzb2CELBAgiTaYeYRsEDyuLlXEAIWSJBEO8w8AhZIHjf3CkLAAgmSaIeZR8ACyePmXkEIWCBBEu0w8whYIHnc3CsIAQskSKIdZh4BCySPm3sFIWCBBEm0w8wjYIHkcXOvIAQskCCJdph5BCyQPG7uFYSABRIk0Q4zj4AFksfNvYIQsECCJNph5hGwQPK4uVcQAhZIkEQ7zDwCFkgeN/cKQmAsgfwc2D0IU4c5HoH9h55qLIEcDNw1dDAePxSBdcCmoSMeSyCK4yrglKED8vghCNwMHD1GpGMKZA/gT8BLxgjMczRNYD/gwTEiHFMgiudM4OIxAvMczRK4BDhrrOjGFoji+gPwprEC9DxNEfgH8Frgn2NFNYVAjgI2jhWg52mKwGeAb48Z0RQCUXy3AB8eM1DPVT2Bu4FDxo5iKoFo/3rz2MF6vqoJvA/4xdgRTCUQxXkZsH7sgD1flQSuA06YwvMpBfIy4DHg5VME7jmrIvD67ieC0Z2eUiAK9rPAhtGj9oQ1ETgfOG8qh6cWiOK+F3j7VAA8b9EEHu+2dZ+byssSBHI4cNtUADxv0QROBL43pYclCETx/xD46JQgPHdxBG4HDpvaq1IEsjfw8NQwPH9RBN4F/Hpqj0oRiDhcCJwzNRDPXwSBq4GTS/CkJIG8sNv2fVUJYOzDZASe6V7Mn5jMgxUTlyQQuXUScE0JYOzDZATOBi6abPaZiUsTiNz7FfDuUgDZj1EJPATsM+qMcyYrUSCHAneUBMm+jEbgGOCm0WZLmKhEgcjta4FPJvjvJu0QuBU4orRwShXIq7sX9heUBsz+DEbgAOD+wUbPHLhUgSicc4ELMuNyt7oIXAGcVqLLJQtEvB4B3lAiOPvUG4Gnum1d/VuclS6Q44Hri6Nmh/okoCeHniBFWukCEbSfAu8vkp6dWpaA3jn07lGs1SCQg4B7iiVox5YhoF0r7V4VazUIRPCuBE4tlqIdyyFwI3BsTscx+9QikFd0274vHROO5xqUgH4x1y/nRVstAhHEM4BLi6Zp51IJqNZKNVfFW00CEczfA28unqodXIuAqnR1OqKqdou32gRyJPCj4qnawbUI6DsPfe9RhdUmEEGVQCQUW30E9IWgvhSsxmoUiI6+f6AawnZ0JQF9Y65vzauxGgUiuHpZ10u7rR4COp1Ep5RUZbUKZOdu29f3Htax3HSulV7Mdc5VVVarQARZPxzqB0Rb+QR0MqJOSKzOahaIYKsERaUotnIJ6No9na1bpdUuEBUxqpjRVi4Bncqu09mrtNoFIugqh1dZvK08ArrPQ/d6VGstCESP70erzUDbjutGKN0MVa21IBDB16e5+kTXVg4B3SWoOwWrtlYEsmO37btX1dlox3ndQqttXd1KW7W1IhAlQccE6bgg2/QEdI+57jOv3loSiJKhA+d08JxtOgIPAioHasJaE4gK4e5sIjP1BnFUSxXXrQlEy0qHX+sQbNv4BDYB68afdrgZWxTInt0L+07DYfPIqxDYv/uorRlALQpEydFFPLqQxzYegcuB08ebbpyZWhWI6OlKN13tZhuewJPdtu7Tw0817gwtC0SXgupyUNvwBHTffZOV1S0LRMtC10vrmmnbcATuAw4cbvhpR25dIG8DlEDbcAT0H1CzFdWtC0TLYgOgPwFs/RO4ATiu/2HLGTGCQHbrtn13KQd7M55oE0RXVDRrEQSi5K0HLms2i9MEpm305iuoowhES2gzoB+ybMsT+Gu3rfvs8kOVPUIkgXwIUCmEbXkCKuUJUTkdSSBaFhsBFdPZ8gnoHvswFdPRBLIvoHJsWz4BiUMiCWHRBKKkXgycGSK7/QepP6tCVUpHFMiLu23fPfpfP02P+J/uxfwvTUc5E1xEgQjBKcBVkRLdQ6za0g1XIR1VIFovdwEH97BwIgyhHwNDVkZHFsh7AR1sZptPQAfzhayMjiwQLYsfAB+bvz5Ct1AhYtiK6OgC0dlNOlzZtjoBHQ5+b1RA0QWivH8V+ErUBTAnbn0EFboS2gIBMXgMeI1Fsg0BfT6rJ6w+pw1rFsjW1H8c0BVhtucJ6Iq78BXQFsjzC+KXwHuskC0EdB+9K5/Z+ueFbSuBdwC6pti29ZrtWwzCApldA98BPhV8Yegeelc8d4vAT5Bt1fDK7oX9RYFFooOnXfFsgawqgS8BXw8qEN0/70rnFcn3E2T7Svgj8MZgItFlN9rW1eU3Nj9B1lwDHwFuDLZKdF2ark2z+QmStAZ+DHwwqWX9jXTfvCubt5NH/4m1+uJ+K/Db+td+UgS6qtmVzRZI0mJZ2eibwOcX7lVXB90z74rmVXLmJ8jai3nXbttX/7ZqumfeFc0WSPb61hNET5IW7XzgvBYD6ysmP0HSSOpdRO8kLdmfu23d/7YUVN+xWCBpRLWbpV2tluxEVzDPT6cFMp/R/1vodxH9PtKC3Q4c1kIgQ8dggaQT1i/r+oW9BdN98q5cTsikBZIAaUWTi4AvLtaluNZXAycX51WhDlkgiyVGVb76PFdVvzXav7sX87/V6PwUPlsgi1PX9yL6bqRGOxvQU9CWSMACSQQ100x/v+sLxJrsIWCfmhwuwVcLJC8L+nZd37DXZMcGrFBeOj8WSD5CnYKi01BqsFuBI2pwtDQfLZD8jOgcLb2w18BQ98VHqUzOz+h2etaQ3F4D7nkwnciokxlLtiuA00p2sGTfLJDls6NKWH2qWqI91fmmf20ZBCyQDGgzXfQthU6JL9G+0HAl8ii8LZB+MOtrPN03UpLdDxxQkkM1+mKB9JM1fc+tG6tKMt0L31oF8uh8LZD+kOtEkE/3N9xSI90EHLPUCO68hYAF0t9C0K252vbVLbpTm34x1y/ntiUJWCBLApzprlMJdQ/7lPYNQKdD2nogYIH0AHFmCJ1ru2//wyaN+ES3rftMUms3mkvAApmLaOEGOhl948K9+umg7zz0vYetJwIWSE8gZ4bZBGgXaUz7DfDOMSeMMJcFMkyWdTvT5mGGXnVUfWOub81tPRKwQHqEOTOU7vdbP9zw24z8feATI80VahoLZLh079Jt++423BRbRn6uezF/fOB5Qg5vgQybdt0xvmHYKbacjKgTEm0DELBABoA6M+R9gL7HGML0w+TrhhjYY24lYIEMvxIOB24baJoTgOsGGtvDWiCjrYEbAH0T3qepglj3etgGJOAnyIBwVwy9N/Bwz1MdAtzd85geboaABTLekrgQOKen6VQ5rDsFbQMTsEAGBrxi+J26bd89l5zyX9227t+XHMfdEwhYIAmQemxyEnDNkuOdBVyy5BjunkjAAkkE1WOzOwGdrp5jqhTeL6ej++QRsEDyuC3T61DgjswBjgZuzuzrbhkELJAMaD10+S6gG54WMVUIr1ukg9suT8ACWZ5hzgh7dS/sOy7Q+S3A7xZo76Y9ELBAeoCYOcS5wAWJfS8HTk9s62Y9ErBAeoSZMdSjgO4pX8ue7LZ1n84Y312WJGCBLAlwye7HA9fPGeNzwLeWnMfdMwlYIJngeuz2szVqqlQJfGCPc3moBQlYIAsCG6D5QcA9q4z7AeAnA8zpIRMJWCCJoAZudiVw6swcqgA+buB5PfwcAhZIGUtk927bd+cV7qgC+JEy3IvrhQVSTu7PAC7t3Pka8OVyXIvriQVSVu4fAHbttnWfLcu1mN5YIGXl/chOINeW5VZcbyyQuLl35AkELJAESG4Sl4AFEjf3jjyBgAWSAMlN4hKwQOLm3pEnELBAEiC5SVwCFkjc3DvyBAIWSAIkN4lLwAKJm3tHnkDAAkmA5CZxCVggcXPvyBMIWCAJkNwkLgELJG7uHXkCAQskAZKbxCVggcTNvSNPIGCBJEByk7gELJC4uXfkCQQskARIbhKXgAUSN/eOPIGABZIAyU3iErBA4ubekScQsEASILlJXAIWSNzcO/IEAhZIAiQ3iUvAAombe0eeQMACSYDkJnEJWCBxc+/IEwhYIAmQ3CQugf8B4iUV2AmRzcoAAAAASUVORK5CYII=" alt="" />
                 </div>
                 <div class="editor-but-down" v-if="item.menuKeys.length > 0">
@@ -17,9 +17,9 @@
                         <li @click="butTap(item,item2)" v-for="(item2,index2) in item.menuKeys">
                             <label v-if="item2.key === 'uploadImage'">
                                 <input type="file" @change="upload($event,item2.key)" accept="image/*" style="display: none;">
-                                <span>{{ item2.name }}</span>
+                                <span v-html="item2.name"></span>
                             </label>
-                            <span v-else>{{ item2.name }}</span>
+                            <span v-else v-html="item2.name"></span>
                         </li>
                     </ul>
                 </div>
@@ -221,7 +221,7 @@ export default {
     },
     emits: ['confirm','enclosure'],
     methods: {
-        readOnlyPage() {
+         readOnlyPage() {
             this.htmlArr = []
             const data = document.querySelectorAll('.editing-cont')[0].childNodes[0].childNodes
             let max = 1123
@@ -229,6 +229,11 @@ export default {
             let html = ''
             for (let i = 0; i < data.length; i++) {
                 let text = data[i].offsetHeight
+                if(data[i].dataset?.signid === 'ack') {
+                    this.htmlArr.push(html)
+                    pHeight = 0
+                    html = ''
+                }
                 if((pHeight + text) > max) {
                     // console.log(this.rows(data[i],(pHeight + text) - max))
                     this.htmlArr.push(html)
@@ -279,7 +284,7 @@ export default {
                 }
             }
         },
-        upSort(editor) {
+        upSort(editor,v) {
             const data = editor.state.selection.$anchor.path[0].content.content
             let num = 1
             let len = 0
@@ -294,7 +299,7 @@ export default {
                 }
             })
             return {
-                len: this.selectionPath('enclosure') + len,
+                len: this.selectionPath(v) + len,
                 num: num
             }
         },
@@ -313,12 +318,12 @@ export default {
                             if(b === -1) {
                                 const last = this.editor.state.selection.$anchor.path[0].content.size
                                 if(t === -1) this.editor.chain().focus().insertContentAt(last,html).run()
-                                const num = this.upSort(this.editor)
+                                const num = this.upSort(this.editor,'enclosure')
                                 const html2 = `<p contenteditable="false" data-signId="u-${num.num}"><a href="${url}" ><span>${num.num}. ${name}</span></a></p>`
                                 this.editor.chain().focus().insertContentAt(num.len,html2).run()
                             }else {
                                 if(t === -1) this.editor.chain().focus().insertContentAt(this.selectionPath('paragraph',b - 1),html).run()
-                                const num = this.upSort(this.editor)
+                                const num = this.upSort(this.editor,'enclosure')
                                 const html2 = `<p contenteditable="false" data-signId="u-${num.num}"><a href="${url}" ><span>${num.num}. ${name}</span></a></p>`
                                 this.editor.chain().focus().insertContentAt(num.len,html2).run()
                             }
@@ -385,7 +390,17 @@ export default {
         organizeButton() {
             this.toolbar.forEach(item => {
                 let obj = butJson(this.editor,this.menusText)[item.key === undefined? item : item.key]
-                if (obj) this.butData.push(obj)
+                if (obj) {
+                    if(item.key === undefined) {
+                        this.butData.push(obj)
+                    }else {
+                        this.butData.push({
+                            key: item.key,
+                            menuKeys: obj.menuKeys,
+                            name: item.title
+                        })
+                    }
+                }
             })
         },
         async butTap(data,key) {
@@ -436,8 +451,14 @@ export default {
             if(data.key === 'paragraphMenu') {
                 const html = butJson(this.editor,this.menusText)[data.key].html
                 const last = this.editor.state.selection.$anchor.path[0].content.size
+                const b = await this.signIdData('ack')
                 const r = await this.signIdData('paragraph')
-                if(r === -1) this.editor.chain().focus().insertContentAt(last,html).run()
+                if(b === -1) {
+                    if(r === -1) this.editor.chain().focus().insertContentAt(last,html).run()
+                }else {
+                    const num = this.upSort(this.editor,'ack')
+                    if(r === -1) this.editor.chain().focus().insertContentAt(num.len-3,html).run()
+                }
             }
             // 标注编号
             if(data.key === 'numberMenu') {
@@ -454,6 +475,16 @@ export default {
                 const html = butJson(this.editor,this.menusText)[data.key].html
                 this.editor.chain().focus().insertContentAt(this.selection(),html).run()
             }
+            // 致谢
+            if(data.key === 'ackMenu') {
+                const html = butJson(this.editor,this.menusText)[data.key].html
+                const last = this.editor.state.selection.$anchor.path[0].content.size
+                const r = await this.signIdData('ack')
+                if(r === -1) {
+                    this.editor.chain().focus().insertContentAt(last,html[0]).run()
+                    this.editor.chain().focus().insertContentAt(last+3,html[1]).run()
+                }
+            }
             // 文献
             if(data.key === 'literatureMenu') {
                 const html = butJson(this.editor,this.menusText)[data.key].html

package/src/components/editor/src/extend/title-id.js

@@ -16,13 +16,13 @@ export const titleId = Extension.create({
                 attributes: {
                     titleId: {
                         default: null,
-                        parseHTML: element => element.getAttribute('id'),
+                        parseHTML: element => element.getAttribute('class'),
                         renderHTML: attributes => {
                             if (!attributes.titleId) {
                                 return {}
                             }
                             return {
-                                'id': attributes.titleId,
+                                'class': attributes.titleId,
                             }
                         },
                     },

package/src/components/word/src/word.css

@@ -88,11 +88,20 @@
 }
 .subject-title{
     flex: 1;
-    text-indent: 2em;
     position: relative;
 }
 .subject-title label{
-    display: flex;
+    display: inline-block;
+}
+.subject-title label input{
+    position: absolute;
+    top: 5px;
+    left: 0;
+    z-index: 1;
+}
+.subject span{
+    text-align: justify;
+    padding-left: 2em;
 }
 .subject span em{
     font-style: normal;
@@ -145,8 +154,16 @@ input[name='check'] {
     left: 0;
 }
 .subject-but{
+    position: relative;
+}
+.subject-but b{
     position: absolute;
-    bottom: 2px;
-    right: 0;
     z-index: 1;
+    display: flex;
+}
+.subject-html{
+    margin: 2px 0;
+}
+.subject-html :deep(p){
+    margin: 2px 0;
 }

package/src/components/word/src/word.vue

@@ -6,21 +6,31 @@
                    <div class="subject-title">
                        <label>
                            <input v-if="multipleShow" type="checkbox" :checked="item.checked" @change="checkboxChange($event,index)" name="check" />
-                           <span>{{ item.order }}.<em v-html="item.title"></em></span>
+                           <span>{{ item.order }}.<em v-html="item.title"></em>
+                               <i class="subject-but" ref="subject">
+                                   <b :style="{right: -item.right + 'px', top: item.top + 'px'}" v-if="butShow" ref="b">
+                                     <button class="but" @click="modify(item)">修改</button>
+                                     <button class="but" @click="del(item)">删除</button>
+                                   </b>
+                                   <b :style="{right: -item.right + 'px', top: item.top + 'px'}" v-if="replace" ref="b">
+                                      <button class="but" @click="replaceTap(item,index)">替换题目</button>
+                                   </b>
+                                   <b :style="{right: -item.right + 'px', top: item.top + 'px'}" v-if="choice" ref="b">
+                                       <button class="but"
+                                               @click="choiceTap(item,index)"
+                                               :disabled="!item.choice"
+                                               :style="{border: !item.choice?'1px solid #ccc': '1px solid #000'}">
+                                       {{ choiceState? '选择题目' : item.choice?'撤销选择': '选择题目' }}
+                                       </button>
+                                   </b>
+                               </i>
+                           </span>
                        </label>
-                       <div class="subject-but">
-                           <button class="but" v-if="butShow" @click="modify(item)">修改</button>
-                           <button class="but" v-if="butShow" @click="del(item)">删除</button>
-                           <button class="but" v-if="replace" @click="replaceTap(item,index)">替换题目</button>
-                           <button class="but" v-if="choice"
-                                   @click="choiceTap(item,index)"
-                                   :disabled="!item.choice"
-                                   :style="{border: !item.choice?'1px solid #ccc': '1px solid #000'}">
-                               {{ choiceState? '选择题目' : item.choice?'撤销选择': '选择题目' }}
-                           </button>
-                       </div>
                    </div>
                </div>
+               <div v-if="item.alist" class="subject-html">
+                   <div v-for="(item,index) in item.alist" v-html="item.amexontet"></div>
+               </div>
                <div class="choice" v-if="item.testKey">
                    <div class="choice-box" v-for="(ts,ind) in JSON.parse(item.testKey)">
                        <label>
@@ -35,7 +45,7 @@
 </template>
 
 <script>
-
+import { html2json, json2html } from 'html2json'
 export default {
     name: "zydx-seek",
     data() {
@@ -81,8 +91,24 @@ export default {
                 this.value = val
                 this.value.map((item,index) => {
                     item.choice = true
+                    item.right = 0
+                    item.top = 0
+                    if(item.alist) {
+                        item.alist.map(x => {
+                            x.amexontet = json2html({node: "root",child: JSON.parse(x.amexontet)})
+                            return x
+                        })
+                    }
                     return item
                 })
+                this.$nextTick(() => {
+                    const w = this.$refs.parer.offsetWidth
+                    for(let i = 0; i< this.$refs.subject.length; i++) {
+                        this.value[i].right = w - this.$refs.subject[i].offsetLeft
+                        if(this.value[i].right < this.$refs.b[i].offsetWidth) this.value[i].top = 25
+                    }
+                })
+                console.log(this.value)
             },
             immediate: true,
         },

package/src/index.js

@@ -77,7 +77,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.32.183',
+    version: '1.32.184',
     install,
     Calendar,
     Message,