zhuhao
/
AIx_Smarttalk
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 24 Wiki Activity

zhuhao_dev #170

Merged
zhuhao merged 12 commits from zhuhao_dev into main 2024-09-03 16:39:59 +08:00
Conversation 0 Commits 12 Files Changed 6 +284 -100
18 changed files with 284 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 59ca00d6d1 - Show all commits

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "aix-win",
"version": "1.1.3",
"version": "1.1.6",
"description": "An Electron application with Vue",
"main": "./out/main/index.js",
"author": "example.com",

36
src/main/index.js
View File

@ -3,15 +3,17 @@ import { join } from 'path'
import { electronApp, optimizer, is } from '@electron-toolkit/utils'
import icon from '../../resources/icon.png?asset'
import File from './file'
import Logger from './logger' // 日志封装
import chat from './chat' // chat封装
import Store from './store' // Store封装
import updateInit from './update'
// 代理 electron/remote
// 第一步：引入remote
import remote from '@electron/remote/main'
// 第二步： 初始化remote
remote.initialize()
// 日志配置-初始化(日志直接绑定到console上)
if(!is.dev) Logger.initialize()
// 持久化数据-初始化
Store.initialize()
@ -158,6 +160,7 @@ async function createLinkWin(data) {
// 初始化完成
app.on('ready', () => {
appWatchError() // 监听app错误
process.env.LANG = 'en_US.UTF-8'
// 设置应用程序用户模型标识符
electronApp.setAppUserModelId('com.electron')
@ -264,3 +267,34 @@ function handleAll() {
win.webContents.send('pinia-state-set', storeName, jsonStr)
})
}
// app 崩溃监听器
function appWatchError() {
// 渲染进程崩溃
app.on('renderer-process-crashed', (event, webContents, killed) => {
console.error(
`APP-ERROR:renderer-process-crashed; event: ${JSON.stringify(event)}; webContents:${JSON.stringify(
webContents
)}; killed:${JSON.stringify(killed)}`
)
})
// GPU进程崩溃
app.on('gpu-process-crashed', (event, killed) => {
console.error(`APP-ERROR:gpu-process-crashed; event: ${JSON.stringify(event)}; killed: ${JSON.stringify(killed)}`)
})
// 渲染进程结束
app.on('render-process-gone', async (event, webContents, details) => {
console.error(
`APP-ERROR:render-process-gone; event: ${JSON.stringify(event)}; webContents:${JSON.stringify(
webContents
)}; details:${JSON.stringify(details)}`
)
})
// 子进程结束
app.on('child-process-gone', async (event, details) => {
console.error(`APP-ERROR:child-process-gone; event: ${JSON.stringify(event)}; details:${JSON.stringify(details)}`)
})
}

52
src/main/logger.js Normal file
View File

@ -0,0 +1,52 @@
/**
* @description 日志配置
* @author zdg
* @date 2021-07-05 14:07:01
*/
// import log from 'electron-log'
import log from 'electron-log/main'
import { app } from 'electron'
import path from 'path'
// 关闭控制台打印
// 日志控制台等级，默认值：false
log.transports.console.level = false
// log.transports.console.level = 'info'
// 日志文件等级，默认值：false
log.transports.file.level = 'info'
// 日志文件名，默认：main.log
// log.transports.file.fileName = 'main.log';
// 日志大小，默认：1048576（1M），达到最大上限后，备份文件并重命名为：main.old.log，有且仅有一个备份文件
log.transports.file.maxSize = 10 * 1024 * 1024; // 文件最大不超过 10M
// 自定义日志文件滚动策略
log.transports.file.rollSize = 10 * 1024 * 1024; // 10MB
// 日志格式，默认：[{y}-{m}-{d} {h}:{i}:{s}.{ms}] [{level}]{scope} {text}
log.transports.file.format = '[{y}-{m}-{d} {h}:{i}:{s}.{ms}] [{level}]{scope} {text}'
let date = new Date()
let dateStr = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate()
// 文件位置及命名方式
// 默认位置为：C:\Users\[user]\AppData\Roaming\[appname]\electron_log\
// 文件名为：年-月-日.log
// 自定义文件保存位置为安装目录下 \log\年-月-日.log
// log.transports.file.resolvePathFn = () => 'logs\\' + dateStr+ '.log';
log.transports.file.resolvePathFn = () => path.join(app.getPath('userData'), `logs/${dateStr}.log`)
// 有六个日志级别error, warn, info, verbose, debug, silly。默认是silly
export const logger = {
error: (...args) => log.error(...args),
warn: (...args) => log.warn(...args),
info: (...args) => log.info(...args),
verbose: (...args) => log.verbose(...args),
debug: (...args) => log.debug(...args),
silly: (...args) => log.silly(...args)
}
export function initialize(bool = true, type = 'all') {
log.initialize() // 为渲染器进行初始化
if (bool) { // 是否替换默认的console
if (type == 'all') Object.assign(console, log.functions)
else { // 替换指定类型
console[type] = log[type]
}
}
}
export default { initialize }

41
src/main/store.js
View File

@ -8,6 +8,7 @@ Store.initRenderer()
// 默认共享数据
const defaultData = {
session: { // 缓存(临时sessionStorage)
model: 'select', // 悬浮球-当前模式
showBoardAll: false, // 全屏画板-是否显示
isPdfWin: false, // pdf窗口是否打开
@ -16,17 +17,45 @@ const defaultData = {
data: {}, // 当前教材节点 （包含当前教材 单元）
querySearch: {} // 查询资源所需参数
}
},
local: { // 本地(永久localStorage)
},
}
// 初始化
export function initialize(){
const store = new Store({
name: 'cache-store', // 存储文件名
// 缓存数据-sessionStore
const sessionStore = new Store({
name: 'session-store', // 存储文件名
fileExtension: 'ini', // 文件后缀名
encryptionKey: 'Eihrjwi7h104h2Kub423' // 数据加密-防止用户直接改配置
encryptionKey: 'BvPLmgCC4DSIG0KkTec5', // 数据加密-防止用户直接改配置
beforeEachMigration: (store, context) => { // 版本迁移回调
console.log(`[session-store] 迁移从 ${context.fromVersion} → ${context.toVersion}`);
},
migrations: { // 版本变化
'0.0.0': store => {
// store.set('debugPhase', true);
}
}
})
store.clear() // 先清除-所有缓存数据
store.set(defaultData) // 初始化-默认数据
return store
sessionStore.clear() // 先清除-所有缓存数据
sessionStore.set(defaultData.session) // 初始化-默认数据
// 缓存数据-localStore
const localStore = new Store({
name: 'local-store', // 存储文件名
fileExtension: 'ini', // 文件后缀名
encryptionKey: '6CyoHQmUaPmLzvVsh', // 数据加密-防止用户直接改配置
beforeEachMigration: (store, context) => { // 版本迁移回调
console.log(`[local-store] 迁移从 ${context.fromVersion} → ${context.toVersion}`);
},
migrations: { // 版本变化
'0.0.0': store => {
// store.set('debugPhase', true);
}
}
})
localStore.set(defaultData.local) // 初始化-默认数据
return {sessionStore, localStore}
}
export default { initialize }

9
src/renderer/src/components/pdf/index.vue
View File

@ -383,16 +383,7 @@ defineExpose({
savaDataStore
})
watchEffect(() => {
setTimeout(() => {
console.log(toolState,'监听')
}, 300)
if(toolState.isPdfWin){
// if(toolState.isToolWin){
// ispointer.value=false
// }else{
// ispointer.value=true
// }
watchToolState() //监听工具栏
}
})

6
src/renderer/src/main.js
View File

@ -12,10 +12,14 @@ import 'virtual:windi.css'
import { store } from '@/store'
import App from './App.vue'
import router from './router'
import log from 'electron-log/renderer' // 渲染进程日志-文件记录
if(process.env.NODE_ENV != 'development') { // 非开发环境，将日志打印到日志文件
Object.assign(console, log.functions) // 渲染进程日志-控制台替换
}
const app = createApp(App)
app.use(router)
.use(store)
.use(ElementPlus, { locale: zhLocale }).mount('#app')

47
src/renderer/src/plugins/shareStore.js
View File

@ -3,13 +3,14 @@
*/
const isNode = typeof require !== 'undefined' // 是否支持node函数
const { ipcRenderer } = isNode?require('electron'):{} // app使用
import { sessionStore } from '@/utils/store'
// const Remote = isNode?require('@electron/remote'):{} // 远程模块
export function shareStorePlugin({store}) {
store.$subscribe((mutation, state) => { // 自动同步
// mutation 变量包含了变化前后的状态
// mutation.events: key newValue target oldValue oldTarget
// state 是变化后的状态
// console.log('store.$subscribe', mutation)
// console.log('store.$subscribe', mutation, state, store)
// 在存储变化的时候执行
// const storeName = store.$id
const storeName = mutation.storeId
@ -19,13 +20,15 @@ export function shareStorePlugin({store}) {
const { storeId: storeName, payload, events, type } = mutation // direct
// if (!Object.keys(payload).length) return
if (type != 'direct' || !events || Array.isArray(events) || !events.key) return
stateSync(storeName, events.key, events.newValue) // 需要同步
stateSync(storeName, events.key, events.newValue, state) // 需要同步
}
})
// 暴露方法-手动同步
store.stateSync = (storeName, key, value) => {
if (!storeName && !!key && !!value) stateSync(storeName, key, value)
else stateSyncAll(store)
const state = store.$state
if (!storeName && !!key && !!value) stateSync(storeName, key, value, state)
else stateSyncAll(store, state)
}
// 暴露方法-发送当前状态-新窗口
store.stateSyncInit = wid => stateSyncInit(wid, store)
@ -34,14 +37,16 @@ export function shareStorePlugin({store}) {
}
// 同步数据-发送给主线程-单独
function stateSync(storeName, key, value) {
function stateSync(storeName, key, value, state) {
// console.log('state-change', storeName, key, value)
try {
let jsonStr = ''
if (typeof key === 'string') jsonStr = JSON.stringify({[key]:value})
else if (typeof value === 'object') jsonStr = JSON.stringify(key)
const { data, keystr } = filterByKey(state, key, value)
const jsonStr = JSON.stringify(data) // 从新组装-json数据
// 更新本地数据-session
sessionStore.set(keystr, value)
// 通知主线程更新
ipcRenderer?.invoke('pinia-state-change', storeName, jsonStr)
// console.log('======',keystr, jsonStr )
} catch (error) {
console.log('state-change-error', error)
}
@ -95,3 +100,29 @@ const circularSafeStringify = (obj) => {
});
}
// 过滤对象
const filterByKey = (obj, key, value) => {
let res = { data:{}, keystr:'' }
for (let k in obj) {
if (obj.hasOwnProperty(k)) {
const isEqual = JSON.stringify(obj[k]) === JSON.stringify(value) // 值是否相同
if (k === key && isEqual) {
// 如果匹配，则添加到新对象中
res.data[k] = obj[k];
res.keystr = k;
} else {
if (obj[k] !== null && typeof obj[k] === 'object') {
// 如果是对象，则递归处理
const {data, keystr} = filterByKey(obj[k], key, value)
if(!!keystr) {
res.data[k] = data
res.keystr = `${k}.${keystr}`
}
}
}
}
}
return res;
}
// 对象克隆
const objClone = (obj) => JSON.parse(JSON.stringify(obj))

7
src/renderer/src/store/modules/tool.js
View File

@ -2,6 +2,10 @@
* 工具类-窗口-状态管理
*/
import { defineStore } from 'pinia'
import { sessionStore } from '@/utils/tool'
// 默认数据
const defData = sessionStore.store || {}
export const useToolState = defineStore('tool', {
state: () => ({
@ -12,7 +16,8 @@ export const useToolState = defineStore('tool', {
curSubjectNode: {
data: {}, // 当前教材节点 （包含当前教材 单元）
querySearch: {} // 查询资源所需参数
}
},
...defData // 默认数据-覆盖上面的配置(不要删除, 会导致新窗口-获取状态失败)
}),
actions: {
}

25
src/renderer/src/utils/store.js Normal file
View File

@ -0,0 +1,25 @@
/**
* @description : 存储对象-本地存储 封装工具(渲染器)
* @author : zdg
* @date : 2024-09-03
*/
const isNode = typeof require !== 'undefined' // 是否支持node函数
const Store = isNode?require('electron-store'):null // 持久化存储
// 暴露sessionStore存储对象
export const sessionStore = Store ? new Store({
name: 'session-store', // 存储文件名
fileExtension: 'ini', // 文件后缀名
encryptionKey: 'BvPLmgCC4DSIG0KkTec5' // 数据加密-防止用户直接改配置
}) : {}
// 暴露localStore存储对象
export const localStore = Store ? new Store({
name: 'local-store', // 存储文件名
fileExtension: 'ini', // 文件后缀名
encryptionKey: '6CyoHQmUaPmLzvVsh' // 数据加密-防止用户直接改配置
}) : {}
export default {
sessionStore, localStore
}

29
src/renderer/src/utils/tool.js
View File

@ -11,22 +11,27 @@ const path = isNode?require('path'):{}
const Remote = isNode?require('@electron/remote'):{}
const { ipcRenderer } = isNode?require('electron'):window.electron || {}
const API = isNode?window.api:{} // preload-api
import { useToolState } from '@/store/modules/tool' // 获取store状态
const Store = isNode?require('electron-store'):null // 持久化存储
// import { useToolState } from '@/store/modules/tool' // 获取store状态
// const Store = isNode?require('electron-store'):null // 持久化存储
import store from './store'
// 常用变量
const BaseUrl = isNode?process.env['ELECTRON_RENDERER_URL']+'/#':''
const isDev = isNode?process.env.NODE_ENV !== 'production':''
const toolState = useToolState() // 获取store状态
// const toolState = useToolState() // 获取store状态
// 暴露Remote中的属性
export const ipcMain = Remote?.ipcMain || {}
// 暴露sessionStore存储对象
export const sessionStore = store.sessionStore
// 暴露localStore存储对象
export const localStore = store.localStore
// 暴露Store存储对象
export const store = Store ? new Store({
name: 'cache-store', // 存储文件名
fileExtension: 'ini', // 文件后缀名
encryptionKey: 'Eihrjwi7h104h2Kub423' // 数据加密-防止用户直接改配置
}) : {}
export const Store = store
/**
* 获取静态资源，开发和生产环境
* @param {*} url
@ -128,7 +133,7 @@ export const createWindow = async (type, data) => {
winPdf.restore();
} else{
winPdf.focus();
toolState.isPdfWin=true
// toolState.isPdfWin=true
}
return
@ -195,9 +200,9 @@ export function toolWindow({url, isConsole, isWeb=true, option={}}) {
mainWin.once('closed', () => { win.destroy()})
// 内部监听器
win.webContents.on('did-finish-load', () => {
setTimeout(() => {
toolState.stateSyncInit(win.id) // 同步状态
}, 200);
// setTimeout(() => {
// toolState.stateSyncInit(win.id) // 同步状态
// }, 200);
})
// 内部监听器-是否打印
if (!!isConsole) {

5
src/renderer/src/views/classBegins/index.vue
View File

@ -104,9 +104,12 @@ const switchPageMode = () => {
}
}
onMounted(async () => {
const isDev = process.env.NODE_ENV == 'development'
toolState.isPdfWin=true //设置打开pdf窗口
if (isDev)
pdfObj.pdfUrl = getStaticUrl('aaa.pdf', 'user', 'selfFile', true) //本地
else
pdfObj.pdfUrl = getStaticUrl(route.query.path, 'user', 'selfFile', true) //线上
// pdfObj.pdfUrl = getStaticUrl('aaa.pdf', 'user', 'selfFile', true) //本地
textbookId.value = route.query.textbookId
pdfObj.bookId=textbookId.value
//初始化获取接口数据

10
src/renderer/src/views/classManage/basicGroup.vue
View File

@ -1,10 +1,10 @@
<template>
<el-card style="width: 100%;height: 100%">
<template #header>
<div class="card-header" style="text-align: left">
<el-button type="primary" @click="addGroup">新建分组</el-button>
</div>
</template>
<!-- <template #header>-->
<!-- <div class="card-header" style="text-align: left">-->
<!-- <el-button type="primary" @click="addGroup">新建分组</el-button>-->
<!-- </div>-->
<!-- </template>-->
<template v-if="groupList.length > 0">
<div style="font-size: 16px;font-weight: bold;color: #000;text-align: left;margin-bottom: 5px">可用分组</div>
<div class="groupList">

10
src/renderer/src/views/classManage/classInfo.vue
View File

@ -1,10 +1,10 @@
<template>
<el-card style="width: 100%;height: 100%">
<template #header>
<div style="text-align: left">
<el-button type="danger" @click="deleteClassRoom">删除班级</el-button>
</div>
</template>
<!-- <template #header>-->
<!-- <div style="text-align: left">-->
<!-- <el-button type="danger" @click="deleteClassRoom">删除班级</el-button>-->
<!-- </div>-->
<!-- </template>-->
<el-descriptions :column="1">
<el-descriptions-item label="班级名称">{{ classInfo.caption }}</el-descriptions-item>
<el-descriptions-item label="教师">

11
src/renderer/src/views/classManage/index.vue
View File

@ -6,11 +6,12 @@
<div :style="{'max-height': (viewportHeight - 120) + 'px','overflow-y': 'auto'}">
<Aside :menuItems="menuItems" :classList="classList" @handleSelect="handleSelect"></Aside>
</div>
<template #footer>
<div>
<el-button @click="addClass" type="primary" :icon="Plus" >新增班级</el-button>
</div>
</template>
<!-- 隐藏操作按钮-->
<!-- <template #footer>-->
<!-- <div>-->
<!-- <el-button @click="addClass" type="primary" :icon="Plus" >新增班级</el-button>-->
<!-- </div>-->
<!-- </template>-->
</el-card>
</el-aside>
<el-main :style="{'min-height': (viewportHeight - 160) + 'px'}">

48
src/renderer/src/views/classManage/studentList.vue
View File

@ -3,10 +3,10 @@
<el-card style="width: 100%;height: 100%;overflow-y: auto">
<template #header>
<div style="text-align: left;display: flex;justify-content: space-between">
<div>
<el-button type="primary" @click="addStudent(0)">新增学生</el-button>
<el-button type="primary" @click="importStudent()">导入学生</el-button>
</div>
<!-- <div>-->
<!-- <el-button type="primary" @click="addStudent(0)">新增学生</el-button>-->
<!-- <el-button type="primary" @click="importStudent()">导入学生</el-button>-->
<!-- </div>-->
<el-text class="mx-1">点击学生头像查看学生信息</el-text>
</div>
</template>
@ -54,27 +54,27 @@
<el-form-item label="电话" prop="parentmobile">
<el-input v-model="studentForm.parentmobile" placeholder="请输入电话" style="width: 50%"/>
</el-form-item>
<div>
<el-row :gutter="4">
<el-col :span="12">
<el-form-item label-width="100px" label="平台登录账号">
系统自动创建
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label-width="100px" label="平台登录密码">
系统自动创建，默认为123123
</el-form-item>
</el-col>
</el-row>
</div>
<!-- <div>-->
<!-- <el-row :gutter="4">-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label-width="100px" label="平台登录账号">-->
<!-- 系统自动创建-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label-width="100px" label="平台登录密码">-->
<!-- 系统自动创建，默认为123123-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- </div>-->
</el-form>
<template #footer>
<el-button type="warning" v-show="studentForm.id > 0" @click="delStudent(1)">移出班级</el-button>
<el-button type="danger" v-show="studentForm.id > 0 && studentForm.editoruserid == userStore.userId" @click="delStudent(2)">删除学生</el-button>
<el-button @click="studentVisible = false">取 消</el-button>
<el-button type="primary" @click="btnStudentSave">确 定</el-button>
</template>
<!-- <template #footer>-->
<!-- <el-button type="warning" v-show="studentForm.id > 0" @click="delStudent(1)">移出班级</el-button>-->
<!-- <el-button type="danger" v-show="studentForm.id > 0 && studentForm.editoruserid == userStore.userId" @click="delStudent(2)">删除学生</el-button>-->
<!-- <el-button @click="studentVisible = false">取 消</el-button>-->
<!-- <el-button type="primary" @click="btnStudentSave">确 定</el-button>-->
<!-- </template>-->
</el-dialog>
<!-- 学生导入-->
<el-dialog title="学生导入" v-model="importVisiable" :width="600" append-to-body>

7
src/renderer/src/views/prepare/index.vue
View File

@ -122,6 +122,7 @@
:book-id="uploadData.textbookId"
@add-success="initReserv"
></reserv>
<!-- <button @click="ipcMsgSend('tool-sphere:close')">测试</button> -->
</template>
<script setup>
import { Check } from '@element-plus/icons-vue'
@ -144,12 +145,13 @@ import { parseCataByNode, creatPPT, asyncLocalFile } from '@/utils/talkFile'
import FileOperBatch from '@/views/prepare/container/file-oper-batch.vue'
import SetHomework from '@/components/set-homework/index.vue'
import outLink from '@/utils/linkConfig'
import { createWindow } from '@/utils/tool'
import { createWindow, ipcMsgSend } from '@/utils/tool'
import { cloneDeep } from 'lodash'
import { delClasswork } from '@/api/teaching/classwork'
import { getSelfReserv, startClass } from '@/api/classManage'
import { useGetHomework } from '@/hooks/useGetHomework'
const toolStore = useToolState()
const fs = require('fs')
const { ipcRenderer } = window.electron || {}
@ -423,7 +425,8 @@ export default {
this.uploadData.levelThirdId = cata[2]
this.uploadData.textbookId = data.textBook.curBookId
toolStore.curSubjectNode.data = data
toolStore.curSubjectNode.querySearch = this.uploadData
// 不要同时修改共享数据，这样只会触发一次
this.$nextTick(() =>{ toolStore.curSubjectNode.querySearch = this.uploadData })
this.initHomeWork()
await this.asyncAllFile()
},

4
src/renderer/src/views/tool/components/board.vue
View File

@ -29,7 +29,7 @@ onMounted(async() => {
const handleMode = (newVal, oldVal) => {
if(toolStore.isPdfWin){
if(newVal=='clear'){
emit('update:modelValue', oldVal)
setTimeout(() => emit('update:modelValue', oldVal), 10)
}
return
}
@ -47,7 +47,7 @@ const handleMode = (newVal, oldVal) => {
case 'clear': // 清空画布
if(oldVal){
FabricVue.history?.clean()
emit('update:modelValue', oldVal)
setTimeout(() => emit('update:modelValue', oldVal), 10)
}
break

9
src/renderer/src/views/tool/sphere.vue
View File

@ -51,8 +51,9 @@ import imChat from './components/imChat.vue' // im-chat-子组件
import vDrag from './directive/drag' // 自定义指令-拖拽
import vIgnore from './directive/ignore' // 自定义指令-穿透
import { useToolState } from '@/store/modules/tool' // 数据状态-缓存
import { ipcMsgSend, ipcHandle, ipcMain, ipcMsgInvoke } from '@/utils/tool' // 相关工具
import { ipcMsgSend, ipcMain, sessionStore } from '@/utils/tool' // 相关工具
import MsgEnum from '@/plugins/imChat/msgEnum' // 消息头-相关定义(nuem)
const route = useRoute();
const tabActive = ref('select') // 工具栏当前选中项
const isFold = ref(false) // 折叠工具栏
@ -82,10 +83,11 @@ const btnList = [ // 工具栏按钮列表
// === 页面加载完毕 ===
onMounted(async() => {
if (!electron) return // 浏览器端
// console.log(sessionStore)
// window.test = sessionStore
// window.test1 = toolStore
getClassInfo() // 获取课堂详情 ex3
setTimeout(() => {
resetStatus() // 开启重置状态-监听
}, 200);
})
// ==== 方法 ===
@ -104,7 +106,6 @@ const getClassInfo = async () => {
const tabChange = (val) => {
const bool = !toolStore.isPdfWin && !toolStore.showBoardAll
if(bool) toolStore.showBoardAll = true
// ipcMsgSend('tool-sphere:close')
toolStore.model = val // 存储当前tab
}
// logo 点击-事件 折叠|展开