From 286ac1982d8f2427e11289e9982fd044a0039eda Mon Sep 17 00:00:00 2001
From: alan <alan@fanruan.com>
Date: Thu, 30 May 2019 17:24:55 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=E7=9A=84=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../connection/more/item/more_link_item.ts    | 34 +++++++++++--------
 src/app/connection/right/nothing.ts           |  3 --
 .../connection/right/right_edit/right_edit.ts |  2 +-
 src/shared/components/both_side.ts            |  5 +--
 src/shared/components/form_item.ts            |  9 ++---
 5 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/src/app/connection/more/item/more_link_item.ts b/src/app/connection/more/item/more_link_item.ts
index 01a41c3..e2da222 100644
--- a/src/app/connection/more/item/more_link_item.ts
+++ b/src/app/connection/more/item/more_link_item.ts
@@ -1,11 +1,13 @@
 import './more_link_item.less';
-import {WidgetType, Vertical, Img, Label, Layout, Absolute} from '@ui/index';
+import {WidgetType, Vertical, Img, Label, Layout, Absolute, Vtape} from '@ui/index';
 import ModelName from './more_link_litem.model';
 
 const className = 'dec.dcm.component.linkSet.morelink.item';
 const Widget: WidgetType = {
   props: {
     baseCls: 'dec-webui-dcm-connection-more-link-item bi-border',
+    height: 120,
+    width: 120,
   },
   _store() {
     return BI.Models.getModel(ModelName);
@@ -20,16 +22,17 @@ const Widget: WidgetType = {
     const {text, name} = this.options;
     
     return {
-      type: Vertical,
+      type: Vtape,
       items: [
         {
-          type: Img,
-          width: 120,
-          height: 90,
-          src: this._buildResourceUrl(name),
-        }, {
           type: Absolute,
           items: [
+            {
+              el: {
+                type: Img,
+                src: this._buildResourceUrl(name),
+              },
+            },
             {
               el: {
                 type: Layout,
@@ -41,16 +44,17 @@ const Widget: WidgetType = {
                   this.selected = _ref;
                 },
               },
-              left: 90,
-              top: -90,
+              right: 0,
             },
           ],
-        }, {
-          type: Label,
-          cls: 'bi-header-background',
-          height: 27,
-          width: 120,
-          text,
+        },
+        {
+          el: {
+            type: Label,
+            cls: 'bi-header-background',
+            text,
+          },
+          height: 30,
         },
       ],
     };
diff --git a/src/app/connection/right/nothing.ts b/src/app/connection/right/nothing.ts
index 425ba85..cfe2172 100644
--- a/src/app/connection/right/nothing.ts
+++ b/src/app/connection/right/nothing.ts
@@ -7,8 +7,6 @@ const Widget: WidgetType = {
       top: 200,
       items: [{
         type: Vertical,
-        width: 260,
-        height: 180,
         items: [
           {
             type: Layout,
@@ -18,7 +16,6 @@ const Widget: WidgetType = {
           },
           {
             type: Label,
-            height: 20,
             text: BI.i18nText('Dec-Dcm_Connection_Plase_Add_One'),
           },
         ],
diff --git a/src/app/connection/right/right_edit/right_edit.ts b/src/app/connection/right/right_edit/right_edit.ts
index 4ae86f6..38a9cce 100644
--- a/src/app/connection/right/right_edit/right_edit.ts
+++ b/src/app/connection/right/right_edit/right_edit.ts
@@ -1,4 +1,4 @@
-import {WidgetType, Vertical, MultiSelectItem, TextAreaEditor, Editor, Button, TextValueCombo, TextEditor} from '@ui/index';
+import {WidgetType, Vertical, MultiSelectItem, TextAreaEditor, Button, TextValueCombo, TextEditor} from '@ui/index';
 import {LinkType} from '@ui/type';
 import {CONNECT_CHARSET} from '@private/constants';
 import Model from '../../link_set.model';
diff --git a/src/shared/components/both_side.ts b/src/shared/components/both_side.ts
index 452b33b..ff05f20 100644
--- a/src/shared/components/both_side.ts
+++ b/src/shared/components/both_side.ts
@@ -1,13 +1,14 @@
 import {WidgetType, Htape, Label} from '@ui/index';
 const BothSide = 'dec.dcm.shared.component.both.side';
 const Widget: WidgetType = {
+  props: {
+    height: 24,
+  },
   render() {
     const {leftText, rightText} = this.options;
     
     return {
       type: Htape,
-      cls: 'both-side',
-      height: 24,
       items: [{
         el: {
           type: Label,
diff --git a/src/shared/components/form_item.ts b/src/shared/components/form_item.ts
index 8cd1341..20c9f51 100644
--- a/src/shared/components/form_item.ts
+++ b/src/shared/components/form_item.ts
@@ -1,13 +1,14 @@
 import {WidgetType, Htape, Label} from '@ui/index';
 const className = 'dec.dcm.shared.component.form.item';
 const Widget: WidgetType = {
+  props: {
+    height: 24,
+  },
   render() {
-    const {text, form, hint, height, width = 115} = this.options;
-
+    const {text, form, hint, width = 115} = this.options;
+    
     return {
       type: Htape,
-      cls: 'both-side',
-      height: height ? height : 24,
       items: [{
         el: {
           type: Label,