Browse Source

Merge pull request #833 in VISUAL/fineui from ~FRANK.QIU/fineui:master to master

* commit '067153889c4804b9d8fbcc04288e106400793188':
  无JIRA 颜色选择器的更多贴边了
es6
Frank.Qiu 6 years ago
parent
commit
8a17e9554a
  1. 1
      dist/bundle.ie.js
  2. 1
      dist/bundle.js
  3. 1
      dist/case.js
  4. 25
      dist/demo.js
  5. 1
      dist/fineui.ie.js
  6. 1
      dist/fineui.js
  7. 1
      src/case/colorchooser/colorchooser.popup.js

1
dist/bundle.ie.js vendored

@ -51660,6 +51660,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
cls: "color-chooser-popup-more bi-list-item", cls: "color-chooser-popup-more bi-list-item",
textAlign: "center", textAlign: "center",
height: 24, height: 24,
textLgap: 10,
text: BI.i18nText("BI-Basic_More") + "..." text: BI.i18nText("BI-Basic_More") + "..."
}, },
popup: panel popup: panel

1
dist/bundle.js vendored

@ -52064,6 +52064,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
cls: "color-chooser-popup-more bi-list-item", cls: "color-chooser-popup-more bi-list-item",
textAlign: "center", textAlign: "center",
height: 24, height: 24,
textLgap: 10,
text: BI.i18nText("BI-Basic_More") + "..." text: BI.i18nText("BI-Basic_More") + "..."
}, },
popup: panel popup: panel

1
dist/case.js vendored

@ -2422,6 +2422,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
cls: "color-chooser-popup-more bi-list-item", cls: "color-chooser-popup-more bi-list-item",
textAlign: "center", textAlign: "center",
height: 24, height: 24,
textLgap: 10,
text: BI.i18nText("BI-Basic_More") + "..." text: BI.i18nText("BI-Basic_More") + "..."
}, },
popup: panel popup: panel

25
dist/demo.js vendored

@ -6158,30 +6158,7 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, {
}; };
} }
}); });
BI.shortcut("demo.htape", Demo.HtapeLayout);Demo.InlineVerticalLayout = BI.inherit(BI.Widget, { BI.shortcut("demo.htape", Demo.HtapeLayout);/**
props: {
baseCls: "demo-absolute"
},
render: function () {
return {
type: "bi.inline_vertical_adapt",
items: [{
type: "bi.label",
text: "绝对布局",
cls: "layout-bg1",
width: 300,
height: 200
}, {
type: "bi.label",
text: "绝对布局",
cls: "layout-bg1",
width: 300,
height: 100
}]
};
}
});
BI.shortcut("demo.inline_vertical", Demo.InlineVerticalLayout);/**
* Created by User on 2017/3/22. * Created by User on 2017/3/22.
*/ */
Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, { Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, {

1
dist/fineui.ie.js vendored

@ -51905,6 +51905,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
cls: "color-chooser-popup-more bi-list-item", cls: "color-chooser-popup-more bi-list-item",
textAlign: "center", textAlign: "center",
height: 24, height: 24,
textLgap: 10,
text: BI.i18nText("BI-Basic_More") + "..." text: BI.i18nText("BI-Basic_More") + "..."
}, },
popup: panel popup: panel

1
dist/fineui.js vendored

@ -52309,6 +52309,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
cls: "color-chooser-popup-more bi-list-item", cls: "color-chooser-popup-more bi-list-item",
textAlign: "center", textAlign: "center",
height: 24, height: 24,
textLgap: 10,
text: BI.i18nText("BI-Basic_More") + "..." text: BI.i18nText("BI-Basic_More") + "..."
}, },
popup: panel popup: panel

1
src/case/colorchooser/colorchooser.popup.js

@ -104,6 +104,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
cls: "color-chooser-popup-more bi-list-item", cls: "color-chooser-popup-more bi-list-item",
textAlign: "center", textAlign: "center",
height: 24, height: 24,
textLgap: 10,
text: BI.i18nText("BI-Basic_More") + "..." text: BI.i18nText("BI-Basic_More") + "..."
}, },
popup: panel popup: panel

Loading…
Cancel
Save