From dfb8100b149a8020005a08e63cbe3fc055b67e02 Mon Sep 17 00:00:00 2001
From: litian <2804272236@qq.com>
Date: 星期三, 15 五月 2024 11:22:06 +0800
Subject: [PATCH] zy
---
src/views/home.vue | 618 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 417 insertions(+), 201 deletions(-)
diff --git a/src/views/home.vue b/src/views/home.vue
index 9ebb6a1..a9106f2 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -171,7 +171,9 @@
: item.color
}"
>
- <div class="con">{{ item.note }}</div>
+ <div class="con hover" @click="jumpContent('note' + index)">
+ {{ item.note }}
+ </div>
</div>
<div class="chapter">{{ item.selectText }}</div>
</div>
@@ -221,10 +223,27 @@
<el-col :span="12" v-for="(item, index) in resourceDataList" :key="item">
<div class="resourceItem hover" @click="goResourceDetail(item)">
<div class="resourceImg">
- <img :src="video" mode="" />
+ <img :src="item.icon" mode="" v-if="item.icon" />
+ <el-icon v-else-if="activeClassify == 'image'" size="30"><Picture /></el-icon>
+ <el-icon v-else-if="activeClassify == 'audio'" size="30"><Headset /></el-icon>
+ <el-icon v-else-if="activeClassify == 'video'" size="30"
+ ><VideoCamera
+ /></el-icon>
+ <el-icon
+ v-else-if="activeClassify == 'other' && item.fileType == 'PDF'"
+ size="30"
+ ><Files
+ /></el-icon>
+ <el-icon
+ v-else-if="activeClassify == 'other' && item.fileType == ''"
+ size="30"
+ ><Tickets
+ /></el-icon>
</div>
<div class="rName" v-if="searchText != ''" v-html="item.name"></div>
- <div class="rName" v-else>{{ item.name }}</div>
+ <div class="rName" v-else :title="item.resourceName">
+ {{ item.resourceName }}
+ </div>
</div>
</el-col>
</el-row>
@@ -246,16 +265,19 @@
<div class="" v-if="activeMenu == 4">
<div class="list-box">
<div class="screenshot" v-if="screenshotList.length > 0">
- <div
- v-for="(item, index) in screenshotList"
- :key="item"
- class="captureItem"
- @click="getCapture(item)"
- >
+ <div v-for="(item, index) in screenshotList" :key="item" class="captureItem">
<div class="imgBox">
- <img :src="item.imgUrl" class="capture" mode="aspectFill" />
+ <img
+ :src="item.imgUrl"
+ class="capture"
+ mode="aspectFill"
+ @click="getCapture(item)"
+ />
+ <div class="deleteBox hover" @click="deleteScreenshot(item, 'capture')">
+ <img :src="shanchu" />
+ </div>
</div>
- <div class="captureName">{{ item.name }}</div>
+ <div class="captureName" :title="item.name">{{ item.name }}</div>
</div>
</div>
<div v-else>
@@ -285,7 +307,7 @@
<div class="">宸蹭笂璇撅細{{ headerData.classTime }}</div>
</div>
<div class="progress">
- <div class="bookName">瀛﹀墠鍎跨鍗敓涓庝繚鍋ワ紙绗笁鐗堬級</div>
+ <div class="bookName">{{ bookName }}</div>
<div>{{ headerData.process }}%</div>
</div>
<div class="rightBox">
@@ -306,7 +328,7 @@
id="container"
@mousedown="handleMouseDown"
@mousemove="handleMousemove"
- @mouseup="handleMouseUp"
+ :style="{ background: settingForm.bgColorActive }"
></div>
<!-- 鐢荤瑪鐢诲竷 -->
<div class="canvas-box" v-show="canvasShow">
@@ -407,14 +429,34 @@
</div>
</div>
<template #reference>
- <div :class="floatingToolData.activeToolData == item.name ? 'floatToolActive floatToolItem' : 'floatToolItem'">
- <img :src="floatingToolData.activeToolData == item.name ? item.activeIcon : item.icon" alt="" />
+ <div
+ :class="
+ floatingToolData.activeToolData == item.name
+ ? 'floatToolActive floatToolItem'
+ : 'floatToolItem'
+ "
+ >
+ <img
+ :src="floatingToolData.activeToolData == item.name ? item.activeIcon : item.icon"
+ alt=""
+ />
<div class="text">{{ item.name }}</div>
</div>
</template>
</el-popover>
- <div :class="floatingToolData.activeToolData == item.name ? 'floatToolActive floatToolItem' : 'floatToolItem'" v-else @click="floatItemHandle(item)">
- <img :src="floatingToolData.activeToolData == item.name ? item.activeIcon : item.icon" alt="" />
+ <div
+ :class="
+ floatingToolData.activeToolData == item.name
+ ? 'floatToolActive floatToolItem'
+ : 'floatToolItem'
+ "
+ v-else
+ @click="floatItemHandle(item)"
+ >
+ <img
+ :src="floatingToolData.activeToolData == item.name ? item.activeIcon : item.icon"
+ alt=""
+ />
<div class="text">{{ item.name }}</div>
</div>
</div>
@@ -423,7 +465,7 @@
<div class="toolList">
<el-popover placement="top" width="250" trigger="click">
<div class="popinnerBox">
- <div class="brush" >
+ <div class="brush">
<div class="thickness">
<div
:class="toolSelectData.thicknessActive == '1' ? 'small active' : 'small'"
@@ -533,7 +575,7 @@
<template #reference>
<div class="floatToolItem" @click="toolSelectHandle('wenzi')">
<div class="imgBox">
- <img :src="wenzi2" alt="" />
+ <img :src="wenzi2" alt="" />
</div>
<div class="text">鏂囧瓧</div>
</div>
@@ -579,7 +621,7 @@
</div>
</div>
<template #reference>
- <div class="floatToolItem" @click="toolSelectHandle('tuxing')">
+ <div class="floatToolItem" @click="toolSelectHandle('tuxing')">
<div class="imgBox">
<img :src="tuxing" alt="" />
</div>
@@ -587,7 +629,7 @@
</div>
</template>
</el-popover>
- <div class="floatToolItem" @click="toolSelectHandle('xiangpi')">
+ <div class="floatToolItem" @click="toolSelectHandle('xiangpi')">
<div class="imgBox">
<img :src="clearPrevious" alt="" />
</div>
@@ -654,9 +696,18 @@
</div>
</div>
</div>
+ <!-- 鍒掔嚎锛岄珮浜垹闄� -->
+ <div
+ class="lineDeleteBox"
+ v-show="lineDelete.showLineDelete"
+ :style="{ top: `${lineDelete.top}px`, left: `${lineDelete.left}px` }"
+ >
+ <el-button @click="lineDeleteBtn">鍒犻櫎</el-button>
+ </div>
+
<el-dialog title="璧勬簮" align-center v-model="resourVisble" width="845" class="resourDialog">
- <div class="videoBox" v-if="resourType == 'video'">
- <video controls object-fit="fill" :src="testVideo"></video>
+ <div class="videoBox" v-if="resourType == '瑙嗛'">
+ <video controls controlslist="nodownload" :src="testVideo"></video>
</div>
<div class="wordBox" v-if="resourType == 'word'">
<vue-office-docx :src="testWord" />
@@ -714,7 +765,7 @@
v-model="screenshotVisble"
:before-close="screenshotClose"
width="400"
- class="resourDialog"
+ class="resourDialog screenshotDialog"
>
<div class="formBox">
<el-input v-model="nameData" placeholder="璇疯緭鍏ユ埅鍥惧悕绉�"></el-input>
@@ -766,8 +817,8 @@
</template>
<script setup lang="ts">
-import { ref, reactive, watch, onMounted, inject } from 'vue'
-import { ctxUrl } from '@/assets/js/config'
+import { ref, reactive, watch, onMounted, onBeforeMount, inject } from 'vue'
+import { ctxUrl, resourceUrl, requestCtx } from '@/assets/js/config'
import { useRouter, useRoute } from 'vue-router'
import useClipboard from 'vue-clipboard3'
const { toClipboard } = useClipboard()
@@ -779,7 +830,7 @@
let route = useRoute()
import moment from 'moment'
import dictionary from '@/views/components/dictionary.vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox, valueEquals } from 'element-plus'
import logo from '@/assets/images/header/logo.png'
import mulu from '@/assets/images/menu/mulu.png'
import biji from '@/assets/images/menu/biji.png'
@@ -871,25 +922,25 @@
import { start } from 'qiankun'
import axios from 'axios'
import { fabric } from 'fabric'
+
+import { loadMicroApp } from 'qiankun'
+import { microApps } from '@/child.ts'
const canvasWith = ref(1000)
const canvasheight = ref(3000)
const screenWidth = ref(
window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth
)
+
+let microApp = null // 寰簲鐢ㄥ疄渚�
+const bookName = ref('')
+const bookId = ref(1)
onMounted(() => {
- console.log(1111)
- // canvasWith.value = window.innerWidth - 540
- // canvasheight.value = window.innerHeight - 110
- getNotesList() // 鑾峰彇楂樹寒
- getlineHeightList() //鑾峰彇楂樹寒
- getScribeList() //鑾峰彇鍒掔嚎
getCatalogueData()
getResourceData()
- getScreenshotList()
- // setTimeout(() => {
- // canvasWith.value = document.getElementById('container').offsetWidth
- // canvasheight.value = document.getElementById('container').offsetHeight
- // }, 5000)
+ setTimeout(() => {
+ canvasWith.value = document.querySelector('.content-box').offsetWidth
+ canvasheight.value = document.querySelector('.content-box').offsetHeight
+ }, 5000)
if (screenWidth.value < 1180) {
menuState.open = false
toolState.open = false
@@ -901,11 +952,26 @@
})()
}
- console.log(qiankunActions, 'qiankunActions')
+ // 鍔犺浇寰簲鐢�
+ microApp = loadMicroApp(microApps.book1, {
+ sandbox: {
+ // strictStyleIsolation: true,
+ // experimentalStyleIsolation: true
+ }
+ })
+ window.qiankunActions.onGlobalStateChange((state, prev) => {
+ console.log(state, '鐖跺眰')
+ bookName.value = state.bookName
+ bookId.value = state.bookId
+ state.gotoPage
+ })
- qiankunActions.setGlobalState({
- cc: (data) => {
- console.log(data)
+ window.qiankunActions.setGlobalState({
+ state: 1, // 鍔犺浇瀛愬簲鐢�
+ windowSelection: (data) => {
+ // 缁戝畾瀛愬簲鐢ㄩ�夋嫨鐩戝惉浜嬩欢
+ console.log(data, '瀛愬簲鐢ㄩ�夋嫨')
+ getSelection(data)
}
})
})
@@ -920,11 +986,20 @@
}
}
)
+watch(
+ () => bookId.value,
+ (val) => {
+ getNotesList() // 鑾峰彇绗旇
+ getlineHeightList() //鑾峰彇楂樹寒
+ getScribeList() //鑾峰彇鍒掔嚎
+ getScreenshotList() //鎴浘
+ }
+)
//鑾峰彇鐩綍
const catalogueData = ref([])
const getCatalogueData = () => {
axios
- .get(ctxUrl + '/books/test/information.json')
+ .get(ctxUrl + '/catalog.json')
.then(function (response) {
var json = response.data
// 澶勭悊鑾峰彇鍒扮殑json鏁版嵁
@@ -939,7 +1014,6 @@
label: 'label'
}
const handleNodeClick = (data) => {
- console.log(data.id, 12)
document.getElementById(data.id).scrollIntoView()
}
@@ -971,23 +1045,38 @@
const searchShow = ref(true)
const resourceData = ref({})
const resourceDataList = ref([])
+const resourceImgList = ref([])
+const resourceVideoList = ref([])
+const resourceAudioList = ref([])
+const resourceDocList = ref([])
const resourVisble = ref(false)
const resourType = ref('')
const testVideo = ref('') //瑙嗛閾炬帴
const testWord = ref('') //word閾炬帴
const getResourceData = () => {
axios
- .get(ctxUrl + '/books/test/resource.json')
+ .get(ctxUrl + '/resource.json')
.then(function (response) {
var json = response.data
// 澶勭悊鑾峰彇鍒扮殑json鏁版嵁
- console.log(json, '璧勬簮')
- resourceData.value = json
- resourceDataList.value = json.imgList
- classifySelectList[0].count = json.imgList.length
- classifySelectList[1].count = json.audioList.length
- classifySelectList[2].count = json.videoList.length
- classifySelectList[3].count = json.attachmentList.length
+ if (json.length > 0) {
+ json.forEach((item) => {
+ if (item.fileType == '鍥剧墖') {
+ resourceImgList.value.push(item)
+ } else if (item.fileType == '瑙嗛') {
+ resourceVideoList.value.push(item)
+ } else if (item.fileType == '闊抽') {
+ resourceAudioList.value.push(item)
+ } else {
+ resourceDocList.value.push(item)
+ }
+ })
+ }
+ resourceDataList.value = resourceImgList.value
+ classifySelectList[0].count = resourceImgList.value.length
+ classifySelectList[1].count = resourceAudioList.value.length
+ classifySelectList[2].count = resourceVideoList.value.length
+ classifySelectList[3].count = resourceDocList.value.length
})
.catch(function (error) {
console.log(error)
@@ -995,12 +1084,13 @@
}
const goResourceDetail = (data) => {
- resourVisble.value = true
- resourType.value = data.type
- if (data.type == 'video') {
- testVideo.value = ctxUrl + '/books/test/resourceData/' + data.name
- } else if (data.type == 'word') {
- testWord.value = ctxUrl + '/books/test/resourceData/' + data.name
+ resourType.value = data.fileType
+ if (data.fileType == '瑙嗛') {
+ resourVisble.value = true
+ testVideo.value = requestCtx + '/file/api/ApiDownload?md5=' + data.md5
+ } else if (data.fileType == 'PDF') {
+ window.open(requestCtx + '/file/api/ApiDownload?md5=' + data.md5)
+ // testWord.value = resourceUrl + '/resourceData/' + data.name
}
}
@@ -1010,19 +1100,18 @@
searchText.value = ''
switch (item.key) {
case 'image':
- resourceDataList.value = resourceData.value.imgList
+ resourceDataList.value = resourceImgList.value
break
case 'audio':
- resourceDataList.value = resourceData.value.audioList
+ resourceDataList.value = resourceAudioList.value
break
case 'video':
- resourceDataList.value = resourceData.value.videoList
+ resourceDataList.value = resourceVideoList.value
break
case 'other':
- resourceDataList.value = resourceData.value.attachmentList
+ resourceDataList.value = resourceDocList.value
break
}
- console.log(resourceDataList.value)
}
const searchBtn = () => {
if (searchShow.value) {
@@ -1061,7 +1150,6 @@
// 閫変腑鑿滃崟
const activeMenu = ref(0)
//璧勬簮绫诲瀷
-
const resourceType = ref('default')
// 鑿滃崟鐐瑰嚮
const menuItemClick = (index) => {
@@ -1086,6 +1174,17 @@
//鍒锋柊褰撳墠椤甸潰
const reload = () => {
location.reload()
+ // if (microApp) {
+ // microApp.unmount() // 鍗歌浇寰簲鐢�
+ // microApp = loadMicroApp(microApps.book1, {
+ // sandbox: {
+ // strictStyleIsolation: true,
+ // experimentalStyleIsolation: true
+ // }
+ // })
+ // } else {
+ // location.reload()
+ // }
}
const selectResourceType = (type) => {
@@ -1110,7 +1209,7 @@
{
lable: '澶�',
- key: '20'
+ key: '18'
}
],
fontSizeActive: '16',
@@ -1138,6 +1237,7 @@
})
const fontSizeSelect = (item) => {
settingForm.fontSizeActive = item.key
+ document.getElementById('app').style.fontSize = item.key + 'px'
}
const bgColorSelect = (item) => {
settingForm.bgColorActive = item.key
@@ -1304,7 +1404,7 @@
name: '鎴睆'
}
])
-const canvas = ref(null)
+let canvas = null
const floatingToolData = reactive({
activeToolData: '', //閫変腑宸ュ叿
elLeft: 400,
@@ -1376,6 +1476,9 @@
switch (item.name) {
case '鐢荤瑪':
canvasShow.value = true
+ toolSelectData.activeTool = 'huabi'
+ break
+ case '鏍囩':
break
case '鎴睆':
jitT()
@@ -1391,13 +1494,12 @@
}
}
const dragstart = (e) => {
- console.log(e)
floatingToolData.startclientx = e.clientX
floatingToolData.startclienty = e.clientY
}
//鐢荤瑪鎿嶄綔鏍忎簨浠�
const toolSelectData = reactive({
- activeTool:'',
+ activeTool: '',
fontSizeActive: '16',
thicknessActive: '3', //鐢荤瑪閫変腑绮楃粏
lineTypeActive: 'solid', //鐢荤瑪閫変腑绾跨被鍨�
@@ -1407,9 +1509,16 @@
toolSelectData.activeTool = title
switch (title) {
case 'huabi':
- init()
+ init()
break
case 'wenzi':
+ break
+ case 'tuichu':
+ canvasShow.value = false
+ floatingToolData.activeToolData = ''
+ break
+ case 'qingchu':
+ canvas.clear()
break
}
}
@@ -1417,7 +1526,7 @@
//閫変腑鐢荤瑪绮楃粏
const selectThickness = (str) => {
toolSelectData.thicknessActive = str
- init()
+ canvas.freeDrawingBrush.color = toolSelectData.thicknessActive
}
const selectLineType = (str) => {
@@ -1427,25 +1536,25 @@
//鐢荤瑪棰滆壊閫夋嫨
const lineColorSelect = (item) => {
toolSelectData.lineColorActive = item.key
- init()
+ canvas.freeDrawingBrush.color = item.key
}
//鐢诲竷灞炴��
+const isDrawing = ref(true) // 鏄惁寮�鍚粯鍥撅紝true 寮�鍚紱false 鍏抽棴
const init = () => {
- canvas.value = new fabric.Canvas('canvasRef', {
- isDrawingMode: true // 鍚敤缁樼敾妯″紡
+ canvas = new fabric.Canvas('canvasRef', {
+ isDrawingMode: isDrawing.value // 鍚敤缁樼敾妯″紡
})
- canvas.value.freeDrawingBrush.color = toolSelectData.lineColorActive
- canvas.value.freeDrawingBrush.width = toolSelectData.thicknessActive
+ canvas.freeDrawingBrush.color = toolSelectData.lineColorActive
+ canvas.freeDrawingBrush.width = toolSelectData.thicknessActive
}
-
-
-//鏍囩鏄剧ず闅愯棌
-const labelShow = (str) => {}
//鏂囧瓧澶у皬
const selectfontSize = (str) => {
toolSelectData.fontSizeActive = str
}
+
+//鏍囩鏄剧ず闅愯棌
+const labelShow = (str) => {}
//鎴浘
//鎴浘浜嬩欢
@@ -1465,6 +1574,7 @@
//鍙栨秷鍥炶皟
const closeFn = (base64: any) => {
console.log(base64)
+ floatingToolData.activeToolData = ''
}
const addScreenshot = () => {
if (nameData.value) {
@@ -1480,13 +1590,16 @@
setKeyRequests: [
{
domain: 'screenshot',
- key: '2358',
+ key: bookId.value,
value: JSON.stringify(screenshotList.value)
}
]
}
}).then((res) => {
getScreenshotList()
+ nameData.value = ''
+ urlData.value = ''
+ floatingToolData.activeToolData = ''
screenshotVisble.value = false
})
} else {
@@ -1503,7 +1616,7 @@
method: 'post',
data: {
domain: 'screenshot',
- keys: ['2358']
+ keys: [bookId.value]
}
}).then((res) => {
if (res && res.length > 0 && res[0].value) {
@@ -1519,6 +1632,7 @@
//閫変腑鏂囧瓧宸ュ叿鏍�
const selectText = ref('') //閫変腑鏂囧瓧
const selectNode = ref(null)
+const selectPage = ref(1)
const showToolBox = ref(false)
const dialogToolData = reactive({
left: 500,
@@ -1531,42 +1645,28 @@
})
///鍐呭閫変腑
-const isMouseDown = ref(false)
-const move = ref(false)
-const handleMouseDown = () => {
- isMouseDown.value = true
- showToolBox.value = false
- colorActive.value = ''
- toolActive.value = ''
-}
-const handleMousemove = () => {
- if (isMouseDown.value) {
- move.value = true
+const getSelection = (data) => {
+ if (data.txt) {
+ console.log(data.node, 'data')
+ showToolBox.value = true
+ selectText.value = data.txt
+ selectNode.value = data.node.innerHTML
+ selectPage.value = data.page
}
-}
-
-const handleMouseUp = (e) => {
- if (move.value) {
- const txt = window.getSelection()?.toString()
- selectText.value = txt
- const node = window.getSelection()
- let html = node.anchorNode.parentNode.parentNode
- dialogToolData.chapter = html.firstChild.innerHTML
- if (txt) {
- showToolBox.value = true
- dialogToolData.top = e.y
- dialogToolData.left = e.x
- }
- isMouseDown.value = false
- }
- move.value = false
}
const pageScroll = (e) => {
+ window.qiankunActions.setGlobalState({
+ gotoPage: (t, s) => {
+ // 缁戝畾瀛愬簲鐢ㄩ�夋嫨鐩戝惉浜嬩欢
+ console.log(t, s, '瀛愬簲鐢ㄦ粴鍔�')
+ }
+ })
showToolBox.value = false
- let scroll = e.target.scrollTop
- let offsetHeight = document.getElementById('container').offsetHeight
- headerData.process = Math.round((scroll / offsetHeight) * 100)
+ lineDelete.showLineDelete = false
+ // let scroll = e.target.scrollTop
+ // let offsetHeight = document.getElementById('container').offsetHeight
+ // headerData.process = Math.round((scroll / offsetHeight) * 100)
}
const toolActive = ref('')
@@ -1736,13 +1836,16 @@
const clickSelect = (item) => {
colorActive.value = item.key
if (toolActive.value == '楂樹寒') {
- dialogToolData.lineHeight.push({
+ let lineHeightData = {
selectNode: selectNode.value,
selectText: selectText.value,
+ selectPage: selectPage.value,
color: colorActive.value,
chapter: dialogToolData.chapter,
createDate: new Date()
- })
+ }
+ dialogToolData.lineHeight.push(lineHeightData)
+ console.log(dialogToolData.lineHeight, '鍓峮ode')
request({
url: '/identity/api/ApiAppUserSetKey',
method: 'post',
@@ -1750,7 +1853,7 @@
setKeyRequests: [
{
domain: 'highLight',
- key: '2358',
+ key: bookId.value,
value: JSON.stringify(dialogToolData.lineHeight)
}
]
@@ -1766,6 +1869,7 @@
dialogToolData.scribeList.push({
selectNode: selectNode.value,
selectText: selectText.value,
+ selectPage: selectPage.value,
color: colorActive.value,
chapter: dialogToolData.chapter,
createDate: new Date()
@@ -1777,7 +1881,7 @@
setKeyRequests: [
{
domain: 'underline',
- key: '2358',
+ key: bookId.value,
value: JSON.stringify(dialogToolData.scribeList)
}
]
@@ -1796,12 +1900,18 @@
const obj = {
desc: formData.desc
}
+ if (!colorActive.value) {
+ ElMessage.error('璇烽�夋嫨绗旇棰滆壊!')
+ return
+ }
if (!lock.value) {
lock.value = true
if (formData.desc.replace(/^\s*|\s*$/g, '')) {
dialogToolData.notesList.push({
+ selectNode: selectNode.value,
selectText: selectText.value,
color: colorActive.value,
+ selectPage: selectPage.value,
chapter: dialogToolData.chapter,
createDate: new Date(),
note: formData.desc.replace(/^\s*|\s*$/g, '')
@@ -1813,7 +1923,7 @@
setKeyRequests: [
{
domain: 'notes',
- key: '2358',
+ key: bookId.value,
value: JSON.stringify(dialogToolData.notesList)
}
]
@@ -1843,13 +1953,13 @@
method: 'post',
data: {
domain: 'notes',
- keys: ['2358']
+ keys: [bookId.value]
}
}).then((res) => {
if (res && res.length > 0 && res[0].value) {
dialogToolData.notesList = JSON.parse(res[0].value)
let list = JSON.parse(res[0].value)
- let textDom1 = document.getElementById('container')
+ let textDom1 = document.querySelector('.temp-book')
if (list.length > 0) {
list.forEach((item, index) => {
item.createDate = moment(item.createDate).format('YYYY-MM-DD')
@@ -1871,16 +1981,17 @@
}
}
//椤甸潰娣诲姞绗旇
- let containerElement = document.createElement('span')
- containerElement.style.textDecoration = 'underline'
- containerElement.innerText = item.selectText
let rReg1 = new RegExp(`${item.selectText}`, 'ig')
let text1 = textDom1.innerHTML
- let rHtml1 = ''
- rHtml1 = text1.replace(
+ let nHtmlText1 = item.selectNode
+
+ let nHtml1 = ''
+ nHtml1 = nHtmlText1.replace(
rReg1,
- `<span style="padding-bottom:2px; border-bottom: 2px solid;border-bottom-color:${item.color}" class="underline">${item.selectText}</span><img src="${biji1}" style="cursor: pointer" onclick="notesVisbleShow('${item.selectText}')"/>`
+ `<span style="padding-bottom:2px; border-bottom: 2px solid;border-bottom-color:${item.color}" class="notesline">${item.selectText}</span><img src="${biji1}" style="cursor: pointer" onclick="notesVisbleShow('${item.selectText}')"/>`
)
+ let rHtml1 = ''
+ rHtml1 = text1.replace(nHtmlText1, nHtml1)
textDom1.innerHTML = rHtml1
})
}
@@ -1896,27 +2007,27 @@
method: 'post',
data: {
domain: 'underline',
- keys: ['2358']
+ keys: [bookId.value]
}
}).then((res) => {
if (res && res.length > 0 && res[0].value) {
dialogToolData.scribeList = JSON.parse(res[0].value)
scribeData.scribeDataList = JSON.parse(res[0].value)
- let textDom1 = document.getElementById('container')
- console.log(scribeData.scribeDataList, '鍒掔嚎')
+ let textDom1 = document.querySelector('.temp-book')
if (scribeData.scribeDataList.length > 0) {
for (let i = 0; i < scribeData.scribeDataList.length; i++) {
let item = scribeData.scribeDataList[i]
- let containerElement = document.createElement('span')
- containerElement.style.textDecoration = 'underline'
- containerElement.innerText = item.selectText
let rReg1 = new RegExp(`${item.selectText}`, 'ig')
let text1 = textDom1.innerHTML
- let rHtml1 = ''
- rHtml1 = text1.replace(
+ let nHtmlText1 = item.selectNode
+
+ let nHtml1 = ''
+ nHtml1 = nHtmlText1.replace(
rReg1,
- `<span style="text-decoration:underline;text-decoration-style: wavy;text-underline-thickness:2px;text-decoration-color:${item.color};cursor: pointer">${item.selectText}</span>`
+ `<span style="text-decoration:underline;text-decoration-style: wavy;text-underline-thickness:2px;text-decoration-color:${item.color};cursor: pointer" class="underline" onclick="deleteScribeShow('${item.selectText}')">${item.selectText}</span>`
)
+ let rHtml1 = ''
+ rHtml1 = text1.replace(nHtmlText1, nHtml1)
textDom1.innerHTML = rHtml1
}
}
@@ -1931,27 +2042,27 @@
method: 'post',
data: {
domain: 'highLight',
- keys: ['2358']
+ keys: [bookId.value]
}
}).then((res) => {
if (res && res.length > 0 && res[0].value) {
dialogToolData.lineHeight = JSON.parse(res[0].value)
scribeData.lineHeightList = JSON.parse(res[0].value)
- console.log(scribeData.lineHeightList, '楂樹寒')
- let textDom = document.getElementById('container')
+ let textDom = document.querySelector('.temp-book')
if (scribeData.lineHeightList.length > 0) {
for (let i = 0; i < scribeData.lineHeightList.length; i++) {
let item = scribeData.lineHeightList[i]
- let heightLightElement = document.createElement('i')
- heightLightElement.style.backgroundColor = item.color
- heightLightElement.innerText = item.selectText
let rReg = new RegExp(`${item.selectText}`, 'ig')
let text = textDom.innerHTML
- let rHtml = ''
- rHtml = text.replace(
+ let nHtmlText = item.selectNode
+ let nHtml = ''
+ nHtml = nHtmlText.replace(
rReg,
- `<span style="background: ${item.color};padding: 2px;cursor: pointer">${item.selectText}</span>`
+ `<span style="background: ${item.color};padding:3px;cursor: pointer" class="highLight" onclick="deletelineHeightShow('${item.selectText}')">${item.selectText}</span>`
)
+ // nHtmlText = nHtml
+ let rHtml = ''
+ rHtml = text.replace(nHtmlText, nHtml)
textDom.innerHTML = rHtml
}
}
@@ -1960,49 +2071,97 @@
}
//姝ｆ枃涓垹闄ら珮浜紝鍒掔嚎锛岀瑪璁版搷浣滄
+const lineDelete = reactive({
+ showLineDelete: false,
+ top: 0,
+ left: 0,
+ deleteType: '',
+ deleteTxt: ''
+})
+
window.notesVisbleShow = function (txt) {
addNoteVisble.value = true
let notes = dialogToolData.notesList.find((item) => item.selectText == txt)
formData.desc = notes.note
+ colorActive.value = notes.color
+ selectNode.value = notes.selectNode
+ selectText.value = notes.selectText
+ selectPage.value = notes.selectPage
+ dialogToolData.chapter = notes.chapter
}
+
window.deleteScribeShow = function (txt) {
- console.log(txt, 2)
- let list = scribeData.scribeDataList.filter((item) => item.selectText != txt)
- request({
- url: '/identity/api/ApiAppUserSetKey',
- method: 'post',
- data: {
- setKeyRequests: [
- {
- domain: 'underline',
- key: '2358',
- value: JSON.stringify(list)
- }
- ]
- }
- }).then((res) => {
- getScribeList()
- })
+ let lines = scribeData.scribeDataList.find((item) => item.selectText == txt)
+ lineDelete.deleteType = 'underline'
+ lineDelete.deleteTxt = txt
+ lineDelete.top = event.screenY
+ lineDelete.left = event.screenX
+ lineDelete.showLineDelete = true
}
window.deletelineHeightShow = function (txt) {
- console.log(txt, 1)
- let list = scribeData.lineHeightList.filter((item) => item.selectText != txt)
- request({
- url: '/identity/api/ApiAppUserSetKey',
- method: 'post',
- data: {
- setKeyRequests: [
- {
- domain: 'highLight',
- key: '2358',
- value: JSON.stringify(list)
+ let lines = scribeData.lineHeightList.find((item) => item.selectText == txt)
+ lineDelete.deleteType = 'highLight'
+ lineDelete.deleteTxt = txt
+ lineDelete.top = event.screenY
+ lineDelete.left = event.screenX
+ lineDelete.showLineDelete = true
+}
+
+const lineDeleteBtn = () => {
+ if (lineDelete.deleteType == 'underline') {
+ let list = scribeData.scribeDataList.filter((item) => item.selectText != lineDelete.deleteTxt)
+ request({
+ url: '/identity/api/ApiAppUserSetKey',
+ method: 'post',
+ data: {
+ setKeyRequests: [
+ {
+ domain: 'underline',
+ key: bookId.value,
+ value: JSON.stringify(list)
+ }
+ ]
+ }
+ }).then((res) => {
+ lineDelete.showLineDelete = false
+ let list = document.querySelectorAll('.underline')
+ list.forEach((itemNode) => {
+ if (itemNode.innerText == lineDelete.deleteTxt) {
+ itemNode.removeAttribute('style')
+ itemNode.className = ''
+ itemNode.removeAttribute('onclick')
}
- ]
- }
- }).then((res) => {
- getlineHeightList()
- })
+ })
+ getScribeList()
+ })
+ } else if (lineDelete.deleteType == 'highLight') {
+ let list = scribeData.lineHeightList.filter((item) => item.selectText != lineDelete.deleteTxt)
+ request({
+ url: '/identity/api/ApiAppUserSetKey',
+ method: 'post',
+ data: {
+ setKeyRequests: [
+ {
+ domain: 'highLight',
+ key: bookId.value,
+ value: JSON.stringify(list)
+ }
+ ]
+ }
+ }).then((res) => {
+ lineDelete.showLineDelete = false
+ let list = document.querySelectorAll('.highLight')
+ list.forEach((itemNode) => {
+ if (itemNode.innerText == lineDelete.deleteTxt) {
+ itemNode.removeAttribute('style')
+ itemNode.className = ''
+ itemNode.removeAttribute('onclick')
+ }
+ })
+ getlineHeightList()
+ })
+ }
}
const jumpContent = (id) => {
@@ -2014,7 +2173,9 @@
dialogToolData.notesList.findIndex((itemData) => itemData.selectText == item.selectText),
1
)
+ selectNode.value = item.selectNode
selectText.value = item.selectText
+ selectPage.value = item.selectPage
colorActive.value = item.color
dialogToolData.chapter = item.chapter
formData.desc = item.note
@@ -2033,7 +2194,7 @@
setKeyRequests: [
{
domain: 'notes',
- key: '2358',
+ key: bookId.value,
value: JSON.stringify(list)
}
]
@@ -2043,11 +2204,43 @@
message: '鍒犻櫎绗旇鎴愬姛!',
type: 'success'
})
+ console.log(document.querySelectorAll('.notesline'))
+ let list = document.querySelectorAll('.notesline')
+ list.forEach((itemNode) => {
+ if (itemNode.innerText == item.selectText) {
+ console.log(itemNode.nextSibling)
+ itemNode.removeAttribute('style')
+ itemNode.nextSibling?.remove()
+ }
+ })
getNotesList()
})
}
}
+//鍒犻櫎鎴浘
+const deleteScreenshot = (item) => {
+ let list = screenshotList.value.filter((itemData) => itemData.imgUrl !== item.imgUrl)
+ request({
+ url: '/identity/api/ApiAppUserSetKey',
+ method: 'post',
+ data: {
+ setKeyRequests: [
+ {
+ domain: 'screenshot',
+ key: bookId.value,
+ value: JSON.stringify(list)
+ }
+ ]
+ }
+ }).then((res) => {
+ ElMessage({
+ message: '鍒犻櫎鎴浘鎴愬姛!',
+ type: 'success'
+ })
+ getScreenshotList()
+ })
+}
//鍐呭鍖哄煙椤堕儴鏄剧ず
const headerData = reactive({
@@ -2366,11 +2559,14 @@
padding: 10px 0;
align-items: center;
.resourceImg {
- width: 130px;
+ // width: 130px;
height: 80px;
background: #fff;
border-radius: 5px;
overflow: hidden;
+ display: flex;
+ align-items: center;
+ justify-content: center;
img {
height: 100%;
width: 100%;
@@ -2399,11 +2595,22 @@
.captureItem {
margin-bottom: 10px;
width: 46%;
+ position: relative;
.imgBox {
border: 1px solid #d8d8d8;
width: 100%;
height: 80px;
margin-bottom: 5px;
+ }
+ .deleteBox {
+ position: absolute;
+ top: 2px;
+ right: 2px;
+ width: 20px;
+ height: 20px;
+ background: rgba(44, 44, 44, 0.3);
+ text-align: center;
+ padding: 2px;
}
// .capture {
// width: 100%;
@@ -2729,45 +2936,44 @@
margin-right: 5px;
}
}
- .floatToolItem:hover ,.floatToolActive{
+ .floatToolItem:hover,
+ .floatToolActive {
background-color: #fff;
color: #0093ff;
}
}
-
-
- .brushBox{
+ .brushBox {
position: fixed;
left: 500px;
- bottom:20px;
+ bottom: 20px;
z-index: 99;
border-radius: 5px;
- background:#fff;
+ background: #fff;
// padding: 10px;
overflow: hidden;
- border:1px solid #0093FF;
- .toolList{
- display:flex;
+ border: 1px solid #0093ff;
+ .toolList {
+ display: flex;
justify-content: center;
align-items: center;
.floatToolItem {
- margin:10px;
- width:48px;
+ margin: 10px;
+ width: 48px;
border-radius: 5px;
- text-align:center;
- flex:1;
- .imgBox{
- height:22px;
- width:22px;
- text-align:center;
- margin:0 auto;
- margin-bottom:5px;
+ text-align: center;
+ flex: 1;
+ .imgBox {
+ height: 22px;
+ width: 22px;
+ text-align: center;
+ margin: 0 auto;
+ margin-bottom: 5px;
}
}
- .layOutTool{
- padding-left:15px;
- border-left:1px solid #E0E0E0
+ .layOutTool {
+ padding-left: 15px;
+ border-left: 1px solid #e0e0e0;
}
}
}
@@ -2775,7 +2981,6 @@
.dialogToolBox {
position: fixed;
z-index: 2;
-
.toolSelectBox {
height: 57px;
display: flex;
@@ -2836,6 +3041,14 @@
}
}
}
+.lineDeleteBox {
+ position: fixed;
+ z-index: 2;
+ border: 1px solid #0093ff;
+ padding: 20px 8px;
+ background: #fff;
+ border-radius: 5px;
+}
.wendabox {
width: 100%;
height: 700px;
@@ -2882,6 +3095,9 @@
.myNoteDialogs {
width: 500px !important;
}
+.screenshotDialog {
+ width: 400px !important;
+}
.noteColorSelectBox {
margin-top: 10px;
width: 190px;
--
Gitblit v1.9.1