From 9e00f0350b939ad7e4d356f151de9851525115b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Mon, 2 Sep 2019 16:12:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/courses/poll/PollNewQuestbank.js  | 37 +++++++++----------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/public/react/src/modules/courses/poll/PollNewQuestbank.js b/public/react/src/modules/courses/poll/PollNewQuestbank.js
index 81aa4d9fc..1daf48e28 100644
--- a/public/react/src/modules/courses/poll/PollNewQuestbank.js
+++ b/public/react/src/modules/courses/poll/PollNewQuestbank.js
@@ -1836,8 +1836,8 @@ class PollNewQuestbank extends Component {
 					question_title: object.question.question_title,
 					question_type: number,
 					is_necessary: object.question.is_necessary,
-					max_choices: max_choicess===undefined?length:max_choicess===null?length:max_choicess===0?length:max_choicess,
-					min_choices: min_choicess===undefined?2:min_choicess===null?2:min_choicess===0?2:min_choicess,
+					max_choices: max_choicess===undefined||max_choicess===null||max_choicess===0||max_choicess==="0"?null:max_choicess,
+					min_choices: min_choicess===undefined||min_choicess===null||min_choicess===0||min_choicess==="0"?null:min_choicess,
 					question_answers: option,
 					question_other_answer: null,
 					insert_id: insert_id
@@ -1908,8 +1908,8 @@ class PollNewQuestbank extends Component {
 					question_title: object.question.question_title,
 					question_type: number,
 					is_necessary: object.question.is_necessary,
-					max_choices: max_choicess===undefined?length:max_choicess===null?length:max_choicess===0?length:max_choicess,
-					min_choices: min_choicess===undefined?2:min_choicess===null?2:min_choicess===0?2:min_choicess,
+					max_choices: max_choicess===undefined||max_choicess===null||max_choicess===0||max_choicess==="0"?null:max_choicess,
+					min_choices: min_choicess===undefined||min_choicess===null||min_choicess===0||min_choicess==="0"?null:min_choicess,
 					question_answers: option,
 					question_other_answer: null,
 				};
@@ -2831,7 +2831,7 @@ class PollNewQuestbank extends Component {
 									<span
 										className=" ml10">{item.question.is_necessary === 1 ? "(必答)" : item.question.question_type === 2 ? "(选答)" : "(选答)"}</span>
 									<span style={{color: "#4B4B4B"}}
-												className="font-16 mt10 ml10">{(item.question.min_choices === undefined && item.question.max_choices === undefined ? "" : item.question.min_choices === null && item.question.max_choices === null ? "" : item.question.min_choices === 0 && item.question.max_choices === 0 ? "" : "可选" + item.question.min_choices + "-" + item.question.max_choices + "项")}</span>
+												className="font-16 mt10 ml10">{(item.question.min_choices === undefined && item.question.max_choices === undefined ? "不限制" : item.question.min_choices === null && item.question.max_choices === null ? "不限制" : item.question.min_choices === 0 && item.question.max_choices === 0 ? "": item.question.min_choices === "null" && item.question.max_choices === "null" ? "不限制"  : "可选" + item.question.min_choices + "-" + (item.question.max_choices===undefined||item.question.max_choices===null||item.question.max_choices===""||item.question.max_choices==="null"?item.question.answers.length:item.question.max_choices) + "项")}</span>
 									{
 										polls_status === undefined || polls_status === 1 ?
 											<span className="fr">
@@ -3088,7 +3088,7 @@ class PollNewQuestbank extends Component {
                                                         <span
 																													className="color-grey-6 mr20 font-16 lineh-40 fl">可选</span>
 																								<div className="mr40 flex1 ">
-																									{/*可选最小*/}
+																									{/*可选最小1*/}
 																									<style>
 																										{
 																											`
@@ -3106,8 +3106,7 @@ class PollNewQuestbank extends Component {
 																									</style>
 																									<Select className="fl  w100"
 																													onChange={(value) => this.HandleGradationGroupChangee(value, indexo, itemo.question.max_choices, itemo.question.answers.length)}
-																													value={itemo.question.min_choices === 0 || itemo.question.min_choices === "0" ? "--" : itemo.question.min_choices === null ? "--" : itemo.question.min_choices === undefined ? "--" : itemo.question.min_choices}
-
+																													value={itemo.question.min_choices === null || itemo.question.min_choices === undefined ||itemo.question.min_choices === "null"|| itemo.question.min_choices === 0 || itemo.question.min_choices === "0"?"0": itemo.question.min_choices}
 																									>
 																										<Option value={String("0")}>--</Option>
 																										{itemo.question.answers === undefined ? "" : itemo.question.answers.map((itemt, indext) => {
@@ -3119,10 +3118,10 @@ class PollNewQuestbank extends Component {
 																									</Select>
 																									<span
 																										className="ml10 mr10 color-grey-6 lineh-40 fl">~</span>
-																									{/*可选最大*/}
+																									{/*可选最大1*/}
 																									<Select className="fl w100"
 																													onChange={(value) => this.HandleGradationGroupChangeee(value, indexo, itemo.question.min_choices,itemo.question.answers.length)}
-																													value={itemo.question.max_choices === 0 || itemo.question.max_choices === "0" ? "--" : itemo.question.min_choices === null ? "--" : itemo.question.min_choices === undefined ? "--" : itemo.question.max_choices}
+																													value={itemo.question.max_choices === null || itemo.question.max_choices === undefined ||itemo.question.max_choices === "null"|| itemo.question.max_choices === 0 || itemo.question.max_choices === "0"?"0": itemo.question.max_choices}
 																									>
 																										<Option value={String("0")}>--</Option>
 																										{itemo.question.answers === undefined ? "" : itemo.question.answers.map((itemt, indext) => {
@@ -3398,7 +3397,7 @@ class PollNewQuestbank extends Component {
                                                         <span
 																													className="color-grey-6 mr20 font-16 lineh-40 fl">可选</span>
 																								<div className="mr40 flex1 ">
-																									{/*可选最小*/}
+																									{/*可选最小2*/}
 																									<style>
 																										{
 																											`
@@ -3416,8 +3415,7 @@ class PollNewQuestbank extends Component {
 																									</style>
 																									<Select className="fl  w100"
 																													onChange={(value) => this.HandleGradationGroupChangee(value, indexo, itemo.question.max_choices, itemo.question.answers.length)}
-																													value={itemo.question.min_choices === 0 || itemo.question.min_choices === "0" ? "--" : itemo.question.min_choices === null ? "--" : itemo.question.min_choices === undefined ? "--" : itemo.question.min_choices}
-
+																													value={itemo.question.min_choices === null || itemo.question.min_choices === undefined ||itemo.question.min_choices === "null"|| itemo.question.min_choices === 0 || itemo.question.min_choices === "0"?"0": itemo.question.min_choices}
 																									>
 																										<Option value={String("0")}>--</Option>
 																										{itemo.question.answers === undefined ? "" : itemo.question.answers.map((itemt, indext) => {
@@ -3429,10 +3427,10 @@ class PollNewQuestbank extends Component {
 																									</Select>
 																									<span
 																										className="ml10 mr10 color-grey-6 lineh-40 fl">~</span>
-																									{/*可选最大*/}
+																									{/*可选最大2*/}
 																									<Select className="fl w100"
 																													onChange={(value) => this.HandleGradationGroupChangeee(value, indexo, itemo.question.min_choices,itemo.question.answers.length)}
-																													value={itemo.question.max_choices === 0 || itemo.question.max_choices === "0" ? "--" : itemo.question.min_choices === null ? "--" : itemo.question.min_choices === undefined ? "--" : itemo.question.max_choices}
+																													value={itemo.question.max_choices === null || itemo.question.max_choices === undefined ||itemo.question.max_choices === "null"|| itemo.question.max_choices === 0 || itemo.question.max_choices === "0"?"0": itemo.question.max_choices}
 																									>
 																										<Option value={String("0")}>--</Option>
 																										{itemo.question.answers === undefined ? "" : itemo.question.answers.map((itemt, indext) => {
@@ -3718,7 +3716,7 @@ class PollNewQuestbank extends Component {
                                                         <span
 																													className="color-grey-6 mr20 font-16 lineh-40 fl">可选</span>
 																				<div className="mr40 flex1 ">
-																					{/*可选最小*/}
+																					{/*可选最小3*/}
 																					<style>
 																						{
 																							`
@@ -3736,8 +3734,7 @@ class PollNewQuestbank extends Component {
 																					</style>
 																					<Select className="fl  w100"
 																									onChange={(value) => this.HandleGradationGroupChangee(value, indexo, itemo.question.max_choices, itemo.question.answers.length)}
-																									value={itemo.question.min_choices === 0 || itemo.question.min_choices === "0" ? "--" : itemo.question.min_choices === null ? "--" : itemo.question.min_choices === undefined ? "--" : itemo.question.min_choices}
-
+																									value={itemo.question.min_choices === null || itemo.question.min_choices === undefined ||itemo.question.min_choices === "null"|| itemo.question.min_choices === 0 || itemo.question.min_choices === "0"?"0": itemo.question.min_choices}
 																					>
 																						<Option value={String("0")}>--</Option>
 																						{itemo.question.answers === undefined ? "" : itemo.question.answers.map((itemt, indext) => {
@@ -3749,10 +3746,10 @@ class PollNewQuestbank extends Component {
 																					</Select>
 																					<span
 																						className="ml10 mr10 color-grey-6 lineh-40 fl">~</span>
-																					{/*可选最大*/}
+																					{/*可选最大3*/}
 																					<Select className="fl w100"
 																									onChange={(value) => this.HandleGradationGroupChangeee(value, indexo, itemo.question.min_choices,itemo.question.answers.length)}
-																									value={itemo.question.max_choices === 0 || itemo.question.max_choices === "0" ? "--" : itemo.question.min_choices === null ? "--" : itemo.question.min_choices === undefined ? "--" : itemo.question.max_choices}
+																									value={itemo.question.max_choices === null || itemo.question.max_choices === undefined ||itemo.question.max_choices === "null"|| itemo.question.max_choices === 0 || itemo.question.max_choices === "0"?"0": itemo.question.max_choices}
 																					>
 																						<Option value={String("0")}>--</Option>
 																						{itemo.question.answers === undefined ? "" : itemo.question.answers.map((itemt, indext) => {