v4.38 release.

kalcaddle · Feb 25, 2019 · 538bb10 · 538bb10
1 parent 4bdfcd6
commit 538bb10
Show file tree

Hide file tree

Showing 23 changed files with 48 additions and 43 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,13 +1,16 @@
 ### ver4.38 `2019/2/25` 
 -----
 #### update:
+- 排序优化：文件夹列表，中文排序支持按拼音进行排序
 - 针对移动端APP进行兼容适配优化
 - 部门列表过多时，排序效率优化。
-- https请求优化兼容
-- cad分享无法预览问题解决
 - 新增hook点
 - 其他细节优化
 
+#### fix bug
+- https请求优化兼容
+- cad分享无法预览问题解决
+
 ### ver4.37 `2018/11/28` 
 -----
 #### update:

diff --git a/app/controller/utils.php b/app/controller/utils.php
diff --git a/plugins/toolsCommon/static/pie/.pie.tif b/plugins/toolsCommon/static/pie/.pie.tif
diff --git a/static/js/app/src/api/default/main.js b/static/js/app/src/api/default/main.js
diff --git a/static/js/app/src/api/view/main.js b/static/js/app/src/api/view/main.js
diff --git a/static/js/app/src/app/main.js b/static/js/app/src/app/main.js
diff --git a/static/js/app/src/desktop/main.js b/static/js/app/src/desktop/main.js
diff --git a/static/js/app/src/edit/main.js b/static/js/app/src/edit/main.js
diff --git a/static/js/app/src/editor/main.js b/static/js/app/src/editor/main.js
diff --git a/static/js/app/src/explorer/main.js b/static/js/app/src/explorer/main.js
diff --git a/static/js/app/src/explorerWap/main.js b/static/js/app/src/explorerWap/main.js
diff --git a/static/js/app/src/plugins/main.js b/static/js/app/src/plugins/main.js
diff --git a/static/js/app/src/setting/main.js b/static/js/app/src/setting/main.js
diff --git a/static/js/app/src/shareEditor/main.js b/static/js/app/src/shareEditor/main.js
diff --git a/static/js/app/src/shareExplorer/main.js b/static/js/app/src/shareExplorer/main.js
diff --git a/static/js/app/src/shareIndex/main.js b/static/js/app/src/shareIndex/main.js
diff --git a/static/js/app/src/user/main.js b/static/js/app/src/user/main.js
diff --git a/static/js/lib/util.js b/static/js/lib/util.js
@@ -658,6 +658,8 @@ var pathTools = (function(){
 	 * https://github.com/overset/javascript-natural-sort/blob/master/naturalSort.js
 	 */
 	var strSort = function(a,b){
+		if(a == undefined ) return 1;
+		if(b == undefined ) return -1;
 		if($.isNumeric(a) && $.isNumeric(b)){
 			a = parseFloat(a);b = parseFloat(b);
 			return a==b?0:(a>b?1:-1);
@@ -705,7 +707,7 @@ var pathTools = (function(){
 			}else{
 				//英文字符排在中文字符前
 				if( aChar.charCodeAt() < 255 || bChar.charCodeAt() < 255){
-					if(bChar==bChar) continue;
+					if(aChar==bChar) continue;
 					return aChar>bChar?1:-1;
 				}
 				//中文数字排在所有汉字前

diff --git a/static/style/skin/base/app_code_edit.css b/static/style/skin/base/app_code_edit.css
diff --git a/static/style/skin/base/app_desktop.css b/static/style/skin/base/app_desktop.css
diff --git a/static/style/skin/base/app_editor.css b/static/style/skin/base/app_editor.css
diff --git a/static/style/skin/base/app_explorer.css b/static/style/skin/base/app_explorer.css
diff --git a/static/style/skin/base/app_setting.css b/static/style/skin/base/app_setting.css