zydx-plus 1.30.175 → 1.30.176

package/package.json

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

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

@@ -17,7 +17,7 @@
             <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">
+            <div class="editor-but" v-if="butText !== '' && readOnly">
                 <button class="but" @click="complete">{{ butText }}</button>
             </div>
             <div class="enclosure" v-if="uploadAttData.length > 0 && enclosureShow">
@@ -84,6 +84,7 @@ import Placeholder from '@tiptap/extension-placeholder'
 import Color from '@tiptap/extension-color'
 import textStyle from '@tiptap/extension-text-style'
 import { sid } from "./sign-id";
+import { FontSize } from "./font-size";
 export default {
     name: 'zydx-xiao-editor',
     components: {
@@ -191,7 +192,7 @@ export default {
         // 强制监听data变化
         data: {
             handler: function (e, oldVal) {
-                this.editor.commands.setContent(json2html({node: "root",child: (e.html === undefined || null)? [] : e.html}))
+                this.editor?.commands.setContent(json2html({node: "root",child: (e.html === undefined || null)? [] : e.html}))
                 this.uploadAttData = (e.enclosure === undefined)? [] : this.enclosureAction(e.enclosure)
             },
             deep: true
@@ -218,6 +219,7 @@ export default {
                 sid,
                 StarterKit,
                 textStyle,
+                FontSize,
                 Color.configure({
                     types: ['textStyle'],
                 }),
@@ -357,6 +359,9 @@ export default {
                 this.editor.chain().focus().insertContentAt(this.selection(),html).run()
             }
         },
+        enclosureContent(v) {
+            this.uploadAttData = [...this.uploadAttData, ...this.enclosureAction(v)]
+        },
         download(index) {
             this.$emit('download', this.uploadAttData[index])
         },
@@ -392,10 +397,10 @@ export default {
             return json.child
         },
         toolTap(v) {
-            if(v === 'h1') this.editor.chain().focus().toggleHeading({level:1}).run()
-            if(v === 'h2') this.editor.chain().focus().toggleHeading({level:2}).run()
-            if(v === 'h3') this.editor.chain().focus().toggleHeading({level:3}).run()
-            if(v === 'p') this.editor.chain().focus().setParagraph().run()
+            if(v === 'h1') this.editor.chain().focus().setFontSize('18px').setBold().run()
+            if(v === 'h2') this.editor.chain().focus().setFontSize('16px').setBold().run()
+            if(v === 'h3') this.editor.chain().focus().setFontSize('14px').setBold().run()
+            if(v === 'p') this.editor.chain().focus().setParagraph().setFontSize('14px').unsetBold().run()
             if(v === 'bold') this.editor.chain().focus().toggleBold().run()
             if(v === 'center' || v === 'left' || v === 'right') this.editor.chain().focus().setTextAlign(v).run()
             if(v === 'add') {
@@ -403,9 +408,9 @@ export default {
                 html += '<p style="text-align: right;"><span style="color: #999;">请填来源</span></p>'
                 this.editor.commands.setContent(html)
             }
-            if(v === 'centerH2') this.editor.chain().focus().toggleHeading({level:2}).setTextAlign('center').run()
-            if(v === 'leftH2') this.editor.chain().focus().toggleHeading({level:2}).setTextAlign('left').run()
-            if(v === 'rightH2') this.editor.chain().focus().toggleHeading({level:2}).setTextAlign('right').run()
+            if(v === 'centerH2') this.editor.chain().focus().setFontSize('16px').setBold().setTextAlign('center').run()
+            if(v === 'leftH2') this.editor.chain().focus().setFontSize('16px').setBold().setTextAlign('left').run()
+            if(v === 'rightH2') this.editor.chain().focus().setFontSize('16px').setBold().setTextAlign('right').run()
         }
     }
 }
@@ -413,6 +418,22 @@ export default {
 </script>
 
 <style scoped>
+.editor :deep(h1) {
+    line-height: 25px;
+    font-size: 18px;
+}
+.editor :deep(h2) {
+    line-height: 25px;
+    font-size: 16px;
+}
+.editor :deep(h3) {
+    line-height: 25px;
+    font-size: 14px;
+}
+.editor :deep(p) {
+    font-size: 14px;
+    line-height: 25px;
+}
 :deep(.ProseMirror) p.is-editor-empty:first-child::before {
     content: attr(data-placeholder);
     float: left;

package/src/components/editor2/src/font-size.js

@@ -0,0 +1,49 @@
+import { Extension } from '@tiptap/core'
+
+export const FontSize = Extension.create({
+    name: 'fontSize',
+
+    addOptions() {
+        return {
+            types: ['textStyle'],
+        }
+    },
+
+    addGlobalAttributes() {
+        return [
+            {
+                types: this.options.types,
+                attributes: {
+                    fontSize: {
+                        default: null,
+                        parseHTML: element => element.style.fontSize.replace(/['"]+/g, ''),
+                        renderHTML: attributes => {
+                            if (!attributes.fontSize) {
+                                return {}
+                            }
+                            return {
+                                style: `font-size: ${attributes.fontSize}`,
+                            }
+                        },
+                    },
+                },
+            },
+        ]
+    },
+
+    addCommands() {
+        return {
+            setFontSize: fontSize => ({ chain }) => {
+                return chain()
+                    .setMark('textStyle', { fontSize })
+                    .run()
+            },
+            unsetFontSize: () => ({ chain }) => {
+                return chain()
+                    .setMark('textStyle', { fontSize: null })
+                    .removeEmptyTextStyle()
+                    .run()
+            },
+        }
+    },
+})

package/src/index.js

@@ -73,7 +73,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.30.175',
+    version: '1.30.176',
     install,
     Calendar,
     Message,