Merge branch 'main' into zhuhao_dev

package.json

@@ -28,6 +28,7 @@
     "element-plus": "^2.7.6",
     "js-cookie": "^3.0.5",
     "jsencrypt": "^3.3.2",
+    "lodash": "^4.17.21",
     "pinia": "^2.1.7",
     "pinia-plugin-persistedstate": "^3.2.1",
     "spark-md5": "^3.0.2",

src/main/index.js

@@ -5,7 +5,7 @@ import icon from '../../resources/icon.png?asset'
 import File from './file'
 
 File({ app, shell, BrowserWindow, ipcMain })
-
+process.env['ELECTRON_DISABLE_SECURITY_WARNINGS'] = 'true'
 let mainWindow, loginWindow
 
 //登录窗口
@@ -24,9 +24,16 @@ function createLoginWindow() {
       nodeIntegration: true
     }
   })
-  const loginURL = is.dev ? `http://localhost:5173/#/login` : `file://${__dirname}/index.html/login`
+  // handleUpdate(loginWindow,ipcMain)
-  loginWindow.loadURL(loginURL)
+  // const loginURL = is.dev ? `http://localhost:5173/#/login` : `file://${__dirname}/index.html/#/login`
+  // loginWindow.loadURL(loginURL)
+  if (is.dev && process.env['ELECTRON_RENDERER_URL']) {
+    loginWindow.loadURL('http://localhost:5173/#/login')
+  } else {
+    loginWindow.loadFile(join(__dirname, '../renderer/index.html'), {hash: 'login'})
+  }
 
+  loginWindow.webContents.openDevTools()
   loginWindow.once('ready-to-show', () => {
     loginWindow.show()
   })
@@ -67,11 +74,12 @@ function createMainWindow() {
   }
 }
 
+
 // 作业窗口相关-开发中
-let openWindow
+let linkWindow
-function createOpenWin(data) {
+async function createLinkWin(data) {
-  if (openWindow) return
+  if (linkWindow) return
-  openWindow = new BrowserWindow({
+  linkWindow = new BrowserWindow({
     width: 650,
     height: 500,
     show: false,
@@ -81,28 +89,32 @@ function createOpenWin(data) {
     ...(process.platform === 'linux' ? { icon } : {}),
     webPreferences: {
       sandbox: false,
-      nodeIntegration: true
+      nodeIntegration: true,
+      worldSafeExecuteJavaScript: true, 
+      contextIsolation: true
     }
   })
   let cookieDetails = { ...data.cookieData }
-  openWindow.webContents.session.cookies.set(cookieDetails).then(()=>{
+  await linkWindow.webContents.session.cookies.set(cookieDetails).then(()=>{
-    console.log('Cookie set successfully.')
+    console.log('Cookie is successful');
-  }).catch(err =>{
+  }).catch( error =>{
-    console.error('Set cookie failed:', error)
+    console.error('Cookie is error', error);
   })
 
-  openWindow.loadURL(data.fullPath)
+  linkWindow.loadURL(data.fullPath)
 
-  openWindow.once('ready-to-show', () => {
+  linkWindow.once('ready-to-show', () => {
-    openWindow.show()
+    linkWindow.show()
+    linkWindow.maximize()
   })
-  openWindow.on('closed', () => {
+  linkWindow.on('closed', () => {
-    openWindow = null
+    linkWindow = null
   })
 }
 
 // 初始化完成
 app.on('ready', () => {
+
   // 设置应用程序用户模型标识符
   electronApp.setAppUserModelId('com.electron')
 
@@ -149,16 +161,18 @@ app.on('ready', () => {
       createLoginWindow()
     }
     mainWindow.destroy()
+    mainWindow = null
     loginWindow.show()
     loginWindow.focus()
   })
 
   //打开作业窗口
-  ipcMain.on('openWork', (e, data) => {
+  ipcMain.on('openWindow', (e, data) => {
-    createOpenWin(data)
+    createLinkWin(data)
   })
 
   createLoginWindow()
+  
   app.on('activate', function () {
     if (BrowserWindow.getAllWindows().length === 0) createLoginWindow()
   })

src/renderer/src/components/select-subject/index.vue

@@ -79,10 +79,6 @@ const subjectList = ref([])
 const allSubject = ref([])
 const dialogVisible = ref(false)
 
-watch(() => props.modelValue, (newVal) => {
-  dialogVisible.value = newVal
-})
-
 //切换年级
 const changeGrade = ()=>{
   // 切换年级 过滤出对应学科数据
@@ -120,8 +116,13 @@ const editUserInfo = async () =>{
   emit('onSuccess')
 }
 
+watch(() => props.modelValue, (newVal) => {
+  dialogVisible.value = newVal
+  if(newVal){
+    getSubject()
+  }
+})
 
-onMounted(getSubject)
 </script>
 
 <style lang="scss" scoped>
@@ -138,6 +139,7 @@ onMounted(getSubject)
 
 .dialog-content {
   padding: 30px 20px 10px 30px;
+  -webkit-app-region: no-drag;
 }
 
 .dialog-footer{

src/renderer/src/utils/config.js

@@ -1,9 +0,0 @@
-
-// 作业
-export const homeWorkConfig = {
-  // host 设置token 等
-  host: 'https://file.ysaix.com:7868',
-  name: 'Admin-Token',
-  // 完整路径
-  fullPath: 'https://file.ysaix.com:7868/teaching/classtaskassign?titleName=%E4%BD%9C%E4%B8%9A%E5%B8%83%E7%BD%AE'
-}

src/renderer/src/utils/hasPermission.js

@@ -0,0 +1,18 @@
+
+import useUserStore from '@/store/modules/user'
+
+import array from 'lodash/array'
+export const hasPermission = (value, def = true) => {
+  // 不传值，默认视为有权限，不做鉴权
+  if (!value) {
+    return def
+  }
+ 
+  const allCodeList = useUserStore().roles
+  // 如果不是数组，直接判断pinia里的权限数组有没有相同的元素即可
+  if (!Array.isArray(value)) {
+    return allCodeList.includes(value)
+  }
+  // intersection是lodash提供的一个方法，用于返回一个所有给定数组都存在的元素组成的数组
+  return array.intersection(value, allCodeList).length > 0
+}

src/renderer/src/utils/linkConfig.js

@@ -0,0 +1,40 @@
+
+import useUserStore from '@/store/modules/user'
+
+const userStore = useUserStore()
+const baseConfig = {
+    // Electron 设置cookie
+    url: 'https://file.ysaix.com:7868',
+    //cookie 名称 这里为 token 
+    name: 'Admin-Token',
+    //cookie 值
+    value: userStore.token,
+    // 域名
+    domain: 'file.ysaix.com',
+
+}
+
+// 作业
+const homeWork = {
+  data: {  ...baseConfig},
+  // 完整路径
+  fullPath: `${baseConfig.url}/teaching/classtaskassign?titleName=%E4%BD%9C%E4%B8%9A%E5%B8%83%E7%BD%AE`
+}
+
+// 高考研读
+const gk = {
+  data: {  ...baseConfig},
+  fullPath: `${baseConfig.url}/education/colentrance`
+}
+
+// 课标研读
+const standard = {
+  data: {  ...baseConfig},
+  fullPath: `${baseConfig.url}/teaching/chatwithstandard`
+}
+
+export default {
+  homeWork,
+  gk,
+  standard
+}

src/renderer/src/views/login/index.vue

@@ -31,7 +31,7 @@
     </div>
   </div>
   <!--选择学科-->
-  <SelectSubject v-model="isSubject" v-if="isSubject" class="select-subject" @onSuccess="successEditSubject" /> 
+  <SelectSubject v-model="isSubject" @onSuccess="successEditSubject" /> 
 </template>
 <script setup>
 import { onMounted, reactive, ref } from 'vue'
@@ -202,7 +202,5 @@ onMounted(()=>{
 .el-form-item {
   margin-bottom: 40px;
 }
-.select-subject{
+
-  -webkit-app-region: drag;
-}
 </style>

src/renderer/src/views/prepare/index.vue

@@ -7,9 +7,9 @@
           <el-image style="width: 80px; height: 110px" :src="curBookImg" />
         </div>
         <div class="top-item">
-          <el-button class="btn">教材研读</el-button>
+          <el-button class="btn" @click="handleOutLink('standard')">课标研读</el-button>
           <el-button class="btn" >电子课本</el-button>
-          <el-button class="btn">高考研读</el-button>
+          <el-button class="btn" @click="handleOutLink('gk')">高考研读</el-button>
           <el-button class="btn">教学大模型</el-button>
         </div>
         <el-button type="primary" class="to-class-btn">
@@ -37,7 +37,7 @@
           </el-popover>
         </div>
         <div style="display: flex">
-          <el-button @click="handleHomeWork">布置作业</el-button>
+          <el-button @click="handleOutLink('homeWork')">布置作业</el-button>
           <el-button @click="isDialogOpen = true">上传资料</el-button>
           <el-button type="primary" style="margin-left: 10px" @click="createFile">新建课件</el-button>
         </div>
@@ -73,8 +73,8 @@ import { toTimeText } from '@/utils/date'
 import { ElMessage } from 'element-plus'
 import { parseCataByNode, creatPPT, asyncLocalFile } from '@/utils/talkFile'
 import FileOperBatch from '@/views/prepare/container/file-oper-batch.vue'
-import useUserStore from '@/store/modules/user'
+
-import { homeWorkConfig } from '@/utils/config'
+import outLink from '@/utils/linkConfig'
 const { ipcRenderer } = window.electron || {}
 
 export default {
@@ -102,7 +102,6 @@ export default {
       },
       // 当前教材封面图
       curBookImg: '',
-      userStore: ''
     }
   },
   computed: {
@@ -118,7 +117,7 @@ export default {
       this.callback(param)
     })
     this.lastAsyncAllTime = localStorage.getItem('lastAsyncAllTime')
-    this.userStore = useUserStore()
+  
   },
   mounted() {
   },
@@ -251,15 +250,14 @@ export default {
       this.uploadData.textbookId = data.textBook.curBookId
       this.asyncAllFile()
     },
-    // 布置组后也
+    // 打开外部链接
-    handleHomeWork(){
+    handleOutLink(key){
-      ipcRenderer.send('openWork',{
+      // key 对应的 linkConfig.js 外部链接配置 
-        fullPath: homeWorkConfig.fullPath,
+      let configObj = outLink[key]
-        cookieData: {
+      // 通知主进程 
-          url: homeWorkConfig.host,
+      ipcRenderer.send('openWindow', {
-          name: homeWorkConfig.name,
+        fullPath: configObj.fullPath,
-          value: this.userStore.token
+        cookieData: {...(configObj.data)}
-        }
       })
     },
   }

src/renderer/src/views/resource/container/resoure-search.vue

@@ -8,7 +8,8 @@
           }}</el-button>
       </el-col>
       <el-col :span="12" class="search-box flex">
-        <el-input v-model="sourceStore.query.fileName" @input="sourceStore.changeName" style="width: 240px" placeholder="请输入关键词" />
+        <el-input v-model="sourceStore.query.fileName" @input="sourceStore.changeName" style="width: 240px"
+          placeholder="请输入关键词" />
       </el-col>
     </el-row>
     <el-row class="resoure-btns">
@@ -58,6 +59,7 @@ const sourceStore = useResoureStore()
 
     .query-row {
       justify-content: space-between;
+
       .row-left {
         align-items: center;
       }
@@ -74,6 +76,7 @@ const sourceStore = useResoureStore()
   }
 
 }
+
 .el-button.is-round {
   padding: 3px 15px;
   font-size: 13px;

src/renderer/src/views/resource/index.vue

@@ -6,7 +6,7 @@
     <div class="page-right">
       <!-- 搜索 -->
       <ResoureSearch #add>
-        <el-button type="primary" round @click="openDialog" class="create-btn">
+        <el-button v-if="hasPermission(['platformmanager'])" type="primary" round @click="openDialog" class="create-btn">
           <i class="iconfont icon-jiahao"></i>
           新建资源</el-button>
       </ResoureSearch>
@@ -26,6 +26,7 @@ import ResoureSearch from './container/resoure-search.vue'
 import ResoureList from './container/resoure-list.vue'
 import uploadDialog from '@/components/upload-dialog/index.vue'
 import uploaderState from '@/store/modules/uploader'
+import { hasPermission } from '@/utils/hasPermission'
 
 const sourceStore = useResoureStore()
 const isDialogOpen = ref(false)
@@ -76,7 +77,6 @@ const submitFile = (data) => {
 
 
 const fileCallBack = (res) => {
-  console.log(res)
   if (res.code == 200) {
     sourceStore.handleQuery()
   }

src/renderer/src/views/resource/store.js

@@ -2,6 +2,7 @@ import { defineStore } from 'pinia'
 import { getSmarttalkPage } from '@/api/file/index'
 import { tabs, resourceType, resourceFormat } from '@/utils/resourceDict'
 import useUserStore from '@/store/modules/user'
+import { hasPermission } from '@/utils/hasPermission'
 
 const userStore = useUserStore()
 
@@ -21,11 +22,16 @@ const resourceFormatList = [
 ]
 
 // 校本资源为学校ID
-tabs.forEach(item =>{
+tabs.forEach((item) => {
- if( item.label == "校本资源"){
+  if (item.label == '校本资源') {
     item.value = userStore.user.deptId
   }
 })
+tabs.forEach((item, i) => {
+  if (item.label == '平台资源' && !hasPermission(['platformmanager'])) {
+    tabs.splice(i, 1)
+  }
+})
 
 const structQuery = {
   pageNum: 1,
@@ -46,7 +52,7 @@ export default defineStore('resource', {
     //查询条件
     query: {
       textbookId: '',
-      fileSource: '平台',
+      fileSource: tabs[0].value,
       //资源格式  mp3 ppt ...
       fileSuffix: -1,
       // 资源类型 课件 素材 教案
@@ -70,6 +76,7 @@ export default defineStore('resource', {
         if (data.fileSuffix == -1) {
           data.fileSuffix = ''
         }
+        console.log(data, 200)
         getSmarttalkPage(data).then((res) => {
           this.result.total = res.total
           this.result.list = res.rows
@@ -92,8 +99,7 @@ export default defineStore('resource', {
     },
     // 关键词搜索
     changeName() {
-      console.log(this.query.fileName)
       this.handleQuery()
-    },
+    }
   }
 })