A web add schedule wait status

spug_web/src/pages/schedule/Table.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { observer } from 'mobx-react';
-import { Table, Divider, Modal, Tag, message } from 'antd';
+import { Table, Divider, Modal, Tag, Dropdown, Icon, Menu, message } from 'antd';
 import ComForm from './Form';
 import http from 'libs/http';
 import store from './store';
@@ -14,6 +14,18 @@ class ComTable extends React.Component {
 
   colors = ['green', 'orange', 'red'];
 
+  moreMenus = (info) => (
+    <Menu>
+      <Menu.Item>
+        <LinkButton onClick={() => this.handleActive(info)}>{info.is_active ? '禁用' : '激活'}</LinkButton>
+      </Menu.Item>
+      <Menu.Divider />
+      <Menu.Item>
+        <LinkButton onClick={() => this.handleDelete(info)}>删除</LinkButton>
+      </Menu.Item>
+    </Menu>
+  );
+
   columns = [{
     title: '序号',
     key: 'series',
@@ -29,7 +41,11 @@ class ComTable extends React.Component {
     title: '最新状态',
     render: info => {
       if (info.is_active) {
-        return <Tag color={this.colors[info['latest_status']]}>{info['latest_status_alias']}</Tag>
+        if (info['latest_status_alias']) {
+          return <Tag color={this.colors[info['latest_status']]}>{info['latest_status_alias']}</Tag>
+        } else {
+          return <Tag color="blue">待调度</Tag>
+        }
       } else {
         return <Tag>未激活</Tag>
       }
@@ -43,13 +59,18 @@ class ComTable extends React.Component {
     ellipsis: true
   }, {
     title: '操作',
+    width: 180,
     render: info => (
       <span>
-        <LinkButton onClick={() => this.handleActive(info)}>{info.is_active ? '禁用' : '激活'}</LinkButton>
+        <LinkButton onClick={() => store.showForm(info)}>详情</LinkButton>
         <Divider type="vertical"/>
         <LinkButton onClick={() => store.showForm(info)}>编辑</LinkButton>
         <Divider type="vertical"/>
-        <LinkButton onClick={() => this.handleDelete(info)}>删除</LinkButton>
+        <Dropdown overlay={() => this.moreMenus(info)} trigger={['click']}>
+          <LinkButton>
+            更多 <Icon type="down"/>
+          </LinkButton>
+        </Dropdown>
       </span>
     )
   }];
@@ -85,10 +106,12 @@ class ComTable extends React.Component {
   render() {
     let data = store.records;
     if (store.f_status !== undefined) {
-      if (store.f_status === -2) {
+      if (store.f_status === -3) {
         data = data.filter(item => !item['is_active'])
-      } else if (store.f_status === -1) {
+      } else if (store.f_status === -2) {
         data = data.filter(item => item['is_active'])
+      } else if (store.f_status === -1) {
+        data = data.filter(item => item['is_active'] && !item['latest_status_alias'])
       } else {
         data = data.filter(item => item['latest_status'] === store.f_status)
       }

spug_web/src/pages/schedule/index.js

@@ -11,8 +11,9 @@ export default observer(function () {
       <SearchForm>
         <SearchForm.Item span={6} title="状态">
           <Select allowClear onChange={v => store.f_status = v} placeholder="请选择">
-            <Select.Option value={-2}>未激活</Select.Option>
+            <Select.Option value={-3}>未激活</Select.Option>
-            <Select.Option value={-1}>已激活</Select.Option>
+            <Select.Option value={-2}>已激活</Select.Option>
+            <Select.Option value={-1}>待调度</Select.Option>
             <Select.Option value={0}>成功</Select.Option>
             <Select.Option value={1}>异常</Select.Option>
             <Select.Option value={2}>失败</Select.Option>