Browse Source

Merge pull request #3611 in DESIGN/design from feature/10.0 to feature/x

* commit 'c5ab3def4e1bbd561879348589c2af595a632eda':
  CHART-18270 点样式图片的宽高增加px单位
  CHART-18112 富文本组件新建和刷新后选中最后一个元素
  调整富文本组件间距
  REPORT-46723 填报智能添加单元格组 遗漏一个判断条件的同步修改
research/11.0
superman 4 years ago
parent
commit
1b5d43eae6
  1. 5
      designer-chart/src/main/java/com/fr/van/chart/designer/component/marker/VanChartImageMarkerPane.java
  2. 16
      designer-chart/src/main/resources/com/fr/design/editor/rich_editor.html
  3. 6
      designer-chart/src/main/resources/com/fr/design/editor/script/editor.js
  4. 2
      designer-chart/src/main/resources/com/fr/design/editor/script/editor.model.js
  5. 7
      designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java

5
designer-chart/src/main/java/com/fr/van/chart/designer/component/marker/VanChartImageMarkerPane.java

@ -4,6 +4,7 @@ import com.fr.base.background.ImageFileBackground;
import com.fr.design.beans.BasicBeanPane; import com.fr.design.beans.BasicBeanPane;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.gui.ispinner.UISpinner;
import com.fr.design.gui.ispinner.chart.UISpinnerWithPx;
import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper; import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.mainframe.backgroundpane.ImageBackgroundQuickPane; import com.fr.design.mainframe.backgroundpane.ImageBackgroundQuickPane;
@ -30,8 +31,8 @@ public class VanChartImageMarkerPane extends BasicBeanPane<VanChartAttrMarker> {
public VanChartImageMarkerPane() { public VanChartImageMarkerPane() {
imageBackgroundPane = new ImageBackgroundQuickPane(false); imageBackgroundPane = new ImageBackgroundQuickPane(false);
imageBackgroundPane.setPreferredSize(getImageBackgroundPreferredSize(imageBackgroundPane.getPreferredSize())); imageBackgroundPane.setPreferredSize(getImageBackgroundPreferredSize(imageBackgroundPane.getPreferredSize()));
width = new UISpinner(0, 100, 0.5, 30); width = new UISpinnerWithPx(0, 100, 0.5, 30);
height = new UISpinner(0, 100, 0.5, 30); height = new UISpinnerWithPx(0, 100, 0.5, 30);
double p = TableLayout.PREFERRED; double p = TableLayout.PREFERRED;
double f = TableLayout.FILL; double f = TableLayout.FILL;

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

7
designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java

@ -460,10 +460,11 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
TemplateCellElement cellElement = ePane.getEditingElementCase().getTemplateCellElement(c + i, r + j); TemplateCellElement cellElement = ePane.getEditingElementCase().getTemplateCellElement(c + i, r + j);
if (cellElement != null && ((i + c) != 0 || (r + j) != 0)) { if (cellElement != null && ((i + c) != 0 || (r + j) != 0)) {
String value = cellElement.toString(); String value = cellElement.toString();
if (!newAdd.contains(value) && !allColumnRow.contains(value)) { ColumnRow columnRow = ColumnRow.valueOf(value);
add.addColumnRow(ColumnRow.valueOf(value)); if (!newAdd.contains(columnRow) && !allColumnRow.contains(value)) {
add.addColumnRow(columnRow);
} }
newAdd.add(ColumnRow.valueOf(value)); newAdd.add(columnRow);
} }
if (cellElement == null) { if (cellElement == null) {

Loading…
Cancel
Save