Browse Source

Pull request #1791: 无JIRA任务 高度调整

Merge in VISUAL/fineui from ~WINDY/fui:master to master

* commit 'c2918554f051d929fba970ff97e81acab3f85c3f':
  无JIRA任务 高度调整
es6
windy 4 years ago
parent
commit
b9cd9ffd35
  1. 8
      src/widget/dynamicdate/dynamicdate.combo.js
  2. 8
      src/widget/dynamicdatetime/dynamicdatetime.combo.js
  3. 2
      src/widget/multiselect/multiselect.combo.js
  4. 2
      src/widget/multiselect/multiselect.combo.nobar.js
  5. 2
      src/widget/multiselect/multiselect.insert.combo.js
  6. 2
      src/widget/multiselect/multiselect.insert.combo.nobar.js
  7. 2
      src/widget/multitree/multi.tree.combo.js
  8. 2
      src/widget/multitree/multi.tree.insert.combo.js
  9. 2
      src/widget/multitree/multi.tree.list.combo.js
  10. 2
      src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js

8
src/widget/dynamicdate/dynamicdate.combo.js

@ -16,12 +16,6 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
supportDynamic: true, supportDynamic: true,
}, },
_init: function () {
var o = this.options;
o.height -= 2;
BI.DynamicDateCombo.superclass._init.apply(this, arguments);
},
render: function () { render: function () {
var self = this, opts = this.options; var self = this, opts = this.options;
this.storeTriggerValue = ""; this.storeTriggerValue = "";
@ -61,7 +55,7 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
format: opts.format, format: opts.format,
allowEdit: opts.allowEdit, allowEdit: opts.allowEdit,
watermark: opts.watermark, watermark: opts.watermark,
height: opts.height, height: opts.height - 2,
value: opts.value, value: opts.value,
ref: function () { ref: function () {
self.trigger = this; self.trigger = this;

8
src/widget/dynamicdatetime/dynamicdatetime.combo.js

@ -16,12 +16,6 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
supportDynamic: true supportDynamic: true
}, },
_init: function () {
var o = this.options;
o.height -= 2;
BI.DynamicDateTimeCombo.superclass._init.apply(this, arguments);
},
render: function () { render: function () {
var self = this, opts = this.options; var self = this, opts = this.options;
this.storeTriggerValue = ""; this.storeTriggerValue = "";
@ -61,7 +55,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
allowEdit: opts.allowEdit, allowEdit: opts.allowEdit,
watermark: opts.watermark, watermark: opts.watermark,
format: opts.format, format: opts.format,
height: opts.height, height: opts.height - 2,
value: opts.value, value: opts.value,
ref: function () { ref: function () {
self.trigger = this; self.trigger = this;

2
src/widget/multiselect/multiselect.combo.js

@ -44,7 +44,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
this.trigger = BI.createWidget({ this.trigger = BI.createWidget({
type: "bi.multi_select_trigger", type: "bi.multi_select_trigger",
allowEdit: o.allowEdit, allowEdit: o.allowEdit,
height: o.height, height: o.height - 2,
text: o.text, text: o.text,
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {

2
src/widget/multiselect/multiselect.combo.nobar.js

@ -41,7 +41,7 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
this.trigger = BI.createWidget({ this.trigger = BI.createWidget({
type: "bi.multi_select_trigger", type: "bi.multi_select_trigger",
height: o.height, height: o.height - 2,
text: o.text, text: o.text,
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {

2
src/widget/multiselect/multiselect.insert.combo.js

@ -40,7 +40,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
this.trigger = BI.createWidget({ this.trigger = BI.createWidget({
type: "bi.multi_select_insert_trigger", type: "bi.multi_select_insert_trigger",
allowEdit: o.allowEdit, allowEdit: o.allowEdit,
height: o.height, height: o.height - 2,
text: o.text, text: o.text,
watermark: o.watermark, watermark: o.watermark,
// adapter: this.popup, // adapter: this.popup,

2
src/widget/multiselect/multiselect.insert.combo.nobar.js

@ -41,7 +41,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
this.trigger = BI.createWidget({ this.trigger = BI.createWidget({
type: "bi.multi_select_insert_trigger", type: "bi.multi_select_insert_trigger",
height: o.height, height: o.height - 2,
text: o.text, text: o.text,
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {

2
src/widget/multitree/multi.tree.combo.js

@ -37,7 +37,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
this.trigger = BI.createWidget({ this.trigger = BI.createWidget({
type: "bi.multi_select_trigger", type: "bi.multi_select_trigger",
allowEdit: o.allowEdit, allowEdit: o.allowEdit,
height: o.height, height: o.height - 2,
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
text: o.text, text: o.text,
watermark: o.watermark, watermark: o.watermark,

2
src/widget/multitree/multi.tree.insert.combo.js

@ -37,7 +37,7 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
this.trigger = BI.createWidget({ this.trigger = BI.createWidget({
type: "bi.multi_select_trigger", type: "bi.multi_select_trigger",
allowEdit: o.allowEdit, allowEdit: o.allowEdit,
height: o.height, height: o.height - 2,
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {

2
src/widget/multitree/multi.tree.list.combo.js

@ -40,7 +40,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
allowEdit: o.allowEdit, allowEdit: o.allowEdit,
text: o.text, text: o.text,
watermark: o.watermark, watermark: o.watermark,
height: o.height, height: o.height - 2,
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {

2
src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js

@ -35,7 +35,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
this.trigger = BI.createWidget({ this.trigger = BI.createWidget({
type: "bi.search_multi_select_trigger", type: "bi.search_multi_select_trigger",
text: o.text, text: o.text,
height: o.height, height: o.height - 2,
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
offset: { offset: {

Loading…
Cancel
Save