Merge 3a1e103ead into f663b23b29

2018-04-30 06:59:20 +00:00 · 2018-04-30 06:59:20 +00:00 · de2b0d6ace
parent f663b23b29 3a1e103ead
commit de2b0d6ace
1 changed files with 2 additions and 1 deletions
--- a/src/components/Tinymce/index.vue
+++ b/src/components/Tinymce/index.vue
@ -48,7 +48,8 @@ export default {
  },
  watch: {
    value(val) {
-      if (!this.hasChange && this.hasInit) {
+      if (val == null) {val = ''}
+      if (this.hasInit) {
        this.$nextTick(() => window.tinymce.get(this.tinymceId).setContent(val))
      }
    }