fix: 修改json5 逻辑

a3032136 · Aug 9, 2018 · 764de94 · 764de94
1 parent d5adf87
commit 764de94
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/client/containers/Project/Interface/InterfaceList/InterfaceEditForm.js b/client/containers/Project/Interface/InterfaceList/InterfaceEditForm.js
@@ -985,9 +985,9 @@ class InterfaceEditForm extends Component {
             <span>JSON-SCHEMA:&nbsp;</span>
             {getFieldDecorator('req_body_is_json_schema', {
               valuePropName: 'checked',
-              initialValue: this.state.req_body_is_json_schema || projectMsg.is_json5
+              initialValue: this.state.req_body_is_json_schema || !projectMsg.is_json5
             })(
-              <Switch checkedChildren="开" unCheckedChildren="关" disabled={projectMsg.is_json5} />
+              <Switch checkedChildren="开" unCheckedChildren="关" disabled={!projectMsg.is_json5} />
             )}
 
             <Col style={{ marginTop: '5px' }} className="interface-edit-json-info">
@@ -1054,12 +1054,12 @@ class InterfaceEditForm extends Component {
           返回数据设置&nbsp;
           {getFieldDecorator('res_body_is_json_schema', {
             valuePropName: 'checked',
-            initialValue: this.state.res_body_is_json_schema || projectMsg.is_json5
+            initialValue: this.state.res_body_is_json_schema || !projectMsg.is_json5
           })(
             <Switch
               checkedChildren="json-schema"
               unCheckedChildren="json"
-              disabled={projectMsg.is_json5}
+              disabled={!projectMsg.is_json5}
             />
           )}
         </h2>

diff --git a/server/controllers/project.js b/server/controllers/project.js
@@ -216,7 +216,7 @@ class projectController extends baseController {
       color: params.color,
       add_time: yapi.commons.time(),
       up_time: yapi.commons.time(),
-      is_json5: true,
+      is_json5: false,
       env: [{ name: 'local', domain: 'http://127.0.0.1' }]
     };
 

diff --git a/server/models/project.js b/server/models/project.js
@@ -34,7 +34,7 @@ class projectModel extends baseModel {
       project_mock_script: String,
       is_mock_open: { type: Boolean, default: false },
       strice: { type: Boolean, default: false },
-      is_json5: { type: Boolean, default: false }
+      is_json5: { type: Boolean, default: true }
     };
   }