From 5fd03995c2bf81c700204fcd973b495549ccd956 Mon Sep 17 00:00:00 2001
From: 964269669 <964269669@qq.com>
Date: Thu, 10 May 2018 21:25:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=91=E5=BD=A2=E6=8E=A7=E4=BB=B6=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../haomo/components/forms/HmComplexForm.vue   | 18 ++++++++++++------
 src/views/haomo/components/forms/index.vue     |  4 ++--
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/views/haomo/components/forms/HmComplexForm.vue b/src/views/haomo/components/forms/HmComplexForm.vue
index 86fe1b7..2c7d385 100644
--- a/src/views/haomo/components/forms/HmComplexForm.vue
+++ b/src/views/haomo/components/forms/HmComplexForm.vue
@@ -117,7 +117,7 @@
             <!-- 8树形图 -->
             <!--:default-expanded-keys="[2, 3]"-->
             <!--:default-checked-keys="[5]"-->
-            <div @mouseenter="currentTree = column.codeCamel" v-else-if="column.widgetType === 9">
+            <div class="hm-form_form_div" @mouseenter="currentTree = column.codeCamel" v-else-if="column.widgetType === 9" :style="formStyle && formStyle.quillEditor && formStyle.quillEditor.style || {width:'70%'}">
               <el-tree :data="column.options"
                        ref="tree"
                        show-checkbox
@@ -1365,13 +1365,19 @@
   .hm-form .ql-toolbar.ql-snow{
     padding: 7px;
   }
-  .hm-form .el-input__inner:hover {
+  .hm-form .el-input__inner:hover{
     border-color: rgba(153, 153, 153, 0.6);
   }
-  .hm-form .el-tree{
+  .hm-form .hm-form_form_div{
     border-radius: 4px;
-    border: 1px solid red;
-    height: 150px;
-    overflow-y: auto;
+    border: 1px solid #dcdfe6;
+    max-height: 150px;
+    overflow-y: scroll;
+  }
+  .hm-form .hm-form_form_div:hover{
+    border-color: rgba(153, 153, 153, 0.6);
+  }
+  .hm-form .hm-form_form_div::-webkit-scrollbar{
+    display: none;
   }
 </style>
diff --git a/src/views/haomo/components/forms/index.vue b/src/views/haomo/components/forms/index.vue
index 6ad14f6..5ce9aef 100644
--- a/src/views/haomo/components/forms/index.vue
+++ b/src/views/haomo/components/forms/index.vue
@@ -32,7 +32,7 @@
         showUserColumns: [
           // 1普通input
           { name: '选择人员', codeCamel: 'type', widgetType: 9, disabled: false,
-            change: this.inputChange, options: [
+            options: [
               {
                 id: 1,
                 label: '公诉处',
@@ -154,7 +154,7 @@
         },
         // showUserButtons: []
         // 布局方式
-        layout: { left: 2, middle: 20, right: 2 },
+        layout: { left: 4, middle: 16, right: 4 },
         // 自定义提示消息
         tips: {
           hidde: false, // 是否显示提示,默认false显示
-- 
2.21.0