diff --git a/com.connor.jd.plm/plugin.xml b/com.connor.jd.plm/plugin.xml index 8b0d856..900a37a 100644 --- a/com.connor.jd.plm/plugin.xml +++ b/com.connor.jd.plm/plugin.xml @@ -501,6 +501,11 @@ + + + + + @@ -519,12 +524,6 @@ true - - - - - diff --git a/com.connor.jd.plm/src/com/connor/jd/plm/dialogs/CSXWHDialog.java b/com.connor.jd.plm/src/com/connor/jd/plm/dialogs/CSXWHDialog.java index d59c99a..a054c5c 100644 --- a/com.connor.jd.plm/src/com/connor/jd/plm/dialogs/CSXWHDialog.java +++ b/com.connor.jd.plm/src/com/connor/jd/plm/dialogs/CSXWHDialog.java @@ -19,8 +19,8 @@ public class CSXWHDialog extends Application { } private JPanel Panel; - private Object[] obj = new Object[] { "ÐòºÅ", "²úÆ·ÀàÐÍ", "ÊÔÑéÏîÄ¿", "ÊÔÑéʱ¼ä", "ÑùÆ·ÊýÁ¿", "ÊÔÑé·ÑÓÃ" };// ÃñÓñí - private Object[] obj2 = new Object[] { "ÐòºÅ", "Àà±ð", "ÏîÄ¿", "ÏîÄ¿·ÑÓÃ" };// ¹¤Òµ±í + private Object[] obj = new Object[] { "ÐòºÅ", "²úÆ·ÀàÐÍ", "ÊÔÑéÏîÄ¿", "ÊÔÑéʱ¼ä", "ÑùÆ·ÊýÁ¿", "ÊÔÑé·ÑÓÃ" };// + private Object[] obj2 = new Object[] { "ÐòºÅ", "Àà±ð", "ÏîÄ¿", "ÏîÄ¿·ÑÓÃ" };// public void initUI() { diff --git a/com.connor.jd.plm/src/com/connor/jd/plm/dialogs/QTXJCDialog.java b/com.connor.jd.plm/src/com/connor/jd/plm/dialogs/QTXJCDialog.java index 5c337ed..4b549ca 100644 --- a/com.connor.jd.plm/src/com/connor/jd/plm/dialogs/QTXJCDialog.java +++ b/com.connor.jd.plm/src/com/connor/jd/plm/dialogs/QTXJCDialog.java @@ -35,6 +35,7 @@ public class QTXJCDialog extends Application { private List sfList = new ArrayList(); private TCComponent[] com; private String type; + private Stage primaryStage = null; public QTXJCDialog(List sfList, TCComponent[] com, TCSession session, String type) throws TCException { @@ -47,7 +48,7 @@ public class QTXJCDialog extends Application { @Override public void start(Stage arg0) throws Exception { - Stage primaryStage = new Stage(); + primaryStage = new Stage(); Pane root = new Pane(); Label pjStage = new Label("ÏîÄ¿½×¶Î"); pjStage.setLayoutX(37.0); @@ -195,7 +196,7 @@ public class QTXJCDialog extends Application { String outpath = roadName; System.out.println(outpath); - + // System.out.println("typeÊÇ" + type); File file = getExcle(jdname, type); String sel = pjsName.getSelectionModel().getSelectedItem(); Map> jfw = new HashMap>(); @@ -235,6 +236,7 @@ public class QTXJCDialog extends Application { } ExcelOperation.writeExcel(file, outpath, jfw); System.out.println("µ¼³ö³É¹¦"); + primaryStage.close(); MessageBox.post("µ¼³ö³É¹¦", "ÐÅÏ¢", MessageBox.INFORMATION); } diff --git a/com.connor.jd.plm/src/com/connor/jd/plm/handlers/CSXWHHandler.java b/com.connor.jd.plm/src/com/connor/jd/plm/handlers/CSXWHHandler.java index 6bc75e6..70994ff 100644 --- a/com.connor.jd.plm/src/com/connor/jd/plm/handlers/CSXWHHandler.java +++ b/com.connor.jd.plm/src/com/connor/jd/plm/handlers/CSXWHHandler.java @@ -4,10 +4,36 @@ import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; +import com.connor.jd.plm.dialogs.CSXWHDialog; +import com.teamcenter.rac.aif.AbstractAIFUIApplication; +import com.teamcenter.rac.aifrcp.AIFUtility; +import com.teamcenter.rac.kernel.TCSession; + +import javafx.application.Platform; +import javafx.embed.swing.JFXPanel; +import javafx.stage.Stage; + public class CSXWHHandler extends AbstractHandler { @Override public Object execute(ExecutionEvent arg0) throws ExecutionException { + AbstractAIFUIApplication app = AIFUtility.getCurrentApplication(); + TCSession session = (TCSession) app.getSession(); + new Thread(() -> { + new JFXPanel(); + Platform.setImplicitExit(false); + Platform.runLater(new Runnable() { + @Override + public void run() { + try { + CSXWHDialog csxwh = new CSXWHDialog(); + csxwh.start(new Stage()); + } catch (Exception e) { + e.printStackTrace(); + } + } + }); + }).start(); return null; } diff --git a/com.connor.jd.plm/src/com/connor/jd/plm/handlers/QTXJCHandler.java b/com.connor.jd.plm/src/com/connor/jd/plm/handlers/QTXJCHandler.java index cd8435b..8fe54a9 100644 --- a/com.connor.jd.plm/src/com/connor/jd/plm/handlers/QTXJCHandler.java +++ b/com.connor.jd.plm/src/com/connor/jd/plm/handlers/QTXJCHandler.java @@ -30,7 +30,7 @@ public class QTXJCHandler extends AbstractHandler { public Object execute(ExecutionEvent arg0) throws ExecutionException { List sfList = new ArrayList(); String name = arg0.getCommand().getId(); - + // System.out.println("name:" + name); try { AbstractAIFUIApplication app = AIFUtility.getCurrentApplication(); if (app.getTargetComponent() != null && app.getTargetComponent() instanceof TCComponentProject) { @@ -41,14 +41,15 @@ public class QTXJCHandler extends AbstractHandler { sfList.add(sf.getProperty("object_string")); } TCSession session = (TCSession) app.getSession(); + switch (name) { - case "JDProject.menus.JD2_GTQTXJC": + case "JD2_GTQTXJC": type = "GT"; break; - case "JDProject.menus.JD2_BLQTXJC": + case "JD2_BLQTXJC": type = "BL"; break; - case "JDProject.menus.JD2_BXQTXJC": + case "JD2_BXQTXJC": type = "BX"; break; default: @@ -61,6 +62,7 @@ public class QTXJCHandler extends AbstractHandler { @Override public void run() { try { + // System.out.println("typeÄÚÈÝ" + type); QTXJCDialog qtxjc = new QTXJCDialog(sfList, com, session, type); qtxjc.start(new Stage()); } catch (Exception e) {