Browse Source

Pull request #3161: 无JIRA fix: 文本过滤组件

Merge in VISUAL/fineui from ~DAILER/fineui:master to master

* commit '73cfcc5e7b786476d71befaa15118f69a4c8dbc6':
  Revert "无JIRA fix: _initElementHeight和_initElementWidth方法修复"
  无JIRA fix: 文本过滤组件
  无JIRA fix: _initElementHeight和_initElementWidth方法修复
es6
Dailer-刘荣歆 2 years ago
parent
commit
eb29a3a47c
  1. 2
      src/widget/dynamicdatetime/dynamicdatetime.combo.js
  2. 4
      src/widget/multiselect/search/multiselect.search.insert.pane.js
  3. 7
      src/widget/multiselectlist/multiselectlist.insert.js
  4. 5
      src/widget/singleselect/search/singleselect.search.pane.insert.js
  5. 4
      src/widget/singleselect/search/singleselect.search.pane.js
  6. 8
      src/widget/singleselect/singleselectlist.insert.js
  7. 2
      src/widget/year/popup.year.js

2
src/widget/dynamicdatetime/dynamicdatetime.combo.js

@ -8,7 +8,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
}, },
props: { props: {
baseCls: "bi-dynamic-date-combo", baseCls: "bi-dynamic-date--time-combo",
height: 24, height: 24,
minDate: "1900-01-01", minDate: "1900-01-01",
maxDate: "2099-12-31", maxDate: "2099-12-31",

4
src/widget/multiselect/search/multiselect.search.insert.pane.js

@ -54,11 +54,11 @@ BI.MultiSelectSearchInsertPane = BI.inherit(BI.Widget, {
}); });
this.resizer = BI.createWidget({ this.resizer = BI.createWidget({
type: "bi.vtape", type: "bi.vertical_fill",
rowSize: ["", "fill"],
element: this, element: this,
items: [{ items: [{
el: this.addNotMatchTip, el: this.addNotMatchTip,
height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
}, { }, {
el: this.loader, el: this.loader,
}], }],

7
src/widget/multiselectlist/multiselectlist.insert.js

@ -74,7 +74,6 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
ref: function (ref) { ref: function (ref) {
self.editor = ref; self.editor = ref;
}, },
height: o.searcherHeight || BI.SIZE_CONSANTS.TRIGGER_HEIGHT,
}, },
isAutoSearch: false, isAutoSearch: false,
isAutoSync: false, isAutoSync: false,
@ -83,7 +82,6 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
}, },
adapter: this.adapter, adapter: this.adapter,
popup: this.searcherPane, popup: this.searcherPane,
height: 200,
masker: false, masker: false,
listeners: [{ listeners: [{
eventName: BI.Searcher.EVENT_START, eventName: BI.Searcher.EVENT_START,
@ -168,14 +166,13 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
}); });
BI.createWidget({ BI.createWidget({
type: "bi.vtape", type: "bi.vertical_fill",
rowSize: ["", "fill"],
element: this, element: this,
items: [{ items: [{
el: this.trigger, el: this.trigger,
height: o.searcherHeight || BI.SIZE_CONSANTS.TRIGGER_HEIGHT,
}, { }, {
el: this.adapter, el: this.adapter,
height: "fill"
}] }]
}); });
BI.createWidget({ BI.createWidget({

5
src/widget/singleselect/search/singleselect.search.pane.insert.js

@ -15,7 +15,7 @@ BI.SingleSelectSearchInsertPane = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.SingleSelectSearchInsertPane.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.SingleSelectSearchInsertPane.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-single-select-search-pane bi-card", baseCls: "bi-single-select-search-pane-insert bi-card",
allowNoSelect: false, allowNoSelect: false,
itemsCreator: BI.emptyFn, itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,
@ -53,7 +53,8 @@ BI.SingleSelectSearchInsertPane = BI.inherit(BI.Widget, {
}); });
this.resizer = BI.createWidget({ this.resizer = BI.createWidget({
type: "bi.vtape", type: "bi.vertical_fill",
rowSize: ["", "fill"],
element: this, element: this,
items: [{ items: [{
type: "bi.vertical", type: "bi.vertical",

4
src/widget/singleselect/search/singleselect.search.pane.js

@ -53,11 +53,11 @@ BI.SingleSelectSearchPane = BI.inherit(BI.Widget, {
}); });
this.resizer = BI.createWidget({ this.resizer = BI.createWidget({
type: "bi.vtape", type: "bi.vertical_fill",
rowSize: ["", "fill"],
element: this, element: this,
items: [{ items: [{
el: this.tooltipClick, el: this.tooltipClick,
height: 0
}, { }, {
el: this.loader el: this.loader
}] }]

8
src/widget/singleselect/singleselectlist.insert.js

@ -6,7 +6,7 @@
BI.SingleSelectInsertList = BI.inherit(BI.Single, { BI.SingleSelectInsertList = BI.inherit(BI.Single, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.SingleSelectInsertList.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.SingleSelectInsertList.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-insert-list", baseCls: "bi-single-select-insert-list",
allowNoSelect: false, allowNoSelect: false,
itemsCreator: BI.emptyFn, itemsCreator: BI.emptyFn,
itemWrapper: BI.emptyFn, itemWrapper: BI.emptyFn,
@ -81,7 +81,6 @@ BI.SingleSelectInsertList = BI.inherit(BI.Single, {
}, },
adapter: this.adapter, adapter: this.adapter,
popup: this.searcherPane, popup: this.searcherPane,
height: 200,
masker: false, masker: false,
value: o.value, value: o.value,
listeners: [{ listeners: [{
@ -124,14 +123,13 @@ BI.SingleSelectInsertList = BI.inherit(BI.Single, {
}); });
BI.createWidget({ BI.createWidget({
type: "bi.vtape", type: "bi.vertical_fill",
rowSize: ["", "fill"],
element: this, element: this,
items: [{ items: [{
el: this.trigger, el: this.trigger,
height: 24
}, { }, {
el: this.adapter, el: this.adapter,
height: "fill"
}] }]
}); });
BI.createWidget({ BI.createWidget({

2
src/widget/year/popup.year.js

@ -11,7 +11,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
}, },
props: { props: {
baseCls: "bi-year-popup", baseCls: "bi-dynamic-year-popup",
behaviors: {}, behaviors: {},
min: "1900-01-01", // 最小日期 min: "1900-01-01", // 最小日期
max: "2099-12-31", // 最大日期, max: "2099-12-31", // 最大日期,

Loading…
Cancel
Save