|
@@ -254,10 +254,16 @@ export const confirm = (state,action) =>{
|
|
|
export const setCheckBox = (state,action)=>{
|
|
|
const res = Object.assign({},state);
|
|
|
const {exists,labelInx,existsName} = action.data;
|
|
|
+ // 若每个选项都有符号,去掉最后一个,因与标签间的符号有冲突
|
|
|
+ let names=existsName;
|
|
|
+ let pattern = new RegExp(/\,+$|\,+$|\.+$|\。+$|\、+$/);//+ 一次或多次
|
|
|
+ if(pattern.test(existsName)){
|
|
|
+ names = existsName.substr(0,existsName.length-1);
|
|
|
+ }
|
|
|
let arr = res.data;
|
|
|
- arr[labelInx].value = existsName;
|
|
|
- res.saveText[labelInx] = existsName;
|
|
|
- res.selecteds[labelInx] = action.data;
|
|
|
+ arr[labelInx].value = names;
|
|
|
+ res.saveText[labelInx] = names;
|
|
|
+ res.selecteds[labelInx] = action.data;console.log(99,res,action);
|
|
|
res.update=Math.random();
|
|
|
return res;
|
|
|
}
|