From ef9e6c06dd80abf2c1c674974e29f95002820f04 Mon Sep 17 00:00:00 2001
From: fanxb <fanxb.tl@gmail.com>
Date: Mon, 30 Dec 2019 22:56:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=B7=B3=E8=BD=AC=E5=89=8D=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E6=98=AF=E5=90=A6=E6=9C=89http?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/components/Search/index.jsx     | 55 ++++++++++++++++----
 front/src/pages/manage/OverView/index.jsx | 63 ++++++++++++++++++-----
 2 files changed, 93 insertions(+), 25 deletions(-)

diff --git a/front/src/components/Search/index.jsx b/front/src/components/Search/index.jsx
index 10aa5ae..0d4ebfd 100644
--- a/front/src/components/Search/index.jsx
+++ b/front/src/components/Search/index.jsx
@@ -63,21 +63,35 @@ class Search extends React.Component {
       this.setState({ resultList: [] });
       return;
     }
-    httpUtil.get("/bookmark/searchUserBookmark?content=" + encodeURIComponent(content)).then(res => this.setState({ resultList: res }));
+    httpUtil
+      .get(
+        "/bookmark/searchUserBookmark?content=" + encodeURIComponent(content)
+      )
+      .then(res => this.setState({ resultList: res }));
   }
 
   /**
    * 处理跳转到搜索引擎或者对应的书签
    */
   enter() {
-    const { currentIndex, currentOptionIndex, resultList, content } = this.state;
+    const {
+      currentIndex,
+      currentOptionIndex,
+      resultList,
+      content
+    } = this.state;
     if (currentOptionIndex === 0 && resultList.length > 0) {
-      window.open(resultList[currentIndex].url);
+      let url = resultList[currentIndex].url;
+      window.open(url.startsWith("http") ? url : "http://" + url);
     }
     if (currentOptionIndex === 1) {
-      window.open("https://www.baidu.com/s?ie=UTF-8&wd=" + encodeURIComponent(content));
+      window.open(
+        "https://www.baidu.com/s?ie=UTF-8&wd=" + encodeURIComponent(content)
+      );
     } else if (currentOptionIndex === 2) {
-      window.open("https://www.google.com/search?q=" + encodeURIComponent(content));
+      window.open(
+        "https://www.google.com/search?q=" + encodeURIComponent(content)
+      );
     }
   }
 
@@ -123,7 +137,12 @@ class Search extends React.Component {
    * 渲染结果列表
    */
   renderResults() {
-    const { resultList, currentIndex, currentOptionIndex, isFocus } = this.state;
+    const {
+      resultList,
+      currentIndex,
+      currentOptionIndex,
+      isFocus
+    } = this.state;
     if (currentOptionIndex !== 0 || !isFocus) {
       return;
     }
@@ -132,25 +151,37 @@ class Search extends React.Component {
         <div className={styles.resultList}>
           {resultList.map((item, index) => (
             <div
-              className={`${styles.item} ${index === currentIndex ? styles.checked : ""}`}
+              className={`${styles.item} ${
+                index === currentIndex ? styles.checked : ""
+              }`}
               key={item.bookmarkId}
               onClick={() => window.open(item.url)}
             >
               <span style={{ fontWeight: 600 }}>{item.name}&emsp;</span>
-              <span style={{ fontSize: "0.8em", fontWeight: 400 }}>{item.url}</span>
+              <span style={{ fontSize: "0.8em", fontWeight: 400 }}>
+                {item.url}
+              </span>
             </div>
           ))}
         </div>
       );
     } else {
-      return <Empty className={styles.resultList} image={Empty.PRESENTED_IMAGE_SIMPLE} />;
+      return (
+        <Empty
+          className={styles.resultList}
+          image={Empty.PRESENTED_IMAGE_SIMPLE}
+        />
+      );
     }
   }
 
   render() {
     const { content, options, currentOptionIndex } = this.state;
     const prefix = (
-      <Select value={options[currentOptionIndex]} onChange={this.valueIndexChange.bind(this)}>
+      <Select
+        value={options[currentOptionIndex]}
+        onChange={this.valueIndexChange.bind(this)}
+      >
         {options.map((item, index) => (
           <Select.Option key={index} value={index}>
             {item}
@@ -171,7 +202,9 @@ class Search extends React.Component {
           onChange={this.contentChange.bind(this)}
           onKeyDown={this.keyUp.bind(this)}
           onFocus={() => this.setState({ isFocus: true })}
-          onBlur={() => setTimeout(() => this.setState({ isFocus: false }), 600)}
+          onBlur={() =>
+            setTimeout(() => this.setState({ isFocus: false }), 600)
+          }
         />
         {this.renderResults()}
       </div>
diff --git a/front/src/pages/manage/OverView/index.jsx b/front/src/pages/manage/OverView/index.jsx
index aaf0258..52c2a8a 100644
--- a/front/src/pages/manage/OverView/index.jsx
+++ b/front/src/pages/manage/OverView/index.jsx
@@ -22,9 +22,11 @@ function mapDispatchToProps(dispatch) {
     addNode: (item, e) => dispatch(action.addNode(item, e)),
     editNode: (item, e) => dispatch(action.editNode(item, e)),
     changeIsInit: value => dispatch(action.changeIsInit(value)),
-    changeCheckedKeys: (keys, nodes) => dispatch(action.changeCheckedKeys(keys, nodes)),
+    changeCheckedKeys: (keys, nodes) =>
+      dispatch(action.changeCheckedKeys(keys, nodes)),
     changeExpandedKeys: keys => dispatch(action.changeExpandedKeys(keys)),
-    changeCurrentClickItem: item => dispatch(action.changeCurrentClickItem(item)),
+    changeCurrentClickItem: item =>
+      dispatch(action.changeCurrentClickItem(item)),
     changeLoadedKeys: keys => dispatch(action.changeLoadedKeys(keys))
   };
 }
@@ -78,7 +80,9 @@ class OverView extends React.Component {
     const { expandedKeys, changeExpandedKeys } = this.props;
     const item = e.node.props.dataRef;
     if (item.type === 0) {
-      window.open(item.url);
+      window.open(
+        item.url.startsWith("http") ? item.url : "http://" + item.url
+      );
     } else {
       const id = item.bookmarkId.toString();
       const index = expandedKeys.indexOf(id);
@@ -88,7 +92,16 @@ class OverView extends React.Component {
   }
 
   render() {
-    const { isEdit, setIsEdit, treeData, addNode, isInit, expandedKeys, checkedKeys, loadedKeys } = this.props;
+    const {
+      isEdit,
+      setIsEdit,
+      treeData,
+      addNode,
+      isInit,
+      expandedKeys,
+      checkedKeys,
+      loadedKeys
+    } = this.props;
     const { isLoading } = this.state;
     const { changeExpandedKeys } = this.props;
     return (
@@ -98,23 +111,46 @@ class OverView extends React.Component {
           <div className={styles.header}>
             <div className={styles.left}>
               <span className={styles.myTree}>我的书签树</span>
-              <Button size="small" type="primary" icon="plus" shape="circle" onClick={addNode.bind(this, null)} />
+              <Button
+                size="small"
+                type="primary"
+                icon="plus"
+                shape="circle"
+                onClick={addNode.bind(this, null)}
+              />
               {expandedKeys.length > 0 ? (
-                <Button type="primary" size="small" onClick={changeExpandedKeys.bind(this, [])}>
+                <Button
+                  type="primary"
+                  size="small"
+                  onClick={changeExpandedKeys.bind(this, [])}
+                >
                   收起
                 </Button>
               ) : null}
-              <a className={styles.help} href="https://github.com/FleyX/bookmark/blob/master/README.md">使用帮助</a>
+              <a
+                className={styles.help}
+                href="https://github.com/FleyX/bookmark/blob/master/README.md"
+              >
+                使用帮助
+              </a>
             </div>
             <div className={styles.right}>
               {isEdit ? (
                 <React.Fragment>
-                  <Button size="small" type="danger" onClick={batchDelete.bind(this)}>
+                  <Button
+                    size="small"
+                    type="danger"
+                    onClick={batchDelete.bind(this)}
+                  >
                     删除选中
                   </Button>
                 </React.Fragment>
               ) : null}
-              <Button size="small" type="primary" onClick={setIsEdit.bind(this, !isEdit)}>
+              <Button
+                size="small"
+                type="primary"
+                onClick={setIsEdit.bind(this, !isEdit)}
+              >
                 {isEdit ? "完成" : "编辑"}
               </Button>
             </div>
@@ -136,7 +172,9 @@ class OverView extends React.Component {
             >
               {renderTreeNodes.call(this, treeData)}
             </Tree>
-            {isInit && treeData.length === 0 ? <Empty description="还没有数据" /> : null}
+            {isInit && treeData.length === 0 ? (
+              <Empty description="还没有数据" />
+            ) : null}
           </Spin>
           <AddModal />
         </div>
@@ -145,7 +183,4 @@ class OverView extends React.Component {
   }
 }
 
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(OverView);
+export default connect(mapStateToProps, mapDispatchToProps)(OverView);