diff --git a/dist/base.css b/dist/base.css index 790f04d64..c52d8d866 100644 --- a/dist/base.css +++ b/dist/base.css @@ -527,8 +527,7 @@ } /* GUTTER */ .CodeMirror-gutters { - border-right: 1px solid #ddd; - background-color: #f7f7f7; + background-color: #F2F4F7; white-space: nowrap; } .CodeMirror-linenumber { @@ -906,7 +905,7 @@ div.CodeMirror-cursors { background: #d9d9d9; } .CodeMirror-focused .CodeMirror-selected { - background: #d7d4f0; + background: #3685F2; } .CodeMirror-crosshair { cursor: crosshair; diff --git a/dist/bundle.css b/dist/bundle.css index 52513a665..75b6b3f6e 100644 --- a/dist/bundle.css +++ b/dist/bundle.css @@ -2367,8 +2367,7 @@ textarea { } /* GUTTER */ .CodeMirror-gutters { - border-right: 1px solid #ddd; - background-color: #f7f7f7; + background-color: #F2F4F7; white-space: nowrap; } .CodeMirror-linenumber { @@ -2746,7 +2745,7 @@ div.CodeMirror-cursors { background: #d9d9d9; } .CodeMirror-focused .CodeMirror-selected { - background: #d7d4f0; + background: #3685F2; } .CodeMirror-crosshair { cursor: crosshair; diff --git a/dist/bundle.js b/dist/bundle.js index cee0b97e5..9d09dbf60 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -73404,8 +73404,8 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro pId: "", open: false, height: 24, - iconHeight: 12, - iconWidth: 12, + iconHeight: 16, + iconWidth: 16, iconCls: "" }); }, @@ -73438,7 +73438,7 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro BI.count(0, o.layer, function () { items.push({ type: "bi.layout", - width: 12, + width: 24, height: o.height }); }); @@ -73446,7 +73446,7 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 13), + columnSize: BI.makeArray(o.layer, 24), items: [items] }); }, @@ -73483,7 +73483,8 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro } }); -BI.shortcut("bi.multilayer_icon_arrow_node", BI.MultiLayerIconArrowNode);/** +BI.shortcut("bi.multilayer_icon_arrow_node", BI.MultiLayerIconArrowNode); +/** * 加号表示的组节点 * Created by GUY on 2015/9/6. * @class BI.PlusGroupNode @@ -74015,8 +74016,8 @@ BI.MultiLayerIconTreeLeafItem = BI.inherit(BI.BasicButton, { layer: 0, height: 24, iconCls: "", - iconHeight: 12, - iconWidth: 12 + iconHeight: 16, + iconWidth: 16 }); }, _init: function () { @@ -74048,7 +74049,7 @@ BI.MultiLayerIconTreeLeafItem = BI.inherit(BI.BasicButton, { BI.count(0, o.layer, function () { items.push({ type: "bi.layout", - width: 12, + width: 24, height: o.height }); }); @@ -74056,7 +74057,7 @@ BI.MultiLayerIconTreeLeafItem = BI.inherit(BI.BasicButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 12), + columnSize: BI.makeArray(o.layer, 24), items: [items] }); }, @@ -74100,7 +74101,8 @@ BI.MultiLayerIconTreeLeafItem = BI.inherit(BI.BasicButton, { } }); -BI.shortcut("bi.multilayer_icon_tree_leaf_item", BI.MultiLayerIconTreeLeafItem);/** +BI.shortcut("bi.multilayer_icon_tree_leaf_item", BI.MultiLayerIconTreeLeafItem); +/** * 树叶子节点 * Created by GUY on 2015/9/6. * @class BI.TreeTextLeafItem diff --git a/dist/case.js b/dist/case.js index 05e339497..92d623685 100644 --- a/dist/case.js +++ b/dist/case.js @@ -835,8 +835,8 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro pId: "", open: false, height: 24, - iconHeight: 12, - iconWidth: 12, + iconHeight: 16, + iconWidth: 16, iconCls: "" }); }, @@ -869,7 +869,7 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro BI.count(0, o.layer, function () { items.push({ type: "bi.layout", - width: 12, + width: 24, height: o.height }); }); @@ -877,7 +877,7 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 13), + columnSize: BI.makeArray(o.layer, 24), items: [items] }); }, @@ -914,7 +914,8 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro } }); -BI.shortcut("bi.multilayer_icon_arrow_node", BI.MultiLayerIconArrowNode);/** +BI.shortcut("bi.multilayer_icon_arrow_node", BI.MultiLayerIconArrowNode); +/** * 加号表示的组节点 * Created by GUY on 2015/9/6. * @class BI.PlusGroupNode @@ -1446,8 +1447,8 @@ BI.MultiLayerIconTreeLeafItem = BI.inherit(BI.BasicButton, { layer: 0, height: 24, iconCls: "", - iconHeight: 12, - iconWidth: 12 + iconHeight: 16, + iconWidth: 16 }); }, _init: function () { @@ -1479,7 +1480,7 @@ BI.MultiLayerIconTreeLeafItem = BI.inherit(BI.BasicButton, { BI.count(0, o.layer, function () { items.push({ type: "bi.layout", - width: 12, + width: 24, height: o.height }); }); @@ -1487,7 +1488,7 @@ BI.MultiLayerIconTreeLeafItem = BI.inherit(BI.BasicButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 12), + columnSize: BI.makeArray(o.layer, 24), items: [items] }); }, @@ -1531,7 +1532,8 @@ BI.MultiLayerIconTreeLeafItem = BI.inherit(BI.BasicButton, { } }); -BI.shortcut("bi.multilayer_icon_tree_leaf_item", BI.MultiLayerIconTreeLeafItem);/** +BI.shortcut("bi.multilayer_icon_tree_leaf_item", BI.MultiLayerIconTreeLeafItem); +/** * 树叶子节点 * Created by GUY on 2015/9/6. * @class BI.TreeTextLeafItem diff --git a/dist/fineui.css b/dist/fineui.css index e029adbdb..5e00d294b 100644 --- a/dist/fineui.css +++ b/dist/fineui.css @@ -2367,8 +2367,7 @@ textarea { } /* GUTTER */ .CodeMirror-gutters { - border-right: 1px solid #ddd; - background-color: #f7f7f7; + background-color: #F2F4F7; white-space: nowrap; } .CodeMirror-linenumber { @@ -2746,7 +2745,7 @@ div.CodeMirror-cursors { background: #d9d9d9; } .CodeMirror-focused .CodeMirror-selected { - background: #d7d4f0; + background: #3685F2; } .CodeMirror-crosshair { cursor: crosshair; diff --git a/dist/fineui.js b/dist/fineui.js index 03bd87ea2..b34ac245d 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -73653,8 +73653,8 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro pId: "", open: false, height: 24, - iconHeight: 12, - iconWidth: 12, + iconHeight: 16, + iconWidth: 16, iconCls: "" }); }, @@ -73687,7 +73687,7 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro BI.count(0, o.layer, function () { items.push({ type: "bi.layout", - width: 12, + width: 24, height: o.height }); }); @@ -73695,7 +73695,7 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 13), + columnSize: BI.makeArray(o.layer, 24), items: [items] }); }, @@ -73732,7 +73732,8 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro } }); -BI.shortcut("bi.multilayer_icon_arrow_node", BI.MultiLayerIconArrowNode);/** +BI.shortcut("bi.multilayer_icon_arrow_node", BI.MultiLayerIconArrowNode); +/** * 加号表示的组节点 * Created by GUY on 2015/9/6. * @class BI.PlusGroupNode @@ -74264,8 +74265,8 @@ BI.MultiLayerIconTreeLeafItem = BI.inherit(BI.BasicButton, { layer: 0, height: 24, iconCls: "", - iconHeight: 12, - iconWidth: 12 + iconHeight: 16, + iconWidth: 16 }); }, _init: function () { @@ -74297,7 +74298,7 @@ BI.MultiLayerIconTreeLeafItem = BI.inherit(BI.BasicButton, { BI.count(0, o.layer, function () { items.push({ type: "bi.layout", - width: 12, + width: 24, height: o.height }); }); @@ -74305,7 +74306,7 @@ BI.MultiLayerIconTreeLeafItem = BI.inherit(BI.BasicButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 12), + columnSize: BI.makeArray(o.layer, 24), items: [items] }); }, @@ -74349,7 +74350,8 @@ BI.MultiLayerIconTreeLeafItem = BI.inherit(BI.BasicButton, { } }); -BI.shortcut("bi.multilayer_icon_tree_leaf_item", BI.MultiLayerIconTreeLeafItem);/** +BI.shortcut("bi.multilayer_icon_tree_leaf_item", BI.MultiLayerIconTreeLeafItem); +/** * 树叶子节点 * Created by GUY on 2015/9/6. * @class BI.TreeTextLeafItem diff --git a/src/case/button/node/node.multilayer.icon.arrow.js b/src/case/button/node/node.multilayer.icon.arrow.js index 9c6f4e3ec..ec2a301fd 100644 --- a/src/case/button/node/node.multilayer.icon.arrow.js +++ b/src/case/button/node/node.multilayer.icon.arrow.js @@ -8,8 +8,8 @@ BI.MultiLayerIconArrowNode = BI.inherit(BI.NodeButton, { pId: "", open: false, height: 24, - iconHeight: 12, - iconWidth: 12, + iconHeight: 16, + iconWidth: 16, iconCls: "" }); }, @@ -42,7 +42,7 @@ BI.MultiLayerIconArrowNode = BI.inherit(BI.NodeButton, { BI.count(0, o.layer, function () { items.push({ type: "bi.layout", - width: 12, + width: 24, height: o.height }); }); @@ -50,7 +50,7 @@ BI.MultiLayerIconArrowNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 13), + columnSize: BI.makeArray(o.layer, 24), items: [items] }); }, @@ -87,4 +87,4 @@ BI.MultiLayerIconArrowNode = BI.inherit(BI.NodeButton, { } }); -BI.shortcut("bi.multilayer_icon_arrow_node", BI.MultiLayerIconArrowNode); \ No newline at end of file +BI.shortcut("bi.multilayer_icon_arrow_node", BI.MultiLayerIconArrowNode); diff --git a/src/case/button/treeitem/item.multilayer.icon.treeleaf.js b/src/case/button/treeitem/item.multilayer.icon.treeleaf.js index 050a9e59d..f4fcafea7 100644 --- a/src/case/button/treeitem/item.multilayer.icon.treeleaf.js +++ b/src/case/button/treeitem/item.multilayer.icon.treeleaf.js @@ -9,8 +9,8 @@ BI.MultiLayerIconTreeLeafItem = BI.inherit(BI.BasicButton, { layer: 0, height: 24, iconCls: "", - iconHeight: 12, - iconWidth: 12 + iconHeight: 16, + iconWidth: 16 }); }, _init: function () { @@ -42,7 +42,7 @@ BI.MultiLayerIconTreeLeafItem = BI.inherit(BI.BasicButton, { BI.count(0, o.layer, function () { items.push({ type: "bi.layout", - width: 12, + width: 24, height: o.height }); }); @@ -50,7 +50,7 @@ BI.MultiLayerIconTreeLeafItem = BI.inherit(BI.BasicButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 12), + columnSize: BI.makeArray(o.layer, 24), items: [items] }); }, @@ -94,4 +94,4 @@ BI.MultiLayerIconTreeLeafItem = BI.inherit(BI.BasicButton, { } }); -BI.shortcut("bi.multilayer_icon_tree_leaf_item", BI.MultiLayerIconTreeLeafItem); \ No newline at end of file +BI.shortcut("bi.multilayer_icon_tree_leaf_item", BI.MultiLayerIconTreeLeafItem); diff --git a/src/css/base/formula/codemirror.css b/src/css/base/formula/codemirror.css index e51c335fa..482ed06f3 100644 --- a/src/css/base/formula/codemirror.css +++ b/src/css/base/formula/codemirror.css @@ -22,8 +22,7 @@ } /* GUTTER */ .CodeMirror-gutters { - border-right: 1px solid #ddd; - background-color: #f7f7f7; + background-color: #F2F4F7; white-space: nowrap; } .CodeMirror-linenumber { @@ -401,7 +400,7 @@ div.CodeMirror-cursors { background: #d9d9d9; } .CodeMirror-focused .CodeMirror-selected { - background: #d7d4f0; + background: #3685F2; } .CodeMirror-crosshair { cursor: crosshair; diff --git a/src/less/base/formula/codemirror.less b/src/less/base/formula/codemirror.less index fc255d611..b378e34de 100644 --- a/src/less/base/formula/codemirror.less +++ b/src/less/base/formula/codemirror.less @@ -27,8 +27,7 @@ /* GUTTER */ .CodeMirror-gutters { - border-right: 1px solid #ddd; - background-color: #f7f7f7; + background-color: #F2F4F7; white-space: nowrap; } @@ -496,7 +495,7 @@ div.CodeMirror-cursors { } .CodeMirror-focused .CodeMirror-selected { - background: #d7d4f0; + background: #3685F2; } .CodeMirror-crosshair { @@ -585,4 +584,4 @@ span.CodeMirror-selectedtext { li.CodeMirror-hint-active { background: #08f; color: white; -} \ No newline at end of file +}