release 4.39 update

plugins/yzOffice/app.php

@@ -55,6 +55,11 @@ class yzOfficePlugin extends PluginBase{
 		}else{
 			$content = file_get_contents($pageFile);
 		}
+		if(strstr($content,'location.href = ')){
+			$app->clearChche();
+			show_tips("请求转换异常，请重试！");
+		}
+		
 
 		//替换内容
 		$config = $this->getConfig();

plugins/yzOffice/package.json

@@ -2,7 +2,7 @@
 	"id":"yzOffice",
 	"name":"{{LNG.yzOffice.meta.name}}",
 	"title":"{{LNG.yzOffice.meta.title}}",
-	"version":"1.34",
+	"version":"1.35",
 	"category":"file",
 	"source":{
 		"icon":"{{pluginHost}}static/images/icon.png"

plugins/yzOffice/php/yzOffice2.class.php

@@ -17,21 +17,11 @@ class yzOffice2{
 	public function __construct($plugin,$filePath,$oldVersion=true){
 		$this->plugin = $plugin;
 		$this->filePath = $filePath;
-
-		if($oldVersion){
-			//旧版本;http://dcs.yozosoft.com/examples.html
-			$this->api = array(
-				'upload'	=> 'http://dcs.yozosoft.com/testUpload',
-				'convert'	=> 'http://dcs.yozosoft.com/convert',
-			);
-		}else{
-			//新版本，加入了文件上传2M的限制; http://dcs.yozosoft.com/examples.html
-			$this->api = array(
-				'upload'	=> "http://www.yozodcs.com/testUpload",
-				'convert'	=> "http://www.yozodcs.com/convert",
-			);
-		}
-		
+		//新版本，加入了文件上传2M的限制; http://dcs.yozosoft.com/examples.html
+		$this->api = array(
+			'upload'	=> "http://www.yozodcs.com/testUpload",
+			'convert'	=> "http://www.yozodcs.com/convert",
+		);
 
 		if($filePath === -1) return;
 		if(!$filePath || !file_exists($filePath)){
@@ -48,7 +38,6 @@ class yzOffice2{
 			$this->task = is_array($task_has)?$task_has:false;
 		}
 		//show_json($this->upload(),false);
-		//show_json($this->convert("90ef3480-e446-463e-8372-4438fab0367f\/ios系统体验苹果ppt模板.pptx"));
 	}
 	public function runTask(){
 		$task = array(
@@ -161,7 +150,6 @@ class yzOffice2{
 	public function clearChche(){
 		del_dir($this->cachePath);
 	}
-
 	public function uploadProcess(){
 		return curl_progress_get($this->filePath,$this->task['taskUuid']);
 	}
@@ -180,4 +168,3 @@ class yzOffice2{
 		}
 	}
 }
-

static/js/lib/util.js

@@ -652,8 +652,11 @@ var pathTools = (function(){
 	 * pathTools.strSort(a,b) 			5.0s
 	 * a.localeCompare(b)				6.0s
 	 * 
-	 * ['3',"1",'2','21','我','月',"二", "四","一","三",'安','巴士','秦','a','b','z','1.a','2.b','3.d','23.f']
-	 * ['1.595','1.52e7','1.58e3']
+	 * ['3',"1",'2','21','我','月',"二", "四","一","三",'安','巴士','秦','a','b','z','1.a','2.b','3.d','23.f','1语文']
+	 * ['5a','1a','10a','11a'] 		按数字大小排序
+	 * ['1.595','1.52e7','1.58e3']	科学技术法排序
+	 * ['B1','a1','b2f',"A2"]		按大小写无关排序，小写小于大写; ==> ['a1',"A2",'b2f','B1']
+	 * 
 	 * 参考
 	 * https://github.com/overset/javascript-natural-sort/blob/master/naturalSort.js
 	 * 
@@ -688,7 +691,7 @@ var pathTools = (function(){
 		var arr = '零一二三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟万';//
 		for (var i=0;i<Math.max(a.length,b.length);i++){
 			var aChar = a.charAt(i),bChar = b.charAt(i);
-			if(aChar == bChar) continue;
+			if(aChar == bChar && !isNumeric(aChar) ) continue; //相等且不为数字
 			//连续数字时比较数值;
 			if(isNumeric(aChar) && isNumeric(bChar)){
 				var aNum = substrNumber(a,i),bNum = substrNumber(b,i);
@@ -698,25 +701,29 @@ var pathTools = (function(){
 				}
 				return aNum>bNum?1:-1;
 			}
-			if( aChar.charCodeAt() < 255 && bChar.charCodeAt() < 255){
-				if(aChar==bChar) continue;
+			if(aChar == bChar) continue;
+			
+			//字符和汉字(字符小于汉字)、字符和字符(小写英文小于大写英文,a<A<b<B )
+			if( aChar.charCodeAt() < 255 || bChar.charCodeAt() < 255){
+				if( aChar.charCodeAt() < 255 && bChar.charCodeAt() < 255){
+					// a<A; ansi比较需要反置; 自行实现，避免localeCompare比较不同平台不一致问题 
+					var aCharI = aChar.toLowerCase(),bCharI = bChar.toLowerCase();
+					if(aCharI == bCharI) return aCharI>bCharI?-1:1;
+					return aCharI>bCharI?1:-1;
+				}
 				return aChar>bChar?1:-1;
 			}
+
+			//纯中文情况
 			var aIndex = arr.indexOf(aChar);
 			var bIndex = arr.indexOf(bChar);
-			if( aIndex!=-1 && bIndex!=-1 ){//有该字符
-				if(aIndex==bIndex) continue;
+			if( aIndex!=-1 && bIndex!=-1 ){//中文数字
 				return (aIndex>bIndex?1:-1);
-			}else{
-				if( aChar.charCodeAt() < 255 || bChar.charCodeAt() < 255){
-					if(aChar == bChar) continue;
-					return aChar>bChar?1:-1;
-				}
-				//中文数字排在所有汉字前
-				if(aIndex !=-1 ) return -1;
-				if(bIndex !=-1 ) return 1;
-				return aChar.localeCompare(bChar);//中文按拼音进行排序
 			}
+			//中文数字排在所有汉字前
+			if(aIndex !=-1 ) return -1;
+			if(bIndex !=-1 ) return 1;
+			return aChar.localeCompare(bChar);//中文按拼音排序; 不支持词语多音字处理:北京/长沙/长高/重量/重庆
 		}
 		return 0;
 	}

static/style/skin/base/app_editor.css

@@ -1,5 +1,5 @@
-/* power by kodexplorer ver 4.39(2019-03-12) [build 1552382254.047] */
+/* power by kodexplorer ver 4.39(2019-03-21) [build 1553149080.2695] */
 @import url('./fileIcon.css');
 @import url('./common.css');
 .frame-main{position:absolute;top:40px;width:100%;bottom:0px;}.frame-main .tools-left{background:#f8f8f8 url("../../../images/common/bg.gif") 0 0px;position:fixed;line-height:30px;padding-left:20px;height:28px;border-bottom:1px solid #ddd;left:0;width:100%;}.frame-main .tools-left a{font-size:1.25em;font-weight:800;text-decoration:none;color:#999;text-shadow:0 0 3px;display:inline-block;padding:2px 6px;margin-top:0;height:20px;line-height:20px;}.frame-main .tools-left a:hover{background:url("../../../images/common/buttons_40.png") 0 0px repeat-x;-webkit-box-shadow:0 2px 8px rgba(0,0,0,0.8);-moz-box-shadow:0 2px 8px rgba(0,0,0,0.8);box-shadow:0 2px 8px rgba(0,0,0,0.8);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}.frame-main .frame-left{position:absolute;left:0;top:30px;bottom:0;width:200px;background:#fff;background-attachment:fixed;overflow:auto;}.frame-main .frame-left .ztree{margin-top:0;}.frame-main .frame-left .ztree li.level0{margin-bottom:5px;}.frame-main .frame-resize{width:10px;cursor:col-resize;z-index:100;position:absolute;left:195px;top:0;bottom:0;overflow:hidden;background:url("../../../images/common/resize.png") 0px 50% no-repeat;}.frame-main .frame-resize.active{background:#000;opacity:0.2;filter:alpha(opacity=20);}.frame-main .frame-right{left:200px;right:0;position:absolute;top:0;bottom:0;overflow:auto;}.frame-main .frame-right .frame-right-main .resize-mask{z-index:999;position:absolute;left:0;top:0;bottom:0;right:0;display:none;}.frame-main .frame-right .frame-right-main .frame{height:100%;border-left:1px solid #ddd;overflow:hidden;}
-/* ver 4.39(2019-03-12) [build 1552382254.047] */
+/* ver 4.39(2019-03-21) [build 1553149080.2696] */