zdg #72

Merged
zhangxuelin merged 21 commits from zdg into main 2024-07-26 14:39:20 +08:00
8 changed files with 113 additions and 6 deletions
Showing only changes of commit df87aafca4 - Show all commits

View File

@ -22,8 +22,8 @@ export default defineConfig({
server: { server: {
proxy: { proxy: {
'/dev-api': { '/dev-api': {
// target: 'http://27.128.240.72:7865', target: 'http://27.128.240.72:7865',
target: 'http://192.168.2.52:7863', // target: 'http://192.168.2.52:7863',
changeOrigin: true, changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api/, '') rewrite: (p) => p.replace(/^\/dev-api/, '')
}, },

View File

@ -3,8 +3,12 @@ import { join } from 'path'
import { electronApp, optimizer, is } from '@electron-toolkit/utils' import { electronApp, optimizer, is } from '@electron-toolkit/utils'
import icon from '../../resources/icon.png?asset' import icon from '../../resources/icon.png?asset'
import File from './file' import File from './file'
import Tool from './tool'
File({ app, shell, BrowserWindow, ipcMain }) File({ app, shell, BrowserWindow, ipcMain })
// zdg: 创建工具-如 悬浮球
Tool(app, shell, BrowserWindow, ipcMain)
function createWindow() { function createWindow() {
// Create the browser window. // Create the browser window.
const mainWindow = new BrowserWindow({ const mainWindow = new BrowserWindow({

43
src/main/tool.js Normal file
View File

@ -0,0 +1,43 @@
/**
* @description: electron 封装的工具函数
*/
// import { app, shell, BrowserWindow, ipcMain } from 'electron'
let electron = {}
export default function(app, shell, BrowserWindow, ipcMain) {
electron = { app, shell, BrowserWindow, ipcMain }
// 创建工具-悬浮球
ipcMain.on('create-tool-sphere', (e, data) => {
console.log('测试xxxx', data)
const res = createTools(...data) // 执行逻辑
e.reply('create-tool-sphere-reply', {a: 1111}) // 返回结果
})
}
/**
* @description: 创建工具
* @param {*} url 路由地址
* @param {number} [width=800] 窗口宽度
* @param {number} [height=600] 窗口高度
* @param {{}} [option={}] 自定义选项
* @author: zdg
* @date 2021-07-05 14:07:01
*/
function createTools(url, width = 800, height = 600, option={}) {
if (!electron.BrowserWindow) return
const win = new electron.BrowserWindow({
width, height,
type: 'toolbar', //创建的窗口类型为工具栏窗口
frame: false, //要创建无边框窗口
resizable: false, //禁止窗口大小缩放
transparent: true, //设置透明
alwaysOnTop: true, //窗口是否总是显示在其他窗口之前
webPreferences: {
nodeIntegration: true,
contextIsolation: false,
webSecurity: false
},
...option
})
win.loadURL(url)
return win
}

View File

@ -1,6 +1,7 @@
import { createRouter, createWebHashHistory } from 'vue-router' import { createRouter, createWebHashHistory } from 'vue-router'
import Layout from '../layout/index.vue' import Layout from '../layout/index.vue'
import { toolRouters } from './tool'
export const constantRoutes = [ export const constantRoutes = [
{ {
@ -40,7 +41,7 @@ export const constantRoutes = [
} }
] ]
}, },
...toolRouters
] ]
const router = createRouter({ const router = createRouter({

View File

@ -0,0 +1,18 @@
/**
* @description: 工具路由
* @author: zdg
* @date 2021-07-05 14:07:01
*/
export const toolRouters = [
{
path: '/tool',
children: [
{
path: '/sphere',
component: () => import('@/views/tool/sphere.vue'),
name: 'toolSphere',
meta: {title: '悬浮球'}
},
]
}
]

View File

@ -0,0 +1,24 @@
/**
* @description: electron 封装的工具函数
*/
const { ipcRenderer } = window.electron || {}
/**
* @form src/main/tool.js 来源
* @description 创建工具
* @param {*} key 消息头
* create-tool-sphere 创建-悬浮球 | url:路由地址,width:窗口宽度,height:窗口高度,option:自定义选项
* @param {*} data 参数
*/
export function createTools(key, data) {
const msgKey = `create-tool-${key}` // 消息头
const msgKeyRes = `${msgKey}-reply` // 消息头-返回结果
return new Promise((resolve) => {
// 返回结果-监听
ipcRenderer.once(msgKeyRes, async (e, res) => {
resolve(res)
})
// 发送消息
ipcRenderer.send(msgKey, data)
})
}

View File

@ -19,13 +19,14 @@
</template> </template>
<script setup> <script setup>
import { ref, toRaw } from 'vue' import { onMounted, ref, toRaw } from 'vue'
import useResoureStore from './store' import useResoureStore from './store'
import ChooseTextbook from '@/components/choose-textbook/index.vue' import ChooseTextbook from '@/components/choose-textbook/index.vue'
import ResoureSearch from './container/resoure-search.vue' import ResoureSearch from './container/resoure-search.vue'
import ResoureList from './container/resoure-list.vue' import ResoureList from './container/resoure-list.vue'
import uploadDialog from '@/components/upload-dialog/index.vue' import uploadDialog from '@/components/upload-dialog/index.vue'
import uploaderState from '@/store/modules/uploader' import uploaderState from '@/store/modules/uploader'
import { createTools } from '@/utils/tool'
const sourceStore = useResoureStore() const sourceStore = useResoureStore()
const isDialogOpen = ref(false) const isDialogOpen = ref(false)
@ -33,7 +34,11 @@ const isDialogOpen = ref(false)
const openDialog = () => { const openDialog = () => {
isDialogOpen.value = true isDialogOpen.value = true
} }
onMounted(async () => {
const params = { url: '/tools/sphere', width: 120, height: 120 }
const res = await createTools('sphere', params)
console.log('消息返回:', res)
})
// //
const getData = (data) => { const getData = (data) => {
const { textBook, node } = data const { textBook, node } = data
@ -81,7 +86,6 @@ const fileCallBack = (res) => {
sourceStore.handleQuery() sourceStore.handleQuery()
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

View File

@ -0,0 +1,13 @@
<template>
<div>
xxxxx
</div>
</template>
<script setup>
// electron
</script>
<style lang="scss" scoped>
</style>