소스 검색

主诉常见症状添加滚动条;主诉字数限制使用预览方法filterDataArr;多选下拉添加字数限制(展示8个字,多余省略号);

liucf 6 년 전
부모
커밋
113d2d3bba

+ 2 - 2
src/common/components/EditableSpan/index.jsx

@@ -1,7 +1,7 @@
 import React,{Component} from 'react';
 import style from './index.less';
 import config from "@config/index";
-import {filterArr,isIE} from '@utils/tools.js';
+import {filterArr,isIE,filterDataArr} from '@utils/tools.js';
 import Notify from '../Notify/index.js';
 import classNames from 'classnames';
 
@@ -54,7 +54,7 @@ class EditableSpan extends Component{
     const {handleChange,boxMark,i,handleSearch,value,mainSaveText,mainIds} = this.props;
     const {labelVal,searchPre} = this.state;
     const text1 =e.target.innerText;
-    let mainText = filterArr(mainSaveText);//主诉字数
+    let mainText = filterDataArr(mainSaveText);//主诉字数
     if(+boxMark==1){
       if(mainText.length >= config.limited){
         if(text1.length > labelVal.length){

+ 1 - 1
src/components/CommonSymptom/index.jsx

@@ -44,7 +44,7 @@ class CommonSymptom extends Component{
   render(){  
     const {data} = this.props;
     return <div className={this.getClass()} contenteditable="false">
-      <ul>
+      <ul className={style["listBox"]}>
         {data&&data.map((it)=>{
           return <li onClick={(e)=>this.handleSelect(e,it)}>{it.name}</li>
         })}

+ 4 - 0
src/components/CommonSymptom/index.less

@@ -3,6 +3,10 @@
   .pop;
   left: 85px;
   padding: 0 0 10px;
+  .listBox{
+    max-height: 370px;
+    overflow-y: auto;
+  }
   li{
     width: 200px;
     line-height: 35px;

+ 1 - 1
src/components/CurrentIll/index.jsx

@@ -125,7 +125,7 @@ class CurrentIll extends Component{
       <ItemBox title='现病史' editable={editClear||data.length==0?true:false} handleFocus={this.handleFocus} onchange={forbidInput?(e)=>{this.onchange(e)}:''} handleClick={this.handleClick}>
         {data.length>0?this.getInlineTag():''}
       </ItemBox>
-      {searchFlag ? <SearchDrop data={searchData} show={!totalHide&&show} onSelect={this.handleSearchSelect} left={boxLeft} top={boxTop} />:""}
+      {searchFlag ? <SearchDrop data={searchData} show={!totalHide} onSelect={this.handleSearchSelect} left={boxLeft} top={boxTop} />:""}
     </div>
   }
 }

+ 3 - 3
src/components/Multiple/index.jsx

@@ -2,7 +2,7 @@ import react from "react";
 import style from "./index.less";
 import $ from 'jquery';
 import classNames from 'classnames';
-import {handleEnter,isIE,filterArr,deepClone} from '@utils/tools.js';
+import {handleEnter,isIE,filterArr,deepClone,filterDataArr} from '@utils/tools.js';
 import {Notify} from '@commonComp';
 import config from '@config/index.js';
 /**
@@ -133,7 +133,7 @@ class Multiple extends react.Component{
   onChange(e){
     const {mainSaveText,ikey,type,handleLabelChange} = this.props;
     const {labelVal,editable} = this.state;
-    let mainText = filterArr(mainSaveText);//主诉字数
+    let mainText = filterDataArr(mainSaveText);//主诉字数
     if(editable){//避免IE中点击标签也会触发
       let val = e.target.innerText;
       if(+type==1){// 主诉字数达到上限时不允许输入
@@ -211,7 +211,7 @@ class Multiple extends react.Component{
       <div className={this.getListClass()} style={{top:boxTop,left:boxLeft}} contentEditable="false">
         <ul>
           {data&&data.map((it)=>{
-          return <li onClick={(e)=>this.handleSelect(e,it)} className={this.getSeleStyle(it.id)}>{it.labelPrefix}{it.name}{it.labelSuffix}</li>
+          return <li onClick={(e)=>this.handleSelect(e,it)} className={this.getSeleStyle(it.id)} title={it.name.length>8?it.name:''}>{it.name&&it.name.length>8?it.name.slice(0,8)+'...':it.name}</li>
         })}
           <li onClick={this.handleClear} className={style['mClear']}>清空选项</li>
           <li onClick={this.handleComfirn} className={style['mConfirm']}>确定</li>

+ 2 - 2
src/components/NumberUnitDrop/index.jsx

@@ -3,7 +3,7 @@ import className from 'classnames';
 import {NumberUnitPan} from '@commonComp';
 import style from './index.less';
 import config from '@config/index.js';
-import {filterArr,handleEnter,isIE} from '@utils/tools.js';
+import {filterArr,handleEnter,isIE,filterDataArr} from '@utils/tools.js';
 import {Notify} from '@commonComp';
 import $ from 'jquery';
 /***
@@ -94,7 +94,7 @@ class NumberUnitDrop extends Component{
     // 主诉字数达到上限时不允许输入
     const {mainSaveText,ikey,type,handleSelect,suffix,prefix,boxMark} = this.props;
     const {labelVal,editable} = this.state;
-    let mainText = filterArr(mainSaveText);//主诉字数
+    let mainText = filterDataArr(mainSaveText);//主诉字数
     if(editable){//避免IE中点击标签也会触发
       let val = e.target.innerText;
       if(+boxMark==1){

+ 5 - 4
src/components/SpreadDrop/index.jsx

@@ -2,7 +2,7 @@ import React,{Component} from 'react';
 import classNames from 'classnames';
 import config from '@config/index.js';
 import style from './index.less';
-import {deepClone,filterArr,handleEnter,isIE} from '@utils/tools.js';
+import {deepClone,filterArr,handleEnter,isIE,filterDataArr} from '@utils/tools.js';
 import {Notify} from '@commonComp';
 import {getIds} from '@common/js/func.js';
 import $ from 'jquery';
@@ -97,7 +97,7 @@ class SpreadDrop extends Component{
   onChange(e){
     const {mainSaveText,ikey,type,handleLabelChange} = this.props;
     const {labelVal,editable} = this.state;
-    let mainText = filterArr(mainSaveText);//主诉字数
+    let mainText = filterDataArr(mainSaveText);//主诉字数
     if(editable){//避免IE中点击标签也会触发
       let val = e.target.innerText;
       if(+type==1){// 主诉字数达到上限时不允许输入
@@ -410,8 +410,9 @@ class ListItem extends Component{
     const pos = isSpecialPos?style['independent']:'';
     return <ul className={classNames(style['row'],pos)} onBlur={(e)=>e.stopPropagation()}>
       {data&&data.map((it,i)=>{
-        return <li onClick={(e)=>this.handleClick(e,it,i)}
-                   className={this.getClass(it.id)}>{it.labelPrefix}{it.name}{it.labelSuffix}</li>
+        /*return <li onClick={(e)=>this.handleClick(e,it,i)}
+                   className={this.getClass(it.id)}>{it.labelPrefix}{it.name}{it.labelSuffix}</li>*/
+          return <li onClick={(e)=>this.handleClick(e,it,i)} className={this.getClass(it.id)} title={it.name.length>8?it.name:''}>{it.name&&it.name.length>8?it.name.slice(0,8)+'...':it.name}</li>
       })}
     </ul>;
   }

+ 2 - 2
src/containers/MainSuit.js

@@ -7,7 +7,7 @@ import {getCommSymptoms,getCommSymptomPush} from '@store/async-actions/mainSuit.
 import {SET_MAIN_SUIT} from '@store/types/fillInfo';
 import {getSearch} from '@store/async-actions/fetchModules';
 import {billing} from '@store/async-actions/pushMessage';
-import {filterArr,didPushParamChange} from '@utils/tools.js';
+import {filterArr,didPushParamChange,filterDataArr} from '@utils/tools.js';
 import config from '@config/index.js';
 import {Notify} from '@commonComp';
 
@@ -51,7 +51,7 @@ function mapDispatchToProps(dispatch) {
           })
         },
         handleTailClick:(obj,saveText)=>{//点击带尾巴的标签,如添加病程变化
-          let text = filterArr(saveText);
+          let text = filterDataArr(saveText);
           if(text.length >= config.limited){
             Notify.info(config.limitText);
             return

+ 2 - 2
src/containers/Multiple.js

@@ -7,14 +7,14 @@ import {MAINSUIT_MUL,CHANGE_LABELVAL} from '@types/mainSuit';
 import {OTHERHIS_MUL,CHANGEOTHERTEXTLABEL} from '@types/otherHistory';
 import {CHECKBODY_MUL,CHANGECHECKTEXTLABEL} from '@types/checkBody';
 import {getLabelIndex,fullfillText,getIds} from '@common/js/func.js';
-import {filterArr} from '@utils/tools.js';
+import {filterArr,filterDataArr} from '@utils/tools.js';
 import config from '@config/index.js';
 import {Notify} from '@commonComp';
 
 function handleMainSuit(dispatch,params){
   const {ikey,seleData,seleId,value,mainSaveText} = params;
   //字数限制
-  let mainText = filterArr(mainSaveText);
+  let mainText = filterDataArr(mainSaveText);
   let lengths = value?mainText.length - value.length + seleData.length:mainText.length + seleData.length;
   if(lengths > config.limited){
     Notify.info(config.limitText);

+ 2 - 2
src/containers/NumberDrop.js

@@ -9,7 +9,7 @@ import {getLabelIndex} from '@common/js/func.js';
 import {CURRENT_NUMBER,CURRENT_TEXT_LABEL,CURRENT_TEXT_LABEL_NUMBER} from '@store/types/currentIll.js';
 import {billing} from '@store/async-actions/pushMessage';
 import {Notify} from '@commonComp';
-import {filterArr,didPushParamChange} from '@utils/tools.js';
+import {filterArr,didPushParamChange,filterDataArr} from '@utils/tools.js';
 import config from '@config/index.js';
 
 function mapStateToProps(state){
@@ -51,7 +51,7 @@ function handleModuleDiff(dispatch,params){
   const type = params.ikey.substr(0,1);    //当前所在的项目
   switch (+type){
     case 1:
-      let text = filterArr(mainSaveText);
+      let text = filterDataArr(mainSaveText);
       if(text.length >= config.limited){
         Notify.info(config.limitText);
         return

+ 2 - 2
src/containers/NumberUnitDrop.js

@@ -8,7 +8,7 @@ import {NUMBER_SELECT,CHANGE_LABELVAL} from '@store/types/mainSuit.js';
 import {getLabelIndex} from '@common/js/func.js';
 import {CURRENT_NUMBER,CURRENT_TEXT_LABEL} from '@store/types/currentIll.js';
 import {Notify} from '@commonComp';
-import {filterArr,didPushParamChange} from '@utils/tools.js';
+import {filterArr,didPushParamChange,filterDataArr} from '@utils/tools.js';
 import {billing} from '@store/async-actions/pushMessage';
 import config from '@config/index.js';
 
@@ -51,7 +51,7 @@ function handleModuleDiff(dispatch,params){
   const type = params.ikey.substr(0,1);    //当前所在的项目
   switch (+type){
     case 1:
-      let text = filterArr(mainSaveText);
+      let text = filterDataArr(mainSaveText);
       if(text.length >= config.limited){
         Notify.info(config.limitText);
         return

+ 2 - 2
src/containers/RadioDrop.js

@@ -7,7 +7,7 @@ import {SETDROPSHOW,HIDE,RESET,HIDEDROP,CLICKCOUNT,ISREAD} from '@types/homePage
 import {RADIO_SELECT,CHANGE_LABELVAL} from '@store/types/mainSuit.js';
 import {CURRENT_RADIO,CURRENT_TEXT_LABEL} from '@store/types/currentIll.js';
 import {Notify} from '@commonComp';
-import {filterArr,didPushParamChange} from '@utils/tools.js';
+import {filterArr,didPushParamChange,filterDataArr} from '@utils/tools.js';
 import {billing} from '@store/async-actions/pushMessage';
 import {getLabelIndex,fullfillText} from '@common/js/func.js';
 import config from '@config/index.js';
@@ -68,7 +68,7 @@ function handleModuleDiff(dispatch,store,params){
   const type = params.ikey.substr(0,1);    //当前所在的项目
   switch (+type){
     case 1:
-      let text = filterArr(mainSaveText);
+      let text = filterDataArr(mainSaveText);
       if(text.length >= config.limited){
         Notify.info(config.limitText);
         return

+ 5 - 5
src/containers/SpreadDrop.js

@@ -12,7 +12,7 @@ import {CURRENT_CONFIRM,SETMAINCHECKBOX,CURRENT_TEXT_LABEL,CURRENT_GET_BIGDATAPU
 import {getLabelIndex,fullfillText,getIds} from '@common/js/func.js';
 import {billing} from '@store/async-actions/pushMessage';
 import {Notify} from '@commonComp';
-import {filterArr,didPushParamChange} from '@utils/tools.js';
+import {filterArr,didPushParamChange,filterDataArr} from '@utils/tools.js';
 import config from '@config/index.js';
 
 function mapStateToProps(state) {
@@ -44,7 +44,7 @@ function mainSuitModule(dispatch,store,params){
   let existsName = getNames(exists);
   let withsName = getNames(withs);
   let banName = ban.name;
-  let text = filterArr(mainSaveText);
+  let text = filterDataArr(mainSaveText);
   if(text.length >= config.limited){
     Notify.info(config.limitText);
     return
@@ -173,7 +173,7 @@ function handleModuleDiff(dispatch,store,params){
   const {type,mainSaveText} = params;
   switch (+type){
     case 1:
-      /*let text = filterArr(mainSaveText);
+      /*let text = filterDataArr(mainSaveText);
       if(text.length >= config.limited){
         Notify.info(config.limitText);
         return
@@ -200,7 +200,7 @@ function handleModuleDiff(dispatch,store,params){
 function mainSuitCheck(dispatch,store,params){
   const {nones,exists,withs,order,mainSaveText,value} = params;
   let existsName = getNames(exists,order);
-  let text = filterArr(mainSaveText);
+  let text = filterDataArr(mainSaveText);
   if(text.length >= config.limited){
     Notify.info(config.limitText);
     return
@@ -262,7 +262,7 @@ function handleCheckBox(dispatch,store,params){
   const {type,mainSaveText} = params;
   switch (+type){
     case 1:
-      /*let text = filterArr(mainSaveText);
+      /*let text = filterDataArr(mainSaveText);
       if(text.length >= config.limited){
         Notify.info(config.limitText);
         return