From 3002c5f4593c91cbd5dd8bc684c3800eff9ab122 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期三, 29 五月 2024 21:58:20 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/lifeCare/index.vue | 293 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 192 insertions(+), 101 deletions(-)
diff --git a/src/books/lifeCare/index.vue b/src/books/lifeCare/index.vue
index 1329af6..4dd6659 100644
--- a/src/books/lifeCare/index.vue
+++ b/src/books/lifeCare/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="page-main" @scroll="throttledScrollHandler">
<div
- class="public-lifCare"
+ class="public-lifeCare"
@mouseup="handleMouseUp"
:style="{
fontSize: fontSize ? fontSize + 'px' : '16px',
@@ -135,6 +135,7 @@
loadPageObserver: null,
loadPageList: [],
questionData: {},
+ renderSignMap: {}
};
},
computed: {
@@ -167,12 +168,21 @@
this.initObservation();
this.initThemeColor();
}, 500);
- },
+ }
},
+ loadPageList: {
+ handler(newVal, oldVal) {
+ console.log(newVal, "this.loadPageList");
+ setTimeout(() => {
+ this.initSwiper();
+ this.initViewer();
+ }, 200);
+ }
+ }
},
mounted() {
// 榛樿鍔犺浇绔犺妭
- this.showCatalogList = [11];
+ this.showCatalogList = [1];
// 婊氬姩鐩戝惉鑺傛祦
this.throttledScrollHandler = _.throttle(
this.scrollFun,
@@ -219,75 +229,24 @@
// 娴嬭瘯椤甸潰璺宠浆
// setTimeout(() => {
- // this.gotoPage(5, 100);
- // setTimeout(() => {
- // this.renderSign("Note", {
- // id: "2ACA9359",
- // txt: "钀ュ吇绱犲拰鐑噺锛屾墠鑳�",
- // page: "100",
- // type: "Highlight",
- // color: "#F5E12A"
- // });
- // setTimeout(() => {
- // this.delSign({
- // ids: ["2ACA9359"]
- // });
- // }, 2000);
- // }, 1000);
- // }, 3000);
+ // this.gotoPage(1, 15);
+ // setTimeout(() => {
+ // this.renderSign("Note", {
+ // id: "2ACA9359",
+ // txt: "钀ュ吇绱犲拰鐑噺锛屾墠鑳�",
+ // page: "100",
+ // type: "Highlight",
+ // color: "#F5E12A"
+ // });
+ // setTimeout(() => {
+ // this.delSign({
+ // ids: ["2ACA9359"]
+ // });
+ // }, 2000);
+ // }, 1000);
+ // }, 1000);
},
methods: {
- getParentWithClass(element, className) {
- while (element.parentElement) {
- element = element.parentElement;
- if (element.classList.contains(className)) {
- return element;
- }
- }
- },
- handleMouseUp(e) {
- const selection = (
- this.container ? this.container : window
- ).getSelection();
- const txt = selection.toString();
- if (selection.type != "none" && txt) {
- // eslint-disable-next-line no-unused-vars
- let node = selection.anchorNode.parentNode;
- let pageHtml = this.getParentWithClass(
- selection.anchorNode,
- "page-box"
- );
- let chapterDom = this.getParentWithClass(
- selection.anchorNode,
- "chapter"
- );
- let chapterNum;
- if (chapterDom) chapterNum = chapterDom.getAttribute("num");
- if (pageHtml) {
- const page = pageHtml.getAttribute("page");
- // 鐩戝惉閫変腑鏂囨湰浜嬩欢锛屽苟瑙﹀彂鐖跺眰鏂规硶
- if (this.$store.state.qiankun.windowSelection) {
- this.$store.state.qiankun.windowSelection({
- chapterNum,
- txt,
- page,
- x: e.x,
- y: e.y,
- });
- }
- }
- } else {
- if (this.$store.state.qiankun.windowSelection) {
- this.$store.state.qiankun.windowSelection({
- chapterNum: "",
- txt: "",
- page: "",
- x: e.x,
- y: e.y,
- });
- }
- }
- },
// 婊氬姩鐩戝惉
scrollFun(event) {
// 鍒ゆ柇鍚戜笂婊氬姩杩樻槸鍚戜笅婊氬姩
@@ -343,7 +302,7 @@
this.showCatalogList = [
this.catalogLength - 2,
this.catalogLength - 1,
- this.catalogLength,
+ this.catalogLength
];
} else {
this.showCatalogList = [catalog - 1, catalog, catalog + 1];
@@ -364,6 +323,14 @@
}
},
+ // 澶勭悊鏍囪鏁版嵁
+ handelSignData(type, data) {
+ if (!this.renderSignMap[type]) this.renderSignMap[type] = {};
+ if (!this.renderSignMap[type][data.page])
+ this.renderSignMap[type][data.page] = [];
+ this.renderSignMap[type][data.page].push(data);
+ },
+
// 娓叉煋鏍囪
renderSign(type, data) {
const existence = (
@@ -374,29 +341,48 @@
const pageDom = (
this.container ? this.container : document
).querySelector(`[page="${data.page}"]`);
- let reg = new RegExp(`${data.txt}`, "ig");
- switch (type) {
- case "Highlight":
- // 楂樹寒
- pageDom.innerHTML = pageDom.innerHTML.replace(
- reg,
- `<span datatype="Highlight" dataid="${data.id}" style="background: ${data.color};" class="highLight" onclick="signClick('Highlight','${data.id}','${data.chapterNum}')">${data.txt}</span>`
- );
- break;
- case "Dashing":
- // 鍒掔嚎
- pageDom.innerHTML = pageDom.innerHTML.replace(
- reg,
- `<span datatype="Dashing" dataid="${data.id}" style="text-decoration-color:${data.color};" class="underline" onclick="signClick('Dashing','${data.id}','${data.chapterNum}')">${data.txt}</span>`
- );
- break;
- case "Note":
- // 绗旇
- pageDom.innerHTML = pageDom.innerHTML.replace(
- reg,
- `<span datatype="Note" dataid="${data.id}" style="border-bottom-color:${data.color}" class="notesline" onclick="signClick('Note','${data.id}','${data.chapterNum}')" onmouseover="noteHover('Note','${data.id}','${data.chapterNum}')" onmouseout="noteOut">${data.txt}<img src="${NoteIcon}"/></span>`
- );
- break;
+ // 鍒涘缓 createTreeWalker 杩唬鍣紝鐢ㄤ簬閬嶅巻鏂囨湰鑺傜偣锛屼繚瀛樺埌涓�涓暟缁�
+ const treeWalker = document.createTreeWalker(
+ pageDom,
+ NodeFilter.SHOW_TEXT
+ );
+ const allTextNodes = [];
+ let currentNode = treeWalker.nextNode();
+ while (currentNode) {
+ allTextNodes.push(currentNode);
+ currentNode = treeWalker.nextNode();
+ }
+ for (let i = 0; i < allTextNodes.length; i++) {
+ const textDom = allTextNodes[i];
+ if (textDom.textContent.indexOf(data.txt) > -1) {
+ let reg = new RegExp(`${data.txt}`, "ig");
+ switch (type) {
+ case "Highlight":
+ // 楂樹寒
+ textDom.parentNode.innerHTML =
+ textDom.parentNode.innerHTML.replace(
+ reg,
+ `<span datatype="Highlight" dataid="${data.id}" style="background: ${data.color};" class="highLight" onclick="signClick('Highlight','${data.id}','${data.chapterNum}')">${data.txt}</span>`
+ );
+ break;
+ case "Dashing":
+ // 鍒掔嚎
+ textDom.parentNode.innerHTML =
+ textDom.parentNode.innerHTML.replace(
+ reg,
+ `<span datatype="Dashing" dataid="${data.id}" style="text-decoration-color:${data.color};" class="underline" onclick="signClick('Dashing','${data.id}','${data.chapterNum}')">${data.txt}</span>`
+ );
+ break;
+ case "Note":
+ // 绗旇
+ textDom.parentNode.innerHTML =
+ textDom.parentNode.innerHTML.replace(
+ reg,
+ `<span datatype="Note" dataid="${data.id}" style="border-bottom-color:${data.color}" class="notesline" onclick="signClick('Note','${data.id}','${data.chapterNum}')" onmouseover="noteHover('Note','${data.id}','${data.chapterNum}')" onmouseout="noteOut('Note')">${data.txt}<img src="${NoteIcon}"/></span>`
+ );
+ break;
+ }
+ }
}
}
},
@@ -442,7 +428,7 @@
return false;
}
}
- //observer 瑙傚療姣忎釜鍏冪礌锛屼互渚垮湪瀹冧滑杩涘叆鎴栫寮�瑙嗙獥鏃惰Е鍙戝洖璋冨嚱鏁般��
+ // observer 瑙傚療姣忎釜鍏冪礌锛屼互渚垮湪瀹冧滑杩涘叆鎴栫寮�瑙嗙獥鏃惰Е鍙戝洖璋冨嚱鏁般��
const isObserver = section.getAttribute("observer");
const isLoadObserver = section.getAttribute("loadObserver");
if (!isObserver) {
@@ -555,12 +541,16 @@
"chapter"
);
const catalog = catalogDom.getAttribute("num");
- console.log(page, "page", catalog, "catalog");
+ let text = null;
+ if (target.querySelector("p")) {
+ text = target.querySelector("p").textContent.substring(0, 20);
+ }
// 杩斿洖椤电爜鍜岀珷鑺備俊鎭�
if (this.$store.state.qiankun && this.$store.state.qiankun.pageChange)
this.$store.state.qiankun.pageChange({
page: page,
catalog: catalog,
+ text
});
// const sections = Array.from(document.querySelectorAll(".section"));
//sections锛氳幏鍙栨墍鏈夊叿鏈� .section 绫诲悕鐨勫厓绱狅紝骞惰浆鎹负鏁扮粍銆�
@@ -574,8 +564,7 @@
if (entry.isIntersecting) {
const target = entry.target;
const page = target.getAttribute("page");
- if (this.loadPageList.indexOf(page) == -1) {
- //
+ if (this.loadPageList.indexOf(Number(page)) == -1) {
const catalogDom = this.tool.getParentNodeByClassName(
target,
"chapter"
@@ -586,7 +575,7 @@
if (testData[catalog][page]) {
if (Array.isArray(testData[catalog][page])) {
this.questionData[page] = await getQuestionList(
- [],
+ page,
testData[catalog][page],
this.config.activeBook
);
@@ -604,7 +593,16 @@
}
}
}
+ // 娣诲姞椤电爜
this.loadPageList.push(Number(page));
+ // 娓叉煋杩欎竴椤电殑鏍囪
+ for (const key in this.renderSignMap) {
+ if (this.renderSignMap[key][page]) {
+ this.renderSignMap[key][page].forEach((item) => {
+ this.renderSign(key, item);
+ });
+ }
+ }
if (this.loadPageList.length > 5) {
// 瓒呰繃5椤�
this.loadPageList.shift();
@@ -613,8 +611,101 @@
}
});
},
- changeQuestionData(page, data) {
- this.$props.questionData[page] = data;
+ initSwiper() {
+ const doms = (
+ this.container ? this.container : document
+ ).querySelectorAll(".swiper-container");
+ for (let i = 0; i < doms.length; i++) {
+ const dom = doms[i];
+ new Swiper(dom, {
+ loop: false, // 鏃犵紳
+ autoplay: {
+ //鑷姩寮�濮�
+ delay: 3000, //鏃堕棿闂撮殧
+ disableOnInteraction: false //*鎵嬪姩鎿嶄綔杞挱鍥惧悗涓嶄細鏆傚仠*
+ },
+ paginationClickable: true,
+ slidesPerView: 1, // 涓�缁勪笁涓�
+ spaceBetween: 30, // 闂撮殧
+ // 濡傛灉闇�瑕佸墠杩涘悗閫�鎸夐挳
+ navigation: {
+ nextEl: ".swiper-button-next",
+ prevEl: ".swiper-button-prev"
+ },
+ // 绐楀彛鍙樺寲,閲嶆柊init,閽堝F11鍏ㄥ睆鍜屾斁澶х缉灏�,蹇呴』鍔�
+ observer: true,
+ observeParents: true,
+ // // 濡傛灉闇�瑕佸垎椤靛櫒
+ // pagination: {
+ // el: ".swiper-pagination",
+ // clickable: true // 鍒嗛〉鍣ㄥ彲浠ョ偣鍑�
+ // }
+ });
+ }
+ },
+ initViewer() {
+ const doms = (
+ this.container ? this.container : document
+ ).querySelectorAll(".openImgBox");
+ for (let i = 0; i < doms.length; i++) {
+ const dom = doms[i];
+ new Viewer(dom, {
+ navbar: true, // 鏄剧ず瀵艰埅鏍�
+ toolbar: true, // 鏄剧ず宸ュ叿鏍�
+ title: true // 鏄剧ず鏍囬
+ });
+ }
+ },
+ // eslint-disable-next-line
+ getParentWithClass(element, className) {
+ while (element.parentElement) {
+ element = element.parentElement;
+ if (element.classList.contains(className)) {
+ return element;
+ }
+ }
+ },
+ handleMouseUp(e) {
+ const selection = (
+ this.container ? this.container : window
+ ).getSelection();
+ const txt = selection.toString();
+ if (selection.type != "none" && txt) {
+ let node = selection.anchorNode.parentNode;
+ let pageHtml = this.getParentWithClass(
+ selection.anchorNode,
+ "page-box"
+ );
+ let chapterDom = this.getParentWithClass(
+ selection.anchorNode,
+ "chapter"
+ );
+ let chapterNum;
+ if (chapterDom) chapterNum = chapterDom.getAttribute("num");
+ if (pageHtml) {
+ const page = pageHtml.getAttribute("page");
+ // 鐩戝惉閫変腑鏂囨湰浜嬩欢锛屽苟瑙﹀彂鐖跺眰鏂规硶
+ if (this.$store.state.qiankun.windowSelection) {
+ this.$store.state.qiankun.windowSelection({
+ chapterNum,
+ txt,
+ page,
+ x: e.x,
+ y: e.y,
+ });
+ }
+ }
+ } else {
+ if (this.$store.state.qiankun.windowSelection) {
+ this.$store.state.qiankun.windowSelection({
+ chapterNum: "",
+ txt: "",
+ page: "",
+ x: e.x,
+ y: e.y,
+ });
+ }
+ }
},
},
components: {
--
Gitblit v1.9.1