caoww
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

* commit '576153200a763b5b9e0f74797e4f3e1ddd0dc506':
  BI-33362 视觉改间距了
es6
windy 6 years ago
parent
27303c90e5 576153200a
commit
890b7e66c4
14 changed files with 98 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      dist/bundle.ie.js
  2. 6
      dist/bundle.ie.min.js
  3. 17
      dist/bundle.js
  4. 6
      dist/bundle.min.js
  5. 12
      dist/core.js
  6. 25
      dist/demo.js
  7. 17
      dist/fineui.ie.js
  8. 6
      dist/fineui.ie.min.js
  9. 17
      dist/fineui.js
  10. 4
      dist/fineui.min.js
  11. 7
      dist/fineui_without_jquery_polyfill.js
  12. 2
      dist/utils.min.js
  13. 5
      dist/widget.js
  14. 1
      src/widget/downlist/popup.downlist.js

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

@ -14843,7 +14843,7 @@ BI.Layout = BI.inherit(BI.Widget, {
return eq(item1, item2);
// 不比较函数
function eq(a, b, aStack, bStack) {
function eq (a, b, aStack, bStack) {
if (a === b) {
return a !== 0 || 1 / a === 1 / b;
}
@ -15163,7 +15163,7 @@ BI.Layout = BI.inherit(BI.Widget, {
self._children[self._getChildName(i)] = children[key];
});
function sameVnode(vnode1, vnode2, oldIndex, newIndex) {
function sameVnode (vnode1, vnode2, oldIndex, newIndex) {
vnode1 = self._getOptions(vnode1);
vnode2 = self._getOptions(vnode2);
if (BI.isKey(vnode1.key)) {
@ -15174,20 +15174,20 @@ BI.Layout = BI.inherit(BI.Widget, {
}
}
function addNode(vnode, index) {
function addNode (vnode, index) {
var opt = self._getOptions(vnode);
var key = opt.key == null ? self._getChildName(index) : opt.key;
return children[key] = self._addElement(key, vnode);
}
function addVnodes(before, vnodes, startIdx, endIdx) {
function addVnodes (before, vnodes, startIdx, endIdx) {
for (; startIdx <= endIdx; ++startIdx) {
var node = addNode(vnodes[startIdx], startIdx);
insertBefore(node, before, false, startIdx);
}
}
function removeVnodes(vnodes, startIdx, endIdx) {
function removeVnodes (vnodes, startIdx, endIdx) {
for (; startIdx <= endIdx; ++startIdx) {
var node = self._getOptions(vnodes[startIdx]);
var key = node.key == null ? self._getChildName(startIdx) : node.key;
@ -15195,7 +15195,7 @@ BI.Layout = BI.inherit(BI.Widget, {
}
}
function insertBefore(insert, before, isNext, index) {
function insertBefore (insert, before, isNext, index) {
insert = self._getOptions(insert);
before = before && self._getOptions(before);
var insertKey = BI.isKey(insert.key) ? insert.key : self._getChildName(index);
@ -60481,6 +60481,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
}],
cls: "bi-down-list-spliter-container cursor-pointer",
vgap: 5,
lgap: 10,
rgap: 0
});
@ -72007,6 +72008,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
self._setComboValueChangedEvent(self.smallCombo);
self._setEditorValueChangedEvent(self.bigEditor);
self._setEditorValueChangedEvent(self.smallEditor);
self._checkValidation();
},
_checkValidation: function () {
@ -72284,6 +72287,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
}
self.bigCombo.setValue(combo_value);
}
this._checkValidation();
},

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

File diff suppressed because one or more lines are too long

17
dist/bundle.js vendored
Unescape View File

@ -14843,7 +14843,7 @@ BI.Layout = BI.inherit(BI.Widget, {
return eq(item1, item2);
// 不比较函数
function eq(a, b, aStack, bStack) {
function eq (a, b, aStack, bStack) {
if (a === b) {
return a !== 0 || 1 / a === 1 / b;
}
@ -15163,7 +15163,7 @@ BI.Layout = BI.inherit(BI.Widget, {
self._children[self._getChildName(i)] = children[key];
});
function sameVnode(vnode1, vnode2, oldIndex, newIndex) {
function sameVnode (vnode1, vnode2, oldIndex, newIndex) {
vnode1 = self._getOptions(vnode1);
vnode2 = self._getOptions(vnode2);
if (BI.isKey(vnode1.key)) {
@ -15174,20 +15174,20 @@ BI.Layout = BI.inherit(BI.Widget, {
}
}
function addNode(vnode, index) {
function addNode (vnode, index) {
var opt = self._getOptions(vnode);
var key = opt.key == null ? self._getChildName(index) : opt.key;
return children[key] = self._addElement(key, vnode);
}
function addVnodes(before, vnodes, startIdx, endIdx) {
function addVnodes (before, vnodes, startIdx, endIdx) {
for (; startIdx <= endIdx; ++startIdx) {
var node = addNode(vnodes[startIdx], startIdx);
insertBefore(node, before, false, startIdx);
}
}
function removeVnodes(vnodes, startIdx, endIdx) {
function removeVnodes (vnodes, startIdx, endIdx) {
for (; startIdx <= endIdx; ++startIdx) {
var node = self._getOptions(vnodes[startIdx]);
var key = node.key == null ? self._getChildName(startIdx) : node.key;
@ -15195,7 +15195,7 @@ BI.Layout = BI.inherit(BI.Widget, {
}
}
function insertBefore(insert, before, isNext, index) {
function insertBefore (insert, before, isNext, index) {
insert = self._getOptions(insert);
before = before && self._getOptions(before);
var insertKey = BI.isKey(insert.key) ? insert.key : self._getChildName(index);
@ -61020,6 +61020,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
}],
cls: "bi-down-list-spliter-container cursor-pointer",
vgap: 5,
lgap: 10,
rgap: 0
});
@ -72546,6 +72547,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
self._setComboValueChangedEvent(self.smallCombo);
self._setEditorValueChangedEvent(self.bigEditor);
self._setEditorValueChangedEvent(self.smallEditor);
self._checkValidation();
},
_checkValidation: function () {
@ -72823,6 +72826,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
}
self.bigCombo.setValue(combo_value);
}
this._checkValidation();
},

6
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

12
dist/core.js vendored
Unescape View File

@ -14843,7 +14843,7 @@ BI.Layout = BI.inherit(BI.Widget, {
return eq(item1, item2);
// 不比较函数
function eq(a, b, aStack, bStack) {
function eq (a, b, aStack, bStack) {
if (a === b) {
return a !== 0 || 1 / a === 1 / b;
}
@ -15163,7 +15163,7 @@ BI.Layout = BI.inherit(BI.Widget, {
self._children[self._getChildName(i)] = children[key];
});
function sameVnode(vnode1, vnode2, oldIndex, newIndex) {
function sameVnode (vnode1, vnode2, oldIndex, newIndex) {
vnode1 = self._getOptions(vnode1);
vnode2 = self._getOptions(vnode2);
if (BI.isKey(vnode1.key)) {
@ -15174,20 +15174,20 @@ BI.Layout = BI.inherit(BI.Widget, {
}
}
function addNode(vnode, index) {
function addNode (vnode, index) {
var opt = self._getOptions(vnode);
var key = opt.key == null ? self._getChildName(index) : opt.key;
return children[key] = self._addElement(key, vnode);
}
function addVnodes(before, vnodes, startIdx, endIdx) {
function addVnodes (before, vnodes, startIdx, endIdx) {
for (; startIdx <= endIdx; ++startIdx) {
var node = addNode(vnodes[startIdx], startIdx);
insertBefore(node, before, false, startIdx);
}
}
function removeVnodes(vnodes, startIdx, endIdx) {
function removeVnodes (vnodes, startIdx, endIdx) {
for (; startIdx <= endIdx; ++startIdx) {
var node = self._getOptions(vnodes[startIdx]);
var key = node.key == null ? self._getChildName(startIdx) : node.key;
@ -15195,7 +15195,7 @@ BI.Layout = BI.inherit(BI.Widget, {
}
}
function insertBefore(insert, before, isNext, index) {
function insertBefore (insert, before, isNext, index) {
insert = self._getOptions(insert);
before = before && self._getOptions(before);
var insertKey = BI.isKey(insert.key) ? insert.key : self._getChildName(index);

25
dist/demo.js vendored
Unescape View File

@ -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.
*/
Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, {

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

@ -15085,7 +15085,7 @@ BI.Layout = BI.inherit(BI.Widget, {
return eq(item1, item2);
// 不比较函数
function eq(a, b, aStack, bStack) {
function eq (a, b, aStack, bStack) {
if (a === b) {
return a !== 0 || 1 / a === 1 / b;
}
@ -15405,7 +15405,7 @@ BI.Layout = BI.inherit(BI.Widget, {
self._children[self._getChildName(i)] = children[key];
});
function sameVnode(vnode1, vnode2, oldIndex, newIndex) {
function sameVnode (vnode1, vnode2, oldIndex, newIndex) {
vnode1 = self._getOptions(vnode1);
vnode2 = self._getOptions(vnode2);
if (BI.isKey(vnode1.key)) {
@ -15416,20 +15416,20 @@ BI.Layout = BI.inherit(BI.Widget, {
}
}
function addNode(vnode, index) {
function addNode (vnode, index) {
var opt = self._getOptions(vnode);
var key = opt.key == null ? self._getChildName(index) : opt.key;
return children[key] = self._addElement(key, vnode);
}
function addVnodes(before, vnodes, startIdx, endIdx) {
function addVnodes (before, vnodes, startIdx, endIdx) {
for (; startIdx <= endIdx; ++startIdx) {
var node = addNode(vnodes[startIdx], startIdx);
insertBefore(node, before, false, startIdx);
}
}
function removeVnodes(vnodes, startIdx, endIdx) {
function removeVnodes (vnodes, startIdx, endIdx) {
for (; startIdx <= endIdx; ++startIdx) {
var node = self._getOptions(vnodes[startIdx]);
var key = node.key == null ? self._getChildName(startIdx) : node.key;
@ -15437,7 +15437,7 @@ BI.Layout = BI.inherit(BI.Widget, {
}
}
function insertBefore(insert, before, isNext, index) {
function insertBefore (insert, before, isNext, index) {
insert = self._getOptions(insert);
before = before && self._getOptions(before);
var insertKey = BI.isKey(insert.key) ? insert.key : self._getChildName(index);
@ -60723,6 +60723,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
}],
cls: "bi-down-list-spliter-container cursor-pointer",
vgap: 5,
lgap: 10,
rgap: 0
});
@ -72249,6 +72250,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
self._setComboValueChangedEvent(self.smallCombo);
self._setEditorValueChangedEvent(self.bigEditor);
self._setEditorValueChangedEvent(self.smallEditor);
self._checkValidation();
},
_checkValidation: function () {
@ -72526,6 +72529,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
}
self.bigCombo.setValue(combo_value);
}
this._checkValidation();
},

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

File diff suppressed because one or more lines are too long

17
dist/fineui.js vendored
Unescape View File

@ -15085,7 +15085,7 @@ BI.Layout = BI.inherit(BI.Widget, {
return eq(item1, item2);
// 不比较函数
function eq(a, b, aStack, bStack) {
function eq (a, b, aStack, bStack) {
if (a === b) {
return a !== 0 || 1 / a === 1 / b;
}
@ -15405,7 +15405,7 @@ BI.Layout = BI.inherit(BI.Widget, {
self._children[self._getChildName(i)] = children[key];
});
function sameVnode(vnode1, vnode2, oldIndex, newIndex) {
function sameVnode (vnode1, vnode2, oldIndex, newIndex) {
vnode1 = self._getOptions(vnode1);
vnode2 = self._getOptions(vnode2);
if (BI.isKey(vnode1.key)) {
@ -15416,20 +15416,20 @@ BI.Layout = BI.inherit(BI.Widget, {
}
}
function addNode(vnode, index) {
function addNode (vnode, index) {
var opt = self._getOptions(vnode);
var key = opt.key == null ? self._getChildName(index) : opt.key;
return children[key] = self._addElement(key, vnode);
}
function addVnodes(before, vnodes, startIdx, endIdx) {
function addVnodes (before, vnodes, startIdx, endIdx) {
for (; startIdx <= endIdx; ++startIdx) {
var node = addNode(vnodes[startIdx], startIdx);
insertBefore(node, before, false, startIdx);
}
}
function removeVnodes(vnodes, startIdx, endIdx) {
function removeVnodes (vnodes, startIdx, endIdx) {
for (; startIdx <= endIdx; ++startIdx) {
var node = self._getOptions(vnodes[startIdx]);
var key = node.key == null ? self._getChildName(startIdx) : node.key;
@ -15437,7 +15437,7 @@ BI.Layout = BI.inherit(BI.Widget, {
}
}
function insertBefore(insert, before, isNext, index) {
function insertBefore (insert, before, isNext, index) {
insert = self._getOptions(insert);
before = before && self._getOptions(before);
var insertKey = BI.isKey(insert.key) ? insert.key : self._getChildName(index);
@ -61262,6 +61262,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
}],
cls: "bi-down-list-spliter-container cursor-pointer",
vgap: 5,
lgap: 10,
rgap: 0
});
@ -72788,6 +72789,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
self._setComboValueChangedEvent(self.smallCombo);
self._setEditorValueChangedEvent(self.bigEditor);
self._setEditorValueChangedEvent(self.smallEditor);
self._checkValidation();
},
_checkValidation: function () {
@ -73065,6 +73068,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
}
self.bigCombo.setValue(combo_value);
}
this._checkValidation();
},

4
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

7
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

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

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

5
dist/widget.js vendored
Unescape View File

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

1
src/widget/downlist/popup.downlist.js
Unescape View File

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

Write Preview
Loading…
Cancel
Save