dev_aliyun_beta
杨树林 6 years ago
parent 69bd597ef6
commit 4974f66388

@ -1061,11 +1061,11 @@ class PollNewQuestbank extends Component {
if(object.question.min_choices>0){ if(object.question.min_choices>0){
if(object.question.max_choices){ if(object.question.max_choices){
if(object.question.max_choices===0){ if(object.question.max_choices===0){
this.props.showNotification(`可选:最小和最大限制须同时为数值或者“--"`); this.props.showNotification(`可选的最大限制不能小于最小限制!`);
return; return;
} }
}else { }else {
this.props.showNotification(`可选:最小和最大限制须同时为数值或者“--"`); this.props.showNotification(`可选的最大限制不能小于最小限制!`);
return; return;
} }
@ -1292,11 +1292,11 @@ class PollNewQuestbank extends Component {
if(object.question.min_choices>0){ if(object.question.min_choices>0){
if(object.question.max_choices){ if(object.question.max_choices){
if(object.question.max_choices===0){ if(object.question.max_choices===0){
this.props.showNotification(`可选:最小和最大限制须同时为数值或者“--"`); this.props.showNotification(`最大限制不能小于最小限制!`);
return; return;
} }
}else { }else {
this.props.showNotification(`可选:最小和最大限制须同时为数值或者“--"`); this.props.showNotification(`最大限制不能小于最小限制!`);
return; return;
} }
@ -1622,11 +1622,11 @@ class PollNewQuestbank extends Component {
if(object.question.min_choices>0){ if(object.question.min_choices>0){
if(object.question.max_choices){ if(object.question.max_choices){
if(object.question.max_choices===0){ if(object.question.max_choices===0){
this.props.showNotification(`可选:最小和最大限制须同时为数值或者“--"`); this.props.showNotification(`可选的最大限制不能小于最小限制!`);
return; return;
} }
}else { }else {
this.props.showNotification(`可选:最小和最大限制须同时为数值或者“--"`); this.props.showNotification(`可选的最大限制不能小于最小限制!`);
return; return;
} }
@ -1826,11 +1826,11 @@ class PollNewQuestbank extends Component {
if(object.question.min_choices>0){ if(object.question.min_choices>0){
if(object.question.max_choices){ if(object.question.max_choices){
if(object.question.max_choices===0){ if(object.question.max_choices===0){
this.props.showNotification(`可选:最小和最大限制须同时为数值或者“--"`); this.props.showNotification(`可选的最大限制不能小于最小限制!`);
return; return;
} }
}else { }else {
this.props.showNotification(`可选:最小和最大限制须同时为数值或者“--"`); this.props.showNotification(`可选的最大限制不能小于最小限制!`);
return; return;
} }
@ -3209,16 +3209,17 @@ class PollNewQuestbank extends Component {
}} }}
onInput={(e) => this.HandleInputChanges(e, indexo, indext)}></TextArea> onInput={(e) => this.HandleInputChanges(e, indexo, indext)}></TextArea>
{this.state.polls_status === undefined || this.state.polls_status === 1 ? {this.state.polls_status === undefined || this.state.polls_status === 1 ?
(itemo.question.question_type === 2 && itemo.question.answers.length === 3 ? // (itemo.question.question_type === 2 && itemo.question.answers.length === 3 ?
(indext ===1? // (indext ===1?
<a className="lineh-40" id="bianjibianji1" // <a className="lineh-40" id="bianjibianji1"
onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip // onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
title="新增" placement={"bottom"}><i // title="新增" placement={"bottom"}><i
className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a> // className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
: // :
"" // ""
) // )
: // ""
// :
itemo.question.answers.length > 2 &&indext>1? itemo.question.answers.length > 2 &&indext>1?
<span> <span>
<a className="lineh-40 mr10" <a className="lineh-40 mr10"
@ -3248,8 +3249,8 @@ class PollNewQuestbank extends Component {
title="新增" placement={"bottom"}><i title="新增" placement={"bottom"}><i
className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a> className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
:"") :"")
: "") // : "")
: ""} : "":""}
</p>)} </p>)}
</div> </div>
) )
@ -3267,8 +3268,8 @@ class PollNewQuestbank extends Component {
{this.state.polls_status === undefined || this.state.polls_status === 1 ? {this.state.polls_status === undefined || this.state.polls_status === 1 ?
(this.state.newoption === false ? (this.state.newoption === false ?
<ActionBtn style="grey" className="ml61 mt5" <a className="defalutCancelbtn ml61 mt5"
onClick={() => this.Addanotheroption(itemo.question.id)}>添加[其它]选项</ActionBtn> onClick={() => this.Addanotheroption(itemo.question.id)}>添加[其它]选项</a>
: "") : "")
: ""} : ""}
<span className="fr mt5"> <span className="fr mt5">
@ -3293,11 +3294,11 @@ class PollNewQuestbank extends Component {
{polls_status === undefined || polls_status === 1 ? {polls_status === undefined || polls_status === 1 ?
(newoption === false ? (newoption === false ?
<ActionBtn style="grey" className="ml61 mt5" <a className="defalutCancelbtn ml61 mt5 mb20"
onClick={() => this.Addanotheroption(itemo.question.id)}>添加[其它]选项</ActionBtn> onClick={() => this.Addanotheroption(itemo.question.id)}>添加[其它]选项</a>
: "") : "")
: ""} : ""}
<div> <div >
<span <span
className="color-grey-6 mr5 w55 font-16 lineh-40 fl" style={{textAlign: "center"}}>可选</span> className="color-grey-6 mr5 w55 font-16 lineh-40 fl" style={{textAlign: "center"}}>可选</span>
<div className="mr40 flex1 "> <div className="mr40 flex1 ">
@ -3314,6 +3315,17 @@ class PollNewQuestbank extends Component {
"display": "block"; "display": "block";
"opacity": "1"; "opacity": "1";
} }
.ant-select-selection__rendered{
height:100%;
line-height:37px;
text-align:center;
}
.ant-select-selection-selected-value{
display:block;
opacity:1;
width:100%
}
` `
} }
</style> </style>
@ -3524,14 +3536,13 @@ class PollNewQuestbank extends Component {
}} }}
onInput={(e) => this.HandleInputChanges(e, indexo, indext)}></TextArea> onInput={(e) => this.HandleInputChanges(e, indexo, indext)}></TextArea>
{this.state.polls_status === undefined || this.state.polls_status === 1 ? {this.state.polls_status === undefined || this.state.polls_status === 1 ?
( itemo.question.question_type === 2 && itemo.question.answers.length === 3 ? // ( itemo.question.question_type === 2 && itemo.question.answers.length === 3 ?
(indext ===1? // (indext ===1?
<a className="lineh-40 " id="bianjibianji2" // <a className="lineh-40 " id="bianjibianji2"
onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip // onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
title="新增" placement={"bottom"}><i // title="新增" placement={"bottom"}><i
className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a> // className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
:"") // :"")
:
itemo.question.answers.length > 2 && indext>1 ? itemo.question.answers.length > 2 && indext>1 ?
<span> <span>
<a className="lineh-40 mr10" <a className="lineh-40 mr10"
@ -3561,8 +3572,8 @@ class PollNewQuestbank extends Component {
title="新增" placement={"bottom"}><i title="新增" placement={"bottom"}><i
className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a> className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
:"") :"")
: "") // : "")
: ""} : "":""}
</p>)} </p>)}
</div> </div>
) )
@ -3580,8 +3591,8 @@ class PollNewQuestbank extends Component {
{this.state.polls_status === undefined || this.state.polls_status === 1 ? {this.state.polls_status === undefined || this.state.polls_status === 1 ?
(this.state.newoption === false ? (this.state.newoption === false ?
<ActionBtn style="grey" className="ml61 mt5" <a className="defalutCancelbtn ml61 mt5"
onClick={() => this.Addanotheroption(itemo.question.id)}>添加[其它]选项</ActionBtn> onClick={() => this.Addanotheroption(itemo.question.id)}>添加[其它]选项</a>
: "") : "")
: ""} : ""}
<span className="fr mt5"> <span className="fr mt5">
@ -3606,8 +3617,8 @@ class PollNewQuestbank extends Component {
{polls_status === undefined || polls_status === 1 ? {polls_status === undefined || polls_status === 1 ?
(newoption === false ? (newoption === false ?
<ActionBtn style="grey" className="ml61 mt5" <a className=" defalutCancelbtn ml61 mt5 mb20"
onClick={() => this.Addanotheroption(itemo.question.id)}>添加[其它]选项</ActionBtn> onClick={() => this.Addanotheroption(itemo.question.id)}>添加[其它]选项</a>
: "") : "")
: ""} : ""}
<div> <div>
@ -3627,6 +3638,17 @@ class PollNewQuestbank extends Component {
"display": "block"; "display": "block";
"opacity": "1"; "opacity": "1";
} }
.ant-select-selection__rendered{
height:100%;
line-height:37px;
text-align:center;
}
.ant-select-selection-selected-value{
display:block;
opacity:1;
width:100%
}
` `
} }
</style> </style>
@ -3909,8 +3931,8 @@ class PollNewQuestbank extends Component {
{polls_status === undefined || polls_status === 1 ? {polls_status === undefined || polls_status === 1 ?
(newoption === false ? (newoption === false ?
<ActionBtn style="grey" className="ml61 mt5" <a className="defalutCancelbtn ml61 mt5"
onClick={() => this.Addanotheroption(itemo.question.id)}>添加[其它]选项</ActionBtn> onClick={() => this.Addanotheroption(itemo.question.id)}>添加[其它]选项</a>
: "") : "")
: ""} : ""}
<span className="fr mt5"> <span className="fr mt5">
@ -3936,8 +3958,8 @@ class PollNewQuestbank extends Component {
{polls_status === undefined || polls_status === 1 ? {polls_status === undefined || polls_status === 1 ?
(newoption === false ? (newoption === false ?
<ActionBtn style="grey" className="ml61 mt5" <a className=" defalutCancelbtn ml61 mt5 mb20"
onClick={() => this.Addanotheroption(itemo.question.id)}>添加[其它]选项</ActionBtn> onClick={() => this.Addanotheroption(itemo.question.id)}>添加[其它]选项</a>
: "") : "")
: ""} : ""}
<div> <div>
@ -3957,6 +3979,17 @@ class PollNewQuestbank extends Component {
"display": "block"; "display": "block";
"opacity": "1"; "opacity": "1";
} }
.ant-select-selection__rendered{
height:100%;
line-height:37px;
text-align:center;
}
.ant-select-selection-selected-value{
display:block;
opacity:1;
width:100%
}
` `
} }
</style> </style>

Loading…
Cancel
Save