imagemagick windows打包

.gitignore

@@ -30,4 +30,7 @@ pnpm-debug.log*
 #Electron-builder output
 /dist_electron
 
-oldSrc
+oldSrc
+
+*202012*
+imagemagick

package.json

@@ -7,7 +7,7 @@
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
     "lint": "vue-cli-service lint",
-    "electron:build:win": "vue-cli-service electron:build --win --x64 --ia32",
+    "electron:build:win": "vue-cli-service electron:build --win --ia32",
     "electron:build": "vue-cli-service electron:build",
     "electron:serve": "vue-cli-service electron:serve",
     "postinstall": "electron-builder install-app-deps",

src/features/Image/Image.vue

@@ -180,7 +180,8 @@ let ruleExample = computed(() => {
   return "";
 });
 
-const chooseDirectory = () => {
+const chooseDirectory = (e: MouseEvent) => {
+  e.preventDefault();
   window.electron.dialog
     .showOpenDialog({
       title: "请选择保存目录",

src/features/Login/Login.vue

@@ -57,9 +57,9 @@ let password = ref("");
 // onMounted(() => {
 //   window.localStorage.clear();
 // });
-server.value = "http://192.168.10.224:80";
-loginName.value = "admin-test";
-password.value = "123456";
+// server.value = "http://192.168.10.224:80";
+// loginName.value = "admin-test";
+// password.value = "123456";
 
 const loginAction = () => {
   Object.assign(store.env, {

src/lib/config.ts

@@ -5,12 +5,12 @@ import moment from "moment";
 
 let configJson;
 // if (process.env.IS_ELECTRON) {
-//   const dirName = process.env.PORTABLE_EXECUTABLE_DIR;
-
-//   configJson = readFileSync(path.join(dirName || "", "config.json"));
-// } else {
-configJson = readFileSync(path.join(__dirname, "../config.json"));
-// }
+const dirName = process.env.PORTABLE_EXECUTABLE_DIR;
+if (dirName) {
+  configJson = readFileSync(path.join(dirName || "", "config.json"));
+} else {
+  configJson = readFileSync(path.join(__dirname, "../config.json"));
+}
 
 const store = JSON.parse(configJson.toString());
 

src/lib/watermark.ts

@@ -29,12 +29,17 @@ export async function addWatermark(
   y = imageHeight * y;
   if (!gm) {
     gm =
-      store.config.imagemagick != undefined
+      store.config.imagemagickDev != undefined
         ? require("gm").subClass({
             imageMagick: true,
-            appPath: store.config.imagemagick,
+            appPath: store.config.imagemagickDev,
           })
-        : require("gm");
+        : require("gm").subClass({
+            imageMagick: true,
+            appPath: path.join(__dirname, "../../imagemagick/"), // windows打包进程序了
+          });
+    // console.log(path.join(__dirname, "../../imagemagick/"));
+    // console.log(path.join(__dirname, store.config.imagemagickDev));
   }
   if (fs.existsSync(file) && store.pageInputs["/image-download"].append) {
     console.log(file + " already exists");

src/store.ts

@@ -16,7 +16,11 @@ const _store = {
 } as Store;
 
 // for dev
-Object.assign(_store, JSON.parse(window.localStorage.getItem("store") || "{}"));
+Object.assign(
+  _store,
+  JSON.parse(window.localStorage.getItem("store") || "{}"),
+  { config: JSON.parse(JSON.stringify(window.electron.config)) || {} } // use 最新的config
+);
 
 const handler = function () {
   return {

src/types/index.ts

@@ -27,7 +27,7 @@ export interface Store {
     logger: Logger;
     openDevTools: boolean;
     servers: Server[];
-    imagemagick?: string;
+    imagemagickDev?: string;
   };
 
   pageInputs: {

vue.config.js

@@ -22,7 +22,7 @@ module.exports = {
       preload: "src/preload.ts",
       externals: [],
       builderOptions: {
-        // extraFiles: ["extra/**", "preload.js"],
+        extraFiles: ["font/**", "imagemagick/**"],
         win: {
           target: "portable",
           signAndEditExecutable: false,