chore: new icons

yize · Jan 12, 2019 · 9c5a1db · 9c5a1db
1 parent d0c5230
commit 9c5a1db
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 25 deletions.
diff --git a/build/app.min.css b/build/app.min.css
diff --git a/build/app.min.js b/build/app.min.js
diff --git a/build/background.min.js b/build/background.min.js
diff --git a/build/images/info.svg b/build/images/info.svg
diff --git a/build/images/new-tab.svg b/build/images/new-tab.svg
diff --git a/build/manifest.json b/build/manifest.json
@@ -2,7 +2,7 @@
   "name": "XSwitch",
   "description": "XSwitch tools for proxy web request url, support reg",
   "short_name": "xs",
-  "version": "1.15.5",
+  "version": "1.15.6",
   "manifest_version": 2,
   "browser_action": {
     "default_icon": "images/grey_128.png",

diff --git a/images/info.svg b/images/info.svg
diff --git a/images/new-tab.svg b/images/new-tab.svg
diff --git a/manifest.json b/manifest.json
@@ -2,7 +2,7 @@
   "name": "XSwitch",
   "description": "XSwitch tools for proxy web request url, support reg",
   "short_name": "xs",
-  "version": "1.15.5",
+  "version": "1.15.6",
   "manifest_version": 2,
   "browser_action": {
     "default_icon": "images/grey_128.png",

diff --git a/src/constants.ts b/src/constants.ts
@@ -95,7 +95,12 @@ export const DEFAULT_DATA = `{
       ".development.js"
       // "react.development.js",
     ],
-    // then try visit https://unpkg.com/react@16.4.1/umd/react.production.min.js
+    // \`Command/Ctrl + click\` to visit:
+    // https://unpkg.com/react@16.4.1/umd/react.production.min.js
+    [
+      "(.*)/path1/path2/(.*)", // https://www.sample.com/path1/path2/index.js
+      "http://127.0.0.1:3000/$2", // http://127.0.0.1:3000/index.js
+    ],
   ],
   // urls that want CORS
   "cors": [
@@ -108,8 +113,8 @@ export const DEFAULT_DATA = `{
 export const DEFAULT_DUP_DATA = `{
   "proxy": [
     [
-      ".production(.min)?.js",
-      "react.development.js",
+      "(.*)/path1/path2/(.*)", // https://www.sample.com/path1/path2/index.js
+      "http://127.0.0.1:3000/$2", // http://127.0.0.1:3000/index.js
     ],
   ],
 }

diff --git a/src/pages/xswitch/xswitch.less b/src/pages/xswitch/xswitch.less
@@ -60,6 +60,13 @@
     z-index: 3;
     background: #fff;
     width: 100%;
+    position: relative;
+    .confirm-button{
+      position: absolute;
+      right: 15px;
+      top: 15px;
+      cursor: pointer;
+    }
   }
 }
 

diff --git a/src/pages/xswitch/xswitch.ts b/src/pages/xswitch/xswitch.ts
@@ -1,5 +1,5 @@
 import { ViewController, observable, inject } from '@ali/recore';
-import { Switch, Icon, Checkbox, Input, Popconfirm } from 'antd';
+import { Switch, Icon, Checkbox, Input, Popconfirm, Button } from 'antd';
 
 import './xswitch.less';
 
@@ -35,7 +35,7 @@ import { getEditorConfig } from '../../editor-config';
 
 let editor: any;
 @inject({
-  components: { Switch, Icon, Checkbox, Input, Popconfirm },
+  components: { Switch, Icon, Checkbox, Input, Popconfirm, Button },
 })
 export default class XSwitch extends ViewController {
   @observable

diff --git a/src/pages/xswitch/xswitch.vx b/src/pages/xswitch/xswitch.vx
@@ -1,9 +1,9 @@
 <div class="xswitch-wrapper">
   <div class="xswitch-left-area">
     <ul class="xswitch-tabs" ref="tabs">
-      <li x-for={items} x-each='item' @click='setEditingKey' className.editing={item.id === editingKey}>
-        <Checkbox checked={item.active} @change='setActive' disabled={item.id === '0'}/><span className="label">&nbsp;{item.name}</span>
-        <Icon className="delete-icon" className.deleting={item.id === deletingKey} type="delete" theme="outlined" style.color={item.id === deletingKey? "#f5222d": "#ccc"} title={item.id === deletingKey? "Are you sure to delete?":"Click to delete"} @click="remove"/>
+      <li x-for={items} x-each='item' @click='setEditingKey' class.editing={item.id === editingKey}>
+        <Checkbox checked={item.active} @change='setActive' disabled={item.id === '0'}/><span class="label">&nbsp;{item.name}</span>
+        <Icon class="delete-icon" class.deleting={item.id === deletingKey} type="delete" theme="outlined" style.color={item.id === deletingKey? "#f5222d": "#ccc"} title={item.id === deletingKey? "Are you sure to delete?":"Click to delete"} @click="remove"/>
       </li>
     </ul>
     <div class="xswitch-new-item-container">
@@ -15,16 +15,17 @@
         x-model={newItem}
         @keyUp.enter="add"
         />
+        <Icon class="confirm-button" type="edit" theme="twoTone" @click="add" />
     </div>
   </div>
-  <div className="xswitch-container" ref="shell"></div>
+  <div class="xswitch-container" ref="shell"></div>
 </div>
-<div className="toolbar-area">
+<div class="toolbar-area">
   <Switch checkedChildren={<Icon type="check" />} unCheckedChildren={<Icon type="close" />} checked={checked} @change="toggleButton"/>
-  <a className="open-readme" title="Open help page" href="javascript:;" @click="openReadme">
-    <img className="xswitch-icon" src={`${prefix}/images/info.svg`} />
+  <a class="open-readme" title="Open help page" href="javascript:;" @click="openReadme">
+    <Icon type="question-circle" theme="twoTone" style={{ fontSize: '22px'}}/>
   </a>
-  <a className="new-tab-control" title="Open in new tab" href="javascript:;" @click="openNewTab">
-    <img className="xswitch-icon" src={`${prefix}/images/new-tab.svg`} />
+  <a class="new-tab-control" title="Open in new tab" href="javascript:;" @click="openNewTab">
+    <Icon type="code" theme="twoTone" style={{ fontSize: '22px'}}/>
   </a>
 </div>