瀏覽代碼

设置项配置:一般情况默认值配置生效

zhouna 5 年之前
父節點
當前提交
30bc62bd15
共有 3 個文件被更改,包括 7 次插入3 次删除
  1. 1 1
      src/components/Banner/ModeChange/index.jsx
  2. 3 2
      src/components/RadioDrop/index.jsx
  3. 3 0
      src/containers/RadioDrop.js

+ 1 - 1
src/components/Banner/ModeChange/index.jsx

@@ -50,7 +50,7 @@ class ModeChange extends Component {
                     </a>
                   </p>
                   <p className={this.getStyle(1)+" "+style['big-marb']}>
-                    <span>开启开启其他史默认值:</span>
+                    <span>开启其他史默认值:</span>
                     <a className={style['switch']} href="javascript:void(0)" onClick={hideBtn&&isOpen?()=>changeType('config2',ohis?1:0):null}>
                       <img src={ohis?sclose:sopen} alt=""/>
                       {ohis?'关':'开'}

+ 3 - 2
src/components/RadioDrop/index.jsx

@@ -94,9 +94,10 @@ class RadioDrop extends Component{
     });
   }
   componentDidMount(){    //默认值选中
-    const {data,ikey,handleSelect,hideTag,mainSaveText,value,boxMark} = this.props;
+    const {data,ikey,handleSelect,hideTag,mainSaveText,value,boxMark,readDefault,confDefault} = this.props;
+    const showDefault = readDefault===-1||readDefault===undefined?confDefault:readDefault;
     const selected = data.find((it)=>{
-      return it.selected === undefined&&+it.defaultSelect===1;
+      return it.selected === undefined&&+showDefault===1&&+it.defaultSelect===1;
     });
     if(boxMark!=1&&!hideTag&&selected){
       // const text = selected.labelPrefix+selected.name+selected.labelSuffix;

+ 3 - 0
src/containers/RadioDrop.js

@@ -12,8 +12,11 @@ import {billing} from '@store/async-actions/pushMessage';
 import config from '@config/index.js';
 
 function mapStateToProps(state){
+  const {typeConfig} = state;
   return {
     mainSaveText:state.mainSuit.saveText,
+    readDefault:typeConfig.readConfig[1],
+    confDefault:typeConfig.typeConfig[1]
   }
 }