zydx-plus 1.33.347 → 1.33.348

package/package.json

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

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

@@ -86,7 +86,7 @@ export default {
     },
     dragTextShow: {
       type: Boolean,
-      default: false
+      default: true
     },
     minimize: {
       type: Boolean,
@@ -298,6 +298,8 @@ export default {
 
 .down-text-cont {
   display: inline-block;
+  position: relative;
+  z-index: 10000;
 }
 
 .down-text-cont img {
@@ -312,8 +314,8 @@ export default {
   line-height: 30px;
   font-size: 14px;
   color: #999;
-  padding: 0 10px;
   text-align: center;
+  box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
 }
 
 .drag-down {

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

@@ -45,12 +45,12 @@ export function butJson(editor, data) {
                     name: '摘 要',
                     key: 'abstractMenu',
                     menuKeys: [],
-                    html: `<p class="abstract" data-signId="abstract"><span style="color: rgb(0, 0, 0);font-size: 14px;font-weight: 700;font-family: SimSun;">摘要：</span><span style="color: rgb(0, 0, 0);font-size: 12px;font-family: KaiTi">摘要内容...</span></p>`
+                    html: `<p class="abstract" data-signId="abstract"><span style="color: rgb(0, 0, 0);font-size: 14px;font-weight: 700;font-family: SimSun;">摘要:</span> <span style="color: rgb(0, 0, 0);font-size: 12px;font-family: KaiTi"> 摘要内容...</span></p>`
                 }, {
                     name: '关键词',
                     key: 'keywordMenu',
                     menuKeys: [],
-                    html: `<p class="keyword" data-signId="keyword"><span style="color: rgb(0, 0, 0);font-size: 14px;font-weight: 700;font-family: SimSun;">关键词：</span><span style="color: rgb(0, 0, 0);font-size: 12px;font-family: KaiTi">关键词内容...</span></p>`
+                    html: `<p class="keyword" data-signId="keyword"><span contenteditable="false" style="color: rgb(0, 0, 0);font-size: 14px;font-weight: 700;font-family: SimSun;">关键词:</span> <span style="color: rgb(0, 0, 0);font-size: 12px;font-family: KaiTi"> 关键词内容...</span></p>`
                 }, {
                     name: '落 款',
                     key: 'paragraphMenu',

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

@@ -349,7 +349,8 @@ export default {
         'shortcut', 'pageMargin', 'paragraph',
         'outlineMenu', 'alignmentMode', 'titleMenu',
         'textMenu', 'color', 'interposition'],
-      bubbleData: {}
+      bubbleData: {},
+      htmlJson: []
     }
   },
   props: {
@@ -535,8 +536,10 @@ export default {
   },
   mounted() {
     const _this = this
-    if (_this.html[_this.html.length - 1]?.type === 'interpositionData') {
-      this.interpositionData = _this.html[_this.html.length - 1].data
+    _this.htmlJson=_this.html
+    if (_this.htmlJson[_this.htmlJson.length - 1]?.type === 'interpositionData') {
+      this.interpositionData = _this.htmlJson[_this.htmlJson.length - 1].data
+      _this.htmlJson.splice(_this.htmlJson.length - 1,1)
     }
     let dataHtml = json2html({node: "root", child: (_this.html === undefined || _this.html === null) ? [] : _this.html})
     if (dataHtml[0]?.tag === 'sign') {
@@ -1844,6 +1847,7 @@ export default {
     },
 
     async butTap(data, key, childKey) {
+      console.log(data, key, childKey)
       // 快捷排版
       if (data.key === 'shortcut') {
         const menusHtml = butJson(this.editor, this.menusText)[data.key].menuKeys
@@ -1873,6 +1877,7 @@ export default {
         // 摘要
         if (key.key === 'abstractMenu') {
           const html = menusHtml.filter(item => item.key == key.key)[0].html
+          console.log('html',html)
           const r = await this.signIdData('abstract')
           if (r === -1) this.editor.chain().focus().insertContentAt(this.selection(), html).run()
         }
@@ -2025,7 +2030,7 @@ export default {
       }
       // 插入
       if (data.key === 'interposition') {
-        const menusHtml = butJson(this.editor, this.menusText)[data.key].menuKeys
+        // const menusHtml = butJson(this.editor, this.menusText)[data.key].menuKeys
         // 添加图片
         if (key.key === 'group-image') {
           if (childKey.key === 'insertImage') {
@@ -2613,7 +2618,6 @@ export default {
 </script>
 
 <style scoped>
-@import "../../tipBox/src/zydxStyle.css";
 
 :deep(.ProseMirror-separator) {
   display: none !important;
@@ -3048,7 +3052,7 @@ li {
 }
 
 .menu-one {
-  //max-width: 557px;
+//max-width: 557px;
   min-width: 300px;
   width: max-content;
   padding: 10px;
@@ -3089,6 +3093,14 @@ li {
   align-items: center;
   color: #CCCCCC;
 }
+@keyframes linkDown {
+  0% {
+    opacity: 0;
+  }
+  100% {
+    opacity: 1;
+  }
+}
 
 .tip-box {
   width: 744px;
@@ -3122,4 +3134,52 @@ li {
 .tip-boxContent {
   overflow-y: auto;
 }
+
+.tip-title {
+  margin-bottom: 20px;
+  font-size: 18px;
+  font-weight: 700;
+  flex-shrink: 0;
+  display: flex;
+  align-items: flex-end;
+  justify-content: center;
+  flex-wrap: wrap;
+  overflow: hidden;
+}
+
+.tip-boxContent {
+  max-height: 600px;
+}
+
+.tip-btnBox {
+  margin-top: 20px;
+  flex-shrink: 0;
+  display: flex;
+  justify-content: center;
+  align-items: flex-start;
+  font-size: 12px;
+}
+
+.tip-btnBox > div {
+  width: 60px;
+  line-height: 20px;
+  margin-right: 10px;
+  border-radius: 3px;
+  border: 1px solid #000000;
+  cursor: pointer;
+  text-align: center;
+}
+
+.tip-popupWindowSearch {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.2);
+  z-index: 20000;
+  display: flex;
+  align-items: center;
+}
+
 </style>

package/src/index.js

@@ -83,7 +83,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.33.347',
+    version: '1.33.348',
     install,
     Calendar,
     Message,