zhangjie hace 1 año
padre
commit
0c6dd7c6df
Se han modificado 4 ficheros con 54 adiciones y 40 borrados
  1. 1 1
      package.json
  2. 40 37
      public/index.html
  3. 3 1
      src/background.js
  4. 10 1
      vue.config.js

+ 1 - 1
package.json

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

+ 40 - 37
public/index.html

@@ -1,40 +1,43 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width,initial-scale=1.0" />
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
-    <title><%= htmlWebpackPlugin.options.title %></title>
-    <script>
-      (function() {
-        // 按Ctrl+Shift+U,放开U,在一秒内再按Ctrl+Shift+P,可以调出开发者工具
-        let firstStepKey = false;
-        document.addEventListener("keydown", function(e) {
-          if (e.ctrlKey && e.shiftKey && e.code === "KeyU") {
-            firstStepKey = true;
-            setTimeout(() => {
-              firstStepKey = false;
-            }, 1000);
-          }
-          if (firstStepKey && e.ctrlKey && e.shiftKey && e.code === "KeyP") {
-            require("electron")
-              .remote.getCurrentWindow()
-              .toggleDevTools();
-          }
-        });
-      })();
-    </script>
-  </head>
-  <body>
-    <noscript>
-      <strong
-        >We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work
+
+<head>
+  <meta charset="utf-8" />
+  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+  <meta name="viewport" content="width=device-width,initial-scale=1.0" />
+  <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
+  <title>
+    <%= htmlWebpackPlugin.options.title %>
+  </title>
+  <script>
+    (function () {
+      // 按Ctrl+Shift+U,放开U,在一秒内再按Ctrl+Shift+P,可以调出开发者工具
+      let firstStepKey = false;
+      document.addEventListener("keydown", function (e) {
+        if (e.ctrlKey && e.shiftKey && e.code === "KeyU") {
+          firstStepKey = true;
+          setTimeout(() => {
+            firstStepKey = false;
+          }, 1000);
+        }
+        if (firstStepKey && e.ctrlKey && e.shiftKey && e.code === "KeyP") {
+          window.require("electron")
+            .remote.getCurrentWindow()
+            .toggleDevTools();
+        }
+      });
+    })();
+  </script>
+</head>
+
+<body>
+  <noscript>
+    <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work
         properly without JavaScript enabled. Please enable it to
-        continue.</strong
-      >
-    </noscript>
-    <div id="app"></div>
-    <!-- built files will be auto injected -->
-  </body>
-</html>
+        continue.</strong>
+  </noscript>
+  <div id="app"></div>
+  <!-- built files will be auto injected -->
+</body>
+
+</html>

+ 3 - 1
src/background.js

@@ -29,7 +29,9 @@ function createWindow() {
     useContentSize: true,
     webPreferences: {
       nodeIntegration: true,
-      webSecurity: false
+      enableRemoteModule: true,
+      webSecurity: false,
+      contextIsolation: false
     }
   });
 

+ 10 - 1
vue.config.js

@@ -15,7 +15,16 @@ var config = {
   },
   pluginOptions: {
     electronBuilder: {
-      externals: ["node-xlsx"],
+      nodeIntegration: true,
+      externals: [
+        "cropperjs",
+        "crypto",
+        "gm",
+        "imagemagick",
+        "deepmerge",
+        "node-xlsx",
+        "log4js"
+      ],
       builderOptions: {
         extraFiles: [
           "extra/encrypt/**",