Merge branch 'dev'

nashaofu · Feb 7, 2018 · fd20843 · fd20843
2 parents fa0d3e7 + 247a913
commit fd20843
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -11,13 +11,20 @@
 4. 打包完成之后即可拷贝出dist目录下的文件到想要的文件夹下，运行里面的dingtalk文件即可安装应用。
 
 ## 截图效果
-1. 二维码登录页面![1.png](./screenshot/1.png)
-2. 账号密码登录页面![2.png](./screenshot/2.png)
-3. 登录后页面展示![3.png](./screenshot/3.png)
-4. 邮箱打开效果![4.png](./screenshot/4.png)
-5. 截图效果预览![5.png](./screenshot/5.png)
-6. 网络错误页面![6.png](./screenshot/6.png)
-7. 网络错误页面![7.png](./screenshot/7.png)
+1. 二维码登录页面
+![1.png](./screenshot/1.png)
+2. 账号密码登录页面
+![2.png](./screenshot/2.png)
+3. 登录后页面展示
+![3.png](./screenshot/3.png)
+4. 邮箱打开效果
+![4.png](./screenshot/4.png)
+5. 截图效果预览
+![5.png](./screenshot/5.png)
+6. 网络错误页面
+![6.png](./screenshot/6.png)
+7. 网络错误页面
+![7.png](./screenshot/7.png)
 
 ## 功能说明
 1. 本版本是基于网页版钉钉和electron制作的

diff --git a/app/plugins/shortcut-capture-renderer.js b/app/plugins/shortcut-capture-renderer.js
@@ -33,7 +33,7 @@ ipcRenderer.on('shortcut-capture', () => {
             width: display.width,
             height: display.height,
             quality: 'best'
-          }).toDataURL()
+          }).toPNG()
         }
       })
     }

diff --git a/app/plugins/shortcut-capture.js b/app/plugins/shortcut-capture.js
@@ -1,4 +1,5 @@
 const {
+  app,
   globalShortcut,
   ipcMain,
   BrowserWindow,
@@ -102,7 +103,7 @@ function createWindow (source, setting) {
     $win.webContents.send('dom-ready', { source, setting })
     $win.focus()
   })
-  const filename = path.join(__dirname, '../views/shortcut-capture.html')
+  const filename = path.join(app.getAppPath(), './app/views/shortcut-capture.html')
   $win.loadURL(filename)
   $windows.push($win)
 }

diff --git a/app/views/css/shortcut-capture.css b/app/views/css/shortcut-capture.css
@@ -42,6 +42,9 @@ img {
 canvas {
   position: absolute;
   border: 2px dashed #333;
+  margin-top: -2px;
+  margin-left: -2px;
+  box-sizing: border-box;
 }
 
 .capture-toolbar {
@@ -52,7 +55,7 @@ canvas {
 }
 
 canvas, .capture-toolbar {
-  transform: translateZ(0);
+  transform: translate3d(0, 0, 0);
 }
 
 .capture-toolbar button {

diff --git a/app/views/js/shortcut-capture.js b/app/views/js/shortcut-capture.js
@@ -50,7 +50,8 @@ class Injector {
       this.onDrawImage()
     })
 
-    this.$capture.src = this.source.thumbnail
+    const file = new Blob([this.source.thumbnail], { type: 'image/png' })
+    this.$capture.src = URL.createObjectURL(file)
     this.$captureToolbar = document.querySelector('#capture-toolbar')
   }
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "dingtalk",
   "version": "1.5.0",
-  "description": "钉钉linux桌面版",
+  "description": "钉钉linux桌面版，基于electron开发",
   "main": "./app/index.js",
   "scripts": {
     "dev": "electron .",

diff --git a/screenshot/1.png b/screenshot/1.png
diff --git a/screenshot/2.png b/screenshot/2.png
diff --git a/screenshot/3.png b/screenshot/3.png
diff --git a/screenshot/4.png b/screenshot/4.png
diff --git a/screenshot/5.png b/screenshot/5.png
diff --git a/screenshot/6.png b/screenshot/6.png
diff --git a/screenshot/7.png b/screenshot/7.png
diff --git a/scripts/build.js b/scripts/build.js
@@ -1,7 +1,7 @@
 const path = require('path')
 const { build, Platform } = require('electron-builder')
 const chalk = require('chalk')
-const { author } = require('../package.json')
+const { author, description } = require('../package.json')
 
 build({
   targets: Platform.LINUX.createTarget(),
@@ -11,7 +11,7 @@ build({
     productName: '钉钉',
     asar: true,
     linux: {
-      description: '钉钉linux版本',
+      description,
       icon: path.join(__dirname, '../icon'),
       target: 'deb',
       category: 'InstantMessaging'