Merge branch 'dev/new1' into dev/byll

src/common/components/EditableSpan/index.jsx

@@ -50,7 +50,7 @@ class EditableSpan extends Component{
   onChange(e){
     e.stopPropagation();
     const {handleChange,boxMark,i,handleSearch,value,mainSaveText,mainIds} = this.props;
-    const {labelVal,oldText,searchPre} = this.state;
+    const {labelVal,searchPre} = this.state;
     const text1 =e.target.innerText;
     let mainText = filterArr(mainSaveText);//主诉字数
     if(+boxMark==1){
@@ -80,17 +80,18 @@ class EditableSpan extends Component{
     clearTimeout(this.state.timer);
     const timer = setTimeout(function(){
       let newText = e.target.innerText;
-      let temp = '';
+      let temp = '',isEnd=false;
       let search='';
       clearTimeout(that.state.timer);
-      // temp = newText.replace(oldText.replace(/(^\s*)|(\s*$)/g,''),'');
-      temp = newText.replace(searchPre.replace(/(^\s*)|(\s*$)|(^\,*)|(\,*$)/g,''),'');
-      search = temp.replace(/(^\s*)|(\s*$)|(^\,*)|(\,*$)/g,'');
-      // console.log(111,labelVal,searchPre,333,newText,444,search);
-      handleSearch&&handleSearch({text:search,boxMark,mainIds});
-      /*that.setState({
-        oldText:newText.replace(search,'')
-      })*/
+      temp = newText.replace(searchPre,'');
+      isEnd = !(newText.indexOf(searchPre)>0);
+      search = temp.replace(/[(^\s*)|(\s*$)|(^\,*)|(\,*$)]/g,'');
+      //console.log(labelVal,'旧：',searchPre,'新：',newText,'搜索：',search);
+      handleSearch&&handleSearch({text:search,isEnd,boxMark,mainIds});
+      //搜索后保持现在的值，继续输入时要用于对比
+      that.setState({
+        searchPre:newText
+      });
     },config.delayTime);
     this.setState({
       timer
@@ -114,6 +115,9 @@ class EditableSpan extends Component{
     const ev = e||window.event;
     const target = ev.target||ev.srcElement;
     let innerVal = target.innerText;
+    /*if(this.props.full){
+      return false;
+    }*/
     //禁止回车事件
     if(ev.keyCode==13){return false;}
     //backspace事件
@@ -171,7 +175,7 @@ class EditableSpan extends Component{
   }
 
   render() {
-    return <span className={style['editable-span']}
+    return <span className={style['editable-span']+(this.props.full?' '+style['full']:'')}
                       contentEditable='true'
                       ref={this.$span}
                       onInput={this.onChange}

src/common/components/ItemBox/index.jsx

@@ -33,7 +33,7 @@ class ItemBox extends Component {
   }
   handleInput(e){
     const {onchange,data} = this.props;
-    if(data&&data.length==0){//避免结构化下触发onchange，导致下拉要点两下
+    if((data&&data.length==0)||!data){//避免结构化下触发onchange，导致下拉要点两下
       onchange&&onchange(e)
     }
   }
@@ -49,7 +49,7 @@ class ItemBox extends Component {
   render(){
     const {title,children,editable,className,handleFocus,onchange,fuzhen,border,handleBlur,titleTop,backgroundColor} = this.props;
     return <div className={style["box"]+" "+"clearfix"} >
-      <div className={style["title"] + ' ' + className} style={{marginTop:titleTop?'22px':''}}>{title}</div>
+      <div className={style["title"] + ' '+(className||'')} style={{marginTop:titleTop?'22px':''}}>{title}</div>
       <div ref={this.$div} className={`${style["content"]} ${border?style["border"]:''} ${backgroundColor?style["noBorder"]:''}`} contentEditable={editable} style={this.getBoxStyle()} onFocus={handleFocus} onInput={this.handleInput} onClick={(e)=>{this.handleClick(e);}} onBlur={handleBlur}>
         {fuzhen?children||fuzhen:children}
       </div>

src/common/components/NumberPan/index.jsx

@@ -49,7 +49,9 @@ class NumberPan extends Component{
   render(){
     const select = this.handleSelect.bind(this);
     const {show} = this.props;      //table onBlur阻止冒泡是为了修复multSpread中数字键盘点击触发最外层数字组件onBlur事件
-    return <div className={style['panBox']} onBlur={(e)=>e.stopPropagation()} style={{display:show?'table':'none'}}>
+    return <div className={style['panBox']}
+                onBlur={(e)=>e.stopPropagation()} style={{display:show?'table':'none'}}
+                onDoubleClick={(e)=>e.stopPropagation()}>
     <table className={style['pan']} >
       <tr>
         <td><button onClick={select}>1</button></td>

src/common/less/variables.less

@@ -57,7 +57,8 @@
   top:30px;
   background: #fff;
   box-shadow: 0 10px 20px 0 #989DA3;
-  filter:progid:DXImageTransform.Microsoft.Shadow(color='#CCCCCC',Direction=125,Strength=4);
+  filter:progid:DXImageTransform.Microsoft.Shadow(color='#989DA3',Direction=125,Strength=6);
+  border: 1px solid #f3f0f0;
   z-index: 203;
   padding: 20px;
   white-space: nowrap;

src/components/CheckBody/index.jsx

@@ -15,7 +15,7 @@ class CheckBody extends Component{
     this.handleClick = this.handleClick.bind(this);
     this.handleSearchSelect = this.handleSearchSelect.bind(this);
     this.getData = this.getData.bind(this);
-    this.handleInput = this.handleInput.bind(this);
+    //this.handleInput = this.handleInput.bind(this);
   }
   getLabels(){
     const {data,showArr,saveText,selecteds} = this.props;
@@ -38,6 +38,7 @@ class CheckBody extends Component{
     if(totalHide){
       return ;
     }
+
     let boxLeft = e.pageX -102 + 'px';
     let boxTop =  (+e.target.offsetTop+22)+'px';
     this.setState({
@@ -47,34 +48,28 @@ class CheckBody extends Component{
   }
   handleSearchSelect(obj){
    const {questionId,name} = obj;
-   const {fetchModules,focusTextIndex,span} = this.props;//console.log(focusTextIndex)
-    fetchModules&&fetchModules({id:questionId,index:focusTextIndex,name,span});
+   const {fetchModules,focusTextIndex,span,searchInEnd} = this.props;
+    fetchModules&&fetchModules({id:questionId,index:focusTextIndex,name,span,searchInEnd});
   }
   getData(){
     //第一次聚焦查体时，主诉有数据则调接口，主诉无数据则显示提示；其他时间查体模板数据不调接口
-    const {hasMain,saveText,data,fetchPushInfos} = this.props;
+    const {hasMain,saveText,data,isEmpty} = this.props;
     const hasData = saveText.join("")||data.length>0;
 
-    if(hasData){
+    if(!hasMain&&isEmpty){          //无主诉且本身无数据时，点击提示（空白页、清空）
+      Notify.error("无法操作，请先输入主诉");
       return ;
     }
-    if(hasMain){
+    //有主诉时且本身无数据，第一次点击获取数据，(不论获取成功与否)再点击不获取（直到刷新成空白页或清空）
+    if(hasMain&&isEmpty){
       this.props.getInit();
-    }else{
-      Notify.error("无法操作，请先输入主诉");
-    }
-
-  }
-  handleInput(e){  //主诉未填无法输入
-    if(!this.props.hasMain){
-      e.target.innerText='';
     }
   }
   render(){
     const {searchData,totalHide,data} = this.props;
     const {boxLeft,boxTop,boxMark} = this.state;
     return  <div className={style['container']}>
-      <ItemBox title='查体' editable={!data.length}  handleClick={this.handleClick} onchange={this.handleInput}>
+      <ItemBox title='查体' handleClick={this.handleClick}>
         {this.getLabels()}
         {searchData && searchData.length>0?<SearchDrop data={searchData} show={!totalHide} left={boxLeft} top={boxTop} onSelect={this.handleSearchSelect}></SearchDrop>:''}
       </ItemBox>

src/components/DiagnosticList/index.jsx

@@ -22,8 +22,11 @@ class DiagnosticList extends Component {
         this.handleClickDiag = this.handleClickDiag.bind(this);
     }
 
-    componentWillReceiveProps() {
-        this.props.getBilling();
+    componentWillReceiveProps(nextprops) {
+        if (this.props.diagnosticStr != nextprops.diagnosticStr) {
+            this.props.getBilling();
+        }
+        
     }
 
     upDiagnostic(index) {

src/components/NumberDrop/index.jsx

@@ -83,6 +83,7 @@ class NumberDrop extends Component{
     });
     const {handleSelect,ikey,suffix,prefix,mainSaveText,placeholder} = this.props;
     const text = e.target.innerText===placeholder?'':e.target.innerText;
+    e.target.innerText = '';      //避免出现重复输入值
     handleSelect&&handleSelect({ikey,text,suffix,prefix,mainSaveText});
   }
   handleSpanInp(e){    //数字框输入事件

src/components/OtherHistory/index.jsx

@@ -26,8 +26,8 @@ class OtherHistory extends Component{
   }
   handleSearchSelect(obj){
     const {questionId,name} = obj;
-    const {fetchModules,focusTextIndex,span} = this.props;
-    fetchModules&&fetchModules({id:questionId,index:focusTextIndex,name,span});
+    const {fetchModules,focusTextIndex,span,searchInEnd} = this.props;
+    fetchModules&&fetchModules({id:questionId,index:focusTextIndex,name,span,searchInEnd});
   }
   getLabels(){
     const {data,showArr,selecteds,saveText} = this.props;

src/components/SpreadDrop/index.jsx

@@ -61,7 +61,7 @@ class SpreadDrop extends Component{
       boxTop:boxTop
     })
     // window.event? window.event.cancelBubble = true : e.stopPropagation();
-    // this.setStateInit();      //恢复初始选中状态
+     this.setStateInit();      //恢复初始选中状态
     const {ikey,handleShow,placeholder,flag,id,value,tagType,type} = this.props;
     const that = this;
     this.btnClickFlag = false;

src/containers/CheckBody.js

@@ -10,6 +10,7 @@ function mapStateToProps(state){
   const hasMain = mainSuit.saveText.join('');//||mainSuit.data.length;
   return {
     data:checkBody.data,
+    isEmpty:checkBody.isEmpty,
     update:checkBody.update,   //用于触发更新
     showArr:homePage.showDrop,
     totalHide:homePage.totalHide,
@@ -18,6 +19,7 @@ function mapStateToProps(state){
     hasMain,//主诉选中的数据
     focusTextIndex:checkBody.focusIndex,    //聚焦的自由文本标签index
     span:checkBody.span,
+    searchInEnd:checkBody.searchInEnd,      //是否在搜索末尾插入结果
     selecteds:checkBody.selecteds       //普通多选选中状态
   }
 }
@@ -28,7 +30,7 @@ function mapDispatchToProps(dispatch,state){
       dispatch(getInitData());
     },
     fetchModules(param){
-      const {id,name,index,span} = param;
+      const {id,name,index,span,searchInEnd} = param;
       getModule(id).then((res)=>{
         if(res.data.code=='0'){
           dispatch({
@@ -37,7 +39,8 @@ function mapDispatchToProps(dispatch,state){
             name,
             data: res.data.data,
             span,
-            isReplace:false
+            isReplace:false,
+            searchInEnd
           })
           dispatch({
             type:ISREAD

src/containers/DiagnosticList.js

@@ -13,7 +13,8 @@ function mapStateToProps(state) {
     return {
         list: state.diagnosticList.diagnosticList,
         treatment: state.treat.show,
-        isFirst: state.diagnosticList.isFirst
+        isFirst: state.diagnosticList.isFirst,
+        diagnosticStr: state.diagnosticList.diagnosticStr
     }
 }
 

src/containers/EditableSpan.js

@@ -26,6 +26,7 @@ function mainSuitSearch(obj){
         dispatch({
           type:SET_SEARCH,
           data:res.data.data,
+          isEnd:obj.isEnd,      //true为在末尾插入搜索结果否则在前面插入
           inpStr:text //搜索输入的值
         })
       }
@@ -41,6 +42,7 @@ function currentSearch(obj){
         dispatch({
           type:SET_CURRENT_SEARCH,
           data:res.data.data,
+          isEnd:obj.isEnd,      //true为在末尾插入搜索结果否则在前面插入
           inpStr:text
         })
       }
@@ -56,6 +58,7 @@ function checkBodySearch(obj){
         dispatch({
           type:SETSEARCHDATA,
           data:res.data.data,
+          isEnd:obj.isEnd,      //true为在末尾插入搜索结果否则在前面插入
           inpStr:text
         });
       }
@@ -71,6 +74,7 @@ function otherHisSearch(obj) {
         dispatch({
           type:SETOTHERSEARCHDATA,
           data:res.data.data,
+          isEnd:obj.isEnd,      //true为在末尾插入搜索结果否则在前面插入
           inpStr:text
         });
       }

src/containers/OtherHistory.js

@@ -8,7 +8,7 @@ import {billing} from '@store/async-actions/pushMessage';
 import {fullfillText} from '@common/js/func';
 import {didPushParamChange} from '@utils/tools.js';
 
-function mapStateToProps(state){ 
+function mapStateToProps(state){
   const {otherHistory,homePage,typeConfig,mainSuit} = state;
   const hasMain = mainSuit.saveText.join('');//||mainSuit.data.length;
   return {
@@ -23,6 +23,7 @@ function mapStateToProps(state){
     searchData:otherHistory.searchData,    //延迟搜索结果
     focusTextIndex:otherHistory.focusIndex,    //聚焦的自由文本标签index
     span:otherHistory.span,
+    searchInEnd:otherHistory.searchInEnd,      //是否在搜索末尾插入结果
     selecteds:otherHistory.selecteds,       //普通多选选中状态
     editClear:otherHistory.editClear,       //编辑状态
     isRead:state.homePage.isRead
@@ -56,7 +57,7 @@ function mapDispatchToProps(dispatch,store){
       },500);
     },
     fetchModules(param){
-      const {id,name,index,span} = param;
+      const {id,name,index,span,searchInEnd} = param;
       getModule(id).then((res)=>{
         if(res.data.code=='0'){
           dispatch({
@@ -65,7 +66,8 @@ function mapDispatchToProps(dispatch,store){
             name,
             data: res.data.data,
             span,
-            isReplace:false
+            isReplace:false,
+            searchInEnd
           });
           dispatch({
             type:ISREAD

src/containers/eleType.js

@@ -124,7 +124,7 @@ export default function(params){
     case 8:
       // return <EditableSpan {...params} value={data.value||data.name} update={Math.random()}/>;
       // 删除后value为空，应展示空而不是name
-      return <EditableSpan {...params} value={data.value||data.value==''?data.value:data.name} update={Math.random()}/>;
+      return <EditableSpan {...params} value={data.value||data.value==''?data.value:data.name} full={data.full} update={Math.random()}/>;
     case 11://推送类型
       return multCheckLabels(params,data.tagType);
     default:

src/store/actions/checkBody.js

@@ -7,6 +7,7 @@ export function set(state,action){
   res.data = [...data];
   res.saveText = fullfillText(res.data).saveText;//存逗号
   res.update = Math.random();
+  res.isEmpty = false;
   return res;
 }
 //查体中数字键盘选中事件
@@ -130,31 +131,44 @@ export function setSearchData(state,action){
   let res = Object.assign({},state);
   res.searchData = action.data;
   res.searchStr = action.inpStr;
+  res.searchInEnd = action.isEnd;
   return res;
 }
 
-//插入标签数据
+//插入标签数据-搜索
 export function insertLabelData(state,action){
   let res = Object.assign({},state);
   const text = Object.assign({},JSON.parse(config.textLabel));
   const searchStr = res.searchStr;
-  const {index,data,isReplace,span}=action;
+  const {index,data,isReplace,span,searchInEnd}=action;
   const showText = res.saveText[index];
   const spreadLabels = data;
-  const toEnd = showText.indexOf(searchStr)>0;    //替换前或后的搜索词（中间不可搜）
-  let reg = toEnd?new RegExp(searchStr+"$"):new RegExp("^"+searchStr);
+  let reg = searchInEnd?new RegExp(searchStr+"$"):new RegExp("^"+searchStr);
   const newText=showText.replace(reg,'')||'';
   if(!isReplace){
     span.current.innerText = newText;
     const pText = Object.assign({},text,{value:newText});
-    res.data.splice(index,1,pText,spreadLabels,text);
-    res.saveText.splice(index,1,newText,'','');
-    res.selecteds.splice(index,1,null,null,null);
+    if(searchInEnd){
+      res.data.splice(index,1,pText,spreadLabels,text);
+      res.saveText.splice(index,1,newText,'','');
+      res.selecteds.splice(index,1,null,null,null);
+    }else{
+      res.data.splice(index,1,text,spreadLabels,pText);
+      res.saveText.splice(index,1,'','',newText);
+      res.selecteds.splice(index,1,null,null,null);
+    }
+
   }else{
     span.current.innerText = ' ';
-    res.data.splice(index+1,0,spreadLabels,text);
-    res.saveText.splice(index+1,0,'','');
-    res.selecteds.splice(index+1,0,null,null);
+    if(searchInEnd){
+      res.data.splice(index+1,0,spreadLabels,text);
+      res.saveText.splice(index+1,0,'','');
+      res.selecteds.splice(index+1,0,null,null);
+    }else{
+      res.data.splice(index,0,text,spreadLabels);
+      res.saveText.splice(index,0,'','');
+      res.selecteds.splice(index,0,null,null);
+    }
   }
   res.searchData = [];    //选中清空搜索内容（即关闭搜索弹窗）
   res.update = Math.random();
@@ -193,8 +207,8 @@ export const changeNumLabelVal = (state,action)=>{
   if(newVal.trim()){
     if(item){
       item.value = newVal;
-      res.saveText[index] = totalVal;
     }
+    res.saveText[index] = newVal;
   }else{//删除完标签内容则删除该标签
     res.data.splice(index,1);
     res.saveText = fullfillText(res.data).saveText;
@@ -208,6 +222,7 @@ export function clearCheckBody(state,action){  //清空
   let res = Object.assign({},state);
   res.data = action.data;
   res.saveText = action.saveText;
+  res.isEmpty = action.isEmpty;
   res.selecteds = action.selecteds?action.selecteds:[];
   return res;
 }

src/store/actions/otherHistory.js

@@ -171,29 +171,40 @@ export function setSearchData(state,action){
   let res = Object.assign({},state);
   res.searchData = action.data;
   res.searchStr = action.inpStr;
+  res.searchInEnd = action.isEnd;
   return res;
 }
 
-//插入标签数据
+//插入标签数据-搜索
 export function insertLabelData(state,action){
   let res = Object.assign({},state);
   const text = Object.assign({},JSON.parse(config.textLabel));
   const searchStr = res.searchStr;
-  const {index,data,isReplace,span}=action;
+  const {index,data,isReplace,span,searchInEnd}=action;
   const showText = res.saveText[index];
   const spreadLabels = data;
-  const toEnd = showText.indexOf(searchStr)>0;    //替换前或后的搜索词（中间不可搜）
-  let reg = toEnd?new RegExp(searchStr+"$"):new RegExp("^"+searchStr);
+  let reg = searchInEnd?new RegExp(searchStr+"$"):new RegExp("^"+searchStr);
   const newText=showText.replace(reg,'')||' ';
   if(!isReplace){
     span.current.innerText = newText;
     const pText = Object.assign({},text,{value:newText});
-    res.data.splice(index,1,pText,spreadLabels,text);
-    res.saveText.splice(index,1,newText,'','');
+    if(searchInEnd){
+      res.data.splice(index,1,pText,spreadLabels,text);
+      res.saveText.splice(index,1,newText,'','');
+    }else{
+      res.data.splice(index,1,spreadLabels,pText,text);
+      res.saveText.splice(index,1,'',newText,'');
+    }
   }else{
     span.current.innerText = ' ';
-    res.data.splice(index+1,0,spreadLabels,text);
-    res.saveText.splice(index+1,0,'','');
+    if(searchInEnd){
+      res.data.splice(index+1,0,spreadLabels,text);
+      res.saveText.splice(index+1,0,'','');
+    }else{
+      res.data.splice(index,0,text,spreadLabels);
+      res.saveText.splice(index,0,'','');
+    }
+
   }
   res.searchData = [];    //选中清空搜索内容（即关闭搜索弹窗）
   res.update = Math.random();

src/store/async-actions/diagnosticList.js

@@ -9,9 +9,6 @@ export const isAddMainSuit = () =>{
                                       && (state.mainSuit.saveText.length === 0 || state.mainSuit.saveText.length === 1 
                                       &&  state.mainSuit.saveText[0] === '') && state.assistCheck && state.assistCheck.dataString.length === 0
                                       && state.inspect.labelList && state.inspect.labelList.length === 0 && state.inspect.inspectStrPlus.length === 0
-            console.log('isAddMainSuitFlag', state.mainSuit.data && state.mainSuit.data.length === 0 && state.mainSuit.saveText    //判断主诉和化验查体是否为空
-            && (state.mainSuit.saveText.length === 0 || state.mainSuit.saveText.length === 1 
-            &&  state.mainSuit.saveText[0] === '')&& state.assistCheck && state.assistCheck.dataString.length === 0 && state.inspect.labelList && state.inspect.labelList.length === 0  && state.inspect.inspectStrPlus.length === 0  )                     
             if(isAddMainSuitFlag) {
                 dispatch({
                     type:ISREAD

src/store/async-actions/fetchModules.js

@@ -6,6 +6,7 @@ import store from '@store';
 import {getEMRParams} from '@utils/tools.js';
 import {Notify} from '@commonComp';
 import {SETOTHERHISTORY} from "../types/homePage";
+import config from "@config/index";
 
 const api={
   getSpreadModule:'/api/icss/questionInfo/getByIds',
@@ -106,9 +107,16 @@ export function getInitData(){
         const arr = fullfillText(JSON.parse(str),false,false,false).newArr;
         dispatch({
           type:SET,
-          data:[...arr]
+          data:[...arr],
+          isEmpty:false
         });
       }else{
+        const block = Object.assign(JSON.parse(config.textLabel),{full:true});      //无数据时保留一个自由文本标签可输入
+        dispatch({
+          type:SET,
+          data:[block],
+          isEmpty:false
+        });
         Notify.error(res.data.msg);
       }
     });

src/store/async-actions/treat.js

@@ -137,7 +137,7 @@ export const getTreatResult = (item) =>{
                         surgeryTreat: treat.surgeryTreatment,
                     })
                 }
-
+                
         }).catch((e) =>{
             console.log(e)
         })

src/store/reducers/checkBody.js

@@ -3,13 +3,15 @@ import {SET,SETNUMBER4,SETSELECTED4,SETCHECKBOX,ADDLABELITEM,SETCHECKTEXT,SETSEA
 import {set,setNumberValue,setRadioValue,setCheckBoxValue,addLabelItem,setCheckText,setSearchData,insertLabelData,changeLabelVal,clearCheckBody,setInputLabel,backspaceText,changeNumLabelVal} from '../actions/checkBody.js';
 import config from '@config/index.js';
 
-const block = Object.assign(JSON.parse(config.textLabel),{full:true});
+//const block = Object.assign(JSON.parse(config.textLabel),{full:false});//空白时保留一个自由文本标签
 const initState = {
                 data:[],
                 saveText:[],    //saveText为生成的纯文本
                 searchData:[],
                 selecteds:[],
-                focusIndex:''};
+                focusIndex:'',
+                isEmpty:true      //是否为空白，需要请求数据
+          };
 export default function(state=initState,action){
   let res = Object.assign({},state);
   switch(action.type){

src/utils/tools.js

@@ -8,6 +8,7 @@ import {clearAllLabel} from '@store/actions/inspect';
 import {CLEAR_ALL_DIAG} from '@store/types/diagnosticList';
 import {CLEAR_ALL_PUSH_MESSAGE, SET_TIPS} from '@store/types/pushMessage';
 import {ISREAD, SETREADDITEMS} from "../store/types/homePage";
+import config from '@config/index.js';
 
 /***
  * 工具函数
@@ -234,7 +235,7 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
         store.dispatch({type: CLEAR_MAIN_SUIT,data:[],saveText:[],selecteds:[],editClear:true,mainIds:[]});
         store.dispatch({type: CLEAR_CURRENT_ILL,data:[],saveText:[],selecteds:[],editClear:true,symptomIds:[]});
         store.dispatch({type: CLEAROTHERHISTORY,data:[],saveText:[],selecteds:[],editClear:true});
-        store.dispatch({type: CLEARCHECKBODY,data:[],saveText:[],selecteds:[]});
+        store.dispatch({type: CLEARCHECKBODY,data:[],isEmpty:true,saveText:[],selecteds:[]});
         store.dispatch(clearAssistData([],''));
         store.dispatch(clearAllLabel([],[],''));
         store.dispatch({