zydx-plus 1.32.257 → 1.32.259

package/package.json

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

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

@@ -46,13 +46,13 @@ export function butJson (editor,data) {
             name: '添加作者',
             key: 'authorMenu',
             menuKeys: [],
-            html: `<p class="author" data-signId="author" style="text-align: center;"><span style="color: rgb(0, 0, 0);font-size: 14px;">${menusData(data,'authorMenu').text}</span></p>`
+            html: `<p class="author" data-signId="author" style="text-align: center;"><span style="color: rgb(0, 0, 0);font-size: 16px;font-family: KaiT;">${menusData(data,'authorMenu').text}</span></p>`
         },
         subjectMenu: {
             name: '添加题目',
             key: 'subjectMenu',
             menuKeys: [],
-            html: `<p data-signId="subject" style="text-align: center;"><span style="color: rgb(0, 0, 0);font-size: 24px;">${menusData(data,'subjectMenu').text}</span></p>`
+            html: `<p data-signId="subject" style="text-align: center;padding-bottom: 30px;"><span style="color: rgb(0, 0, 0);font-size: 24px;font-family: SimHei;font-weight: 700;">${menusData(data,'subjectMenu').text}</span></p>`
         },
         paragraphMenu: {
             name: '添加落款',
@@ -73,19 +73,19 @@ export function butJson (editor,data) {
             name: '关键词',
             key: 'keywordMenu',
             menuKeys: [],
-            html: `<p class="keyword"><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>`
+            html: `<p class="keyword" data-signId="keyword"><span style="color: rgb(0, 0, 0);font-size: 12px;font-weight: 700;font-family: SimSun;">关键词：</span><span style="color: rgb(0, 0, 0);font-size: 12px;font-family: KaiTi">关键词内容...</span></p>`
         },
         abstractMenu: {
             name: '添加摘要',
             key: 'abstractMenu',
             menuKeys: [],
-            html: `<p class="abstract"><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>`
+            html: `<p class="abstract" data-signId="abstract"><span style="color: rgb(0, 0, 0);font-size: 12px;font-weight: 700;font-family: SimSun;">摘要：</span><span style="color: rgb(0, 0, 0);font-size: 12px;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>`
+            html: `<p><span style="color: rgb(0, 0, 0);font-size: 12px;font-family: SimSun">[1]作者.期刊论文名称IJ1.期刊名称,发表年份(第几期):页码</span></p><p><span style="color: rgb(0, 0, 0);font-size: 14px;font-family: SimSun">[2]作者.学位论文名称[D1.毕业院校所在城市:毕业院校,论文提交年份:页码</span></p><p><span style="color: rgb(0, 0, 0);font-size: 14px;font-family: SimSun">[3]作者.著作名称[M.出版社所在城市:出版社名称,出版年份:页码.</span></p><p data-signId="literature"><span style="color: rgb(0, 0, 0);font-size: 14px;font-family: SimSun">[4]作者.文章名称[N].报纸名称,发行日期(版面)</span></p>`
         },
         taggingMenu: {
             name: '添加标注',
@@ -104,8 +104,8 @@ export function butJson (editor,data) {
             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>`
+                `<p data-signId="ack" contenteditable="false" style="text-align: center;"><span style="color: rgb(0, 0, 0);font-size: 16px;font-weight: bold;">致谢</span></p>`,
+                `<p><span style="color: rgb(0, 0, 0);font-size: 14px;font-family: KaiTi;">致谢内容...</span></p>`
             ]
         },
         'group-image': {

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

@@ -69,11 +69,6 @@
                 <button class="but" @click="imgCancel">取消</button>
             </div>
         </div>
-<!--        <div v-if="loading" class="loading-back">-->
-<!--            <div class="loading-cont">-->
-<!--                <div class="loadings">Loading</div>-->
-<!--            </div>-->
-<!--        </div>-->
         <div class="down-html" id="test" v-html="htmlArr2"></div>
     </div>
 </template>
@@ -796,12 +791,14 @@ export default {
             // 关键词
             if (data.key === 'keywordMenu') {
                 const html = butJson(this.editor, this.menusText)[data.key].html
-                this.editor.chain().focus().insertContentAt(this.selection(), html).run()
+                const r = await this.signIdData('keyword')
+                if (r === -1) this.editor.chain().focus().insertContentAt(this.selection(), html).run()
             }
             // 摘要
             if (data.key === 'abstractMenu') {
                 const html = butJson(this.editor, this.menusText)[data.key].html
-                this.editor.chain().focus().insertContentAt(this.selection(), html).run()
+                const r = await this.signIdData('abstract')
+              if (r === -1) this.editor.chain().focus().insertContentAt(this.selection(), html).run()
             }
             // 致谢
             if (data.key === 'ackMenu') {
@@ -918,6 +915,12 @@ export default {
 .down-html :deep(img){
     padding: 5px 0;
 }
+:deep(.keyword) {
+    text-indent: 2em;
+}
+:deep(.abstract) {
+  text-indent: 2em;
+}
 .read-only {
     position: relative;
     margin: 0 auto;
@@ -925,7 +928,7 @@ export default {
 
 .read-only-page {
     width: 100%;
-    padding: 100px;
+    padding: 120px 100px 66px 100px;
     background-color: #fff;
     box-sizing: border-box;
     position: relative;
@@ -944,13 +947,19 @@ export default {
     line-height: 24px;
     text-align: justify;
 }
+:deep(p[data-signid="subject"]) {
+  padding-bottom: 30px;
+}
+:deep(.author){
+  padding-bottom: 40px;
+}
 :deep(.text){
     text-indent: 2em;
 }
 
 .read-only-a {
     position: absolute;
-    bottom: 70px;
+    bottom: 36px;
     left: 50%;
     z-index: 1;
     font-size: 14px;
@@ -1169,57 +1178,11 @@ li {
 }
 
 .editing-cont {
-    padding: 100px;
+    padding: 120px 100px 66px 100px;
     box-sizing: border-box;
     width: 794px;
     min-height: 700px;
 }
-.loading-back{
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: 100;
-    display: flex;
-    align-items: center;
-}
-.loading-cont{
-    display: inline-block;
-    margin: 0 auto;
-}
-.loadings {
-    display: inline-block;
-    font-size: 28px;
-    font-family: Arial, Helvetica, sans-serif;
-    font-weight: bold;
-    color: #fff;
-    text-shadow: 0 0 2px #ff3d00, 0 0 1px #ff3d00, 0 0 1px #ff3d00;
-    letter-spacing: 2px;
-    position: relative;
-}
-
-.loadings::after {
-    content: "Loading";
-    position: absolute;
-    left: 0;
-    top: 0;
-    color: #ff3d00;
-    width: 0%;
-    height: 100%;
-    overflow: hidden;
-    animation: loading-animation 6s linear infinite;
-}
-
-@keyframes loading-animation {
-    0% {
-        width: 0;
-    }
-
-    100% {
-        width: 100%;
-    }
-}
 .menu{
     background-color: #fff;
     padding: 5px;