Merge branch 'feature/hongy_maxExecutionTime_200226' into 'master'

添加最大执行时间

See merge request admin-manager/dc!17

src/pages/tc/jobs/jobs.js

@@ -174,6 +174,7 @@ class Index extends React.PureComponent {
                     <Descriptions.Item label="描述">{get(myState,'description.desc')}</Descriptions.Item>
                     <Descriptions.Item label="创建人">{get(myState,'description.createName')}</Descriptions.Item>
                     <Descriptions.Item label="创建时间">{get(myState,'createTime')}</Descriptions.Item>
+                    <Descriptions.Item label="最长执行时长">{get(myState,'options.maximumRunSeconds')}</Descriptions.Item>
                 </Descriptions>
                 {/* <Card title="卡片标题">卡片内容</Card> */}
                 <hr></hr>

src/pages/tc/project/Add/index.js

@@ -59,6 +59,13 @@ export default class Index extends Component {
       isRequired: true,
       placeholder: '请选择'
     },
+    {
+      label: '最大执行时长',
+      type: 'input',
+      key: 'maximumRunSeconds',
+      isRequired: true,
+      placeholder: '请输入最大执行时长秒数'
+    },
     {
       label: '排他运行',
       type: 'select',

src/pages/tc/project/index.js

@@ -135,7 +135,7 @@ class Index extends React.PureComponent {
     // 点击新建、编辑对话框的确定按钮的事件处理函数
     onModalOk = (params) => {
 
-        const { ruleName, targetName, value, description, projectName, disableAutoCreate, disableAutoTrigger, isExclusive } = params;
+        const { ruleName, targetName, value, description, projectName, disableAutoCreate, disableAutoTrigger, isExclusive , maximumRunSeconds} = params;
         if (!params.targetName && !params.ruleName) {
             message.warning('名称必填')
             return
@@ -156,8 +156,12 @@ class Index extends React.PureComponent {
             message.warning('排他必填')
             return
         }
+        if (!params.maximumRunSeconds) {
+            message.warning('最大执行时长必填')
+            return
+        }
 
-        const payload = { targetName, ruleName, value, description, projectName, disableAutoCreate, disableAutoTrigger, isExclusive }
+        const payload = { targetName, ruleName, value, description, projectName, disableAutoCreate, disableAutoTrigger, isExclusive , maximumRunSeconds }
         const type = 'tctemplate/_addItem'
         this.props.dispatch({
             type,

src/pages/tc/sp/components/Add/index.js

@@ -59,6 +59,13 @@ export default class Index extends Component {
       isRequired: true,
       placeholder: '请选择'
     },
+    {
+      label: '最大执行时长',
+      type: 'input',
+      key: 'maximumRunSeconds',
+      isRequired: true,
+      placeholder: '请输入最大执行时长秒数'
+    },
     {
       label: '排他运行',
       type: 'select',

src/pages/tc/sp/plan.js

@@ -54,6 +54,10 @@ class Index extends React.PureComponent {
                 title: '创建人',
                 dataIndex: 'description.createName'
             },
+            {
+                title: '最大执行时长',
+                dataIndex: 'options.maximumRunSeconds'
+            },
             {
                 title: '创建时间',
                 dataIndex: 'createTime'
@@ -181,6 +185,7 @@ class Index extends React.PureComponent {
                 disableAutoCreate: record.options.disableAutoCreate,
                 disableAutoTrigger: record.options.disableAutoTrigger,
                 isExclusive: record.options.isExclusive,
+                maximumRunSeconds: get(record,"options.maximumRunSeconds"),
             }
         })
     }
@@ -222,7 +227,7 @@ class Index extends React.PureComponent {
     // 点击新建、编辑对话框的确定按钮的事件处理函数
     onModalOk = (params) => {
 
-        const { ruleName, targetName, value, description,projectName, disableAutoCreate, disableAutoTrigger, isExclusive,createTime,createName } = params;
+        const { ruleName, targetName, value, description,projectName, disableAutoCreate, disableAutoTrigger, isExclusive,createTime,createName ,maximumRunSeconds} = params;
         if (!params.targetName && !params.ruleName) {
             message.warning('名称必填')
             return
@@ -243,8 +248,12 @@ class Index extends React.PureComponent {
             message.warning('排他必填')
             return
         }
+        if (!params.maximumRunSeconds) {
+            message.warning('最大执行时长必填')
+            return
+        }
 
-        const payload = { targetName, ruleName, value, description,projectName, disableAutoCreate, disableAutoTrigger, isExclusive,createTime,createName }
+        const payload = { targetName, ruleName, value, description,projectName, disableAutoCreate, disableAutoTrigger, isExclusive , createTime , createName , maximumRunSeconds }
         const type = !params.targetName ? 'tctemplate/_addItem' : 'tctemplate/_editItem'
         this.props.dispatch({
             type,