Browse Source

解决冲突

es6
woodyjang 7 years ago
parent
commit
b49c9fca9b
  1. 2
      dist/bundle.min.css
  2. 4
      dist/bundle.min.js
  3. 30
      dist/demo.js
  4. 929
      docs/base/bubble.html
  5. 1111
      docs/base/button/button.html
  6. 921
      docs/base/button/icon_button.html
  7. 968
      docs/base/button/image_button.html
  8. 1025
      docs/base/button/text_button.html
  9. 930
      docs/base/canvas.html
  10. 982
      docs/base/editor/code_editor.html
  11. 1165
      docs/base/editor/editor.html
  12. 1009
      docs/base/editor/formula_editor.html
  13. 972
      docs/base/editor/multifile_editor.html
  14. 938
      docs/base/editor/textarea_editor.html
  15. 1081
      docs/base/label.html
  16. 913
      docs/base/message.html
  17. 1079
      docs/base/pager.html
  18. 985
      docs/base/svg.html
  19. 1058
      docs/base/table/collection_table.html
  20. 1029
      docs/base/table/grid_table.html
  21. 1077
      docs/base/table/resizable_table.html
  22. 1098
      docs/base/table/table_view.html
  23. 935
      docs/base/toast.html
  24. 942
      docs/case/button/multi_select_item.html
  25. 949
      docs/case/button/single_select_item.html
  26. 949
      docs/case/button/single_select_radio_item.html
  27. 956
      docs/case/calendar.html
  28. 904
      docs/case/clipboard.html
  29. 904
      docs/case/color_chooser.html
  30. 1092
      docs/case/combo/bubble_combo.html
  31. 0
      docs/case/combo/formula_combo.md
  32. 1029
      docs/case/combo/icon_combo.html
  33. 963
      docs/case/combo/static_combo.html
  34. 951
      docs/case/combo/text_value_downlist_combo.html
  35. 902
      docs/case/complex_canvas.html
  36. 1171
      docs/case/editor/shelter_editor.html
  37. 1152
      docs/case/editor/sign_editor.html
  38. 1165
      docs/case/editor/sign_initial_editor.html
  39. 1141
      docs/case/editor/state_editor.html
  40. 1022
      docs/case/layer/layer_panel.html
  41. 896
      docs/case/layer/multi_popup_layer.html
  42. 1076
      docs/case/layer/pane_list.html
  43. 942
      docs/case/layer/panel.html
  44. 1031
      docs/case/list/list.select.html
  45. 959
      docs/case/loader/lazy_loader.html
  46. 1016
      docs/case/loader/list_loader.html
  47. 1016
      docs/case/loader/sort_list.html
  48. 970
      docs/case/pager/all_count_pager.html
  49. 1030
      docs/case/pager/direction_pager.html
  50. 971
      docs/case/segment.html
  51. 1082
      docs/case/table/adaptive_table.html
  52. 1105
      docs/case/table/layer_tree_table.html
  53. 1105
      docs/case/table/tree_table.html
  54. 932
      docs/case/tree/branch_relation.html
  55. 937
      docs/case/tree/branch_tree.html
  56. 903
      docs/case/tree/display_tree.html
  57. 940
      docs/case/tree/handstand_branch_tree.html
  58. 952
      docs/case/tree/level_tree.html
  59. 933
      docs/case/tree/simple_tree.html
  60. 951
      docs/case/trigger/editor_trigger.html
  61. 873
      docs/case/trigger/icon_trigger.html
  62. 895
      docs/case/trigger/text_trigger.html
  63. 1040
      docs/core/abstract/button_group.html
  64. 956
      docs/core/abstract/button_tree.html
  65. 1048
      docs/core/abstract/collection_view.html
  66. 1022
      docs/core/abstract/custom_tree.html
  67. 1079
      docs/core/abstract/grid_view.html
  68. 953
      docs/core/abstract/virtual_group.html
  69. 960
      docs/core/abstract/virtual_list.html
  70. 1055
      docs/core/basic_button.html
  71. 1150
      docs/core/combination/bi.combo.html
  72. 1061
      docs/core/combination/bi.expander.html
  73. 969
      docs/core/combination/group_combo.html
  74. 1053
      docs/core/combination/loader.html
  75. 1036
      docs/core/combination/navigation.html
  76. 1174
      docs/core/combination/searcher.html
  77. 1101
      docs/core/combination/switcher.html
  78. 1031
      docs/core/combination/tab.html
  79. 980
      docs/core/layer/layer_float_box.html
  80. 1074
      docs/core/layer/layer_popup.html
  81. 963
      docs/core/layer/layer_searcher.html
  82. 926
      docs/core/layout/border.html
  83. 942
      docs/core/layout/center.html
  84. 986
      docs/core/layout/center_adapt.html
  85. 937
      docs/core/layout/float_center.html
  86. 977
      docs/core/layout/flow.html
  87. 947
      docs/core/layout/grid.html
  88. 983
      docs/core/layout/horizontal.html
  89. 959
      docs/core/layout/horizontal_adapt.html
  90. 940
      docs/core/layout/horizontal_auto.html
  91. 929
      docs/core/layout/horizontal_float.html
  92. 964
      docs/core/layout/htape.html
  93. 0
      docs/core/layout/inline.md
  94. 952
      docs/core/layout/left_right_vertical_adapt.html
  95. 947
      docs/core/layout/table.html
  96. 934
      docs/core/layout/td.html
  97. 951
      docs/core/layout/vertical.html
  98. 946
      docs/core/layout/vertical_adapt.html
  99. 964
      docs/core/layout/vtape.html
  100. 928
      docs/core/node_button.html
  101. Some files were not shown because too many files have changed in this diff Show More

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

4
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

30
dist/demo.js vendored

@ -29,7 +29,8 @@ BI.i18n = {
"BI-Basic_Value": "值",
"BI-Load_More": "加载更多",
"BI-Select_All": "全选",
"BI-No_More_Data": "无更多数据"
"BI-No_More_Data": "无更多数据",
"BI-No_Selected_Value": "没有可选项"
};$(function () {
var ref;
BI.createWidget({
@ -7657,21 +7658,26 @@ Demo.FileManager = BI.inherit(BI.Widget, {
lastModify: 1454316355142
}];
var filemanager = BI.createWidget({
type: "bi.file_manager",
items: items
type: "bi.fine_tuning_number_editor",
validationChecker: function (v) {
return BI.parseFloat(v) <= 100 && BI.parseFloat(v) >= 0
},
height: 24,
width: 150,
errorText: "hahah"
});
filemanager.on(BI.FineTuningNumberEditor.EVENT_CHANGE, function () {
if(BI.parseFloat(this.getValue()) < 1){
filemanager.setBottomEnable(false);
}else{
filemanager.setBottomEnable(true);
}
});
return {
type: "bi.vtape",
type: "bi.vertical",
items: [{
el: filemanager,
height: "fill"
}, {
type: "bi.button",
text: "getValue",
handler: function () {
BI.Msg.alert("", JSON.stringify(filemanager.getValue()));
},
height: 25
height: 24
}]
}
}

929
docs/base/bubble.html

File diff suppressed because it is too large Load Diff

1111
docs/base/button/button.html

File diff suppressed because it is too large Load Diff

921
docs/base/button/icon_button.html

File diff suppressed because it is too large Load Diff

968
docs/base/button/image_button.html

File diff suppressed because it is too large Load Diff

1025
docs/base/button/text_button.html

File diff suppressed because it is too large Load Diff

930
docs/base/canvas.html

File diff suppressed because it is too large Load Diff

982
docs/base/editor/code_editor.html

File diff suppressed because it is too large Load Diff

1165
docs/base/editor/editor.html

File diff suppressed because it is too large Load Diff

1009
docs/base/editor/formula_editor.html

File diff suppressed because it is too large Load Diff

972
docs/base/editor/multifile_editor.html

File diff suppressed because it is too large Load Diff

938
docs/base/editor/textarea_editor.html

File diff suppressed because it is too large Load Diff

1081
docs/base/label.html

File diff suppressed because it is too large Load Diff

913
docs/base/message.html

File diff suppressed because it is too large Load Diff

1079
docs/base/pager.html

File diff suppressed because it is too large Load Diff

985
docs/base/svg.html

File diff suppressed because it is too large Load Diff

1058
docs/base/table/collection_table.html

File diff suppressed because it is too large Load Diff

1029
docs/base/table/grid_table.html

File diff suppressed because it is too large Load Diff

1077
docs/base/table/resizable_table.html

File diff suppressed because it is too large Load Diff

1098
docs/base/table/table_view.html

File diff suppressed because it is too large Load Diff

935
docs/base/toast.html

File diff suppressed because it is too large Load Diff

942
docs/case/button/multi_select_item.html

File diff suppressed because it is too large Load Diff

949
docs/case/button/single_select_item.html

File diff suppressed because it is too large Load Diff

949
docs/case/button/single_select_radio_item.html

File diff suppressed because it is too large Load Diff

956
docs/case/calendar.html

File diff suppressed because it is too large Load Diff

904
docs/case/shelter_editor.html → docs/case/clipboard.html

File diff suppressed because it is too large Load Diff

904
docs/case/color_chooser.html

File diff suppressed because it is too large Load Diff

1092
docs/case/combo/bubble_combo.html

File diff suppressed because it is too large Load Diff

0
uidoc/case/combo/formula_combo.md → docs/case/combo/formula_combo.md

1029
docs/case/combo/icon_combo.html

File diff suppressed because it is too large Load Diff

963
docs/case/combo/static_combo.html

File diff suppressed because it is too large Load Diff

951
docs/case/combo/text_value_downlist_combo.html

File diff suppressed because it is too large Load Diff

902
docs/case/complex_canvas.html

File diff suppressed because it is too large Load Diff

1171
docs/case/editor/shelter_editor.html

File diff suppressed because it is too large Load Diff

1152
docs/case/editor/sign_editor.html

File diff suppressed because it is too large Load Diff

1165
docs/case/editor/sign_initial_editor.html

File diff suppressed because it is too large Load Diff

1141
docs/case/editor/state_editor.html

File diff suppressed because it is too large Load Diff

1022
docs/case/layer/layer_panel.html

File diff suppressed because it is too large Load Diff

896
docs/case/layer/multi_popup_layer.html

File diff suppressed because it is too large Load Diff

1076
docs/case/layer/pane_list.html

File diff suppressed because it is too large Load Diff

942
docs/case/layer/panel.html

File diff suppressed because it is too large Load Diff

1031
docs/case/list/list.select.html

File diff suppressed because it is too large Load Diff

959
docs/case/loader/lazy_loader.html

File diff suppressed because it is too large Load Diff

1016
docs/case/loader/list_loader.html

File diff suppressed because it is too large Load Diff

1016
docs/case/loader/sort_list.html

File diff suppressed because it is too large Load Diff

970
docs/case/pager/all_count_pager.html

File diff suppressed because it is too large Load Diff

1030
docs/case/pager/direction_pager.html

File diff suppressed because it is too large Load Diff

971
docs/case/segment.html

File diff suppressed because it is too large Load Diff

1082
docs/case/table/adaptive_table.html

File diff suppressed because it is too large Load Diff

1105
docs/case/table/layer_tree_table.html

File diff suppressed because it is too large Load Diff

1105
docs/case/table/tree_table.html

File diff suppressed because it is too large Load Diff

932
docs/case/tree/branch_relation.html

File diff suppressed because it is too large Load Diff

937
docs/case/tree/branch_tree.html

File diff suppressed because it is too large Load Diff

903
docs/case/tree/display_tree.html

File diff suppressed because it is too large Load Diff

940
docs/case/tree/handstand_branch_editor.html → docs/case/tree/handstand_branch_tree.html

File diff suppressed because it is too large Load Diff

952
docs/case/tree/level_tree.html

File diff suppressed because it is too large Load Diff

933
docs/case/tree/simple_tree.html

File diff suppressed because it is too large Load Diff

951
docs/case/trigger/editor_trigger.html

File diff suppressed because it is too large Load Diff

873
docs/case/trigger/icon_trigger.html

File diff suppressed because it is too large Load Diff

895
docs/case/trigger/text_trigger.html

File diff suppressed because it is too large Load Diff

1040
docs/core/abstract/button_group.html

File diff suppressed because it is too large Load Diff

956
docs/core/abstract/button_tree.html

File diff suppressed because it is too large Load Diff

1048
docs/core/abstract/collection_view.html

File diff suppressed because it is too large Load Diff

1022
docs/core/abstract/custom_tree.html

File diff suppressed because it is too large Load Diff

1079
docs/core/abstract/grid_view.html

File diff suppressed because it is too large Load Diff

953
docs/core/abstract/virtual_group.html

File diff suppressed because it is too large Load Diff

960
docs/core/abstract/virtual_list.html

File diff suppressed because it is too large Load Diff

1055
docs/core/basic_button.html

File diff suppressed because it is too large Load Diff

1150
docs/core/combination/bi.combo.html

File diff suppressed because it is too large Load Diff

1061
docs/core/combination/bi.expander.html

File diff suppressed because it is too large Load Diff

969
docs/core/combination/group_combo.html

File diff suppressed because it is too large Load Diff

1053
docs/core/combination/loader.html

File diff suppressed because it is too large Load Diff

1036
docs/core/combination/navigation.html

File diff suppressed because it is too large Load Diff

1174
docs/core/combination/searcher.html

File diff suppressed because it is too large Load Diff

1101
docs/core/combination/switcher.html

File diff suppressed because it is too large Load Diff

1031
docs/core/combination/tab.html

File diff suppressed because it is too large Load Diff

980
docs/core/layer/layer_float_box.html

File diff suppressed because it is too large Load Diff

1074
docs/core/layer/layer_popup.html

File diff suppressed because it is too large Load Diff

963
docs/core/layer/layer_searcher.html

File diff suppressed because it is too large Load Diff

926
docs/core/layout/border.html

File diff suppressed because it is too large Load Diff

942
docs/core/layout/center.html

File diff suppressed because it is too large Load Diff

986
docs/core/layout/center_adapt.html

File diff suppressed because it is too large Load Diff

937
docs/core/layout/float_center.html

File diff suppressed because it is too large Load Diff

977
docs/core/layout/flow.html

File diff suppressed because it is too large Load Diff

947
docs/core/layout/grid.html

File diff suppressed because it is too large Load Diff

983
docs/core/layout/horizontal.html

File diff suppressed because it is too large Load Diff

959
docs/core/layout/horizontal_adapt.html

File diff suppressed because it is too large Load Diff

940
docs/core/layout/horizontal_auto.html

File diff suppressed because it is too large Load Diff

929
docs/core/layout/horizontal_float.html

File diff suppressed because it is too large Load Diff

964
docs/core/layout/htape.html

File diff suppressed because it is too large Load Diff

0
uidoc/core/layout/inline.md → docs/core/layout/inline.md

952
docs/core/layout/left_right_vertical_adapt.html

File diff suppressed because it is too large Load Diff

947
docs/core/layout/table.html

File diff suppressed because it is too large Load Diff

934
docs/core/layout/td.html

File diff suppressed because it is too large Load Diff

951
docs/core/layout/vertical.html

File diff suppressed because it is too large Load Diff

946
docs/core/layout/vertical_adapt.html

File diff suppressed because it is too large Load Diff

964
docs/core/layout/vtape.html

File diff suppressed because it is too large Load Diff

928
docs/core/node_button.html

File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save