diff --git a/spug_api/apps/app/models.py b/spug_api/apps/app/models.py index f8db656..938f369 100644 --- a/spug_api/apps/app/models.py +++ b/spug_api/apps/app/models.py @@ -74,6 +74,8 @@ class DeployExtend1(models.Model, ModelMixin): deploy = models.OneToOneField(Deploy, primary_key=True, on_delete=models.CASCADE) git_repo = models.CharField(max_length=255) dst_dir = models.CharField(max_length=255) + dst_repo = models.CharField(max_length=255) + versions = models.IntegerField() filter_rule = models.TextField() hook_pre_server = models.TextField(null=True) hook_post_server = models.TextField(null=True) diff --git a/spug_api/apps/app/views.py b/spug_api/apps/app/views.py index 1fe117b..f813ddc 100644 --- a/spug_api/apps/app/views.py +++ b/spug_api/apps/app/views.py @@ -119,7 +119,9 @@ class DeployView(View): if form.extend == '1': extend_form, error = JsonParser( Argument('git_repo', handler=str.strip, help='请输入git仓库地址'), - Argument('dst_dir', handler=str.strip, help='请输入发布目标路径'), + Argument('dst_dir', handler=str.strip, help='请输入发布部署路径'), + Argument('dst_repo', handler=str.strip, help='请输入发布存储路径'), + Argument('versions', type=int, filter=lambda x: x > 0, help='请输入发布保留版本数量'), Argument('filter_rule', type=dict, help='参数错误'), Argument('hook_pre_server', handler=str.strip, default=''), Argument('hook_post_server', handler=str.strip, default=''), diff --git a/spug_web/src/pages/deploy/app/Ext1Setup3.js b/spug_web/src/pages/deploy/app/Ext1Setup3.js index 954870e..bc05436 100644 --- a/spug_web/src/pages/deploy/app/Ext1Setup3.js +++ b/spug_web/src/pages/deploy/app/Ext1Setup3.js @@ -3,9 +3,9 @@ * Copyright (c) * Released under the AGPL-3.0 License. */ -import React, {useState} from 'react'; +import React, { useState } from 'react'; import { observer } from 'mobx-react'; -import { Form, Button, Input, message } from 'antd'; +import { Form, Button, Input, Row, Col, message } from 'antd'; import Editor from 'react-ace'; import 'ace-builds/src-noconflict/mode-text'; import 'ace-builds/src-noconflict/mode-sh'; @@ -38,9 +38,21 @@ export default observer(function () { const info = store.deploy; return (
- - info['dst_dir'] = e.target.value} placeholder="请输入部署目标路径" /> + + info['dst_dir'] = e.target.value} placeholder="请输入部署目标路径"/> + + + + info['dst_repo'] = e.target.value} placeholder="请输入部署目标路径"/> + + + + + info['versions'] = e.target.value} placeholder="请输入部署目标路径"/> + + +