From 746a51d76ca615b98bf0a2883a1a3c1a2b63d414 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期五, 17 五月 2024 16:20:36 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/childHealth/view/content/index.vue | 199 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 177 insertions(+), 22 deletions(-)
diff --git a/src/books/childHealth/view/content/index.vue b/src/books/childHealth/view/content/index.vue
index 2cd253b..14d3a66 100644
--- a/src/books/childHealth/view/content/index.vue
+++ b/src/books/childHealth/view/content/index.vue
@@ -1,6 +1,12 @@
<template>
<div class="page-main" @scroll="throttledScrollHandler">
- <div class="page-content">
+ <div
+ class="page-content"
+ :style="{
+ fontSize: fontSize ? fontSize + 'px' : '16px',
+ transform: `scale(${pageZoom ? pageZoom : 1})`
+ }"
+ >
<pageHeader v-if="showCatalogList.indexOf(0) > -1"></pageHeader>
<chapterOne v-if="showCatalogList.indexOf(1) > -1"></chapterOne>
<chapterTwo v-if="showCatalogList.indexOf(2) > -1"></chapterTwo>
@@ -36,6 +42,7 @@
import chapterEleven from "./components/chapter011.vue";
import chapterTwelve from "./components/chapter012.vue";
import chapterThirteen from "./components/chapter013.vue";
+import NoteIcon from "@/assets/images/biji.png";
import _ from "lodash";
export default {
data() {
@@ -45,50 +52,102 @@
loadThreshold: 300, // 瑙﹀彂鍔犺浇闃堝��
throttleThreshold: 100, // 鑺傛祦闃堝��
previousScrollTop: 0,
- throttledScrollHandler: null
+ throttledScrollHandler: null,
+ observer: null
};
+ },
+ computed: {
+ fontSize() {
+ return this.$store.state.qiankun.fontSize;
+ },
+ pageZoom() {
+ return this.$store.state.qiankun.scale / 100;
+ }
},
watch: {
showCatalogList: {
- handler(newVal) {
- if (this.$store.state.qiankun && this.$store.state.qiankun.catalogChange) {
+ handler(newVal, oldVal) {
+ if (
+ this.$store.state.qiankun &&
+ this.$store.state.qiankun.catalogChange
+ ) {
// 璋冪敤鐖跺眰鏂规硶
this.$store.state.qiankun.catalogChange({
showCatalogList: newVal
});
}
+ // 鍚姩椤电爜瑙傚療
+ setTimeout(() => {
+ this.initObservation();
+ }, 500);
}
}
},
mounted() {
// 榛樿鍔犺浇绔犺妭
- this.showCatalogList = [0];
+ this.showCatalogList = [3];
// 婊氬姩鐩戝惉鑺傛祦
this.throttledScrollHandler = _.throttle(
this.scrollFun,
this.throttleThreshold,
{ leading: true, trailing: false }
);
- // 鎻愪緵椤甸潰璺宠浆鍔熻兘
+ // 瀹氫箟瀛愬眰鏂规硶
if (this.setGlobalState) {
- // 瀹氫箟瀛愬眰鏂规硶
+ // 鎻愪緵椤甸潰璺宠浆鍔熻兘
this.setGlobalState({
gotoPage: (catalog, page) => {
- console.log(catalog, page, "gotoPage锛歝atalog, page");
this.gotoPage(catalog, page);
+ },
+ // 娓叉煋绗旇銆侀珮浜�佸垝绾�
+ renderSign: (type, data) => {
+ this.renderSign(type, data);
+ },
+ // 鍒犻櫎绗旇銆侀珮浜�佸垝绾�
+ delSign: (data) => {
+ this.delSign(data);
}
});
}
+ // 鍒涘缓涓�涓柊鐨� Intersection Observer 瀹炰緥锛岀敤浜庤瀵熺洰鏍囧厓绱犲拰鎵ц鐩稿簲鐨勫洖璋冨嚱鏁般��
+ // new IntersectionObserver(callback, options)锛氫娇鐢ㄤ箣鍓嶅畾涔夌殑 callback 鍥炶皟鍑芥暟鍜� options 閰嶇疆閫夐」鏉ュ垵濮嬪寲 Intersection Observer 瀹炰緥銆�
+ this.observer = new IntersectionObserver(this.pageChangeCallback, {
+ root: null, // 鎸囧畾鏍瑰厓绱狅紝杩欓噷璁句负 null锛岃〃绀洪�夊彇鏁翠釜瑙嗙獥浣滀负鏍瑰厓绱犮��
+ rootMargin: "0px", // 鎸囧畾鏍瑰厓绱犵殑杈圭晫锛岃繖閲岃涓� "0px"锛岃〃绀烘牴鍏冪礌鐨勮竟鐣屽拰瑙嗙獥鐨勮竟鐣岄噸鍚�
+ threshold: 0.5 // 鎸囧畾浜ゅ弶姣斾緥锛岃繖閲岃涓� 0.5锛岃〃绀哄綋鐩爣鍏冪礌涓�鍗婃垨鏇村鏄剧ず鍦ㄨ绐椾腑鏃惰Е鍙戝洖璋冨嚱鏁般��
+ });
+
+ // 鍚姩椤电爜瑙傚療
+ setTimeout(() => {
+ this.initObservation();
+ }, 500);
+
// 娴嬭瘯椤甸潰璺宠浆
// 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);
},
methods: {
- scrollFun(e) {
+ // 婊氬姩鐩戝惉
+ scrollFun(event) {
// 鍒ゆ柇鍚戜笂婊氬姩杩樻槸鍚戜笅婊氬姩
if (event.target.scrollTop > this.previousScrollTop) {
+ // 鍚戜笅
const currentScrollTop =
event.target.scrollTop + event.target.offsetHeight;
if (
@@ -111,6 +170,7 @@
}
}
} else if (event.target.scrollTop < this.previousScrollTop) {
+ // 鍚戜笂
const currentScrollTop = event.target.scrollTop;
if (currentScrollTop <= this.loadThreshold) {
// 鍒拌揪闃堝��
@@ -127,16 +187,8 @@
// showCatalogList 褰撳墠鏄剧ず鐨勪笁涓珷鑺傦紝watch鐩戝惉浼犻�掔粰涓诲簲鐢�
// 鏇存柊涓婁竴娆℃粴鍔ㄧ殑浣嶇疆
this.previousScrollTop = event.target.scrollTop;
-
- // 杩斿洖椤电爜鍜岀珷鑺備俊鎭�
- if (this.$store.state.qiankun && this.$store.state.qiankun.pageChange)
- this.$store.state.qiankun.pageChange({
- page: 100,
- catalog: 5,
- catalogId: "",
- catalogName: ""
- });
},
+ // 绔犺妭銆侀〉闈㈣烦杞�
gotoPage(catalog, page) {
if (catalog >= 0 && catalog <= this.catalogLength) {
// 澶勭悊娓叉煋绔犺妭
@@ -152,19 +204,122 @@
this.showCatalogList = [catalog - 1, catalog, catalog + 1];
}
setTimeout(() => {
- console.log(document);
- console.log(document.querySelector(`[page="${page}"]`));
// 璺宠浆椤电爜
- const pageDom = document.querySelector(`[page="${page}"]`);
+ const pageDom = (
+ this.container ? this.container : document
+ ).querySelector(`[page="${page}"]`);
if (pageDom) {
pageDom.scrollIntoView();
} else {
console.log("椤电爜閿欒锛�");
}
- }, 100);
+ }, 500);
} else {
console.log("绔犺妭閿欒锛�");
}
+ },
+ // 娓叉煋鏍囪
+ renderSign(type, data) {
+ const existence = (
+ this.container ? this.container : document
+ ).querySelector(`[dataid="${data.id}"]`);
+ // 鍘婚噸
+ if (!existence) {
+ 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}')">${data.txt}<img src="${NoteIcon}" style="cursor: pointer" /></span>`
+ );
+ break;
+ }
+ }
+ },
+ // 鍒犻櫎鏍囪娓叉煋
+ delSign({ ids, type }) {
+ if (ids && ids.length) {
+ for (let i = 0; i < ids.length; i++) {
+ const id = ids[i];
+ const dom = (
+ this.container ? this.container : document
+ ).querySelector(`[dataid="${id}"]`);
+ dom.parentNode.innerHTML = dom.parentNode.innerHTML.replace(
+ dom.outerHTML,
+ dom.outerText
+ );
+ }
+ }
+ if (type) {
+ const doms = (
+ this.container ? this.container : document
+ ).querySelectorAll(`[datatype="${type}"]`);
+ for (let i = 0; i < doms.length; i++) {
+ const dom = doms[i];
+ dom.parentNode.innerHTML = dom.parentNode.innerHTML.replace(
+ dom.outerHTML,
+ dom.outerText
+ );
+ }
+ }
+ },
+ initObservation() {
+ const sections = (
+ this.container ? this.container : document
+ ).querySelectorAll(".page-box");
+ //observer 瑙傚療姣忎釜鍏冪礌锛屼互渚垮湪瀹冧滑杩涘叆鎴栫寮�瑙嗙獥鏃惰Е鍙戝洖璋冨嚱鏁般��
+ sections.forEach((section) => {
+ const isObserver = section.getAttribute("observer");
+ if (!isObserver) {
+ this.observer.observe(section);
+ section.setAttribute("observer", "1");
+ }
+ });
+ },
+ pageChangeCallback(entries, observer) {
+ //entries锛氫唬琛ㄨ瀵熷埌鐨勭洰鏍囧厓绱犵殑闆嗗悎銆� observer锛氫唬琛ㄨ瀵熻�呭璞°��
+ entries.forEach((entry) => {
+ //entry.isIntersecting锛氭鏌ュ綋鍓嶇洰鏍囧厓绱犳槸鍚︿笌鏍瑰厓绱犵浉浜ゃ��
+ if (entry.isIntersecting) {
+ const target = entry.target;
+ //entry.target锛氳幏鍙栧綋鍓嶇洰鏍囧厓绱�
+ const page = target.getAttribute("page");
+ const catalogDom = this.tool.getParentNodeByClassName(
+ target,
+ "chapter"
+ );
+ const catalog = catalogDom.getAttribute("num");
+ console.log("page", page, catalog);
+ // 杩斿洖椤电爜鍜岀珷鑺備俊鎭�
+ if (this.$store.state.qiankun && this.$store.state.qiankun.pageChange)
+ this.$store.state.qiankun.pageChange({
+ page: page,
+ catalog: catalog
+ });
+ // const sections = Array.from(document.querySelectorAll(".section"));
+ //sections锛氳幏鍙栨墍鏈夊叿鏈� .section 绫诲悕鐨勫厓绱狅紝骞惰浆鎹负鏁扮粍銆�
+ // let index = sections.findIndex((section) => section === target) + 1;
+ //index锛氭煡鎵惧綋鍓嶇洰鏍囧厓绱犲湪 sections 鏁扮粍涓殑绱㈠紩锛屽苟鍔� 1锛岀敤浜庣‘瀹氬綋鍓嶉〉鐮併��
+ }
+ });
}
},
components: {
--
Gitblit v1.9.1