github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Select: fix readonly problem in edge (#13034) 

Cascader select readonly 添加 edge 浏览器判断;
src/utils/util.js 添加 isIE, isEdge方法;
pull/13084/head
咖喱 2018-10-17 10:57:41 +08:00 committed by hetech
parent ef397572da
commit 868bbc71e7
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/cascader/src/main.vue
View File

@ -71,7 +71,7 @@ import emitter from 'element-ui/src/mixins/emitter';
import Locale from 'element-ui/src/mixins/locale';
import { t } from 'element-ui/src/locale';
import debounce from 'throttle-debounce/debounce';
import { generateId, escapeRegexpString } from 'element-ui/src/utils/util';
import { generateId, escapeRegexpString, isIE, isEdge } from 'element-ui/src/utils/util';
const popperMixin = {
props: {
@ -223,8 +223,7 @@ export default {
return this.disabled || (this.elForm || {}).disabled;
},
readonly() {
const isIE = !this.$isServer && !isNaN(Number(document.documentMode));
return !this.filterable || (!isIE && !this.menuVisible);
return !this.filterable || (!isIE() && !isEdge() && !this.menuVisible);
}
},

6
packages/select/src/select.vue
View File

@ -147,7 +147,7 @@
import { t } from 'element-ui/src/locale';
import scrollIntoView from 'element-ui/src/utils/scroll-into-view';
import { getValueByPath } from 'element-ui/src/utils/util';
import { valueEquals } from 'element-ui/src/utils/util';
import { valueEquals, isIE, isEdge } from 'element-ui/src/utils/util';
import NavigationMixin from './navigation-mixin';
import { isKorean } from 'element-ui/src/utils/shared';
@ -180,9 +180,7 @@
},
readonly() {
// trade-off for IE input readonly problem: https://github.com/ElemeFE/element/issues/10403
const isIE = !this.$isServer && !isNaN(Number(document.documentMode));
return !this.filterable || this.multiple || !isIE && !this.visible;
return !this.filterable || this.multiple || (!isIE() && !isEdge() && !this.visible);
},
showClose() {

10
src/utils/util.js
View File

@ -1,3 +1,5 @@
import Vue from 'vue';
const hasOwnProperty = Object.prototype.hasOwnProperty;
export function noop() {};
@ -110,3 +112,11 @@ export const coerceTruthyValueToArray = function(val) {
return [];
}
};
export const isIE = function() {
return !Vue.prototype.$isServer && !isNaN(Number(document.documentMode));
};
export const isEdge = function() {
return !Vue.prototype.$isServer && navigator.userAgent.indexOf('Edge') > -1;
};