Merge pull request #16 from misterpancn/feature-develop-buck

release v1.1.0

Author: misterpancn

package.json

@@ -1,6 +1,6 @@
 {
   "name": "VueChat",
-  "version": "1.0.5",
+  "version": "1.1.0",
   "author": "[email protected]",
   "description": "An electron-vue project",
   "private": true,

src/main/index.js

@@ -15,12 +15,16 @@ if (process.env.NODE_ENV !== 'development') {
 let mainWindow
 let exit = false
 let winModal
+let videoModal
 const winURL = process.env.NODE_ENV === 'development'
   ? `http://localhost:9080`
   : `file://${__dirname}/index.html`
 const winModalURL = process.env.NODE_ENV === 'development'
   ? `http://localhost:9080/#/modelWindow`
   : `file://${__dirname}/index.html#modelWindow`
+const videoModalURl = process.env.NODE_ENV === 'development'
+  ? `http://localhost:9080/#/videoModal`
+  : `file://${__dirname}/index.html#videoModal`
 
 function createWindow () {
   /**
@@ -48,8 +52,7 @@ function createWindow () {
     modal: true,
     useContentSize: true,
     frame: false,
-    show: false,
-    alwaysOnTop: true
+    show: false
   })
   winModal.loadURL(winModalURL)
   winModal.on('closed', () => {
@@ -134,19 +137,19 @@ function handleUpdate () {
   autoUpdater.autoInstallOnAppQuit = false
   autoUpdater.setFeedURL(config.downloadAddress);
   autoUpdater.on('error', (err) => {
-    mainWindow.webContents.send('update-error', String(err))
+    if (mainWindow) mainWindow.webContents.send('update-error', String(err))
   })
   autoUpdater.on('update-available', (info) => {
-    mainWindow.webContents.send('update-available', info)
+    if (mainWindow) mainWindow.webContents.send('update-available', info)
   })
   autoUpdater.on('update-not-available', (info) => {
-    mainWindow.webContents.send('update-not-available', info)
+    if (mainWindow) mainWindow.webContents.send('update-not-available', info)
   })
   autoUpdater.on('download-progress', (progress) => {
-    mainWindow.webContents.send('update-download-progress', progress)
+    if (mainWindow) mainWindow.webContents.send('update-download-progress', progress)
   })
   autoUpdater.on('update-downloaded', (info) => {
-    mainWindow.webContents.send('update-downloaded', info)
+    if (mainWindow) mainWindow.webContents.send('update-downloaded', info)
   })
   ipcMain.on('check-for-update', () => {
     autoUpdater.checkForUpdates()
@@ -169,3 +172,43 @@ function isShowExitNotify () {
   }
   return true;
 }
+
+function createVideoModal (data) {
+  videoModal = new BrowserWindow({
+    parent: mainWindow,
+    modal: true,
+    useContentSize: true,
+    frame: false,
+    show: false
+  })
+  videoModal.loadURL(videoModalURl)
+  videoModal.on('closed', () => {
+    videoModal = null
+  })
+  videoModal.once('ready-to-show', () => {
+    videoModal.show()
+    videoModal.webContents.send('video-modal-data', data)
+  })
+}
+ipcMain.on('show-video-modal', (e, data) => {
+  createVideoModal(data)
+})
+ipcMain.on('close-video-modal', () => {
+  if (videoModal) {
+    videoModal.close()
+  }
+})
+ipcMain.on('forwarded-message-to-video', (e, data) => {
+  if (videoModal) {
+    videoModal.webContents.send('forwarded-message-to-video', data)
+  }
+})
+ipcMain.on('video-modal-full-screen', () => {
+  if (videoModal) {
+    if (videoModal.isMaximized()) {
+      videoModal.unmaximize()
+    } else {
+      videoModal.maximize()
+    }
+  }
+})

src/renderer/App.vue

@@ -33,6 +33,25 @@
   ul {
     list-style: none;
   }
+
+  ::-webkit-scrollbar
+  {
+    width: 5px;  /*滚动条宽度*/
+    height: 5px;  /*滚动条高度*/
+  }
+
+  /*定义滚动条轨道 内阴影+圆角*/
+  ::-webkit-scrollbar-track
+  {
+    border-radius: 2.5px;  /*滚动条的背景区域的圆角*/
+    background-color: #e6e6e6;/*滚动条的背景颜色*/
+  }
+
+  /*定义滑块 内阴影+圆角*/
+  ::-webkit-scrollbar-thumb {
+    border-radius: 2.5px; /*滚动条的圆角*/
+    background-color: #A9A9A9; /*滚动条的颜色*/
+  }
   #app {
     margin: auto;
     max-width: 100%;

src/renderer/components/Chat/Modal/addGroupUser.vue

@@ -0,0 +1,89 @@
+<script>
+  import axios from '@/request'
+  export default {
+    props: [ 'group' ],
+    data () {
+      return {
+        selectUser: [],
+        loading: false
+      }
+    },
+    computed: {
+      show: {
+        get: function () {
+          if (this.$store.getters.getAddGroupUserShow) {
+            this.$Spin.hide();
+          }
+          return this.$store.getters.getAddGroupUserShow
+        },
+        set: function (val) {
+          this.$store.dispatch('addGroupUserShow', val)
+        }
+      },
+      friendList () {
+        let friendList = this.$store.getters.getUserList
+        if (friendList && friendList.length > 0) {
+          friendList.map((item) => {
+            item.label = item.name
+            item.key = item.id
+            if (this.group.group_members) {
+              for (let i = 0; i < this.group.group_members.length; i++) {
+                if (item.id === this.group.group_members[i].user_id) {
+                  item.disabled = true
+                }
+              }
+            }
+          })
+          return friendList
+        } else {
+          return []
+        }
+      }
+    },
+    methods: {
+      close () {
+
+      },
+      handleChange (newTargetKeys) {
+        this.selectUser = newTargetKeys;
+      },
+      inviteToGroup () {
+        if (this.selectUser) {
+          this.loading = true;
+          axios.inviteToGroup({users: this.selectUser, group_id: this.group.group_id}).then((r) => {
+            this.$Message.warning({
+              content: r.data.data,
+              duration: 3
+            });
+            this.loading = false;
+          }).catch((e) => {
+            this.$Message.warning({
+              content: e.response.data.data,
+              duration: 3
+            });
+            this.loading = false;
+          });
+        }
+      }
+    }
+  }
+</script>
+<template>
+    <Modal v-model="show" :mask-closable="false" footer-hide @on-cancel="close">
+        <p slot="header" style="text-align: center;">{{ $t('chat.inviteToGroup') }}</p>
+        <div class="m-ui-content">
+            <Transfer style="margin-left: 35px"
+                    :data="friendList"
+                    :target-keys="selectUser"
+                    :titles="[$t('chat.theFriendsList'), $t('chat.theSelected')]"
+                    filterable
+                    @on-change="handleChange"></Transfer>
+            <p style="margin-top: 10px;text-align: center"><Button @click="inviteToGroup" :loading="loading">Submit</Button></p>
+        </div>
+    </Modal>
+</template>
+<style lang="less">
+    .m-ui-content {
+        position: relative;
+    }
+</style>

src/renderer/components/Chat/Modal/addTo.vue

@@ -49,7 +49,6 @@
       },
       trimStr (data) {
         if (data.is_related) {
-          console.log(data)
           return data.is_group ? this.$t('chat.alreadyInTheGroup') : this.$t('chat.hasBeenFriend')
         }
       },