Browse Source

Merge remote-tracking branch 'origin/master'

es6
imp 4 years ago
parent
commit
c68f3bedbd
  1. 1
      changelog.md
  2. 2
      dist/2.0/fineui.css
  3. 4
      dist/2.0/fineui.ie.min.js
  4. 2
      dist/2.0/fineui.ie.min.js.map
  5. 59
      dist/2.0/fineui.js
  6. 2
      dist/2.0/fineui.js.map
  7. 2
      dist/2.0/fineui.min.css
  8. 4
      dist/2.0/fineui.min.js
  9. 2
      dist/2.0/fineui.min.js.map
  10. 2
      dist/2.0/fineui_without_normalize.css
  11. 2
      dist/2.0/fineui_without_normalize.min.css
  12. 2
      dist/core.css
  13. 59
      dist/core.js
  14. 2
      dist/core.js.map
  15. 2
      dist/demo.css
  16. 59
      dist/demo.js
  17. 2
      dist/demo.js.map
  18. 2
      dist/fineui.css
  19. 4
      dist/fineui.ie.min.js
  20. 2
      dist/fineui.ie.min.js.map
  21. 59
      dist/fineui.js
  22. 2
      dist/fineui.js.map
  23. 2
      dist/fineui.min.css
  24. 4
      dist/fineui.min.js
  25. 2
      dist/fineui.min.js.map
  26. 45
      dist/fineui_without_jquery_polyfill.js
  27. 2
      dist/fineui_without_jquery_polyfill.js.map
  28. 2
      dist/font.css
  29. BIN
      dist/font/iconfont.eot
  30. 6
      dist/font/iconfont.svg
  31. BIN
      dist/font/iconfont.ttf
  32. BIN
      dist/font/iconfont.woff
  33. BIN
      dist/font/iconfont.woff2
  34. 2
      dist/resource.css
  35. 2
      dist/utils.js
  36. 2
      dist/utils.min.js
  37. 2
      package.json
  38. 3
      src/case/button/treeitem/item.icon.treeleaf.js
  39. 8
      src/case/colorchooser/colorchooser.js
  40. 4
      src/case/colorchooser/colorchooser.trigger.js
  41. 2
      src/case/colorchooser/colorchooser.trigger.long.js
  42. 18
      src/core/widget.js

1
changelog.md

@ -1,6 +1,7 @@
# 更新日志 # 更新日志
2.0(2021-02) 2.0(2021-02)
- 增加updateModel属性,可以配置自动模式,自动watch属性并响应变化 - 增加updateModel属性,可以配置自动模式,自动watch属性并响应变化
- 增加beforeRender生命周期函数
2.0(2021-01) 2.0(2021-01)
- 修改了日期下拉面板中的当前时间按钮的交互效果 - 修改了日期下拉面板中的当前时间按钮的交互效果

2
dist/2.0/fineui.css vendored

File diff suppressed because one or more lines are too long

4
dist/2.0/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.ie.min.js.map vendored

File diff suppressed because one or more lines are too long

59
dist/2.0/fineui.js vendored

@ -1,4 +1,4 @@
/*! time: 2021-3-2 20:00:40 */ /*! time: 2021-3-4 17:10:44 */
/******/ (function(modules) { // webpackBootstrap /******/ (function(modules) { // webpackBootstrap
/******/ // The module cache /******/ // The module cache
/******/ var installedModules = {}; /******/ var installedModules = {};
@ -13846,9 +13846,11 @@ module.exports = function (exec) {
} }
}, },
// 生命周期函数
beforeInit: null, beforeInit: null,
// 生命周期函数 beforeRender: null,
beforeCreate: null, beforeCreate: null,
created: null, created: null,
@ -13881,14 +13883,24 @@ module.exports = function (exec) {
}, },
_initRender: function () { _initRender: function () {
var self = this;
function render () {
if (self.options.beforeRender || self.beforeRender) {
(self.options.beforeRender || self.beforeRender).call(self, BI.bind(self._render, self));
} else {
self._render();
}
}
if (this.options.beforeInit || this.beforeInit) { if (this.options.beforeInit || this.beforeInit) {
this.__asking = true; this.__asking = true;
(this.options.beforeInit || this.beforeInit).call(this, BI.bind(this._render, this)); (this.options.beforeInit || this.beforeInit).call(this, render);
if (this.__asking === true) { if (this.__asking === true) {
this.__async = true; this.__async = true;
} }
} else { } else {
this._render(); render();
} }
}, },
@ -14013,36 +14025,32 @@ module.exports = function (exec) {
* @returns {boolean} * @returns {boolean}
* @private * @private
*/ */
_mount: function (force, deep, lifeHook, predicate, layer, queue) { _mount: function (force, deep, lifeHook, predicate, layer) {
var self = this; var self = this;
if (!layer) {
layer = 0;
}
if (!queue) {
queue = [];
}
if (!force && (this._isMounted || !this.isVisible() || this.__asking === true || !(this._isRoot === true || (this._parent && this._parent._isMounted === true)))) { if (!force && (this._isMounted || !this.isVisible() || this.__asking === true || !(this._isRoot === true || (this._parent && this._parent._isMounted === true)))) {
return false; return false;
} }
layer = layer || 0;
lifeHook !== false && callLifeHook(this, "beforeMount"); lifeHook !== false && callLifeHook(this, "beforeMount");
this._isMounted = true; this._isMounted = true;
queue.push(this);
BI.each(this._children, function (i, widget) { BI.each(this._children, function (i, widget) {
!self.isEnabled() && widget._setEnable(false); !self.isEnabled() && widget._setEnable(false);
!self.isValid() && widget._setValid(false); !self.isValid() && widget._setValid(false);
widget._mount && widget._mount(deep ? force : false, deep, lifeHook, predicate, layer + 1, queue); widget._mount && widget._mount(deep ? force : false, deep, lifeHook, predicate, layer + 1);
}); });
this._mountChildren && this._mountChildren(); this._mountChildren && this._mountChildren();
if (layer === 0) { if (layer === 0) {
BI.each(queue, function (i, w) { // 最后再统一执行生命周期
w.__afterMount(lifeHook, predicate); this.__afterMount(lifeHook, predicate);
});
} }
return true; return true;
}, },
__afterMount: function (lifeHook, predicate) { __afterMount: function (lifeHook, predicate) {
if (this._isMounted) { if (this._isMounted) {
BI.each(this._children, function (i, widget) {
widget.__afterMount && widget.__afterMount(lifeHook, predicate);
});
lifeHook !== false && callLifeHook(this, "mounted"); lifeHook !== false && callLifeHook(this, "mounted");
this.fireEvent(BI.Events.MOUNT); this.fireEvent(BI.Events.MOUNT);
predicate && predicate(this); predicate && predicate(this);
@ -33983,7 +33991,8 @@ BI.IconTreeLeafItem = BI.inherit(BI.BasicButton, {
hgap: o.hgap, hgap: o.hgap,
text: o.text, text: o.text,
value: o.value, value: o.value,
py: o.py py: o.py,
keyword: o.keyword
}); });
var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
@ -93373,7 +93382,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.ColorChooser.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.ColorChooser.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-color-chooser bi-border", baseCls: "bi-color-chooser",
value: "", value: "",
height: 24, height: 24,
el: {}, el: {},
@ -93382,8 +93391,6 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
_init: function () { _init: function () {
var self = this, o = this.options; var self = this, o = this.options;
o.height -= 2;
BI.isNumeric(o.width) && (o.width -= 2);
BI.ColorChooser.superclass._init.apply(this, arguments); BI.ColorChooser.superclass._init.apply(this, arguments);
o.value = o.value || ""; o.value = o.value || "";
this.combo = BI.createWidget({ this.combo = BI.createWidget({
@ -93398,8 +93405,8 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
ref: function (_ref) { ref: function (_ref) {
self.trigger = _ref; self.trigger = _ref;
}, },
width: o.width, width: o.width - 2,
height: o.height height: o.height - 2
}, o.el), }, o.el),
popup: { popup: {
el: BI.extend({ el: BI.extend({
@ -94150,8 +94157,8 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.ColorChooserTrigger.superclass._defaultConfig.apply(this, arguments); var conf = BI.ColorChooserTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger", baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-border bi-focus-shadow",
height: 24 height: 22
}); });
}, },
@ -94221,7 +94228,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.LongColorChooserTrigger.superclass._defaultConfig.apply(this, arguments); var conf = BI.LongColorChooserTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger", baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-border bi-focus-shadow",
height: 24 height: 24
}); });
}, },
@ -98047,7 +98054,7 @@ BI.shortcut("bi.simple_tree", BI.SimpleTreeView);
delete this.__cacheStore; delete this.__cacheStore;
}; };
_.each(["_mount"], function (name) { _.each(["_mount", "__afterMount"], function (name) {
var old = BI.Widget.prototype[name]; var old = BI.Widget.prototype[name];
old && (BI.Widget.prototype[name] = function () { old && (BI.Widget.prototype[name] = function () {
this.store && pushTarget(this.store); this.store && pushTarget(this.store);

2
dist/2.0/fineui.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.min.css vendored

File diff suppressed because one or more lines are too long

4
dist/2.0/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.min.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui_without_normalize.css vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui_without_normalize.min.css vendored

File diff suppressed because one or more lines are too long

2
dist/core.css vendored

File diff suppressed because one or more lines are too long

59
dist/core.js vendored

@ -1,4 +1,4 @@
/*! time: 2021-3-2 20:00:40 */ /*! time: 2021-3-4 17:10:44 */
/******/ (function(modules) { // webpackBootstrap /******/ (function(modules) { // webpackBootstrap
/******/ // The module cache /******/ // The module cache
/******/ var installedModules = {}; /******/ var installedModules = {};
@ -13846,9 +13846,11 @@ module.exports = function (exec) {
} }
}, },
// 生命周期函数
beforeInit: null, beforeInit: null,
// 生命周期函数 beforeRender: null,
beforeCreate: null, beforeCreate: null,
created: null, created: null,
@ -13881,14 +13883,24 @@ module.exports = function (exec) {
}, },
_initRender: function () { _initRender: function () {
var self = this;
function render () {
if (self.options.beforeRender || self.beforeRender) {
(self.options.beforeRender || self.beforeRender).call(self, BI.bind(self._render, self));
} else {
self._render();
}
}
if (this.options.beforeInit || this.beforeInit) { if (this.options.beforeInit || this.beforeInit) {
this.__asking = true; this.__asking = true;
(this.options.beforeInit || this.beforeInit).call(this, BI.bind(this._render, this)); (this.options.beforeInit || this.beforeInit).call(this, render);
if (this.__asking === true) { if (this.__asking === true) {
this.__async = true; this.__async = true;
} }
} else { } else {
this._render(); render();
} }
}, },
@ -14013,36 +14025,32 @@ module.exports = function (exec) {
* @returns {boolean} * @returns {boolean}
* @private * @private
*/ */
_mount: function (force, deep, lifeHook, predicate, layer, queue) { _mount: function (force, deep, lifeHook, predicate, layer) {
var self = this; var self = this;
if (!layer) {
layer = 0;
}
if (!queue) {
queue = [];
}
if (!force && (this._isMounted || !this.isVisible() || this.__asking === true || !(this._isRoot === true || (this._parent && this._parent._isMounted === true)))) { if (!force && (this._isMounted || !this.isVisible() || this.__asking === true || !(this._isRoot === true || (this._parent && this._parent._isMounted === true)))) {
return false; return false;
} }
layer = layer || 0;
lifeHook !== false && callLifeHook(this, "beforeMount"); lifeHook !== false && callLifeHook(this, "beforeMount");
this._isMounted = true; this._isMounted = true;
queue.push(this);
BI.each(this._children, function (i, widget) { BI.each(this._children, function (i, widget) {
!self.isEnabled() && widget._setEnable(false); !self.isEnabled() && widget._setEnable(false);
!self.isValid() && widget._setValid(false); !self.isValid() && widget._setValid(false);
widget._mount && widget._mount(deep ? force : false, deep, lifeHook, predicate, layer + 1, queue); widget._mount && widget._mount(deep ? force : false, deep, lifeHook, predicate, layer + 1);
}); });
this._mountChildren && this._mountChildren(); this._mountChildren && this._mountChildren();
if (layer === 0) { if (layer === 0) {
BI.each(queue, function (i, w) { // 最后再统一执行生命周期
w.__afterMount(lifeHook, predicate); this.__afterMount(lifeHook, predicate);
});
} }
return true; return true;
}, },
__afterMount: function (lifeHook, predicate) { __afterMount: function (lifeHook, predicate) {
if (this._isMounted) { if (this._isMounted) {
BI.each(this._children, function (i, widget) {
widget.__afterMount && widget.__afterMount(lifeHook, predicate);
});
lifeHook !== false && callLifeHook(this, "mounted"); lifeHook !== false && callLifeHook(this, "mounted");
this.fireEvent(BI.Events.MOUNT); this.fireEvent(BI.Events.MOUNT);
predicate && predicate(this); predicate && predicate(this);
@ -33983,7 +33991,8 @@ BI.IconTreeLeafItem = BI.inherit(BI.BasicButton, {
hgap: o.hgap, hgap: o.hgap,
text: o.text, text: o.text,
value: o.value, value: o.value,
py: o.py py: o.py,
keyword: o.keyword
}); });
var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
@ -93373,7 +93382,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.ColorChooser.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.ColorChooser.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-color-chooser bi-border", baseCls: "bi-color-chooser",
value: "", value: "",
height: 24, height: 24,
el: {}, el: {},
@ -93382,8 +93391,6 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
_init: function () { _init: function () {
var self = this, o = this.options; var self = this, o = this.options;
o.height -= 2;
BI.isNumeric(o.width) && (o.width -= 2);
BI.ColorChooser.superclass._init.apply(this, arguments); BI.ColorChooser.superclass._init.apply(this, arguments);
o.value = o.value || ""; o.value = o.value || "";
this.combo = BI.createWidget({ this.combo = BI.createWidget({
@ -93398,8 +93405,8 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
ref: function (_ref) { ref: function (_ref) {
self.trigger = _ref; self.trigger = _ref;
}, },
width: o.width, width: o.width - 2,
height: o.height height: o.height - 2
}, o.el), }, o.el),
popup: { popup: {
el: BI.extend({ el: BI.extend({
@ -94150,8 +94157,8 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.ColorChooserTrigger.superclass._defaultConfig.apply(this, arguments); var conf = BI.ColorChooserTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger", baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-border bi-focus-shadow",
height: 24 height: 22
}); });
}, },
@ -94221,7 +94228,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.LongColorChooserTrigger.superclass._defaultConfig.apply(this, arguments); var conf = BI.LongColorChooserTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger", baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-border bi-focus-shadow",
height: 24 height: 24
}); });
}, },
@ -97880,7 +97887,7 @@ BI.shortcut("bi.simple_tree", BI.SimpleTreeView);
delete this.__cacheStore; delete this.__cacheStore;
}; };
_.each(["_mount"], function (name) { _.each(["_mount", "__afterMount"], function (name) {
var old = BI.Widget.prototype[name]; var old = BI.Widget.prototype[name];
old && (BI.Widget.prototype[name] = function () { old && (BI.Widget.prototype[name] = function () {
this.store && pushTarget(this.store); this.store && pushTarget(this.store);

2
dist/core.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/demo.css vendored

File diff suppressed because one or more lines are too long

59
dist/demo.js vendored

@ -1,4 +1,4 @@
/*! time: 2021-3-2 20:00:40 */ /*! time: 2021-3-4 17:10:44 */
/******/ (function(modules) { // webpackBootstrap /******/ (function(modules) { // webpackBootstrap
/******/ // The module cache /******/ // The module cache
/******/ var installedModules = {}; /******/ var installedModules = {};
@ -13846,9 +13846,11 @@ module.exports = function (exec) {
} }
}, },
// 生命周期函数
beforeInit: null, beforeInit: null,
// 生命周期函数 beforeRender: null,
beforeCreate: null, beforeCreate: null,
created: null, created: null,
@ -13881,14 +13883,24 @@ module.exports = function (exec) {
}, },
_initRender: function () { _initRender: function () {
var self = this;
function render () {
if (self.options.beforeRender || self.beforeRender) {
(self.options.beforeRender || self.beforeRender).call(self, BI.bind(self._render, self));
} else {
self._render();
}
}
if (this.options.beforeInit || this.beforeInit) { if (this.options.beforeInit || this.beforeInit) {
this.__asking = true; this.__asking = true;
(this.options.beforeInit || this.beforeInit).call(this, BI.bind(this._render, this)); (this.options.beforeInit || this.beforeInit).call(this, render);
if (this.__asking === true) { if (this.__asking === true) {
this.__async = true; this.__async = true;
} }
} else { } else {
this._render(); render();
} }
}, },
@ -14013,36 +14025,32 @@ module.exports = function (exec) {
* @returns {boolean} * @returns {boolean}
* @private * @private
*/ */
_mount: function (force, deep, lifeHook, predicate, layer, queue) { _mount: function (force, deep, lifeHook, predicate, layer) {
var self = this; var self = this;
if (!layer) {
layer = 0;
}
if (!queue) {
queue = [];
}
if (!force && (this._isMounted || !this.isVisible() || this.__asking === true || !(this._isRoot === true || (this._parent && this._parent._isMounted === true)))) { if (!force && (this._isMounted || !this.isVisible() || this.__asking === true || !(this._isRoot === true || (this._parent && this._parent._isMounted === true)))) {
return false; return false;
} }
layer = layer || 0;
lifeHook !== false && callLifeHook(this, "beforeMount"); lifeHook !== false && callLifeHook(this, "beforeMount");
this._isMounted = true; this._isMounted = true;
queue.push(this);
BI.each(this._children, function (i, widget) { BI.each(this._children, function (i, widget) {
!self.isEnabled() && widget._setEnable(false); !self.isEnabled() && widget._setEnable(false);
!self.isValid() && widget._setValid(false); !self.isValid() && widget._setValid(false);
widget._mount && widget._mount(deep ? force : false, deep, lifeHook, predicate, layer + 1, queue); widget._mount && widget._mount(deep ? force : false, deep, lifeHook, predicate, layer + 1);
}); });
this._mountChildren && this._mountChildren(); this._mountChildren && this._mountChildren();
if (layer === 0) { if (layer === 0) {
BI.each(queue, function (i, w) { // 最后再统一执行生命周期
w.__afterMount(lifeHook, predicate); this.__afterMount(lifeHook, predicate);
});
} }
return true; return true;
}, },
__afterMount: function (lifeHook, predicate) { __afterMount: function (lifeHook, predicate) {
if (this._isMounted) { if (this._isMounted) {
BI.each(this._children, function (i, widget) {
widget.__afterMount && widget.__afterMount(lifeHook, predicate);
});
lifeHook !== false && callLifeHook(this, "mounted"); lifeHook !== false && callLifeHook(this, "mounted");
this.fireEvent(BI.Events.MOUNT); this.fireEvent(BI.Events.MOUNT);
predicate && predicate(this); predicate && predicate(this);
@ -33983,7 +33991,8 @@ BI.IconTreeLeafItem = BI.inherit(BI.BasicButton, {
hgap: o.hgap, hgap: o.hgap,
text: o.text, text: o.text,
value: o.value, value: o.value,
py: o.py py: o.py,
keyword: o.keyword
}); });
var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
@ -93373,7 +93382,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.ColorChooser.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.ColorChooser.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-color-chooser bi-border", baseCls: "bi-color-chooser",
value: "", value: "",
height: 24, height: 24,
el: {}, el: {},
@ -93382,8 +93391,6 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
_init: function () { _init: function () {
var self = this, o = this.options; var self = this, o = this.options;
o.height -= 2;
BI.isNumeric(o.width) && (o.width -= 2);
BI.ColorChooser.superclass._init.apply(this, arguments); BI.ColorChooser.superclass._init.apply(this, arguments);
o.value = o.value || ""; o.value = o.value || "";
this.combo = BI.createWidget({ this.combo = BI.createWidget({
@ -93398,8 +93405,8 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
ref: function (_ref) { ref: function (_ref) {
self.trigger = _ref; self.trigger = _ref;
}, },
width: o.width, width: o.width - 2,
height: o.height height: o.height - 2
}, o.el), }, o.el),
popup: { popup: {
el: BI.extend({ el: BI.extend({
@ -94150,8 +94157,8 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.ColorChooserTrigger.superclass._defaultConfig.apply(this, arguments); var conf = BI.ColorChooserTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger", baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-border bi-focus-shadow",
height: 24 height: 22
}); });
}, },
@ -94221,7 +94228,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.LongColorChooserTrigger.superclass._defaultConfig.apply(this, arguments); var conf = BI.LongColorChooserTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger", baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-border bi-focus-shadow",
height: 24 height: 24
}); });
}, },
@ -98047,7 +98054,7 @@ BI.shortcut("bi.simple_tree", BI.SimpleTreeView);
delete this.__cacheStore; delete this.__cacheStore;
}; };
_.each(["_mount"], function (name) { _.each(["_mount", "__afterMount"], function (name) {
var old = BI.Widget.prototype[name]; var old = BI.Widget.prototype[name];
old && (BI.Widget.prototype[name] = function () { old && (BI.Widget.prototype[name] = function () {
this.store && pushTarget(this.store); this.store && pushTarget(this.store);

2
dist/demo.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.css vendored

File diff suppressed because one or more lines are too long

4
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.ie.min.js.map vendored

File diff suppressed because one or more lines are too long

59
dist/fineui.js vendored

@ -1,4 +1,4 @@
/*! time: 2021-3-2 20:00:40 */ /*! time: 2021-3-4 17:10:44 */
/******/ (function(modules) { // webpackBootstrap /******/ (function(modules) { // webpackBootstrap
/******/ // The module cache /******/ // The module cache
/******/ var installedModules = {}; /******/ var installedModules = {};
@ -13846,9 +13846,11 @@ module.exports = function (exec) {
} }
}, },
// 生命周期函数
beforeInit: null, beforeInit: null,
// 生命周期函数 beforeRender: null,
beforeCreate: null, beforeCreate: null,
created: null, created: null,
@ -13881,14 +13883,24 @@ module.exports = function (exec) {
}, },
_initRender: function () { _initRender: function () {
var self = this;
function render () {
if (self.options.beforeRender || self.beforeRender) {
(self.options.beforeRender || self.beforeRender).call(self, BI.bind(self._render, self));
} else {
self._render();
}
}
if (this.options.beforeInit || this.beforeInit) { if (this.options.beforeInit || this.beforeInit) {
this.__asking = true; this.__asking = true;
(this.options.beforeInit || this.beforeInit).call(this, BI.bind(this._render, this)); (this.options.beforeInit || this.beforeInit).call(this, render);
if (this.__asking === true) { if (this.__asking === true) {
this.__async = true; this.__async = true;
} }
} else { } else {
this._render(); render();
} }
}, },
@ -14013,36 +14025,32 @@ module.exports = function (exec) {
* @returns {boolean} * @returns {boolean}
* @private * @private
*/ */
_mount: function (force, deep, lifeHook, predicate, layer, queue) { _mount: function (force, deep, lifeHook, predicate, layer) {
var self = this; var self = this;
if (!layer) {
layer = 0;
}
if (!queue) {
queue = [];
}
if (!force && (this._isMounted || !this.isVisible() || this.__asking === true || !(this._isRoot === true || (this._parent && this._parent._isMounted === true)))) { if (!force && (this._isMounted || !this.isVisible() || this.__asking === true || !(this._isRoot === true || (this._parent && this._parent._isMounted === true)))) {
return false; return false;
} }
layer = layer || 0;
lifeHook !== false && callLifeHook(this, "beforeMount"); lifeHook !== false && callLifeHook(this, "beforeMount");
this._isMounted = true; this._isMounted = true;
queue.push(this);
BI.each(this._children, function (i, widget) { BI.each(this._children, function (i, widget) {
!self.isEnabled() && widget._setEnable(false); !self.isEnabled() && widget._setEnable(false);
!self.isValid() && widget._setValid(false); !self.isValid() && widget._setValid(false);
widget._mount && widget._mount(deep ? force : false, deep, lifeHook, predicate, layer + 1, queue); widget._mount && widget._mount(deep ? force : false, deep, lifeHook, predicate, layer + 1);
}); });
this._mountChildren && this._mountChildren(); this._mountChildren && this._mountChildren();
if (layer === 0) { if (layer === 0) {
BI.each(queue, function (i, w) { // 最后再统一执行生命周期
w.__afterMount(lifeHook, predicate); this.__afterMount(lifeHook, predicate);
});
} }
return true; return true;
}, },
__afterMount: function (lifeHook, predicate) { __afterMount: function (lifeHook, predicate) {
if (this._isMounted) { if (this._isMounted) {
BI.each(this._children, function (i, widget) {
widget.__afterMount && widget.__afterMount(lifeHook, predicate);
});
lifeHook !== false && callLifeHook(this, "mounted"); lifeHook !== false && callLifeHook(this, "mounted");
this.fireEvent(BI.Events.MOUNT); this.fireEvent(BI.Events.MOUNT);
predicate && predicate(this); predicate && predicate(this);
@ -33983,7 +33991,8 @@ BI.IconTreeLeafItem = BI.inherit(BI.BasicButton, {
hgap: o.hgap, hgap: o.hgap,
text: o.text, text: o.text,
value: o.value, value: o.value,
py: o.py py: o.py,
keyword: o.keyword
}); });
var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
@ -93373,7 +93382,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.ColorChooser.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.ColorChooser.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-color-chooser bi-border", baseCls: "bi-color-chooser",
value: "", value: "",
height: 24, height: 24,
el: {}, el: {},
@ -93382,8 +93391,6 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
_init: function () { _init: function () {
var self = this, o = this.options; var self = this, o = this.options;
o.height -= 2;
BI.isNumeric(o.width) && (o.width -= 2);
BI.ColorChooser.superclass._init.apply(this, arguments); BI.ColorChooser.superclass._init.apply(this, arguments);
o.value = o.value || ""; o.value = o.value || "";
this.combo = BI.createWidget({ this.combo = BI.createWidget({
@ -93398,8 +93405,8 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
ref: function (_ref) { ref: function (_ref) {
self.trigger = _ref; self.trigger = _ref;
}, },
width: o.width, width: o.width - 2,
height: o.height height: o.height - 2
}, o.el), }, o.el),
popup: { popup: {
el: BI.extend({ el: BI.extend({
@ -94150,8 +94157,8 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.ColorChooserTrigger.superclass._defaultConfig.apply(this, arguments); var conf = BI.ColorChooserTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger", baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-border bi-focus-shadow",
height: 24 height: 22
}); });
}, },
@ -94221,7 +94228,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.LongColorChooserTrigger.superclass._defaultConfig.apply(this, arguments); var conf = BI.LongColorChooserTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger", baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-border bi-focus-shadow",
height: 24 height: 24
}); });
}, },
@ -98042,7 +98049,7 @@ BI.shortcut("bi.simple_tree", BI.SimpleTreeView);
delete this.__cacheStore; delete this.__cacheStore;
}; };
_.each(["_mount"], function (name) { _.each(["_mount", "__afterMount"], function (name) {
var old = BI.Widget.prototype[name]; var old = BI.Widget.prototype[name];
old && (BI.Widget.prototype[name] = function () { old && (BI.Widget.prototype[name] = function () {
this.store && pushTarget(this.store); this.store && pushTarget(this.store);

2
dist/fineui.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

4
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.min.js.map vendored

File diff suppressed because one or more lines are too long

45
dist/fineui_without_jquery_polyfill.js vendored

@ -1,4 +1,4 @@
/*! time: 2021-3-2 20:00:40 */ /*! time: 2021-3-4 17:10:44 */
/******/ (function(modules) { // webpackBootstrap /******/ (function(modules) { // webpackBootstrap
/******/ // The module cache /******/ // The module cache
/******/ var installedModules = {}; /******/ var installedModules = {};
@ -9868,9 +9868,11 @@ BI.Req = {
} }
}, },
// 生命周期函数
beforeInit: null, beforeInit: null,
// 生命周期函数 beforeRender: null,
beforeCreate: null, beforeCreate: null,
created: null, created: null,
@ -9903,14 +9905,24 @@ BI.Req = {
}, },
_initRender: function () { _initRender: function () {
var self = this;
function render () {
if (self.options.beforeRender || self.beforeRender) {
(self.options.beforeRender || self.beforeRender).call(self, BI.bind(self._render, self));
} else {
self._render();
}
}
if (this.options.beforeInit || this.beforeInit) { if (this.options.beforeInit || this.beforeInit) {
this.__asking = true; this.__asking = true;
(this.options.beforeInit || this.beforeInit).call(this, BI.bind(this._render, this)); (this.options.beforeInit || this.beforeInit).call(this, render);
if (this.__asking === true) { if (this.__asking === true) {
this.__async = true; this.__async = true;
} }
} else { } else {
this._render(); render();
} }
}, },
@ -10035,36 +10047,32 @@ BI.Req = {
* @returns {boolean} * @returns {boolean}
* @private * @private
*/ */
_mount: function (force, deep, lifeHook, predicate, layer, queue) { _mount: function (force, deep, lifeHook, predicate, layer) {
var self = this; var self = this;
if (!layer) {
layer = 0;
}
if (!queue) {
queue = [];
}
if (!force && (this._isMounted || !this.isVisible() || this.__asking === true || !(this._isRoot === true || (this._parent && this._parent._isMounted === true)))) { if (!force && (this._isMounted || !this.isVisible() || this.__asking === true || !(this._isRoot === true || (this._parent && this._parent._isMounted === true)))) {
return false; return false;
} }
layer = layer || 0;
lifeHook !== false && callLifeHook(this, "beforeMount"); lifeHook !== false && callLifeHook(this, "beforeMount");
this._isMounted = true; this._isMounted = true;
queue.push(this);
BI.each(this._children, function (i, widget) { BI.each(this._children, function (i, widget) {
!self.isEnabled() && widget._setEnable(false); !self.isEnabled() && widget._setEnable(false);
!self.isValid() && widget._setValid(false); !self.isValid() && widget._setValid(false);
widget._mount && widget._mount(deep ? force : false, deep, lifeHook, predicate, layer + 1, queue); widget._mount && widget._mount(deep ? force : false, deep, lifeHook, predicate, layer + 1);
}); });
this._mountChildren && this._mountChildren(); this._mountChildren && this._mountChildren();
if (layer === 0) { if (layer === 0) {
BI.each(queue, function (i, w) { // 最后再统一执行生命周期
w.__afterMount(lifeHook, predicate); this.__afterMount(lifeHook, predicate);
});
} }
return true; return true;
}, },
__afterMount: function (lifeHook, predicate) { __afterMount: function (lifeHook, predicate) {
if (this._isMounted) { if (this._isMounted) {
BI.each(this._children, function (i, widget) {
widget.__afterMount && widget.__afterMount(lifeHook, predicate);
});
lifeHook !== false && callLifeHook(this, "mounted"); lifeHook !== false && callLifeHook(this, "mounted");
this.fireEvent(BI.Events.MOUNT); this.fireEvent(BI.Events.MOUNT);
predicate && predicate(this); predicate && predicate(this);
@ -30005,7 +30013,8 @@ BI.IconTreeLeafItem = BI.inherit(BI.BasicButton, {
hgap: o.hgap, hgap: o.hgap,
text: o.text, text: o.text,
value: o.value, value: o.value,
py: o.py py: o.py,
keyword: o.keyword
}); });
var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
@ -72929,7 +72938,7 @@ var _button = __webpack_require__(8);
delete this.__cacheStore; delete this.__cacheStore;
}; };
_.each(["_mount"], function (name) { _.each(["_mount", "__afterMount"], function (name) {
var old = BI.Widget.prototype[name]; var old = BI.Widget.prototype[name];
old && (BI.Widget.prototype[name] = function () { old && (BI.Widget.prototype[name] = function () {
this.store && pushTarget(this.store); this.store && pushTarget(this.store);

2
dist/fineui_without_jquery_polyfill.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/font.css vendored

File diff suppressed because one or more lines are too long

BIN
dist/font/iconfont.eot vendored

Binary file not shown.

6
dist/font/iconfont.svg vendored

@ -20,6 +20,12 @@ Created by iconfont
/> />
<missing-glyph /> <missing-glyph />
<glyph glyph-name="dangjichuli" unicode="&#59466;" d="M169.923333 838.358271l186.257984-186.189757-11.666709-100.906798-100.906798-11.666709-186.257984 186.257984-20.740815-43.596649a375.381475 375.381475 0 0 1 73.343345-427.097061l12.417199-11.871388a375.108569 375.108569 0 0 1 340.244895-87.807336l11.803162 3.20664 172.817389-172.817389a185.712173 185.712173 0 0 1 262.671515 0l8.664749 9.278786a185.712173 185.712173 0 0 1-8.664749 253.392729L737.089127 421.222259l3.138413 11.803162A375.381475 375.381475 0 0 1 213.519982 859.23554l-43.528423-20.809043z m422.457668-100.770345a307.018654 307.018654 0 0 0 73.889157-315.205818l-6.754411-19.990326 202.154727-202.086501a117.485805 117.485805 0 0 0-166.199431-166.199432L493.384542 236.19235l-20.058552-6.686184a307.018654 307.018654 0 0 0-315.205819 73.889156l-10.711539 11.325578a307.155107 307.155107 0 0 0-69.932027 280.751502l2.933734 10.847993 138.363073-138.363074 187.281379 21.832438 21.764212 187.213153-138.363074 138.363073 10.916219 2.933734a307.155107 307.155107 0 0 0 292.008853-80.711793z" horiz-adv-x="1024" />
<glyph glyph-name="xingnengfankui" unicode="&#59465;" d="M128 352V128h160a30.72 30.72 0 0 0 17.408-5.888l0.512 0.768L448 27.52V96a32 32 0 0 0 32 32H896V352h64V128a64 64 0 0 0-64-64H512v-96c0-17.92-14.08-32-32-32-4.48 0-8.96 0.64-12.8 2.56a34.368 34.368 0 0 0-10.24 6.4L277.824 64H128a64 64 0 0 0-64 64V352h64z m336.512 306.112l1.536-5.44 60.288-302.08 95.36 171.072a32 32 0 0 0 54.208 2.688l2.88-5.12 60.16-133.12 68.48 82.432a32 32 0 0 0 18.944 11.072L832 480.128h128a32 32 0 0 0 5.76-63.488l-5.76-0.512h-113.024l-91.456-110.272a32 32 0 0 0-50.944 2.176l-2.816 5.056-55.168 121.984-106.624-191.552a32 32 0 0 0-57.728 3.776l-1.6 5.504-61.184 306.304-106.88-177.728a32 32 0 0 0-52.8-3.008l-3.2 5.248-41.792 83.776-29.312-38.656a32 32 0 0 0-19.584-12.096l-5.888-0.512H64a32 32 0 0 0-5.76 63.488L64 480.128h80.064l50.944 66.944a32 32 0 0 0 51.136-0.192l3.008-4.928 38.656-77.568 119.424 198.464a32 32 0 0 0 57.28-4.736zM896 832a64 64 0 0 0 64-64v-224h-64V768H128v-224H64V768a64 64 0 0 0 64 64h768z" horiz-adv-x="1024" />
<glyph glyph-name="beizhu" unicode="&#59463;" d="M809.152 800H214.848A119.232 119.232 0 0 1 96 681.152v-475.456c0-65.344 53.504-118.848 118.848-118.848h54.848l124.8-112.896c5.952-5.952 11.904-5.952 17.856-5.952 17.792 0 35.648 11.904 35.648 35.648v83.2h361.152a119.232 119.232 0 0 1 118.848 118.848V681.152A119.232 119.232 0 0 1 809.152 800z m59.392-594.304c0-35.648-23.744-59.392-59.392-59.392H448a53.952 53.952 0 0 1-41.6-17.856 53.952 53.952 0 0 1-17.856-41.6v-29.696l-77.248 71.296a64.192 64.192 0 0 1-41.6 17.856h-54.848c-35.648 0-59.392 23.744-59.392 59.392V681.152c0 35.648 23.744 59.392 59.392 59.392h594.304c35.648 0 59.392-23.744 59.392-59.392v-475.456zM720 562.304h-416c-17.856 0-29.696-11.904-29.696-29.76 0-17.792 11.84-29.696 29.696-29.696h416c17.856 0 29.696 11.904 29.696 29.696 0 17.856-11.84 29.76-29.696 29.76z m0-178.304h-416c-17.856 0-29.696-11.904-29.696-29.696 0-17.856 11.84-29.76 29.696-29.76h416c17.856 0 29.696 11.904 29.696 29.76 0 17.792-11.84 29.696-29.696 29.696z" horiz-adv-x="1024" /> <glyph glyph-name="beizhu" unicode="&#59463;" d="M809.152 800H214.848A119.232 119.232 0 0 1 96 681.152v-475.456c0-65.344 53.504-118.848 118.848-118.848h54.848l124.8-112.896c5.952-5.952 11.904-5.952 17.856-5.952 17.792 0 35.648 11.904 35.648 35.648v83.2h361.152a119.232 119.232 0 0 1 118.848 118.848V681.152A119.232 119.232 0 0 1 809.152 800z m59.392-594.304c0-35.648-23.744-59.392-59.392-59.392H448a53.952 53.952 0 0 1-41.6-17.856 53.952 53.952 0 0 1-17.856-41.6v-29.696l-77.248 71.296a64.192 64.192 0 0 1-41.6 17.856h-54.848c-35.648 0-59.392 23.744-59.392 59.392V681.152c0 35.648 23.744 59.392 59.392 59.392h594.304c35.648 0 59.392-23.744 59.392-59.392v-475.456zM720 562.304h-416c-17.856 0-29.696-11.904-29.696-29.76 0-17.792 11.84-29.696 29.696-29.696h416c17.856 0 29.696 11.904 29.696 29.696 0 17.856-11.84 29.76-29.696 29.76z m0-178.304h-416c-17.856 0-29.696-11.904-29.696-29.696 0-17.856 11.84-29.76 29.696-29.76h416c17.856 0 29.696 11.904 29.696 29.76 0 17.792-11.84 29.696-29.696 29.696z" horiz-adv-x="1024" />

Before

Width:  |  Height:  |  Size: 379 KiB

After

Width:  |  Height:  |  Size: 381 KiB

BIN
dist/font/iconfont.ttf vendored

Binary file not shown.

BIN
dist/font/iconfont.woff vendored

Binary file not shown.

BIN
dist/font/iconfont.woff2 vendored

Binary file not shown.

2
dist/resource.css vendored

File diff suppressed because one or more lines are too long

2
dist/utils.js vendored

@ -1,4 +1,4 @@
/*! time: 2021-3-2 20:00:40 */ /*! time: 2021-3-4 17:10:44 */
/******/ (function(modules) { // webpackBootstrap /******/ (function(modules) { // webpackBootstrap
/******/ // The module cache /******/ // The module cache
/******/ var installedModules = {}; /******/ var installedModules = {};

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

2
package.json

@ -1,6 +1,6 @@
{ {
"name": "fineui", "name": "fineui",
"version": "2.0.20210302200248", "version": "2.0.20210304171221",
"description": "fineui", "description": "fineui",
"main": "dist/fineui.min.js", "main": "dist/fineui.min.js",
"types": "dist/lib/index.d.ts", "types": "dist/lib/index.d.ts",

3
src/case/button/treeitem/item.icon.treeleaf.js

@ -36,7 +36,8 @@ BI.IconTreeLeafItem = BI.inherit(BI.BasicButton, {
hgap: o.hgap, hgap: o.hgap,
text: o.text, text: o.text,
value: o.value, value: o.value,
py: o.py py: o.py,
keyword: o.keyword
}); });
var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {

8
src/case/colorchooser/colorchooser.js

@ -9,7 +9,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.ColorChooser.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.ColorChooser.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-color-chooser bi-border", baseCls: "bi-color-chooser",
value: "", value: "",
height: 24, height: 24,
el: {}, el: {},
@ -18,8 +18,6 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
_init: function () { _init: function () {
var self = this, o = this.options; var self = this, o = this.options;
o.height -= 2;
BI.isNumeric(o.width) && (o.width -= 2);
BI.ColorChooser.superclass._init.apply(this, arguments); BI.ColorChooser.superclass._init.apply(this, arguments);
o.value = o.value || ""; o.value = o.value || "";
this.combo = BI.createWidget({ this.combo = BI.createWidget({
@ -34,8 +32,8 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
ref: function (_ref) { ref: function (_ref) {
self.trigger = _ref; self.trigger = _ref;
}, },
width: o.width, width: o.width - 2,
height: o.height height: o.height - 2
}, o.el), }, o.el),
popup: { popup: {
el: BI.extend({ el: BI.extend({

4
src/case/colorchooser/colorchooser.trigger.js

@ -10,8 +10,8 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.ColorChooserTrigger.superclass._defaultConfig.apply(this, arguments); var conf = BI.ColorChooserTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger", baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-border bi-focus-shadow",
height: 24 height: 22
}); });
}, },

2
src/case/colorchooser/colorchooser.trigger.long.js

@ -10,7 +10,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.LongColorChooserTrigger.superclass._defaultConfig.apply(this, arguments); var conf = BI.LongColorChooserTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger", baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-border bi-focus-shadow",
height: 24 height: 24
}); });
}, },

18
src/core/widget.js

@ -59,9 +59,11 @@
} }
}, },
// 生命周期函数
beforeInit: null, beforeInit: null,
// 生命周期函数 beforeRender: null,
beforeCreate: null, beforeCreate: null,
created: null, created: null,
@ -94,14 +96,24 @@
}, },
_initRender: function () { _initRender: function () {
var self = this;
function render () {
if (self.options.beforeRender || self.beforeRender) {
(self.options.beforeRender || self.beforeRender).call(self, BI.bind(self._render, self));
} else {
self._render();
}
}
if (this.options.beforeInit || this.beforeInit) { if (this.options.beforeInit || this.beforeInit) {
this.__asking = true; this.__asking = true;
(this.options.beforeInit || this.beforeInit).call(this, BI.bind(this._render, this)); (this.options.beforeInit || this.beforeInit).call(this, render);
if (this.__asking === true) { if (this.__asking === true) {
this.__async = true; this.__async = true;
} }
} else { } else {
this._render(); render();
} }
}, },

Loading…
Cancel
Save