diff --git a/client/containers/Project/Interface/InterfaceList/InterfaceEditForm.js b/client/containers/Project/Interface/InterfaceList/InterfaceEditForm.js
index 2037aa0..70297c0 100644
--- a/client/containers/Project/Interface/InterfaceList/InterfaceEditForm.js
+++ b/client/containers/Project/Interface/InterfaceList/InterfaceEditForm.js
@@ -1078,8 +1078,10 @@ class InterfaceEditForm extends Component {
label='状态'>
{getFieldDecorator('status', { initialValue: this.state.status })(
,
)}
@@ -1542,4 +1544,4 @@ export default Form.create({
onValuesChange() {
EditFormContext.props.changeEditStatus(true)
}
-})(InterfaceEditForm)
\ No newline at end of file
+})(InterfaceEditForm)
diff --git a/client/containers/Project/Interface/InterfaceList/InterfaceList.js b/client/containers/Project/Interface/InterfaceList/InterfaceList.js
index f762072..6519249 100644
--- a/client/containers/Project/Interface/InterfaceList/InterfaceList.js
+++ b/client/containers/Project/Interface/InterfaceList/InterfaceList.js
@@ -281,12 +281,21 @@ class InterfaceList extends Component {
className="select"
onChange={this.changeInterfaceStatus}
>
+
+ {/**/}
+
+
+
-
+
);
},
@@ -295,9 +304,17 @@ class InterfaceList extends Component {
text: '已完成',
value: 'done'
},
+ // {
+ // text: '未完成',
+ // value: 'undone'
+ // },
{
- text: '未完成',
- value: 'undone'
+ text: '设计中',
+ value: 'designing'
+ },
+ {
+ text: '开发中',
+ value: 'coding'
}
],
onFilter: (value, record) => record.status.indexOf(value) === 0
diff --git a/client/containers/Project/Interface/InterfaceList/View.js b/client/containers/Project/Interface/InterfaceList/View.js
index 141068f..22e7d6e 100644
--- a/client/containers/Project/Interface/InterfaceList/View.js
+++ b/client/containers/Project/Interface/InterfaceList/View.js
@@ -378,7 +378,8 @@ class View extends Component {
}
]
let status = {
- undone: '未完成',
+ designing: '设计中',
+ coding: '开发中',
done: '已完成'
}
@@ -627,4 +628,4 @@ class View extends Component {
}
}
-export default View
\ No newline at end of file
+export default View
diff --git a/client/plugin-module.js b/client/plugin-module.js
index f574903..180cd7a 100644
--- a/client/plugin-module.js
+++ b/client/plugin-module.js
@@ -1 +1 @@
-module.exports = {"notifier" : {module: require('yapi-plugin-notifier/client.js'),options: {"host":"http://localhost:3000"}},"interface-oauth2-token" : {module: require('yapi-plugin-interface-oauth2-token/client.js'),options: null},"add-user" : {module: require('yapi-plugin-add-user/client.js'),options: null},"pl-auto-test" : {module: require('yapi-plugin-pl-auto-test/client.js'),options: {"host":"http://localhost:3000"}},"api-watch" : {module: require('yapi-plugin-api-watch/client.js'),options: null},"import-swagger-customize" : {module: require('yapi-plugin-import-swagger-customize/client.js'),options: null},"export-schema" : {module: require('yapi-plugin-export-schema/client.js'),options: null},"import-postman" : {module: require('exts/yapi-plugin-import-postman/client.js'),options: null},"import-har" : {module: require('exts/yapi-plugin-import-har/client.js'),options: null},"advanced-mock" : {module: require('exts/yapi-plugin-advanced-mock/client.js'),options: null},"import-swagger" : {module: require('exts/yapi-plugin-import-swagger/client.js'),options: null},"statistics" : {module: require('exts/yapi-plugin-statistics/client.js'),options: null},"export-data" : {module: require('exts/yapi-plugin-export-data/client.js'),options: null},"gen-services" : {module: require('exts/yapi-plugin-gen-services/client.js'),options: null},"export-swagger2-data" : {module: require('exts/yapi-plugin-export-swagger2-data/client.js'),options: null},"import-yapi-json" : {module: require('exts/yapi-plugin-import-yapi-json/client.js'),options: null},"wiki" : {module: require('exts/yapi-plugin-wiki/client.js'),options: null},"swagger-auto-sync" : {module: require('exts/yapi-plugin-swagger-auto-sync/client.js'),options: null}}
\ No newline at end of file
+module.exports = {"import-postman" : {module: require('exts/yapi-plugin-import-postman/client.js'),options: null},"import-har" : {module: require('exts/yapi-plugin-import-har/client.js'),options: null},"advanced-mock" : {module: require('exts/yapi-plugin-advanced-mock/client.js'),options: null},"import-swagger" : {module: require('exts/yapi-plugin-import-swagger/client.js'),options: null},"statistics" : {module: require('exts/yapi-plugin-statistics/client.js'),options: null},"export-data" : {module: require('exts/yapi-plugin-export-data/client.js'),options: null},"gen-services" : {module: require('exts/yapi-plugin-gen-services/client.js'),options: null},"export-swagger2-data" : {module: require('exts/yapi-plugin-export-swagger2-data/client.js'),options: null},"import-yapi-json" : {module: require('exts/yapi-plugin-import-yapi-json/client.js'),options: null},"wiki" : {module: require('exts/yapi-plugin-wiki/client.js'),options: null},"swagger-auto-sync" : {module: require('exts/yapi-plugin-swagger-auto-sync/client.js'),options: null}}
\ No newline at end of file
diff --git a/client/styles/common.scss b/client/styles/common.scss
index 668208b..abc7ac3 100644
--- a/client/styles/common.scss
+++ b/client/styles/common.scss
@@ -27,7 +27,7 @@ html {
/* 外层轨道 */
::-webkit-scrollbar-track {
-webkit-box-shadow: inset006pxrgba(255,0,0,0.3);
- // background-color:
+ // background-color:
background: rgba(255, 255, 255, 0.1);
}
/* 滚动条滑块 */
@@ -158,6 +158,12 @@ em {
&.undone::before {
background-color: #ff561b;
}
+ &.designing::before {
+ background-color: #d3adf7;
+ }
+ &.coding::before {
+ background-color: #4096ff;
+ }
}
@@ -228,4 +234,4 @@ em {
&:hover {
color: #2395f1;
}
-}
\ No newline at end of file
+}
diff --git a/server/models/interface.js b/server/models/interface.js
index 8c6a8ac..b4beb90 100644
--- a/server/models/interface.js
+++ b/server/models/interface.js
@@ -15,7 +15,7 @@ class interfaceModel extends baseModel {
project_id: { type: Number, required: true },
catid: { type: Number, required: true },
edit_uid: { type: Number, default: 0 },
- status: { type: String, enum: ['undone', 'done'], default: 'undone' },
+ status: { type: String, enum: ['designing','coding', 'done'], default: 'designing' },
desc: String,
markdown: String,
add_time: Number,
@@ -357,4 +357,4 @@ class interfaceModel extends baseModel {
}
}
-module.exports = interfaceModel
\ No newline at end of file
+module.exports = interfaceModel