diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..26e7651 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,37 @@ +name: release-build + +on: + push: + tags: + - v*.*.* + +jobs: + release: + runs-on: ${{ matrix.os }} + + strategy: + matrix: + os: [windows-latest, macos-latest, ubuntu-latest] + + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-node@v1 + with: + node-version: 12 + + - run: | + yarn + yarn electron:build + shell: pwsh + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Release + uses: softprops/action-gh-release@v1 + with: + files: | + dist_electron/*.exe + dist_electron/*.dmg + dist_electron/*.snap + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/src/background.js b/src/background.js index ff99a10..3f70d71 100644 --- a/src/background.js +++ b/src/background.js @@ -59,6 +59,7 @@ function createMini () { webSecurity: false, nodeIntegration: process.env.ELECTRON_NODE_INTEGRATION }, + // eslint-disable-next-line icon: path.join(__static, 'icon.png') }) @@ -102,14 +103,14 @@ ipcMain.on('mini', () => { createMini() win.close() }) -ipcMain.on('mini-min', () => { +ipcMain.on('miniMin', () => { mini.minimize() }) -ipcMain.on('mini-close', () => { +ipcMain.on('miniClose', () => { mini.close() createWindow() }) -ipcMain.on('mini-opacity', (e, arg) => { +ipcMain.on('miniOpacity', (e, arg) => { mini.setOpacity(arg) }) diff --git a/src/components/Play.vue b/src/components/Play.vue index 4b0ea86..2b6ec1d 100644 --- a/src/components/Play.vue +++ b/src/components/Play.vue @@ -369,9 +369,13 @@ export default { }, listItemEvent (n) { this.video.index = n + this.right.show = false + this.right.type = '' }, historyItemEvent (e) { this.video = e + this.right.show = false + this.right.type = '' }, removeItem (e) { history.remove(e.id).then(res => { diff --git a/src/mini/Mini.vue b/src/mini/Mini.vue index de5b876..87077d1 100644 --- a/src/mini/Mini.vue +++ b/src/mini/Mini.vue @@ -2,16 +2,16 @@