Merge pull request YMFE#2 from YMFE/master

update

client/components/Postman/Postman.js

@@ -691,7 +691,7 @@ export default class Run extends Component {
                   )}
                   <span className="eq-symbol">=</span>
                   <Input
-                    value={item.value}
+                    value={item.value ? item.value : item.example}
                     className="value"
                     onChange={e => this.changeParam('req_query', e.target.value, index)}
                     placeholder="参数值"
@@ -825,7 +825,7 @@ export default class Run extends Component {
                           // />
                         ) : (
                           <Input
-                            value={item.value}
+                            value={item.value ? item.value : item.example}
                             className="value"
                             onChange={e => this.changeBody(e.target.value, index)}
                             placeholder="参数值"

client/containers/Project/Setting/Setting.js

@@ -8,6 +8,9 @@ import ProjectToken from './ProjectToken/ProjectToken';
 import ProjectMock from './ProjectMock/index.js';
 import { connect } from 'react-redux';
 const TabPane = Tabs.TabPane;
+const plugin = require('client/plugin.js');
+
+const routers = {}
 
 import './Setting.scss';
 
@@ -23,7 +26,7 @@ class Setting extends Component {
   };
   render() {
     const id = this.props.match.params.id;
-
+    plugin.emitHook('sub_setting_nav', routers);
     return (
       <div className="g-row">
         <Tabs type="card" className="has-affix-footer tabs-large">
@@ -44,6 +47,12 @@ class Setting extends Component {
           <TabPane tab="全局mock脚本" key="5">
             <ProjectMock projectId={+id} />
           </TabPane>
+          {Object.keys(routers).map(key=>{
+            const C = routers[key].component;
+            return <TabPane tab={routers[key].name} key={routers[key].name}>
+              <C projectId={+id} />
+            </TabPane>
+          })}
         </Tabs>
       </div>
     );

client/plugin.js

@@ -185,6 +185,19 @@ hooks = {
     type: 'listener',
     mulit: true,
     listener: []
+  },
+  /*
+   * 添加项目设置 nav
+   * @param Object routers
+   * 
+   *  let routers = {
+      interface: { name: 'xxx', component: Xxx },
+    }
+   */
+  sub_setting_nav:{
+    type: 'listener',
+    mulit: true,
+    listener: []
   }
 };
 

common/config.js

@@ -17,5 +17,9 @@ module.exports = {
     name: 'import-yapi-json'
   },{
     name: 'wiki'
-  }]
+  }
+  // {
+  //   name: 'test'
+  // }
+]
 }

exts/yapi-plugin-test/client.js

@@ -0,0 +1,10 @@
+function hander(routers) {
+  routers.test = {
+    name: 'test',
+    component: ()=> 'hello world.'
+  };
+}
+
+module.exports = function() {
+  this.bindHook('sub_setting_nav', hander);
+};

exts/yapi-plugin-test/index.js

@@ -0,0 +1,4 @@
+module.exports = {
+  server: false,
+  client: true
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "yapi-vendor",
-  "version": "1.5.11",
+  "version": "1.5.12",
   "description": "YAPI",
   "main": "server/app.js",
   "scripts": {

server/controllers/base.js

@@ -79,7 +79,7 @@ class baseController {
       //   }
       //   return (this.$tokenAuth = true);
       // }
-
+      
       let checkId = await this.getProjectIdByToken(token);
       if(!checkId){
         ctx.body = yapi.commons.resReturn(null, 42014, 'token 无效');