Browse Source

Merge pull request #487 in DESIGN/design from ~PLOUGH/10-design:release/10.0 to release/10.0

* commit '6b0d6c60ec1abcde0a6b4d890d0d6c6a4dcd6d9e':
  REPORT-11155 10.0 丢失功能点补充
final/10.0
plough 6 years ago
parent
commit
faeeec995c
  1. 22
      designer-form/src/main/java/com/fr/design/designer/beans/actions/FormWidgetEditAction.java
  2. 10
      designer-form/src/main/java/com/fr/design/mainframe/actions/FormMobileAttrAction.java
  3. 10
      designer-form/src/main/java/com/fr/design/mainframe/widget/accessibles/AccessibleBodyWatermarkEditor.java
  4. 9
      designer-realize/src/main/java/com/fr/design/actions/report/ReportMobileAttrAction.java
  5. 10
      designer-realize/src/main/java/com/fr/design/actions/report/ReportWatermarkAction.java

22
designer-form/src/main/java/com/fr/design/designer/beans/actions/FormWidgetEditAction.java

@ -3,9 +3,14 @@ package com.fr.design.designer.beans.actions;
import com.fr.design.actions.TemplateComponentAction; import com.fr.design.actions.TemplateComponentAction;
import com.fr.design.designer.beans.actions.behavior.UpdateBehavior; import com.fr.design.designer.beans.actions.behavior.UpdateBehavior;
import com.fr.design.mainframe.FormDesigner; import com.fr.design.mainframe.FormDesigner;
import com.fr.intelli.record.Focus;
import com.fr.intelli.record.Original;
import com.fr.record.analyzer.EnableMetrics;
import javax.swing.JButton;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
@EnableMetrics
public abstract class FormWidgetEditAction extends TemplateComponentAction<FormDesigner> { public abstract class FormWidgetEditAction extends TemplateComponentAction<FormDesigner> {
private UpdateBehavior updateBehavior = new UpdateBehavior<FormWidgetEditAction>() { private UpdateBehavior updateBehavior = new UpdateBehavior<FormWidgetEditAction>() {
@ -27,9 +32,24 @@ public abstract class FormWidgetEditAction extends TemplateComponentAction<FormD
@Override @Override
public void actionPerformed(ActionEvent evt) { public void actionPerformed(ActionEvent evt) {
super.actionPerformed(evt); super.actionPerformed(evt);
if (evt.getSource() instanceof JButton) {
recordFunction4Toolbar();
} else {
recordFunction4PopupMenu();
}
}
@Focus(id = "com.fr.form.widget_edit_toolbar", text = "Fine-Design_Function_Form_Widget_Edit_Toolbar", source = Original.EMBED)
private void recordFunction4Toolbar() {
// do nothing
}
@Focus(id = "com.fr.form.widget_edit_popupmenu", text = "Fine-Design_Function_Form_Widget_Edit_Popup_Menu", source = Original.EMBED)
private void recordFunction4PopupMenu() {
// do nothing
} }
public void setUpdateBehavior(UpdateBehavior updateBehavior) { void setUpdateBehavior(UpdateBehavior updateBehavior) {
this.updateBehavior = updateBehavior; this.updateBehavior = updateBehavior;
} }

10
designer-form/src/main/java/com/fr/design/mainframe/actions/FormMobileAttrAction.java

@ -14,6 +14,9 @@ import com.fr.design.menu.MenuKeySet;
import com.fr.file.FILE; import com.fr.file.FILE;
import com.fr.form.main.Form; import com.fr.form.main.Form;
import com.fr.form.main.mobile.FormMobileAttr; import com.fr.form.main.mobile.FormMobileAttr;
import com.fr.intelli.record.Focus;
import com.fr.intelli.record.Original;
import com.fr.record.analyzer.EnableMetrics;
import javax.swing.*; import javax.swing.*;
@ -22,6 +25,7 @@ import java.awt.event.ActionEvent;
/** /**
* Created by fanglei on 2016/11/14. * Created by fanglei on 2016/11/14.
*/ */
@EnableMetrics
public class FormMobileAttrAction extends JTemplateAction<JForm> { public class FormMobileAttrAction extends JTemplateAction<JForm> {
public FormMobileAttrAction(JForm jf) { public FormMobileAttrAction(JForm jf) {
@ -64,6 +68,7 @@ public class FormMobileAttrAction extends JTemplateAction<JForm> {
// 放到后面。如果提前 return 了,则仍然处于未设置状态,不要添加 // 放到后面。如果提前 return 了,则仍然处于未设置状态,不要添加
jf.getTarget().addAttrMark(new MobileOnlyTemplateAttrMark()); jf.getTarget().addAttrMark(new MobileOnlyTemplateAttrMark());
} }
recordFunction();
// 设置移动端属性并刷新界面 // 设置移动端属性并刷新界面
formTpl.setFormMobileAttr(formMobileAttr); // 会调整 body 的自适应布局,放到最后 formTpl.setFormMobileAttr(formMobileAttr); // 会调整 body 的自适应布局,放到最后
((FormArea)jf.getFormDesign().getParent()).onMobileAttrModified(); ((FormArea)jf.getFormDesign().getParent()).onMobileAttrModified();
@ -74,6 +79,11 @@ public class FormMobileAttrAction extends JTemplateAction<JForm> {
dialog.setVisible(true); dialog.setVisible(true);
} }
@Focus(id = "com.fr.mobile.mobile_template_frm", text = "Fine-Design_Function_Mobile_Template_Frm", source = Original.EMBED)
private void recordFunction() {
// do nothing
}
private static final MenuKeySet REPORT_APP_ATTR = new MenuKeySet() { private static final MenuKeySet REPORT_APP_ATTR = new MenuKeySet() {
@Override @Override
public char getMnemonic() { public char getMnemonic() {

10
designer-form/src/main/java/com/fr/design/mainframe/widget/accessibles/AccessibleBodyWatermarkEditor.java

@ -7,6 +7,9 @@ import com.fr.design.mainframe.widget.editors.ITextComponent;
import com.fr.design.mainframe.widget.renderer.WatermarkRenderer; import com.fr.design.mainframe.widget.renderer.WatermarkRenderer;
import com.fr.design.mainframe.widget.wrappers.WatermarkWrapper; import com.fr.design.mainframe.widget.wrappers.WatermarkWrapper;
import com.fr.design.report.WatermarkPane; import com.fr.design.report.WatermarkPane;
import com.fr.intelli.record.Focus;
import com.fr.intelli.record.Original;
import com.fr.record.analyzer.EnableMetrics;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
@ -15,6 +18,7 @@ import java.awt.*;
* Created by plough on 2018/5/15. * Created by plough on 2018/5/15.
*/ */
@EnableMetrics
public class AccessibleBodyWatermarkEditor extends UneditableAccessibleEditor { public class AccessibleBodyWatermarkEditor extends UneditableAccessibleEditor {
private WatermarkPane watermarkPane; private WatermarkPane watermarkPane;
@ -40,9 +44,15 @@ public class AccessibleBodyWatermarkEditor extends UneditableAccessibleEditor {
public void doOk() { public void doOk() {
setValue(watermarkPane.update()); setValue(watermarkPane.update());
fireStateChanged(); fireStateChanged();
recordFunction();
} }
}); });
watermarkPane.populate((WatermarkAttr) getValue()); watermarkPane.populate((WatermarkAttr) getValue());
dlg.setVisible(true); dlg.setVisible(true);
} }
@Focus(id = "com.fr.watermark", text = "Fine-Design_Form_WaterMark", source = Original.EMBED)
private void recordFunction() {
// do nothing
}
} }

9
designer-realize/src/main/java/com/fr/design/actions/report/ReportMobileAttrAction.java

@ -11,7 +11,9 @@ import com.fr.design.report.mobile.ReportMobileAttrPane;
import com.fr.file.FILE; import com.fr.file.FILE;
import com.fr.general.IOUtils; import com.fr.general.IOUtils;
import com.fr.intelli.record.Focus;
import com.fr.main.TemplateWorkBook; import com.fr.main.TemplateWorkBook;
import com.fr.record.analyzer.EnableMetrics;
import com.fr.report.mobile.ElementCaseMobileAttr; import com.fr.report.mobile.ElementCaseMobileAttr;
import javax.swing.*; import javax.swing.*;
@ -22,6 +24,7 @@ import java.awt.event.ActionEvent;
* *
* Created by Administrator on 2016/5/12/0012. * Created by Administrator on 2016/5/12/0012.
*/ */
@EnableMetrics
public class ReportMobileAttrAction extends JWorkBookAction{ public class ReportMobileAttrAction extends JWorkBookAction{
public ReportMobileAttrAction(JWorkBook jwb) { public ReportMobileAttrAction(JWorkBook jwb) {
@ -64,6 +67,7 @@ public class ReportMobileAttrAction extends JWorkBookAction{
// 放到后面。如果提前 return 了,则仍然处于未设置状态,不要添加 // 放到后面。如果提前 return 了,则仍然处于未设置状态,不要添加
wbTpl.addAttrMark(new MobileOnlyTemplateAttrMark()); wbTpl.addAttrMark(new MobileOnlyTemplateAttrMark());
} }
recordFunction();
// 设置移动端属性并刷新界面 // 设置移动端属性并刷新界面
wbTpl.setReportMobileAttr(elementCaseMobileAttr); // 会同时修改页面设置,放到最后 wbTpl.setReportMobileAttr(elementCaseMobileAttr); // 会同时修改页面设置,放到最后
jwb.fireTargetModified(); jwb.fireTargetModified();
@ -72,6 +76,11 @@ public class ReportMobileAttrAction extends JWorkBookAction{
dialog.setVisible(true); dialog.setVisible(true);
} }
@Focus(id = "com.fr.mobile.mobile_template_cpt", text = "Fine-Design_Function_Mobile_Template_Cpt")
private void recordFunction() {
// do nothing
}
private static final MenuKeySet REPORT_APP_ATTR = new MenuKeySet() { private static final MenuKeySet REPORT_APP_ATTR = new MenuKeySet() {
@Override @Override
public char getMnemonic() { return 'P'; } public char getMnemonic() { return 'P'; }

10
designer-realize/src/main/java/com/fr/design/actions/report/ReportWatermarkAction.java

@ -8,7 +8,10 @@ import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.JWorkBook; import com.fr.design.mainframe.JWorkBook;
import com.fr.design.menu.KeySetUtils; import com.fr.design.menu.KeySetUtils;
import com.fr.design.report.WatermarkPane; import com.fr.design.report.WatermarkPane;
import com.fr.intelli.record.Focus;
import com.fr.intelli.record.Original;
import com.fr.main.impl.WorkBook; import com.fr.main.impl.WorkBook;
import com.fr.record.analyzer.EnableMetrics;
import com.fr.report.core.ReportUtils; import com.fr.report.core.ReportUtils;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
@ -16,6 +19,7 @@ import java.awt.event.ActionEvent;
/** /**
* Created by plough on 2018/5/15. * Created by plough on 2018/5/15.
*/ */
@EnableMetrics
public class ReportWatermarkAction extends JWorkBookAction { public class ReportWatermarkAction extends JWorkBookAction {
public ReportWatermarkAction(JWorkBook jwb) { public ReportWatermarkAction(JWorkBook jwb) {
super(jwb); super(jwb);
@ -42,7 +46,13 @@ public class ReportWatermarkAction extends JWorkBookAction {
public void doOk() { public void doOk() {
wbTpl.addAttrMark(watermarkPane.update()); wbTpl.addAttrMark(watermarkPane.update());
jwb.fireTargetModified(); jwb.fireTargetModified();
recordFunction();
} }
}).setVisible(true); }).setVisible(true);
} }
@Focus(id = "com.fr.watermark", text = "Fine-Design_Form_WaterMark", source = Original.EMBED)
private void recordFunction() {
// do nothing
}
} }

Loading…
Cancel
Save