Merge branch 'dev'

change.log

@@ -1,5 +1,12 @@
 {
 	"log": [
+		{
+			"ver":"6.1.747.831",
+			"date":"2018.06.10",
+			"content":[
+				"fix bug: some options of appearance error"
+			]
+		},
 		{
 			"ver":"6.1.742.830",
 			"date":"2018.06.05",

js/background.js

@@ -3730,21 +3730,23 @@ var sub={
 					_sendConf.note=sub.theConf.note;
 					_sendConf.allaction=[];
 				//get all actions
+				let _confType=config[message.drawType[0]][message.drawType[1]];
 				if(config[sub.message.drawType[0]].ui.allaction.enable){
-					for(let i=0;i<confType.length;i++){
-						if(confType[i].direct.indexOf(direct)==0
-							&&confType[i].direct.length>direct.length){
+					for(let i=0;i<_confType.length;i++){
+						if(_confType[i].direct.indexOf(message.direct)==0
+							&&_confType[i].direct.length>message.direct.length){
 							let _action={
-								direct:confType[i].direct,
-								tip:(confType[i].mydes&&confType[i].mydes.type&&confType[i].mydes.value)?confType[i].mydes.value:sub.getI18n(confType[i].name)
+								direct:_confType[i].direct,
+								tip:(_confType[i].mydes&&_confType[i].mydes.type&&_confType[i].mydes.value)?_confType[i].mydes.value:sub.getI18n(_confType[i].name)
 							}
 							_sendConf.allaction.push(_action);
 						}
-						if(i==confType.length-1&&_sendConf.allaction.length==0){
+						if(i==_confType.length-1&&_sendConf.allaction.length==0){
 							_sendConf.allaction=null;
 						}
 					}
 				}
+				console.log(_sendConf)
 				sendResponse(_sendConf);
 				break;
 			case"action":

js/event.js

@@ -6,7 +6,6 @@ Array.prototype.contains=function (ele) {
 	}
 	return false;
 }
-console.log("event")
 var editMode,editDirect,browserType;
 var config={};
 let devMode,
@@ -1005,9 +1004,10 @@ var sue={
 	sendDir:function(dir,dirType,e){
 		//console.log(sue.drawType)
 		console.log(dirType)
+		console.log({type:dirType,direct:dir,drawType:sue.drawType,selEle:sue.selEle})
 		var returnValue;
 		chrome.runtime.sendMessage(extID,{type:dirType,direct:dir,drawType:sue.drawType,selEle:sue.selEle},function(response){
-			//console.log(response)
+			console.log(response)
   			returnValue=response;
   			sue.getedConf=returnValue;
   			switch(response.type){

manifest.json

@@ -3,7 +3,7 @@
 	"minimum_chrome_version": "22",
 	"name": "__MSG_ext_name__",
 	"short_name":"smartUp",
-	"version": "6.1.742.830",
+	"version": "6.1.747.831",
 	"description": "__MSG_ext_des__",
 	"default_locale": "en",
 	"author":"zimo",