diff --git a/demo/js/case/list/demo.select_list.js b/demo/js/case/list/demo.select_list.js index 1e3d83bfb..f32d426be 100644 --- a/demo/js/case/list/demo.select_list.js +++ b/demo/js/case/list/demo.select_list.js @@ -18,8 +18,7 @@ Demo.Func = BI.inherit(BI.Widget, { } }, items: BI.createItems(BI.deepClone(Demo.CONSTANTS.SIMPLE_ITEMS), { - type: "bi.multi_select_item", - height: 30 + type: "bi.multi_select_item" }) }); } diff --git a/demo/js/core/abstract/combination/demo.combo.js b/demo/js/core/abstract/combination/demo.combo.js index 7fbb2fbb6..e849a1824 100644 --- a/demo/js/core/abstract/combination/demo.combo.js +++ b/demo/js/core/abstract/combination/demo.combo.js @@ -152,7 +152,7 @@ Demo.Func = BI.inherit(BI.Widget, { type: "bi.button_group", items: BI.createItems(BI.deepClone(this.years), { type: "bi.single_select_radio_item", - height: 30, + height: 25, handler: function (v) { } diff --git a/demo/js/core/layout/demo.absolute.js b/demo/js/core/layout/demo.absolute.js index 3a58108c8..2137c24df 100644 --- a/demo/js/core/layout/demo.absolute.js +++ b/demo/js/core/layout/demo.absolute.js @@ -5,16 +5,15 @@ Demo.AbsoluteLayout = BI.inherit(BI.Widget, { render: function () { return { type: "bi.absolute", - scrollx: true, items: [{ el: { type: "bi.label", text: "绝对布局", cls: "layout-bg1", - width: 800, + width: 300, height: 200 }, - right: 100, + left: 100, top: 100 }] }; diff --git a/demo/js/widget/basewidget/demo.items.js b/demo/js/widget/basewidget/demo.items.js index 7130c7311..0562519b3 100644 --- a/demo/js/widget/basewidget/demo.items.js +++ b/demo/js/widget/basewidget/demo.items.js @@ -16,11 +16,9 @@ Demo.Items = BI.inherit(BI.Widget, { text: "单选item" }, { type: "bi.single_select_item", - height: 30, text: "单选项" }, { type: "bi.single_select_radio_item", - height: 30, text: "单选项" }, { type: "bi.label", @@ -28,7 +26,6 @@ Demo.Items = BI.inherit(BI.Widget, { text: "复选item" }, { type: "bi.multi_select_item", - height: 30, text: "复选项" }, { type: "bi.switch", diff --git a/dist/2.0/fineui.css b/dist/2.0/fineui.css index 5270800c3..17180c339 100644 --- a/dist/2.0/fineui.css +++ b/dist/2.0/fineui.css @@ -2193,10 +2193,10 @@ textarea { background: url('images/1x/icon/tree_vertical_line_4.png') no-repeat center center; } .ztree li ul.line { - background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 0 0; + background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0; } .bi-theme-dark .ztree li ul.line { - background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 0 0; + background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0; } .ztree li span.button.chk.checkbox_false_full { background: url('images/2x/icon/check_box_normal.png') no-repeat center center; @@ -3930,13 +3930,13 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before, } .ztree li ul { margin: 0; - padding: 0 0 0 22px; + padding: 0 0 0 18px; } .ztree li a { padding: 1px 3px 0 0; margin: 0; cursor: pointer; - height: 30px; + height: 24px; background-color: transparent; text-decoration: none; vertical-align: top; @@ -3978,7 +3978,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before, *border: 0px; } .ztree li span { - line-height: 30px; + line-height: 24px; margin-right: 2px; } .ztree li span.button { @@ -4050,8 +4050,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before, background-position: -42px -56px; } .ztree li span.button.switch { - width: 30px; - height: 30px; + width: 25px; + height: 25px; } .ztree li span.button.noline_open { background-position: -92px -72px; @@ -4664,10 +4664,10 @@ textarea::-webkit-scrollbar-thumb:hover { background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/icon/tree_vertical_line_4.png') no-repeat center center; } .ztree li ul.line { - background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/icon/tree_vertical_line_1.png') repeat-y 0 0; + background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0; } .bi-theme-dark .ztree li ul.line { - background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 0 0; + background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0; } .ztree li span.button.chk.checkbox_false_full { background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/2x/icon/check_box_normal.png') no-repeat center center; diff --git a/dist/2.0/fineui.ie.js b/dist/2.0/fineui.ie.js index bbe5607d6..64c836b5b 100644 --- a/dist/2.0/fineui.ie.js +++ b/dist/2.0/fineui.ie.js @@ -52361,7 +52361,7 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -52414,7 +52414,7 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, { BI.ArrowNode.superclass.doClick.apply(this, arguments); this.checkbox.setSelected(this.isOpened()); }, - + setText: function (text) { BI.ArrowNode.superclass.setText.apply(this, arguments); this.text.setText(text); @@ -52443,7 +52443,7 @@ BI.FirstPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -52526,7 +52526,7 @@ BI.IconArrowNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30, + height: 24, iconHeight: 12, iconWidth: 12, iconCls: "" @@ -52622,7 +52622,7 @@ BI.LastPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -52703,7 +52703,7 @@ BI.MidPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -52776,7 +52776,7 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro id: "", pId: "", open: false, - height: 30, + height: 24, iconHeight: 16, iconWidth: 16, iconCls: "" @@ -52872,7 +52872,7 @@ BI.PlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -52993,7 +52993,7 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 30 + height: 24 }); }, _init: function () { @@ -53022,19 +53022,19 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : { - width: 16, + width: 12, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height } }), { - width: 30, + width: 24, el: { type: "bi.layout", cls: "first-line-conn-background", - width: 30, + width: 24, height: o.height } }, { @@ -53089,7 +53089,7 @@ BI.shortcut("bi.first_tree_leaf_item", BI.FirstTreeLeafItem);BI.IconTreeLeafItem logic: { dynamic: false }, - height: 30, + height: 24, iconWidth: 16, iconHeight: 16, iconCls: "" @@ -53184,7 +53184,7 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 30 + height: 24 }); }, _init: function () { @@ -53213,19 +53213,19 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : { - width: 16, + width: 12, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height } }), { - width: 30, + width: 24, el: { type: "bi.layout", cls: "last-line-conn-background", - width: 30, + width: 24, height: o.height } }, { @@ -53288,7 +53288,7 @@ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 30 + height: 24 }); }, _init: function () { @@ -53317,19 +53317,19 @@ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : { - width: 16, + width: 12, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height } }), { - width: 30, + width: 24, el: { type: "bi.layout", cls: "mid-line-conn-background", - width: 30, + width: 24, height: o.height } }, { @@ -53386,7 +53386,7 @@ BI.MultiLayerIconTreeLeafItem = BI.inherit(BI.BasicButton, { return BI.extend(BI.MultiLayerIconTreeLeafItem.superclass._defaultConfig.apply(this, arguments), { extraCls: "bi-multilayer-icon-tree-leaf-item bi-list-item-active", layer: 0, - height: 30, + height: 24, iconCls: "", iconHeight: 16, iconWidth: 16 @@ -53486,7 +53486,7 @@ BI.TreeTextLeafItem = BI.inherit(BI.BasicButton, { extraCls: "bi-tree-text-leaf-item bi-list-item-active", id: "", pId: "", - height: 30, + height: 24, hgap: 0, lgap: 0, rgap: 0 @@ -53708,7 +53708,7 @@ BI.Calendar = BI.inherit(BI.Widget, { whiteSpace: "normal", once: false, forceSelected: true, - height: 30, + height: 24, value: o.year + "-" + month + "-" + td.text, disabled: td.lastMonth || td.nextMonth || td.disabled, lgap: 5, @@ -53725,7 +53725,7 @@ BI.Calendar = BI.inherit(BI.Widget, { columns: 7, rows: 6, columnSize: [1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7], - rowSize: 30, + rowSize: 24, vgap: 10 }))] }); @@ -53874,7 +53874,7 @@ BI.YearCalendar = BI.inherit(BI.Widget, { whiteSpace: "normal", once: false, forceSelected: true, - height: 30, + height: 24, width: 45, value: td.text, disabled: td.disabled @@ -53890,7 +53890,7 @@ BI.YearCalendar = BI.inherit(BI.Widget, { columns: 2, rows: 6, columnSize: [1 / 2, 1 / 2], - rowSize: 30 + rowSize: 24 })), { type: "bi.center_adapt", vgap: 1 @@ -54004,8 +54004,8 @@ BI.FirstTreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend( BI.FirstTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type2", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, @@ -54027,8 +54027,8 @@ BI.LastTreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend(BI.LastTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type4", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, @@ -54050,8 +54050,8 @@ BI.MidTreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend( BI.MidTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type3", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, @@ -54073,8 +54073,8 @@ BI.TreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend( BI.TreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type1", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, @@ -56199,7 +56199,7 @@ BI.IconComboPopup = BI.inherit(BI.Pane, { type: "bi.button_group", items: BI.createItems(o.items, { type: "bi.single_select_icon_text_item", - height: 30 + height: 24 }), chooseType: o.chooseType, layouts: [{ @@ -56227,7 +56227,7 @@ BI.IconComboPopup = BI.inherit(BI.Pane, { BI.IconComboPopup.superclass.populate.apply(this, arguments); items = BI.createItems(items, { type: "bi.single_select_icon_text_item", - height: 30 + height: 24 }); this.popup.populate(items); }, @@ -56402,7 +56402,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, { el: this.trigger, popup: { el: this.popup, - maxHeight: 300 + maxHeight: 240 } }); if (BI.isKey(o.value)) { @@ -56461,7 +56461,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, { type: "bi.button_group", items: BI.createItems(o.items, { type: "bi.single_select_icon_text_item", - height: 30, + height: 24, iconHeight: o.iconHeight, iconWidth: o.iconWidth, iconWrapperWidth: o.iconWrapperWidth @@ -56500,7 +56500,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, { var o = this.options; items = BI.createItems(items, { type: "bi.single_select_icon_text_item", - height: 30, + height: 24, iconWrapperWidth: o.iconWrapperWidth, iconHeight: o.iconHeight, iconWidth: o.iconWidth @@ -57047,7 +57047,7 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T return BI.extend({ type: "bi.single_select_item", cls: "bi-list-item", - height: 30 + height: 24 }, item); }); }, @@ -57122,7 +57122,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, { el: this.trigger, popup: { el: this.popup, - maxHeight: 300 + maxHeight: 240 } }); if(BI.isKey(o.value)) { @@ -57211,7 +57211,7 @@ BI.SmallTextValueCombo = BI.inherit(BI.Widget, { el: this.trigger, popup: { el: this.popup, - maxHeight: 300 + maxHeight: 240 } }); }, @@ -57247,7 +57247,7 @@ BI.shortcut("bi.small_text_value_combo", BI.SmallTextValueCombo);BI.TextValueCom items: BI.createItems(o.items, { type: "bi.single_select_item", textAlign: o.textAlign, - height: 30 + height: 24 }), chooseType: o.chooseType, layouts: [{ @@ -57276,7 +57276,7 @@ BI.shortcut("bi.small_text_value_combo", BI.SmallTextValueCombo);BI.TextValueCom BI.TextValueComboPopup.superclass.populate.apply(this, arguments); items = BI.createItems(items, { type: "bi.single_select_item", - height: 30 + height: 24 }); this.popup.populate(items); }, @@ -62880,7 +62880,7 @@ BI.extend(BI.DynamicDatePane, { BI.DateTimeCombo = BI.inherit(BI.Single, { constants: { popupHeight: 290, - popupWidth: 310, + popupWidth: 270, comboAdjustHeight: 1, border: 1 }, @@ -63015,8 +63015,8 @@ BI.DateTimePopup = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.DateTimePopup.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-date-time-popup", - width: 310, - height: 410 + width: 268, + height: 374 }); }, _init: function () { @@ -63651,7 +63651,7 @@ BI.shortcut("bi.down_list_group", BI.DownListGroup);BI.DownListItem = BI.inherit return BI.extend(conf, { baseCls: "bi-down-list-item bi-list-item-active", cls: "", - height: 30, + height: 24, logic: { dynamic: true }, @@ -63864,7 +63864,7 @@ BI.shortcut("bi.down_list_group_item", BI.DownListGroupItem);/** BI.DownListPopup = BI.inherit(BI.Pane, { constants: { nextIcon: "pull-right-e-font", - height: 30, + height: 24, iconHeight: 12, iconWidth: 12, hgap: 0, @@ -64978,8 +64978,8 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, { props: { baseCls: "bi-dynamic-date-popup", - width: 290, - height: 380 + width: 248, + height: 344 }, _init: function () { @@ -65829,8 +65829,8 @@ BI.extend(BI.DynamicDateTimeCombo, { props: { baseCls: "bi-dynamic-date-time-popup", - width: 290, - height: 421 + width: 248, + height: 385 }, _init: function () { @@ -67909,7 +67909,7 @@ BI.MonthPopup = BI.inherit(BI.Widget, { whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30, + height: 23, width: 38, value: td, text: td @@ -67928,7 +67928,7 @@ BI.MonthPopup = BI.inherit(BI.Widget, { columns: 2, rows: 6, columnSize: [1 / 2, 1 / 2], - rowSize: 30 + rowSize: 25 })), { type: "bi.center_adapt", vgap: 1, @@ -68161,7 +68161,7 @@ BI.shortcut("bi.multi_layer_down_list_combo", BI.DownListCombo);/** BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, { constants: { nextIcon: "pull-right-e-font", - height: 30, + height: 25, iconHeight: 12, iconWidth: 12, hgap: 0, @@ -69060,7 +69060,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -69101,7 +69101,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -69109,7 +69109,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -69163,7 +69163,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -69204,7 +69204,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -69212,7 +69212,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -69262,7 +69262,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -69303,7 +69303,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -69311,7 +69311,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -69361,7 +69361,7 @@ BI.MultiLayerSelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -69402,7 +69402,7 @@ BI.MultiLayerSelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -69410,7 +69410,7 @@ BI.MultiLayerSelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -70026,7 +70026,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -70048,7 +70048,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -70056,7 +70056,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -70129,7 +70129,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -70151,7 +70151,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -70159,7 +70159,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -70231,7 +70231,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -70253,7 +70253,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -70261,7 +70261,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -70331,7 +70331,7 @@ BI.MultiLayerSingleTreePlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -70353,7 +70353,7 @@ BI.MultiLayerSingleTreePlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -70434,7 +70434,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, { layer: 0, id: "", pId: "", - height: 30 + height: 24 }); }, _init: function () { @@ -70477,7 +70477,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -70485,7 +70485,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -70533,7 +70533,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, { layer: 0, id: "", pId: "", - height: 30 + height: 24 }); }, _init: function () { @@ -70575,7 +70575,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -70583,7 +70583,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -70631,7 +70631,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, { layer: 0, id: "", pId: "", - height: 30 + height: 24 }); }, _init: function () { @@ -70673,7 +70673,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -70681,7 +70681,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -72392,7 +72392,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, { type: "bi.multi_select_item", logic: this.options.logic, cls: "bi-list-item-active", - height: 30, + height: 24, selected: this.isAllSelected(), iconWrapperWidth: 36 }); @@ -77894,7 +77894,7 @@ BI.QuarterPopup = BI.inherit(BI.Widget, { whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30 + height: 25 }); }); @@ -78790,7 +78790,7 @@ BI.SearchMultiSelectLoader = BI.inherit(BI.Widget, { type: "bi.multi_select_item", logic: this.options.logic, cls: "bi-list-item-active", - height: 30, + height: 24, selected: this.isAllSelected(), iconWrapperWidth: 36 }); @@ -79131,7 +79131,7 @@ BI.SelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -79216,7 +79216,7 @@ BI.SelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -79301,7 +79301,7 @@ BI.SelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -79386,7 +79386,7 @@ BI.SelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -80978,7 +80978,7 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, { type: this.options.allowNoSelect ? "bi.single_select_item" : "bi.single_select_combo_item", logic: this.options.logic, cls: "bi-list-item-active", - height: 30, + height: 24, selected: false }); }, @@ -84449,7 +84449,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, { min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期, width: 180, - height: 276 + height: 240 }, render: function () { @@ -84906,7 +84906,7 @@ BI.shortcut("bi.dynamic_year_month_card", BI.DynamicYearMonthCard);BI.StaticYear whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30, + height: 23, width: 38, value: td, text: td @@ -84950,7 +84950,7 @@ BI.shortcut("bi.dynamic_year_month_card", BI.DynamicYearMonthCard);BI.StaticYear columns: 2, rows: 6, columnSize: [1 / 2, 1 / 2], - rowSize: 30 + rowSize: 25 })), { type: "bi.center_adapt", vgap: 1, @@ -85204,7 +85204,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, { min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期, width: 180, - height: 270 + height: 240 }, render: function () { @@ -85946,7 +85946,7 @@ BI.shortcut("bi.dynamic_year_quarter_card", BI.DynamicYearQuarterCard);BI.Static whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30 + height: 24 }); }); }, @@ -86204,7 +86204,7 @@ BI.extend(BI.DynamicYearQuarterCombo, { min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期, width: 180, - height: 260 + height: 240 }, render: function () { @@ -86669,10 +86669,12 @@ BI.AbstractAllValueChooser = BI.inherit(BI.Widget, { if (options.keyword) { keywords.push(options.keyword); } + var resultItems = []; BI.each(keywords, function (i, kw) { var search = BI.Func.getSearchResult(items, kw); - items = search.match.concat(search.find); + resultItems = resultItems.concat(search.match).concat(search.find); }); + resultItems = BI.uniq(resultItems); if (options.selectedValues) {// 过滤 var filter = BI.makeObject(options.selectedValues, true); items = BI.filter(items, function (i, ob) { diff --git a/dist/2.0/fineui.js b/dist/2.0/fineui.js index 42b3c0356..3ce01ecf7 100644 --- a/dist/2.0/fineui.js +++ b/dist/2.0/fineui.js @@ -52765,7 +52765,7 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -52818,7 +52818,7 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, { BI.ArrowNode.superclass.doClick.apply(this, arguments); this.checkbox.setSelected(this.isOpened()); }, - + setText: function (text) { BI.ArrowNode.superclass.setText.apply(this, arguments); this.text.setText(text); @@ -52847,7 +52847,7 @@ BI.FirstPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -52930,7 +52930,7 @@ BI.IconArrowNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30, + height: 24, iconHeight: 12, iconWidth: 12, iconCls: "" @@ -53026,7 +53026,7 @@ BI.LastPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -53107,7 +53107,7 @@ BI.MidPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -53180,7 +53180,7 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro id: "", pId: "", open: false, - height: 30, + height: 24, iconHeight: 16, iconWidth: 16, iconCls: "" @@ -53276,7 +53276,7 @@ BI.PlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -53397,7 +53397,7 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 30 + height: 24 }); }, _init: function () { @@ -53426,19 +53426,19 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : { - width: 16, + width: 12, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height } }), { - width: 30, + width: 24, el: { type: "bi.layout", cls: "first-line-conn-background", - width: 30, + width: 24, height: o.height } }, { @@ -53493,7 +53493,7 @@ BI.shortcut("bi.first_tree_leaf_item", BI.FirstTreeLeafItem);BI.IconTreeLeafItem logic: { dynamic: false }, - height: 30, + height: 24, iconWidth: 16, iconHeight: 16, iconCls: "" @@ -53588,7 +53588,7 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 30 + height: 24 }); }, _init: function () { @@ -53617,19 +53617,19 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : { - width: 16, + width: 12, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height } }), { - width: 30, + width: 24, el: { type: "bi.layout", cls: "last-line-conn-background", - width: 30, + width: 24, height: o.height } }, { @@ -53692,7 +53692,7 @@ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 30 + height: 24 }); }, _init: function () { @@ -53721,19 +53721,19 @@ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : { - width: 16, + width: 12, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height } }), { - width: 30, + width: 24, el: { type: "bi.layout", cls: "mid-line-conn-background", - width: 30, + width: 24, height: o.height } }, { @@ -53790,7 +53790,7 @@ BI.MultiLayerIconTreeLeafItem = BI.inherit(BI.BasicButton, { return BI.extend(BI.MultiLayerIconTreeLeafItem.superclass._defaultConfig.apply(this, arguments), { extraCls: "bi-multilayer-icon-tree-leaf-item bi-list-item-active", layer: 0, - height: 30, + height: 24, iconCls: "", iconHeight: 16, iconWidth: 16 @@ -53890,7 +53890,7 @@ BI.TreeTextLeafItem = BI.inherit(BI.BasicButton, { extraCls: "bi-tree-text-leaf-item bi-list-item-active", id: "", pId: "", - height: 30, + height: 24, hgap: 0, lgap: 0, rgap: 0 @@ -54112,7 +54112,7 @@ BI.Calendar = BI.inherit(BI.Widget, { whiteSpace: "normal", once: false, forceSelected: true, - height: 30, + height: 24, value: o.year + "-" + month + "-" + td.text, disabled: td.lastMonth || td.nextMonth || td.disabled, lgap: 5, @@ -54129,7 +54129,7 @@ BI.Calendar = BI.inherit(BI.Widget, { columns: 7, rows: 6, columnSize: [1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7], - rowSize: 30, + rowSize: 24, vgap: 10 }))] }); @@ -54278,7 +54278,7 @@ BI.YearCalendar = BI.inherit(BI.Widget, { whiteSpace: "normal", once: false, forceSelected: true, - height: 30, + height: 24, width: 45, value: td.text, disabled: td.disabled @@ -54294,7 +54294,7 @@ BI.YearCalendar = BI.inherit(BI.Widget, { columns: 2, rows: 6, columnSize: [1 / 2, 1 / 2], - rowSize: 30 + rowSize: 24 })), { type: "bi.center_adapt", vgap: 1 @@ -54408,8 +54408,8 @@ BI.FirstTreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend( BI.FirstTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type2", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, @@ -54431,8 +54431,8 @@ BI.LastTreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend(BI.LastTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type4", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, @@ -54454,8 +54454,8 @@ BI.MidTreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend( BI.MidTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type3", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, @@ -54477,8 +54477,8 @@ BI.TreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend( BI.TreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type1", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, @@ -56603,7 +56603,7 @@ BI.IconComboPopup = BI.inherit(BI.Pane, { type: "bi.button_group", items: BI.createItems(o.items, { type: "bi.single_select_icon_text_item", - height: 30 + height: 24 }), chooseType: o.chooseType, layouts: [{ @@ -56631,7 +56631,7 @@ BI.IconComboPopup = BI.inherit(BI.Pane, { BI.IconComboPopup.superclass.populate.apply(this, arguments); items = BI.createItems(items, { type: "bi.single_select_icon_text_item", - height: 30 + height: 24 }); this.popup.populate(items); }, @@ -56806,7 +56806,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, { el: this.trigger, popup: { el: this.popup, - maxHeight: 300 + maxHeight: 240 } }); if (BI.isKey(o.value)) { @@ -56865,7 +56865,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, { type: "bi.button_group", items: BI.createItems(o.items, { type: "bi.single_select_icon_text_item", - height: 30, + height: 24, iconHeight: o.iconHeight, iconWidth: o.iconWidth, iconWrapperWidth: o.iconWrapperWidth @@ -56904,7 +56904,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, { var o = this.options; items = BI.createItems(items, { type: "bi.single_select_icon_text_item", - height: 30, + height: 24, iconWrapperWidth: o.iconWrapperWidth, iconHeight: o.iconHeight, iconWidth: o.iconWidth @@ -57451,7 +57451,7 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T return BI.extend({ type: "bi.single_select_item", cls: "bi-list-item", - height: 30 + height: 24 }, item); }); }, @@ -57526,7 +57526,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, { el: this.trigger, popup: { el: this.popup, - maxHeight: 300 + maxHeight: 240 } }); if(BI.isKey(o.value)) { @@ -57615,7 +57615,7 @@ BI.SmallTextValueCombo = BI.inherit(BI.Widget, { el: this.trigger, popup: { el: this.popup, - maxHeight: 300 + maxHeight: 240 } }); }, @@ -57651,7 +57651,7 @@ BI.shortcut("bi.small_text_value_combo", BI.SmallTextValueCombo);BI.TextValueCom items: BI.createItems(o.items, { type: "bi.single_select_item", textAlign: o.textAlign, - height: 30 + height: 24 }), chooseType: o.chooseType, layouts: [{ @@ -57680,7 +57680,7 @@ BI.shortcut("bi.small_text_value_combo", BI.SmallTextValueCombo);BI.TextValueCom BI.TextValueComboPopup.superclass.populate.apply(this, arguments); items = BI.createItems(items, { type: "bi.single_select_item", - height: 30 + height: 24 }); this.popup.populate(items); }, @@ -63284,7 +63284,7 @@ BI.extend(BI.DynamicDatePane, { BI.DateTimeCombo = BI.inherit(BI.Single, { constants: { popupHeight: 290, - popupWidth: 310, + popupWidth: 270, comboAdjustHeight: 1, border: 1 }, @@ -63419,8 +63419,8 @@ BI.DateTimePopup = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.DateTimePopup.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-date-time-popup", - width: 310, - height: 410 + width: 268, + height: 374 }); }, _init: function () { @@ -64055,7 +64055,7 @@ BI.shortcut("bi.down_list_group", BI.DownListGroup);BI.DownListItem = BI.inherit return BI.extend(conf, { baseCls: "bi-down-list-item bi-list-item-active", cls: "", - height: 30, + height: 24, logic: { dynamic: true }, @@ -64268,7 +64268,7 @@ BI.shortcut("bi.down_list_group_item", BI.DownListGroupItem);/** BI.DownListPopup = BI.inherit(BI.Pane, { constants: { nextIcon: "pull-right-e-font", - height: 30, + height: 24, iconHeight: 12, iconWidth: 12, hgap: 0, @@ -65382,8 +65382,8 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, { props: { baseCls: "bi-dynamic-date-popup", - width: 290, - height: 380 + width: 248, + height: 344 }, _init: function () { @@ -66233,8 +66233,8 @@ BI.extend(BI.DynamicDateTimeCombo, { props: { baseCls: "bi-dynamic-date-time-popup", - width: 290, - height: 421 + width: 248, + height: 385 }, _init: function () { @@ -68313,7 +68313,7 @@ BI.MonthPopup = BI.inherit(BI.Widget, { whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30, + height: 23, width: 38, value: td, text: td @@ -68332,7 +68332,7 @@ BI.MonthPopup = BI.inherit(BI.Widget, { columns: 2, rows: 6, columnSize: [1 / 2, 1 / 2], - rowSize: 30 + rowSize: 25 })), { type: "bi.center_adapt", vgap: 1, @@ -68565,7 +68565,7 @@ BI.shortcut("bi.multi_layer_down_list_combo", BI.DownListCombo);/** BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, { constants: { nextIcon: "pull-right-e-font", - height: 30, + height: 25, iconHeight: 12, iconWidth: 12, hgap: 0, @@ -69464,7 +69464,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -69505,7 +69505,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -69513,7 +69513,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -69567,7 +69567,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -69608,7 +69608,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -69616,7 +69616,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -69666,7 +69666,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -69707,7 +69707,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -69715,7 +69715,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -69765,7 +69765,7 @@ BI.MultiLayerSelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -69806,7 +69806,7 @@ BI.MultiLayerSelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -69814,7 +69814,7 @@ BI.MultiLayerSelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -70430,7 +70430,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -70452,7 +70452,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -70460,7 +70460,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -70533,7 +70533,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -70555,7 +70555,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -70563,7 +70563,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -70635,7 +70635,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -70657,7 +70657,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -70665,7 +70665,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -70735,7 +70735,7 @@ BI.MultiLayerSingleTreePlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -70757,7 +70757,7 @@ BI.MultiLayerSingleTreePlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -70838,7 +70838,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, { layer: 0, id: "", pId: "", - height: 30 + height: 24 }); }, _init: function () { @@ -70881,7 +70881,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -70889,7 +70889,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -70937,7 +70937,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, { layer: 0, id: "", pId: "", - height: 30 + height: 24 }); }, _init: function () { @@ -70979,7 +70979,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -70987,7 +70987,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -71035,7 +71035,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, { layer: 0, id: "", pId: "", - height: 30 + height: 24 }); }, _init: function () { @@ -71077,7 +71077,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -71085,7 +71085,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -72796,7 +72796,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, { type: "bi.multi_select_item", logic: this.options.logic, cls: "bi-list-item-active", - height: 30, + height: 24, selected: this.isAllSelected(), iconWrapperWidth: 36 }); @@ -78298,7 +78298,7 @@ BI.QuarterPopup = BI.inherit(BI.Widget, { whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30 + height: 25 }); }); @@ -79194,7 +79194,7 @@ BI.SearchMultiSelectLoader = BI.inherit(BI.Widget, { type: "bi.multi_select_item", logic: this.options.logic, cls: "bi-list-item-active", - height: 30, + height: 24, selected: this.isAllSelected(), iconWrapperWidth: 36 }); @@ -79535,7 +79535,7 @@ BI.SelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -79620,7 +79620,7 @@ BI.SelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -79705,7 +79705,7 @@ BI.SelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -79790,7 +79790,7 @@ BI.SelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -81382,7 +81382,7 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, { type: this.options.allowNoSelect ? "bi.single_select_item" : "bi.single_select_combo_item", logic: this.options.logic, cls: "bi-list-item-active", - height: 30, + height: 24, selected: false }); }, @@ -84853,7 +84853,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, { min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期, width: 180, - height: 276 + height: 240 }, render: function () { @@ -85310,7 +85310,7 @@ BI.shortcut("bi.dynamic_year_month_card", BI.DynamicYearMonthCard);BI.StaticYear whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30, + height: 23, width: 38, value: td, text: td @@ -85354,7 +85354,7 @@ BI.shortcut("bi.dynamic_year_month_card", BI.DynamicYearMonthCard);BI.StaticYear columns: 2, rows: 6, columnSize: [1 / 2, 1 / 2], - rowSize: 30 + rowSize: 25 })), { type: "bi.center_adapt", vgap: 1, @@ -85608,7 +85608,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, { min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期, width: 180, - height: 270 + height: 240 }, render: function () { @@ -86350,7 +86350,7 @@ BI.shortcut("bi.dynamic_year_quarter_card", BI.DynamicYearQuarterCard);BI.Static whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30 + height: 24 }); }); }, @@ -86608,7 +86608,7 @@ BI.extend(BI.DynamicYearQuarterCombo, { min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期, width: 180, - height: 260 + height: 240 }, render: function () { @@ -87073,10 +87073,12 @@ BI.AbstractAllValueChooser = BI.inherit(BI.Widget, { if (options.keyword) { keywords.push(options.keyword); } + var resultItems = []; BI.each(keywords, function (i, kw) { var search = BI.Func.getSearchResult(items, kw); - items = search.match.concat(search.find); + resultItems = resultItems.concat(search.match).concat(search.find); }); + resultItems = BI.uniq(resultItems); if (options.selectedValues) {// 过滤 var filter = BI.makeObject(options.selectedValues, true); items = BI.filter(items, function (i, ob) { diff --git a/dist/base.css b/dist/base.css index 02c0078bb..8ea8d9510 100644 --- a/dist/base.css +++ b/dist/base.css @@ -38,10 +38,10 @@ background: url('images/1x/icon/tree_vertical_line_4.png') no-repeat center center; } .ztree li ul.line { - background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 0 0; + background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0; } .bi-theme-dark .ztree li ul.line { - background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 0 0; + background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0; } .ztree li span.button.chk.checkbox_false_full { background: url('images/2x/icon/check_box_normal.png') no-repeat center center; @@ -1775,13 +1775,13 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before, } .ztree li ul { margin: 0; - padding: 0 0 0 22px; + padding: 0 0 0 18px; } .ztree li a { padding: 1px 3px 0 0; margin: 0; cursor: pointer; - height: 30px; + height: 24px; background-color: transparent; text-decoration: none; vertical-align: top; @@ -1823,7 +1823,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before, *border: 0px; } .ztree li span { - line-height: 30px; + line-height: 24px; margin-right: 2px; } .ztree li span.button { @@ -1895,8 +1895,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before, background-position: -42px -56px; } .ztree li span.button.switch { - width: 30px; - height: 30px; + width: 25px; + height: 25px; } .ztree li span.button.noline_open { background-position: -92px -72px; diff --git a/dist/bundle.css b/dist/bundle.css index 5270800c3..17180c339 100644 --- a/dist/bundle.css +++ b/dist/bundle.css @@ -2193,10 +2193,10 @@ textarea { background: url('images/1x/icon/tree_vertical_line_4.png') no-repeat center center; } .ztree li ul.line { - background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 0 0; + background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0; } .bi-theme-dark .ztree li ul.line { - background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 0 0; + background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0; } .ztree li span.button.chk.checkbox_false_full { background: url('images/2x/icon/check_box_normal.png') no-repeat center center; @@ -3930,13 +3930,13 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before, } .ztree li ul { margin: 0; - padding: 0 0 0 22px; + padding: 0 0 0 18px; } .ztree li a { padding: 1px 3px 0 0; margin: 0; cursor: pointer; - height: 30px; + height: 24px; background-color: transparent; text-decoration: none; vertical-align: top; @@ -3978,7 +3978,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before, *border: 0px; } .ztree li span { - line-height: 30px; + line-height: 24px; margin-right: 2px; } .ztree li span.button { @@ -4050,8 +4050,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before, background-position: -42px -56px; } .ztree li span.button.switch { - width: 30px; - height: 30px; + width: 25px; + height: 25px; } .ztree li span.button.noline_open { background-position: -92px -72px; @@ -4664,10 +4664,10 @@ textarea::-webkit-scrollbar-thumb:hover { background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/icon/tree_vertical_line_4.png') no-repeat center center; } .ztree li ul.line { - background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/icon/tree_vertical_line_1.png') repeat-y 0 0; + background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0; } .bi-theme-dark .ztree li ul.line { - background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 0 0; + background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0; } .ztree li span.button.chk.checkbox_false_full { background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/2x/icon/check_box_normal.png') no-repeat center center; diff --git a/dist/bundle.ie.js b/dist/bundle.ie.js index bbe5607d6..64c836b5b 100644 --- a/dist/bundle.ie.js +++ b/dist/bundle.ie.js @@ -52361,7 +52361,7 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -52414,7 +52414,7 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, { BI.ArrowNode.superclass.doClick.apply(this, arguments); this.checkbox.setSelected(this.isOpened()); }, - + setText: function (text) { BI.ArrowNode.superclass.setText.apply(this, arguments); this.text.setText(text); @@ -52443,7 +52443,7 @@ BI.FirstPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -52526,7 +52526,7 @@ BI.IconArrowNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30, + height: 24, iconHeight: 12, iconWidth: 12, iconCls: "" @@ -52622,7 +52622,7 @@ BI.LastPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -52703,7 +52703,7 @@ BI.MidPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -52776,7 +52776,7 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro id: "", pId: "", open: false, - height: 30, + height: 24, iconHeight: 16, iconWidth: 16, iconCls: "" @@ -52872,7 +52872,7 @@ BI.PlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -52993,7 +52993,7 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 30 + height: 24 }); }, _init: function () { @@ -53022,19 +53022,19 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : { - width: 16, + width: 12, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height } }), { - width: 30, + width: 24, el: { type: "bi.layout", cls: "first-line-conn-background", - width: 30, + width: 24, height: o.height } }, { @@ -53089,7 +53089,7 @@ BI.shortcut("bi.first_tree_leaf_item", BI.FirstTreeLeafItem);BI.IconTreeLeafItem logic: { dynamic: false }, - height: 30, + height: 24, iconWidth: 16, iconHeight: 16, iconCls: "" @@ -53184,7 +53184,7 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 30 + height: 24 }); }, _init: function () { @@ -53213,19 +53213,19 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : { - width: 16, + width: 12, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height } }), { - width: 30, + width: 24, el: { type: "bi.layout", cls: "last-line-conn-background", - width: 30, + width: 24, height: o.height } }, { @@ -53288,7 +53288,7 @@ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 30 + height: 24 }); }, _init: function () { @@ -53317,19 +53317,19 @@ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : { - width: 16, + width: 12, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height } }), { - width: 30, + width: 24, el: { type: "bi.layout", cls: "mid-line-conn-background", - width: 30, + width: 24, height: o.height } }, { @@ -53386,7 +53386,7 @@ BI.MultiLayerIconTreeLeafItem = BI.inherit(BI.BasicButton, { return BI.extend(BI.MultiLayerIconTreeLeafItem.superclass._defaultConfig.apply(this, arguments), { extraCls: "bi-multilayer-icon-tree-leaf-item bi-list-item-active", layer: 0, - height: 30, + height: 24, iconCls: "", iconHeight: 16, iconWidth: 16 @@ -53486,7 +53486,7 @@ BI.TreeTextLeafItem = BI.inherit(BI.BasicButton, { extraCls: "bi-tree-text-leaf-item bi-list-item-active", id: "", pId: "", - height: 30, + height: 24, hgap: 0, lgap: 0, rgap: 0 @@ -53708,7 +53708,7 @@ BI.Calendar = BI.inherit(BI.Widget, { whiteSpace: "normal", once: false, forceSelected: true, - height: 30, + height: 24, value: o.year + "-" + month + "-" + td.text, disabled: td.lastMonth || td.nextMonth || td.disabled, lgap: 5, @@ -53725,7 +53725,7 @@ BI.Calendar = BI.inherit(BI.Widget, { columns: 7, rows: 6, columnSize: [1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7], - rowSize: 30, + rowSize: 24, vgap: 10 }))] }); @@ -53874,7 +53874,7 @@ BI.YearCalendar = BI.inherit(BI.Widget, { whiteSpace: "normal", once: false, forceSelected: true, - height: 30, + height: 24, width: 45, value: td.text, disabled: td.disabled @@ -53890,7 +53890,7 @@ BI.YearCalendar = BI.inherit(BI.Widget, { columns: 2, rows: 6, columnSize: [1 / 2, 1 / 2], - rowSize: 30 + rowSize: 24 })), { type: "bi.center_adapt", vgap: 1 @@ -54004,8 +54004,8 @@ BI.FirstTreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend( BI.FirstTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type2", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, @@ -54027,8 +54027,8 @@ BI.LastTreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend(BI.LastTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type4", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, @@ -54050,8 +54050,8 @@ BI.MidTreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend( BI.MidTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type3", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, @@ -54073,8 +54073,8 @@ BI.TreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend( BI.TreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type1", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, @@ -56199,7 +56199,7 @@ BI.IconComboPopup = BI.inherit(BI.Pane, { type: "bi.button_group", items: BI.createItems(o.items, { type: "bi.single_select_icon_text_item", - height: 30 + height: 24 }), chooseType: o.chooseType, layouts: [{ @@ -56227,7 +56227,7 @@ BI.IconComboPopup = BI.inherit(BI.Pane, { BI.IconComboPopup.superclass.populate.apply(this, arguments); items = BI.createItems(items, { type: "bi.single_select_icon_text_item", - height: 30 + height: 24 }); this.popup.populate(items); }, @@ -56402,7 +56402,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, { el: this.trigger, popup: { el: this.popup, - maxHeight: 300 + maxHeight: 240 } }); if (BI.isKey(o.value)) { @@ -56461,7 +56461,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, { type: "bi.button_group", items: BI.createItems(o.items, { type: "bi.single_select_icon_text_item", - height: 30, + height: 24, iconHeight: o.iconHeight, iconWidth: o.iconWidth, iconWrapperWidth: o.iconWrapperWidth @@ -56500,7 +56500,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, { var o = this.options; items = BI.createItems(items, { type: "bi.single_select_icon_text_item", - height: 30, + height: 24, iconWrapperWidth: o.iconWrapperWidth, iconHeight: o.iconHeight, iconWidth: o.iconWidth @@ -57047,7 +57047,7 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T return BI.extend({ type: "bi.single_select_item", cls: "bi-list-item", - height: 30 + height: 24 }, item); }); }, @@ -57122,7 +57122,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, { el: this.trigger, popup: { el: this.popup, - maxHeight: 300 + maxHeight: 240 } }); if(BI.isKey(o.value)) { @@ -57211,7 +57211,7 @@ BI.SmallTextValueCombo = BI.inherit(BI.Widget, { el: this.trigger, popup: { el: this.popup, - maxHeight: 300 + maxHeight: 240 } }); }, @@ -57247,7 +57247,7 @@ BI.shortcut("bi.small_text_value_combo", BI.SmallTextValueCombo);BI.TextValueCom items: BI.createItems(o.items, { type: "bi.single_select_item", textAlign: o.textAlign, - height: 30 + height: 24 }), chooseType: o.chooseType, layouts: [{ @@ -57276,7 +57276,7 @@ BI.shortcut("bi.small_text_value_combo", BI.SmallTextValueCombo);BI.TextValueCom BI.TextValueComboPopup.superclass.populate.apply(this, arguments); items = BI.createItems(items, { type: "bi.single_select_item", - height: 30 + height: 24 }); this.popup.populate(items); }, @@ -62880,7 +62880,7 @@ BI.extend(BI.DynamicDatePane, { BI.DateTimeCombo = BI.inherit(BI.Single, { constants: { popupHeight: 290, - popupWidth: 310, + popupWidth: 270, comboAdjustHeight: 1, border: 1 }, @@ -63015,8 +63015,8 @@ BI.DateTimePopup = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.DateTimePopup.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-date-time-popup", - width: 310, - height: 410 + width: 268, + height: 374 }); }, _init: function () { @@ -63651,7 +63651,7 @@ BI.shortcut("bi.down_list_group", BI.DownListGroup);BI.DownListItem = BI.inherit return BI.extend(conf, { baseCls: "bi-down-list-item bi-list-item-active", cls: "", - height: 30, + height: 24, logic: { dynamic: true }, @@ -63864,7 +63864,7 @@ BI.shortcut("bi.down_list_group_item", BI.DownListGroupItem);/** BI.DownListPopup = BI.inherit(BI.Pane, { constants: { nextIcon: "pull-right-e-font", - height: 30, + height: 24, iconHeight: 12, iconWidth: 12, hgap: 0, @@ -64978,8 +64978,8 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, { props: { baseCls: "bi-dynamic-date-popup", - width: 290, - height: 380 + width: 248, + height: 344 }, _init: function () { @@ -65829,8 +65829,8 @@ BI.extend(BI.DynamicDateTimeCombo, { props: { baseCls: "bi-dynamic-date-time-popup", - width: 290, - height: 421 + width: 248, + height: 385 }, _init: function () { @@ -67909,7 +67909,7 @@ BI.MonthPopup = BI.inherit(BI.Widget, { whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30, + height: 23, width: 38, value: td, text: td @@ -67928,7 +67928,7 @@ BI.MonthPopup = BI.inherit(BI.Widget, { columns: 2, rows: 6, columnSize: [1 / 2, 1 / 2], - rowSize: 30 + rowSize: 25 })), { type: "bi.center_adapt", vgap: 1, @@ -68161,7 +68161,7 @@ BI.shortcut("bi.multi_layer_down_list_combo", BI.DownListCombo);/** BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, { constants: { nextIcon: "pull-right-e-font", - height: 30, + height: 25, iconHeight: 12, iconWidth: 12, hgap: 0, @@ -69060,7 +69060,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -69101,7 +69101,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -69109,7 +69109,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -69163,7 +69163,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -69204,7 +69204,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -69212,7 +69212,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -69262,7 +69262,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -69303,7 +69303,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -69311,7 +69311,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -69361,7 +69361,7 @@ BI.MultiLayerSelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -69402,7 +69402,7 @@ BI.MultiLayerSelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -69410,7 +69410,7 @@ BI.MultiLayerSelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -70026,7 +70026,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -70048,7 +70048,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -70056,7 +70056,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -70129,7 +70129,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -70151,7 +70151,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -70159,7 +70159,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -70231,7 +70231,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -70253,7 +70253,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -70261,7 +70261,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -70331,7 +70331,7 @@ BI.MultiLayerSingleTreePlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -70353,7 +70353,7 @@ BI.MultiLayerSingleTreePlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -70434,7 +70434,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, { layer: 0, id: "", pId: "", - height: 30 + height: 24 }); }, _init: function () { @@ -70477,7 +70477,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -70485,7 +70485,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -70533,7 +70533,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, { layer: 0, id: "", pId: "", - height: 30 + height: 24 }); }, _init: function () { @@ -70575,7 +70575,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -70583,7 +70583,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -70631,7 +70631,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, { layer: 0, id: "", pId: "", - height: 30 + height: 24 }); }, _init: function () { @@ -70673,7 +70673,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -70681,7 +70681,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -72392,7 +72392,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, { type: "bi.multi_select_item", logic: this.options.logic, cls: "bi-list-item-active", - height: 30, + height: 24, selected: this.isAllSelected(), iconWrapperWidth: 36 }); @@ -77894,7 +77894,7 @@ BI.QuarterPopup = BI.inherit(BI.Widget, { whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30 + height: 25 }); }); @@ -78790,7 +78790,7 @@ BI.SearchMultiSelectLoader = BI.inherit(BI.Widget, { type: "bi.multi_select_item", logic: this.options.logic, cls: "bi-list-item-active", - height: 30, + height: 24, selected: this.isAllSelected(), iconWrapperWidth: 36 }); @@ -79131,7 +79131,7 @@ BI.SelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -79216,7 +79216,7 @@ BI.SelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -79301,7 +79301,7 @@ BI.SelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -79386,7 +79386,7 @@ BI.SelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -80978,7 +80978,7 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, { type: this.options.allowNoSelect ? "bi.single_select_item" : "bi.single_select_combo_item", logic: this.options.logic, cls: "bi-list-item-active", - height: 30, + height: 24, selected: false }); }, @@ -84449,7 +84449,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, { min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期, width: 180, - height: 276 + height: 240 }, render: function () { @@ -84906,7 +84906,7 @@ BI.shortcut("bi.dynamic_year_month_card", BI.DynamicYearMonthCard);BI.StaticYear whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30, + height: 23, width: 38, value: td, text: td @@ -84950,7 +84950,7 @@ BI.shortcut("bi.dynamic_year_month_card", BI.DynamicYearMonthCard);BI.StaticYear columns: 2, rows: 6, columnSize: [1 / 2, 1 / 2], - rowSize: 30 + rowSize: 25 })), { type: "bi.center_adapt", vgap: 1, @@ -85204,7 +85204,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, { min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期, width: 180, - height: 270 + height: 240 }, render: function () { @@ -85946,7 +85946,7 @@ BI.shortcut("bi.dynamic_year_quarter_card", BI.DynamicYearQuarterCard);BI.Static whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30 + height: 24 }); }); }, @@ -86204,7 +86204,7 @@ BI.extend(BI.DynamicYearQuarterCombo, { min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期, width: 180, - height: 260 + height: 240 }, render: function () { @@ -86669,10 +86669,12 @@ BI.AbstractAllValueChooser = BI.inherit(BI.Widget, { if (options.keyword) { keywords.push(options.keyword); } + var resultItems = []; BI.each(keywords, function (i, kw) { var search = BI.Func.getSearchResult(items, kw); - items = search.match.concat(search.find); + resultItems = resultItems.concat(search.match).concat(search.find); }); + resultItems = BI.uniq(resultItems); if (options.selectedValues) {// 过滤 var filter = BI.makeObject(options.selectedValues, true); items = BI.filter(items, function (i, ob) { diff --git a/dist/bundle.js b/dist/bundle.js index 42b3c0356..3ce01ecf7 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -52765,7 +52765,7 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -52818,7 +52818,7 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, { BI.ArrowNode.superclass.doClick.apply(this, arguments); this.checkbox.setSelected(this.isOpened()); }, - + setText: function (text) { BI.ArrowNode.superclass.setText.apply(this, arguments); this.text.setText(text); @@ -52847,7 +52847,7 @@ BI.FirstPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -52930,7 +52930,7 @@ BI.IconArrowNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30, + height: 24, iconHeight: 12, iconWidth: 12, iconCls: "" @@ -53026,7 +53026,7 @@ BI.LastPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -53107,7 +53107,7 @@ BI.MidPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -53180,7 +53180,7 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro id: "", pId: "", open: false, - height: 30, + height: 24, iconHeight: 16, iconWidth: 16, iconCls: "" @@ -53276,7 +53276,7 @@ BI.PlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -53397,7 +53397,7 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 30 + height: 24 }); }, _init: function () { @@ -53426,19 +53426,19 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : { - width: 16, + width: 12, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height } }), { - width: 30, + width: 24, el: { type: "bi.layout", cls: "first-line-conn-background", - width: 30, + width: 24, height: o.height } }, { @@ -53493,7 +53493,7 @@ BI.shortcut("bi.first_tree_leaf_item", BI.FirstTreeLeafItem);BI.IconTreeLeafItem logic: { dynamic: false }, - height: 30, + height: 24, iconWidth: 16, iconHeight: 16, iconCls: "" @@ -53588,7 +53588,7 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 30 + height: 24 }); }, _init: function () { @@ -53617,19 +53617,19 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : { - width: 16, + width: 12, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height } }), { - width: 30, + width: 24, el: { type: "bi.layout", cls: "last-line-conn-background", - width: 30, + width: 24, height: o.height } }, { @@ -53692,7 +53692,7 @@ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 30 + height: 24 }); }, _init: function () { @@ -53721,19 +53721,19 @@ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : { - width: 16, + width: 12, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height } }), { - width: 30, + width: 24, el: { type: "bi.layout", cls: "mid-line-conn-background", - width: 30, + width: 24, height: o.height } }, { @@ -53790,7 +53790,7 @@ BI.MultiLayerIconTreeLeafItem = BI.inherit(BI.BasicButton, { return BI.extend(BI.MultiLayerIconTreeLeafItem.superclass._defaultConfig.apply(this, arguments), { extraCls: "bi-multilayer-icon-tree-leaf-item bi-list-item-active", layer: 0, - height: 30, + height: 24, iconCls: "", iconHeight: 16, iconWidth: 16 @@ -53890,7 +53890,7 @@ BI.TreeTextLeafItem = BI.inherit(BI.BasicButton, { extraCls: "bi-tree-text-leaf-item bi-list-item-active", id: "", pId: "", - height: 30, + height: 24, hgap: 0, lgap: 0, rgap: 0 @@ -54112,7 +54112,7 @@ BI.Calendar = BI.inherit(BI.Widget, { whiteSpace: "normal", once: false, forceSelected: true, - height: 30, + height: 24, value: o.year + "-" + month + "-" + td.text, disabled: td.lastMonth || td.nextMonth || td.disabled, lgap: 5, @@ -54129,7 +54129,7 @@ BI.Calendar = BI.inherit(BI.Widget, { columns: 7, rows: 6, columnSize: [1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7], - rowSize: 30, + rowSize: 24, vgap: 10 }))] }); @@ -54278,7 +54278,7 @@ BI.YearCalendar = BI.inherit(BI.Widget, { whiteSpace: "normal", once: false, forceSelected: true, - height: 30, + height: 24, width: 45, value: td.text, disabled: td.disabled @@ -54294,7 +54294,7 @@ BI.YearCalendar = BI.inherit(BI.Widget, { columns: 2, rows: 6, columnSize: [1 / 2, 1 / 2], - rowSize: 30 + rowSize: 24 })), { type: "bi.center_adapt", vgap: 1 @@ -54408,8 +54408,8 @@ BI.FirstTreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend( BI.FirstTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type2", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, @@ -54431,8 +54431,8 @@ BI.LastTreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend(BI.LastTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type4", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, @@ -54454,8 +54454,8 @@ BI.MidTreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend( BI.MidTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type3", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, @@ -54477,8 +54477,8 @@ BI.TreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend( BI.TreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type1", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, @@ -56603,7 +56603,7 @@ BI.IconComboPopup = BI.inherit(BI.Pane, { type: "bi.button_group", items: BI.createItems(o.items, { type: "bi.single_select_icon_text_item", - height: 30 + height: 24 }), chooseType: o.chooseType, layouts: [{ @@ -56631,7 +56631,7 @@ BI.IconComboPopup = BI.inherit(BI.Pane, { BI.IconComboPopup.superclass.populate.apply(this, arguments); items = BI.createItems(items, { type: "bi.single_select_icon_text_item", - height: 30 + height: 24 }); this.popup.populate(items); }, @@ -56806,7 +56806,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, { el: this.trigger, popup: { el: this.popup, - maxHeight: 300 + maxHeight: 240 } }); if (BI.isKey(o.value)) { @@ -56865,7 +56865,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, { type: "bi.button_group", items: BI.createItems(o.items, { type: "bi.single_select_icon_text_item", - height: 30, + height: 24, iconHeight: o.iconHeight, iconWidth: o.iconWidth, iconWrapperWidth: o.iconWrapperWidth @@ -56904,7 +56904,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, { var o = this.options; items = BI.createItems(items, { type: "bi.single_select_icon_text_item", - height: 30, + height: 24, iconWrapperWidth: o.iconWrapperWidth, iconHeight: o.iconHeight, iconWidth: o.iconWidth @@ -57451,7 +57451,7 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T return BI.extend({ type: "bi.single_select_item", cls: "bi-list-item", - height: 30 + height: 24 }, item); }); }, @@ -57526,7 +57526,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, { el: this.trigger, popup: { el: this.popup, - maxHeight: 300 + maxHeight: 240 } }); if(BI.isKey(o.value)) { @@ -57615,7 +57615,7 @@ BI.SmallTextValueCombo = BI.inherit(BI.Widget, { el: this.trigger, popup: { el: this.popup, - maxHeight: 300 + maxHeight: 240 } }); }, @@ -57651,7 +57651,7 @@ BI.shortcut("bi.small_text_value_combo", BI.SmallTextValueCombo);BI.TextValueCom items: BI.createItems(o.items, { type: "bi.single_select_item", textAlign: o.textAlign, - height: 30 + height: 24 }), chooseType: o.chooseType, layouts: [{ @@ -57680,7 +57680,7 @@ BI.shortcut("bi.small_text_value_combo", BI.SmallTextValueCombo);BI.TextValueCom BI.TextValueComboPopup.superclass.populate.apply(this, arguments); items = BI.createItems(items, { type: "bi.single_select_item", - height: 30 + height: 24 }); this.popup.populate(items); }, @@ -63284,7 +63284,7 @@ BI.extend(BI.DynamicDatePane, { BI.DateTimeCombo = BI.inherit(BI.Single, { constants: { popupHeight: 290, - popupWidth: 310, + popupWidth: 270, comboAdjustHeight: 1, border: 1 }, @@ -63419,8 +63419,8 @@ BI.DateTimePopup = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.DateTimePopup.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-date-time-popup", - width: 310, - height: 410 + width: 268, + height: 374 }); }, _init: function () { @@ -64055,7 +64055,7 @@ BI.shortcut("bi.down_list_group", BI.DownListGroup);BI.DownListItem = BI.inherit return BI.extend(conf, { baseCls: "bi-down-list-item bi-list-item-active", cls: "", - height: 30, + height: 24, logic: { dynamic: true }, @@ -64268,7 +64268,7 @@ BI.shortcut("bi.down_list_group_item", BI.DownListGroupItem);/** BI.DownListPopup = BI.inherit(BI.Pane, { constants: { nextIcon: "pull-right-e-font", - height: 30, + height: 24, iconHeight: 12, iconWidth: 12, hgap: 0, @@ -65382,8 +65382,8 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, { props: { baseCls: "bi-dynamic-date-popup", - width: 290, - height: 380 + width: 248, + height: 344 }, _init: function () { @@ -66233,8 +66233,8 @@ BI.extend(BI.DynamicDateTimeCombo, { props: { baseCls: "bi-dynamic-date-time-popup", - width: 290, - height: 421 + width: 248, + height: 385 }, _init: function () { @@ -68313,7 +68313,7 @@ BI.MonthPopup = BI.inherit(BI.Widget, { whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30, + height: 23, width: 38, value: td, text: td @@ -68332,7 +68332,7 @@ BI.MonthPopup = BI.inherit(BI.Widget, { columns: 2, rows: 6, columnSize: [1 / 2, 1 / 2], - rowSize: 30 + rowSize: 25 })), { type: "bi.center_adapt", vgap: 1, @@ -68565,7 +68565,7 @@ BI.shortcut("bi.multi_layer_down_list_combo", BI.DownListCombo);/** BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, { constants: { nextIcon: "pull-right-e-font", - height: 30, + height: 25, iconHeight: 12, iconWidth: 12, hgap: 0, @@ -69464,7 +69464,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -69505,7 +69505,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -69513,7 +69513,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -69567,7 +69567,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -69608,7 +69608,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -69616,7 +69616,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -69666,7 +69666,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -69707,7 +69707,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -69715,7 +69715,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -69765,7 +69765,7 @@ BI.MultiLayerSelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -69806,7 +69806,7 @@ BI.MultiLayerSelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -69814,7 +69814,7 @@ BI.MultiLayerSelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -70430,7 +70430,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -70452,7 +70452,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -70460,7 +70460,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -70533,7 +70533,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -70555,7 +70555,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -70563,7 +70563,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -70635,7 +70635,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -70657,7 +70657,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -70665,7 +70665,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -70735,7 +70735,7 @@ BI.MultiLayerSingleTreePlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -70757,7 +70757,7 @@ BI.MultiLayerSingleTreePlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -70838,7 +70838,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, { layer: 0, id: "", pId: "", - height: 30 + height: 24 }); }, _init: function () { @@ -70881,7 +70881,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -70889,7 +70889,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -70937,7 +70937,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, { layer: 0, id: "", pId: "", - height: 30 + height: 24 }); }, _init: function () { @@ -70979,7 +70979,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -70987,7 +70987,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -71035,7 +71035,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, { layer: 0, id: "", pId: "", - height: 30 + height: 24 }); }, _init: function () { @@ -71077,7 +71077,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -71085,7 +71085,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -72796,7 +72796,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, { type: "bi.multi_select_item", logic: this.options.logic, cls: "bi-list-item-active", - height: 30, + height: 24, selected: this.isAllSelected(), iconWrapperWidth: 36 }); @@ -78298,7 +78298,7 @@ BI.QuarterPopup = BI.inherit(BI.Widget, { whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30 + height: 25 }); }); @@ -79194,7 +79194,7 @@ BI.SearchMultiSelectLoader = BI.inherit(BI.Widget, { type: "bi.multi_select_item", logic: this.options.logic, cls: "bi-list-item-active", - height: 30, + height: 24, selected: this.isAllSelected(), iconWrapperWidth: 36 }); @@ -79535,7 +79535,7 @@ BI.SelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -79620,7 +79620,7 @@ BI.SelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -79705,7 +79705,7 @@ BI.SelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -79790,7 +79790,7 @@ BI.SelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -81382,7 +81382,7 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, { type: this.options.allowNoSelect ? "bi.single_select_item" : "bi.single_select_combo_item", logic: this.options.logic, cls: "bi-list-item-active", - height: 30, + height: 24, selected: false }); }, @@ -84853,7 +84853,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, { min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期, width: 180, - height: 276 + height: 240 }, render: function () { @@ -85310,7 +85310,7 @@ BI.shortcut("bi.dynamic_year_month_card", BI.DynamicYearMonthCard);BI.StaticYear whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30, + height: 23, width: 38, value: td, text: td @@ -85354,7 +85354,7 @@ BI.shortcut("bi.dynamic_year_month_card", BI.DynamicYearMonthCard);BI.StaticYear columns: 2, rows: 6, columnSize: [1 / 2, 1 / 2], - rowSize: 30 + rowSize: 25 })), { type: "bi.center_adapt", vgap: 1, @@ -85608,7 +85608,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, { min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期, width: 180, - height: 270 + height: 240 }, render: function () { @@ -86350,7 +86350,7 @@ BI.shortcut("bi.dynamic_year_quarter_card", BI.DynamicYearQuarterCard);BI.Static whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30 + height: 24 }); }); }, @@ -86608,7 +86608,7 @@ BI.extend(BI.DynamicYearQuarterCombo, { min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期, width: 180, - height: 260 + height: 240 }, render: function () { @@ -87073,10 +87073,12 @@ BI.AbstractAllValueChooser = BI.inherit(BI.Widget, { if (options.keyword) { keywords.push(options.keyword); } + var resultItems = []; BI.each(keywords, function (i, kw) { var search = BI.Func.getSearchResult(items, kw); - items = search.match.concat(search.find); + resultItems = resultItems.concat(search.match).concat(search.find); }); + resultItems = BI.uniq(resultItems); if (options.selectedValues) {// 过滤 var filter = BI.makeObject(options.selectedValues, true); items = BI.filter(items, function (i, ob) { diff --git a/dist/case.js b/dist/case.js index e0783dfaa..bbf10978f 100644 --- a/dist/case.js +++ b/dist/case.js @@ -430,7 +430,7 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -483,7 +483,7 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, { BI.ArrowNode.superclass.doClick.apply(this, arguments); this.checkbox.setSelected(this.isOpened()); }, - + setText: function (text) { BI.ArrowNode.superclass.setText.apply(this, arguments); this.text.setText(text); @@ -512,7 +512,7 @@ BI.FirstPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -595,7 +595,7 @@ BI.IconArrowNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30, + height: 24, iconHeight: 12, iconWidth: 12, iconCls: "" @@ -691,7 +691,7 @@ BI.LastPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -772,7 +772,7 @@ BI.MidPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -845,7 +845,7 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro id: "", pId: "", open: false, - height: 30, + height: 24, iconHeight: 16, iconWidth: 16, iconCls: "" @@ -941,7 +941,7 @@ BI.PlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -1062,7 +1062,7 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 30 + height: 24 }); }, _init: function () { @@ -1091,19 +1091,19 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : { - width: 16, + width: 12, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height } }), { - width: 30, + width: 24, el: { type: "bi.layout", cls: "first-line-conn-background", - width: 30, + width: 24, height: o.height } }, { @@ -1158,7 +1158,7 @@ BI.shortcut("bi.first_tree_leaf_item", BI.FirstTreeLeafItem);BI.IconTreeLeafItem logic: { dynamic: false }, - height: 30, + height: 24, iconWidth: 16, iconHeight: 16, iconCls: "" @@ -1253,7 +1253,7 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 30 + height: 24 }); }, _init: function () { @@ -1282,19 +1282,19 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : { - width: 16, + width: 12, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height } }), { - width: 30, + width: 24, el: { type: "bi.layout", cls: "last-line-conn-background", - width: 30, + width: 24, height: o.height } }, { @@ -1357,7 +1357,7 @@ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 30 + height: 24 }); }, _init: function () { @@ -1386,19 +1386,19 @@ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : { - width: 16, + width: 12, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height } }), { - width: 30, + width: 24, el: { type: "bi.layout", cls: "mid-line-conn-background", - width: 30, + width: 24, height: o.height } }, { @@ -1455,7 +1455,7 @@ BI.MultiLayerIconTreeLeafItem = BI.inherit(BI.BasicButton, { return BI.extend(BI.MultiLayerIconTreeLeafItem.superclass._defaultConfig.apply(this, arguments), { extraCls: "bi-multilayer-icon-tree-leaf-item bi-list-item-active", layer: 0, - height: 30, + height: 24, iconCls: "", iconHeight: 16, iconWidth: 16 @@ -1555,7 +1555,7 @@ BI.TreeTextLeafItem = BI.inherit(BI.BasicButton, { extraCls: "bi-tree-text-leaf-item bi-list-item-active", id: "", pId: "", - height: 30, + height: 24, hgap: 0, lgap: 0, rgap: 0 @@ -1777,7 +1777,7 @@ BI.Calendar = BI.inherit(BI.Widget, { whiteSpace: "normal", once: false, forceSelected: true, - height: 30, + height: 24, value: o.year + "-" + month + "-" + td.text, disabled: td.lastMonth || td.nextMonth || td.disabled, lgap: 5, @@ -1794,7 +1794,7 @@ BI.Calendar = BI.inherit(BI.Widget, { columns: 7, rows: 6, columnSize: [1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7], - rowSize: 30, + rowSize: 24, vgap: 10 }))] }); @@ -1943,7 +1943,7 @@ BI.YearCalendar = BI.inherit(BI.Widget, { whiteSpace: "normal", once: false, forceSelected: true, - height: 30, + height: 24, width: 45, value: td.text, disabled: td.disabled @@ -1959,7 +1959,7 @@ BI.YearCalendar = BI.inherit(BI.Widget, { columns: 2, rows: 6, columnSize: [1 / 2, 1 / 2], - rowSize: 30 + rowSize: 24 })), { type: "bi.center_adapt", vgap: 1 @@ -2073,8 +2073,8 @@ BI.FirstTreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend( BI.FirstTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type2", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, @@ -2096,8 +2096,8 @@ BI.LastTreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend(BI.LastTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type4", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, @@ -2119,8 +2119,8 @@ BI.MidTreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend( BI.MidTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type3", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, @@ -2142,8 +2142,8 @@ BI.TreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend( BI.TreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type1", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, @@ -4268,7 +4268,7 @@ BI.IconComboPopup = BI.inherit(BI.Pane, { type: "bi.button_group", items: BI.createItems(o.items, { type: "bi.single_select_icon_text_item", - height: 30 + height: 24 }), chooseType: o.chooseType, layouts: [{ @@ -4296,7 +4296,7 @@ BI.IconComboPopup = BI.inherit(BI.Pane, { BI.IconComboPopup.superclass.populate.apply(this, arguments); items = BI.createItems(items, { type: "bi.single_select_icon_text_item", - height: 30 + height: 24 }); this.popup.populate(items); }, @@ -4471,7 +4471,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, { el: this.trigger, popup: { el: this.popup, - maxHeight: 300 + maxHeight: 240 } }); if (BI.isKey(o.value)) { @@ -4530,7 +4530,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, { type: "bi.button_group", items: BI.createItems(o.items, { type: "bi.single_select_icon_text_item", - height: 30, + height: 24, iconHeight: o.iconHeight, iconWidth: o.iconWidth, iconWrapperWidth: o.iconWrapperWidth @@ -4569,7 +4569,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, { var o = this.options; items = BI.createItems(items, { type: "bi.single_select_icon_text_item", - height: 30, + height: 24, iconWrapperWidth: o.iconWrapperWidth, iconHeight: o.iconHeight, iconWidth: o.iconWidth @@ -5116,7 +5116,7 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T return BI.extend({ type: "bi.single_select_item", cls: "bi-list-item", - height: 30 + height: 24 }, item); }); }, @@ -5191,7 +5191,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, { el: this.trigger, popup: { el: this.popup, - maxHeight: 300 + maxHeight: 240 } }); if(BI.isKey(o.value)) { @@ -5280,7 +5280,7 @@ BI.SmallTextValueCombo = BI.inherit(BI.Widget, { el: this.trigger, popup: { el: this.popup, - maxHeight: 300 + maxHeight: 240 } }); }, @@ -5316,7 +5316,7 @@ BI.shortcut("bi.small_text_value_combo", BI.SmallTextValueCombo);BI.TextValueCom items: BI.createItems(o.items, { type: "bi.single_select_item", textAlign: o.textAlign, - height: 30 + height: 24 }), chooseType: o.chooseType, layouts: [{ @@ -5345,7 +5345,7 @@ BI.shortcut("bi.small_text_value_combo", BI.SmallTextValueCombo);BI.TextValueCom BI.TextValueComboPopup.superclass.populate.apply(this, arguments); items = BI.createItems(items, { type: "bi.single_select_item", - height: 30 + height: 24 }); this.popup.populate(items); }, diff --git a/dist/demo.js b/dist/demo.js index 74f30e88e..543d484b6 100644 --- a/dist/demo.js +++ b/dist/demo.js @@ -2711,8 +2711,7 @@ BI.shortcut("demo.lazy_loader", Demo.Func);Demo.Func = BI.inherit(BI.Widget, { } }, items: BI.createItems(BI.deepClone(Demo.CONSTANTS.SIMPLE_ITEMS), { - type: "bi.multi_select_item", - height: 30 + type: "bi.multi_select_item" }) }); } @@ -4389,7 +4388,7 @@ BI.shortcut("demo.combo_group", Demo.Func);Demo.Func = BI.inherit(BI.Widget, { type: "bi.button_group", items: BI.createItems(BI.deepClone(this.years), { type: "bi.single_select_radio_item", - height: 30, + height: 25, handler: function (v) { } @@ -5849,16 +5848,15 @@ BI.shortcut("demo.virtual_list", Demo.Func);Demo.AbsoluteLayout = BI.inherit(BI. render: function () { return { type: "bi.absolute", - scrollx: true, items: [{ el: { type: "bi.label", text: "绝对布局", cls: "layout-bg1", - width: 800, + width: 300, height: 200 }, - right: 100, + left: 100, top: 100 }] }; @@ -9218,11 +9216,9 @@ Demo.Items = BI.inherit(BI.Widget, { text: "单选item" }, { type: "bi.single_select_item", - height: 30, text: "单选项" }, { type: "bi.single_select_radio_item", - height: 30, text: "单选项" }, { type: "bi.label", @@ -9230,7 +9226,6 @@ Demo.Items = BI.inherit(BI.Widget, { text: "复选item" }, { type: "bi.multi_select_item", - height: 30, text: "复选项" }, { type: "bi.switch", diff --git a/dist/fineui.css b/dist/fineui.css index cd6d66dc4..872a06777 100644 --- a/dist/fineui.css +++ b/dist/fineui.css @@ -2193,10 +2193,10 @@ textarea { background: url('images/1x/icon/tree_vertical_line_4.png') no-repeat center center; } .ztree li ul.line { - background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 0 0; + background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0; } .bi-theme-dark .ztree li ul.line { - background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 0 0; + background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0; } .ztree li span.button.chk.checkbox_false_full { background: url('images/2x/icon/check_box_normal.png') no-repeat center center; @@ -3930,13 +3930,13 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before, } .ztree li ul { margin: 0; - padding: 0 0 0 22px; + padding: 0 0 0 18px; } .ztree li a { padding: 1px 3px 0 0; margin: 0; cursor: pointer; - height: 30px; + height: 24px; background-color: transparent; text-decoration: none; vertical-align: top; @@ -3978,7 +3978,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before, *border: 0px; } .ztree li span { - line-height: 30px; + line-height: 24px; margin-right: 2px; } .ztree li span.button { @@ -4050,8 +4050,8 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before, background-position: -42px -56px; } .ztree li span.button.switch { - width: 30px; - height: 30px; + width: 25px; + height: 25px; } .ztree li span.button.noline_open { background-position: -92px -72px; @@ -4664,10 +4664,10 @@ textarea::-webkit-scrollbar-thumb:hover { background: url('resources?path=/com/fr/web/ui/images/1x/icon/tree_vertical_line_4.png') no-repeat center center; } .ztree li ul.line { - background: url('resources?path=/com/fr/web/ui/images/1x/icon/tree_vertical_line_1.png') repeat-y 0 0; + background: url('resources?path=/com/fr/web/ui/images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0; } .bi-theme-dark .ztree li ul.line { - background: url('resources?path=/com/fr/web/ui/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 0 0; + background: url('resources?path=/com/fr/web/ui/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0; } .ztree li span.button.chk.checkbox_false_full { background: url('resources?path=/com/fr/web/ui/images/2x/icon/check_box_normal.png') no-repeat center center; diff --git a/dist/fineui.ie.js b/dist/fineui.ie.js index 2e1f95edb..72e82c15f 100644 --- a/dist/fineui.ie.js +++ b/dist/fineui.ie.js @@ -52606,7 +52606,7 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -52659,7 +52659,7 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, { BI.ArrowNode.superclass.doClick.apply(this, arguments); this.checkbox.setSelected(this.isOpened()); }, - + setText: function (text) { BI.ArrowNode.superclass.setText.apply(this, arguments); this.text.setText(text); @@ -52688,7 +52688,7 @@ BI.FirstPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -52771,7 +52771,7 @@ BI.IconArrowNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30, + height: 24, iconHeight: 12, iconWidth: 12, iconCls: "" @@ -52867,7 +52867,7 @@ BI.LastPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -52948,7 +52948,7 @@ BI.MidPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -53021,7 +53021,7 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro id: "", pId: "", open: false, - height: 30, + height: 24, iconHeight: 16, iconWidth: 16, iconCls: "" @@ -53117,7 +53117,7 @@ BI.PlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -53238,7 +53238,7 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 30 + height: 24 }); }, _init: function () { @@ -53267,19 +53267,19 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : { - width: 16, + width: 12, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height } }), { - width: 30, + width: 24, el: { type: "bi.layout", cls: "first-line-conn-background", - width: 30, + width: 24, height: o.height } }, { @@ -53334,7 +53334,7 @@ BI.shortcut("bi.first_tree_leaf_item", BI.FirstTreeLeafItem);BI.IconTreeLeafItem logic: { dynamic: false }, - height: 30, + height: 24, iconWidth: 16, iconHeight: 16, iconCls: "" @@ -53429,7 +53429,7 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 30 + height: 24 }); }, _init: function () { @@ -53458,19 +53458,19 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : { - width: 16, + width: 12, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height } }), { - width: 30, + width: 24, el: { type: "bi.layout", cls: "last-line-conn-background", - width: 30, + width: 24, height: o.height } }, { @@ -53533,7 +53533,7 @@ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 30 + height: 24 }); }, _init: function () { @@ -53562,19 +53562,19 @@ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : { - width: 16, + width: 12, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height } }), { - width: 30, + width: 24, el: { type: "bi.layout", cls: "mid-line-conn-background", - width: 30, + width: 24, height: o.height } }, { @@ -53631,7 +53631,7 @@ BI.MultiLayerIconTreeLeafItem = BI.inherit(BI.BasicButton, { return BI.extend(BI.MultiLayerIconTreeLeafItem.superclass._defaultConfig.apply(this, arguments), { extraCls: "bi-multilayer-icon-tree-leaf-item bi-list-item-active", layer: 0, - height: 30, + height: 24, iconCls: "", iconHeight: 16, iconWidth: 16 @@ -53731,7 +53731,7 @@ BI.TreeTextLeafItem = BI.inherit(BI.BasicButton, { extraCls: "bi-tree-text-leaf-item bi-list-item-active", id: "", pId: "", - height: 30, + height: 24, hgap: 0, lgap: 0, rgap: 0 @@ -53953,7 +53953,7 @@ BI.Calendar = BI.inherit(BI.Widget, { whiteSpace: "normal", once: false, forceSelected: true, - height: 30, + height: 24, value: o.year + "-" + month + "-" + td.text, disabled: td.lastMonth || td.nextMonth || td.disabled, lgap: 5, @@ -53970,7 +53970,7 @@ BI.Calendar = BI.inherit(BI.Widget, { columns: 7, rows: 6, columnSize: [1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7], - rowSize: 30, + rowSize: 24, vgap: 10 }))] }); @@ -54119,7 +54119,7 @@ BI.YearCalendar = BI.inherit(BI.Widget, { whiteSpace: "normal", once: false, forceSelected: true, - height: 30, + height: 24, width: 45, value: td.text, disabled: td.disabled @@ -54135,7 +54135,7 @@ BI.YearCalendar = BI.inherit(BI.Widget, { columns: 2, rows: 6, columnSize: [1 / 2, 1 / 2], - rowSize: 30 + rowSize: 24 })), { type: "bi.center_adapt", vgap: 1 @@ -54249,8 +54249,8 @@ BI.FirstTreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend( BI.FirstTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type2", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, @@ -54272,8 +54272,8 @@ BI.LastTreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend(BI.LastTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type4", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, @@ -54295,8 +54295,8 @@ BI.MidTreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend( BI.MidTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type3", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, @@ -54318,8 +54318,8 @@ BI.TreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend( BI.TreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type1", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, @@ -56444,7 +56444,7 @@ BI.IconComboPopup = BI.inherit(BI.Pane, { type: "bi.button_group", items: BI.createItems(o.items, { type: "bi.single_select_icon_text_item", - height: 30 + height: 24 }), chooseType: o.chooseType, layouts: [{ @@ -56472,7 +56472,7 @@ BI.IconComboPopup = BI.inherit(BI.Pane, { BI.IconComboPopup.superclass.populate.apply(this, arguments); items = BI.createItems(items, { type: "bi.single_select_icon_text_item", - height: 30 + height: 24 }); this.popup.populate(items); }, @@ -56647,7 +56647,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, { el: this.trigger, popup: { el: this.popup, - maxHeight: 300 + maxHeight: 240 } }); if (BI.isKey(o.value)) { @@ -56706,7 +56706,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, { type: "bi.button_group", items: BI.createItems(o.items, { type: "bi.single_select_icon_text_item", - height: 30, + height: 24, iconHeight: o.iconHeight, iconWidth: o.iconWidth, iconWrapperWidth: o.iconWrapperWidth @@ -56745,7 +56745,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, { var o = this.options; items = BI.createItems(items, { type: "bi.single_select_icon_text_item", - height: 30, + height: 24, iconWrapperWidth: o.iconWrapperWidth, iconHeight: o.iconHeight, iconWidth: o.iconWidth @@ -57292,7 +57292,7 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T return BI.extend({ type: "bi.single_select_item", cls: "bi-list-item", - height: 30 + height: 24 }, item); }); }, @@ -57367,7 +57367,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, { el: this.trigger, popup: { el: this.popup, - maxHeight: 300 + maxHeight: 240 } }); if(BI.isKey(o.value)) { @@ -57456,7 +57456,7 @@ BI.SmallTextValueCombo = BI.inherit(BI.Widget, { el: this.trigger, popup: { el: this.popup, - maxHeight: 300 + maxHeight: 240 } }); }, @@ -57492,7 +57492,7 @@ BI.shortcut("bi.small_text_value_combo", BI.SmallTextValueCombo);BI.TextValueCom items: BI.createItems(o.items, { type: "bi.single_select_item", textAlign: o.textAlign, - height: 30 + height: 24 }), chooseType: o.chooseType, layouts: [{ @@ -57521,7 +57521,7 @@ BI.shortcut("bi.small_text_value_combo", BI.SmallTextValueCombo);BI.TextValueCom BI.TextValueComboPopup.superclass.populate.apply(this, arguments); items = BI.createItems(items, { type: "bi.single_select_item", - height: 30 + height: 24 }); this.popup.populate(items); }, @@ -63125,7 +63125,7 @@ BI.extend(BI.DynamicDatePane, { BI.DateTimeCombo = BI.inherit(BI.Single, { constants: { popupHeight: 290, - popupWidth: 310, + popupWidth: 270, comboAdjustHeight: 1, border: 1 }, @@ -63260,8 +63260,8 @@ BI.DateTimePopup = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.DateTimePopup.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-date-time-popup", - width: 310, - height: 410 + width: 268, + height: 374 }); }, _init: function () { @@ -63896,7 +63896,7 @@ BI.shortcut("bi.down_list_group", BI.DownListGroup);BI.DownListItem = BI.inherit return BI.extend(conf, { baseCls: "bi-down-list-item bi-list-item-active", cls: "", - height: 30, + height: 24, logic: { dynamic: true }, @@ -64109,7 +64109,7 @@ BI.shortcut("bi.down_list_group_item", BI.DownListGroupItem);/** BI.DownListPopup = BI.inherit(BI.Pane, { constants: { nextIcon: "pull-right-e-font", - height: 30, + height: 24, iconHeight: 12, iconWidth: 12, hgap: 0, @@ -65223,8 +65223,8 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, { props: { baseCls: "bi-dynamic-date-popup", - width: 290, - height: 380 + width: 248, + height: 344 }, _init: function () { @@ -66074,8 +66074,8 @@ BI.extend(BI.DynamicDateTimeCombo, { props: { baseCls: "bi-dynamic-date-time-popup", - width: 290, - height: 421 + width: 248, + height: 385 }, _init: function () { @@ -68154,7 +68154,7 @@ BI.MonthPopup = BI.inherit(BI.Widget, { whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30, + height: 23, width: 38, value: td, text: td @@ -68173,7 +68173,7 @@ BI.MonthPopup = BI.inherit(BI.Widget, { columns: 2, rows: 6, columnSize: [1 / 2, 1 / 2], - rowSize: 30 + rowSize: 25 })), { type: "bi.center_adapt", vgap: 1, @@ -68406,7 +68406,7 @@ BI.shortcut("bi.multi_layer_down_list_combo", BI.DownListCombo);/** BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, { constants: { nextIcon: "pull-right-e-font", - height: 30, + height: 25, iconHeight: 12, iconWidth: 12, hgap: 0, @@ -69305,7 +69305,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -69346,7 +69346,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -69354,7 +69354,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -69408,7 +69408,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -69449,7 +69449,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -69457,7 +69457,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -69507,7 +69507,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -69548,7 +69548,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -69556,7 +69556,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -69606,7 +69606,7 @@ BI.MultiLayerSelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -69647,7 +69647,7 @@ BI.MultiLayerSelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -69655,7 +69655,7 @@ BI.MultiLayerSelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -70271,7 +70271,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -70293,7 +70293,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -70301,7 +70301,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -70374,7 +70374,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -70396,7 +70396,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -70404,7 +70404,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -70476,7 +70476,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -70498,7 +70498,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -70506,7 +70506,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -70576,7 +70576,7 @@ BI.MultiLayerSingleTreePlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -70598,7 +70598,7 @@ BI.MultiLayerSingleTreePlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -70679,7 +70679,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, { layer: 0, id: "", pId: "", - height: 30 + height: 24 }); }, _init: function () { @@ -70722,7 +70722,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -70730,7 +70730,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -70778,7 +70778,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, { layer: 0, id: "", pId: "", - height: 30 + height: 24 }); }, _init: function () { @@ -70820,7 +70820,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -70828,7 +70828,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -70876,7 +70876,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, { layer: 0, id: "", pId: "", - height: 30 + height: 24 }); }, _init: function () { @@ -70918,7 +70918,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -70926,7 +70926,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -72637,7 +72637,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, { type: "bi.multi_select_item", logic: this.options.logic, cls: "bi-list-item-active", - height: 30, + height: 24, selected: this.isAllSelected(), iconWrapperWidth: 36 }); @@ -78139,7 +78139,7 @@ BI.QuarterPopup = BI.inherit(BI.Widget, { whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30 + height: 25 }); }); @@ -79035,7 +79035,7 @@ BI.SearchMultiSelectLoader = BI.inherit(BI.Widget, { type: "bi.multi_select_item", logic: this.options.logic, cls: "bi-list-item-active", - height: 30, + height: 24, selected: this.isAllSelected(), iconWrapperWidth: 36 }); @@ -79376,7 +79376,7 @@ BI.SelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -79461,7 +79461,7 @@ BI.SelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -79546,7 +79546,7 @@ BI.SelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -79631,7 +79631,7 @@ BI.SelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -81223,7 +81223,7 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, { type: this.options.allowNoSelect ? "bi.single_select_item" : "bi.single_select_combo_item", logic: this.options.logic, cls: "bi-list-item-active", - height: 30, + height: 24, selected: false }); }, @@ -84694,7 +84694,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, { min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期, width: 180, - height: 276 + height: 240 }, render: function () { @@ -85151,7 +85151,7 @@ BI.shortcut("bi.dynamic_year_month_card", BI.DynamicYearMonthCard);BI.StaticYear whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30, + height: 23, width: 38, value: td, text: td @@ -85195,7 +85195,7 @@ BI.shortcut("bi.dynamic_year_month_card", BI.DynamicYearMonthCard);BI.StaticYear columns: 2, rows: 6, columnSize: [1 / 2, 1 / 2], - rowSize: 30 + rowSize: 25 })), { type: "bi.center_adapt", vgap: 1, @@ -85449,7 +85449,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, { min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期, width: 180, - height: 270 + height: 240 }, render: function () { @@ -86191,7 +86191,7 @@ BI.shortcut("bi.dynamic_year_quarter_card", BI.DynamicYearQuarterCard);BI.Static whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30 + height: 24 }); }); }, @@ -86449,7 +86449,7 @@ BI.extend(BI.DynamicYearQuarterCombo, { min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期, width: 180, - height: 260 + height: 240 }, render: function () { @@ -86914,10 +86914,12 @@ BI.AbstractAllValueChooser = BI.inherit(BI.Widget, { if (options.keyword) { keywords.push(options.keyword); } + var resultItems = []; BI.each(keywords, function (i, kw) { var search = BI.Func.getSearchResult(items, kw); - items = search.match.concat(search.find); + resultItems = resultItems.concat(search.match).concat(search.find); }); + resultItems = BI.uniq(resultItems); if (options.selectedValues) {// 过滤 var filter = BI.makeObject(options.selectedValues, true); items = BI.filter(items, function (i, ob) { diff --git a/dist/fineui.js b/dist/fineui.js index ffcb0d5f5..95d45d044 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -53010,7 +53010,7 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -53063,7 +53063,7 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, { BI.ArrowNode.superclass.doClick.apply(this, arguments); this.checkbox.setSelected(this.isOpened()); }, - + setText: function (text) { BI.ArrowNode.superclass.setText.apply(this, arguments); this.text.setText(text); @@ -53092,7 +53092,7 @@ BI.FirstPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -53175,7 +53175,7 @@ BI.IconArrowNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30, + height: 24, iconHeight: 12, iconWidth: 12, iconCls: "" @@ -53271,7 +53271,7 @@ BI.LastPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -53352,7 +53352,7 @@ BI.MidPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -53425,7 +53425,7 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro id: "", pId: "", open: false, - height: 30, + height: 24, iconHeight: 16, iconWidth: 16, iconCls: "" @@ -53521,7 +53521,7 @@ BI.PlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -53642,7 +53642,7 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 30 + height: 24 }); }, _init: function () { @@ -53671,19 +53671,19 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : { - width: 16, + width: 12, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height } }), { - width: 30, + width: 24, el: { type: "bi.layout", cls: "first-line-conn-background", - width: 30, + width: 24, height: o.height } }, { @@ -53738,7 +53738,7 @@ BI.shortcut("bi.first_tree_leaf_item", BI.FirstTreeLeafItem);BI.IconTreeLeafItem logic: { dynamic: false }, - height: 30, + height: 24, iconWidth: 16, iconHeight: 16, iconCls: "" @@ -53833,7 +53833,7 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 30 + height: 24 }); }, _init: function () { @@ -53862,19 +53862,19 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : { - width: 16, + width: 12, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height } }), { - width: 30, + width: 24, el: { type: "bi.layout", cls: "last-line-conn-background", - width: 30, + width: 24, height: o.height } }, { @@ -53937,7 +53937,7 @@ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 30 + height: 24 }); }, _init: function () { @@ -53966,19 +53966,19 @@ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : { - width: 16, + width: 12, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height } }), { - width: 30, + width: 24, el: { type: "bi.layout", cls: "mid-line-conn-background", - width: 30, + width: 24, height: o.height } }, { @@ -54035,7 +54035,7 @@ BI.MultiLayerIconTreeLeafItem = BI.inherit(BI.BasicButton, { return BI.extend(BI.MultiLayerIconTreeLeafItem.superclass._defaultConfig.apply(this, arguments), { extraCls: "bi-multilayer-icon-tree-leaf-item bi-list-item-active", layer: 0, - height: 30, + height: 24, iconCls: "", iconHeight: 16, iconWidth: 16 @@ -54135,7 +54135,7 @@ BI.TreeTextLeafItem = BI.inherit(BI.BasicButton, { extraCls: "bi-tree-text-leaf-item bi-list-item-active", id: "", pId: "", - height: 30, + height: 24, hgap: 0, lgap: 0, rgap: 0 @@ -54357,7 +54357,7 @@ BI.Calendar = BI.inherit(BI.Widget, { whiteSpace: "normal", once: false, forceSelected: true, - height: 30, + height: 24, value: o.year + "-" + month + "-" + td.text, disabled: td.lastMonth || td.nextMonth || td.disabled, lgap: 5, @@ -54374,7 +54374,7 @@ BI.Calendar = BI.inherit(BI.Widget, { columns: 7, rows: 6, columnSize: [1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7], - rowSize: 30, + rowSize: 24, vgap: 10 }))] }); @@ -54523,7 +54523,7 @@ BI.YearCalendar = BI.inherit(BI.Widget, { whiteSpace: "normal", once: false, forceSelected: true, - height: 30, + height: 24, width: 45, value: td.text, disabled: td.disabled @@ -54539,7 +54539,7 @@ BI.YearCalendar = BI.inherit(BI.Widget, { columns: 2, rows: 6, columnSize: [1 / 2, 1 / 2], - rowSize: 30 + rowSize: 24 })), { type: "bi.center_adapt", vgap: 1 @@ -54653,8 +54653,8 @@ BI.FirstTreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend( BI.FirstTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type2", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, @@ -54676,8 +54676,8 @@ BI.LastTreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend(BI.LastTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type4", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, @@ -54699,8 +54699,8 @@ BI.MidTreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend( BI.MidTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type3", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, @@ -54722,8 +54722,8 @@ BI.TreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend( BI.TreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type1", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, @@ -56848,7 +56848,7 @@ BI.IconComboPopup = BI.inherit(BI.Pane, { type: "bi.button_group", items: BI.createItems(o.items, { type: "bi.single_select_icon_text_item", - height: 30 + height: 24 }), chooseType: o.chooseType, layouts: [{ @@ -56876,7 +56876,7 @@ BI.IconComboPopup = BI.inherit(BI.Pane, { BI.IconComboPopup.superclass.populate.apply(this, arguments); items = BI.createItems(items, { type: "bi.single_select_icon_text_item", - height: 30 + height: 24 }); this.popup.populate(items); }, @@ -57051,7 +57051,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, { el: this.trigger, popup: { el: this.popup, - maxHeight: 300 + maxHeight: 240 } }); if (BI.isKey(o.value)) { @@ -57110,7 +57110,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, { type: "bi.button_group", items: BI.createItems(o.items, { type: "bi.single_select_icon_text_item", - height: 30, + height: 24, iconHeight: o.iconHeight, iconWidth: o.iconWidth, iconWrapperWidth: o.iconWrapperWidth @@ -57149,7 +57149,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, { var o = this.options; items = BI.createItems(items, { type: "bi.single_select_icon_text_item", - height: 30, + height: 24, iconWrapperWidth: o.iconWrapperWidth, iconHeight: o.iconHeight, iconWidth: o.iconWidth @@ -57696,7 +57696,7 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T return BI.extend({ type: "bi.single_select_item", cls: "bi-list-item", - height: 30 + height: 24 }, item); }); }, @@ -57771,7 +57771,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, { el: this.trigger, popup: { el: this.popup, - maxHeight: 300 + maxHeight: 240 } }); if(BI.isKey(o.value)) { @@ -57860,7 +57860,7 @@ BI.SmallTextValueCombo = BI.inherit(BI.Widget, { el: this.trigger, popup: { el: this.popup, - maxHeight: 300 + maxHeight: 240 } }); }, @@ -57896,7 +57896,7 @@ BI.shortcut("bi.small_text_value_combo", BI.SmallTextValueCombo);BI.TextValueCom items: BI.createItems(o.items, { type: "bi.single_select_item", textAlign: o.textAlign, - height: 30 + height: 24 }), chooseType: o.chooseType, layouts: [{ @@ -57925,7 +57925,7 @@ BI.shortcut("bi.small_text_value_combo", BI.SmallTextValueCombo);BI.TextValueCom BI.TextValueComboPopup.superclass.populate.apply(this, arguments); items = BI.createItems(items, { type: "bi.single_select_item", - height: 30 + height: 24 }); this.popup.populate(items); }, @@ -63529,7 +63529,7 @@ BI.extend(BI.DynamicDatePane, { BI.DateTimeCombo = BI.inherit(BI.Single, { constants: { popupHeight: 290, - popupWidth: 310, + popupWidth: 270, comboAdjustHeight: 1, border: 1 }, @@ -63664,8 +63664,8 @@ BI.DateTimePopup = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.DateTimePopup.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-date-time-popup", - width: 310, - height: 410 + width: 268, + height: 374 }); }, _init: function () { @@ -64300,7 +64300,7 @@ BI.shortcut("bi.down_list_group", BI.DownListGroup);BI.DownListItem = BI.inherit return BI.extend(conf, { baseCls: "bi-down-list-item bi-list-item-active", cls: "", - height: 30, + height: 24, logic: { dynamic: true }, @@ -64513,7 +64513,7 @@ BI.shortcut("bi.down_list_group_item", BI.DownListGroupItem);/** BI.DownListPopup = BI.inherit(BI.Pane, { constants: { nextIcon: "pull-right-e-font", - height: 30, + height: 24, iconHeight: 12, iconWidth: 12, hgap: 0, @@ -65627,8 +65627,8 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, { props: { baseCls: "bi-dynamic-date-popup", - width: 290, - height: 380 + width: 248, + height: 344 }, _init: function () { @@ -66478,8 +66478,8 @@ BI.extend(BI.DynamicDateTimeCombo, { props: { baseCls: "bi-dynamic-date-time-popup", - width: 290, - height: 421 + width: 248, + height: 385 }, _init: function () { @@ -68558,7 +68558,7 @@ BI.MonthPopup = BI.inherit(BI.Widget, { whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30, + height: 23, width: 38, value: td, text: td @@ -68577,7 +68577,7 @@ BI.MonthPopup = BI.inherit(BI.Widget, { columns: 2, rows: 6, columnSize: [1 / 2, 1 / 2], - rowSize: 30 + rowSize: 25 })), { type: "bi.center_adapt", vgap: 1, @@ -68810,7 +68810,7 @@ BI.shortcut("bi.multi_layer_down_list_combo", BI.DownListCombo);/** BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, { constants: { nextIcon: "pull-right-e-font", - height: 30, + height: 25, iconHeight: 12, iconWidth: 12, hgap: 0, @@ -69709,7 +69709,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -69750,7 +69750,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -69758,7 +69758,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -69812,7 +69812,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -69853,7 +69853,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -69861,7 +69861,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -69911,7 +69911,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -69952,7 +69952,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -69960,7 +69960,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -70010,7 +70010,7 @@ BI.MultiLayerSelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -70051,7 +70051,7 @@ BI.MultiLayerSelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -70059,7 +70059,7 @@ BI.MultiLayerSelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -70675,7 +70675,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -70697,7 +70697,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -70705,7 +70705,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -70778,7 +70778,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -70800,7 +70800,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -70808,7 +70808,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -70880,7 +70880,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -70902,7 +70902,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -70910,7 +70910,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -70980,7 +70980,7 @@ BI.MultiLayerSingleTreePlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -71002,7 +71002,7 @@ BI.MultiLayerSingleTreePlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -71083,7 +71083,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, { layer: 0, id: "", pId: "", - height: 30 + height: 24 }); }, _init: function () { @@ -71126,7 +71126,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -71134,7 +71134,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -71182,7 +71182,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, { layer: 0, id: "", pId: "", - height: 30 + height: 24 }); }, _init: function () { @@ -71224,7 +71224,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -71232,7 +71232,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -71280,7 +71280,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, { layer: 0, id: "", pId: "", - height: 30 + height: 24 }); }, _init: function () { @@ -71322,7 +71322,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -71330,7 +71330,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -73041,7 +73041,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, { type: "bi.multi_select_item", logic: this.options.logic, cls: "bi-list-item-active", - height: 30, + height: 24, selected: this.isAllSelected(), iconWrapperWidth: 36 }); @@ -78543,7 +78543,7 @@ BI.QuarterPopup = BI.inherit(BI.Widget, { whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30 + height: 25 }); }); @@ -79439,7 +79439,7 @@ BI.SearchMultiSelectLoader = BI.inherit(BI.Widget, { type: "bi.multi_select_item", logic: this.options.logic, cls: "bi-list-item-active", - height: 30, + height: 24, selected: this.isAllSelected(), iconWrapperWidth: 36 }); @@ -79780,7 +79780,7 @@ BI.SelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -79865,7 +79865,7 @@ BI.SelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -79950,7 +79950,7 @@ BI.SelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -80035,7 +80035,7 @@ BI.SelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -81627,7 +81627,7 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, { type: this.options.allowNoSelect ? "bi.single_select_item" : "bi.single_select_combo_item", logic: this.options.logic, cls: "bi-list-item-active", - height: 30, + height: 24, selected: false }); }, @@ -85098,7 +85098,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, { min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期, width: 180, - height: 276 + height: 240 }, render: function () { @@ -85555,7 +85555,7 @@ BI.shortcut("bi.dynamic_year_month_card", BI.DynamicYearMonthCard);BI.StaticYear whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30, + height: 23, width: 38, value: td, text: td @@ -85599,7 +85599,7 @@ BI.shortcut("bi.dynamic_year_month_card", BI.DynamicYearMonthCard);BI.StaticYear columns: 2, rows: 6, columnSize: [1 / 2, 1 / 2], - rowSize: 30 + rowSize: 25 })), { type: "bi.center_adapt", vgap: 1, @@ -85853,7 +85853,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, { min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期, width: 180, - height: 270 + height: 240 }, render: function () { @@ -86595,7 +86595,7 @@ BI.shortcut("bi.dynamic_year_quarter_card", BI.DynamicYearQuarterCard);BI.Static whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30 + height: 24 }); }); }, @@ -86853,7 +86853,7 @@ BI.extend(BI.DynamicYearQuarterCombo, { min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期, width: 180, - height: 260 + height: 240 }, render: function () { @@ -87318,10 +87318,12 @@ BI.AbstractAllValueChooser = BI.inherit(BI.Widget, { if (options.keyword) { keywords.push(options.keyword); } + var resultItems = []; BI.each(keywords, function (i, kw) { var search = BI.Func.getSearchResult(items, kw); - items = search.match.concat(search.find); + resultItems = resultItems.concat(search.match).concat(search.find); }); + resultItems = BI.uniq(resultItems); if (options.selectedValues) {// 过滤 var filter = BI.makeObject(options.selectedValues, true); items = BI.filter(items, function (i, ob) { diff --git a/dist/fineui_without_jquery_polyfill.js b/dist/fineui_without_jquery_polyfill.js index af56fba2d..4927eb3c1 100644 --- a/dist/fineui_without_jquery_polyfill.js +++ b/dist/fineui_without_jquery_polyfill.js @@ -37162,7 +37162,7 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -37215,7 +37215,7 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, { BI.ArrowNode.superclass.doClick.apply(this, arguments); this.checkbox.setSelected(this.isOpened()); }, - + setText: function (text) { BI.ArrowNode.superclass.setText.apply(this, arguments); this.text.setText(text); @@ -37244,7 +37244,7 @@ BI.FirstPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -37327,7 +37327,7 @@ BI.IconArrowNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30, + height: 24, iconHeight: 12, iconWidth: 12, iconCls: "" @@ -37423,7 +37423,7 @@ BI.LastPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -37504,7 +37504,7 @@ BI.MidPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -37577,7 +37577,7 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro id: "", pId: "", open: false, - height: 30, + height: 24, iconHeight: 16, iconWidth: 16, iconCls: "" @@ -37673,7 +37673,7 @@ BI.PlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -37794,7 +37794,7 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 30 + height: 24 }); }, _init: function () { @@ -37823,19 +37823,19 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : { - width: 16, + width: 12, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height } }), { - width: 30, + width: 24, el: { type: "bi.layout", cls: "first-line-conn-background", - width: 30, + width: 24, height: o.height } }, { @@ -37890,7 +37890,7 @@ BI.shortcut("bi.first_tree_leaf_item", BI.FirstTreeLeafItem);BI.IconTreeLeafItem logic: { dynamic: false }, - height: 30, + height: 24, iconWidth: 16, iconHeight: 16, iconCls: "" @@ -37985,7 +37985,7 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 30 + height: 24 }); }, _init: function () { @@ -38014,19 +38014,19 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : { - width: 16, + width: 12, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height } }), { - width: 30, + width: 24, el: { type: "bi.layout", cls: "last-line-conn-background", - width: 30, + width: 24, height: o.height } }, { @@ -38089,7 +38089,7 @@ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 30 + height: 24 }); }, _init: function () { @@ -38118,19 +38118,19 @@ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : { - width: 16, + width: 12, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height } }), { - width: 30, + width: 24, el: { type: "bi.layout", cls: "mid-line-conn-background", - width: 30, + width: 24, height: o.height } }, { @@ -38187,7 +38187,7 @@ BI.MultiLayerIconTreeLeafItem = BI.inherit(BI.BasicButton, { return BI.extend(BI.MultiLayerIconTreeLeafItem.superclass._defaultConfig.apply(this, arguments), { extraCls: "bi-multilayer-icon-tree-leaf-item bi-list-item-active", layer: 0, - height: 30, + height: 24, iconCls: "", iconHeight: 16, iconWidth: 16 @@ -38287,7 +38287,7 @@ BI.TreeTextLeafItem = BI.inherit(BI.BasicButton, { extraCls: "bi-tree-text-leaf-item bi-list-item-active", id: "", pId: "", - height: 30, + height: 24, hgap: 0, lgap: 0, rgap: 0 @@ -38509,7 +38509,7 @@ BI.Calendar = BI.inherit(BI.Widget, { whiteSpace: "normal", once: false, forceSelected: true, - height: 30, + height: 24, value: o.year + "-" + month + "-" + td.text, disabled: td.lastMonth || td.nextMonth || td.disabled, lgap: 5, @@ -38526,7 +38526,7 @@ BI.Calendar = BI.inherit(BI.Widget, { columns: 7, rows: 6, columnSize: [1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7], - rowSize: 30, + rowSize: 24, vgap: 10 }))] }); @@ -38675,7 +38675,7 @@ BI.YearCalendar = BI.inherit(BI.Widget, { whiteSpace: "normal", once: false, forceSelected: true, - height: 30, + height: 24, width: 45, value: td.text, disabled: td.disabled @@ -38691,7 +38691,7 @@ BI.YearCalendar = BI.inherit(BI.Widget, { columns: 2, rows: 6, columnSize: [1 / 2, 1 / 2], - rowSize: 30 + rowSize: 24 })), { type: "bi.center_adapt", vgap: 1 @@ -38805,8 +38805,8 @@ BI.FirstTreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend( BI.FirstTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type2", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, @@ -38828,8 +38828,8 @@ BI.LastTreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend(BI.LastTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type4", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, @@ -38851,8 +38851,8 @@ BI.MidTreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend( BI.MidTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type3", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, @@ -38874,8 +38874,8 @@ BI.TreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend( BI.TreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type1", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, @@ -39457,7 +39457,7 @@ BI.IconComboPopup = BI.inherit(BI.Pane, { type: "bi.button_group", items: BI.createItems(o.items, { type: "bi.single_select_icon_text_item", - height: 30 + height: 24 }), chooseType: o.chooseType, layouts: [{ @@ -39485,7 +39485,7 @@ BI.IconComboPopup = BI.inherit(BI.Pane, { BI.IconComboPopup.superclass.populate.apply(this, arguments); items = BI.createItems(items, { type: "bi.single_select_icon_text_item", - height: 30 + height: 24 }); this.popup.populate(items); }, @@ -39660,7 +39660,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, { el: this.trigger, popup: { el: this.popup, - maxHeight: 300 + maxHeight: 240 } }); if (BI.isKey(o.value)) { @@ -39719,7 +39719,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, { type: "bi.button_group", items: BI.createItems(o.items, { type: "bi.single_select_icon_text_item", - height: 30, + height: 24, iconHeight: o.iconHeight, iconWidth: o.iconWidth, iconWrapperWidth: o.iconWrapperWidth @@ -39758,7 +39758,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, { var o = this.options; items = BI.createItems(items, { type: "bi.single_select_icon_text_item", - height: 30, + height: 24, iconWrapperWidth: o.iconWrapperWidth, iconHeight: o.iconHeight, iconWidth: o.iconWidth @@ -40305,7 +40305,7 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T return BI.extend({ type: "bi.single_select_item", cls: "bi-list-item", - height: 30 + height: 24 }, item); }); }, @@ -40380,7 +40380,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, { el: this.trigger, popup: { el: this.popup, - maxHeight: 300 + maxHeight: 240 } }); if(BI.isKey(o.value)) { @@ -40469,7 +40469,7 @@ BI.SmallTextValueCombo = BI.inherit(BI.Widget, { el: this.trigger, popup: { el: this.popup, - maxHeight: 300 + maxHeight: 240 } }); }, @@ -40505,7 +40505,7 @@ BI.shortcut("bi.small_text_value_combo", BI.SmallTextValueCombo);BI.TextValueCom items: BI.createItems(o.items, { type: "bi.single_select_item", textAlign: o.textAlign, - height: 30 + height: 24 }), chooseType: o.chooseType, layouts: [{ @@ -40534,7 +40534,7 @@ BI.shortcut("bi.small_text_value_combo", BI.SmallTextValueCombo);BI.TextValueCom BI.TextValueComboPopup.superclass.populate.apply(this, arguments); items = BI.createItems(items, { type: "bi.single_select_item", - height: 30 + height: 24 }); this.popup.populate(items); }, @@ -45862,7 +45862,7 @@ BI.extend(BI.DynamicDatePane, { BI.DateTimeCombo = BI.inherit(BI.Single, { constants: { popupHeight: 290, - popupWidth: 310, + popupWidth: 270, comboAdjustHeight: 1, border: 1 }, @@ -45997,8 +45997,8 @@ BI.DateTimePopup = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.DateTimePopup.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-date-time-popup", - width: 310, - height: 410 + width: 268, + height: 374 }); }, _init: function () { @@ -46633,7 +46633,7 @@ BI.shortcut("bi.down_list_group", BI.DownListGroup);BI.DownListItem = BI.inherit return BI.extend(conf, { baseCls: "bi-down-list-item bi-list-item-active", cls: "", - height: 30, + height: 24, logic: { dynamic: true }, @@ -46846,7 +46846,7 @@ BI.shortcut("bi.down_list_group_item", BI.DownListGroupItem);/** BI.DownListPopup = BI.inherit(BI.Pane, { constants: { nextIcon: "pull-right-e-font", - height: 30, + height: 24, iconHeight: 12, iconWidth: 12, hgap: 0, @@ -47960,8 +47960,8 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, { props: { baseCls: "bi-dynamic-date-popup", - width: 290, - height: 380 + width: 248, + height: 344 }, _init: function () { @@ -48811,8 +48811,8 @@ BI.extend(BI.DynamicDateTimeCombo, { props: { baseCls: "bi-dynamic-date-time-popup", - width: 290, - height: 421 + width: 248, + height: 385 }, _init: function () { @@ -50891,7 +50891,7 @@ BI.MonthPopup = BI.inherit(BI.Widget, { whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30, + height: 23, width: 38, value: td, text: td @@ -50910,7 +50910,7 @@ BI.MonthPopup = BI.inherit(BI.Widget, { columns: 2, rows: 6, columnSize: [1 / 2, 1 / 2], - rowSize: 30 + rowSize: 25 })), { type: "bi.center_adapt", vgap: 1, @@ -51143,7 +51143,7 @@ BI.shortcut("bi.multi_layer_down_list_combo", BI.DownListCombo);/** BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, { constants: { nextIcon: "pull-right-e-font", - height: 30, + height: 25, iconHeight: 12, iconWidth: 12, hgap: 0, @@ -52042,7 +52042,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -52083,7 +52083,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -52091,7 +52091,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -52145,7 +52145,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -52186,7 +52186,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -52194,7 +52194,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -52244,7 +52244,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -52285,7 +52285,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -52293,7 +52293,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -52343,7 +52343,7 @@ BI.MultiLayerSelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -52384,7 +52384,7 @@ BI.MultiLayerSelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -52392,7 +52392,7 @@ BI.MultiLayerSelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -53008,7 +53008,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -53030,7 +53030,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -53038,7 +53038,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -53111,7 +53111,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -53133,7 +53133,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -53141,7 +53141,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -53213,7 +53213,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -53235,7 +53235,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -53243,7 +53243,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -53313,7 +53313,7 @@ BI.MultiLayerSingleTreePlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -53335,7 +53335,7 @@ BI.MultiLayerSingleTreePlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -53416,7 +53416,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, { layer: 0, id: "", pId: "", - height: 30 + height: 24 }); }, _init: function () { @@ -53459,7 +53459,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -53467,7 +53467,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -53515,7 +53515,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, { layer: 0, id: "", pId: "", - height: 30 + height: 24 }); }, _init: function () { @@ -53557,7 +53557,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -53565,7 +53565,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -53613,7 +53613,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, { layer: 0, id: "", pId: "", - height: 30 + height: 24 }); }, _init: function () { @@ -53655,7 +53655,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -53663,7 +53663,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -55374,7 +55374,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, { type: "bi.multi_select_item", logic: this.options.logic, cls: "bi-list-item-active", - height: 30, + height: 24, selected: this.isAllSelected(), iconWrapperWidth: 36 }); @@ -60876,7 +60876,7 @@ BI.QuarterPopup = BI.inherit(BI.Widget, { whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30 + height: 25 }); }); @@ -61772,7 +61772,7 @@ BI.SearchMultiSelectLoader = BI.inherit(BI.Widget, { type: "bi.multi_select_item", logic: this.options.logic, cls: "bi-list-item-active", - height: 30, + height: 24, selected: this.isAllSelected(), iconWrapperWidth: 36 }); @@ -62113,7 +62113,7 @@ BI.SelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -62198,7 +62198,7 @@ BI.SelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -62283,7 +62283,7 @@ BI.SelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -62368,7 +62368,7 @@ BI.SelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -63960,7 +63960,7 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, { type: this.options.allowNoSelect ? "bi.single_select_item" : "bi.single_select_combo_item", logic: this.options.logic, cls: "bi-list-item-active", - height: 30, + height: 24, selected: false }); }, @@ -67431,7 +67431,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, { min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期, width: 180, - height: 276 + height: 240 }, render: function () { @@ -67888,7 +67888,7 @@ BI.shortcut("bi.dynamic_year_month_card", BI.DynamicYearMonthCard);BI.StaticYear whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30, + height: 23, width: 38, value: td, text: td @@ -67932,7 +67932,7 @@ BI.shortcut("bi.dynamic_year_month_card", BI.DynamicYearMonthCard);BI.StaticYear columns: 2, rows: 6, columnSize: [1 / 2, 1 / 2], - rowSize: 30 + rowSize: 25 })), { type: "bi.center_adapt", vgap: 1, @@ -68186,7 +68186,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, { min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期, width: 180, - height: 270 + height: 240 }, render: function () { @@ -68928,7 +68928,7 @@ BI.shortcut("bi.dynamic_year_quarter_card", BI.DynamicYearQuarterCard);BI.Static whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30 + height: 24 }); }); }, @@ -69186,7 +69186,7 @@ BI.extend(BI.DynamicYearQuarterCombo, { min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期, width: 180, - height: 260 + height: 240 }, render: function () { @@ -69651,10 +69651,12 @@ BI.AbstractAllValueChooser = BI.inherit(BI.Widget, { if (options.keyword) { keywords.push(options.keyword); } + var resultItems = []; BI.each(keywords, function (i, kw) { var search = BI.Func.getSearchResult(items, kw); - items = search.match.concat(search.find); + resultItems = resultItems.concat(search.match).concat(search.find); }); + resultItems = BI.uniq(resultItems); if (options.selectedValues) {// 过滤 var filter = BI.makeObject(options.selectedValues, true); items = BI.filter(items, function (i, ob) { diff --git a/dist/images/1x/icon/dark/tree_collapse_1.png b/dist/images/1x/icon/dark/tree_collapse_1.png index b0f79d361..3b8bcf82f 100644 Binary files a/dist/images/1x/icon/dark/tree_collapse_1.png and b/dist/images/1x/icon/dark/tree_collapse_1.png differ diff --git a/dist/images/1x/icon/dark/tree_collapse_2.png b/dist/images/1x/icon/dark/tree_collapse_2.png index 2f752d854..e05a3c2a1 100644 Binary files a/dist/images/1x/icon/dark/tree_collapse_2.png and b/dist/images/1x/icon/dark/tree_collapse_2.png differ diff --git a/dist/images/1x/icon/dark/tree_collapse_3.png b/dist/images/1x/icon/dark/tree_collapse_3.png index bb3d88bbb..b9435ff49 100644 Binary files a/dist/images/1x/icon/dark/tree_collapse_3.png and b/dist/images/1x/icon/dark/tree_collapse_3.png differ diff --git a/dist/images/1x/icon/dark/tree_collapse_4.png b/dist/images/1x/icon/dark/tree_collapse_4.png index 67bdd3d54..c83be64c7 100644 Binary files a/dist/images/1x/icon/dark/tree_collapse_4.png and b/dist/images/1x/icon/dark/tree_collapse_4.png differ diff --git a/dist/images/1x/icon/dark/tree_expand_1.png b/dist/images/1x/icon/dark/tree_expand_1.png index c695fb452..4538bdab3 100644 Binary files a/dist/images/1x/icon/dark/tree_expand_1.png and b/dist/images/1x/icon/dark/tree_expand_1.png differ diff --git a/dist/images/1x/icon/dark/tree_expand_2.png b/dist/images/1x/icon/dark/tree_expand_2.png index 6d46d8969..f6d8fe280 100644 Binary files a/dist/images/1x/icon/dark/tree_expand_2.png and b/dist/images/1x/icon/dark/tree_expand_2.png differ diff --git a/dist/images/1x/icon/dark/tree_expand_3.png b/dist/images/1x/icon/dark/tree_expand_3.png index e5e25e568..48283b573 100644 Binary files a/dist/images/1x/icon/dark/tree_expand_3.png and b/dist/images/1x/icon/dark/tree_expand_3.png differ diff --git a/dist/images/1x/icon/dark/tree_expand_4.png b/dist/images/1x/icon/dark/tree_expand_4.png index 26a90a077..0e2bd0c15 100644 Binary files a/dist/images/1x/icon/dark/tree_expand_4.png and b/dist/images/1x/icon/dark/tree_expand_4.png differ diff --git a/dist/images/1x/icon/dark/tree_vertical_line_1.png b/dist/images/1x/icon/dark/tree_vertical_line_1.png index b6e1f7305..da1525d02 100644 Binary files a/dist/images/1x/icon/dark/tree_vertical_line_1.png and b/dist/images/1x/icon/dark/tree_vertical_line_1.png differ diff --git a/dist/images/1x/icon/dark/tree_vertical_line_2.png b/dist/images/1x/icon/dark/tree_vertical_line_2.png index 3a2b4fa28..95dc9470b 100644 Binary files a/dist/images/1x/icon/dark/tree_vertical_line_2.png and b/dist/images/1x/icon/dark/tree_vertical_line_2.png differ diff --git a/dist/images/1x/icon/dark/tree_vertical_line_3.png b/dist/images/1x/icon/dark/tree_vertical_line_3.png index 1ad0a9c65..ecd99fd2d 100644 Binary files a/dist/images/1x/icon/dark/tree_vertical_line_3.png and b/dist/images/1x/icon/dark/tree_vertical_line_3.png differ diff --git a/dist/images/1x/icon/dark/tree_vertical_line_4.png b/dist/images/1x/icon/dark/tree_vertical_line_4.png index 81d482749..6584a862e 100644 Binary files a/dist/images/1x/icon/dark/tree_vertical_line_4.png and b/dist/images/1x/icon/dark/tree_vertical_line_4.png differ diff --git a/dist/images/1x/icon/dark/tree_vertical_line_5.png b/dist/images/1x/icon/dark/tree_vertical_line_5.png index fe4be5c8c..3125a9baa 100644 Binary files a/dist/images/1x/icon/dark/tree_vertical_line_5.png and b/dist/images/1x/icon/dark/tree_vertical_line_5.png differ diff --git a/dist/images/1x/icon/tree_collapse_1.png b/dist/images/1x/icon/tree_collapse_1.png index e0c3cce8c..d67ba2999 100644 Binary files a/dist/images/1x/icon/tree_collapse_1.png and b/dist/images/1x/icon/tree_collapse_1.png differ diff --git a/dist/images/1x/icon/tree_collapse_2.png b/dist/images/1x/icon/tree_collapse_2.png index b0e426aa8..6d807542f 100644 Binary files a/dist/images/1x/icon/tree_collapse_2.png and b/dist/images/1x/icon/tree_collapse_2.png differ diff --git a/dist/images/1x/icon/tree_collapse_3.png b/dist/images/1x/icon/tree_collapse_3.png index 924895f44..64cac3286 100644 Binary files a/dist/images/1x/icon/tree_collapse_3.png and b/dist/images/1x/icon/tree_collapse_3.png differ diff --git a/dist/images/1x/icon/tree_collapse_4.png b/dist/images/1x/icon/tree_collapse_4.png index a3a29ae3f..42d2a1ef8 100644 Binary files a/dist/images/1x/icon/tree_collapse_4.png and b/dist/images/1x/icon/tree_collapse_4.png differ diff --git a/dist/images/1x/icon/tree_expand_1.png b/dist/images/1x/icon/tree_expand_1.png index a65ecb8b4..578a49621 100644 Binary files a/dist/images/1x/icon/tree_expand_1.png and b/dist/images/1x/icon/tree_expand_1.png differ diff --git a/dist/images/1x/icon/tree_expand_2.png b/dist/images/1x/icon/tree_expand_2.png index fff764515..ec715ed54 100644 Binary files a/dist/images/1x/icon/tree_expand_2.png and b/dist/images/1x/icon/tree_expand_2.png differ diff --git a/dist/images/1x/icon/tree_expand_3.png b/dist/images/1x/icon/tree_expand_3.png index ae16937c5..dc32dc7f8 100644 Binary files a/dist/images/1x/icon/tree_expand_3.png and b/dist/images/1x/icon/tree_expand_3.png differ diff --git a/dist/images/1x/icon/tree_expand_4.png b/dist/images/1x/icon/tree_expand_4.png index a5cdaaeb4..f16647181 100644 Binary files a/dist/images/1x/icon/tree_expand_4.png and b/dist/images/1x/icon/tree_expand_4.png differ diff --git a/dist/images/1x/icon/tree_vertical_line_1.png b/dist/images/1x/icon/tree_vertical_line_1.png index 9137f76e8..1eae66352 100644 Binary files a/dist/images/1x/icon/tree_vertical_line_1.png and b/dist/images/1x/icon/tree_vertical_line_1.png differ diff --git a/dist/images/1x/icon/tree_vertical_line_2.png b/dist/images/1x/icon/tree_vertical_line_2.png index 317d309ff..9d160d99a 100644 Binary files a/dist/images/1x/icon/tree_vertical_line_2.png and b/dist/images/1x/icon/tree_vertical_line_2.png differ diff --git a/dist/images/1x/icon/tree_vertical_line_3.png b/dist/images/1x/icon/tree_vertical_line_3.png index 63a0aa51f..4b8c500a8 100644 Binary files a/dist/images/1x/icon/tree_vertical_line_3.png and b/dist/images/1x/icon/tree_vertical_line_3.png differ diff --git a/dist/images/1x/icon/tree_vertical_line_4.png b/dist/images/1x/icon/tree_vertical_line_4.png index 2b83c23e5..25be9ef04 100644 Binary files a/dist/images/1x/icon/tree_vertical_line_4.png and b/dist/images/1x/icon/tree_vertical_line_4.png differ diff --git a/dist/images/1x/icon/tree_vertical_line_5.png b/dist/images/1x/icon/tree_vertical_line_5.png index 0714ee954..c9a5754ac 100644 Binary files a/dist/images/1x/icon/tree_vertical_line_5.png and b/dist/images/1x/icon/tree_vertical_line_5.png differ diff --git a/dist/images/2x/icon/dark/tree_collapse_1.png b/dist/images/2x/icon/dark/tree_collapse_1.png index 36d99d6d6..b3f555f80 100644 Binary files a/dist/images/2x/icon/dark/tree_collapse_1.png and b/dist/images/2x/icon/dark/tree_collapse_1.png differ diff --git a/dist/images/2x/icon/dark/tree_collapse_2.png b/dist/images/2x/icon/dark/tree_collapse_2.png index f745a6469..4a78b939a 100644 Binary files a/dist/images/2x/icon/dark/tree_collapse_2.png and b/dist/images/2x/icon/dark/tree_collapse_2.png differ diff --git a/dist/images/2x/icon/dark/tree_collapse_3.png b/dist/images/2x/icon/dark/tree_collapse_3.png index ff860dbc6..3361b8a46 100644 Binary files a/dist/images/2x/icon/dark/tree_collapse_3.png and b/dist/images/2x/icon/dark/tree_collapse_3.png differ diff --git a/dist/images/2x/icon/dark/tree_collapse_4.png b/dist/images/2x/icon/dark/tree_collapse_4.png index b9b6464fd..9e7af4a78 100644 Binary files a/dist/images/2x/icon/dark/tree_collapse_4.png and b/dist/images/2x/icon/dark/tree_collapse_4.png differ diff --git a/dist/images/2x/icon/dark/tree_expand_1.png b/dist/images/2x/icon/dark/tree_expand_1.png index 5e343ab47..484843f1c 100644 Binary files a/dist/images/2x/icon/dark/tree_expand_1.png and b/dist/images/2x/icon/dark/tree_expand_1.png differ diff --git a/dist/images/2x/icon/dark/tree_expand_2.png b/dist/images/2x/icon/dark/tree_expand_2.png index 27a9457e9..d44e15d4e 100644 Binary files a/dist/images/2x/icon/dark/tree_expand_2.png and b/dist/images/2x/icon/dark/tree_expand_2.png differ diff --git a/dist/images/2x/icon/dark/tree_expand_3.png b/dist/images/2x/icon/dark/tree_expand_3.png index 7631b315d..3190b87f0 100644 Binary files a/dist/images/2x/icon/dark/tree_expand_3.png and b/dist/images/2x/icon/dark/tree_expand_3.png differ diff --git a/dist/images/2x/icon/dark/tree_expand_4.png b/dist/images/2x/icon/dark/tree_expand_4.png index 9c2e7958d..bf35d7548 100644 Binary files a/dist/images/2x/icon/dark/tree_expand_4.png and b/dist/images/2x/icon/dark/tree_expand_4.png differ diff --git a/dist/images/2x/icon/dark/tree_vertical_line_1.png b/dist/images/2x/icon/dark/tree_vertical_line_1.png index 1d75547b1..9ae642458 100644 Binary files a/dist/images/2x/icon/dark/tree_vertical_line_1.png and b/dist/images/2x/icon/dark/tree_vertical_line_1.png differ diff --git a/dist/images/2x/icon/dark/tree_vertical_line_2.png b/dist/images/2x/icon/dark/tree_vertical_line_2.png index 9c9959e50..0e43988fc 100644 Binary files a/dist/images/2x/icon/dark/tree_vertical_line_2.png and b/dist/images/2x/icon/dark/tree_vertical_line_2.png differ diff --git a/dist/images/2x/icon/dark/tree_vertical_line_3.png b/dist/images/2x/icon/dark/tree_vertical_line_3.png index 46c468dbf..54fd20153 100644 Binary files a/dist/images/2x/icon/dark/tree_vertical_line_3.png and b/dist/images/2x/icon/dark/tree_vertical_line_3.png differ diff --git a/dist/images/2x/icon/dark/tree_vertical_line_4.png b/dist/images/2x/icon/dark/tree_vertical_line_4.png index 24d5e260f..60f2c0a8c 100644 Binary files a/dist/images/2x/icon/dark/tree_vertical_line_4.png and b/dist/images/2x/icon/dark/tree_vertical_line_4.png differ diff --git a/dist/images/2x/icon/dark/tree_vertical_line_5.png b/dist/images/2x/icon/dark/tree_vertical_line_5.png index dc61baa27..27531a35b 100644 Binary files a/dist/images/2x/icon/dark/tree_vertical_line_5.png and b/dist/images/2x/icon/dark/tree_vertical_line_5.png differ diff --git a/dist/images/2x/icon/tree_collapse_1.png b/dist/images/2x/icon/tree_collapse_1.png index fda6e4884..2041a0e4b 100644 Binary files a/dist/images/2x/icon/tree_collapse_1.png and b/dist/images/2x/icon/tree_collapse_1.png differ diff --git a/dist/images/2x/icon/tree_collapse_2.png b/dist/images/2x/icon/tree_collapse_2.png index 89649e721..f2b989399 100644 Binary files a/dist/images/2x/icon/tree_collapse_2.png and b/dist/images/2x/icon/tree_collapse_2.png differ diff --git a/dist/images/2x/icon/tree_collapse_3.png b/dist/images/2x/icon/tree_collapse_3.png index 0bb8e69f5..24eb8e827 100644 Binary files a/dist/images/2x/icon/tree_collapse_3.png and b/dist/images/2x/icon/tree_collapse_3.png differ diff --git a/dist/images/2x/icon/tree_collapse_4.png b/dist/images/2x/icon/tree_collapse_4.png index 28eaf8d3b..242f034da 100644 Binary files a/dist/images/2x/icon/tree_collapse_4.png and b/dist/images/2x/icon/tree_collapse_4.png differ diff --git a/dist/images/2x/icon/tree_expand_1.png b/dist/images/2x/icon/tree_expand_1.png index 40d6d192f..9f5acc590 100644 Binary files a/dist/images/2x/icon/tree_expand_1.png and b/dist/images/2x/icon/tree_expand_1.png differ diff --git a/dist/images/2x/icon/tree_expand_2.png b/dist/images/2x/icon/tree_expand_2.png index 9066c8323..5b630d0a2 100644 Binary files a/dist/images/2x/icon/tree_expand_2.png and b/dist/images/2x/icon/tree_expand_2.png differ diff --git a/dist/images/2x/icon/tree_expand_3.png b/dist/images/2x/icon/tree_expand_3.png index 08c47be7f..b995958c0 100644 Binary files a/dist/images/2x/icon/tree_expand_3.png and b/dist/images/2x/icon/tree_expand_3.png differ diff --git a/dist/images/2x/icon/tree_expand_4.png b/dist/images/2x/icon/tree_expand_4.png index 69c8010ee..e8df787d6 100644 Binary files a/dist/images/2x/icon/tree_expand_4.png and b/dist/images/2x/icon/tree_expand_4.png differ diff --git a/dist/images/2x/icon/tree_vertical_line_1.png b/dist/images/2x/icon/tree_vertical_line_1.png index 545b1cbb4..ea9e933a0 100644 Binary files a/dist/images/2x/icon/tree_vertical_line_1.png and b/dist/images/2x/icon/tree_vertical_line_1.png differ diff --git a/dist/images/2x/icon/tree_vertical_line_2.png b/dist/images/2x/icon/tree_vertical_line_2.png index 06548083b..6b3a595e5 100644 Binary files a/dist/images/2x/icon/tree_vertical_line_2.png and b/dist/images/2x/icon/tree_vertical_line_2.png differ diff --git a/dist/images/2x/icon/tree_vertical_line_3.png b/dist/images/2x/icon/tree_vertical_line_3.png index 667a7c1ae..878ea613b 100644 Binary files a/dist/images/2x/icon/tree_vertical_line_3.png and b/dist/images/2x/icon/tree_vertical_line_3.png differ diff --git a/dist/images/2x/icon/tree_vertical_line_4.png b/dist/images/2x/icon/tree_vertical_line_4.png index f08cd60dd..7d9469617 100644 Binary files a/dist/images/2x/icon/tree_vertical_line_4.png and b/dist/images/2x/icon/tree_vertical_line_4.png differ diff --git a/dist/images/2x/icon/tree_vertical_line_5.png b/dist/images/2x/icon/tree_vertical_line_5.png index 1f743333b..3c3c9c8fe 100644 Binary files a/dist/images/2x/icon/tree_vertical_line_5.png and b/dist/images/2x/icon/tree_vertical_line_5.png differ diff --git a/dist/resource.css b/dist/resource.css index d34aa382c..1bb2e41c4 100644 --- a/dist/resource.css +++ b/dist/resource.css @@ -88,10 +88,10 @@ textarea::-webkit-scrollbar-thumb:hover { background: url('images/1x/icon/tree_vertical_line_4.png') no-repeat center center; } .ztree li ul.line { - background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 0 0; + background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0; } .bi-theme-dark .ztree li ul.line { - background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 0 0; + background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0; } .ztree li span.button.chk.checkbox_false_full { background: url('images/2x/icon/check_box_normal.png') no-repeat center center; diff --git a/dist/widget.js b/dist/widget.js index e3bed3fdb..9d492aadd 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -1024,7 +1024,7 @@ BI.extend(BI.DynamicDatePane, { BI.DateTimeCombo = BI.inherit(BI.Single, { constants: { popupHeight: 290, - popupWidth: 310, + popupWidth: 270, comboAdjustHeight: 1, border: 1 }, @@ -1159,8 +1159,8 @@ BI.DateTimePopup = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.DateTimePopup.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-date-time-popup", - width: 310, - height: 410 + width: 268, + height: 374 }); }, _init: function () { @@ -1795,7 +1795,7 @@ BI.shortcut("bi.down_list_group", BI.DownListGroup);BI.DownListItem = BI.inherit return BI.extend(conf, { baseCls: "bi-down-list-item bi-list-item-active", cls: "", - height: 30, + height: 24, logic: { dynamic: true }, @@ -2008,7 +2008,7 @@ BI.shortcut("bi.down_list_group_item", BI.DownListGroupItem);/** BI.DownListPopup = BI.inherit(BI.Pane, { constants: { nextIcon: "pull-right-e-font", - height: 30, + height: 24, iconHeight: 12, iconWidth: 12, hgap: 0, @@ -3122,8 +3122,8 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, { props: { baseCls: "bi-dynamic-date-popup", - width: 290, - height: 380 + width: 248, + height: 344 }, _init: function () { @@ -3973,8 +3973,8 @@ BI.extend(BI.DynamicDateTimeCombo, { props: { baseCls: "bi-dynamic-date-time-popup", - width: 290, - height: 421 + width: 248, + height: 385 }, _init: function () { @@ -6053,7 +6053,7 @@ BI.MonthPopup = BI.inherit(BI.Widget, { whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30, + height: 23, width: 38, value: td, text: td @@ -6072,7 +6072,7 @@ BI.MonthPopup = BI.inherit(BI.Widget, { columns: 2, rows: 6, columnSize: [1 / 2, 1 / 2], - rowSize: 30 + rowSize: 25 })), { type: "bi.center_adapt", vgap: 1, @@ -6305,7 +6305,7 @@ BI.shortcut("bi.multi_layer_down_list_combo", BI.DownListCombo);/** BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, { constants: { nextIcon: "pull-right-e-font", - height: 30, + height: 25, iconHeight: 12, iconWidth: 12, hgap: 0, @@ -7204,7 +7204,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -7245,7 +7245,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -7253,7 +7253,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -7307,7 +7307,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -7348,7 +7348,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -7356,7 +7356,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -7406,7 +7406,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -7447,7 +7447,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -7455,7 +7455,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -7505,7 +7505,7 @@ BI.MultiLayerSelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -7546,7 +7546,7 @@ BI.MultiLayerSelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -7554,7 +7554,7 @@ BI.MultiLayerSelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -8170,7 +8170,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -8192,7 +8192,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -8200,7 +8200,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -8273,7 +8273,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -8295,7 +8295,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -8303,7 +8303,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -8375,7 +8375,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -8397,7 +8397,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -8405,7 +8405,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -8475,7 +8475,7 @@ BI.MultiLayerSingleTreePlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -8497,7 +8497,7 @@ BI.MultiLayerSingleTreePlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -8578,7 +8578,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, { layer: 0, id: "", pId: "", - height: 30 + height: 24 }); }, _init: function () { @@ -8621,7 +8621,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -8629,7 +8629,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -8677,7 +8677,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, { layer: 0, id: "", pId: "", - height: 30 + height: 24 }); }, _init: function () { @@ -8719,7 +8719,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -8727,7 +8727,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -8775,7 +8775,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, { layer: 0, id: "", pId: "", - height: 30 + height: 24 }); }, _init: function () { @@ -8817,7 +8817,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -8825,7 +8825,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, @@ -10536,7 +10536,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, { type: "bi.multi_select_item", logic: this.options.logic, cls: "bi-list-item-active", - height: 30, + height: 24, selected: this.isAllSelected(), iconWrapperWidth: 36 }); @@ -16038,7 +16038,7 @@ BI.QuarterPopup = BI.inherit(BI.Widget, { whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30 + height: 25 }); }); @@ -16934,7 +16934,7 @@ BI.SearchMultiSelectLoader = BI.inherit(BI.Widget, { type: "bi.multi_select_item", logic: this.options.logic, cls: "bi-list-item-active", - height: 30, + height: 24, selected: this.isAllSelected(), iconWrapperWidth: 36 }); @@ -17275,7 +17275,7 @@ BI.SelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -17360,7 +17360,7 @@ BI.SelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -17445,7 +17445,7 @@ BI.SelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -17530,7 +17530,7 @@ BI.SelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -19122,7 +19122,7 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, { type: this.options.allowNoSelect ? "bi.single_select_item" : "bi.single_select_combo_item", logic: this.options.logic, cls: "bi-list-item-active", - height: 30, + height: 24, selected: false }); }, @@ -22593,7 +22593,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, { min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期, width: 180, - height: 276 + height: 240 }, render: function () { @@ -23050,7 +23050,7 @@ BI.shortcut("bi.dynamic_year_month_card", BI.DynamicYearMonthCard);BI.StaticYear whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30, + height: 23, width: 38, value: td, text: td @@ -23094,7 +23094,7 @@ BI.shortcut("bi.dynamic_year_month_card", BI.DynamicYearMonthCard);BI.StaticYear columns: 2, rows: 6, columnSize: [1 / 2, 1 / 2], - rowSize: 30 + rowSize: 25 })), { type: "bi.center_adapt", vgap: 1, @@ -23348,7 +23348,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, { min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期, width: 180, - height: 270 + height: 240 }, render: function () { @@ -24090,7 +24090,7 @@ BI.shortcut("bi.dynamic_year_quarter_card", BI.DynamicYearQuarterCard);BI.Static whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30 + height: 24 }); }); }, @@ -24348,7 +24348,7 @@ BI.extend(BI.DynamicYearQuarterCombo, { min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期, width: 180, - height: 260 + height: 240 }, render: function () { @@ -24813,10 +24813,12 @@ BI.AbstractAllValueChooser = BI.inherit(BI.Widget, { if (options.keyword) { keywords.push(options.keyword); } + var resultItems = []; BI.each(keywords, function (i, kw) { var search = BI.Func.getSearchResult(items, kw); - items = search.match.concat(search.find); + resultItems = resultItems.concat(search.match).concat(search.find); }); + resultItems = BI.uniq(resultItems); if (options.selectedValues) {// 过滤 var filter = BI.makeObject(options.selectedValues, true); items = BI.filter(items, function (i, ob) { diff --git a/public/css/background.css b/public/css/background.css index f136e8464..1440b9854 100644 --- a/public/css/background.css +++ b/public/css/background.css @@ -17,10 +17,10 @@ background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/icon/tree_vertical_line_4.png') no-repeat center center; } .ztree li ul.line { - background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/icon/tree_vertical_line_1.png') repeat-y 0 0; + background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0; } .bi-theme-dark .ztree li ul.line { - background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 0 0; + background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0; } .ztree li span.button.chk.checkbox_false_full { background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/2x/icon/check_box_normal.png') no-repeat center center; diff --git a/src/case/button/node/node.arrow.js b/src/case/button/node/node.arrow.js index 2bc7b2876..1955eafd7 100644 --- a/src/case/button/node/node.arrow.js +++ b/src/case/button/node/node.arrow.js @@ -12,7 +12,7 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -65,7 +65,7 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, { BI.ArrowNode.superclass.doClick.apply(this, arguments); this.checkbox.setSelected(this.isOpened()); }, - + setText: function (text) { BI.ArrowNode.superclass.setText.apply(this, arguments); this.text.setText(text); diff --git a/src/case/button/node/node.first.plus.js b/src/case/button/node/node.first.plus.js index 293fd1ab0..bb1f9c2dc 100644 --- a/src/case/button/node/node.first.plus.js +++ b/src/case/button/node/node.first.plus.js @@ -15,7 +15,7 @@ BI.FirstPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { diff --git a/src/case/button/node/node.icon.arrow.js b/src/case/button/node/node.icon.arrow.js index f315fae11..17fbd733a 100644 --- a/src/case/button/node/node.icon.arrow.js +++ b/src/case/button/node/node.icon.arrow.js @@ -17,7 +17,7 @@ BI.IconArrowNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30, + height: 24, iconHeight: 12, iconWidth: 12, iconCls: "" diff --git a/src/case/button/node/node.last.plus.js b/src/case/button/node/node.last.plus.js index 2771cdb00..acc72d6a3 100644 --- a/src/case/button/node/node.last.plus.js +++ b/src/case/button/node/node.last.plus.js @@ -15,7 +15,7 @@ BI.LastPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { diff --git a/src/case/button/node/node.mid.plus.js b/src/case/button/node/node.mid.plus.js index 34efa1b39..4615ce7b9 100644 --- a/src/case/button/node/node.mid.plus.js +++ b/src/case/button/node/node.mid.plus.js @@ -15,7 +15,7 @@ BI.MidPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { diff --git a/src/case/button/node/node.multilayer.icon.arrow.js b/src/case/button/node/node.multilayer.icon.arrow.js index b484867c4..1559db2cf 100644 --- a/src/case/button/node/node.multilayer.icon.arrow.js +++ b/src/case/button/node/node.multilayer.icon.arrow.js @@ -7,7 +7,7 @@ BI.MultiLayerIconArrowNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30, + height: 24, iconHeight: 16, iconWidth: 16, iconCls: "" diff --git a/src/case/button/node/node.plus.js b/src/case/button/node/node.plus.js index a881754b0..16b78b8f1 100644 --- a/src/case/button/node/node.plus.js +++ b/src/case/button/node/node.plus.js @@ -15,7 +15,7 @@ BI.PlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { diff --git a/src/case/button/treeitem/item.first.treeleaf.js b/src/case/button/treeitem/item.first.treeleaf.js index 89c0f3884..4db068ab8 100644 --- a/src/case/button/treeitem/item.first.treeleaf.js +++ b/src/case/button/treeitem/item.first.treeleaf.js @@ -13,7 +13,7 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 30 + height: 24 }); }, _init: function () { @@ -42,19 +42,19 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : { - width: 16, + width: 12, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height } }), { - width: 30, + width: 24, el: { type: "bi.layout", cls: "first-line-conn-background", - width: 30, + width: 24, height: o.height } }, { diff --git a/src/case/button/treeitem/item.icon.treeleaf.js b/src/case/button/treeitem/item.icon.treeleaf.js index 58698e88e..a7a18358b 100644 --- a/src/case/button/treeitem/item.icon.treeleaf.js +++ b/src/case/button/treeitem/item.icon.treeleaf.js @@ -5,7 +5,7 @@ BI.IconTreeLeafItem = BI.inherit(BI.BasicButton, { logic: { dynamic: false }, - height: 30, + height: 24, iconWidth: 16, iconHeight: 16, iconCls: "" diff --git a/src/case/button/treeitem/item.last.treeleaf.js b/src/case/button/treeitem/item.last.treeleaf.js index 557efa5b0..8f3f8e54a 100644 --- a/src/case/button/treeitem/item.last.treeleaf.js +++ b/src/case/button/treeitem/item.last.treeleaf.js @@ -13,7 +13,7 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 30 + height: 24 }); }, _init: function () { @@ -42,19 +42,19 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : { - width: 16, + width: 12, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height } }), { - width: 30, + width: 24, el: { type: "bi.layout", cls: "last-line-conn-background", - width: 30, + width: 24, height: o.height } }, { diff --git a/src/case/button/treeitem/item.mid.treeleaf.js b/src/case/button/treeitem/item.mid.treeleaf.js index 0dbafcefd..8b41612b0 100644 --- a/src/case/button/treeitem/item.mid.treeleaf.js +++ b/src/case/button/treeitem/item.mid.treeleaf.js @@ -13,7 +13,7 @@ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 30 + height: 24 }); }, _init: function () { @@ -42,19 +42,19 @@ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : { - width: 16, + width: 12, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height } }), { - width: 30, + width: 24, el: { type: "bi.layout", cls: "mid-line-conn-background", - width: 30, + width: 24, height: o.height } }, { diff --git a/src/case/button/treeitem/item.multilayer.icon.treeleaf.js b/src/case/button/treeitem/item.multilayer.icon.treeleaf.js index 92a8b876a..f4fcafea7 100644 --- a/src/case/button/treeitem/item.multilayer.icon.treeleaf.js +++ b/src/case/button/treeitem/item.multilayer.icon.treeleaf.js @@ -7,7 +7,7 @@ BI.MultiLayerIconTreeLeafItem = BI.inherit(BI.BasicButton, { return BI.extend(BI.MultiLayerIconTreeLeafItem.superclass._defaultConfig.apply(this, arguments), { extraCls: "bi-multilayer-icon-tree-leaf-item bi-list-item-active", layer: 0, - height: 30, + height: 24, iconCls: "", iconHeight: 16, iconWidth: 16 diff --git a/src/case/button/treeitem/item.treetextleaf.js b/src/case/button/treeitem/item.treetextleaf.js index 3dd9e3a5a..d2e2cf9d0 100644 --- a/src/case/button/treeitem/item.treetextleaf.js +++ b/src/case/button/treeitem/item.treetextleaf.js @@ -10,7 +10,7 @@ BI.TreeTextLeafItem = BI.inherit(BI.BasicButton, { extraCls: "bi-tree-text-leaf-item bi-list-item-active", id: "", pId: "", - height: 30, + height: 24, hgap: 0, lgap: 0, rgap: 0 diff --git a/src/case/calendar/calendar.js b/src/case/calendar/calendar.js index 5f61d7421..71d267776 100644 --- a/src/case/calendar/calendar.js +++ b/src/case/calendar/calendar.js @@ -112,7 +112,7 @@ BI.Calendar = BI.inherit(BI.Widget, { whiteSpace: "normal", once: false, forceSelected: true, - height: 30, + height: 24, value: o.year + "-" + month + "-" + td.text, disabled: td.lastMonth || td.nextMonth || td.disabled, lgap: 5, @@ -129,7 +129,7 @@ BI.Calendar = BI.inherit(BI.Widget, { columns: 7, rows: 6, columnSize: [1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7], - rowSize: 30, + rowSize: 24, vgap: 10 }))] }); diff --git a/src/case/calendar/calendar.year.js b/src/case/calendar/calendar.year.js index 078d1c2bf..cd70532be 100644 --- a/src/case/calendar/calendar.year.js +++ b/src/case/calendar/calendar.year.js @@ -67,7 +67,7 @@ BI.YearCalendar = BI.inherit(BI.Widget, { whiteSpace: "normal", once: false, forceSelected: true, - height: 30, + height: 24, width: 45, value: td.text, disabled: td.disabled @@ -83,7 +83,7 @@ BI.YearCalendar = BI.inherit(BI.Widget, { columns: 2, rows: 6, columnSize: [1 / 2, 1 / 2], - rowSize: 30 + rowSize: 24 })), { type: "bi.center_adapt", vgap: 1 diff --git a/src/case/checkbox/check.first.treenode.js b/src/case/checkbox/check.first.treenode.js index 71618353e..572908d8d 100644 --- a/src/case/checkbox/check.first.treenode.js +++ b/src/case/checkbox/check.first.treenode.js @@ -7,8 +7,8 @@ BI.FirstTreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend( BI.FirstTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type2", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, diff --git a/src/case/checkbox/check.last.treenode.js b/src/case/checkbox/check.last.treenode.js index a0f9eee6e..e0a9f621d 100644 --- a/src/case/checkbox/check.last.treenode.js +++ b/src/case/checkbox/check.last.treenode.js @@ -7,8 +7,8 @@ BI.LastTreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend(BI.LastTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type4", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, diff --git a/src/case/checkbox/check.mid.treenode.js b/src/case/checkbox/check.mid.treenode.js index 8543513a5..7679b466e 100644 --- a/src/case/checkbox/check.mid.treenode.js +++ b/src/case/checkbox/check.mid.treenode.js @@ -7,8 +7,8 @@ BI.MidTreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend( BI.MidTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type3", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, diff --git a/src/case/checkbox/check.treenode.js b/src/case/checkbox/check.treenode.js index 7e9dae5a3..b5642aae4 100644 --- a/src/case/checkbox/check.treenode.js +++ b/src/case/checkbox/check.treenode.js @@ -7,8 +7,8 @@ BI.TreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend( BI.TreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type1", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, diff --git a/src/case/combo/iconcombo/popup.iconcombo.js b/src/case/combo/iconcombo/popup.iconcombo.js index 9c2ebaa26..3cc4fcd32 100644 --- a/src/case/combo/iconcombo/popup.iconcombo.js +++ b/src/case/combo/iconcombo/popup.iconcombo.js @@ -19,7 +19,7 @@ BI.IconComboPopup = BI.inherit(BI.Pane, { type: "bi.button_group", items: BI.createItems(o.items, { type: "bi.single_select_icon_text_item", - height: 30 + height: 24 }), chooseType: o.chooseType, layouts: [{ @@ -47,7 +47,7 @@ BI.IconComboPopup = BI.inherit(BI.Pane, { BI.IconComboPopup.superclass.populate.apply(this, arguments); items = BI.createItems(items, { type: "bi.single_select_icon_text_item", - height: 30 + height: 24 }); this.popup.populate(items); }, diff --git a/src/case/combo/icontextvaluecombo/combo.icontextvalue.js b/src/case/combo/icontextvaluecombo/combo.icontextvalue.js index 373f0d44b..d5600eb98 100644 --- a/src/case/combo/icontextvaluecombo/combo.icontextvalue.js +++ b/src/case/combo/icontextvaluecombo/combo.icontextvalue.js @@ -57,7 +57,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, { el: this.trigger, popup: { el: this.popup, - maxHeight: 300 + maxHeight: 240 } }); if (BI.isKey(o.value)) { diff --git a/src/case/combo/icontextvaluecombo/popup.icontextvalue.js b/src/case/combo/icontextvaluecombo/popup.icontextvalue.js index fdba4ca9b..13813a515 100644 --- a/src/case/combo/icontextvaluecombo/popup.icontextvalue.js +++ b/src/case/combo/icontextvaluecombo/popup.icontextvalue.js @@ -15,7 +15,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, { type: "bi.button_group", items: BI.createItems(o.items, { type: "bi.single_select_icon_text_item", - height: 30, + height: 24, iconHeight: o.iconHeight, iconWidth: o.iconWidth, iconWrapperWidth: o.iconWrapperWidth @@ -54,7 +54,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, { var o = this.options; items = BI.createItems(items, { type: "bi.single_select_icon_text_item", - height: 30, + height: 24, iconWrapperWidth: o.iconWrapperWidth, iconHeight: o.iconHeight, iconWidth: o.iconWidth diff --git a/src/case/combo/textvaluecheckcombo/popup.textvaluecheck.js b/src/case/combo/textvaluecheckcombo/popup.textvaluecheck.js index 175859db0..f5678d870 100644 --- a/src/case/combo/textvaluecheckcombo/popup.textvaluecheck.js +++ b/src/case/combo/textvaluecheckcombo/popup.textvaluecheck.js @@ -39,7 +39,7 @@ BI.TextValueCheckComboPopup = BI.inherit(BI.Pane, { return BI.extend({ type: "bi.single_select_item", cls: "bi-list-item", - height: 30 + height: 24 }, item); }); }, diff --git a/src/case/combo/textvaluecombo/combo.textvalue.js b/src/case/combo/textvaluecombo/combo.textvalue.js index 41cc1dd60..45773ca73 100644 --- a/src/case/combo/textvaluecombo/combo.textvalue.js +++ b/src/case/combo/textvaluecombo/combo.textvalue.js @@ -52,7 +52,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, { el: this.trigger, popup: { el: this.popup, - maxHeight: 300 + maxHeight: 240 } }); if(BI.isKey(o.value)) { diff --git a/src/case/combo/textvaluecombo/combo.textvaluesmall.js b/src/case/combo/textvaluecombo/combo.textvaluesmall.js index 56f81f80a..f7bffa627 100644 --- a/src/case/combo/textvaluecombo/combo.textvaluesmall.js +++ b/src/case/combo/textvaluecombo/combo.textvaluesmall.js @@ -45,7 +45,7 @@ BI.SmallTextValueCombo = BI.inherit(BI.Widget, { el: this.trigger, popup: { el: this.popup, - maxHeight: 300 + maxHeight: 240 } }); }, diff --git a/src/case/combo/textvaluecombo/popup.textvalue.js b/src/case/combo/textvaluecombo/popup.textvalue.js index 7898f4a7e..cf68deefa 100644 --- a/src/case/combo/textvaluecombo/popup.textvalue.js +++ b/src/case/combo/textvaluecombo/popup.textvalue.js @@ -14,7 +14,7 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, { items: BI.createItems(o.items, { type: "bi.single_select_item", textAlign: o.textAlign, - height: 30 + height: 24 }), chooseType: o.chooseType, layouts: [{ @@ -43,7 +43,7 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, { BI.TextValueComboPopup.superclass.populate.apply(this, arguments); items = BI.createItems(items, { type: "bi.single_select_item", - height: 30 + height: 24 }); this.popup.populate(items); }, diff --git a/src/component/allvaluechooser/abstract.allvaluechooser.js b/src/component/allvaluechooser/abstract.allvaluechooser.js index 35259d29b..53f9e02cd 100644 --- a/src/component/allvaluechooser/abstract.allvaluechooser.js +++ b/src/component/allvaluechooser/abstract.allvaluechooser.js @@ -52,10 +52,12 @@ BI.AbstractAllValueChooser = BI.inherit(BI.Widget, { if (options.keyword) { keywords.push(options.keyword); } + var resultItems = []; BI.each(keywords, function (i, kw) { var search = BI.Func.getSearchResult(items, kw); - items = search.match.concat(search.find); + resultItems = resultItems.concat(search.match).concat(search.find); }); + resultItems = BI.uniq(resultItems); if (options.selectedValues) {// 过滤 var filter = BI.makeObject(options.selectedValues, true); items = BI.filter(items, function (i, ob) { diff --git a/src/css/base/colorchooser/colorpicker/editor.css b/src/css/base/colorchooser/colorpicker/editor.css index 770680b91..ffd4e071e 100644 --- a/src/css/base/colorchooser/colorpicker/editor.css +++ b/src/css/base/colorchooser/colorpicker/editor.css @@ -17,10 +17,10 @@ background: url('images/1x/icon/tree_vertical_line_4.png') no-repeat center center; } .ztree li ul.line { - background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 0 0; + background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0; } .bi-theme-dark .ztree li ul.line { - background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 0 0; + background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0; } .ztree li span.button.chk.checkbox_false_full { background: url('images/2x/icon/check_box_normal.png') no-repeat center center; diff --git a/src/css/base/tree/ztree.css b/src/css/base/tree/ztree.css index c538f84b0..9de3dfe23 100644 --- a/src/css/base/tree/ztree.css +++ b/src/css/base/tree/ztree.css @@ -17,13 +17,13 @@ } .ztree li ul { margin: 0; - padding: 0 0 0 22px; + padding: 0 0 0 18px; } .ztree li a { padding: 1px 3px 0 0; margin: 0; cursor: pointer; - height: 30px; + height: 24px; background-color: transparent; text-decoration: none; vertical-align: top; @@ -65,7 +65,7 @@ *border: 0px; } .ztree li span { - line-height: 30px; + line-height: 24px; margin-right: 2px; } .ztree li span.button { @@ -137,8 +137,8 @@ background-position: -42px -56px; } .ztree li span.button.switch { - width: 30px; - height: 30px; + width: 25px; + height: 25px; } .ztree li span.button.noline_open { background-position: -92px -72px; diff --git a/src/css/resource/background.css b/src/css/resource/background.css index 330936127..1adb7984d 100644 --- a/src/css/resource/background.css +++ b/src/css/resource/background.css @@ -17,10 +17,10 @@ background: url('images/1x/icon/tree_vertical_line_4.png') no-repeat center center; } .ztree li ul.line { - background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 0 0; + background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0; } .bi-theme-dark .ztree li ul.line { - background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 0 0; + background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0; } .ztree li span.button.chk.checkbox_false_full { background: url('images/2x/icon/check_box_normal.png') no-repeat center center; diff --git a/src/less/base/tree/ztree.less b/src/less/base/tree/ztree.less index c60e18629..5e65dfb63 100644 --- a/src/less/base/tree/ztree.less +++ b/src/less/base/tree/ztree.less @@ -22,14 +22,14 @@ .ztree li ul { margin: 0; - padding: 0 0 0 22px + padding: 0 0 0 18px } .ztree li a { padding: 1px 3px 0 0; margin: 0; cursor: pointer; - height: 30px; + height: 24px; background-color: transparent; text-decoration: none; vertical-align: top; @@ -82,7 +82,7 @@ } .ztree li span { - line-height: 30px; + line-height: 24px; margin-right: 2px } @@ -181,8 +181,8 @@ } .ztree li span.button.switch { - width: 30px; - height: 30px + width: 25px; + height: 25px } .ztree li span.button.noline_open { diff --git a/src/less/resource/background.less b/src/less/resource/background.less index 120593e34..e1eb69d35 100644 --- a/src/less/resource/background.less +++ b/src/less/resource/background.less @@ -29,12 +29,12 @@ } .ztree li ul.line { - .imagePath(@icon-tree-vertical-line-1, 0, 0, repeat-y); + .imagePath(@icon-tree-vertical-line-1, 0, 1px, repeat-y); } .bi-theme-dark { .ztree li ul.line { - .imagePath(@icon-tree-vertical-line-1-theme-dark, 0, 0, repeat-y); + .imagePath(@icon-tree-vertical-line-1-theme-dark, 0, 1px, repeat-y); } } diff --git a/src/widget/datetime/datetime.combo.js b/src/widget/datetime/datetime.combo.js index 8f18d8c41..600a28242 100644 --- a/src/widget/datetime/datetime.combo.js +++ b/src/widget/datetime/datetime.combo.js @@ -4,7 +4,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, { constants: { popupHeight: 290, - popupWidth: 310, + popupWidth: 270, comboAdjustHeight: 1, border: 1 }, diff --git a/src/widget/datetime/datetime.popup.js b/src/widget/datetime/datetime.popup.js index 3a19b61f6..7102fbc41 100644 --- a/src/widget/datetime/datetime.popup.js +++ b/src/widget/datetime/datetime.popup.js @@ -5,8 +5,8 @@ BI.DateTimePopup = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.DateTimePopup.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-date-time-popup", - width: 310, - height: 410 + width: 268, + height: 374 }); }, _init: function () { diff --git a/src/widget/downlist/item.downlist.js b/src/widget/downlist/item.downlist.js index 6154d84a0..f05fa2e5d 100644 --- a/src/widget/downlist/item.downlist.js +++ b/src/widget/downlist/item.downlist.js @@ -4,7 +4,7 @@ BI.DownListItem = BI.inherit(BI.BasicButton, { return BI.extend(conf, { baseCls: "bi-down-list-item bi-list-item-active", cls: "", - height: 30, + height: 24, logic: { dynamic: true }, diff --git a/src/widget/downlist/popup.downlist.js b/src/widget/downlist/popup.downlist.js index a4bb2ec75..94edd62d7 100644 --- a/src/widget/downlist/popup.downlist.js +++ b/src/widget/downlist/popup.downlist.js @@ -6,7 +6,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, { constants: { nextIcon: "pull-right-e-font", - height: 30, + height: 24, iconHeight: 12, iconWidth: 12, hgap: 0, diff --git a/src/widget/dynamicdate/dynamicdate.popup.js b/src/widget/dynamicdate/dynamicdate.popup.js index 68e3af28e..bb5e0e5fb 100644 --- a/src/widget/dynamicdate/dynamicdate.popup.js +++ b/src/widget/dynamicdate/dynamicdate.popup.js @@ -6,8 +6,8 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, { props: { baseCls: "bi-dynamic-date-popup", - width: 290, - height: 380 + width: 248, + height: 344 }, _init: function () { diff --git a/src/widget/dynamicdatetime/dynamicdatetime.popup.js b/src/widget/dynamicdatetime/dynamicdatetime.popup.js index 02be3f56f..2bdde53d4 100644 --- a/src/widget/dynamicdatetime/dynamicdatetime.popup.js +++ b/src/widget/dynamicdatetime/dynamicdatetime.popup.js @@ -6,8 +6,8 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, { props: { baseCls: "bi-dynamic-date-time-popup", - width: 290, - height: 421 + width: 248, + height: 385 }, _init: function () { diff --git a/src/widget/month/popup.month.js b/src/widget/month/popup.month.js index caeca72dc..658642b21 100644 --- a/src/widget/month/popup.month.js +++ b/src/widget/month/popup.month.js @@ -36,7 +36,7 @@ BI.MonthPopup = BI.inherit(BI.Widget, { whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30, + height: 23, width: 38, value: td, text: td @@ -55,7 +55,7 @@ BI.MonthPopup = BI.inherit(BI.Widget, { columns: 2, rows: 6, columnSize: [1 / 2, 1 / 2], - rowSize: 30 + rowSize: 25 })), { type: "bi.center_adapt", vgap: 1, diff --git a/src/widget/multilayerdownlist/popup.downlist.js b/src/widget/multilayerdownlist/popup.downlist.js index 4262c066a..d0b6b0d63 100644 --- a/src/widget/multilayerdownlist/popup.downlist.js +++ b/src/widget/multilayerdownlist/popup.downlist.js @@ -6,7 +6,7 @@ BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, { constants: { nextIcon: "pull-right-e-font", - height: 30, + height: 25, iconHeight: 12, iconWidth: 12, hgap: 0, diff --git a/src/widget/multilayerselecttree/node/node.first.plus.js b/src/widget/multilayerselecttree/node/node.first.plus.js index fa7e37243..aadd455c2 100644 --- a/src/widget/multilayerselecttree/node/node.first.plus.js +++ b/src/widget/multilayerselecttree/node/node.first.plus.js @@ -15,7 +15,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -56,7 +56,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -64,7 +64,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, diff --git a/src/widget/multilayerselecttree/node/node.last.plus.js b/src/widget/multilayerselecttree/node/node.last.plus.js index d3a6a9900..a48e14767 100644 --- a/src/widget/multilayerselecttree/node/node.last.plus.js +++ b/src/widget/multilayerselecttree/node/node.last.plus.js @@ -15,7 +15,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -56,7 +56,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -64,7 +64,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, diff --git a/src/widget/multilayerselecttree/node/node.mid.plus.js b/src/widget/multilayerselecttree/node/node.mid.plus.js index 9466654d0..a80610160 100644 --- a/src/widget/multilayerselecttree/node/node.mid.plus.js +++ b/src/widget/multilayerselecttree/node/node.mid.plus.js @@ -15,7 +15,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -56,7 +56,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -64,7 +64,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, diff --git a/src/widget/multilayerselecttree/node/node.plus.js b/src/widget/multilayerselecttree/node/node.plus.js index 8d1a3679a..bfde57f66 100644 --- a/src/widget/multilayerselecttree/node/node.plus.js +++ b/src/widget/multilayerselecttree/node/node.plus.js @@ -15,7 +15,7 @@ BI.MultiLayerSelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -56,7 +56,7 @@ BI.MultiLayerSelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -64,7 +64,7 @@ BI.MultiLayerSelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, diff --git a/src/widget/multilayersingletree/node/node.first.plus.js b/src/widget/multilayersingletree/node/node.first.plus.js index 5024d2904..f72f49ed2 100644 --- a/src/widget/multilayersingletree/node/node.first.plus.js +++ b/src/widget/multilayersingletree/node/node.first.plus.js @@ -14,7 +14,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -36,7 +36,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -44,7 +44,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, diff --git a/src/widget/multilayersingletree/node/node.last.plus.js b/src/widget/multilayersingletree/node/node.last.plus.js index 1d00ad20f..02a8a26e0 100644 --- a/src/widget/multilayersingletree/node/node.last.plus.js +++ b/src/widget/multilayersingletree/node/node.last.plus.js @@ -14,7 +14,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -36,7 +36,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -44,7 +44,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, diff --git a/src/widget/multilayersingletree/node/node.mid.plus.js b/src/widget/multilayersingletree/node/node.mid.plus.js index 3d0a6eb17..64612ca04 100644 --- a/src/widget/multilayersingletree/node/node.mid.plus.js +++ b/src/widget/multilayersingletree/node/node.mid.plus.js @@ -14,7 +14,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -36,7 +36,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -44,7 +44,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, diff --git a/src/widget/multilayersingletree/node/node.plus.js b/src/widget/multilayersingletree/node/node.plus.js index 11e4006c7..b2fbd37e6 100644 --- a/src/widget/multilayersingletree/node/node.plus.js +++ b/src/widget/multilayersingletree/node/node.plus.js @@ -12,7 +12,7 @@ BI.MultiLayerSingleTreePlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -34,7 +34,7 @@ BI.MultiLayerSingleTreePlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); diff --git a/src/widget/multilayersingletree/treeitem/item.first.treeleaf.js b/src/widget/multilayersingletree/treeitem/item.first.treeleaf.js index 9ad705a67..3537b4f34 100644 --- a/src/widget/multilayersingletree/treeitem/item.first.treeleaf.js +++ b/src/widget/multilayersingletree/treeitem/item.first.treeleaf.js @@ -14,7 +14,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, { layer: 0, id: "", pId: "", - height: 30 + height: 24 }); }, _init: function () { @@ -57,7 +57,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -65,7 +65,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, diff --git a/src/widget/multilayersingletree/treeitem/item.last.treeleaf.js b/src/widget/multilayersingletree/treeitem/item.last.treeleaf.js index 3edfc4865..5a66b762c 100644 --- a/src/widget/multilayersingletree/treeitem/item.last.treeleaf.js +++ b/src/widget/multilayersingletree/treeitem/item.last.treeleaf.js @@ -14,7 +14,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, { layer: 0, id: "", pId: "", - height: 30 + height: 24 }); }, _init: function () { @@ -56,7 +56,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -64,7 +64,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, diff --git a/src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js b/src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js index ce65c03f5..86372cda4 100644 --- a/src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js +++ b/src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js @@ -14,7 +14,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, { layer: 0, id: "", pId: "", - height: 30 + height: 24 }); }, _init: function () { @@ -56,7 +56,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, height: o.height }); }); @@ -64,7 +64,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, diff --git a/src/widget/multiselect/multiselect.loader.js b/src/widget/multiselect/multiselect.loader.js index 8e6fd24d5..53e4466b6 100644 --- a/src/widget/multiselect/multiselect.loader.js +++ b/src/widget/multiselect/multiselect.loader.js @@ -125,7 +125,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, { type: "bi.multi_select_item", logic: this.options.logic, cls: "bi-list-item-active", - height: 30, + height: 24, selected: this.isAllSelected(), iconWrapperWidth: 36 }); diff --git a/src/widget/quarter/popup.quarter.js b/src/widget/quarter/popup.quarter.js index 387db9b12..474799141 100644 --- a/src/widget/quarter/popup.quarter.js +++ b/src/widget/quarter/popup.quarter.js @@ -39,7 +39,7 @@ BI.QuarterPopup = BI.inherit(BI.Widget, { whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30 + height: 25 }); }); diff --git a/src/widget/searchmultitextvaluecombo/multitextvalue.loader.search.js b/src/widget/searchmultitextvaluecombo/multitextvalue.loader.search.js index e5bfed36f..8811e5aa7 100644 --- a/src/widget/searchmultitextvaluecombo/multitextvalue.loader.search.js +++ b/src/widget/searchmultitextvaluecombo/multitextvalue.loader.search.js @@ -112,7 +112,7 @@ BI.SearchMultiSelectLoader = BI.inherit(BI.Widget, { type: "bi.multi_select_item", logic: this.options.logic, cls: "bi-list-item-active", - height: 30, + height: 24, selected: this.isAllSelected(), iconWrapperWidth: 36 }); diff --git a/src/widget/selecttree/nodes/node.first.plus.js b/src/widget/selecttree/nodes/node.first.plus.js index 1a29f3ca6..f975ea00e 100644 --- a/src/widget/selecttree/nodes/node.first.plus.js +++ b/src/widget/selecttree/nodes/node.first.plus.js @@ -16,7 +16,7 @@ BI.SelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { diff --git a/src/widget/selecttree/nodes/node.last.plus.js b/src/widget/selecttree/nodes/node.last.plus.js index 1284903fc..0cab47f4b 100644 --- a/src/widget/selecttree/nodes/node.last.plus.js +++ b/src/widget/selecttree/nodes/node.last.plus.js @@ -16,7 +16,7 @@ BI.SelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { diff --git a/src/widget/selecttree/nodes/node.mid.plus.js b/src/widget/selecttree/nodes/node.mid.plus.js index e3af90a1f..b2ec407d0 100644 --- a/src/widget/selecttree/nodes/node.mid.plus.js +++ b/src/widget/selecttree/nodes/node.mid.plus.js @@ -16,7 +16,7 @@ BI.SelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { diff --git a/src/widget/selecttree/nodes/node.plus.js b/src/widget/selecttree/nodes/node.plus.js index 17c68e9ae..e0f8e8632 100644 --- a/src/widget/selecttree/nodes/node.plus.js +++ b/src/widget/selecttree/nodes/node.plus.js @@ -16,7 +16,7 @@ BI.SelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { diff --git a/src/widget/singleselect/singleselect.loader.js b/src/widget/singleselect/singleselect.loader.js index 55f55d9e1..b69bf5629 100644 --- a/src/widget/singleselect/singleselect.loader.js +++ b/src/widget/singleselect/singleselect.loader.js @@ -105,7 +105,7 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, { type: this.options.allowNoSelect ? "bi.single_select_item" : "bi.single_select_combo_item", logic: this.options.logic, cls: "bi-list-item-active", - height: 30, + height: 24, selected: false }); }, diff --git a/src/widget/year/popup.year.js b/src/widget/year/popup.year.js index b470fe894..032012018 100644 --- a/src/widget/year/popup.year.js +++ b/src/widget/year/popup.year.js @@ -17,7 +17,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, { min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期, width: 180, - height: 276 + height: 240 }, render: function () { diff --git a/src/widget/yearmonth/card.static.yearmonth.js b/src/widget/yearmonth/card.static.yearmonth.js index 4eb6adfca..2f46a05c5 100644 --- a/src/widget/yearmonth/card.static.yearmonth.js +++ b/src/widget/yearmonth/card.static.yearmonth.js @@ -24,7 +24,7 @@ BI.StaticYearMonthCard = BI.inherit(BI.Widget, { whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30, + height: 23, width: 38, value: td, text: td @@ -68,7 +68,7 @@ BI.StaticYearMonthCard = BI.inherit(BI.Widget, { columns: 2, rows: 6, columnSize: [1 / 2, 1 / 2], - rowSize: 30 + rowSize: 25 })), { type: "bi.center_adapt", vgap: 1, diff --git a/src/widget/yearmonth/popup.yearmonth.js b/src/widget/yearmonth/popup.yearmonth.js index df32e7eb9..0f4d2c81e 100644 --- a/src/widget/yearmonth/popup.yearmonth.js +++ b/src/widget/yearmonth/popup.yearmonth.js @@ -17,7 +17,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, { min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期, width: 180, - height: 270 + height: 240 }, render: function () { diff --git a/src/widget/yearquarter/card.static.yearquarter.js b/src/widget/yearquarter/card.static.yearquarter.js index ac7bfc240..de236ccdf 100644 --- a/src/widget/yearquarter/card.static.yearquarter.js +++ b/src/widget/yearquarter/card.static.yearquarter.js @@ -28,7 +28,7 @@ BI.StaticYearQuarterCard = BI.inherit(BI.Widget, { whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30 + height: 24 }); }); }, diff --git a/src/widget/yearquarter/popup.yearquarter.js b/src/widget/yearquarter/popup.yearquarter.js index e49d97260..51a2b42b3 100644 --- a/src/widget/yearquarter/popup.yearquarter.js +++ b/src/widget/yearquarter/popup.yearquarter.js @@ -10,7 +10,7 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, { min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期, width: 180, - height: 260 + height: 240 }, render: function () { diff --git a/ui/css/background.css b/ui/css/background.css index 82c81f2c3..be8d957f1 100644 --- a/ui/css/background.css +++ b/ui/css/background.css @@ -17,10 +17,10 @@ background: url('resources?path=/com/fr/web/ui/images/1x/icon/tree_vertical_line_4.png') no-repeat center center; } .ztree li ul.line { - background: url('resources?path=/com/fr/web/ui/images/1x/icon/tree_vertical_line_1.png') repeat-y 0 0; + background: url('resources?path=/com/fr/web/ui/images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0; } .bi-theme-dark .ztree li ul.line { - background: url('resources?path=/com/fr/web/ui/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 0 0; + background: url('resources?path=/com/fr/web/ui/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0; } .ztree li span.button.chk.checkbox_false_full { background: url('resources?path=/com/fr/web/ui/images/2x/icon/check_box_normal.png') no-repeat center center;