4.2.3

xland · Jul 8, 2019 · a56d8a7 · a56d8a7
1 parent cc3179e
commit a56d8a7
Show file tree

Hide file tree

Showing 9 changed files with 186 additions and 182 deletions.
diff --git a/package.json b/package.json
@@ -1,129 +1,126 @@
 {
-  "name": "xiangxuema",
-  "version": "6.4.2",
-  "author": "liulun <412588801@qq.com>",
-  "description": "xiangxuema",
-  "license": "MIT",
-  "main": "./dist/electron/main.js",
-  "scripts": {
-    "rebuild": "electron-rebuild",
-    "build": "node .electron-vue/build.js && electron-builder",
-    "build:dir": "node .electron-vue/build.js && electron-builder --dir",
-    "build:clean": "cross-env BUILD_TARGET=clean node .electron-vue/build.js",
-    "build:web": "cross-env BUILD_TARGET=web node .electron-vue/build.js",
-    "dev": "node .electron-vue/dev-runner.js",
-    "pack": "npm run pack:main && npm run pack:renderer",
-    "pack:main": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.main.config.js",
-    "pack:renderer": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.renderer.config.js",
-    "buildsharp": "electron-rebuild -f -w sharp",
-    "postinstall": ""
-  },
-  "build": {
-    "npmRebuild": "false",
-    "electronDownload": {
-      "version": "5.0.2",
-      "cache": "./cache",
-      "mirror": "https://npm.taobao.org/mirrors/electron/",
-      "arch": "x64"
+    "name": "xiangxuema",
+    "version": "6.4.3",
+    "author": "liulun <412588801@qq.com>",
+    "description": "xiangxuema",
+    "license": "MIT",
+    "main": "./dist/electron/main.js",
+    "scripts": {
+        "rebuild": "electron-rebuild",
+        "build": "node .electron-vue/build.js && electron-builder",
+        "build:dir": "node .electron-vue/build.js && electron-builder --dir",
+        "build:clean": "cross-env BUILD_TARGET=clean node .electron-vue/build.js",
+        "build:web": "cross-env BUILD_TARGET=web node .electron-vue/build.js",
+        "dev": "node .electron-vue/dev-runner.js",
+        "pack": "npm run pack:main && npm run pack:renderer",
+        "pack:main": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.main.config.js",
+        "pack:renderer": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.renderer.config.js",
+        "buildsharp": "electron-rebuild -f -w sharp",
+        "postinstall": ""
     },
-    "electronVersion": "5.0.2",
-    "productName": "想学吗",
-    "appId": "com.xiangxuema",
-    "directories": {
-      "output": "build"
-    },
-    "files": [
-      "dist/electron/**/*"
-    ],
-    "publish": [
-      {
-        "provider": "generic",
-        "url": "http://xiangxuema.com/download"
-      }
-    ],
-    "nsis": {
-      "oneClick": false,
-      "perMachine": true,
-      "allowElevation": true,
-      "allowToChangeInstallationDirectory": true,
-      "createDesktopShortcut": "always",
-      "runAfterFinish": true
-    },
-    "dmg": {
-      "contents": [
-        {
-          "x": 410,
-          "y": 150,
-          "type": "link",
-          "path": "/Applications"
+    "build": {
+        "npmRebuild": "false",
+        "electronDownload": {
+            "version": "5.0.2",
+            "cache": "./cache",
+            "mirror": "https://npm.taobao.org/mirrors/electron/",
+            "arch": "x64"
+        },
+        "electronVersion": "5.0.2",
+        "productName": "想学吗",
+        "appId": "com.xiangxuema",
+        "directories": {
+            "output": "build"
+        },
+        "files": [
+            "dist/electron/**/*"
+        ],
+        "publish": [{
+            "provider": "generic",
+            "url": "http://xiangxuema.com/download"
+        }],
+        "nsis": {
+            "oneClick": false,
+            "perMachine": true,
+            "allowElevation": true,
+            "allowToChangeInstallationDirectory": true,
+            "createDesktopShortcut": "always",
+            "runAfterFinish": true
         },
-        {
-          "x": 130,
-          "y": 150,
-          "type": "file"
+        "dmg": {
+            "contents": [{
+                    "x": 410,
+                    "y": 150,
+                    "type": "link",
+                    "path": "/Applications"
+                },
+                {
+                    "x": 130,
+                    "y": 150,
+                    "type": "file"
+                }
+            ]
+        },
+        "mac": {
+            "icon": "build/icons/icon.icns"
+        },
+        "win": {
+            "icon": "build/icons/icon.ico"
+        },
+        "linux": {
+            "icon": "build/icons"
         }
-      ]
-    },
-    "mac": {
-      "icon": "build/icons/icon.icns"
     },
-    "win": {
-      "icon": "build/icons/icon.ico"
+    "dependencies": {
+        "electron-baidu-tongji": "^1.0.2",
+        "electron-updater": "^4.0.6",
+        "fs-extra": "^7.0.1",
+        "knex": "^0.16.3",
+        "sharp": "^0.22.1",
+        "sqlite3": "^4.0.8",
+        "sweetalert": "^2.1.2",
+        "vue": "^2.5.16",
+        "vue-electron": "^1.0.6",
+        "vue-router": "^3.0.1"
     },
-    "linux": {
-      "icon": "build/icons"
+    "devDependencies": {
+        "ajv": "^6.5.0",
+        "babel-core": "^6.26.3",
+        "babel-loader": "^7.1.4",
+        "babel-plugin-transform-runtime": "^6.23.0",
+        "babel-preset-env": "^1.7.0",
+        "babel-preset-stage-0": "^6.24.1",
+        "babel-register": "^6.26.0",
+        "babili-webpack-plugin": "^0.1.2",
+        "cfonts": "^2.1.2",
+        "chalk": "^2.4.1",
+        "copy-webpack-plugin": "^4.5.1",
+        "cross-env": "^5.1.6",
+        "css-loader": "^0.28.11",
+        "del": "^3.0.0",
+        "devtron": "^1.4.0",
+        "electron": "^5.0.2",
+        "electron-builder": "^20.19.2",
+        "electron-debug": "^1.5.0",
+        "electron-devtools-installer": "^2.2.4",
+        "electron-rebuild": "^1.8.4",
+        "file-loader": "^1.1.11",
+        "html-webpack-plugin": "^3.2.0",
+        "mini-css-extract-plugin": "0.4.0",
+        "multispinner": "^0.2.1",
+        "node-loader": "^0.6.0",
+        "node-sass": "^4.9.2",
+        "sass-loader": "^7.0.3",
+        "style-loader": "^0.21.0",
+        "url-loader": "^1.0.1",
+        "vue-html-loader": "^1.2.4",
+        "vue-loader": "^15.2.4",
+        "vue-style-loader": "^4.1.0",
+        "vue-template-compiler": "^2.5.16",
+        "webpack": "^4.15.1",
+        "webpack-cli": "^3.0.8",
+        "webpack-dev-server": "^3.1.4",
+        "webpack-hot-middleware": "^2.22.2",
+        "webpack-merge": "^4.1.3"
     }
-  },
-  "dependencies": {
-    "electron-baidu-tongji": "^1.0.2",
-    "electron-updater": "^4.0.6",
-    "fs-extra": "^7.0.1",
-    "knex": "^0.16.3",
-    "sharp": "^0.22.1",
-    "sqlite3": "^4.0.8",
-    "sweetalert": "^2.1.2",
-    "vue": "^2.5.16",
-    "vue-electron": "^1.0.6",
-    "vue-router": "^3.0.1"
-  },
-  "devDependencies": {
-    "ajv": "^6.5.0",
-    "babel-core": "^6.26.3",
-    "babel-loader": "^7.1.4",
-    "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-preset-env": "^1.7.0",
-    "babel-preset-stage-0": "^6.24.1",
-    "babel-register": "^6.26.0",
-    "babili-webpack-plugin": "^0.1.2",
-    "cfonts": "^2.1.2",
-    "chalk": "^2.4.1",
-    "copy-webpack-plugin": "^4.5.1",
-    "cross-env": "^5.1.6",
-    "css-loader": "^0.28.11",
-    "del": "^3.0.0",
-    "devtron": "^1.4.0",
-    "electron": "^5.0.2",
-    "electron-builder": "^20.19.2",
-    "electron-debug": "^1.5.0",
-    "electron-devtools-installer": "^2.2.4",
-    "electron-rebuild": "^1.8.4",
-    "file-loader": "^1.1.11",
-    "html-webpack-plugin": "^3.2.0",
-    "mini-css-extract-plugin": "0.4.0",
-    "multispinner": "^0.2.1",
-    "node-loader": "^0.6.0",
-    "node-sass": "^4.9.2",
-    "sass-loader": "^7.0.3",
-    "style-loader": "^0.21.0",
-    "url-loader": "^1.0.1",
-    "vue-html-loader": "^1.2.4",
-    "vue-loader": "^15.2.4",
-    "vue-style-loader": "^4.1.0",
-    "vue-template-compiler": "^2.5.16",
-    "webpack": "^4.15.1",
-    "webpack-cli": "^3.0.8",
-    "webpack-dev-server": "^3.1.4",
-    "webpack-hot-middleware": "^2.22.2",
-    "webpack-merge": "^4.1.3"
-  }
-}
+}
diff --git a/src/renderer/app.vue b/src/renderer/app.vue
@@ -32,7 +32,6 @@
       //   webview.loadURL(e.url);
       // })
       // return;
-
       this.db("settings").select("*").then(rows => this.$root.init(rows[0]));
       this.$root.hookMsgFromMainProcess();
     }

diff --git a/src/renderer/components/minds/node.vue b/src/renderer/components/minds/node.vue
@@ -1,6 +1,6 @@
 <template>
   <g :id="node.data.id" :class="classValue" :transform="`translate(${node.data.x},${node.data.y})`">
-    <g class="gChild">
+    <g v-show="!node.data.isClose" class="gChild">
       <node :key="item.data.id" :prop-data="item" v-for="item in node.children"></node>
     </g>
     <g class="gRec">
@@ -15,7 +15,7 @@
         :width="node.data.w"
         :height="node.data.h"
       >
-        <input v-model="editTxt" class="svgInput" type="text">
+        <input v-model="editTxt" class="svgInput" type="text" />
       </foreignObject>
       <path :d="pathValue"></path>
       <use
@@ -71,12 +71,13 @@ export default {
       let endX = 0 - this.node.data.x + this.$parent.node.data.w;
       let endY = 0 - this.node.data.y + 15;
       let span = -10;
-      if(this.node.data.x < 0){
+      if (this.node.data.x < 0) {
         startX = this.node.data.w;
         endX = 0 - this.node.data.x;
         span = 10;
       }
-      return `M${startX},${startY}L${startX+span},${startY}C${startX+6*span},${startY},${endX-6*span},${endY},${endX},${endY}`;
+      return `M${startX},${startY}L${startX + span},${startY}C${startX +
+        6 * span},${startY},${endX - 6 * span},${endY},${endX},${endY}`;
     },
     classValue() {
       let arr = new Set(["node"]);
@@ -98,18 +99,22 @@ export default {
       });
     },
     subtract() {
-      document.querySelector(`#${this.node.data.id} > .gChild`).style.display =
-        "none"; //why can not set isClose directly
-      this.$parent.reLocation(this.node.data.x > 0);
+      // document.querySelector(`#${this.node.data.id} > .gChild`).style.display =
+      //   "none"; //why can not set isClose directly
+
       this.node.data.isClose = true;
-      this.bus.$emit("needSave");
+      this.$nextTick(_ => {
+        this.$parent.reLocation(this.node.data.x > 0);
+        this.bus.$emit("needSave");
+      });
     },
     plus() {
-      document.querySelector(`#${this.node.data.id} > .gChild`).style.display =
-        "inherit";
-      this.reLocation(this.node.data.x > 0);
+      // document.querySelector(`#${this.node.data.id} > .gChild`).style.display = "inherit";
       this.node.data.isClose = false;
-      this.bus.$emit("needSave");
+      this.$nextTick(_ => {
+        this.reLocation(this.node.data.x > 0);
+        this.bus.$emit("needSave");
+      });
     }
   }
 };

diff --git a/src/renderer/main.js b/src/renderer/main.js
@@ -16,8 +16,7 @@ const BAIDU_SITE_ID = '75bf2b763da29b214e586f7dfa74403c'
 ebtRenderer(ipcRenderer, BAIDU_SITE_ID, router)
 
 if (!process.env.IS_WEB) Vue.use(require('vue-electron'))
-Vue.config.productionTip = false
-
+Vue.config.productionTip = false;
 dbInitializer.init(db => {
   new Vue({
     data: store,