Browse Source

Pull request #3604: CHART-18112 调整富文本组件padding,在组件新建和刷新后选中最后一个元素

Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0

* commit '1b271beae8c31369a0fc9886c2c6fbb317926826':
  CHART-18112 富文本组件新建和刷新后选中最后一个元素
  调整富文本组件间距
feature/big-screen
Qinghui.Liu 4 years ago
parent
commit
7f57fd289d
  1. 16
      designer-chart/src/main/resources/com/fr/design/editor/rich_editor.html
  2. 6
      designer-chart/src/main/resources/com/fr/design/editor/script/editor.js
  3. 2
      designer-chart/src/main/resources/com/fr/design/editor/script/editor.model.js

16
designer-chart/src/main/resources/com/fr/design/editor/rich_editor.html

@ -64,6 +64,18 @@
return content; return content;
} }
var selectLast = function (instance) {
if (instance == null) {
return;
}
var target = instance.selElm()
if (target) {
instance.selected({target});
}
};
var dimensionIds = getDimensionIds(params); var dimensionIds = getDimensionIds(params);
if (initParams) { if (initParams) {
@ -110,6 +122,8 @@
} }
}); });
selectLast(rich_editor.editor.instance);
Pool.refresh = function () { Pool.refresh = function () {
var content = Pool.data.getContent(); var content = Pool.data.getContent();
var isAuto = Pool.data.isAuto(); var isAuto = Pool.data.isAuto();
@ -130,6 +144,8 @@
}); });
rich_editor.setFocus(); rich_editor.setFocus();
selectLast(rich_editor.editor.instance);
}; };
Pool.addField = function () { Pool.addField = function () {

6
designer-chart/src/main/resources/com/fr/design/editor/script/editor.js

@ -50,12 +50,14 @@
}, },
items: [{ items: [{
type: "bi.htape", type: "bi.htape",
tgap: 5, tgap: 3,
items: [{ items: [{
type: "bi.label", type: "bi.label",
text: BI.i18nText("BI-Design_Font_Style") + ": ", text: BI.i18nText("BI-Design_Font_Style") + ": ",
textAlign: "left", textAlign: "left",
width: 70 width: 60,
tgap: 2,
lgap: 3
}, { }, {
type: "bi.button_group", type: "bi.button_group",
items: this.model.fontStyleItems, items: this.model.fontStyleItems,

2
designer-chart/src/main/resources/com/fr/design/editor/script/editor.model.js

@ -18,7 +18,6 @@
return [{ return [{
type: "bi.single_select_radio_item", type: "bi.single_select_radio_item",
text: BI.i18nText("BI-Basic_Auto"), text: BI.i18nText("BI-Basic_Auto"),
hgap: 5,
width: 50, width: 50,
logic: { logic: {
dynamic: true dynamic: true
@ -28,7 +27,6 @@
}, { }, {
type: "bi.single_select_radio_item", type: "bi.single_select_radio_item",
text: BI.i18nText("BI-Basic_Custom"), text: BI.i18nText("BI-Basic_Custom"),
hgap: 5,
width: 60, width: 60,
logic: { logic: {
dynamic: true dynamic: true

Loading…
Cancel
Save