From 5f6df471409dc053ecce4536e00cd2c9281de499 Mon Sep 17 00:00:00 2001
From: BoBoooooo <17746714@qq.com>
Date: Fri, 8 Feb 2019 12:20:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=8A=A0=E5=85=A5tinymce?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FormDesigner/Container.vue        |  1 +
 src/components/FormDesigner/GenerateForm.vue     | 13 +------------
 src/components/FormDesigner/GenerateFormItem.vue |  7 +++++++
 src/components/FormDesigner/WidgetFormItem.vue   |  6 ++++++
 src/components/FormDesigner/componentsConfig.js  | 10 ++++++++++
 src/components/Tinymce/index.vue                 |  2 +-
 src/views/Archive/person_edit.vue                | 11 +----------
 7 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/src/components/FormDesigner/Container.vue b/src/components/FormDesigner/Container.vue
index ae59943..e72f58b 100644
--- a/src/components/FormDesigner/Container.vue
+++ b/src/components/FormDesigner/Container.vue
@@ -281,6 +281,7 @@ import 'vue-awesome/icons/sliders-h'
 import 'vue-awesome/icons/regular/image'
 import 'vue-awesome/icons/chalkboard'
 import 'vue-awesome/icons/upload'
+import 'vue-awesome/icons/text-height'
 
 import GenerateForm from './GenerateForm'
 // eslint-disable-next-line no-unused-vars
diff --git a/src/components/FormDesigner/GenerateForm.vue b/src/components/FormDesigner/GenerateForm.vue
index 14de54c..acd0c9e 100644
--- a/src/components/FormDesigner/GenerateForm.vue
+++ b/src/components/FormDesigner/GenerateForm.vue
@@ -21,20 +21,9 @@
               v-for="(col, colIndex) in item.columns"
               :key="colIndex"
               :span="col.span">
-
-
               <template v-for="citem in col.list" >
-                <el-form-item
-                  v-if="citem.type=='blank'"
-                  :label="citem.name"
-                  :prop="citem.model"
-                  :key="citem.key">
-                  <slot
-                    :name="citem.model"
-                    :model="models"/>
-                </el-form-item>
+
                 <genetate-form-item
-                  v-else
                   :key="citem.key"
                   :models.sync="models"
                   :remote="remote"
diff --git a/src/components/FormDesigner/GenerateFormItem.vue b/src/components/FormDesigner/GenerateFormItem.vue
index 9ac7b19..a80ff2a 100644
--- a/src/components/FormDesigner/GenerateFormItem.vue
+++ b/src/components/FormDesigner/GenerateFormItem.vue
@@ -162,14 +162,21 @@
       />
     </template>
 
+    <template v-if="widget.type=='richtext'">
+                <Tinymce  :height="400"  v-model="dataModel"></Tinymce>
+
+    </template>
+
 
   </el-form-item>
 </template>
 
 <script>
+import Tinymce from '@/components/Tinymce' // 富文本编辑器
 
 export default {
   components: {
+    Tinymce,
   },
   props: ['widget', 'models', 'rules', 'remote'],
   data() {
diff --git a/src/components/FormDesigner/WidgetFormItem.vue b/src/components/FormDesigner/WidgetFormItem.vue
index d19eca1..3eec390 100644
--- a/src/components/FormDesigner/WidgetFormItem.vue
+++ b/src/components/FormDesigner/WidgetFormItem.vue
@@ -8,6 +8,10 @@
     :label-width="element.name===''?'0px':''"
 
   >
+  <template v-if="element.type == 'richtext'">
+              <Tinymce  :height="400"          v-model="element.options.defaultValue"
+ />
+    </template>
 
     <template v-if="element.type == 'input'">
       <el-input
@@ -209,11 +213,13 @@ import 'vue-awesome/icons/sliders-h'
 import 'vue-awesome/icons/regular/image'
 import 'vue-awesome/icons/chalkboard'
 import UploadAffix from '@/components/UploadAffix' // 上传模块
+import Tinymce from '@/components/Tinymce' // 富文本编辑器
 
 export default {
   components: {
     icon,
     UploadAffix,
+    Tinymce,
   },
   props: ['element', 'select', 'index', 'data'],
   data() {
diff --git a/src/components/FormDesigner/componentsConfig.js b/src/components/FormDesigner/componentsConfig.js
index 97a45d6..47c8bc0 100644
--- a/src/components/FormDesigner/componentsConfig.js
+++ b/src/components/FormDesigner/componentsConfig.js
@@ -233,6 +233,16 @@ export const advanceComponents = [
       },
     },
   },
+
+  {
+    type: 'richtext',
+    name: '富文本',
+    icon: 'text-height',
+    options: {
+      defaultValue: '',
+
+    },
+  },
 ]
 
 export const layoutComponents = [
diff --git a/src/components/Tinymce/index.vue b/src/components/Tinymce/index.vue
index d87e7d0..210d298 100644
--- a/src/components/Tinymce/index.vue
+++ b/src/components/Tinymce/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div :class="{fullscreen:fullscreen}" class="tinymce-container editor-container">
     <textarea :id="tinymceId" class="tinymce-textarea"/>
-    <div class="editor-custom-btn-container">
+    <div class="editor-custom-btn-container" style="display:none">
       <editorImage color="#1890ff" class="editor-upload-btn" @successCBK="imageSuccessCBK"/>
     </div>
   </div>
diff --git a/src/views/Archive/person_edit.vue b/src/views/Archive/person_edit.vue
index 8bf1638..8a70590 100644
--- a/src/views/Archive/person_edit.vue
+++ b/src/views/Archive/person_edit.vue
@@ -1,21 +1,12 @@
 <template>
  <div>
-          <Tinymce ref="editor" :height="400" v-model="content" />
 <crud-table tableName="person" toolbarButton="add,clear,search" handleButton="edit,delete"></crud-table>
  </div>
 </template>
 <script>
-import Tinymce from '@/components/Tinymce'
 
 export default {
   name: 'PersonEdit',
-  data() {
-    return {
-      content: '',
-    }
-  },
-  components: {
-    Tinymce,
-  },
+
 }
 </script>