diff --git a/designer-chart/src/main/resources/com/fr/design/editor/rich_editor.html b/designer-chart/src/main/resources/com/fr/design/editor/rich_editor.html index 08e2437ada..6df5a29a14 100644 --- a/designer-chart/src/main/resources/com/fr/design/editor/rich_editor.html +++ b/designer-chart/src/main/resources/com/fr/design/editor/rich_editor.html @@ -64,6 +64,18 @@ return content; } + var selectLast = function (instance) { + if (instance == null) { + return; + } + + var target = instance.selElm() + + if (target) { + instance.selected({target}); + } + }; + var dimensionIds = getDimensionIds(params); if (initParams) { @@ -110,6 +122,8 @@ } }); + selectLast(rich_editor.editor.instance); + Pool.refresh = function () { var content = Pool.data.getContent(); var isAuto = Pool.data.isAuto(); @@ -130,6 +144,8 @@ }); rich_editor.setFocus(); + + selectLast(rich_editor.editor.instance); }; Pool.addField = function () { diff --git a/designer-chart/src/main/resources/com/fr/design/editor/script/editor.js b/designer-chart/src/main/resources/com/fr/design/editor/script/editor.js index a2b5dd6a7f..3786e47ef4 100644 --- a/designer-chart/src/main/resources/com/fr/design/editor/script/editor.js +++ b/designer-chart/src/main/resources/com/fr/design/editor/script/editor.js @@ -50,12 +50,14 @@ }, items: [{ type: "bi.htape", - tgap: 5, + tgap: 3, items: [{ type: "bi.label", text: BI.i18nText("BI-Design_Font_Style") + ": ", textAlign: "left", - width: 70 + width: 60, + tgap: 2, + lgap: 3 }, { type: "bi.button_group", items: this.model.fontStyleItems, diff --git a/designer-chart/src/main/resources/com/fr/design/editor/script/editor.model.js b/designer-chart/src/main/resources/com/fr/design/editor/script/editor.model.js index c901fd31ea..e1ee49645a 100644 --- a/designer-chart/src/main/resources/com/fr/design/editor/script/editor.model.js +++ b/designer-chart/src/main/resources/com/fr/design/editor/script/editor.model.js @@ -18,7 +18,6 @@ return [{ type: "bi.single_select_radio_item", text: BI.i18nText("BI-Basic_Auto"), - hgap: 5, width: 50, logic: { dynamic: true @@ -28,7 +27,6 @@ }, { type: "bi.single_select_radio_item", text: BI.i18nText("BI-Basic_Custom"), - hgap: 5, width: 60, logic: { dynamic: true