diff --git a/demo/config.js b/demo/config.js index 35f295624..cc3e5dfe7 100644 --- a/demo/config.js +++ b/demo/config.js @@ -1518,17 +1518,13 @@ Demo.CONSTANTS = { }, {pId: "0_1_33", id: "0_1_33_0", text: "重庆市区", value: "重庆市区", open: true}], TREE: [{id: -1, pId: -2, value: "根目录", text: "根目录"}, - {id: -2, pId: -2, value: "根目录", text: "根目录"}, - {id: -3, pId: -2, value: "根目录", text: "根目录"}, - {id: -4, pId: -2, value: "根目录", text: "根目录"}, - {id: -5, pId: -2, value: "根目录", text: "根目录"}, {id: 1, pId: -1, value: "第一级目录1", text: "第一级目录1"}, {id: 11, pId: 1, value: "第二级文件1", text: "第二级文件1"}, {id: 12, pId: 1, value: "第二级目录2", text: "第二级目录2"}, {id: 121, pId: 12, value: "第三级目录1", text: "第三级目录1"}, {id: 122, pId: 12, value: "第三级文件1", text: "第三级文件1"}, {id: 1211, pId: 121, value: "第四级目录1", text: "第四级目录1"}, - {id: 12111, pId: 1211, value: "第五级文件1", text: "第五级文件1111111111111111111"}, + {id: 12111, pId: 1211, value: "第五级文件1", text: "第五级文件111111111111111111111111111111111111111111111111111111111111111111111111111111111111111"}, {id: 2, pId: -1, value: "第一级目录2", text: "第一级目录2"}, {id: 21, pId: 2, value: "第二级目录3", text: "第二级目录3"}, {id: 22, pId: 2, value: "第二级文件2", text: "第二级文件2"}, diff --git a/demo/js/widget/singleselct/demo.single_select_combo.js b/demo/js/widget/singleselct/demo.single_select_combo.js index 711e3c29f..7a9b78fc5 100644 --- a/demo/js/widget/singleselct/demo.single_select_combo.js +++ b/demo/js/widget/singleselct/demo.single_select_combo.js @@ -29,14 +29,14 @@ Demo.SingleSelectCombo = BI.inherit(BI.Widget, { _getItemsByTimes: function (items, times) { var res = []; - for (var i = (times - 1) * 10; items[i] && i < times * 10; i++) { + for (var i = (times - 1) * 100; items[i] && i < times * 100; i++) { res.push(items[i]); } return res; }, _hasNextByTimes: function (items, times) { - return times * 10 < items.length; + return times * 100 < items.length; }, _itemsCreator: function (options, callback) { diff --git a/dist/bundle.js b/dist/bundle.js index 15f2b481c..e895e35c4 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -97524,7 +97524,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { offset: { left: 1, top: 1, - right: 2, + right: 1, bottom: 33 } }, @@ -97908,7 +97908,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, { offset: { left: 1, top: 1, - right: 2, + right: 1, bottom: 33 } }, @@ -98275,7 +98275,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, { offset: { left: 1, top: 1, - right: 2, + right: 1, bottom: 33 } }, @@ -106236,14 +106236,6 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, { type: "bi.single_select_trigger", height: o.height, // adapter: this.popup, - masker: { - offset: { - left: 1, - top: 1, - right: 2, - bottom: 33 - } - }, valueFormatter: o.valueFormatter, itemsCreator: function (op, callback) { o.itemsCreator(op, function (res) { @@ -106514,14 +106506,6 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, { type: "bi.single_select_trigger", height: o.height, // adapter: this.popup, - masker: { - offset: { - left: 1, - top: 1, - right: 2, - bottom: 33 - } - }, valueFormatter: o.valueFormatter, itemsCreator: function (op, callback) { o.itemsCreator(op, function (res) { diff --git a/dist/demo.js b/dist/demo.js index 3b8dd9cfb..8ab864216 100644 --- a/dist/demo.js +++ b/dist/demo.js @@ -13286,14 +13286,14 @@ Demo.SingleSelectCombo = BI.inherit(BI.Widget, { _getItemsByTimes: function (items, times) { var res = []; - for (var i = (times - 1) * 10; items[i] && i < times * 10; i++) { + for (var i = (times - 1) * 100; items[i] && i < times * 100; i++) { res.push(items[i]); } return res; }, _hasNextByTimes: function (items, times) { - return times * 10 < items.length; + return times * 100 < items.length; }, _itemsCreator: function (options, callback) { @@ -16354,17 +16354,13 @@ Demo.CONSTANTS = { }, {pId: "0_1_33", id: "0_1_33_0", text: "重庆市区", value: "重庆市区", open: true}], TREE: [{id: -1, pId: -2, value: "根目录", text: "根目录"}, - {id: -2, pId: -2, value: "根目录", text: "根目录"}, - {id: -3, pId: -2, value: "根目录", text: "根目录"}, - {id: -4, pId: -2, value: "根目录", text: "根目录"}, - {id: -5, pId: -2, value: "根目录", text: "根目录"}, {id: 1, pId: -1, value: "第一级目录1", text: "第一级目录1"}, {id: 11, pId: 1, value: "第二级文件1", text: "第二级文件1"}, {id: 12, pId: 1, value: "第二级目录2", text: "第二级目录2"}, {id: 121, pId: 12, value: "第三级目录1", text: "第三级目录1"}, {id: 122, pId: 12, value: "第三级文件1", text: "第三级文件1"}, {id: 1211, pId: 121, value: "第四级目录1", text: "第四级目录1"}, - {id: 12111, pId: 1211, value: "第五级文件1", text: "第五级文件1111111111111111111"}, + {id: 12111, pId: 1211, value: "第五级文件1", text: "第五级文件111111111111111111111111111111111111111111111111111111111111111111111111111111111111111"}, {id: 2, pId: -1, value: "第一级目录2", text: "第一级目录2"}, {id: 21, pId: 2, value: "第二级目录3", text: "第二级目录3"}, {id: 22, pId: 2, value: "第二级文件2", text: "第二级文件2"}, diff --git a/dist/fineui.js b/dist/fineui.js index 6706595a2..c6e95d45d 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -97767,7 +97767,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { offset: { left: 1, top: 1, - right: 2, + right: 1, bottom: 33 } }, @@ -98151,7 +98151,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, { offset: { left: 1, top: 1, - right: 2, + right: 1, bottom: 33 } }, @@ -98518,7 +98518,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, { offset: { left: 1, top: 1, - right: 2, + right: 1, bottom: 33 } }, @@ -106479,14 +106479,6 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, { type: "bi.single_select_trigger", height: o.height, // adapter: this.popup, - masker: { - offset: { - left: 1, - top: 1, - right: 2, - bottom: 33 - } - }, valueFormatter: o.valueFormatter, itemsCreator: function (op, callback) { o.itemsCreator(op, function (res) { @@ -106757,14 +106749,6 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, { type: "bi.single_select_trigger", height: o.height, // adapter: this.popup, - masker: { - offset: { - left: 1, - top: 1, - right: 2, - bottom: 33 - } - }, valueFormatter: o.valueFormatter, itemsCreator: function (op, callback) { o.itemsCreator(op, function (res) { diff --git a/dist/widget.js b/dist/widget.js index 5b28b9a16..e3a07130b 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -9900,7 +9900,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { offset: { left: 1, top: 1, - right: 2, + right: 1, bottom: 33 } }, @@ -10284,7 +10284,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, { offset: { left: 1, top: 1, - right: 2, + right: 1, bottom: 33 } }, @@ -10651,7 +10651,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, { offset: { left: 1, top: 1, - right: 2, + right: 1, bottom: 33 } }, @@ -18612,14 +18612,6 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, { type: "bi.single_select_trigger", height: o.height, // adapter: this.popup, - masker: { - offset: { - left: 1, - top: 1, - right: 2, - bottom: 33 - } - }, valueFormatter: o.valueFormatter, itemsCreator: function (op, callback) { o.itemsCreator(op, function (res) { @@ -18890,14 +18882,6 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, { type: "bi.single_select_trigger", height: o.height, // adapter: this.popup, - masker: { - offset: { - left: 1, - top: 1, - right: 2, - bottom: 33 - } - }, valueFormatter: o.valueFormatter, itemsCreator: function (op, callback) { o.itemsCreator(op, function (res) { diff --git a/src/widget/multiselect/multiselect.combo.js b/src/widget/multiselect/multiselect.combo.js index e3d97f523..ed7b16a8f 100644 --- a/src/widget/multiselect/multiselect.combo.js +++ b/src/widget/multiselect/multiselect.combo.js @@ -39,7 +39,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { offset: { left: 1, top: 1, - right: 2, + right: 1, bottom: 33 } }, diff --git a/src/widget/multiselect/multiselect.insert.combo.js b/src/widget/multiselect/multiselect.insert.combo.js index 5c680fd8e..67f711067 100644 --- a/src/widget/multiselect/multiselect.insert.combo.js +++ b/src/widget/multiselect/multiselect.insert.combo.js @@ -36,7 +36,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, { offset: { left: 1, top: 1, - right: 2, + right: 1, bottom: 33 } }, diff --git a/src/widget/multiselect/multiselect.insert.combo.nobar.js b/src/widget/multiselect/multiselect.insert.combo.nobar.js index d88703896..1be0850c3 100644 --- a/src/widget/multiselect/multiselect.insert.combo.nobar.js +++ b/src/widget/multiselect/multiselect.insert.combo.nobar.js @@ -39,7 +39,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, { offset: { left: 1, top: 1, - right: 2, + right: 1, bottom: 33 } }, diff --git a/src/widget/singleselect/singleselect.combo.js b/src/widget/singleselect/singleselect.combo.js index 53ac26636..6fa71870c 100644 --- a/src/widget/singleselect/singleselect.combo.js +++ b/src/widget/singleselect/singleselect.combo.js @@ -30,14 +30,6 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, { type: "bi.single_select_trigger", height: o.height, // adapter: this.popup, - masker: { - offset: { - left: 1, - top: 1, - right: 2, - bottom: 33 - } - }, valueFormatter: o.valueFormatter, itemsCreator: function (op, callback) { o.itemsCreator(op, function (res) { diff --git a/src/widget/singleselect/singleselect.insert.combo.js b/src/widget/singleselect/singleselect.insert.combo.js index 46b601fe2..e44f158c1 100644 --- a/src/widget/singleselect/singleselect.insert.combo.js +++ b/src/widget/singleselect/singleselect.insert.combo.js @@ -30,14 +30,6 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, { type: "bi.single_select_trigger", height: o.height, // adapter: this.popup, - masker: { - offset: { - left: 1, - top: 1, - right: 2, - bottom: 33 - } - }, valueFormatter: o.valueFormatter, itemsCreator: function (op, callback) { o.itemsCreator(op, function (res) {