zydx-plus 1.18.79 → 1.18.81

package/package.json

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

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

@@ -1,5 +1,5 @@
 <template>
-  <we-toolbar v-if="!readOnly && toolbar.length > 0" class="toolbar" :handle="handle" />
+  <we-toolbar v-show="!readOnly && toolbar.length > 0" class="toolbar" :handle="handle" />
   <we-editable class="editable" :style="{'min-height': height + 'px'}" :handle="handle" v-model:json="formData.html" />
   <div class="but" v-if="!readOnly && toolbar.length > 0">
     <button class="def-but" v-if="butShow" @click="confirm">完成</button>
@@ -64,17 +64,27 @@ export default defineComponent({
   watch: {
     html() {
        this.formData.html = this.html
+    },
+    readOnly(e) {
+        this.opts.editable.config.readOnly = e
     }
   },
   methods: {
     confirm() {
       this.syncContent() //强制同步数据
       this.$emit('confirm', this.formData.html)
+    },
+    getContent() {
+      this.syncContent() //强制同步数据
+      return this.formData.html
     }
   },
   mounted() {
     setTimeout(() => {
       this.formData.html = this.html
+      setTimeout(() => {
+        if(this.readOnly) this.opts.editable.config.readOnly = this.readOnly
+      },0)
     },0)
   },
   setup(props) {
@@ -92,7 +102,7 @@ export default defineComponent({
       editable: {
         config: {
           placeholder: props.placeholder,
-          readOnly: props.readOnly,
+          readOnly: false,
           autoFocus: (props.html !== ''),
           MENU_CONF: {
             // 上传图片
@@ -124,7 +134,7 @@ export default defineComponent({
       }
       return -1
     }
-    return { handle, formData, syncContent }
+    return { opts, handle, formData, syncContent }
   }
 })
 </script>

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

@@ -1,7 +1,7 @@
 <template>
     <div :style="heightStyle">
         <div class="ed-head">
-            <div class="ed-title" v-if="titleShow">{{ title }}</div>
+            <div class="ed-title" v-if="titleShow" :style="titleStyle">{{ title }}</div>
             <div class="ed-but" v-if="readOnly">
                 <div class="ed-head-but" v-for="(item,index) in toolbar">
                     <button v-if="item.key === 'but'" class="but" @click="item.onClick(item,info)" :style="{color: (item.active)? '#00ff00' :'#000'}">{{ item.title }}</button>
@@ -70,6 +70,14 @@ export default {
             type: String,
             default: ''
         },
+        titleStyle: {
+            type: Object,
+            default: {
+                'font-size': '16px',
+                'font-weight': 'bold',
+                'color': '#000'
+            }
+        },
         readOnly: {
             type: Boolean,
             default: true
@@ -293,7 +301,6 @@ export default {
     flex: 1;
     text-align: left;
     line-height: 22px;
-    font-size: 14px;
 }
 .enclosure-list{
     display: flex;

package/src/index.js

@@ -55,7 +55,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.18.79',
+    version: '1.18.81',
     install,
     Calendar,
     Message,