Browse Source

Merge branch 'master' of ssh://code.fineres.com:7999/~teller/fineui

es6
iapyang 3 years ago
parent
commit
0185db1920
  1. 2
      package.json
  2. 2
      src/base/1.pane.js
  3. 7
      src/base/single/button/button.basic.js
  4. 2
      src/core/wrapper/layout.js
  5. 1
      typescript/base/single/button/listitem/icontextitem.ts

2
package.json

@ -1,6 +1,6 @@
{ {
"name": "fineui", "name": "fineui",
"version": "2.0.20211107204304", "version": "2.0.20211109100152",
"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",

2
src/base/1.pane.js

@ -150,3 +150,5 @@ BI.Pane = BI.inherit(BI.Widget, {
}); });
BI.Pane.EVENT_LOADED = "EVENT_LOADED"; BI.Pane.EVENT_LOADED = "EVENT_LOADED";
BI.Pane.EVENT_LOADING = "EVENT_LOADING"; BI.Pane.EVENT_LOADING = "EVENT_LOADING";
BI.shortcut("bi.pane", BI.Pane);

7
src/base/single/button/button.basic.js

@ -10,6 +10,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
var conf = BI.BasicButton.superclass._defaultConfig.apply(this, arguments); var conf = BI.BasicButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
_baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer") + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""), _baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer") + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""),
// el: {} // 可以通过el来创建button元素
value: "", value: "",
stopEvent: false, stopEvent: false,
stopPropagation: false, stopPropagation: false,
@ -26,6 +27,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
bubble: null bubble: null
}); });
}, },
_init: function () { _init: function () {
BI.BasicButton.superclass._init.apply(this, arguments); BI.BasicButton.superclass._init.apply(this, arguments);
var opts = this.options; var opts = this.options;
@ -44,6 +46,11 @@ BI.BasicButton = BI.inherit(BI.Single, {
} }
}, },
// 默认render方法
render: function () {
return this.options.el;
},
_createShadow: function () { _createShadow: function () {
var self = this, o = this.options; var self = this, o = this.options;

2
src/core/wrapper/layout.js

@ -241,7 +241,7 @@ BI.Layout = BI.inherit(BI.Widget, {
// 需要有个地方临时存一下新建的组件,否则如果直接使用newIndex的话,newIndex位置的元素可能会被用到 // 需要有个地方临时存一下新建的组件,否则如果直接使用newIndex的话,newIndex位置的元素可能会被用到
this._children[this._getChildName(newIndex) + "-temp"] = w; this._children[this._getChildName(newIndex) + "-temp"] = w;
var nextSibling = del.element.next(); var nextSibling = del.element.next();
if (nextSibling) { if (nextSibling.length > 0) {
BI.Widget._renderEngine.createElement(nextSibling).before(w.element); BI.Widget._renderEngine.createElement(nextSibling).before(w.element);
} else { } else {
w.element.appendTo(this._getWrapper()); w.element.appendTo(this._getWrapper());

1
typescript/base/single/button/listitem/icontextitem.ts

@ -10,6 +10,7 @@ export declare class IconTextItem extends BasicButton {
dynamic: boolean; dynamic: boolean;
}; };
iconWrapperWidth?: number; iconWrapperWidth?: number;
iconCls?: string;
iconHeight?: number; iconHeight?: number;
iconWidth?: number; iconWidth?: number;
textHgap?: number; textHgap?: number;

Loading…
Cancel
Save