From 7efe4944a3a878b9fd9de3d25b14702c45a868a2 Mon Sep 17 00:00:00 2001
From: caicai8 <1149225589@qq.com>
Date: Fri, 17 Jan 2020 17:00:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/issues_controller.rb |  3 ++-
 public/react/src/forge/Order/New.js  | 20 +++++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index f72fd4109..bc3aa77f7 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -166,6 +166,7 @@ class IssuesController < ApplicationController
         author_id: params[:author_id] || current_user.id,
         project_id: @project.id
       }
+
       @issue = Issue.new(issue_params)
       if @issue.save!
         if params[:attachment_ids].present?
@@ -398,4 +399,4 @@ class IssuesController < ApplicationController
     end
     tracker_array
   end
-end
\ No newline at end of file
+end
diff --git a/public/react/src/forge/Order/New.js b/public/react/src/forge/Order/New.js
index faee24d72..a3473195b 100644
--- a/public/react/src/forge/Order/New.js
+++ b/public/react/src/forge/Order/New.js
@@ -183,7 +183,9 @@ class New extends Component{
                   label="状态"
                 >
                   {getFieldDecorator('status_id', {
-                    rules: [],
+                    rules: [{
+                      required: true, message: '请选择完成状态'
+                    }],
                   })(
                     <Select value={status_id}>
                       <Option value={""}>未选择完成状态</Option>
@@ -195,7 +197,9 @@ class New extends Component{
                   label="类型"
                 >
                   {getFieldDecorator('issue_type', {
-                    rules: [],
+                    rules: [{
+                      required: true, message: '请选择类型'
+                    }],
                   })(
                     <Select value={issue_type}>
                       <Option value={""}>未选择类型</Option>
@@ -207,7 +211,9 @@ class New extends Component{
                   label="分类"
                 >
                   {getFieldDecorator('tracker_id', {
-                    rules: [],
+                    rules: [{
+                      required: true, message: '请选择分类'
+                    }],
                   })(
                     <Select value={tracker_id}>
                       <Option value={""}>未选择分类</Option>
@@ -231,7 +237,9 @@ class New extends Component{
                   label="优先度"
                 >
                   {getFieldDecorator('priority_id', {
-                    rules: [],
+                    rules: [{
+                      required: true, message: '请选择优先度'
+                    }],
                   })(
                     <Select value={priority_id}>
                       <Option value={""}>未选择优先度</Option>
@@ -243,7 +251,9 @@ class New extends Component{
                   label="完成度"
                 >
                   {getFieldDecorator('done_ratio', {
-                    rules: [],
+                    rules: [{
+                      required: true, message: '请选择完成度'
+                    }],
                   })(
                     <Select value={done_ratio}>
                       <Option value={""}>未选择完成度</Option>