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

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

* commit '5fa1057c8a028f576f8d2734b2b6713e129f9bf4':
  无JIRA任务 背景色重了
  update
  BI-35864 交互觉得还是换成原来的默认向下弹出比较好
es6
windy 6 years ago
parent
93a639eada 5fa1057c8a
commit
0c8b2f8e8c
16 changed files with 68 additions and 83 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. 3
      demo/js/widget/basewidget/demo.nodes.js
  2. 1
      dist/base.js
  3. 5
      dist/bundle.ie.js
  4. 48
      dist/bundle.ie.min.js
  5. 5
      dist/bundle.js
  6. 6
      dist/bundle.min.js
  7. 4
      dist/case.js
  8. 3
      dist/demo.js
  9. 5
      dist/fineui.ie.js
  10. 48
      dist/fineui.ie.min.js
  11. 5
      dist/fineui.js
  12. 6
      dist/fineui.min.js
  13. 5
      dist/fineui_without_jquery_polyfill.js
  14. 2
      dist/utils.min.js
  15. 1
      src/base/single/button/button.basic.js
  16. 4
      src/case/button/node/node.multilayer.icon.arrow.js

3
demo/js/widget/basewidget/demo.nodes.js
Unescape View File

@ -25,6 +25,9 @@ Demo.Nodes = BI.inherit(BI.Widget, {
type: "bi.icon_arrow_node", type: "bi.icon_arrow_node",
iconCls: "search-font", iconCls: "search-font",
text: "箭头图标节点" text: "箭头图标节点"
}, {
type: "bi.multilayer_icon_arrow_node",
layer: 2
}] }]
}; };
} }

1
dist/base.js vendored
Unescape View File

@ -897,7 +897,6 @@ BI.BasicButton = BI.inherit(BI.Single, {
el: { el: {
type: "bi.bubble_combo", type: "bi.bubble_combo",
trigger: "", trigger: "",
direction: "top,left",
ref: function () { ref: function () {
self.combo = this; self.combo = this;
}, },

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

@ -35983,7 +35983,6 @@ BI.BasicButton = BI.inherit(BI.Single, {
el: { el: {
type: "bi.bubble_combo", type: "bi.bubble_combo",
trigger: "", trigger: "",
direction: "top,left",
ref: function () { ref: function () {
self.combo = this; self.combo = this;
}, },
@ -50024,9 +50023,7 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro
this.node = BI.createWidget({ this.node = BI.createWidget({
type: "bi.icon_arrow_node", type: "bi.icon_arrow_node",
iconCls: o.iconCls, iconCls: o.iconCls,
// logic: { cls: "bi-list-item-none",
// dynamic: true
// },
id: o.id, id: o.id,
pId: o.pId, pId: o.pId,
open: o.open, open: o.open,

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

File diff suppressed because one or more lines are too long

5
dist/bundle.js vendored
Unescape View File

@ -36387,7 +36387,6 @@ BI.BasicButton = BI.inherit(BI.Single, {
el: { el: {
type: "bi.bubble_combo", type: "bi.bubble_combo",
trigger: "", trigger: "",
direction: "top,left",
ref: function () { ref: function () {
self.combo = this; self.combo = this;
}, },
@ -50428,9 +50427,7 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro
this.node = BI.createWidget({ this.node = BI.createWidget({
type: "bi.icon_arrow_node", type: "bi.icon_arrow_node",
iconCls: o.iconCls, iconCls: o.iconCls,
// logic: { cls: "bi-list-item-none",
// dynamic: true
// },
id: o.id, id: o.id,
pId: o.pId, pId: o.pId,
open: o.open, open: o.open,

6
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/case.js vendored
Unescape View File

@ -831,9 +831,7 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro
this.node = BI.createWidget({ this.node = BI.createWidget({
type: "bi.icon_arrow_node", type: "bi.icon_arrow_node",
iconCls: o.iconCls, iconCls: o.iconCls,
// logic: { cls: "bi-list-item-none",
// dynamic: true
// },
id: o.id, id: o.id,
pId: o.pId, pId: o.pId,
open: o.open, open: o.open,

3
dist/demo.js vendored
Unescape View File

@ -10010,6 +10010,9 @@ Demo.Nodes = BI.inherit(BI.Widget, {
type: "bi.icon_arrow_node", type: "bi.icon_arrow_node",
iconCls: "search-font", iconCls: "search-font",
text: "箭头图标节点" text: "箭头图标节点"
}, {
type: "bi.multilayer_icon_arrow_node",
layer: 2
}] }]
}; };
} }

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

@ -36225,7 +36225,6 @@ BI.BasicButton = BI.inherit(BI.Single, {
el: { el: {
type: "bi.bubble_combo", type: "bi.bubble_combo",
trigger: "", trigger: "",
direction: "top,left",
ref: function () { ref: function () {
self.combo = this; self.combo = this;
}, },
@ -50266,9 +50265,7 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro
this.node = BI.createWidget({ this.node = BI.createWidget({
type: "bi.icon_arrow_node", type: "bi.icon_arrow_node",
iconCls: o.iconCls, iconCls: o.iconCls,
// logic: { cls: "bi-list-item-none",
// dynamic: true
// },
id: o.id, id: o.id,
pId: o.pId, pId: o.pId,
open: o.open, open: o.open,

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

File diff suppressed because one or more lines are too long

5
dist/fineui.js vendored
Unescape View File

@ -36629,7 +36629,6 @@ BI.BasicButton = BI.inherit(BI.Single, {
el: { el: {
type: "bi.bubble_combo", type: "bi.bubble_combo",
trigger: "", trigger: "",
direction: "top,left",
ref: function () { ref: function () {
self.combo = this; self.combo = this;
}, },
@ -50670,9 +50669,7 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro
this.node = BI.createWidget({ this.node = BI.createWidget({
type: "bi.icon_arrow_node", type: "bi.icon_arrow_node",
iconCls: o.iconCls, iconCls: o.iconCls,
// logic: { cls: "bi-list-item-none",
// dynamic: true
// },
id: o.id, id: o.id,
pId: o.pId, pId: o.pId,
open: o.open, open: o.open,

6
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

5
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -25139,7 +25139,6 @@ BI.BasicButton = BI.inherit(BI.Single, {
el: { el: {
type: "bi.bubble_combo", type: "bi.bubble_combo",
trigger: "", trigger: "",
direction: "top,left",
ref: function () { ref: function () {
self.combo = this; self.combo = this;
}, },
@ -35317,9 +35316,7 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro
this.node = BI.createWidget({ this.node = BI.createWidget({
type: "bi.icon_arrow_node", type: "bi.icon_arrow_node",
iconCls: o.iconCls, iconCls: o.iconCls,
// logic: { cls: "bi-list-item-none",
// dynamic: true
// },
id: o.id, id: o.id,
pId: o.pId, pId: o.pId,
open: o.open, open: o.open,

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
src/base/single/button/button.basic.js
Unescape View File

@ -229,7 +229,6 @@ BI.BasicButton = BI.inherit(BI.Single, {
el: { el: {
type: "bi.bubble_combo", type: "bi.bubble_combo",
trigger: "", trigger: "",
direction: "top,left",
ref: function () { ref: function () {
self.combo = this; self.combo = this;
}, },

4
src/case/button/node/node.multilayer.icon.arrow.js
Unescape View File

@ -19,9 +19,7 @@ BI.MultiLayerIconArrowNode = BI.inherit(BI.NodeButton, {
this.node = BI.createWidget({ this.node = BI.createWidget({
type: "bi.icon_arrow_node", type: "bi.icon_arrow_node",
iconCls: o.iconCls, iconCls: o.iconCls,
// logic: { cls: "bi-list-item-none",
// dynamic: true
// },
id: o.id, id: o.id,
pId: o.pId, pId: o.pId,
open: o.open, open: o.open,

Write Preview
Loading…
Cancel
Save