Browse Source

去掉对finekit的依赖、修复demo

10.0
hugh 4 years ago
parent
commit
458b3aa0ac
  1. 2
      src/main/java/com/tptj/demo/hg/table/data/Demo.java
  2. 7
      src/main/java/com/tptj/demo/hg/table/data/DemoDataModel.java
  3. 4
      src/main/java/com/tptj/demo/hg/table/data/DemoTableData.java
  4. 2
      src/main/java/com/tptj/demo/hg/table/data/server/Demo.java
  5. 11
      src/main/java/com/tptj/demo/hg/table/data/ui/DemoTableDataPane.java

2
src/main/java/com/tptj/demo/hg/table/data/Demo.java

@ -18,7 +18,7 @@ public class Demo extends AbstractTableDataDefineProvider {
@Override
public Class<? extends TableData> classForInitTableData() {
return null;
return DemoTableData.class;
}
@Override

7
src/main/java/com/tptj/demo/hg/table/data/DemoDataModel.java

@ -1,7 +1,8 @@
package com.tptj.demo.hg.table.data;
import com.fanruan.api.data.open.BaseDataModel;
import com.fanruan.api.err.TableDataException;
import com.fr.data.AbstractDataModel;
import com.fr.general.data.TableDataException;
import com.fr.script.Calculator;
import com.fr.stable.ParameterProvider;
@ -10,7 +11,7 @@ import com.fr.stable.ParameterProvider;
* @version 10.0
* Created by 秃破天际 on 2021-03-29
**/
public class DemoDataModel extends BaseDataModel {
public class DemoDataModel extends AbstractDataModel {
private String config;
private ParameterProvider[] parameters;

4
src/main/java/com/tptj/demo/hg/table/data/DemoTableData.java

@ -1,8 +1,8 @@
package com.tptj.demo.hg.table.data;
import com.fanruan.api.data.open.BaseTableData;
import com.fr.config.holder.Conf;
import com.fr.config.holder.factory.Holders;
import com.fr.data.AbstractParameterTableData;
import com.fr.general.data.DataModel;
import com.fr.general.xml.GeneralXMLTools;
import com.fr.intelli.record.Focus;
@ -19,7 +19,7 @@ import com.fr.stable.xml.XMLableReader;
* Created by 秃破天际 on 2021-03-29
**/
@EnableMetrics
public class DemoTableData extends BaseTableData {
public class DemoTableData extends AbstractParameterTableData {
/**
* 自定义一些配置
*/

2
src/main/java/com/tptj/demo/hg/table/data/server/Demo.java

@ -19,7 +19,7 @@ public class Demo extends AbstractServerTableDataDefineProvider {
@Override
public Class<? extends TableData> classForInitTableData() {
return null;
return DemoTableData.class;
}
@Override

11
src/main/java/com/tptj/demo/hg/table/data/ui/DemoTableDataPane.java

@ -1,16 +1,16 @@
package com.tptj.demo.hg.table.data.ui;
import com.fanruan.api.design.work.BaseTableDataPane;
import com.fanruan.api.design.ui.component.UITextArea;
import com.fanruan.api.design.ui.container.UIScrollPane;
import com.fr.base.BaseUtils;
import com.fr.base.Parameter;
import com.fr.design.data.datapane.preview.PreviewTablePane;
import com.fr.design.data.tabledata.tabledatapane.AbstractTableDataPane;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.icontainer.UIScrollPane;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.itableeditorpane.ParameterTableModel;
import com.fr.design.gui.itableeditorpane.UITableEditorPane;
import com.fr.design.gui.itableeditorpane.UITableModelAdapter;
import com.fr.design.gui.itextarea.UITextArea;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.script.Calculator;
@ -27,12 +27,13 @@ import java.awt.event.ActionListener;
* @version 10.0
* Created by 秃破天际 on 2021-03-29
**/
public class DemoTableDataPane extends BaseTableDataPane<DemoTableData> {
public class DemoTableDataPane extends AbstractTableDataPane<DemoTableData> {
private UITextArea config = new UITextArea();
private UITextArea config;
private UITableEditorPane<ParameterProvider> parameterTableEditorPane;
public DemoTableDataPane(){
config = new UITextArea();
setLayout(new BorderLayout());
UIButton preview = new UIButton(BaseUtils.readIcon("/com/fr/design/images/m_file/preview.png"));

Loading…
Cancel
Save