Browse Source

Merge pull request #787 in VISUAL/fineui from ~FRANK.QIU/fineui:master to master

* commit '5772846839617361cb9de292c850465d4a330374':
  DEC-5551 时间日期后面多了一条线
es6
Frank.Qiu 6 years ago
parent
commit
1793910255
  1. 4
      dist/bundle.ie.js
  2. 4
      dist/bundle.js
  3. 25
      dist/demo.js
  4. 4
      dist/fineui.ie.js
  5. 4
      dist/fineui.js
  6. 4
      dist/fineui_without_jquery_polyfill.js
  7. 4
      dist/widget.js
  8. 4
      src/widget/datetime/datetime.combo.js

4
dist/bundle.ie.js vendored

@ -60026,7 +60026,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
},
_defaultConfig: function () {
return BI.extend(BI.DateTimeCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-date-time-combo bi-border",
baseCls: "bi-date-time-combo bi-border bi-border-radius",
width: 200,
height: 24
});
@ -60095,7 +60095,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
var triggerBtn = BI.createWidget({
type: "bi.icon_button",
cls: "bi-trigger-icon-button date-font bi-border-right",
cls: "bi-trigger-icon-button date-font",
width: 24,
height: 24
});

4
dist/bundle.js vendored

@ -60430,7 +60430,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
},
_defaultConfig: function () {
return BI.extend(BI.DateTimeCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-date-time-combo bi-border",
baseCls: "bi-date-time-combo bi-border bi-border-radius",
width: 200,
height: 24
});
@ -60499,7 +60499,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
var triggerBtn = BI.createWidget({
type: "bi.icon_button",
cls: "bi-trigger-icon-button date-font bi-border-right",
cls: "bi-trigger-icon-button date-font",
width: 24,
height: 24
});

25
dist/demo.js vendored

@ -6126,30 +6126,7 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, {
};
}
});
BI.shortcut("demo.htape", Demo.HtapeLayout);Demo.InlineVerticalLayout = BI.inherit(BI.Widget, {
props: {
baseCls: "demo-absolute"
},
render: function () {
return {
type: "bi.inline_vertical_adapt",
items: [{
type: "bi.label",
text: "绝对布局",
cls: "layout-bg1",
width: 300,
height: 200
}, {
type: "bi.label",
text: "绝对布局",
cls: "layout-bg1",
width: 300,
height: 100
}]
};
}
});
BI.shortcut("demo.inline_vertical", Demo.InlineVerticalLayout);/**
BI.shortcut("demo.htape", Demo.HtapeLayout);/**
* Created by User on 2017/3/22.
*/
Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, {

4
dist/fineui.ie.js vendored

@ -60268,7 +60268,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
},
_defaultConfig: function () {
return BI.extend(BI.DateTimeCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-date-time-combo bi-border",
baseCls: "bi-date-time-combo bi-border bi-border-radius",
width: 200,
height: 24
});
@ -60337,7 +60337,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
var triggerBtn = BI.createWidget({
type: "bi.icon_button",
cls: "bi-trigger-icon-button date-font bi-border-right",
cls: "bi-trigger-icon-button date-font",
width: 24,
height: 24
});

4
dist/fineui.js vendored

@ -60672,7 +60672,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
},
_defaultConfig: function () {
return BI.extend(BI.DateTimeCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-date-time-combo bi-border",
baseCls: "bi-date-time-combo bi-border bi-border-radius",
width: 200,
height: 24
});
@ -60741,7 +60741,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
var triggerBtn = BI.createWidget({
type: "bi.icon_button",
cls: "bi-trigger-icon-button date-font bi-border-right",
cls: "bi-trigger-icon-button date-font",
width: 24,
height: 24
});

4
dist/fineui_without_jquery_polyfill.js vendored

@ -43491,7 +43491,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
},
_defaultConfig: function () {
return BI.extend(BI.DateTimeCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-date-time-combo bi-border",
baseCls: "bi-date-time-combo bi-border bi-border-radius",
width: 200,
height: 24
});
@ -43560,7 +43560,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
var triggerBtn = BI.createWidget({
type: "bi.icon_button",
cls: "bi-trigger-icon-button date-font bi-border-right",
cls: "bi-trigger-icon-button date-font",
width: 24,
height: 24
});

4
dist/widget.js vendored

@ -1028,7 +1028,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
},
_defaultConfig: function () {
return BI.extend(BI.DateTimeCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-date-time-combo bi-border",
baseCls: "bi-date-time-combo bi-border bi-border-radius",
width: 200,
height: 24
});
@ -1097,7 +1097,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
var triggerBtn = BI.createWidget({
type: "bi.icon_button",
cls: "bi-trigger-icon-button date-font bi-border-right",
cls: "bi-trigger-icon-button date-font",
width: 24,
height: 24
});

4
src/widget/datetime/datetime.combo.js

@ -12,7 +12,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
},
_defaultConfig: function () {
return BI.extend(BI.DateTimeCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-date-time-combo bi-border",
baseCls: "bi-date-time-combo bi-border bi-border-radius",
width: 200,
height: 24
});
@ -81,7 +81,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
var triggerBtn = BI.createWidget({
type: "bi.icon_button",
cls: "bi-trigger-icon-button date-font bi-border-right",
cls: "bi-trigger-icon-button date-font",
width: 24,
height: 24
});

Loading…
Cancel
Save