Browse Source

Pull request #2219: JSY-10375 fix: 动态时间边框显示问题

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

* commit 'fea68f99af025924e250854d97e72f6af278930f':
  JSY-10375 fix: 动态时间边框显示问题
es6
Kira 3 years ago
parent
commit
bcb1aa59ef
  1. 4
      src/widget/dynamicdate/dynamicdate.combo.js
  2. 4
      src/widget/dynamicdatetime/dynamicdatetime.combo.js
  3. 4
      src/widget/year/combo.year.js
  4. 4
      src/widget/yearmonth/combo.yearmonth.js
  5. 4
      src/widget/yearquarter/combo.yearquarter.js

4
src/widget/dynamicdate/dynamicdate.combo.js

@ -32,12 +32,13 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
this.storeValue = opts.value; this.storeValue = opts.value;
return { return {
type: "bi.htape", type: "bi.htape",
cls: "bi-border bi-border-radius",
items: [{ items: [{
el: { el: {
type: "bi.icon_button", type: "bi.icon_button",
cls: "bi-trigger-icon-button date-change-h-font", cls: "bi-trigger-icon-button date-change-h-font",
width: opts.height, width: opts.height,
height: opts.height, height: opts.height - 2,
ref: function () { ref: function () {
self.changeIcon = this; self.changeIcon = this;
} }
@ -48,7 +49,6 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
items: [{ items: [{
el: { el: {
type: "bi.combo", type: "bi.combo",
cls: "bi-border bi-border-radius",
container: opts.container, container: opts.container,
ref: function () { ref: function () {
self.combo = this; self.combo = this;

4
src/widget/dynamicdatetime/dynamicdatetime.combo.js

@ -32,12 +32,13 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
this.storeValue = opts.value; this.storeValue = opts.value;
return { return {
type: "bi.htape", type: "bi.htape",
cls: "bi-border bi-border-radius",
items: [{ items: [{
el: { el: {
type: "bi.icon_button", type: "bi.icon_button",
cls: "bi-trigger-icon-button date-change-h-font", cls: "bi-trigger-icon-button date-change-h-font",
width: opts.height, width: opts.height,
height: opts.height, height: opts.height - 2,
ref: function () { ref: function () {
self.changeIcon = this; self.changeIcon = this;
} }
@ -48,7 +49,6 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
items: [{ items: [{
el: { el: {
type: "bi.combo", type: "bi.combo",
cls: "bi-border bi-border-radius",
destroyWhenHide: true, destroyWhenHide: true,
container: opts.container, container: opts.container,
ref: function () { ref: function () {

4
src/widget/year/combo.year.js

@ -59,7 +59,6 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
cls: "bi-border bi-border-radius",
container: o.container, container: o.container,
isNeedAdjustHeight: false, isNeedAdjustHeight: false,
isNeedAdjustWidth: false, isNeedAdjustWidth: false,
@ -121,6 +120,7 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
BI.createWidget({ BI.createWidget({
type: "bi.htape", type: "bi.htape",
cls: "bi-border bi-border-radius",
element: this, element: this,
ref: function () { ref: function () {
self.comboWrapper = this; self.comboWrapper = this;
@ -130,7 +130,7 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
type: "bi.icon_button", type: "bi.icon_button",
cls: "bi-trigger-icon-button date-change-h-font", cls: "bi-trigger-icon-button date-change-h-font",
width: 24, width: 24,
height: 24, height: o.height - 2,
ref: function () { ref: function () {
self.changeIcon = this; self.changeIcon = this;
} }

4
src/widget/yearmonth/combo.yearmonth.js

@ -59,7 +59,6 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
cls: "bi-border bi-border-radius",
container: o.container, container: o.container,
isNeedAdjustHeight: o.isNeedAdjustHeight, isNeedAdjustHeight: o.isNeedAdjustHeight,
isNeedAdjustWidth: o.isNeedAdjustWidth, isNeedAdjustWidth: o.isNeedAdjustWidth,
@ -125,6 +124,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
BI.createWidget({ BI.createWidget({
type: "bi.htape", type: "bi.htape",
cls: "bi-border bi-border-radius",
element: this, element: this,
ref: function () { ref: function () {
self.comboWrapper = this; self.comboWrapper = this;
@ -134,7 +134,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
type: "bi.icon_button", type: "bi.icon_button",
cls: "bi-trigger-icon-button date-change-h-font", cls: "bi-trigger-icon-button date-change-h-font",
width: 24, width: 24,
height: 24, height: o.height - 2,
ref: function () { ref: function () {
self.changeIcon = this; self.changeIcon = this;
} }

4
src/widget/yearquarter/combo.yearquarter.js

@ -59,7 +59,6 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
cls: "bi-border bi-border-radius",
container: o.container, container: o.container,
isNeedAdjustHeight: o.isNeedAdjustHeight, isNeedAdjustHeight: o.isNeedAdjustHeight,
isNeedAdjustWidth: o.isNeedAdjustWidth, isNeedAdjustWidth: o.isNeedAdjustWidth,
@ -125,6 +124,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
BI.createWidget({ BI.createWidget({
type: "bi.htape", type: "bi.htape",
cls: "bi-border bi-border-radius",
element: this, element: this,
ref: function () { ref: function () {
self.comboWrapper = this; self.comboWrapper = this;
@ -134,7 +134,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
type: "bi.icon_button", type: "bi.icon_button",
cls: "bi-trigger-icon-button date-change-h-font", cls: "bi-trigger-icon-button date-change-h-font",
width: 24, width: 24,
height: 24, height: o.height - 2,
ref: function () { ref: function () {
self.changeIcon = this; self.changeIcon = this;
} }

Loading…
Cancel
Save