purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化单据显示，自适应

Browse Source
This commit is contained in:
季圣华
2019-09-14 10:43:17 +08:00
parent 9247e77398
commit edc5404dae
83 changed files with 1151 additions and 498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erp_web/js/select2/4.0/select2.full.js vendored
View File

@@ -4461,7 +4461,7 @@ S2.define('select2/dropdown/closeOnSelect',[
return CloseOnSelect;
});
// ThinkGem 默认为中文
// jishenghua 默认为中文
S2.define('select2/i18n/en',[],function () {
// English
return {
@@ -4884,7 +4884,7 @@ S2.define('select2/defaults',[
return selection.text;
},
theme: 'default',
width: '100%' // ThinkGem 宽度自适应 'resolve'
width: '100%' // jishenghua 宽度自适应 'resolve'
};
};
@@ -5310,7 +5310,7 @@ S2.define('select2/core',[
this.on('close', function () {
self.$container.removeClass('select2-container--open');
self.$selection.focus(); // ThinkGem 修正选择后焦点丢失
self.$selection.focus(); // jishenghua 修正选择后焦点丢失
});
this.on('enable', function () {
@@ -5374,7 +5374,7 @@ S2.define('select2/core',[
evt.preventDefault();
}
} else {
if (/*key === KEYS.ENTER || */key === KEYS.SPACE || // ThinkGem 去掉回车后打开下拉框，解决jqgrid回车获取下一个输入框按键冲突
if (/*key === KEYS.ENTER || */key === KEYS.SPACE || // jishenghua 去掉回车后打开下拉框，解决jqgrid回车获取下一个输入框按键冲突
(key === KEYS.DOWN && evt.altKey)) {
self.open();

8
erp_web/js/select2/4.0/select2.js vendored
View File

@@ -4461,7 +4461,7 @@ S2.define('select2/dropdown/closeOnSelect',[
return CloseOnSelect;
});
//ThinkGem 默认为中文
//jishenghua 默认为中文
S2.define('select2/i18n/en',[],function () {
// English
return {
@@ -4884,7 +4884,7 @@ S2.define('select2/defaults',[
return selection.text;
},
theme: 'default',
width: '100%' // ThinkGem 宽度自适应 'resolve'
width: '100%' // jishenghua 宽度自适应 'resolve'
};
};
@@ -5310,7 +5310,7 @@ S2.define('select2/core',[
this.on('close', function () {
self.$container.removeClass('select2-container--open');
self.$selection.focus(); // ThinkGem 修正选择后焦点丢失
self.$selection.focus(); // jishenghua 修正选择后焦点丢失
});
this.on('enable', function () {
@@ -5374,7 +5374,7 @@ S2.define('select2/core',[
evt.preventDefault();
}
} else {
if (/*key === KEYS.ENTER || */key === KEYS.SPACE || // ThinkGem 去掉回车后打开下拉框，解决jqgrid回车获取下一个输入框按键冲突
if (/*key === KEYS.ENTER || */key === KEYS.SPACE || // jishenghua 去掉回车后打开下拉框，解决jqgrid回车获取下一个输入框按键冲突
(key === KEYS.DOWN && evt.altKey)) {
self.open();