Merge pull request #32 from iview/2.0

update

Merge pull request #32 from iview/2.0
update
yangdan8 · GitHub
2 parents da5d3d4e 0ad95539
Showing 5 changed files with 22 additions and 6 deletions Show diff stats
src/components/input/input.vue
src/components/modal/modal.vue
src/components/select/select.vue
src/components/table/table-head.vue
src/styles/components/table.less
@@ -141,9 +141,7 @@
                 default: false
             },
             autocomplete: {
-                validator (value) {
-                    return oneOf(value, ['on', 'off']);
-                },
+                type: String,
                 default: 'off'
             },
             clearable: {
@@ -5,7 +5,7 @@
         </transition>
         <div :class="wrapClasses" :style="wrapStyles" @click="handleWrapClick">
             <transition :name="transitionNames[0]" @after-leave="animationFinish">
-                <div :class="classes" :style="mainStyles" v-show="visible">
+                <div :class="classes" :style="mainStyles" v-show="visible" @mousedown="handleMousedown">
                     <div :class="contentClasses" ref="content" :style="contentStyles" @click="handleClickModal">
                         <a :class="[prefixCls + '-close']" v-if="closable" @click="close">
                             <slot name="close">
@@ -140,6 +140,7 @@
                     dragging: false
                 },
                 modalIndex: this.handleGetModalIndex(),  // for Esc close the top modal
+                isMouseTriggerIn: false, // #5800
             };
         },
         computed: {
@@ -243,10 +244,17 @@
                 }
             },
             handleWrapClick (event) {
+                if (this.isMouseTriggerIn) {
+                    this.isMouseTriggerIn = false;
+                    return;
+                }
                 // use indexOf,do not use === ,because ivu-modal-wrap can have other custom className
                 const className = event.target.getAttribute('class');
                 if (className && className.indexOf(`${prefixCls}-wrap`) > -1) this.handleMask();
             },
+            handleMousedown () {
+                this.isMouseTriggerIn = true;
+            },
             cancel () {
                 this.close();
             },
@@ -437,6 +437,8 @@
                 if (query === null) {
                     this.onQueryChange('');
                     this.values = [];
+                    // #5620,修复清空搜索关键词后，重新搜索相同的关键词没有触发远程搜索
+                    this.lastRemoteQuery = '';
                 }
             },
             clearSingleSelect(){ // PUBLIC API
@@ -16,7 +16,7 @@
                             <span v-if="!column.renderHeader">{{ column.title || '' }}</span>
                             <render-header v-else :render="column.renderHeader" :column="column" :index="index"></render-header>
                         </template>
-                        <template v-else-if="column.type === 'selection'"><Checkbox :value="isSelectAll" :disabled="!data.length" @on-change="selectAll"></Checkbox></template>
+                        <template v-else-if="column.type === 'selection'"><Checkbox :value="isSelectAll" :disabled="isSelectDisabled" @on-change="selectAll"></Checkbox></template>
                         <template v-else>
                             <span v-if="!column.renderHeader" :class="{[prefixCls + '-cell-sort']: column.sortable}" @click="handleSortByHead(getColumn(rowIndex, index)._index)">{{ column.title || '#' }}</span>
                             <render-header v-else :render="column.renderHeader" :column="column" :index="index"></render-header>
@@ -61,7 +61,7 @@
                         </template>
                     </div>
                 </th>
-                
+
                 <th v-if="$parent.showVerticalScrollBar && rowIndex===0" :class='scrollBarCellClass()' :rowspan="headRows.length"></th>
             </tr>
         </thead>
@@ -121,6 +121,12 @@
                 } else {
                     return [this.columns];
                 }
+            },
+            isSelectDisabled () {
+                let isSelectDisabled = false;
+                if (!this.data.length) isSelectDisabled = true;
+                if (!this.data.find(item => !item._disabled)) isSelectDisabled = true;
+                return isSelectDisabled;
             }
         },
         methods: {
@@ -161,6 +161,8 @@
  
         &-tooltip{
             width: 100%;
+            display: flex;
+            align-items: center;
             &-content{
                 display: block;
                 overflow: hidden;