Kaynağa Gözat

:art: 编辑框不再遮挡字典

Bhikkhu-Kosalla 5 yıl önce
ebeveyn
işleme
9e6e27f501

+ 1 - 1
app/article/index.php

@@ -235,7 +235,7 @@ require_once "../pcdl/html_head.php";
 	<div id="article_author"><?php echo $_local->gui->author; ?></div>
 </div>
 <div id="contents_view">
-	<div id="contents_div" style="padding: 0 1em;">
+	<div id="contents_div" style="padding: 0 1em 0 30px;">
 		<div id="contents">
 		<?php echo $_local->gui->loading; ?>...
 		</div>

+ 2 - 2
app/reader/index.php

@@ -172,7 +172,7 @@ require_once "../pcdl/html_head.php";
     position: absolute;
     margin-top: 7px;
     border-bottom: 3px solid var(--link-color);
-	left: 0;
+	margin-left: -60px;
 	font-family: 'Noto Sans', 'Noto Sans SC', 'Noto Sans TC','Padauk', Arial, Verdana;
 }
 
@@ -318,7 +318,7 @@ require_once "../pcdl/html_head.php";
 	<div id="article_author"><?php echo $_local->gui->author; ?></div>
 </div>
 <div id="contents_view">
-	<div id="contents_div" style="padding: 0 1em;">
+	<div id="contents_div" style="padding: 0 1em 0 30px;">
 		<div id="contents">
 		<?php echo $_local->gui->loading; ?>...
 		</div>

+ 21 - 0
app/studio/css/style.css

@@ -620,6 +620,27 @@ a:active {
   z-index: 52;
 }
 
+.right_edit_frame::after{
+  content: " ";
+  position: absolute;
+  bottom: 100%;
+  right:0;
+  margin-right: 8px;
+  border-width: 8px;
+  border-style: solid;
+  border-color: transparent transparent var(--tool-bg-color2) transparent;
+}
+.left_edit_frame::after{
+  content: " ";
+  position: absolute;
+  bottom: 100%;
+  left:0;
+  margin-left: 8px;
+  border-width: 8px;
+  border-style: solid;
+  border-color: transparent transparent var(--tool-bg-color2) transparent;
+}
+
 #modifywin p {
   margin: 0;
   padding: 0;

+ 1 - 1
app/studio/editor.php

@@ -615,7 +615,7 @@ foreach($plugin_list as $info){
 	
 	<!--逐词解析编辑窗口-->
 	<div id="modifyDiv">
-		<div id="modifywin">
+		<div id="modifywin" style="">
 			<div>
 				<ul id="id_select_modyfy_type" class="common-tab">
 					<li id="detail_li" class="common-tab_li_act" onclick="select_modyfy_type('modify_detaile','detail_li')"><?php echo $module_gui_str['editor']['1041'];?></li>

+ 58 - 37
app/studio/js/editor.js

@@ -219,7 +219,7 @@ function editor_windowsInit() {
 				case "channal":
 					g_channal = item[1];
 					break;
-			}			
+			}
 		}
 	}
 	checkCookie();
@@ -264,7 +264,7 @@ function editor_windowsInit() {
 			}
 			break;
 		case "openchannal":
-				editor_openChannal(g_book,g_para,g_channal);
+			editor_openChannal(g_book, g_para, g_channal);
 			break;
 		case "import":
 			if (g_filename.length > 0) {
@@ -3027,7 +3027,28 @@ function showModifyWin(sWordId) {
 		}
 		getBookMarkColor(g_currBookMarkColor);
 
+		//显示编辑窗口
 		eWin.style.display = "block";
+		//根据偏移量设置窗口位置
+		if ($("#wb" + sWordId).offset().left + $("#modifywin").outerWidth() < $(document.body).width() * 0.7) {
+			$("#modifywin").removeClass("right_edit_frame")
+			$("#modifywin").addClass("left_edit_frame")
+			$("#modifywin").css("margin-left", "0");
+
+			//$("#modifywin").style();
+			//$("#modifywin").css("margin-left", "8px");
+			//$("#modifywin::after").css("left", "0");
+			//$("#modifywin::after").style.left = "0";, "": "" }
+		} else {
+			let margin_change = $("#whead1_" + sWordId).outerWidth() - $("#modifywin").outerWidth();
+			$("#modifywin").removeClass("left_edit_frame")
+			$("#modifywin").addClass("right_edit_frame")
+			$("#modifywin").css("margin-left", margin_change + "px");
+			//$("#modifywin::after").css("margin-right", "8px");
+			//$("#modifywin::after").css("right", "0");
+			//$("#modifywin::after").style.right = "0";
+		}
+
 		var sDetail = "detail" + sWordId;
 		var eDetail = document.getElementById(sDetail);
 		eWord.insertBefore(eWin, eDetail);
@@ -3781,15 +3802,15 @@ function setHeadingInfo(id, objValue) {
 	}
 }
 
-function editor_openChannal(book,para,channal) {
+function editor_openChannal(book, para, channal) {
 	$.post(
 		"../doc/load_channal_para.php",
 		{
-			book:book,
-			para:para,
-			channal:channal,
+			book: book,
+			para: para,
+			channal: channal,
 		},
-		function(data) {
+		function (data) {
 			editor_parse_doc_xml(data);
 		}
 	);
@@ -3826,40 +3847,40 @@ function editor_openProject(strFileId, filetype) {
 }
 
 function editor_parse_doc_xml(xmlText) {
-			if (window.DOMParser) {
-				parser = new DOMParser();
-				gXmlBookData = parser.parseFromString(xmlText, "text/xml");
-			}
-			else { // Internet Explorer
+	if (window.DOMParser) {
+		parser = new DOMParser();
+		gXmlBookData = parser.parseFromString(xmlText, "text/xml");
+	}
+	else { // Internet Explorer
 
-				gXmlBookData = new ActiveXObject("Microsoft.XMLDOM");
-				gXmlBookData.async = "false";
-				gXmlBookData.loadXML(xmlText);
-			}
+		gXmlBookData = new ActiveXObject("Microsoft.XMLDOM");
+		gXmlBookData.async = "false";
+		gXmlBookData.loadXML(xmlText);
+	}
 
-			if (gXmlBookData == null) {
-				alert("error:can not load Project. xml obj is null.");
-				return;
-			}
+	if (gXmlBookData == null) {
+		alert("error:can not load Project. xml obj is null.");
+		return;
+	}
 
 
-			projectDataParse(gXmlBookData);
-			doc_file_info_get();
-			doc_info_change("accese_time", "");
-			//消息系统初始化
-			let msg_id = doc_head("msg_db_max_id");
-			if (msg_id != "" && !isNaN(msg_id)) {
-				msg_init(msg_id);
-			}
-			else {
-				msg_init(1);
-			}
-			updataDocParagraphList();
-			updataToc();
-			//渲染数据块
-			blockShow(0);
-			refreshResource()
-			editro_layout_loadStyle();
+	projectDataParse(gXmlBookData);
+	doc_file_info_get();
+	doc_info_change("accese_time", "");
+	//消息系统初始化
+	let msg_id = doc_head("msg_db_max_id");
+	if (msg_id != "" && !isNaN(msg_id)) {
+		msg_init(msg_id);
+	}
+	else {
+		msg_init(1);
+	}
+	updataDocParagraphList();
+	updataToc();
+	//渲染数据块
+	blockShow(0);
+	refreshResource()
+	editro_layout_loadStyle();
 }
 
 function editor_open_project_serverResponse() {