Browse Source

:bug: 词源信息丢失 拆分下拉菜单错误

visuddhinanda 4 years ago
parent
commit
87968e9fe7
3 changed files with 51 additions and 7 deletions
  1. 1 0
      public/app/studio/css/style.css
  2. 25 3
      public/app/studio/editor.php
  3. 25 4
      public/app/studio/js/editor.js

+ 1 - 0
public/app/studio/css/style.css

@@ -4155,6 +4155,7 @@ border-bottom: 2px solid red;
 
 .edit_detail_p {
 	display: flex;
+	padding:2px 0;
 }
 
 .edit_detail_span {

+ 25 - 3
public/app/studio/editor.php

@@ -303,7 +303,29 @@ else{$currDevice="computer";}
 	#merge_button:hover>.icon{
 		fill: var(--link-hover-color);
 	}
-	</style>
+	#om_dropdown_area::-webkit-scrollbar {
+		width: 10px;
+		height: 10px;
+	}
+	#om_dropdown_area::-webkit-scrollbar-thumb {
+		background-color: var(--link-color);
+	}
+	#om_dropdown_area::-webkit-scrollbar-thumb:hover {
+		background-color:var(--tool-link-hover-color);
+	}
+	#om_dropdown_area::-webkit-scrollbar-button:single-button {
+		width: 10px
+		height: 10px;
+		display: block;
+		background-color: var(--link-color);
+		border-radius: 10px;
+	}
+
+	#om_dropdown_area::-webkit-scrollbar-button:single-button:hover {
+		background-color:var(--tool-link-hover-color);
+	}
+
+		</style>
 	<link type="text/css" rel="stylesheet" href="css/print.css" media="print" />
 	<style id="display_set">
 	</style>
@@ -754,8 +776,8 @@ foreach($plugin_list as $info){
 				<div class="edit_detail_p" >
 					<guide gid="studio_part_meaning">④</guide>
 					<span class="edit_detail_span"><?php echo $_local->gui->partmeaning;?>:</span>
-					<div id="input_org_select" class="input_bar" style="width:80%; display:inline-flex;"></div>
-					<input type="text" id="input_om" class="input_bar" value="" name="in_om" onblur="input_org_switch('input_om','input_org_select')">
+					<div id="input_org_select" class="input_bar" style="width:80%; display:inline-flex;justify-content: space-between;"></div>
+					<input type="text" id="input_om" class="input_bar" value="" name="in_om" onchange='input_om_change(this)' onblur="input_org_switch('input_om','input_org_select')">
 				</div>
 				<!-- 格位 -->
 				<div class="edit_detail_p">

+ 25 - 4
public/app/studio/js/editor.js

@@ -3144,11 +3144,14 @@ function showModifyWin(sWordId) {
 	//showCurrWordTable(sReal);
 
 	if (g_useMode == "edit") {
+		//初始值
 		$("#input_meaning").val(sMeaning);
 		$("#input_org").val(sOrg);
 		$("#input_om").val(sOm);
 		$("#input_case").val(sCase);
-
+		$("#input_parent_grammar").val(sParentGrammar);
+		$("#id_text_prt_prt").val(sParent2);
+		
 		if (sParentGrammar != "" || sParent2 != "" || sParent2 != " ") {
 			document.getElementById("edit_detail_prt_prt").style.display = "block";
 			document.getElementById("svg_parent2").style.transform = "rotate(90deg)";
@@ -3157,7 +3160,7 @@ function showModifyWin(sWordId) {
 			document.getElementById("svg_parent2").style.transform = "rotate(0deg)";
 		}
 		document.getElementById("parent_grammar").innerHTML = getLocalGrammaStr(sParentGrammar);
-		$("#id_text_prt_prt").val(sParent2);
+
 
 		//右侧修改菜单
 		$("#word_mdf_mean_dropdown").html(render_word_menu_mean(g_currEditWord, 1));
@@ -3450,7 +3453,24 @@ function load_my_formula() {
 		}
 	);
 }
+/*
+  |------------------------------------
+  |当人工输入拆分意思后,更新拆分意思数组
+  |------------------------------------
+  |obj : 输入框
+  |------------------------------------
+*/
+function input_om_change(obj){
+	g_arrPartMean = obj.value().split('+');
+}
 
+/*
+  |------------------------------------
+  |当选择拆分意思菜单后,更新拆分意思输入框
+  |------------------------------------
+  | 
+  |------------------------------------
+*/
 function part_mean_ok() {
 	var part_mean_ok_str = g_arrPartMean.join("+");
 	part_mean_ok_str = "#" + part_mean_ok_str + "#";
@@ -3490,7 +3510,7 @@ function refreshPartMeaningSelect() {
 	if (g_initPartMeaning) {
 		g_arrPartMean = part.split("+");
 	}
-	var output = "<div style='overflow-x: scroll;white-space: nowrap;max-width: 13em;'>";
+	var output = "<div id='om_dropdown_area' style='overflow-x: auto;white-space: nowrap;max-width: 13em;'>";
 	//output="<span style='width:90%' onclick=\"input_org_switch('input_org_select','input_om')\"></span><br/>"
 	for (iPart in arrPart) {
 		output += getMeaningMenuList(iPart, arrPart[iPart]);
@@ -3500,7 +3520,8 @@ function refreshPartMeaningSelect() {
 			output += "+";
 		}
 	}
-	output += "</div><div>";
+	output += "</div>";
+	output += "<div style='width: 5.5em;'>";
 	output += "<button style='margin-left:auto; padding: 1px 6px;' onclick=\"copy_part_mean_to_mean()\">";
 	output += '<svg class="icon"><use xlink="http://www.w3.org/1999/xlink" href="svg/icon.svg#ic_vertical_align_top">';
 	output += "</button>";