feat: 1.4

.gitignore

@@ -8,6 +8,7 @@ target/
 .settings/
 .project
 .classpath
+.history
 
 # idea ignore
 .idea/

.npmignore

@@ -0,0 +1,6 @@
+/docs
+/test
+/static/doc
+/iconfont
+/ydoc.js
+/ydocfile.js

CHANGELOG.md

@@ -1,3 +1,15 @@
+### v1.4.1
+
+
+* 支持任何人都可以添加分组，只有管理员才能修改项目是否公开
+* 支持 mongodb 集群
+
+#### Bug Fixed
+* 修改 mock严格模式，GET带有 JSON BODY 导致的验证问题
+* 对 queryPath 改动导致的bug，支持通过 xxx?controller=name 等 query 参数区分路径
+* 因 tui-editor 需要安装github 依赖，导致部分机器无法部署成功的问题
+
+
 ### v1.3.23
 
 * 接口tag功能

README.md

@@ -45,6 +45,9 @@ YApi 是<strong>高效</strong>、<strong>易用</strong>、<strong>功能强大
 * [yapi sso 登录插件](https://github.com/YMFE/yapi-plugin-qsso)
 * [yapi cas 登录插件](https://github.com/wsfe/yapi-plugin-cas) By wsfe
 
+### YApi 一些工具
+* [mysql服务http工具,可配合做自动化测试](https://github.com/hellosean1025/http-mysql-server)
+
 ### YApi docker部署（非官方）
 * [使用 alpine 版 docker 镜像快速部署 yapi](https://www.jianshu.com/p/a97d2efb23c5)
 
@@ -61,6 +64,7 @@ YApi 是<strong>高效</strong>、<strong>易用</strong>、<strong>功能强大
 * 快手
 * 便利蜂
 * 中商惠民
+* 新浪
 
 ### Authors
 * [hellosean1025](https://github.com/hellosean1025)

client/containers/AddProject/AddProject.js

@@ -191,10 +191,10 @@ class ProjectList extends Component {
                     <span className="radio-desc">只有组长和项目开发者可以索引并查看项目信息</span>
                   </Radio>
                   <br />
-                  <Radio value="public" className="radio">
+                  {/* <Radio value="public" className="radio">
                     <Icon type="unlock" />公开<br />
                     <span className="radio-desc">任何人都可以索引并查看项目信息</span>
-                  </Radio>
+                  </Radio> */}
                 </RadioGroup>
               )}
             </FormItem>

client/containers/Group/GroupList/GroupList.js

@@ -221,17 +221,12 @@ export default class GroupList extends Component {
           <div className="curr-group">
             <div className="curr-group-name">
               <span className="name">{currGroup.group_name}</span>
-              {/* this.props.curUserRole === "admin" || this.props.curUserRoleInGroup === 'owner' ? (menu) : '' */}
-              {/* 只有超级管理员能添加分组 */
-              this.props.curUserRole === 'admin' ? (
-                <Tooltip title="添加分组">
-                  <a className="editSet">
-                    <Icon className="btn" type="folder-add" onClick={this.showModal} />
-                  </a>
-                </Tooltip>
-              ) : (
-                ''
-              )}
+              <Tooltip title="添加分组">
+                <a className="editSet">
+                  <Icon className="btn" type="folder-add" onClick={this.showModal} />
+                </a>
+              </Tooltip>
+
             </div>
             <div className="curr-group-desc">简介: {currGroup.group_desc}</div>
           </div>

client/containers/Login/Login.js

@@ -80,6 +80,7 @@ class Login extends Component {
 
   render() {
     const { getFieldDecorator } = this.props.form;
+
     const { isLDAP } = this.props;
 
     const emailRule =

client/containers/Login/LoginWrap.js

@@ -8,7 +8,8 @@ import './Login.scss';
 const TabPane = Tabs.TabPane;
 
 @connect(state => ({
-  loginWrapActiveKey: state.user.loginWrapActiveKey
+  loginWrapActiveKey: state.user.loginWrapActiveKey,
+  canRegister: state.user.canRegister
 }))
 export default class LoginWrap extends Component {
   constructor(props) {
@@ -17,11 +18,13 @@ export default class LoginWrap extends Component {
 
   static propTypes = {
     form: PropTypes.object,
-    loginWrapActiveKey: PropTypes.string
+    loginWrapActiveKey: PropTypes.string,
+    canRegister: PropTypes.bool
   };
 
   render() {
-    const { loginWrapActiveKey } = this.props;
+    const { loginWrapActiveKey, canRegister } = this.props;
+    {/** show only login when register is disabled */}
     return (
       <Tabs
         defaultActiveKey={loginWrapActiveKey}
@@ -31,7 +34,7 @@ export default class LoginWrap extends Component {
         <TabPane tab="登录" key="1">
           <LoginForm />
         </TabPane>
-        <TabPane tab="注册" key="2">
+        <TabPane tab="注册" key="2" disabled={!canRegister}>
           <RegForm />
         </TabPane>
       </Tabs>

client/containers/Project/Interface/InterfaceCol/InterfaceColContent.js

@@ -993,7 +993,10 @@ class InterfaceColContent extends Component {
             </Row>
             <Row type="flex" justify="space-around" className="row" align="middle">
               <Col span={21} className="autoTestUrl">
-                <a href={localUrl + autoTestsUrl} target="_blank">
+                <a 
+                  target="_blank"
+                  rel="noopener noreferrer"
+                  href={localUrl + autoTestsUrl} >
                   {autoTestsUrl}
                 </a>
               </Col>

client/containers/Project/Interface/InterfaceList/InterfaceEditForm.js

@@ -12,17 +12,17 @@ import mockEditor from 'client/components/AceEditor/mockEditor';
 import AceEditor from 'client/components/AceEditor/AceEditor';
 import axios from 'axios';
 import { MOCK_SOURCE } from '../../../../constants/variable.js';
+import Editor from 'common/tui-editor/dist/tui-editor-Editor-all.min.js';
 const jSchema = require('json-schema-editor-visual');
 const ResBodySchema = jSchema({ lang: 'zh_CN', mock: MOCK_SOURCE });
 const ReqBodySchema = jSchema({ lang: 'zh_CN', mock: MOCK_SOURCE });
 const TabPane = Tabs.TabPane;
 
-require('codemirror/lib/codemirror.css'); // codemirror
-require('tui-editor/dist/tui-editor.css'); // editor ui
-require('tui-editor/dist/tui-editor-contents.css'); // editor content
-require('highlight.js/styles/github.css'); // code block highlight
+
+require('common/tui-editor/dist/tui-editor.css'); // editor ui
+require('common/tui-editor/dist/tui-editor-contents.css'); // editor content
 require('./editor.css');
-var Editor = require('tui-editor');
+
 
 function checkIsJsonSchema(json) {
   try {