From fe0e3ba494e7424bcebc8eb3315a4ae57a491f36 Mon Sep 17 00:00:00 2001
From: lihongyu <504404568@qq.com>
Date: Tue, 7 Feb 2023 08:40:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E9=98=85=E8=A7=88=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E9=99=84=E4=BB=B6=E6=8C=89=E5=90=8D=E7=A7=B0=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pal/repository/upfile/web/UpfileWeb.java  |   8 +-
 .../page/pal.pl.level.upfile.portal.htm       |   6 +-
 .../js/coe.pal.pl.upfile.js                   |   9 +-
 .../js/designer.extend.link.view.portal.js    | 123 +++++++++++++++++-
 4 files changed, 131 insertions(+), 15 deletions(-)

diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/upfile/web/UpfileWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/upfile/web/UpfileWeb.java
index 134d54bb..5c200c87 100755
--- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/upfile/web/UpfileWeb.java
+++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/upfile/web/UpfileWeb.java
@@ -793,7 +793,7 @@ public class UpfileWeb extends ActionWeb {
 		if ("file".equals(type)) {
 			type = "f";
 			sqlWhere.append(" and PALREPOSITORYID ='").append(pl_uuid).append("' and FILETYPE='").append(type)
-					.append("'");
+					.append("'").append(" ORDER BY FILENAME ASC");;
 		} else {
 			if ("".equals(uuids)) {
 				return "";
@@ -807,7 +807,7 @@ public class UpfileWeb extends ActionWeb {
 				}
 				sqlWhere.append("'").append(split[i]).append("'").append(",");
 			}
-			sqlWhere.append(")");
+			sqlWhere.append(")").append(" ORDER BY FILENAME ASC");;
 		}
 		List<UpfileModel> search = upFileDao.search(sqlWhere.toString());
 		//三员管理模式下，过滤文件密级高于用户密级不显示
@@ -856,7 +856,7 @@ public class UpfileWeb extends ActionWeb {
 			}
 		}
 		if ("file".equals(type)) {
-			sqlWhere.append(" and PALREPOSITORYID ='").append(null == versionModel?pl_uuid:versionModel.getId()).append("'");
+			sqlWhere.append(" and PALREPOSITORYID ='").append(null == versionModel?pl_uuid:versionModel.getId()).append("'").append(" ORDER BY FILENAME ASC");;
 		} else {
 			if ("".equals(uuids)) {
 				return "";
@@ -870,7 +870,7 @@ public class UpfileWeb extends ActionWeb {
 				}
 				sqlWhere.append("'").append(split[i]).append("'").append(",");
 			}
-			sqlWhere.append(")");
+			sqlWhere.append(")").append(" ORDER BY FILENAME ASC");;
 		}
 		List<UpfileModel> search = upFileDao.search(sqlWhere.toString());
 		//三员管理模式下，过滤文件密级高于用户密级不显示
diff --git a/com.actionsoft.apps.coe.pal/template/page/pal.pl.level.upfile.portal.htm b/com.actionsoft.apps.coe.pal/template/page/pal.pl.level.upfile.portal.htm
index 74e27cdb..c98a3242 100755
--- a/com.actionsoft.apps.coe.pal/template/page/pal.pl.level.upfile.portal.htm
+++ b/com.actionsoft.apps.coe.pal/template/page/pal.pl.level.upfile.portal.htm
@@ -99,13 +99,13 @@
 <!--						<input style="width:350px;float:left;" id="upfileAccessoryName" readonly="readonly" type="text" class="awsui-input">-->
 						<span style="float:left;" id="upfile" class="button blue" onclick="return false;">选择文件</span>
 						<div style="padding: 5px; font-size: 12px; color: rgb(120, 120, 120);display: inline-block;">
-							<span style="word-break:keep-all;">附件格式支持:jpg, jpeg, gif, png, bmp, pdf, doc, docx, ppt, pptx, xls, xlsx, txt, mp3, mp4, avi, mpeg, flv, swf, wmv, xml</span>
+							<span style="word-break:keep-all;">附件格式支持:jpg, jpeg, gif, png, bmp, pdf, doc, docx, ppt, pptx, xls, xlsx, txt, mp3, mp4, avi, mpeg, flv, swf, wmv, xml, rtf</span>
 						</div>
 					</div>
 				</div>
 				<div style="height: 170px;max-height: 170px; overflow-x: hidden; overflow-y: auto;border: 1px solid #e9e9e9;padding: 5px;">
-					<div id="upfileBlankMsg" style="font-size: 20px;width: 100%;text-align: center;line-height: 170px;vertical-align: middle;color: #CCCCCC;">
-						点击"选择文件"进行选择上传文件
+					<div id="upfileBlankMsg" style="font-size: 16px;width: 100%;text-align: center;line-height: 170px;vertical-align: middle;color: #CCCCCC;">
+						多个附件，请按“附件1:XXXX”方式命名附件，否则附件展示顺序随机
 					</div>
 					<div id="upfileList" style="display: none;">
 						<p style="margin: 0px;" id="upfileCheckResultMsg">正在校验</p>
diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.pl.upfile.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.pl.upfile.js
index 6504a227..f635ec94 100755
--- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.pl.upfile.js
+++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.pl.upfile.js
@@ -71,7 +71,7 @@ $(function() {
 	    fileValue:fileValue,
 	    // filesToFilter: [["Images (*.jpg; *.jpeg; *.gif; *.png; *.bmp)","Document (*.doc;*.docx;*.xls;*.xlsx;*.ppt;*.pptx;*.pdf;)", "*.jpg; *.jpeg; *.gif; *.png; *.bmp; *.pdf; *.doc; *.docx; *.xls; *.xlsx; *.ppt; *.pptx; *.txt"]],
 	    filesToFilter: [["Images (*.jpg; *.jpeg; *.gif; *.png; *.bmp),Document (*.doc;*.docx;*.xls;*.xlsx;*.ppt;*.pptx;*.pdf;), Video (*.mp3; *.mp4; *.avi; *.mpeg; *.flv; *.swf; *.wmv)",
-	    	"*.jpg; *.jpeg; *.gif; *.png; *.bmp; *.pdf; *.doc; *.docx; *.xls; *.xlsx; *.ppt; *.pptx; *.txt,*.mp3; *.mp4; *.avi; *.mpeg; *.flv; *.swf; *.wmv; *.xml"]],
+	    	"*.jpg; *.jpeg; *.gif; *.png; *.bmp; *.pdf; *.doc; *.docx; *.xls; *.xlsx; *.ppt; *.pptx; *.txt,*.mp3; *.mp4; *.avi; *.mpeg; *.flv; *.swf; *.wmv; *.xml; *.rtf;"]],
 	    repositoryName: repositoryName,
 	    numLimit : 0,
     	sizeLimit : 500 * 1024 * 1024,
@@ -115,7 +115,7 @@ $(function() {
             }
             //阻止非支持类型文件的上传
             var suffix = data.files[0].name.substring(data.files[0].name.lastIndexOf(".") + 1);
-            var fileTypes = "jpg,jpeg,gif,png,bmp,pdf,doc,docx,ppt,pptx,xls,xlsx,txt,mp3,mp4,avi,mpeg,flv,swf,wmv,xml";
+            var fileTypes = "jpg,jpeg,gif,png,bmp,pdf,doc,docx,ppt,pptx,xls,xlsx,txt,mp3,mp4,avi,mpeg,flv,swf,wmv,xml,rtf";
             if (fileTypes.indexOf(suffix) < 0) {
                 upfileAccessoryTmpObj[data.files[0].name] = {
                     status: 'error',
@@ -263,7 +263,7 @@ function loadFiles() { //加载附件,params参考引用
             $("#selfAccessoryTable tbody").empty();
             var accessoryHtml = "";
             var list = msg.data.list;
-           /* list.sort(function(x,y){
+            list.sort(function(x,y){
                 if(x.fileName.substr(0,2)=='附件' && y.fileName.substr(0,2)=='附件') {
                     return Number(x.fileName.substr(2, 1)) - Number(y.fileName.substr(2, 1));
                 }
@@ -273,9 +273,6 @@ function loadFiles() { //加载附件,params参考引用
                     return x.createTime -y.createTime;
                 }
 
-            });*/
-            list.sort(function(x,y){
-                    return x.createTime -y.createTime;
             });
             accessoryList = list;
             if (list.length > 0) {
diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js
index 99032043..4bac6562 100755
--- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js
+++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js
@@ -1778,6 +1778,7 @@ function initUpfileData(obj) {
         var t = '';
         var splitId='';
         var processFile = upfileData['file'];
+		
         if(processFile.length > 0) {
             /*t += '<table name="file" class="awsui-table">';
             t += '<tr><td>';
@@ -1794,6 +1795,11 @@ function initUpfileData(obj) {
             t += '<div>';
             t +='<strong>文件附件:</strong>';
             var appendFlag=true;
+				 processFile.sort(function(x,y){
+                if(x.name.substr(0,2)=='附件' && y.name.substr(0,2)=='附件') {
+                    return Number(x.name.substr(2, 1)) - Number(y.name.substr(2, 1));
+                }
+            });
             for(var i = 0; i < processFile.length; i++) {
                 var obj = processFile[i];
                 t += '<table  class="awsui-table">';
@@ -1809,6 +1815,7 @@ function initUpfileData(obj) {
                 splitId+=obj.id+',';
 
                 var spiltName=obj.name;
+				
                 if(spiltName.substring(0,spiltName.lastIndexOf("."))==fileName  && appendFlag==true){
                     appendFlag=false;
                     var s='';
@@ -1831,13 +1838,47 @@ function initUpfileData(obj) {
 
         var countindex=0;
         var elements = Model.define.elements;
-        for(var e in elements) {
+		console.log('elements',elements)
+		if(methodId=="data.form"){
+			var sortModelByName = sortModelByName1();;
+		    for(var sortIndex = 0; sortIndex < sortModelByName.length; sortIndex++) {
+            var temp = sortModelByName[sortIndex];
+            var shape = elements[temp.id];
+            if(shape.name == 'linker') {
+                continue;
+            }
+            var processShape = upfileData[temp.id];
+                if(processShape != null && processShape.length > 0) {
+                    var fileTile="表单/模板:";
+                    t += '<div>';
+                    t +='<strong>'+fileTile+'</strong>'+temp.text;
+                    for(var i = 0; i < processShape.length; i++) {
+                        t += '<table name="' + temp.id + '" class="awsui-table">';
+                        t +='<tbody>';
+                        t += '<tr>';
+                        t += '<td>';
+                        var obj = processShape[i];
+                        t += '<div class="tablefileContent"><a href="javascript:void(0);" title="'+obj.name+'" onclick="readFile(\''+ obj.id +'\')">'+ obj.name +'</a>';
+                        t +='</div>';
+                        t += '</td>';
+                        t += '</tr>';
+                        t +='</tbody>';
+                        t += '</table>';
+                        splitId+=obj.id+',';
+
+                    }
+
+                }
+                t += '</div>';
+		}
+			
+		}else{
+			for(var e in elements) {
             var ele = elements[e];
             if(ele.name == 'linker') {
                 continue;
             }
 
-
             var processShape = upfileData[ele.id];
             if(methodId=="control.policy"){
 				//暂时去掉制度节点附件显示  20221208 lihongyu
@@ -1884,6 +1925,7 @@ function initUpfileData(obj) {
                     }
                     t += '<div>';
                     t +='<strong>'+fileTile+'</strong>'+ele.text;
+					
                     for(var i = 0; i < processShape.length; i++) {
                         t += '<table name="' + ele.id + '" class="awsui-table">';
                         t +='<tbody>';
@@ -1908,6 +1950,11 @@ function initUpfileData(obj) {
 
 
         }
+			
+			
+		}
+		
+        
 
         t += '<div id="dabao" style=" margin-top: -25px;"></div>';
 
@@ -1943,6 +1990,78 @@ function initUpfileData(obj) {
     }
 }
 
+//根据节点名称排序
+function sortModelByName1() {
+	var num = 0;
+    var recordId = [];
+    var hasNumArr = [];
+    /*******************************排序方法重构***by zhaolei**********************************************/
+    for (var shapeId in Model.define.elements) {
+        var shape = Model.define.elements[shapeId];
+		var attr = shape.text;
+		var category = shape.category;
+		console.log('节点名称',category);
+				//根据活动名称排序
+                    if (attr != null) {
+                        if(category=="data_form"){
+							
+							if(attr.substr(0,2)=='附件') {
+							var obj = {};
+                                    obj.text = shape.text;
+                                    obj.id = shapeId;
+                                    obj.orderIndex = attr.substr(2, 1);
+                                    hasNumArr.push(obj);
+                                    recordId.push(shapeId);
+							
+							}else{
+								var obj = {};
+                                    obj.text = shape.text;
+                                    obj.id = shapeId;
+                                    obj.orderIndex = num;
+                                    hasNumArr.push(obj);
+                                    recordId.push(shapeId);
+									num++;
+								
+							}
+                        }
+                    }
+              
+          
+        
+    }
+
+    // 按名称升序排序
+    var compare = function (prop) {
+		console.log('44444444',prop)
+        return function (obj1, obj2) {
+            var val1 = obj1[prop];
+            var val2 = obj2[prop];
+            if (!isNaN(Number(val1)) && !isNaN(Number(val2))) {
+                val1 = Number(val1);
+                val2 = Number(val2);
+            }
+            if (val1 < val2) {
+                return -1;
+            } else if (val1 > val2) {
+                return 1;
+            } else {
+                return 0;
+            }
+        }
+    }
+
+    hasNumArr.sort(compare("orderIndex"));
+    /*for (var shapeId in Model.define.elements) {
+        if($.inArray(shapeId, recordId) == -1) {
+            var obj = {};
+            obj.id = shapeId;
+            hasNumArr.push(obj);
+        }
+    }*/
+    return hasNumArr;
+}
+
+
 //附件在线预览
 function readFile(uuid) {
     $.simpleAlert("文件正在处理", "loading");