修复组合部分有时内容没有清空的问题。

Author: oldj

app/ui/bundle.js

@@ -1 +1 @@
-exports.version = [3,3,5,5263];
+exports.version = [3,3,5,5263];

app/version.js

@@ -56,7 +56,8 @@ export default class EditPrompt extends React.Component {
     Agent.on('add_hosts', () => {
       this.setState({
         show: true,
-        is_add: true
+        is_add: true,
+        include: []
       })
       setTimeout(() => {
         this.tryToFocus()
@@ -136,6 +137,9 @@ export default class EditPrompt extends React.Component {
     if (this.state.is_add) {
       this.props.justAdd(new_id)
     }
+    if (this.state.where !== 'group') {
+      data.include = []
+    }
 
     delete data['is_add']
     Agent.emit('update_hosts', data)

ui/frame/edit.jsx

@@ -65,7 +65,7 @@ export default class MyFrame extends React.Component {
     return (
       <Modal
         visible={show}
-        title={title}
+        title={(<h3>{title}</h3>)}
         onOk={this.onOK.bind(this)}
         onCancel={this.onCancel.bind(this)}
         wrapClassName="frame"

ui/frame/frame.jsx

@@ -1,7 +1,7 @@
 .frame {
   @bg: #f5f5f5;
   @btn_default: #05a;
-  @lh: 24px;
+  @lh: 28px;
 
   &:before {
     content: '';
@@ -11,6 +11,12 @@
     width: 0;
   }
 
+  h3 {
+    font-size: 14px;
+    margin: 0;
+    padding: 0;
+  }
+
   .ant-modal {
     //display: inline-block;
     //vertical-align: middle;
@@ -22,13 +28,13 @@
     //max-width: 600px;
     //background: #fff;
     //box-shadow: 0 0 4px 4px rgba(0, 0, 0, 0.1);
-    line-height: 30px;
+    line-height: @lh;
 
     .prompt-body {
       //padding: 20px 20px;
 
       .ln {
-        line-height: 30px;
+        line-height: @lh;
         padding: 2px 0;
         margin-bottom: 10px;
 
@@ -39,7 +45,7 @@
         }
         .cnt {
           margin-left: 100px;
-          line-height: 30px;
+          line-height: @lh;
           //input[type=text] {
           //  width: 240px;
           //  outline: none;

ui/frame/frame.less

@@ -7,7 +7,6 @@
 
 import React from 'react'
 import { Icon } from 'antd'
-import classnames from 'classnames'
 import Sortable from 'sortablejs'
 import listToArray from 'wheel-js/src/common/listToArray'
 import './group.less'
@@ -33,14 +32,21 @@ export default class Group extends React.Component {
     let attrs = {
       'data-id': item.id || ''
     }
+
+    let icon_type
+    if (item.where === 'remote') {
+      icon_type = 'global'
+    } else if (item.where === 'group') {
+      icon_type = 'copy'
+    } else {
+      icon_type = 'file-text'
+    }
+
     return (
       <div className="hosts-item" {...attrs}>
-        <i className={classnames({
-          'iconfont': 1
-          , 'item-icon': 1
-          , 'icon-file': item.where !== 'group'
-          , 'icon-files': item.where === 'group'
-        })}
+        <Icon
+          type={icon_type}
+          className="iconfont"
         />
         <span>{item.title || 'untitled'}</span>
       </div>

ui/frame/group.jsx

@@ -35,6 +35,7 @@
     .hosts-item {
       cursor: move;
       padding: 2px 6px;
+      line-height: 24px;
 
       &:hover {
         background: #f5f5f5;