Skip to content

Commit

Permalink
Merge pull request #292 from andrewei1316/support-dag
Browse files Browse the repository at this point in the history
前端特判,允许 pandora_workflow_name 字段为空
  • Loading branch information
wonderflow authored Jan 4, 2018
2 parents e066cac + 6078669 commit 27d77ec
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion logkitweb/src/components/senderConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ class Sender extends Component {
)}>
{getFieldDecorator(`${this.state.currentOption}.${ele.KeyName}`, {
initialValue: ele.Default,
rules: [{required: ele.Default == '' ? false : true, message: '不能为空', trigger: 'blur'},
rules: [{required: (ele.Default == '' || ele.KeyName === 'pandora_workflow_name' ) ? false : true, message: '不能为空', trigger: 'blur'},
{pattern: ele.CheckRegex, message: '输入不符合规范'},
]
})(
Expand Down
4 changes: 2 additions & 2 deletions public/asset-manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"main.css": "static/css/main.dcc66dd4.css",
"main.css.map": "static/css/main.dcc66dd4.css.map",
"main.js": "static/js/main.89f9f6da.js",
"main.js.map": "static/js/main.89f9f6da.js.map"
"main.js": "static/js/main.0639e904.js",
"main.js.map": "static/js/main.0639e904.js.map"
}
2 changes: 1 addition & 1 deletion public/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><style>#root,#root>.ant-spin-nested-loading,#root>.ant-spin-nested-loading>.ant-spin-container,.page,.tree,body,html{width:100%;height:100%;margin:0}</style><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="shortcut icon" href="static/favicon.ico"><link href="/static/antd.css" rel="stylesheet"><title>七牛Logkit配置文件助手</title><link href="/static/css/main.dcc66dd4.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script type="text/javascript" src="/static/js/main.89f9f6da.js"></script></body></html>
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><style>#root,#root>.ant-spin-nested-loading,#root>.ant-spin-nested-loading>.ant-spin-container,.page,.tree,body,html{width:100%;height:100%;margin:0}</style><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="shortcut icon" href="static/favicon.ico"><link href="/static/antd.css" rel="stylesheet"><title>七牛Logkit配置文件助手</title><link href="/static/css/main.dcc66dd4.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script type="text/javascript" src="/static/js/main.0639e904.js"></script></body></html>
2 changes: 1 addition & 1 deletion public/service-worker.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions public/static/js/main.0639e904.js

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions public/static/js/main.89f9f6da.js

This file was deleted.

0 comments on commit 27d77ec

Please sign in to comment.