diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/VueCallable.java b/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/VueCallable.java index be767722..6936036b 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/VueCallable.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/VueCallable.java @@ -54,6 +54,8 @@ public class VueCallable implements Callable { { HashMap ctx = new HashMap(); ctx.put("appName", option.projectName); + ctx.put("elementui", option.elementui); + ctx.put("iView", option.iView); freeMarkerManager.outputTemp(new File(app, "package.json"), "Vue/package.json", ctx); freeMarkerManager.outputTemp(new File(app, "package-lock.json"), "Vue/package-lock.json", ctx); freeMarkerManager.outputTemp(new File(app, "README.md"), "Vue/README.md", ctx); @@ -61,15 +63,20 @@ public class VueCallable implements Callable { //public Tool.outputResource("Vue/public/favicon.ico", new File(publics, "favicon.ico")); - Tool.outputResource("Vue/public/index.html", new File(publics, "index.html")); + freeMarkerManager.outputTemp(new File(app, "index.html"), "Vue/public/index.html", ctx); //src freeMarkerManager.outputTemp(new File(src, "App.vue"), "Vue/src/App.vue", ctx); - Tool.outputResource("Vue/src/main.js", new File(src, "main.js")); + freeMarkerManager.outputTemp(new File(src, "main.js"), "Vue/src/main.js", ctx); Tool.outputResource("Vue/src/router.js", new File(src, "router.js")); Tool.outputResource("Vue/src/assets/logo.png", new File(assets, "logo.png")); Tool.outputResource("Vue/src/components/HelloWorld.vue", new File(components, "HelloWorld.vue")); - Tool.outputResource("Vue/src/plugins/element.js", new File(plugins, "element.js")); + if (option.elementui) { + Tool.outputResource("Vue/src/plugins/element.js", new File(plugins, "element.js")); + } + if (option.iView) { + Tool.outputResource("Vue/src/plugins/iview.js", new File(plugins, "iview.js")); + } } return true; diff --git a/src/main/resources/fxml/vueOption.fxml b/src/main/resources/fxml/vueOption.fxml index 488f5e36..25e4e44c 100644 --- a/src/main/resources/fxml/vueOption.fxml +++ b/src/main/resources/fxml/vueOption.fxml @@ -31,7 +31,7 @@ - + diff --git a/src/main/resources/modules/Vue/package.json b/src/main/resources/modules/Vue/package.json index 34d4df21..d561cf95 100644 --- a/src/main/resources/modules/Vue/package.json +++ b/src/main/resources/modules/Vue/package.json @@ -9,7 +9,12 @@ }, "dependencies": { "core-js": "^2.6.5", +<#if elementui> "element-ui": "^2.4.5", + +<#if iView> + "iview": "^3.4.1", + "vue": "^2.6.10", "vue-router": "^3.0.6" }, diff --git a/src/main/resources/modules/Vue/src/main.js b/src/main/resources/modules/Vue/src/main.js index 3da55939..b365bbf5 100644 --- a/src/main/resources/modules/Vue/src/main.js +++ b/src/main/resources/modules/Vue/src/main.js @@ -1,7 +1,13 @@ import Vue from 'vue' import App from './App.vue' import router from './router' +<#if elementui> import './plugins/element.js' + +<#if iView> +import './plugins/iview.js' + + Vue.config.productionTip = false diff --git a/src/main/resources/modules/Vue/src/plugins/iview.js b/src/main/resources/modules/Vue/src/plugins/iview.js new file mode 100644 index 00000000..363f1d9d --- /dev/null +++ b/src/main/resources/modules/Vue/src/plugins/iview.js @@ -0,0 +1,5 @@ +import Vue from 'vue' +import iView from 'iview' +import 'iview/dist/styles/iview.css' + +Vue.use(iView)