Merge remote-tracking branch 'origin/master' into referMaster

src/common/OptionInp.vue

@@ -1,6 +1,6 @@
 <!-- 带输入框选项 -->
 <template>
-  <div :class="['inpbox',{'iptCheck':item.select||item.value}]">
+  <div :class="['inpbox',{'iptCheck':item.select}]">
     <span class="prefix" v-if="msg.prefix" @click="stopPop">{{msg.prefix}}</span>
     <p v-if="isXy" class="mult-inps">
       <input :type="msg.type=='number'?'number':'text'"
@@ -104,8 +104,8 @@ import $ from 'jquery';
 
       },
       handleCli(e){
-        if(this.select||!this.txt){//已选中后点击输入框不取消选中
-          e.stopPropagation();
+        if(!this.select&&this.txt.match(/\S/g)){//已选中后点击输入框不取消选中
+          this.$emit("handleSelect")
         }
       }
     },

src/common/Radio.vue

@@ -6,9 +6,9 @@
         v-for="(item,idx) in result"
         :class="[{'liSelect':item.select,'noBorder':((item.description||item.name).indexOf('${'))!=-1}]"
         :key="item.id"
-        @click="selectResult(item,idx)"
+
       >
-        <span v-if="((item.description||item.name).indexOf('${'))==-1">{{item.description||item.name}}</span>
+        <span v-if="((item.description||item.name).indexOf('${'))==-1" @click="selectResult(item,idx)">{{item.description||item.name}}</span>
         <OptionInp v-else :item="item" @handleInp="inpVal" :inx="idx" @handleSelect="selectResult(item,idx)"/>
       </li>
     </ul>

src/common/Select.vue

@@ -6,9 +6,9 @@
         v-for="(item,idx) in result"
         :class="[{'liSelect':item.select,'noBorder':((item.description||item.name).indexOf('${'))!=-1}]"
         :key="item.id"
-        @click="selectResult(item,idx)"
+
       >
-        <span v-if="((item.description||item.name).indexOf('${'))==-1">{{item.description||item.name}}</span>
+        <span v-if="((item.description||item.name).indexOf('${'))==-1" @click="selectResult(item,idx)">{{item.description||item.name}}</span>
         <OptionInp v-else :item="item" @handleInp="inpVal" :inx="idx" @handleSelect="selectResult(item,idx)"/>
       </li>
     </ul>