fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

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

* commit 'ad31e7ca18a3d0fdcf97183e3c4e429b0e4124ef':
  BI-41630 fix: 视觉统一
es6
windy 6 years ago
parent
cbd591ebd3 ad31e7ca18
commit
d925432af8
21 changed files with 122 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 44
      demo/js/widget/downlist/demo.downlist.js
  2. 4
      dist/2.0/fineui.ie.js
  3. 4
      dist/2.0/fineui.ie.min.js
  4. 4
      dist/2.0/fineui.js
  5. 2
      dist/2.0/fineui.min.css
  6. 4
      dist/2.0/fineui.min.js
  7. 4
      dist/bundle.ie.js
  8. 4
      dist/bundle.ie.min.js
  9. 4
      dist/bundle.js
  10. 2
      dist/bundle.min.css
  11. 4
      dist/bundle.min.js
  12. 44
      dist/demo.js
  13. 4
      dist/fineui.ie.js
  14. 4
      dist/fineui.ie.min.js
  15. 4
      dist/fineui.js
  16. 2
      dist/fineui.min.css
  17. 4
      dist/fineui.min.js
  18. 4
      dist/fineui_without_jquery_polyfill.js
  19. 2
      dist/utils.min.js
  20. 4
      dist/widget.js
  21. 4
      src/widget/multilayerdownlist/popup.downlist.js

44
demo/js/widget/downlist/demo.downlist.js
Unescape View File

@ -132,6 +132,50 @@ Demo.Downlist = BI.inherit(BI.Widget, {
}] }]
] ]
}, {
type: "bi.multi_layer_down_list_combo",
ref: function (_ref) {
self.downlist = _ref;
},
// value: [{"childValue":22,"value":11},{"value":18},{"value":20}],
height: 30,
width: 100,
items: [
[{
el: {
text: "column 1111",
iconCls1: "dot-e-font",
value: 12
},
children: [{
text: "column 1.1",
value: 21,
cls: "dot-e-font"
}, {
text: "column 1.2",
value: 22,
cls: "dot-e-font"
}]
}],
[{
el: {
text: "column 1111",
iconCls1: "dot-e-font",
value: 11
},
children: [{
text: "column 1.1",
value: 21,
cls: "dot-e-font"
}, {
text: "column 1.2",
value: 22,
cls: "dot-e-font"
}]
}]
]
}, { }, {
type: "bi.label", type: "bi.label",
text: "显示选择值", text: "显示选择值",

4
dist/2.0/fineui.ie.js vendored
Unescape View File

@ -65733,8 +65733,8 @@ BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, {
}], }],
cls: "bi-down-list-spliter-container cursor-pointer", cls: "bi-down-list-spliter-container cursor-pointer",
lgap: 10, vgap: 5,
rgap: 0 lgap: 10
}); });
result.push(spliter_container); result.push(spliter_container);
} }

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

File diff suppressed because one or more lines are too long

4
dist/2.0/fineui.js vendored
Unescape View File

@ -66137,8 +66137,8 @@ BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, {
}], }],
cls: "bi-down-list-spliter-container cursor-pointer", cls: "bi-down-list-spliter-container cursor-pointer",
lgap: 10, vgap: 5,
rgap: 0 lgap: 10
}); });
result.push(spliter_container); result.push(spliter_container);
} }

2
dist/2.0/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
dist/2.0/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -65733,8 +65733,8 @@ BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, {
}], }],
cls: "bi-down-list-spliter-container cursor-pointer", cls: "bi-down-list-spliter-container cursor-pointer",
lgap: 10, vgap: 5,
rgap: 0 lgap: 10
}); });
result.push(spliter_container); result.push(spliter_container);
} }

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

File diff suppressed because one or more lines are too long

4
dist/bundle.js vendored
Unescape View File

@ -66137,8 +66137,8 @@ BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, {
}], }],
cls: "bi-down-list-spliter-container cursor-pointer", cls: "bi-down-list-spliter-container cursor-pointer",
lgap: 10, vgap: 5,
rgap: 0 lgap: 10
}); });
result.push(spliter_container); result.push(spliter_container);
} }

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

44
dist/demo.js vendored
Unescape View File

@ -8987,6 +8987,50 @@ BI.shortcut("demo.date_time", Demo.CustomDateTime);Demo.Downlist = BI.inherit(BI
}] }]
] ]
}, {
type: "bi.multi_layer_down_list_combo",
ref: function (_ref) {
self.downlist = _ref;
},
// value: [{"childValue":22,"value":11},{"value":18},{"value":20}],
height: 30,
width: 100,
items: [
[{
el: {
text: "column 1111",
iconCls1: "dot-e-font",
value: 12
},
children: [{
text: "column 1.1",
value: 21,
cls: "dot-e-font"
}, {
text: "column 1.2",
value: 22,
cls: "dot-e-font"
}]
}],
[{
el: {
text: "column 1111",
iconCls1: "dot-e-font",
value: 11
},
children: [{
text: "column 1.1",
value: 21,
cls: "dot-e-font"
}, {
text: "column 1.2",
value: 22,
cls: "dot-e-font"
}]
}]
]
}, { }, {
type: "bi.label", type: "bi.label",
text: "显示选择值", text: "显示选择值",

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

@ -65978,8 +65978,8 @@ BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, {
}], }],
cls: "bi-down-list-spliter-container cursor-pointer", cls: "bi-down-list-spliter-container cursor-pointer",
lgap: 10, vgap: 5,
rgap: 0 lgap: 10
}); });
result.push(spliter_container); result.push(spliter_container);
} }

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

File diff suppressed because one or more lines are too long

4
dist/fineui.js vendored
Unescape View File

@ -66382,8 +66382,8 @@ BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, {
}], }],
cls: "bi-down-list-spliter-container cursor-pointer", cls: "bi-down-list-spliter-container cursor-pointer",
lgap: 10, vgap: 5,
rgap: 0 lgap: 10
}); });
result.push(spliter_container); result.push(spliter_container);
} }

2
dist/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -49217,8 +49217,8 @@ BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, {
}], }],
cls: "bi-down-list-spliter-container cursor-pointer", cls: "bi-down-list-spliter-container cursor-pointer",
lgap: 10, vgap: 5,
rgap: 0 lgap: 10
}); });
result.push(spliter_container); result.push(spliter_container);
} }

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/widget.js vendored
Unescape View File

@ -6291,8 +6291,8 @@ BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, {
}], }],
cls: "bi-down-list-spliter-container cursor-pointer", cls: "bi-down-list-spliter-container cursor-pointer",
lgap: 10, vgap: 5,
rgap: 0 lgap: 10
}); });
result.push(spliter_container); result.push(spliter_container);
} }

4
src/widget/multilayerdownlist/popup.downlist.js
Unescape View File

@ -168,8 +168,8 @@ BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, {
}], }],
cls: "bi-down-list-spliter-container cursor-pointer", cls: "bi-down-list-spliter-container cursor-pointer",
lgap: 10, vgap: 5,
rgap: 0 lgap: 10
}); });
result.push(spliter_container); result.push(spliter_container);
} }

Write Preview
Loading…
Cancel
Save