Browse Source

Merge pull request #719 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit '576153200a763b5b9e0f74797e4f3e1ddd0dc506':
  BI-33362 视觉改间距了
master
windy 6 years ago
parent
commit
890b7e66c4
  1. 5
      dist/bundle.ie.js
  2. 6
      dist/bundle.ie.min.js
  3. 5
      dist/bundle.js
  4. 6
      dist/bundle.min.js
  5. 25
      dist/demo.js
  6. 5
      dist/fineui.ie.js
  7. 6
      dist/fineui.ie.min.js
  8. 5
      dist/fineui.js
  9. 4
      dist/fineui.min.js
  10. 7
      dist/fineui_without_jquery_polyfill.js
  11. 2
      dist/utils.min.js
  12. 5
      dist/widget.js
  13. 1
      src/widget/downlist/popup.downlist.js

5
dist/bundle.ie.js vendored

@ -60481,6 +60481,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
}], }],
cls: "bi-down-list-spliter-container cursor-pointer", cls: "bi-down-list-spliter-container cursor-pointer",
vgap: 5,
lgap: 10, lgap: 10,
rgap: 0 rgap: 0
}); });
@ -72007,6 +72008,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
self._setComboValueChangedEvent(self.smallCombo); self._setComboValueChangedEvent(self.smallCombo);
self._setEditorValueChangedEvent(self.bigEditor); self._setEditorValueChangedEvent(self.bigEditor);
self._setEditorValueChangedEvent(self.smallEditor); self._setEditorValueChangedEvent(self.smallEditor);
self._checkValidation();
}, },
_checkValidation: function () { _checkValidation: function () {
@ -72284,6 +72287,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
} }
self.bigCombo.setValue(combo_value); self.bigCombo.setValue(combo_value);
} }
this._checkValidation();
}, },

6
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

5
dist/bundle.js vendored

@ -61020,6 +61020,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
}], }],
cls: "bi-down-list-spliter-container cursor-pointer", cls: "bi-down-list-spliter-container cursor-pointer",
vgap: 5,
lgap: 10, lgap: 10,
rgap: 0 rgap: 0
}); });
@ -72546,6 +72547,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
self._setComboValueChangedEvent(self.smallCombo); self._setComboValueChangedEvent(self.smallCombo);
self._setEditorValueChangedEvent(self.bigEditor); self._setEditorValueChangedEvent(self.bigEditor);
self._setEditorValueChangedEvent(self.smallEditor); self._setEditorValueChangedEvent(self.smallEditor);
self._checkValidation();
}, },
_checkValidation: function () { _checkValidation: function () {
@ -72823,6 +72826,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
} }
self.bigCombo.setValue(combo_value); self.bigCombo.setValue(combo_value);
} }
this._checkValidation();
}, },

6
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

25
dist/demo.js vendored

@ -6044,7 +6044,30 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, {
}; };
} }
}); });
BI.shortcut("demo.htape", Demo.HtapeLayout);/** 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);/**
* Created by User on 2017/3/22. * Created by User on 2017/3/22.
*/ */
Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, { Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, {

5
dist/fineui.ie.js vendored

@ -60723,6 +60723,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
}], }],
cls: "bi-down-list-spliter-container cursor-pointer", cls: "bi-down-list-spliter-container cursor-pointer",
vgap: 5,
lgap: 10, lgap: 10,
rgap: 0 rgap: 0
}); });
@ -72249,6 +72250,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
self._setComboValueChangedEvent(self.smallCombo); self._setComboValueChangedEvent(self.smallCombo);
self._setEditorValueChangedEvent(self.bigEditor); self._setEditorValueChangedEvent(self.bigEditor);
self._setEditorValueChangedEvent(self.smallEditor); self._setEditorValueChangedEvent(self.smallEditor);
self._checkValidation();
}, },
_checkValidation: function () { _checkValidation: function () {
@ -72526,6 +72529,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
} }
self.bigCombo.setValue(combo_value); self.bigCombo.setValue(combo_value);
} }
this._checkValidation();
}, },

6
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

5
dist/fineui.js vendored

@ -61262,6 +61262,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
}], }],
cls: "bi-down-list-spliter-container cursor-pointer", cls: "bi-down-list-spliter-container cursor-pointer",
vgap: 5,
lgap: 10, lgap: 10,
rgap: 0 rgap: 0
}); });
@ -72788,6 +72789,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
self._setComboValueChangedEvent(self.smallCombo); self._setComboValueChangedEvent(self.smallCombo);
self._setEditorValueChangedEvent(self.bigEditor); self._setEditorValueChangedEvent(self.bigEditor);
self._setEditorValueChangedEvent(self.smallEditor); self._setEditorValueChangedEvent(self.smallEditor);
self._checkValidation();
}, },
_checkValidation: function () { _checkValidation: function () {
@ -73065,6 +73068,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
} }
self.bigCombo.setValue(combo_value); self.bigCombo.setValue(combo_value);
} }
this._checkValidation();
}, },

4
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

7
dist/fineui_without_jquery_polyfill.js vendored

@ -14895,7 +14895,7 @@ BI.Layout = BI.inherit(BI.Widget, {
} }
} }
if (oldStartIdx > oldEndIdx) { if (oldStartIdx > oldEndIdx) {
before = BI.isNull(newCh[newEndIdx + 1]) ? null : newCh[newEndIdx + 1].elm; before = BI.isNull(newCh[newEndIdx + 1]) ? null : newCh[newEndIdx + 1];
addVnodes(before, newCh, newStartIdx, newEndIdx); addVnodes(before, newCh, newStartIdx, newEndIdx);
} else if (newStartIdx > newEndIdx) { } else if (newStartIdx > newEndIdx) {
removeVnodes(oldCh, oldStartIdx, oldEndIdx); removeVnodes(oldCh, oldStartIdx, oldEndIdx);
@ -44144,6 +44144,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
}], }],
cls: "bi-down-list-spliter-container cursor-pointer", cls: "bi-down-list-spliter-container cursor-pointer",
vgap: 5,
lgap: 10, lgap: 10,
rgap: 0 rgap: 0
}); });
@ -55670,6 +55671,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
self._setComboValueChangedEvent(self.smallCombo); self._setComboValueChangedEvent(self.smallCombo);
self._setEditorValueChangedEvent(self.bigEditor); self._setEditorValueChangedEvent(self.bigEditor);
self._setEditorValueChangedEvent(self.smallEditor); self._setEditorValueChangedEvent(self.smallEditor);
self._checkValidation();
}, },
_checkValidation: function () { _checkValidation: function () {
@ -55947,6 +55950,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
} }
self.bigCombo.setValue(combo_value); self.bigCombo.setValue(combo_value);
} }
this._checkValidation();
}, },

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

5
dist/widget.js vendored

@ -2325,6 +2325,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
}], }],
cls: "bi-down-list-spliter-container cursor-pointer", cls: "bi-down-list-spliter-container cursor-pointer",
vgap: 5,
lgap: 10, lgap: 10,
rgap: 0 rgap: 0
}); });
@ -13851,6 +13852,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
self._setComboValueChangedEvent(self.smallCombo); self._setComboValueChangedEvent(self.smallCombo);
self._setEditorValueChangedEvent(self.bigEditor); self._setEditorValueChangedEvent(self.bigEditor);
self._setEditorValueChangedEvent(self.smallEditor); self._setEditorValueChangedEvent(self.smallEditor);
self._checkValidation();
}, },
_checkValidation: function () { _checkValidation: function () {
@ -14128,6 +14131,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
} }
self.bigCombo.setValue(combo_value); self.bigCombo.setValue(combo_value);
} }
this._checkValidation();
}, },

1
src/widget/downlist/popup.downlist.js

@ -161,6 +161,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
}], }],
cls: "bi-down-list-spliter-container cursor-pointer", cls: "bi-down-list-spliter-container cursor-pointer",
vgap: 5,
lgap: 10, lgap: 10,
rgap: 0 rgap: 0
}); });

Loading…
Cancel
Save