From b5b955f235ead274457db486a012c76c49a7f978 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Fri, 28 Jun 2019 14:10:01 +0800 Subject: [PATCH] =?UTF-8?q?revert:=2024=E7=9A=84=E9=AB=98=E5=BA=A6=20&&=20?= =?UTF-8?q?24=E7=9A=84=E6=96=B0=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/2.0/fineui.css | 18 +- dist/2.0/fineui.ie.js | 216 +++++++++--------- dist/2.0/fineui.js | 216 +++++++++--------- dist/base.css | 14 +- dist/bundle.css | 18 +- dist/bundle.ie.js | 216 +++++++++--------- dist/bundle.js | 216 +++++++++--------- dist/case.js | 96 ++++---- dist/demo.js | 13 +- dist/fineui.css | 18 +- dist/fineui.ie.js | 216 +++++++++--------- dist/fineui.js | 216 +++++++++--------- dist/fineui_without_jquery_polyfill.js | 216 +++++++++--------- dist/images/1x/icon/dark/tree_collapse_1.png | Bin 193 -> 200 bytes dist/images/1x/icon/dark/tree_collapse_2.png | Bin 230 -> 233 bytes dist/images/1x/icon/dark/tree_collapse_3.png | Bin 247 -> 250 bytes dist/images/1x/icon/dark/tree_collapse_4.png | Bin 236 -> 238 bytes dist/images/1x/icon/dark/tree_expand_1.png | Bin 171 -> 179 bytes dist/images/1x/icon/dark/tree_expand_2.png | Bin 213 -> 214 bytes dist/images/1x/icon/dark/tree_expand_3.png | Bin 227 -> 231 bytes dist/images/1x/icon/dark/tree_expand_4.png | Bin 214 -> 217 bytes .../1x/icon/dark/tree_vertical_line_1.png | Bin 102 -> 102 bytes .../1x/icon/dark/tree_vertical_line_2.png | Bin 143 -> 144 bytes .../1x/icon/dark/tree_vertical_line_3.png | Bin 162 -> 162 bytes .../1x/icon/dark/tree_vertical_line_4.png | Bin 148 -> 148 bytes .../1x/icon/dark/tree_vertical_line_5.png | Bin 138 -> 138 bytes dist/images/1x/icon/tree_collapse_1.png | Bin 192 -> 199 bytes dist/images/1x/icon/tree_collapse_2.png | Bin 224 -> 233 bytes dist/images/1x/icon/tree_collapse_3.png | Bin 240 -> 247 bytes dist/images/1x/icon/tree_collapse_4.png | Bin 228 -> 236 bytes dist/images/1x/icon/tree_expand_1.png | Bin 170 -> 179 bytes dist/images/1x/icon/tree_expand_2.png | Bin 203 -> 209 bytes dist/images/1x/icon/tree_expand_3.png | Bin 218 -> 226 bytes dist/images/1x/icon/tree_expand_4.png | Bin 204 -> 212 bytes dist/images/1x/icon/tree_vertical_line_1.png | Bin 102 -> 102 bytes dist/images/1x/icon/tree_vertical_line_2.png | Bin 144 -> 143 bytes dist/images/1x/icon/tree_vertical_line_3.png | Bin 162 -> 162 bytes dist/images/1x/icon/tree_vertical_line_4.png | Bin 148 -> 148 bytes dist/images/1x/icon/tree_vertical_line_5.png | Bin 138 -> 138 bytes dist/images/2x/icon/dark/tree_collapse_1.png | Bin 272 -> 291 bytes dist/images/2x/icon/dark/tree_collapse_2.png | Bin 333 -> 351 bytes dist/images/2x/icon/dark/tree_collapse_3.png | Bin 338 -> 361 bytes dist/images/2x/icon/dark/tree_collapse_4.png | Bin 320 -> 344 bytes dist/images/2x/icon/dark/tree_expand_1.png | Bin 244 -> 273 bytes dist/images/2x/icon/dark/tree_expand_2.png | Bin 311 -> 324 bytes dist/images/2x/icon/dark/tree_expand_3.png | Bin 316 -> 335 bytes dist/images/2x/icon/dark/tree_expand_4.png | Bin 299 -> 317 bytes .../2x/icon/dark/tree_vertical_line_1.png | Bin 117 -> 117 bytes .../2x/icon/dark/tree_vertical_line_2.png | Bin 215 -> 220 bytes .../2x/icon/dark/tree_vertical_line_3.png | Bin 238 -> 243 bytes .../2x/icon/dark/tree_vertical_line_4.png | Bin 206 -> 212 bytes .../2x/icon/dark/tree_vertical_line_5.png | Bin 210 -> 215 bytes dist/images/2x/icon/tree_collapse_1.png | Bin 274 -> 289 bytes dist/images/2x/icon/tree_collapse_2.png | Bin 336 -> 345 bytes dist/images/2x/icon/tree_collapse_3.png | Bin 344 -> 351 bytes dist/images/2x/icon/tree_collapse_4.png | Bin 328 -> 334 bytes dist/images/2x/icon/tree_expand_1.png | Bin 246 -> 271 bytes dist/images/2x/icon/tree_expand_2.png | Bin 309 -> 319 bytes dist/images/2x/icon/tree_expand_3.png | Bin 316 -> 327 bytes dist/images/2x/icon/tree_expand_4.png | Bin 300 -> 309 bytes dist/images/2x/icon/tree_vertical_line_1.png | Bin 117 -> 117 bytes dist/images/2x/icon/tree_vertical_line_2.png | Bin 220 -> 219 bytes dist/images/2x/icon/tree_vertical_line_3.png | Bin 242 -> 241 bytes dist/images/2x/icon/tree_vertical_line_4.png | Bin 211 -> 210 bytes dist/images/2x/icon/tree_vertical_line_5.png | Bin 215 -> 213 bytes dist/resource.css | 4 +- dist/widget.js | 120 +++++----- src/base/combination/combo.js | 3 +- src/base/combination/searcher.js | 3 +- .../abstract.allvaluechooser.js | 4 +- src/widget/datetime/datetime.combo.js | 2 +- src/widget/datetime/datetime.popup.js | 4 +- src/widget/dynamicdate/dynamicdate.popup.js | 4 +- .../dynamicdatetime/dynamicdatetime.popup.js | 4 +- src/widget/month/popup.month.js | 4 +- src/widget/quarter/popup.quarter.js | 2 +- 76 files changed, 927 insertions(+), 916 deletions(-) diff --git a/dist/2.0/fineui.css b/dist/2.0/fineui.css index 5270800c30..17180c3398 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 bbe5607d6d..64c836b5b5 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 42b3c0356e..3ce01ecf79 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 02c0078bba..8ea8d95100 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 5270800c30..17180c3398 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 bbe5607d6d..64c836b5b5 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 42b3c0356e..3ce01ecf79 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 e0783dfaaa..bbf10978f2 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 74f30e88ee..543d484b63 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 cd6d66dc40..872a06777a 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 2e1f95edb2..72e82c15fb 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 ffcb0d5f50..95d45d044a 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 af56fba2db..4927eb3c14 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 9297ac164f54c6938da6b155bcf5193b92003850..3b8bcf82f93d1c9b0f77906825a4a1dac35f47b5 100644 GIT binary patch delta 159 zcmV;Q0AT;Y0muQ6F@J(dL_t(Y4P#&!1*0KAX$UalG9bI4&Y1bNJl%c30$pRFeL~>|u0p2(OITAfskokUYAq4$F z&;n#bK!zjp37QU6K=U9PTo#ZTJfI-N8wZ3k5ixNvs%A6&Y1bNJl%c30$pRFeL~>|u0p2(OITAfskokUYAz*)8 zx%b*vM@e)uhy!AS1%U)ejGzTDLqM89h9mQl4Z_9-iP1cW2051n*n$TZG`MKIaX=^& u;WCtLapV+2wjsk?BRN4dxRU9hj2{3-&m;FlY*h9D0000&c00000NkvXXu0mjfVwF>F diff --git a/dist/images/1x/icon/dark/tree_collapse_3.png b/dist/images/1x/icon/dark/tree_collapse_3.png index 337b009b6a920e68f2083ca995573fe382b4eb60..b9435ff49c5b8db2c2fd63ba6cf1d5b0d2d6c4a5 100644 GIT binary patch delta 189 zcmV;u07C!w0r~-uF%Yy#L_t(Y4P#&+0bIHF+Lw_*7=PIXE&p-Jp^HzQP=nJP7IekP z{GHqOAak*@-Mw6}io*m+N=2J?t%2zynkLBtqD@6oNOKGD#sSD7=)r=__j3yYyA_nW zbd*FlgE+`34J1a;0+=Bn%^<^(`5-Y6fEkX?2JvYgM1#u$Y{3Hx27CZ-91zMx_zWgX r4mpL8Wg@`v*F;Vb4X$K5DB}nK*sm$iOv*A)00000NkvXXu0mjfe5g;k delta 186 zcmV;r07d`$0rvrrF%YpyL_t(Y4P#&+0et-Yy@8QI7=NF>eE*M24qcp&hZCncEa-}n z`9?;b$Xu-KbLX~W6^99ul!^!$1~U|yCdmS1jl{BPZUNpn0J#!9SdjU!I0B_EeqPQ7 zkb2~l1`@*=`=C?=GXSI!1VDyk6T_E^XdXm^%L4S^fdm|W5^o&f*NTwE7Y7JcM6i%k o2ocIhq8}1+f@p9h(?J<)00@yX-=_#UasU7T07*qoM6N<$g6*S9ssI20 diff --git a/dist/images/1x/icon/dark/tree_collapse_4.png b/dist/images/1x/icon/dark/tree_collapse_4.png index 6f96e27808186ec446b8e21f6f0654168759dbc5..c83be64c7a9ea1cd7719c22001a90f1c784e48ba 100644 GIT binary patch delta 177 zcmV;i08anx0qy~iF%YOpL_t(Y4P#&+0bIHF+Lw_*7=PIXE&p-Jp^HzQP=nJP7IekP z{GHqOAak*@-Mw6}io*m+N=2J?t%2zynkLBtqD@6oNOKGD#sSD7=)r=__j3yYyA_nW zbd*FlgE+`34J1a;0+=Bn%^<^(`5-Y6fEkX?2JvYgM1#u$Y{3Hx27CZ-91zMx_zWJE f8x4UW6cz#iylf-)^oS@r00000NkvXXu0mjfjQUAm delta 175 zcmV;g08sz#0qg;gF%YInL_t(Y4P#&+0et-Yy@8QI7=NF>eE*M24qcp&hZCncEa-}n z`9?;b$Xu-KbLX~W6^99ul!^!$1~U|yCdmS1jl{BPZUNpn0J#!9SdjU!I0B_EeqPQ7 zkb2~l1`@*=`=C?=GXSI!1VDyk6T_E^XdXm^%L4S^fdm|W5^o&f*NTwE7Y7JcqpZ;o d7_=b(02DrZEG5BZE_eU{002ovPDHLkV1l0gMlJvV diff --git a/dist/images/1x/icon/dark/tree_expand_1.png b/dist/images/1x/icon/dark/tree_expand_1.png index 8cf6cc33a3f61236027b41bef49239ab45defdae..4538bdab32579fcc3ed6bb996472511d15025ea4 100644 GIT binary patch delta 138 zcmV;50CoSX0kZ*+F@J4IL_t(Y4P#&!1*0KAX$UalG9bI4RDALC^wX41pPjjUM`O sKyx49jRQiN2wRwsij9WA5DWnTz4;5y(6<0@9DsriUlhG6E+%VI7kke4dM^|IH0)?@Wuh5OauyJssiK`LMBy%hmT?81QE?s5zQ^2 bdHewY2mc%2B5IEX00000NkvXXu0mjf7%D{2 delta 172 zcmV;d08{_g0o4JJF@KLqL_t(Y4P#&!1*0KAX$UalGT_sf@BeYhp^NkJaN;zF1zj;R z-^j=lnTwTu?%Z~);xIub7=u>y(6<0@9DsriUl_yU=;P<_4g9>E4IuR(Hi!lRkQmO` z2c;sI0TAWbNst5ZrJ|u92Q>Eq-Z;P>>X@SV;s8@M9uedef+a`UNR}ceh-jXQXl?<` aV;lf_<0H~Csp$m(0000rx2D&EpRM YncpF|><@~eE*M24qcp&hZCncEa-}n z`9?;b$Xu-KbLX~W6^9AZJQWRn3-HDPC>-&HF)WTisf(YNvjL|O{5Eup_004cQ8{g+T&Sd}q002ov KPDHLkU;%=y%s#&W delta 152 zcmV;J0B8T%0oDPKF%XbRL_t(Y4P#&+0et-Yy@8QI7=53-&HF)WTisf(YNvjL6w_iw2Ll!f&Q%UU1yAo~#|wnJdzKh?w0-34 zY<$wmbb?K2Y2p)2CH0OO8L~bm+Z(RQNu)gMcQf);Vqs98Cvqb4;#F}5An6w_iw2Ll!f&Q%UUA3lEm&L%K@{&ZoV!#`S% zIDB$pOkwW4WbjF3qOgn47CyCE(GJ=CJVu}0m1n96GBGGsiAnQ%i0@zk0#8>zmvv4F FO#s#qAs_$% 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 f35521ea8e86e7d3e4ccbe9bc4e45b6ad67a4125..ecd99fd2d29cc6e0c9dc30fc0aad56e72c5214f4 100644 GIT binary patch delta 77 zcmZ3)xQKCr4QtHK@3*E;bX2ju5GZt)N2vLuV@^$yLggZcO^q&@5|v#iIF)8iUuLpB hq2=i343*0&hZy&l$o9!e{s?6N0#8>zmvv4FO#tw39~J-r delta 77 zcmZ3)xQKCr4QtJxKYJS|I;z+{c>Xkpq4VGm1v5Lt2{wTYHysw4^w_vQVG%s*9Xu=A h;LxK=lS!FE4;eVy6ij?_Y9=uNfv2mV%Q~loCIAwv9+&_C 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 ec9142e58cb01748a58609b11df1e3147016338a..6584a862e4884f2fb592940f5168458446147ed8 100644 GIT binary patch delta 63 zcmbQjIE8V74QtHK@3*E;bX3v55GZt)N2vLuV@^$y!p}ehDW=7WK!RD4iD5;u$O+y@ R8`v3uz|+;wWt~$(69DDZ6)pe( delta 63 zcmbQjIE8V74QtJxKYJS|I;!YDc>Xkpq4VGm1v5Lt34b&scpEPY0EtE(Mh3>6V$!D3 Ri)S$afv2mV%Q~loCICB@7YhIY 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 5c9867342fc77f03fe6ffd2cd374c9daff6db5f6..3125a9baafd82481e61df2dc587102cc91ad5781 100644 GIT binary patch delta 56 zcmeBT>|&f?!y2>m`>p8{9ThcXRWF|PxaB@`v7&(#6Oc$yWMGJX%g*pdQTYo45O})! KxvX|&f?!&>v_&)&v~j*1#}ap%}n-Y!0KQ9y#X5lCzhU|>k_V=qi>Ybs#?0#8>z Jmvv4FO#pFI6dC{k diff --git a/dist/images/1x/icon/tree_collapse_1.png b/dist/images/1x/icon/tree_collapse_1.png index 6bf0ae233799fda023939d100321e3e945a569a6..d67ba2999b6eb079066ab59be7308c4a86e02ec0 100644 GIT binary patch delta 158 zcmV;P0Ac^Y0mlK5F@J$cL_t(Y4P#&!1*0KAX$UalGT_L`i~n)Sp^Mv?>*F+s1zj;R z-`Y$MnTwTu^wcG+;xIub7=swv&M%!9WhiP$vH(RVksO*^fHw|6jzkX@Wd5N|Gl}#E z7G*F+s1zj;R z-`Y$MnTwTu^wcG+;xIub7=swv&M%!9WhiP$vH(RVksO*^fHw|6jzkX@Wd5N|Gr|6t zyL4kia5atTi-Nvq5p(Z8_k1ga5-533v;y4#LLAS$%HZy uUX#g@L{1^(=pO-k$O)psl}ra^Bmn^PoJHZT01sjS0000QWI8CL1OVcCLJi(uFTpy=7Ea-}n`POE7$Xu-Kqo*!m6^99ul#1;9(qa0Drb)7ZXj73C z(%b^PaR71%daxk#4{e$Wb}J}#B}e-=fH=r04JHOwgie4`5l1?(^-V(;`cEje(L9I- zmj$peM-NVXe7uoNC==l`m@GNu6hf8(!(S6QK{U9M>7a}w031U~%RIBy;s5{u07*qo IM6N<$g69oaX#fBK delta 199 zcmV;&0672m0q_BkF@LH_L_t(Y4P#&+0VEf;_>!O;tdxmV4Wz24xdo&;Xo#yPCz2U) z`8lPq^*=5-bn!X;)i}*zL062-pWRo5%*D!1Eo#Fm4ih9P6%jHFW+*aEk_E^biDlE= z0=#hmawU4OAoF2y1WH|V`)f9X)FY=fm>5VL1AtNyI>04{p+Ff)faXCoxGaE$IZ_A^ zWa5ovL_t(Y4P#&+0nA;xv4I5TV5Ll?Y9LiT%`G6+K|@?UIg!kW z%g;wnUi^FTpy=7Ea-}n`POE7$Xu-Kqo*!m6^99ul#1;9(qa0Drb)7ZXj73C z(%b^PaR71%daxk#4{e$Wb}J}#B}e-=fH=r04JHOwgie4`5j;Au^-V(;`cEje(L9I- xmj$peM-NVXe7uoNC==l`cvNmQ1cp!u0071gMd5Vc9|Zsa002ovPDHLkV1n)5P_O_1 delta 187 zcmV;s07U=n0ptOYF@K&(L_t(Y4P#&+0VEf;_>!O;tdxmV4Wz24xdo&;Xo#yPCz2U) z`8lPq^*=5-bn!X;)i}*zL062-pWRo5%*D!1Eo#Fm4ih9P6%jHFW+*aEk_E^biDlE= z0=#hmawU4OAoF2y1WH|V`)f9X)FY=fm>5VL1AtNyI>04{p)?sufaXCoxGaE$IZ_A^ pWa5ov*F+s1zj;R z-`Y$MnTwTu^wcG+;xIub7=u>y(6<0@9Dst&&MzHj=pEWL6Q>+Zf}jP&7y>g48$I;n sfaX5H8wZ3k5w0a48a$FLq85^?gPAWfG>ja ih5M-7Xb23k5C8yMl?@(^llfc#0000*F+s1zj;R z-`Y$MnTwTu^wcG+;xIub7=u>y(6<0@9Dst&&MzHj=pEWL6D&7(>BffSX#WNf2gC-^ zAOI7C@X$z5Dk26DN^L_w4ruNJypc>O6QM;LFTpy=7Ea-}n`POE7$Xu-Kqo*!m6^9AZJQWRn3-HDPC>-tl(qX}g zK_A*Q6D$TwUCGh@4ImD3N`r}k6`>QLR74CQl-h=V9MIeccrqiIP$oi;H;VblDTHFf nhNl7K1QE?s5zQ^2d0YYjUEN6KH>QqX00000NkvXXu0mjfCU#By delta 177 zcmV;i08ann0onnOF@KavL_t(Y4P#&+0VEf;_>!O;tdxmV4Wz24xdo&;Xo#yPCz2U) z`8lPq^*=5-bn!X;)i}*zL062-pWRo5%*D!1Eo#Fm4ilt#DjND0;Ee-NIN}RqSR8>; z*WCV^%^>y2DGeqD62}0bR74CQl-h=V9MIeccq18K1Y<-RH7W#FTpy=7Ea-}n`POE7$Xu-Kqo*!m6^9AZJQWRn3-HDPC>-tl(qX}g zK_A*Q6D$TwUCGh@4ImD3N`r}k6`>QLR74CQl-h=V9MIeccqAj4P$oi;w^9CR2n^8> Z000NKL;Ier89o32002ovPDHLkV1lobMs@%I delta 163 zcmV;U09^mn0n7oAF@J_hL_t(Y4P#&+0VEf;_>!O;tdxmV4Wz24xdo&;Xo#yPCz2U) z`8lPq^*=5-bn!X;)i}*zL062-pWRo5%*D!1Eo#Fm4ilt#DjND0;Ee-NIN}RqSR8>; z*WCV^%^>y2DGeqD62}0bR74CQl-h=V9MIeccq18K1Y<`D(JgA%uP68aW2@2F6u4yY_Q20D-5gpUXO@geCy) CdJ@S1 diff --git a/dist/images/1x/icon/tree_vertical_line_2.png b/dist/images/1x/icon/tree_vertical_line_2.png index 98e2ab6bd8c3d3366b030c290f9e97e83c86ec5c..9d160d99a7b9735d1d4f4814169d148b808e1d5f 100644 GIT binary patch delta 101 zcmbQh*v~k@FwWD{#WBQ#H#tFqb+Mv>6w_iw2Ll!f&Q%UU2IVi0u?d)4-jeq@{G;WF z!zUNU6z0xL2A@PG3cL7h;ZvIx?U2pSWAxcwd8V2m6T=%r;p79n?^_vwz|+;wWt~$( F699JVAr}Au delta 102 zcmV-s0Ga=f0gwTZF<(kaL_t(Y4P#&!1*0J_8UmvsKrjRt393L+kX+c}3*yf0uh|Tu zVSGYjAbFwyvVlZt7;M1&07*qo IM6N<$f-(FheEmC{b(c)@dzZw`Q$`0BQXZU z)W9rAj`nW=iNW|FHa;LEkfan$Q2FL@o P00000NkvXXu0mjf@;EFw diff --git a/dist/images/1x/icon/tree_vertical_line_4.png b/dist/images/1x/icon/tree_vertical_line_4.png index d752b0e0638dde050de3a27a22fa0b9ecf2068b3..25be9ef045335f4f327aa5848beabdc0ca82d906 100644 GIT binary patch delta 95 zcmbQjIE8V7O~jelT^k!&o+d2yS(2p?YI{~!;i{u^%-;+Z{*N3g$9_I>F;X^UJACDU yjz{0Oe1^`0KNQUD3@7~2kl<~+C;%iHc^Dbao)%6%m@mi000f?{elF{r5}E*bKqTP+ delta 95 zcmbQjIE8V7O@xa0wjYxg$gG*t8N$0{)$*OJORO?FR?GK3QIu;uVljV?N1Dp9gc(vZ zSc`vWn>8Ovs1cB!FX2%q($jVzg9Au7v@tLoViov#+ImYL0}yz+`njxgN@xNAj(8?~ diff --git a/dist/images/1x/icon/tree_vertical_line_5.png b/dist/images/1x/icon/tree_vertical_line_5.png index 69e6e408d8a57755678d5b66ddbb1c26bb7c0cb5..c9a5754ac0240d69b387e5b9e80a9c7baeb8b290 100644 GIT binary patch delta 85 zcmeBT>|&f?<98-@*TzPcrwL1amSib}{$0V!;+$jB;nv)dz#$NFz$1Wl5>rrj*OQF@ oY$|UTpSdU?!P^KVHV7~|&f?1AGHa%EhVU*~CBL;Hp`(}WVupYq4`UOT1m`M;Acw3#!|nUi pj3<2ye3rq{({><(gC~N6f#Iw!>+X#cn*K5Xfv2mV%Q~loCIEB6AAN98k^>S)H%M^Dx zC-^U~S!oaV7++e~!f(4<7vt7Jcm>=NxIb@c`n;Q40^SFg_;Vy6BzjpC=tW-kRlfrg z;9I4s%@3QsgfQ9gSIDeDjiivT&6}`i&fygxflSRVT@>hoJ=@e=g|b*h*Sq@2X5p`p zS^?{yln}Jq@CsM~;12-^KmY;|fB*y_00BLL4<79nBc9X=H2?qr07*qoM6N<$g8dh1 A!vFvP delta 231 zcmV>Y%6pj!baS(R>y8{G;hN#0@&1+<{3#J~ZCUSJDt^*dn6f88{>`Bv{p z_#-4ckRxg2bMxk)+J|?50@Nd*>Ty6NsOsfgD7S&$w~yrwe}vrsQ2xZ`Jv{^<009U< h00Izz00hDlH~{XZ8HR%q@qGXQ002ovPDHLkV1m#?X}|yg diff --git a/dist/images/2x/icon/dark/tree_collapse_2.png b/dist/images/2x/icon/dark/tree_collapse_2.png index dc32ec75cdb180d521ef805d921c1eef9b02ae8a..4a78b939a0b44967c7ab402246b929a9895f3f15 100644 GIT binary patch delta 311 zcmX@hbf0O0VZEfMi(^OzYjT1F>taO%DJB%6$hl!+$oh2gEq~NQ`3+w!_gkTOQ&*vQ zW`|*o!RkcC>xI_a-ztV{ciENei;LK;oTDhuZ1VZQve;}1hZ)xz(&QFwJ)HQgzluRj zh}pIO*a3%Dn=^5nUNg>MZ1Iwc`BayuXi%?w;LFtN^|g*XvZ@!)o)9u9OfgI;b++RS zlwp3M$jPl4apLi$_La>SUnu%}$f(&rNlv)JykUimMwJO0o7R)WZ$U9!2YH;9ck0$& z_&V{F{3p+jHxdiBsJmu)JPrb?W|)3lLyUcEV!_sA4KtaO4HqRGxOxJgWpMPgF$8h+ zOfzuuXl(4aeA0a}kpDqa#H1Ijh6GgopDH0}yz+`njxgN@xNA DIO=-A delta 293 zcmV+=0owlG0?h)DF@Fb1L_t(&1?`qy4uUWY$I>fGB|5>Kh zZf+Q^TGfr-INmpXX~%p7ia9`JQ|WS|QOp6(;yGmCKn{v2Hh&O-6nZ&y)p@`z9=mBm z^L`$AJm(wP?9bizOKp1G_|jY7PR{%h64xKD7V-(MY?hWI&y}mT7BYW?;DCSjf8949 zf#f_8A|AVaLVD71^AS+z0V%1Ne6@KX21Y$kHB6|EQ5)S+H2)9m_=F)40D&9?a0@Xh rn!iTj05j6X#2(B?pcok#W)k=S^+YvJ`QD{w00000NkvXXu0mjfz7T~> diff --git a/dist/images/2x/icon/dark/tree_collapse_3.png b/dist/images/2x/icon/dark/tree_collapse_3.png index 3eb3bd4f9e848d1eeb8637d55175aeb62f01be9e..3361b8a46681280e12126d04c25c1a3e73c1ed94 100644 GIT binary patch delta 321 zcmV-H0lxmy0_g&fF@GaTL_t(&1?`x@2?8+?MOU!}8}Muyq9EwWF1%QPM+@*`7oHRZ z#WFnGfJG<~e%K8JlZ-zG$S zt$@?**tlE!QY%3F!I7T@fJ7}z1!|GUy2a-J68zd}V&lu{3Msx8e=x?Q;kiA4{&t^h zBhLIQBvv3K2~r>*8%G>0h{A`B^<&(;0xSSh*0NNf7I~~I-i44Tw5hvKI4{>X{|Xf= zApMfcB^`@5uR1`iFmXTs3yBdj0SSl7QqwD!v#&8>jk719o<+OnWwiXTwY^?z12LTW;B7jQF1bblG zMYH+6d}2qjaXt6d-x8*GU&u~Uh{JG~x~}}D>9Ok9cHApqmVZDX+e(+ChFJof$u(?{ zfCj~u7*L>vo`$cu4$$PKohJ7_tt0dY<96vsiXEOb{yP@hWaoYfRi8iTER+&V2@!d& z-EPl9?w1e}NZ0WOAu&2Qf&d7p w5Wp_P#OVGgfg=Q%N}HLvSHO%60y7DG0p8p~#?fP@oB#j-07*qoM6N<$f{c!h!~g&Q diff --git a/dist/images/2x/icon/dark/tree_collapse_4.png b/dist/images/2x/icon/dark/tree_collapse_4.png index 5cd345b39199bf73ff59aee4023376936693e380..9e7af4a785a25af9c22baacc50021e9665a5cb75 100644 GIT binary patch delta 305 zcmV-10nYxw0@wnOFn<9ONkl3cmCKo?6=v^;+8jmkPS*9UVkt5(y5(!v-zas=Q`#U z5G&wxJ2vi?zQhWUesJVx0U)7esel%FtXq5zAi=MlCN{pDu8`tu@dsl(8lKw&=x_JA zHsZ{`Le&a{BtZ(~W8;W}1yT60v3`u3SAYdTN-awTw8&%K>RkwlLYun#g!6KJ^RG~` z0<~XKxuj$9<|-A46~=xNAOR8}0TLhq5+DH*kSFi~bRsMR*Io{u00000NkvXXu0mjf DoB)Ow delta 281 zcmV+!0p|YL0>A>0Fn<90Nkl8fFPdg14|i z0xc-k%z+Bj&}-pa+y^*#Zl_7TkNXJ!!MI)ek>{o-kN=L5%y#aVkox?=XQ7y2Oo+)# z?RI+>a=(O-K)m+wE4BmqP2!H?xfB*=9 f00@A99f2<=o)R@qvCke`00000NkvXXu0mjfS^I&z diff --git a/dist/images/2x/icon/dark/tree_expand_1.png b/dist/images/2x/icon/dark/tree_expand_1.png index 18ecccb9e8a3502eb4cad0fd51e8946962bd22b3..484843f1ce0d202409c1cf82f16867c41dabb5d0 100644 GIT binary patch delta 232 zcmVG5fB*y_009X6FM)&F`mKL_)R+|g@Vv{lta*iFRH=1twO&R+j>?Ae zCuv6}ta{YQz@osw$l<`i^j|e#^uS^2Db%gb)&(=SQr?!9vM zb4ldt?nk@^4Xf_VJ>D>T#VvkjEyHrV8onpJF8?2|D_-)$|HVcZM)8w5A+_T94U8dA z-`TL;ak*M25zx8w^C#OW)*GW4|3YmOXaHLLL8_6t?k(TFUt9YF8Gyjk)z4*}Q$iB} D(EnDO diff --git a/dist/images/2x/icon/dark/tree_expand_2.png b/dist/images/2x/icon/dark/tree_expand_2.png index 0a2dfe193e5442a0c046a62fdfedfbb5450c1ca8..d44e15d4e244d39f56975838e18455e3abaa9732 100644 GIT binary patch delta 284 zcmdnabcAVwVf{Z(7srqc*5m{U*2RhjQcNgBk#obukoD=}TmGnr@*BQd?zckmrmjNq z%nrjEgVl+O*9)z;zf}y^?y@V_7Z=>8X`#>rB{I$Sztk%Up_iNt?vh ztCM5-56EoFye=g%S>@JwT^85BQ>)k4Ix^K;c`cefQ8nSwiKG*++G>OrS+HGj7P4K^ z@pN&!jgP!u;fy~M`WplJ4=gHL@ZzF`#EJ>+H?5_ZH%ySwnDwTr;nF;jtu{7KCJSt3 zVmd4nAk7wT&E{;#%Cy+f!SO+FmMm{$qAb(mr2-Q#T0iN&7|1UmdD$e`>`8J%nxb)* d!9+y{QHEnuiWhUIO}xnf1fH&bF6*2UngC?wZgl_v delta 271 zcmV+q0r39B0=EK?F@Nz%L_t(&1?`qy3c@fDgsb>c@aHbQg}3rn-lBK03Vl>oSxQT# zJL?u)GJR;1Fj=zSq{&tl9}*w|5+DH*AOR96m%s*1y?gXebdE)T+}H40B<|J{{GT;D z@8X)~?43HA*S6PDAMK=ffC-?MN9*Z8G*L7j9YBdi>)rQ&E`P*(j!*BA+r7U?%+sNM zf2A#tj(>W?TXpHT5L|y~Ei@%Ku)$jDV6nAO`Ypr+upJ+-rUUUzv54s%aNh$Mr)71q z_rNk5r$TC&Z*`0_D%PDHLkV1fs`ef|Id diff --git a/dist/images/2x/icon/dark/tree_expand_3.png b/dist/images/2x/icon/dark/tree_expand_3.png index 595638455e2fb7d26e4f1de681022cb343636623..3190b87f00792c427101ada3866d86026ac40f34 100644 GIT binary patch delta 296 zcmV+@0oVS#0?z`FFn<9FNkla1RAfw@P(!j?K-LfWij0NaK-{@)54l=V z^tpSvpzulM4EY!s^#G|+PHpw0F+lAQCDpvq7$7yosI8vtdVc`skWIVRz?dY_er_Qs z>R}@oI!dCOktJZ_$YLNiOx=)ALKMdUdPt&&6tR3*h@z{v?oO^4-feyM6H0pFlTgJ2qQ>F1x7<)Gz91x0;8o6k-di2N3_d|j{ zU6s8)>$g@M3%ARl9!u#yeIo0v5U1&GZMtckvTpH1-HeeJ*um5X(G ziW;vHl_jja7R{chn(*jEl7gAf-3k6qBF7o3JQlT!Y^;gsShV`MDqpbqljMXe%o|q7 zXjB1Rr}ZT9Ti-DT9Tm1NwcTxaar3SVVZ8j;^v%yL3r>pGQ{R9Uc5J# SPtAn^2s~Z=T-G@yGywp+igB9& delta 258 zcmV+d0sa2H0;>X$F@NPrL_t(&1?`wk3WG2ZMs0B;wDm6DqPOx^y@hw_54dc}VnWSo zW=N31Cx{dIGD+SSoM6{Ax}NWKPIsg9Iqf+|K?4@Bw{bYIw*!n10SGiAKqXd!Jt=ir z_WG>f+^87bE`xb4Y54GktoK5krn|T6rr)wWHf?JoyaO!2YI}KYJr2|+YR!iOR${gF z?m8e7@qWk4IwF5C#_KRk?(~%R|L;;Py6{`beEyKLP)V>Pq-~3Xhdm30-$E=vyVqOk zaG(`gZQk$>xa)wHkXCotI-muF4gwH>00bZa0SG_<0`&>}0JqjEruTa^C;$Ke07*qo IM6N<$g22IcqW}N^ 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 1b2e7181f037dd48bb0ca36cde564c09ba9598be..9ae642458ad4803b062dce5e03f40d1fe0187527 100644 GIT binary patch delta 59 zcmXRdonUXa?oRbv?n7I?$qBF3U9k1%Vz~vS9KuHRCTtw77gqc!;Adp8v1Gk}DP-bP0l+XkK6@?ex delta 59 zcmXRdonUWfSNHE8!=WwTDiF4+2WvD|`E4q>Bu6E=?43oHH<@G~;lZelz5^ P0}yz+`njxgN@xNA2yYkH 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 4939be6d1b2f797b5002a8a33b67de0b1576751a..0e43988fcee8e53c31f1e036b19b8a2e0e9e9ef6 100644 GIT binary patch delta 179 zcmcc4c!zOusUpIm;R8W9hR*(uK)DU)qvG@N&zhSHd2X dHx>pwU|%IEJ8f!v;ywl-@O1TaS?83{1OOMsNAv&y delta 174 zcmcb^c%5;AVf{o;7srqc*0)zTay1(Wuszr^+xg?v-={7e43%M$5?FUa@#1;crs8_uIbzkSu%st#a+(?eAjEcbPM-{xGp9xGGDt zF}TJ|c*n*DO%a~$zYSk899(kw)GmJoU$+ri 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 af6886917126309fe3dc719be9ed606d10cb80d4..54fd201534c9c4d2692325f64dc76ba851ea7270 100644 GIT binary patch delta 202 zcmaFI_?dBnVf|W97srqc*0(bbayA%&9fZMZ%eZ zDVg)a5vBj0S4>a8vKP9&OD2ADmHqpzuMUYv%I*0*wS0kf5RalWL!%l~O{+`H!|oo& zBTI5Oec-%tB7vuIzwm<2qv{HO(x)Iqb%ZJyo*dBEh*KB6&Hx0Su6{1-oD!MOUcVf_kE7srqc*0(bZxf%>aoLA3ou6P<3DHC&ap{v!>3jua^jyfhT|GK3N zR4*6CmDl-CuH72@TI)pFVdQ&MBb@0N74Z8UO$Q 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 b4e7977ed3a387b3c6f03fed159a3547dbda2910..60f2c0a8cf9a1a52da71a2c4c2102e86afd58b3c 100644 GIT binary patch delta 171 zcmX@dc!hC-VSS&ci(^Oz>)RU}IU5WF7#vF3#W$3RE-w|$7BAr37@%@>c|}u2;{=C! z{5$pKE|q#F-|l}p%k$;@Er&P%esPRBO5Be%D*V7-77i887e^c;Y85!9iY;Tx+#)2b za3Rb=o$uH8gF9Yr_~f26@7UM5OKkR^&w6Zk|HQlYXifnIhXw`}MkW>xFbl}|r&_?Y Xi%)ji{Q84)7=Xaj)z4*}Q$iB}B#lL1 delta 165 zcmcb@c#d&`VSR_Ei(^Oz>)RU}xf&D%7y`1hJL+!6_qAQi&^Yu`im!8?0+*cnK50H3 z)yy@wmdKI;Vst0GO3S0ssI2 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 331ee4d12bf339906d2a35ba93811bd6dfeb8c19..27531a35b702aa1b672bbb1b87c2250f4782baaa 100644 GIT binary patch delta 174 zcmcb_c%5;AVf{o;7srqc*0(n{ayA%y=kNzWlVSSIMi(^Oz>)RU}xf&EiS`)LgJK}DJPh-1YP+0tH=ZRi>0hJxSX`|Pgg&ebxsLQ E0OO-Wb^rhX diff --git a/dist/images/2x/icon/tree_collapse_1.png b/dist/images/2x/icon/tree_collapse_1.png index cbb052d199e894b379f76a9d9aee43be70310e84..2041a0e4b348d607b21d9e0724c07bcb88de05d0 100644 GIT binary patch delta 248 zcmVgzFU3ftl#f8&1ae7F6RXQ zst8TAFpEEItZ_TTLOpUDNUbub4$Sc;1Zt%gmFYKivqpK%f9M&KmvTL zG`0Ebtv0*@Rsi@z00Izz00bZa0SG`qPv8SEs}_pI;onFA0000s03Aic?#tc7(IO~uKN~hR>0=Gk(jl+S6~)6;z9rd j5P$##AOHafKp=z<{aF?80Gki900000NkvXXu0mjfA+%-Z diff --git a/dist/images/2x/icon/tree_collapse_2.png b/dist/images/2x/icon/tree_collapse_2.png index b9dd884676e64b4c5c04b7a4d3a850f52a741d0c..f2b989399c280e820fb9263ea055f2ee4fe5755d 100644 GIT binary patch delta 305 zcmcb>bdzataO%DJB%6$hl!+$a;Cp%8&Ldt2zSnlh^rgigtKr zB$)goA?&czy2oqIemQZqYtj1`E4?*pf-Ifw*fO3mTJJAm6If=tU?zLU+kzQC7t1xY z9&xz1*w7$Ak$>~_H&qO23=1c*P5-md*Eq4>t>NWPZ*#K-iIW%qB}g4%W1L~p(yoyB zs;x#yY3EzKm!drL6+VF-l?%*x)|K(Z2#QK9HgsrpkTFd%VQEX{=$Yo^ y;`VximcE<2twV~>WuKcsvu3rPS#i*%je%iazHU%dsH_?T5O})!xvX4Z<)CMGNYBOaTl~j=&K((g6xnFd!(0U(rYr zcH*cQelKnk+lk+g+%^p#5+DH*AOR8}0TTFM0t;>Fo9_J7#z_2c{Xu<}kasCb{>?sZ z?%{^(J~wm{x7}SPW9`7b0@Vr#WJ~Ev)TmZ~WOEB27GOcKB!34LD4}N&oBbWY=ASxE zYCZmrth>`Hn~gds{-b91jiH8M;rB=7>gI4MRJ0m#t+0000Ylp+kAN2q%BnFBejemiG3VE2lWY+^Q0|=Eg zxa1FQnh7%kOv6SnlB4|_kR@Q^$YLNiOx=)ALL|38U~M5nH8CvY(L)+NBw;o2h;0iE z`6M*z0rWIYZ~l;v0gCGZTp>=V^ueW%RPm7;1F-U&)DWY#`XL_!)D951d86Y(@SqrF zjE2By2nr002s(H!7Xh*Y5xT002ov JPDHLkV1kD&gsuPp delta 304 zcmV-00nh&50@wnOF@F+CL_t(&1?`wY3IZ_^oAC? zEI@-|OAac~LQi9FbsxatOE*n!J?$g-g7Ka%ALI@e^Z#>Uj5znNP_qIlNst2h+&bc5 zK@>i0ZXWCI6<`67vX`X-y~yL-=35AfQY*cE(tV}A`&X!10o?PY#I)nxE1(S|=Hqvv zh=KzWAb~Cfcqt1BvAb_%EI_EVS(tkT%*ZgYkiZW#e=p`yu`kU40000zNg{JFC@jhTE7yBSPc{8xH{YQm!vNeX5@cPIEescg4T$W?SQHPm@>(OJq?CDHU_ zM=m$-PZg6_j9*NA^Z!lgXY6{-7^CR7;>*FM{UIMGN;7ZxH2aFc;%&ba<(aSWO$hw# m=A2-{f<(we_zgb<7#PAA>INN=c=(k82s~Z=T-G@yGywqWKX+*W delta 288 zcmV+*0pI@40>}c8F@FL{L_t(&1?`wY3IZ_^oo| zK@>i0Y98zE6<`C9vX`X-y~v|(^(llzvDKbF@xEN&{U=nc0M7YbV%G8Q6|e@vd?Y{u mBtQZrKmsH{0vRNrC-4Kx*eON^M0th)0000!Ze`=&$Wru4T=8OiBLB znkKin?sCcv_2Q=G?akFm^$yU0YPq!@2ds&z`EWobX06Y@2Vb^AZvB1xmB!)ukn|yO z^+#y816CwMgk$T~J3s?5i%ak0Kxx9U{5TLJRC+)A9@zVmvTCgQBV+}FJP?2Y1Rwwb g2tWV=5YP#H0c*JqqOK>w0000007*qoM6N<$g4mI2H2?qr delta 205 zcmeBY`o=iHuzrK5i(^Oz>)WXt`5YVsTm1o4J5Zy2Y)!gRE00f?{elF{r5}E)v C^He+l diff --git a/dist/images/2x/icon/tree_expand_2.png b/dist/images/2x/icon/tree_expand_2.png index addbe513fc85635609df094686c84d7af13855a2..5b630d0a245d1ddbed9a1c1dc58116606ea3c87c 100644 GIT binary patch delta 279 zcmdnWw4Z5$Vf{}}7srqc*5m{U*2RhjQcNgBk#obukoEGGl^^X_R&@mCC$ID06z%ZL zNHF1}S-z*0YH@!x|c9lT5ig&h2jhpzDcRBxJhCn?Yo@^5~Hnlr~+xUJ;DC|~Swne>_!}(MM&_<2Vc5-(YnDMMD z-O}tuF>dk-QK(xi96Q>|7Oj? zySeLS=UqBjx7nTtW9uNj15Chbd9qG4I{s zf!NYw{(VmR(4{{@A3IQzEJ#hUd3LKqi z`Xdw#q>m?Wn6Y|NXfVYs+*7VmX6Hq!mnJm2nlaXOyC4m>oOdyK& TGJM7W0000=W7Fn<97NklB zeMe7SLgACj8S*hO>H$)toZ9L~V}RNrN~(FIF+ggFQCmIP^?v}&A$ET0FeXX#p-nSU z)Wb$FlB4|_kR@Q^$YLNiOx=)ALL|38U~M64*Tf^XEi~kl(5MH{O9y)MM`M8AA&zd} zkdFbfYhp@!Qs^N`E`P|!0J$C~sBd&!h+q(nDi{rc(GZ|%2#l6OLe4xYdI}Gybdlf` zgd`?}z#kZzmNaeNFAa1Ug1*goUbjCeJcnJfRn$NN*}_4AYz44B2!KEk0aRik*oDxK z-L~W9%^gSMF&))=Y0H-{WGgGg`|V(zI-9rKUuS)7r@R74Kz}Q_w?7o{CaR4G1+>Jx z{mpfNHe$WU`#M4|7|-eSqS&pa@$a!_lVABG^tS>%$)1$7PegnFU*qIgUI8RPQf9SK zAd5V$3k8ToR%@;U)(Y&MX!#@L4TR(2U5HV@009t4A%I&*h`oFvLjppj!`#X%5Jm=p bg#0bZtC)5Di1IdFlP8letYE+3&0h5xXxKf) zzP$Sr`WZK6CwWx|y-@Vjt3Pp^VW*t@RdXq(#fk=+u4>DYXhw0-zSw$ehp-wxWPvvs@ub>_D^;T52OR(#2=<59qxXlp(cXeDMH zukHhK5bbxo>?86A<2jvPk~@tu|2>y%i3@*){#KwQS(2*tg=iW7YhL2QD?kAvrPqi8 zUgTw86c7?#qq+}hJFs=3;jfT25b{9)0uX=z1Rwwb2tc5ozz5dsAd1Ro+q(b&002ov JPDHLkV1m1abn^fJ diff --git a/dist/images/2x/icon/tree_vertical_line_1.png b/dist/images/2x/icon/tree_vertical_line_1.png index c3393797e574bbb67ba413a1de4fb96506e5481c..ea9e933a0ceae80554b8a3aacf49cdf9c028dbc3 100644 GIT binary patch delta 59 zcmXRdonUYFOz-XuhC^Gv$qBF3U9k1%Vz~vS9KuHRCTtw77gqc!;Adp`YRK|YWy3cH O5b$*Mb6Mw<&;$Sva~HAz delta 59 zcmXRdonUV^i95Q+amKZK$&0qKZZWIB!n}nq(dk+LF@}W#Qd8yMDKaoz>0u5P`W!Wf P0SG)@{an^LB{Ts5W4hAo`YusUqDU%i3pz1-gD#?TuNjyEeXCc27s*6;B+ zp{DpbC0B}{k%@&vK*6Db0m^v5+i3RsLgJj?pYOdk%6(pFS%2p4+Sh%p_gW9=)hvyf zVkhPGKydz17CW5<+^mP!?(5y-yt+M5oI`DHSXeDn erjZ#R*B^$+f1*E1A6^P(00K`}KbLh*2~7b03Q1@H diff --git a/dist/images/2x/icon/tree_vertical_line_3.png b/dist/images/2x/icon/tree_vertical_line_3.png index e7fc65c63529b5b6616261112446bfe6e9ddb3d9..878ea613b4877aaded5480f29bc913cda3aeb7d7 100644 GIT binary patch delta 200 zcmeyw_>pmfVf|`P7srqc*0(bbayA%cJ%^owi&WAoM-$RemgTTsWF*s@EQBQHGJJ1mVDVweND|bsRcP9D(&IpzSTcu0 zf)3-Xh$r@)yV4^6x<9h|{yRJ9{qwzHu|JefH<$1K#8=|prO4u>aKWWv{e%wfnu&%D yGq(7O*)d8>_9%WRXENFNgQewvj}b!Dm5HB6MgC2tMt3&@5O})!xvXVSSIMi(^Oz>)RWKTnz?13ZQRE}n($=;q zacvIXo>H&3T`yK!y8m+D_jik>`Cr6Zh`xwr{4T68L1lq3d*atdg^;KjTuUx``7}7h zGtRYmVbAh7u6?V$&}o~i>65X8;0ES3j3^P6)RWKTnz?13=UuG_Z<@7VZG}&Q~X2rqmC2(UJ7(ov|e&@ z_R@D=5IfyuS*7gynN$9GTHEaI&$C%j`Y>ccDeE2o28T%veljgr*_#3~6SXF|X&W*! z<+7GMT2L?Fvzkx4UgcY^)RU}IS(j^xCTyUHFh|q^GIo$xPEXuI@shf&k$g{!N79lu~`FWVgs)O zvd~NE8wLlJ6n?oavMraN?|1*eq4U?dG!`^4se?%bVJ}|6_%4dQ!f2`7e+D4%boFyt I=akR{07<1qC;$Ke diff --git a/dist/resource.css b/dist/resource.css index d34aa382cb..1bb2e41c46 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 e3bed3fdbe..9d492aadd4 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/src/base/combination/combo.js b/src/base/combination/combo.js index aa3aecb118..c8faff2a55 100644 --- a/src/base/combination/combo.js +++ b/src/base/combination/combo.js @@ -505,14 +505,13 @@ BI.Combo = BI.inherit(BI.Widget, { this._toggle(); }, - destroy: function () { + destroyed: function () { BI.Widget._renderEngine.createElement(document).unbind("mousedown." + this.getName()) .unbind("mousewheel." + this.getName()) .unbind("mouseenter." + this.getName()) .unbind("mousemove." + this.getName()) .unbind("mouseleave." + this.getName()); BI.Resizers.remove(this.getName()); - BI.Combo.superclass.destroy.apply(this, arguments); } }); BI.Combo.EVENT_TRIGGER_CHANGE = "EVENT_TRIGGER_CHANGE"; diff --git a/src/base/combination/searcher.js b/src/base/combination/searcher.js index 9b2cd5b8ea..07423dc240 100644 --- a/src/base/combination/searcher.js +++ b/src/base/combination/searcher.js @@ -295,9 +295,8 @@ BI.Searcher = BI.inherit(BI.Widget, { this.popupView && this.popupView.empty(); }, - destroy: function () { + destroyed: function () { BI.Maskers.remove(this.getName()); - BI.Searcher.superclass.destroy.apply(this, arguments); } }); BI.Searcher.EVENT_CHANGE = "EVENT_CHANGE"; diff --git a/src/component/allvaluechooser/abstract.allvaluechooser.js b/src/component/allvaluechooser/abstract.allvaluechooser.js index 35259d29b6..53f9e02cd9 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/widget/datetime/datetime.combo.js b/src/widget/datetime/datetime.combo.js index 8f18d8c41a..600a28242e 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 3a19b61f64..7102fbc417 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/dynamicdate/dynamicdate.popup.js b/src/widget/dynamicdate/dynamicdate.popup.js index 68e3af28e2..bb5e0e5fbb 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 02be3f56fe..2bdde53d4f 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 caeca72dcb..658642b210 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/quarter/popup.quarter.js b/src/widget/quarter/popup.quarter.js index 387db9b12d..474799141d 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 }); });