增加 article 阅读器 输入参数，增加 _view

app/article/article.js

@@ -1,11 +1,11 @@
 //import {Like,LikeRefresh} from '../widget/like.js';
 var _view = "";
+var _id = "";
 var _articel_id = "";
 var _channal = "";
 var _lang = "";
 var _author = "";
 var _display = "";
-var _collect_id = "";
 var _collection_id = "";
 
 function article_onload() {
@@ -106,9 +106,9 @@ function articel_load_article_list(articleId,collectionId) {
 					if (result) {
 						let article_list = JSON.parse(result.article_list);
 						render_article_list(article_list,collectionId,articleId);
-						let strTitle = "<a href='../article/?collection=" + result.id + "'>" + result.title + "</a> / ";
+						let strTitle = "<a href='../article/?view=collection&collection=" + result.id + "'>" + result.title + "</a> / ";
 						for (const iterator of tocActivePath) {
-							strTitle += "<a href='../article/?id="+iterator.key+"&collection=" + result.id + "'>" + iterator.title + "</a> / ";
+							strTitle += "<a href='../article/?view=article&id="+iterator.key+"&collection=" + result.id + "'>" + iterator.title + "</a> / ";
 						}
 						$("#article_path").html(strTitle);						
 					}
@@ -145,7 +145,7 @@ function render_article_list_in_content(article_list,collectId="",articleId="")
 	});
 }
 function set_channal(channalid) {
-	let url = "../article/index.php?id=" + _articel_id;
+	let url = "../article/index.php?view=article&id=" + _articel_id;
 	if (_collection_id != "") {
 		url += "&collection=" + _collection_id;
 	}
@@ -164,7 +164,7 @@ function set_channal(channalid) {
 	location.assign(url);
 }
 function setMode(mode = "read") {
-	let url = "../article/index.php?id=" + _articel_id;
+	let url = "../article/index.php?view=article&id=" + _articel_id;
 	if (_collection_id != "") {
 		url += "&collection=" + _collection_id;
 	}
@@ -188,7 +188,7 @@ function setMode(mode = "read") {
 }
 //跳转到另外一个文章
 function gotoArticle(articleId) {
-	let url = "../article/index.php?id=" + articleId;
+	let url = "../article/index.php?view=article&id=" + articleId;
 	if (_collection_id != "") {
 		url += "&collection=" + _collection_id;
 	}

app/article/index.php

@@ -21,6 +21,13 @@ require_once "../pcdl/html_head.php";
 	$_channal  = "";
 	$_collect = "";
 
+	if(isset($_GET["view"])){
+		echo "_view='".$_GET["view"]."';";
+	}
+	else{
+		echo "_view='article';";
+	}
+
 	if(isset($_GET["id"])){
 		echo "_articel_id='".$_GET["id"]."';";
 	}
@@ -34,6 +41,9 @@ require_once "../pcdl/html_head.php";
 	if(isset($_GET["channal"])){
 		echo "_channal='".$_GET["channal"]."';";
 	}
+	if(isset($_GET["channel"])){
+		echo "_channal='".$_GET["channel"]."';";
+	}
 	if(isset($_GET["lang"])){
 		echo "_lang='".$_GET["lang"]."';";
 	}
@@ -231,15 +241,38 @@ span.fancytree-node{
 	click_dropdown_init();
 	note_create();
 	historay_init();
-	if(_articel_id==""){
-		collect_load(_collection_id);
-	}
-	else{
-		articel_load(_articel_id,_collection_id);
-		if(_collection_id!=""){
-			articel_load_article_list(_articel_id,_collection_id);
-		}
+	switch (_view) {
+		case "article":
+			articel_load(_articel_id,_collection_id);
+			if(_collection_id!=""){
+				articel_load_article_list(_articel_id,_collection_id);
+			}
+			break;
+		case "collection":
+			collect_load(_collection_id);
+		break;
+		case "sent":
+		
+		break;
+		case "simsent":
+		
+		break;
+		case "para":
+		
+		break;
+		case "chapter":
+		
+		break;
+		case "book":
+		
+		break;
+		case "series":
+		
+		break;
+		default:
+			break;
 	}
+
 	});
 
 	 window.addEventListener('scroll',winScroll);

app/article/my_article.js

@@ -43,7 +43,7 @@ function my_article_list() {
 						html += "<div style='flex:2;'>" + render_status(iterator.status) + "</div>";
 						
 						html += "<div style='flex:1;'>";
-						html += "<a href='../article/?id=" + iterator.id + "' target='_blank' title='" + gLocal.gui.preview + "' >";
+						html += "<a href='../article/?view=article&id=" + iterator.id + "' target='_blank' title='" + gLocal.gui.preview + "' >";
 						html += "<button class='icon_btn'>";
 						html += "<svg class='icon'>";
 						html += "<use xlink:href='../studio/svg/icon.svg#preview'></use>";

app/article/my_article_edit.php

@@ -126,7 +126,7 @@ require_once '../studio/index_head.php';
 				<span class="icon_btn_div">
 					<span class="icon_btn_tip"><?php echo $_local->gui->scan_in_reader ;?></span>
 					<button type="button" class="icon_btn" >
-						<a href="../article/index.php?id=<?php echo $_GET["id"];?>" target="_blank">
+						<a href="../article/index.php?view=article&id=<?php echo $_GET["id"];?>" target="_blank">
 							<svg class="icon">
 								<use xlink:href="../studio/svg/icon.svg#library"></use>
 							</svg>

app/article/my_collect.js

@@ -30,7 +30,7 @@ function my_collect_list() {
 						html += "<div style='flex:2;'>" + render_status(iterator.status) + "</div>";
 						//html += "<div style='flex:1;'>" + gLocal.gui.copy_link + "</div>";
 						html += "<div style='flex:1;'>";
-						html += "<a href='../article/?collect=" + iterator.id + "' target='_blank'>" + gLocal.gui.preview + "</a>";
+						html += "<a href='../article/?view=collection&collection=" + iterator.id + "' target='_blank'>" + gLocal.gui.preview + "</a>";
 						html += "</div>";
 						html += "<div style='flex:1;'>";
 						html += "<a onclick=\"collection_share('" + iterator.id + "')\">"+gLocal.gui.share+"</a>";
@@ -139,7 +139,7 @@ function my_collect_edit(id) {
 						source: tocGetTreeData(_arrArticleList),
 						click: function(e, data) {
 							if( e.ctrlKey ){
-							  window.open("../article/?id="+data.node.key,"_blank");
+							  window.open("../article/?view=article&id="+data.node.key,"_blank");
 							  return false;
 							}
 						  },

app/collect/index.js

@@ -11,7 +11,7 @@ function collect_load(begin = 0) {
                 html += "<div class='card_state'>" + gLocal.gui.ongoing + "</div>";
                 html += "<div class='card_info'>"; //卡片信息开始
                 html += "<div class='collect_title'>";
-                html += "<a href='../article/?collect=" + iterator.id + "'>" + iterator.title + "</a>";
+                html += "<a href='../article/?view=collection&collection=" + iterator.id + "'>" + iterator.title + "</a>";
                 html += "</div>";
 
                 if (iterator.subtitle && iterator.subtitle != "null") {
@@ -41,7 +41,7 @@ function collect_load(begin = 0) {
                     html += "<div style='padding:6px 0; border-top: #707070 1px solid;'>";
                     html += "<a class='article_title'";
 					html +=" style='color:var(--main_color);font-weight:700;'";
-					html +=" href='../article/?id=" + article.article +"&collection="+iterator.id+"' target='_blank'>" ;
+					html +=" href='../article/?view=article&id=" + article.article +"&collection="+iterator.id+"' target='_blank'>" ;
 					html += article.title ;
 					html += "</a>";
                     html += "</div>";

app/group/group.js

@@ -161,7 +161,7 @@ function group_list(id, list) {
 								case 3: //article
 									html += "<use xlink:href='../studio/svg/icon.svg#article_1'></use>";
 									cardUrl = "../article/card.php";
-									viewLink = "<a href='../article/?id=" + iterator.res_id + "' target='_blank'>";
+									viewLink = "<a href='../article/?view=article&id=" + iterator.res_id + "' target='_blank'>";
 									doing +=
 										"<a href='../article/my_article_edit.php?id=" +
 										iterator.res_id +
@@ -170,7 +170,7 @@ function group_list(id, list) {
 								case 4: //collection
 									html += "<use xlink:href='../studio/svg/icon.svg#collection'></use>";
 									cardUrl = "../collect/card.php";
-									viewLink ="<a href='../article/?collection=" + iterator.res_id + "' target='_blank'>";
+									viewLink ="<a href='../article/?view=collection&collection=" + iterator.res_id + "' target='_blank'>";
 									doing +=
 										"<a href='../article/my_collect_edit.php?id=" +
 										iterator.res_id +

app/pcdl/index.js

@@ -28,13 +28,13 @@ function index_load_collect_new() {
 				gLocal.gui.ongoing + "</div>";
 
 				html += "<div class='title'>";
-				html += "<a href='../article/?id=" + iterator.id + "'>" + iterator.title + "</a>";
+				html += "<a href='../article/?view=article&id=" + iterator.id + "'>" + iterator.title + "</a>";
 				html += "</div>";
 
 				html += "<div class='collect'>";
 				if (iterator.collect) {
 					html +=
-						"<a href='../article/?collect=" + iterator.collect.id + "'>" + iterator.collect.title + "</a>";
+						"<a href='../article/?view=collection&collection=" + iterator.collect.id + "'>" + iterator.collect.title + "</a>";
 				} else {
 					html += "unkow";
 				}

app/public/js/comm.js

@@ -267,7 +267,7 @@ function testCJK(string){
 	U+3131－U+318E,
 	U+FFA1－U+FFDC
 
-	\u0800-\u4e00 (日文)ひらがな平仮名
+	\u3040-\u309f (日文)ひらがな平仮名
 	U+4E00–U+9FBF 汉字; U+3040–U+309F 平假名; U+30A0–U+30FF 片假名
 	*/
 	reg = /[\u4e00-\u9fa5]+/;//cn