fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #727 in VISUAL/fineui from ~NJZY/fineui2.0:master to master 

* commit '48b81e6aa0461966178832f0a21d774f1f914c54':
  无JIRA任务 propertychange处理完keydown需要把keycode重新设为null
  BI-33536 分析表修改字段名的同时鼠标点击空白地方，这时候字段名可以为空了
es6
njzy 6 years ago
parent
43c5885f63 48b81e6aa0
commit
ae702d194c
12 changed files with 75 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      dist/base.js
  2. 12
      dist/bundle.ie.js
  3. 6
      dist/bundle.ie.min.js
  4. 12
      dist/bundle.js
  5. 6
      dist/bundle.min.js
  6. 12
      dist/fineui.ie.js
  7. 6
      dist/fineui.ie.min.js
  8. 12
      dist/fineui.js
  9. 6
      dist/fineui.min.js
  10. 12
      dist/fineui_without_jquery_polyfill.js
  11. 2
      dist/utils.min.js
  12. 11
      src/base/single/input/input.js

12
dist/base.js vendored
Unescape View File

@ -9763,6 +9763,7 @@ BI.Input = BI.inherit(BI.Single, {
BI.Input.superclass._init.apply(this, arguments); BI.Input.superclass._init.apply(this, arguments);
var self = this; var self = this;
var ctrlKey = false; var ctrlKey = false;
var keyCode = null;
var inputEventValid = false; var inputEventValid = false;
var _keydown = BI.debounce(function (keyCode) { var _keydown = BI.debounce(function (keyCode) {
self.onKeyDown(keyCode, ctrlKey); self.onKeyDown(keyCode, ctrlKey);
@ -9784,20 +9785,24 @@ BI.Input = BI.inherit(BI.Single, {
.keydown(function (e) { .keydown(function (e) {
inputEventValid = false; inputEventValid = false;
ctrlKey = e.ctrlKey; ctrlKey = e.ctrlKey;
keyCode = e.keyCode;
self.fireEvent(BI.Input.EVENT_QUICK_DOWN, arguments); self.fireEvent(BI.Input.EVENT_QUICK_DOWN, arguments);
}) })
.keyup(function (e) { .keyup(function (e) {
keyCode = null;
if (!(inputEventValid && e.keyCode === BI.KeyCode.ENTER)) { if (!(inputEventValid && e.keyCode === BI.KeyCode.ENTER)) {
self._keydown_ = true; self._keydown_ = true;
_keydown(e.keyCode); _keydown(e.keyCode);
} }
}) })
.on("input propertychange", function (e) { .on("input propertychange", function (e) {
// 输入内容全选并直接删光，如果按键没放开就失去焦点不会触发keyup，被focusout覆盖了
// 这个事件在input的属性发生改变的时候就会触发（class的变化也算） // 这个事件在input的属性发生改变的时候就会触发（class的变化也算）
if (BI.isNotNull(e.keyCode)) { if (BI.isNotNull(keyCode)) {
keyCode = null;
inputEventValid = true; inputEventValid = true;
self._keydown_ = true; self._keydown_ = true;
_keydown(e.keyCode); _keydown(keyCode);
} }
}) })
.click(function (e) { .click(function (e) {
@ -10041,7 +10046,8 @@ BI.Input.EVENT_VALID = "EVENT_VALID";
BI.Input.EVENT_ERROR = "EVENT_ERROR"; BI.Input.EVENT_ERROR = "EVENT_ERROR";
BI.Input.EVENT_ENTER = "EVENT_ENTER"; BI.Input.EVENT_ENTER = "EVENT_ENTER";
BI.Input.EVENT_RESTRICT = "EVENT_RESTRICT"; BI.Input.EVENT_RESTRICT = "EVENT_RESTRICT";
BI.shortcut("bi.input", BI.Input);/** BI.shortcut("bi.input", BI.Input);
/**
* guy * guy
* @extends BI.Single * @extends BI.Single
* @type {*|void|Object} * @type {*|void|Object}

12
dist/bundle.ie.js vendored
Unescape View File

@ -44657,6 +44657,7 @@ BI.Input = BI.inherit(BI.Single, {
BI.Input.superclass._init.apply(this, arguments); BI.Input.superclass._init.apply(this, arguments);
var self = this; var self = this;
var ctrlKey = false; var ctrlKey = false;
var keyCode = null;
var inputEventValid = false; var inputEventValid = false;
var _keydown = BI.debounce(function (keyCode) { var _keydown = BI.debounce(function (keyCode) {
self.onKeyDown(keyCode, ctrlKey); self.onKeyDown(keyCode, ctrlKey);
@ -44678,20 +44679,24 @@ BI.Input = BI.inherit(BI.Single, {
.keydown(function (e) { .keydown(function (e) {
inputEventValid = false; inputEventValid = false;
ctrlKey = e.ctrlKey; ctrlKey = e.ctrlKey;
keyCode = e.keyCode;
self.fireEvent(BI.Input.EVENT_QUICK_DOWN, arguments); self.fireEvent(BI.Input.EVENT_QUICK_DOWN, arguments);
}) })
.keyup(function (e) { .keyup(function (e) {
keyCode = null;
if (!(inputEventValid && e.keyCode === BI.KeyCode.ENTER)) { if (!(inputEventValid && e.keyCode === BI.KeyCode.ENTER)) {
self._keydown_ = true; self._keydown_ = true;
_keydown(e.keyCode); _keydown(e.keyCode);
} }
}) })
.on("input propertychange", function (e) { .on("input propertychange", function (e) {
// 输入内容全选并直接删光，如果按键没放开就失去焦点不会触发keyup，被focusout覆盖了
// 这个事件在input的属性发生改变的时候就会触发（class的变化也算） // 这个事件在input的属性发生改变的时候就会触发（class的变化也算）
if (BI.isNotNull(e.keyCode)) { if (BI.isNotNull(keyCode)) {
keyCode = null;
inputEventValid = true; inputEventValid = true;
self._keydown_ = true; self._keydown_ = true;
_keydown(e.keyCode); _keydown(keyCode);
} }
}) })
.click(function (e) { .click(function (e) {
@ -44935,7 +44940,8 @@ BI.Input.EVENT_VALID = "EVENT_VALID";
BI.Input.EVENT_ERROR = "EVENT_ERROR"; BI.Input.EVENT_ERROR = "EVENT_ERROR";
BI.Input.EVENT_ENTER = "EVENT_ENTER"; BI.Input.EVENT_ENTER = "EVENT_ENTER";
BI.Input.EVENT_RESTRICT = "EVENT_RESTRICT"; BI.Input.EVENT_RESTRICT = "EVENT_RESTRICT";
BI.shortcut("bi.input", BI.Input);/** BI.shortcut("bi.input", BI.Input);
/**
* guy * guy
* @extends BI.Single * @extends BI.Single
* @type {*|void|Object} * @type {*|void|Object}

6
dist/bundle.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

12
dist/bundle.js vendored
Unescape View File

@ -45196,6 +45196,7 @@ BI.Input = BI.inherit(BI.Single, {
BI.Input.superclass._init.apply(this, arguments); BI.Input.superclass._init.apply(this, arguments);
var self = this; var self = this;
var ctrlKey = false; var ctrlKey = false;
var keyCode = null;
var inputEventValid = false; var inputEventValid = false;
var _keydown = BI.debounce(function (keyCode) { var _keydown = BI.debounce(function (keyCode) {
self.onKeyDown(keyCode, ctrlKey); self.onKeyDown(keyCode, ctrlKey);
@ -45217,20 +45218,24 @@ BI.Input = BI.inherit(BI.Single, {
.keydown(function (e) { .keydown(function (e) {
inputEventValid = false; inputEventValid = false;
ctrlKey = e.ctrlKey; ctrlKey = e.ctrlKey;
keyCode = e.keyCode;
self.fireEvent(BI.Input.EVENT_QUICK_DOWN, arguments); self.fireEvent(BI.Input.EVENT_QUICK_DOWN, arguments);
}) })
.keyup(function (e) { .keyup(function (e) {
keyCode = null;
if (!(inputEventValid && e.keyCode === BI.KeyCode.ENTER)) { if (!(inputEventValid && e.keyCode === BI.KeyCode.ENTER)) {
self._keydown_ = true; self._keydown_ = true;
_keydown(e.keyCode); _keydown(e.keyCode);
} }
}) })
.on("input propertychange", function (e) { .on("input propertychange", function (e) {
// 输入内容全选并直接删光，如果按键没放开就失去焦点不会触发keyup，被focusout覆盖了
// 这个事件在input的属性发生改变的时候就会触发（class的变化也算） // 这个事件在input的属性发生改变的时候就会触发（class的变化也算）
if (BI.isNotNull(e.keyCode)) { if (BI.isNotNull(keyCode)) {
keyCode = null;
inputEventValid = true; inputEventValid = true;
self._keydown_ = true; self._keydown_ = true;
_keydown(e.keyCode); _keydown(keyCode);
} }
}) })
.click(function (e) { .click(function (e) {
@ -45474,7 +45479,8 @@ BI.Input.EVENT_VALID = "EVENT_VALID";
BI.Input.EVENT_ERROR = "EVENT_ERROR"; BI.Input.EVENT_ERROR = "EVENT_ERROR";
BI.Input.EVENT_ENTER = "EVENT_ENTER"; BI.Input.EVENT_ENTER = "EVENT_ENTER";
BI.Input.EVENT_RESTRICT = "EVENT_RESTRICT"; BI.Input.EVENT_RESTRICT = "EVENT_RESTRICT";
BI.shortcut("bi.input", BI.Input);/** BI.shortcut("bi.input", BI.Input);
/**
* guy * guy
* @extends BI.Single * @extends BI.Single
* @type {*|void|Object} * @type {*|void|Object}

6
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

12
dist/fineui.ie.js vendored
Unescape View File

@ -44899,6 +44899,7 @@ BI.Input = BI.inherit(BI.Single, {
BI.Input.superclass._init.apply(this, arguments); BI.Input.superclass._init.apply(this, arguments);
var self = this; var self = this;
var ctrlKey = false; var ctrlKey = false;
var keyCode = null;
var inputEventValid = false; var inputEventValid = false;
var _keydown = BI.debounce(function (keyCode) { var _keydown = BI.debounce(function (keyCode) {
self.onKeyDown(keyCode, ctrlKey); self.onKeyDown(keyCode, ctrlKey);
@ -44920,20 +44921,24 @@ BI.Input = BI.inherit(BI.Single, {
.keydown(function (e) { .keydown(function (e) {
inputEventValid = false; inputEventValid = false;
ctrlKey = e.ctrlKey; ctrlKey = e.ctrlKey;
keyCode = e.keyCode;
self.fireEvent(BI.Input.EVENT_QUICK_DOWN, arguments); self.fireEvent(BI.Input.EVENT_QUICK_DOWN, arguments);
}) })
.keyup(function (e) { .keyup(function (e) {
keyCode = null;
if (!(inputEventValid && e.keyCode === BI.KeyCode.ENTER)) { if (!(inputEventValid && e.keyCode === BI.KeyCode.ENTER)) {
self._keydown_ = true; self._keydown_ = true;
_keydown(e.keyCode); _keydown(e.keyCode);
} }
}) })
.on("input propertychange", function (e) { .on("input propertychange", function (e) {
// 输入内容全选并直接删光，如果按键没放开就失去焦点不会触发keyup，被focusout覆盖了
// 这个事件在input的属性发生改变的时候就会触发（class的变化也算） // 这个事件在input的属性发生改变的时候就会触发（class的变化也算）
if (BI.isNotNull(e.keyCode)) { if (BI.isNotNull(keyCode)) {
keyCode = null;
inputEventValid = true; inputEventValid = true;
self._keydown_ = true; self._keydown_ = true;
_keydown(e.keyCode); _keydown(keyCode);
} }
}) })
.click(function (e) { .click(function (e) {
@ -45177,7 +45182,8 @@ BI.Input.EVENT_VALID = "EVENT_VALID";
BI.Input.EVENT_ERROR = "EVENT_ERROR"; BI.Input.EVENT_ERROR = "EVENT_ERROR";
BI.Input.EVENT_ENTER = "EVENT_ENTER"; BI.Input.EVENT_ENTER = "EVENT_ENTER";
BI.Input.EVENT_RESTRICT = "EVENT_RESTRICT"; BI.Input.EVENT_RESTRICT = "EVENT_RESTRICT";
BI.shortcut("bi.input", BI.Input);/** BI.shortcut("bi.input", BI.Input);
/**
* guy * guy
* @extends BI.Single * @extends BI.Single
* @type {*|void|Object} * @type {*|void|Object}

6
dist/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

12
dist/fineui.js vendored
Unescape View File

@ -45438,6 +45438,7 @@ BI.Input = BI.inherit(BI.Single, {
BI.Input.superclass._init.apply(this, arguments); BI.Input.superclass._init.apply(this, arguments);
var self = this; var self = this;
var ctrlKey = false; var ctrlKey = false;
var keyCode = null;
var inputEventValid = false; var inputEventValid = false;
var _keydown = BI.debounce(function (keyCode) { var _keydown = BI.debounce(function (keyCode) {
self.onKeyDown(keyCode, ctrlKey); self.onKeyDown(keyCode, ctrlKey);
@ -45459,20 +45460,24 @@ BI.Input = BI.inherit(BI.Single, {
.keydown(function (e) { .keydown(function (e) {
inputEventValid = false; inputEventValid = false;
ctrlKey = e.ctrlKey; ctrlKey = e.ctrlKey;
keyCode = e.keyCode;
self.fireEvent(BI.Input.EVENT_QUICK_DOWN, arguments); self.fireEvent(BI.Input.EVENT_QUICK_DOWN, arguments);
}) })
.keyup(function (e) { .keyup(function (e) {
keyCode = null;
if (!(inputEventValid && e.keyCode === BI.KeyCode.ENTER)) { if (!(inputEventValid && e.keyCode === BI.KeyCode.ENTER)) {
self._keydown_ = true; self._keydown_ = true;
_keydown(e.keyCode); _keydown(e.keyCode);
} }
}) })
.on("input propertychange", function (e) { .on("input propertychange", function (e) {
// 输入内容全选并直接删光，如果按键没放开就失去焦点不会触发keyup，被focusout覆盖了
// 这个事件在input的属性发生改变的时候就会触发（class的变化也算） // 这个事件在input的属性发生改变的时候就会触发（class的变化也算）
if (BI.isNotNull(e.keyCode)) { if (BI.isNotNull(keyCode)) {
keyCode = null;
inputEventValid = true; inputEventValid = true;
self._keydown_ = true; self._keydown_ = true;
_keydown(e.keyCode); _keydown(keyCode);
} }
}) })
.click(function (e) { .click(function (e) {
@ -45716,7 +45721,8 @@ BI.Input.EVENT_VALID = "EVENT_VALID";
BI.Input.EVENT_ERROR = "EVENT_ERROR"; BI.Input.EVENT_ERROR = "EVENT_ERROR";
BI.Input.EVENT_ENTER = "EVENT_ENTER"; BI.Input.EVENT_ENTER = "EVENT_ENTER";
BI.Input.EVENT_RESTRICT = "EVENT_RESTRICT"; BI.Input.EVENT_RESTRICT = "EVENT_RESTRICT";
BI.shortcut("bi.input", BI.Input);/** BI.shortcut("bi.input", BI.Input);
/**
* guy * guy
* @extends BI.Single * @extends BI.Single
* @type {*|void|Object} * @type {*|void|Object}

6
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

12
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -32489,6 +32489,7 @@ BI.Input = BI.inherit(BI.Single, {
BI.Input.superclass._init.apply(this, arguments); BI.Input.superclass._init.apply(this, arguments);
var self = this; var self = this;
var ctrlKey = false; var ctrlKey = false;
var keyCode = null;
var inputEventValid = false; var inputEventValid = false;
var _keydown = BI.debounce(function (keyCode) { var _keydown = BI.debounce(function (keyCode) {
self.onKeyDown(keyCode, ctrlKey); self.onKeyDown(keyCode, ctrlKey);
@ -32510,20 +32511,24 @@ BI.Input = BI.inherit(BI.Single, {
.keydown(function (e) { .keydown(function (e) {
inputEventValid = false; inputEventValid = false;
ctrlKey = e.ctrlKey; ctrlKey = e.ctrlKey;
keyCode = e.keyCode;
self.fireEvent(BI.Input.EVENT_QUICK_DOWN, arguments); self.fireEvent(BI.Input.EVENT_QUICK_DOWN, arguments);
}) })
.keyup(function (e) { .keyup(function (e) {
keyCode = null;
if (!(inputEventValid && e.keyCode === BI.KeyCode.ENTER)) { if (!(inputEventValid && e.keyCode === BI.KeyCode.ENTER)) {
self._keydown_ = true; self._keydown_ = true;
_keydown(e.keyCode); _keydown(e.keyCode);
} }
}) })
.on("input propertychange", function (e) { .on("input propertychange", function (e) {
// 输入内容全选并直接删光，如果按键没放开就失去焦点不会触发keyup，被focusout覆盖了
// 这个事件在input的属性发生改变的时候就会触发（class的变化也算） // 这个事件在input的属性发生改变的时候就会触发（class的变化也算）
if (BI.isNotNull(e.keyCode)) { if (BI.isNotNull(keyCode)) {
keyCode = null;
inputEventValid = true; inputEventValid = true;
self._keydown_ = true; self._keydown_ = true;
_keydown(e.keyCode); _keydown(keyCode);
} }
}) })
.click(function (e) { .click(function (e) {
@ -32767,7 +32772,8 @@ BI.Input.EVENT_VALID = "EVENT_VALID";
BI.Input.EVENT_ERROR = "EVENT_ERROR"; BI.Input.EVENT_ERROR = "EVENT_ERROR";
BI.Input.EVENT_ENTER = "EVENT_ENTER"; BI.Input.EVENT_ENTER = "EVENT_ENTER";
BI.Input.EVENT_RESTRICT = "EVENT_RESTRICT"; BI.Input.EVENT_RESTRICT = "EVENT_RESTRICT";
BI.shortcut("bi.input", BI.Input);/** BI.shortcut("bi.input", BI.Input);
/**
* guy * guy
* @extends BI.Single * @extends BI.Single
* @type {*|void|Object} * @type {*|void|Object}

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

11
src/base/single/input/input.js
Unescape View File

@ -20,6 +20,7 @@ BI.Input = BI.inherit(BI.Single, {
BI.Input.superclass._init.apply(this, arguments); BI.Input.superclass._init.apply(this, arguments);
var self = this; var self = this;
var ctrlKey = false; var ctrlKey = false;
var keyCode = null;
var inputEventValid = false; var inputEventValid = false;
var _keydown = BI.debounce(function (keyCode) { var _keydown = BI.debounce(function (keyCode) {
self.onKeyDown(keyCode, ctrlKey); self.onKeyDown(keyCode, ctrlKey);
@ -41,20 +42,24 @@ BI.Input = BI.inherit(BI.Single, {
.keydown(function (e) { .keydown(function (e) {
inputEventValid = false; inputEventValid = false;
ctrlKey = e.ctrlKey; ctrlKey = e.ctrlKey;
keyCode = e.keyCode;
self.fireEvent(BI.Input.EVENT_QUICK_DOWN, arguments); self.fireEvent(BI.Input.EVENT_QUICK_DOWN, arguments);
}) })
.keyup(function (e) { .keyup(function (e) {
keyCode = null;
if (!(inputEventValid && e.keyCode === BI.KeyCode.ENTER)) { if (!(inputEventValid && e.keyCode === BI.KeyCode.ENTER)) {
self._keydown_ = true; self._keydown_ = true;
_keydown(e.keyCode); _keydown(e.keyCode);
} }
}) })
.on("input propertychange", function (e) { .on("input propertychange", function (e) {
// 输入内容全选并直接删光，如果按键没放开就失去焦点不会触发keyup，被focusout覆盖了
// 这个事件在input的属性发生改变的时候就会触发（class的变化也算） // 这个事件在input的属性发生改变的时候就会触发（class的变化也算）
if (BI.isNotNull(e.keyCode)) { if (BI.isNotNull(keyCode)) {
keyCode = null;
inputEventValid = true; inputEventValid = true;
self._keydown_ = true; self._keydown_ = true;
_keydown(e.keyCode); _keydown(keyCode);
} }
}) })
.click(function (e) { .click(function (e) {
@ -298,4 +303,4 @@ BI.Input.EVENT_VALID = "EVENT_VALID";
BI.Input.EVENT_ERROR = "EVENT_ERROR"; BI.Input.EVENT_ERROR = "EVENT_ERROR";
BI.Input.EVENT_ENTER = "EVENT_ENTER"; BI.Input.EVENT_ENTER = "EVENT_ENTER";
BI.Input.EVENT_RESTRICT = "EVENT_RESTRICT"; BI.Input.EVENT_RESTRICT = "EVENT_RESTRICT";
BI.shortcut("bi.input", BI.Input); BI.shortcut("bi.input", BI.Input);

Write Preview
Loading…
Cancel
Save