推送单句

app/commit/commit.js

@@ -33,19 +33,21 @@ function commit_render_channel_select() {
 		}
 	}
 	for (const iterator of _my_channal) {
-		html += "<option value='" + iterator.id + "' ";
-		if (_commit_data.src == iterator.id) {
-			html += " selected ";
-		}
-		html += ">" + iterator.name + "-";
-		if (iterator.power >= 30) {
-			html += gLocal.gui.your;
-		} else if (iterator.power >= 20) {
-			html += "可编辑";
-		} else {
-			html += "只读";
+		if (iterator.status > 0) {
+			html += "<option value='" + iterator.id + "' ";
+			if (_commit_data.src == iterator.id) {
+				html += " selected ";
+			}
+			html += ">" + iterator.name + "-";
+			if (iterator.power >= 30) {
+				html += gLocal.gui.your;
+			} else if (iterator.power >= 20) {
+				html += "可编辑";
+			} else {
+				html += "只读";
+			}
+			html += "</option>";
 		}
-		html += "</option>";
 	}
 	html += "</select>";
 
@@ -62,28 +64,41 @@ function commit_render_channel_select() {
 		}
 	}
 	for (const iterator of _my_channal) {
-		html += "<option value='" + iterator.id + "' ";
-		if (_commit_data.dest == iterator.id) {
-			html += " selected ";
-		}
-		if (typeof _commit_data.src != "undefined" && _commit_data.src == iterator.id) {
-			html += "style:'display:none;' ";
-		}
-		html += " >" + iterator.name + "-";
-		if (iterator.power >= 30) {
-			html += gLocal.gui.your;
-		} else if (iterator.power >= 20) {
-			html += "可编辑";
-		} else {
-			html += "只读";
+		if (iterator.status > 0) {
+			html += "<option value='" + iterator.id + "' ";
+			if (_commit_data.dest == iterator.id) {
+				html += " selected ";
+			}
+			if (typeof _commit_data.src != "undefined" && _commit_data.src == iterator.id) {
+				html += "style:'display:none;' ";
+			}
+			html += " >" + iterator.name + "-";
+			if (iterator.power >= 30) {
+				html += gLocal.gui.your;
+			} else if (iterator.power >= 20) {
+				html += "可编辑";
+			} else if (iterator.power >= 10) {
+				html += "只读";
+			} else {
+				html += "停用";
+			}
+			html += "</option>";
 		}
-		html += "</option>";
 	}
 	html += "</select>";
 	html += "</div>";
 
 	html += "<div id='commit_preview'>";
-	html += "<button onclick='previewWin.show(commit_preview_render())'>文本比对</button>";
+	if (typeof _commit_data.express != "undefined" && _commit_data.express == true) {
+		if (typeof _commit_data.sent != "undefined" && _commit_data.sent.length != 0) {
+			html += "<button onclick='commit_pull()'>推送</button>";
+		} else {
+			html += "没有句子数据";
+		}
+	} else {
+		html += "<button onclick='previewWin.show(commit_preview_render())'>文本比对</button>";
+	}
+
 	html += "</div>";
 	html += "</div>";
 
@@ -104,11 +119,14 @@ function commit_preview_render() {
 		_commit_data.dest != null &&
 		_commit_data.dest != ""
 	) {
-		let sentList = new Array();
-		for (const iterator of _arrData) {
-			sentList.push(iterator.book + "-" + iterator.para + "-" + iterator.begin + "-" + iterator.end);
+		if (typeof _commit_data.sent == "undefined" || _commit_data.sent.length == 0) {
+			let sentList = new Array();
+			for (const iterator of _arrData) {
+				sentList.push(iterator.book + "-" + iterator.para + "-" + iterator.begin + "-" + iterator.end);
+			}
+			_commit_data.sent = sentList;
 		}
-		_commit_data.sent = sentList;
+
 		let arrSentInfo = new Array();
 		for (const iterator of _commit_data.sent) {
 			let id = com_guid();

app/commit/commit.php

@@ -7,18 +7,34 @@ require_once "../redis/function.php";
 require_once "../share/function.php";
 require_once "../usent/function.php";
 
+$respond['message'] = "";
+$respond['status'] = 0;
+
 $_data = array();
 if (isset($_POST["data"])) {
     $_data = json_decode($_POST["data"], true);
 } else {
+	$respond['message'] = "缺少输入数据";
+	$respond['status'] = 1;
+	echo json_encode($respond, JSON_UNESCAPED_UNICODE);
 	exit;
 }
 $channelInfo  = new Channal();
 $srcChannelPower = $channelInfo->getPower($_data["src"]);
 $destChannelPower = $channelInfo->getPower($_data["dest"]);
 
-if($srcChannelPower<10 || $destChannelPower<10){
-	exit;
+
+if($srcChannelPower<10){
+	$respond['message'] = "源channel无权限";
+	$respond['status'] = 1;
+	echo json_encode($respond, JSON_UNESCAPED_UNICODE);
+	exit;		
+}
+if($destChannelPower<10){
+	$respond['message'] = "channel无权限";
+	$respond['status'] = 1;
+	echo json_encode($respond, JSON_UNESCAPED_UNICODE);
+	exit;		
 }
 
 $db_trans_sent = new PDO(_FILE_DB_SENTENCE_, "", "", array(PDO::ATTR_PERSISTENT => true));
@@ -82,8 +98,7 @@ if($stmt){
 	#到此，所有的数据已经准备好
 
 	$sentDb = new Sent_DB();
-	$respond['message'] = "";
-	$respond['status'] = 0;
+
 	if($sentDb->update($updateDate)){
 		$respond['update'] = count($updateDate);
 	}

app/term/note.js

@@ -627,6 +627,13 @@ function sent_pr_merge(id) {
 		}
 	);
 }
+function sent_commit(src, id) {
+	commit_init({
+		src: src,
+		sent: [id],
+		express: true,
+	});
+}
 function render_one_sent_tran_a(iterator) {
 	let mChannel = get_channel_by_id(iterator.channal);
 
@@ -719,7 +726,8 @@ function render_one_sent_tran_a(iterator) {
 
 		//推送按钮
 		if (parseInt(iterator.mypower) >= 20) {
-			html += "<button class='icon_btn tooltip' onclick='sent_tran_edit(this)'>";
+			html += "<button class='icon_btn tooltip' ";
+			html += " onclick=\"sent_commit('" + iterator.channal + "','" + sid + "')\">";
 			html += '<svg class="icon" >';
 			html += '<use xlink="http://www.w3.org/1999/xlink" href="../studio/svg/icon.svg#ic_mode_edit"></use>';
 			html += "</svg>";

app/usent/sent_pr_merge.php

@@ -67,4 +67,7 @@ if($prData){
 		$output["message"]="没有写入权限";
 	}
 }
+
+echo json_encode($respond, JSON_UNESCAPED_UNICODE);
+
 ?>