From 18ffbca9acaccd5099a7a63652f52210f59a7e40 Mon Sep 17 00:00:00 2001
From: xinyb <574600396@qq.com>
Date: 星期四, 19 九月 2024 11:26:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
WebRoot/js/index/funcLink.js | 462 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 364 insertions(+), 98 deletions(-)
diff --git a/WebRoot/js/index/funcLink.js b/WebRoot/js/index/funcLink.js
index 5b8ba33..8ea3056 100644
--- a/WebRoot/js/index/funcLink.js
+++ b/WebRoot/js/index/funcLink.js
@@ -1,17 +1,28 @@
var version = 0;// 鐗堟湰鍙�
var pwdCallBack = null;// 瀵嗙爜杈撳叆鐐瑰嚮纭畾鍚庡洖璋冨嚱鏁�
var obj22 = null;// 22绫诲瀷浼犲�煎璞�
-var shx=false;
-var leftWidth="0";
-var gridId=[];
+var shx = false;
+var leftWidth = "0";
+var gridId = [];
//var uploadObj = null;
//var edit='';
-var pic={};// 鏍肩嚎闄勪欢涓婁紶鍙傛暟灞炴��
-var rsakey={
- pubkey:"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkRupiYcKVGGUtDBDoR1t/1zm3ZtZgnte39iTJW6hlqjdY0UagKjpNiIv7J6XjtgfX7SgsR4AWnivqQHAICIvdPKfGZZzIs62OQ19MqrDTMoB/LvK5teNWhClv23WMUfRbP+EHgprT6hTw8U5apw1IB6i/y57NkLav792wiYBYRU4X45NoTaT+aiTSLFEflbfm94EXnhSS3vFkBmrZGy5BRNI8gmzafroslGx2Hk90CqlNdeKYxgZQ6xtvj+u33yrszWvPT6F9fsJT8aMjtvH050iYKRVct+x6Q7VRJgCI4MgvAexnTKdxW54YzvXCuO5bDiy5la7CgerWkTAq9dzXwIDAQAB"
+var pic = {};// 鏍肩嚎闄勪欢涓婁紶鍙傛暟灞炴��
+var rsakey = {
+ pubkey: "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkRupiYcKVGGUtDBDoR1t/1zm3ZtZgnte39iTJW6hlqjdY0UagKjpNiIv7J6XjtgfX7SgsR4AWnivqQHAICIvdPKfGZZzIs62OQ19MqrDTMoB/LvK5teNWhClv23WMUfRbP+EHgprT6hTw8U5apw1IB6i/y57NkLav792wiYBYRU4X45NoTaT+aiTSLFEflbfm94EXnhSS3vFkBmrZGy5BRNI8gmzafroslGx2Hk90CqlNdeKYxgZQ6xtvj+u33yrszWvPT6F9fsJT8aMjtvH050iYKRVct+x6Q7VRJgCI4MgvAexnTKdxW54YzvXCuO5bDiy5la7CgerWkTAq9dzXwIDAQAB"
};
+let arrayFileType_Panel = {};//淇濆瓨涓婁紶杩斿洖鐨勯檮浠秛uid;seq鍙婃枃浠剁被鍨�
+let arrayFileSeq_Panel = {};//淇濆瓨涓婁紶杩斿洖鐨勯檮浠秛uid;seq鍙婃枃浠跺悕绉帮紝鐢ㄤ簬鍒犻櫎鏃舵牴鎹枃浠跺悕绉板尮閰嶅埌seq
+let fileUploadCount_Panel = 0;//淇濆瓨闄勪欢鎬绘暟
+let formid_Panel;
+let paramExprs = [];//淇濆瓨鍔熻兘閾炬帴鍙傛暟鍊兼槸瀵嗘枃鐨勫弬鏁板悕绉�
+function encryptFun(value) {
+ var encrypt = new JSEncrypt();
+ encrypt.setPublicKey(rsakey.pubkey);
+ return encrypt.encrypt(value);
+}
+
//鎷兼帴闄勪欢url
-function getAttachmentUrl(staticUrl,formid,unid,domain,dbid,isShowOrgPic,width,height,fileExt,isDownLoad){
+function getAttachmentUrl(staticUrl, formid, unid, domain, dbid, isShowOrgPic, width, height, fileExt, isDownLoad) {
// if (staticUrl != null && staticUrl != "") {
// if (isDownLoad) {
// return unid + "_" + dbid + "_" + formid + "_" + fileExt;
@@ -87,7 +98,9 @@
onfileiput(formId, colname, panMain[0].panInfo[colname].controltype,
"", "", nodejs.usercode, value);
picevent(colname); // 浜嬩欢
- $doc(colname).val(value);
+ if (panMain[0].panInfo[colname].controltype != "9") {//9绫诲瀷鏄崟闄勪欢涓嶉渶瑕佸啀璧嬪��
+ $doc(colname).val(value);
+ }
}
}
@@ -108,12 +121,13 @@
uploadAsync: false, // bool鏄惁澶氭枃浠舵壒閲忎笂浼犲皢骞惰寮傛/銆傞粯璁や负true
showCaption: false,//鏄惁鏄剧ず琚�夋枃浠剁殑绠�浠�
showBrowse: false,//鏄惁鏄剧ず鏂囦欢娴忚鎸夐挳
- showBatchDownload:true,//鏄剧ず鎵归噺涓嬭浇鎸夐挳
+ showBatchDownload: true,//鏄剧ず鎵归噺涓嬭浇鎸夐挳
showUpload: false,//鏄惁鏄剧ず涓婁紶鎸夐挳
showCancel: false,//鏄惁鏄剧ず鍙栨秷鎸夐挳
showRemove: false,//鏄惁鏄剧ず绉婚櫎鎸夐挳
- showDrag:false,//鏄惁鏄剧ず鎷栧姩鎸夐挳
+ showDrag: false,//鏄惁鏄剧ず鎷栧姩鎸夐挳
showClose: false,//鏄惁鏄剧ず鍏抽棴鎸夐挳
+ multiple: id.type == 9 ? false : true,//by danaus 2024-02-19 17:39
dropZoneEnabled: true, //鏄惁鏄剧ず鎷栨嫿鍖哄煙
browseOnZoneClick: false, //甯冨皵鍊硷紝鏄惁鍦ㄧ偣鍑婚瑙堝尯鍩熸椂瑙﹀彂鏂囦欢娴忚/閫夋嫨銆傞粯璁や负false
showUploadedThumbs: true, // 鏄惁鍦ㄩ瑙堢獥鍙ｄ腑鎸佺画鏄剧ず宸茬粡涓婁紶鐨勬枃浠剁缉鐣ュ浘锛堢敤浜巃jax涓婁紶锛夛紝鐩村埌鎸変笅鍒犻櫎/娓呴櫎鎸夐挳
@@ -122,8 +136,8 @@
isNine: false, // 19绫诲瀷灏变负false,9绫诲瀷灏变负true,涓嬮潰鏈夊垽鏂�
validateInitialCount: false, // 鏄惁鍖呮嫭鍒濆棰勮鏂囦欢鏁帮紙鏈嶅姟鍣ㄤ笂浼犳枃浠讹級楠岃瘉minfilecount鍜宮axfilecount銆傞粯璁や负false.
overwriteInitial: true, // 鏄惁瑕佽鐩栧垵濮嬮瑙堝唴瀹瑰拰鏍囬璁剧疆
- initialPreviewAsData:true,
- allowedFileExtensions:null,//鍏佽涓婁紶鐨勬枃浠舵墿灞曞悕鍒楄〃銆傞粯璁ゆ儏鍐典笅璁剧疆涓� null
+ initialPreviewAsData: true,
+ allowedFileExtensions: null,//鍏佽涓婁紶鐨勬枃浠舵墿灞曞悕鍒楄〃銆傞粯璁ゆ儏鍐典笅璁剧疆涓� null
dropZoneTitle:'鐐瑰嚮鎴栨嫋鎷芥枃浠�',
dropZoneClickTitle:'',
layoutTemplates : {
@@ -174,7 +188,9 @@
'htm': '<i class="bi bi-filetype-html" style="color:#369584"></i>',
'txt': '<i class="bi bi-filetype-txt" style="color: #5d5a5a"></i>',
'mov': '<i class="bi bi-film"></i>',
- 'mp3': '<i class="bi bi-filetype-mp3"></i>'
+ 'mp3': '<i class="bi bi-filetype-mp3"></i>',
+ 'jpg':'<i class="bi bi-file-image" style="color: #45b8ab"></i>',
+ 'key':'<i class="bi bi-filetype-key" style="color: #3fa2e3"></i>'
},
previewFileExtSettings: {
'doc': function(ext) {
@@ -200,6 +216,9 @@
},
'mp3': function(ext) {
return ext.match(/(mp3|wav)$/i);
+ },
+ 'jpg':function (ext) {
+ return ext.match(/(jpg|png|jpeg|gif|ico|pic|bmp|tif)$/i);
}
},
isNodragging:false,//鑷畾涔夊睘鎬э紝鍦ㄥ彧璇荤姸鎬佹槸鍚﹀彲浠ユ墽琛屾嫋鎷�
@@ -233,16 +252,19 @@
fileInputId.fileinput('upload');
}).on('filebatchuploadsuccess', function(event, data) {
// 姝や簨浠朵粎鍦╝jax涓婁紶涓旀枃浠舵壒閲忎笂浼犳垚鍔熶箣鍚庤Е鍙�
- let tmp={};
- let oldKey=id.val();// 鏃х殑鍊�
- let newKey=data.response.uuid?data.response.uuid+";":""; // 鏂扮殑鍊�
- if(oldKey!=""){
- var keys=oldKey.split(";");
- for(var i=1;i<keys.length;i++){
- newKey=newKey.replace(";"+keys[i]+";",";");
+ fileUploadCount_Panel += data.files.length;
+ arrayFileSeq_Panel = JSON.parse(data.response.seqMap);
+ arrayFileType_Panel = JSON.parse(data.response.fileExtMap);
+ let tmp = {};
+ let oldKey = id.val();// 鏃х殑鍊�
+ let newKey = data.response.uuid ? data.response.uuid + ";" : ""; // 鏂扮殑鍊�
+ if (oldKey != "") {
+ var keys = oldKey.split(";");
+ for (var i = 1; i < keys.length; i++) {
+ newKey = newKey.replace(";" + keys[i] + ";", ";");
}
}
- tmp.key=newKey;
+ tmp.key = newKey;
tmp.type=data.response.type;
tmp.filedId=name;
tmp.oldKey=oldKey;
@@ -252,10 +274,10 @@
data.thumbs.attr("data-key",JSON.stringify(tmp));
}
// 鏍肩嚎璋冪敤
- if(g){
- let grid=g.id;
- let obj=unid+";"+data.response.fileType;// by by danaus 2020/4/30 11:32
- grid.SetValue(g.row, g.col,obj,0);
+ if(g) {
+ let grid = g.id;
+ let obj = unid + ";" + data.response.fileType;// by danaus 2020/4/30 11:32
+ grid.SetValue(g.row, g.col, obj, 0);
grid.RefreshCell(g.row, g.col);
}
}).on('filebeforedelete', function(event, params) {
@@ -265,6 +287,8 @@
}).on('filedeleted', function(event, key) {
// 鍦ㄥ垹闄nitialPreview鍐呭闆嗕腑鐨勬瘡涓缉鐣ュ浘鏂囦欢涔嬪悗瑙﹀彂姝や簨浠�
// 鏍肩嚎璋冪敤
+ debugger;
+ fileUploadCount_Panel--;
if (isGrid != null && isGrid == 'grid') {
if (g) {
let grid = g.id;
@@ -275,6 +299,7 @@
} else { // 闈㈡澘
let va = id.val();
key = key.split(";")[1];
+ delete arrayFileType_Panel[key];
va = va.replace(";" + key, "");
if (va.indexOf(";") < 0) {
va = "";
@@ -284,20 +309,21 @@
}
}).on('filesuccessremove', function(event, val) {
// 浣跨敤缂╃暐鍥惧垹闄ゆ寜閽垹闄ゆ垚鍔熶笂浼犵殑缂╃暐鍥惧悗锛屼細瑙﹀彂姝や簨浠�
- if(val!=null && val.key!=null){
- let vals = val.key.split(";");
- let uuid;
- let seq = 0;
- if (vals.length > 1) {
- uuid = val.key.split(";")[0];
- seq = val.key.split(";")[1];
- }
+ debugger;
+ if(val!=null && val.key!=null) {
+ let title = val.title;//鏂囦欢鍚嶇О锛岀敤浜庢煡鎵惧搴旂殑seq
+ let delSeq = arrayFileSeq_Panel[title];//瀵瑰簲鍒犻櫎鐨剆eq
+ let uuid = val.key.split(";")[0];
$.ajax({
type: "POST",
dataType: 'json',
- url: '/attachment/deleteOwnerAttachment.do?type=' + val.type + '&unid=' + uuid + '&seq=' + seq, // 鍒犻櫎璺緞
+ url: '/attachment/deleteOwnerAttachment.do?formid=' + formid_Panel + '&fieldid=' + val.filedId + '&ishd=1&type=' + val.type + '&unid=' + uuid + '&seq=' + delSeq, // 鍒犻櫎璺緞
success: function (data) {
- let newUid = val.oldKey == "" ? "" : val.oldKey.replace(";" + seq, "");
+ fileUploadCount_Panel--;
+ delete arrayFileSeq_Panel[title];
+ delete arrayFileType_Panel[uuid + ";" + delSeq];
+ // let newUid = val.oldKey == "" ? "" : val.oldKey.replace(";" + delSeq, "");
+ let newUid = val.key == "" ? "" : val.key.replace(";" + delSeq, "");//by danaus 2024-02-21 16:56
id.val(newUid);
}
});
@@ -357,6 +383,19 @@
modal.find('.kv-zoom-caption').attr('title', number[s].fileName);
modal.find('.viewsNumber').html(number[s].totaViewNums);
modal.find('.downNumber').html(number[s].totaDownNums);
+ modal.find('.numberofviews').attr('title','鎬绘煡鐪嬫鏁帮細'+number[s].totaViewNums);
+ modal.find('.amountofdownloads').attr('title','鎬讳笅杞芥鏁帮細'+number[s].totaDownNums);
+ if(number[s].hasPermission){
+ modal.find('.zoom-view').show();
+ modal.find('.viewNums').html(number[s].viewNums);
+ modal.find('.zoom-view').attr('title','鍏佽鏌ョ湅娆℃暟锛�'+number[s].allowViewNums+'\n鎮ㄥ凡鏌ョ湅锛�'+number[s].viewNums);
+ modal.find('.zoom-down').show();
+ modal.find('.downNums').html(number[s].downNums);
+ modal.find('.zoom-down').attr('title','鍏佽涓嬭浇娆℃暟锛�'+number[s].allowDownNums+'\n鎮ㄥ凡涓嬭浇锛�'+number[s].downNums);
+ }else{
+ modal.find('.zoom-view').hide();
+ modal.find('.zoom-down').hide();
+ }
break;
}
}
@@ -365,6 +404,29 @@
}
return o;
}
+//闄勪欢鏉冮檺鎺у埗璁剧疆
+// function readApproved(editstatus,docstatus,id,userCode,index){
+// let isReadOnly = true;//榛樿鍙
+// //鍙朣QL鏉′欢琛ㄨ揪寮忕粨鏋�
+// let expr = getDoc(id + "_expr", ".value");
+// let isEditUpload = ((expr != null && expr == 2) || expr == null) ? true : false;
+// let readonly = panMain[index] != null ? panMain[index].panInfo[id].ReadOnly : 0;//鏄惁鍙
+// if (readonly != 1 && (isNew == 1 || (predocstatus == docstatus && isEditUpload))) {
+// //鍙紪杈戦檮浠�
+// isReadOnly = false;
+// }
+// let editstatusArra = (editstatus != null && editstatus != "") ? editstatus.join(";") : [];
+// let isEditstatus = $.inArray(docstatus, editstatusArra);//鏄惁鍙互缂栬緫
+// let curChecker = getDoc("curchecker", ".value");//褰撳墠瀹℃牳浜�
+// let ApprovedUserCodes = getDoc("approvedusercodes", ".value");//鐢ㄤ簬璁板綍宸插鏍镐汉鍒楄〃
+// if (readonly != 1 && (predocstatus != docstatus && isEditUpload && isEditstatus) &&
+// ((curChecker != "" && curChecker.indexOf(userCode) != 1) ||
+// (curChecker == "" && ApprovedUserCodes.indexOf(userCode) != 1))) {
+// //鍙紪杈戦檮浠�
+// isReadOnly = false;
+// }
+// return isReadOnly;
+// }
/**
*-----end-----涓婇潰鐨勬柟娉曟槸閽堝9/19闄勪欢鎺т欢绫诲瀷 xin 2021-5-13 09:59:58
*/
@@ -378,6 +440,7 @@
* @param usercode 璐﹀彿
* @param uuid uuId
* @param maxFileSize 涓婁紶闄勪欢澶у皬闄愬埗鍊�
+ * @param index 闈㈡澘鍏冪礌锛堝涓潰鏉挎椂鍊欏氨鏄�0锛�1锛�2锛�
*/
function onfileiput(formid,id,controlType,docstatus,rowid,usercode,uuid,maxFileSize){
//鑾峰彇鍒版彃浠跺熀鏈睘鎬�
@@ -385,6 +448,7 @@
var isReadOnly = false;
try {
// 涓婁紶闄勪欢闇�瑕佺殑鍙傛暟
+ formid_Panel = formid;
var param = {};
var panelautoSave = "";//鏍囪鏄惁涓哄崟鎹�
var readerUserCodes = $('#readerusercodes').val();
@@ -401,13 +465,13 @@
try {
param.doccode = $('#doccode').val();
if (param.doccode == undefined) {
- param.doccode = panMain[panIndex].panelAuditValue.doccode;
+ param.doccode = panMain[panIndex].panelAuditValue.doccode;//panMain[panIndex].panelAuditValue.doccode;
}
if (param.doccode && readerUserCodes != undefined && readerUserCodes != '') {
param.readerusercodes = readerUserCodes;
}
} catch (e) {
- param.doccode = panMain[panIndex].panelAuditValue.doccode;
+ param.doccode = panMain[panIndex].panelAuditValue.doccode;//panMain[panIndex].panelAuditValue.doccode;
}
if (formType && (formType == 5 || formType == 9
|| formType == 15 || formType == 8
@@ -419,11 +483,13 @@
var ed = panMain[i].picState[id].split(";pb#");
param.headflag = ed[0];
param.editstatus = (ed.length > 1 && ed[1] != null ? ed[1] : ed[0]);
+ // isReadOnly=readApproved(param.editstatus,docstatus,id,usercode,index);
if (param.editstatus != "") {
if ((";" + param.editstatus + ";").indexOf(";" + docstatus + ";") > -1) {
isReadOnly = false;
} else {
isReadOnly = true;
+ //ApprovedUserCodes //鐢ㄤ簬璁板綍宸插鏍镐汉鍒楄〃
}
}
}
@@ -442,7 +508,7 @@
fileInput.option.otherActionButtons = '';//闅愯棌鏉冮檺
fileInput.option.isNodragging=true;//绂佹鎷栨嫿(鑷畾涔�)
}
- fileInput.option.browseOnZoneClick = !isReadOnly;//鏄彧璇荤姸鎬佸氨绂佺敤鐐瑰嚮鍖哄煙涓婁紶闄勪欢鍔熻兘
+ fileInput.option.browseOnZoneClick = !isReadOnly;//鏄彧璇荤姸鎬佸氨绂佺敤鐐瑰嚮鍖哄煙涓婁紶闄勪欢鍔熻兘(false琛ㄧず绂佺敤)
fileInput.option.maxFileSize = maxFileSize;//涓婁紶澶у皬锛坘b锛�
var encrypt = new JSEncrypt();
encrypt.setPublicKey(rsakey.pubkey);
@@ -453,6 +519,8 @@
param.dbid = jsons[0].dbid;
param.usercode = jsons[0].userCode;
param.username = jsons[0].userName;
+ //鏄柊鍗曢偅灏辫〃绀烘槸娌℃湁闄勪欢鐨勶紝瑕佹竻绌哄崟鎹噷闈㈠瓧娈电殑鍊�
+ $doc(id).val('');//娓呯┖
break;
}
// 鍥剧墖灞炴��
@@ -467,11 +535,28 @@
jsons[i].unid + "@p@" + jsons[i].seq, jsons[i].domain, jsons[i].dbid,
false, 60, 60, jsons[i].orgFileType);
//鏂囦欢鏄剧ず淇℃伅
- let title = '鏂囦欢鍚�:' + jsons[i].originalFileName +
- ' \n绫诲瀷:' + jsons[i].fileType +
- ' \n澶у皬:' + jsons[i].fileSizeStr +
- ' \n涓婁紶鑰�:' + jsons[i].authorName +
- ' \n涓婁紶鏃堕棿:' + jsons[i].uploadTimeStr;
+ let title = '鏂囦欢鍚嶏細' + jsons[i].originalFileName +
+ ' \n绫诲瀷锛�' + jsons[i].fileType +
+ ' \n澶у皬锛�' + jsons[i].fileSizeStr +
+ ' \n涓婁紶鑰咃細' + jsons[i].authorName +
+ ' \n涓婁紶鏃堕棿锛�' + jsons[i].uploadTimeStr +
+ ' \n\n鎬绘煡鐪嬫鏁帮細' + jsons[i].totalViewNums +
+ ' \n鎬讳笅杞芥鏁帮細' + jsons[i].totalDownNums;
+ if(jsons[i].hasPermission){
+ title += ' \n\n涓婁紶鑰呫��' + jsons[i].authorName + '銆戞巿鏉冩偍锛�'
+ title += ' \n鍏佽鏌ョ湅娆℃暟锛�' + jsons[i].allowViewNums +
+ ' \n鎮ㄥ凡鏌ョ湅锛�' + jsons[i].viewNums + '\n';
+ title += ' \n鍏佽涓嬭浇娆℃暟锛�' + jsons[i].allowDownNums +
+ ' \n鎮ㄥ凡涓嬭浇锛�' + jsons[i].downNums;
+ let msg="鏃犳椂闂撮檺鍒�"
+ if(jsons[i].dateFlag==0){
+ msg="鍏佽璁块棶锛�"+jsons[i].startTime.split(" ")[1]+" ~ "+jsons[i].endTime.split(" ")[1];
+ }
+ if(jsons[i].dateFlag==1){
+ msg="鍏佽璁块棶锛�"+jsons[i].startTime.substring(0,jsons[i].startTime.length-3)+" ~ "+jsons[i].endTime.substring(0,jsons[i].endTime.length-3);
+ }
+ title +='\n\n'+msg;
+ }
//涓嬭浇鍦板潃
let Down = jsons[i].domain + "/attachment/downLoadAttachment.do?filePath=" +
jsons[i].unid + "@p@" + jsons[i].seq + "_" + jsons[i].dbid + "_" +
@@ -492,9 +577,7 @@
// if (jsons[i].fileType.toLowerCase() == 'pdf') {//pdf鏍煎紡璋冪敤鎻掍欢
// fileURL = jsons[i].domain + '/general/pdf/web/viewer.jsp?file=' + fileURL;
// }
- if (jsons[i].orgFileType == 'doc' || jsons[i].orgFileType == 'docx' || jsons[i].orgFileType == 'xls'
- || jsons[i].orgFileType == 'xlsx' || jsons[i].orgFileType == 'ppt' || jsons[i].orgFileType == 'pptx') {
- jsons[i].fileType = 'office';
+ if (jsons[i].fileType == 'office') {//office绫诲瀷闇�瑕�
fileURL = encodeURIComponent(fileURL);
}
fileInput.option.initialPreview.push(fileURL);
@@ -503,7 +586,7 @@
'time': jsons[i].uploadTimeStr, //涓婁紶寮�濮嬫椂闂�
'name': jsons[i].authorName, //浣滆�呭悕绉�
'size': jsons[i].fileSizeStr, // 涓婁紶鐨勫浘鐗囧ぇ灏�
- 'type': jsons[i].fileType, // 涓婁紶鐨勫浘鐗囩被鍨�
+ 'type': jsons[i].allowView?jsons[i].fileType:'lock', // 涓婁紶鐨勫浘鐗囩被鍨�
'filename': jsons[i].originalFileName,//jsons[i].physicalFile, //鐗╃悊鏂囦欢
'filetype': jsons[i].fileType + '/' + jsons[i].orgFileType,
'title': title,//title
@@ -515,6 +598,7 @@
'hasZoom': jsons[i].allowView,//鏄惁鑳芥煡鐪�
// 'hasDwn': jsons[i].allowDownload,//鏄惁鑳戒笅杞�
'hasDel': jsons[i].allowDelete,//鏄惁鑳藉垹闄�
+ 'hasPermission':jsons[i].hasPermission,
'hasLock': jsons[i].authorCode != null && jsons[i].authorCode == param.usercode ? true : false,//鏄惁鑳芥樉绀烘潈闄�
'viewsNumber':jsons[i].viewNums,//鏌ョ湅娆℃暟
'downNumber':jsons[i].downNums//涓嬭浇娆℃暟
@@ -584,7 +668,7 @@
})
}
-/******鍥剧墖鍦ㄥ浘鐗囨鍐呮寜瀹介珮姣斾緥鑷姩缂╂斁锛侊紒锛�***/
+// 鍥剧墖鍦ㄥ浘鐗囨鍐呮寜瀹介珮姣斾緥鑷姩缂╂斁锛侊紒锛�
// Img:瑕佹斁鍥剧墖鐨刬mg鍏冪礌锛宱nload鏃朵紶鍙傚彲鐢╰his
// maxHeight :img鍏冪礌鐨勯珮搴︼紝鍍忕礌锛堝浘鐗囨 鏈�澶ч珮搴︼級
@@ -1083,7 +1167,7 @@
type: 2,//鍙紶鍏ョ殑鍊兼湁锛�0锛堜俊鎭锛岄粯璁わ級1锛堥〉闈㈠眰锛�2锛坕frame灞傦級3锛堝姞杞藉眰锛�4锛坱ips灞傦級銆� 鑻ヤ綘閲囩敤layer.open({type: 1})鏂瑰紡璋冪敤
shade: 0.1,
title: "缁存姢闄勪欢涓婁紶鏉冮檺", //涓嶆樉绀烘爣棰�
- area: ['1280px', '650px'], //瀹介珮
+ area: ['1300px', '650px'], //瀹介珮
content: '/general/fileInputoa/uploadPromission.html?unid='+s[0]+'&seq='+s[1],
cancel: function () {
layer.closeAll();
@@ -1279,7 +1363,8 @@
// f:鍔熻兘鍙� t:鍔熻兘绫诲瀷 sf:鑷韩瀛楁 lf:澶栬〃瀛楁 lk:涓�1鏃舵墽琛屽瓨鍌ㄨ繃绋�,0鏄剧ず鐣岄潰锛�3寮瑰嚭灞�
// sd:鑷〃瀛楁 ld:澶栬〃瀛楁 isp: ef:where鏉′欢璇彞 mes:鎻愮ず淇℃伅
// clo:1琛ㄧず鍏抽棴
-function funcLink(f, t, sf, lf, lk, sd, ld, isp, ef, mes, ref, clo, autoSave,sortid,messageTip) {
+//rowid,琛ㄦ牸褰撳墠琛宨d
+function funcLink(f, t, sf, lf, lk, sd, ld, isp, ef, mes, ref, clo, autoSave,sortid,messageTip,rowid) {
var flag = checkSession(); // session澶辨晥鍚庡脊鍑虹櫥褰曟,flag涓簍rue鏃惰〃绀哄凡缁忓け鏁�
if(flag){
return;
@@ -1300,7 +1385,7 @@
lfs=lf.split(";"); // 瀛楁鍒嗛殧鍥哄畾鐢�;
sfs=sf.split(split);
if (sfs.length != lfs.length) {
- $.messager.alert('璀﹀憡', "璇锋鏌ュ琛ㄥ瓧娈典笌鑷韩瀛楁鏄惁璁剧疆姝ｇ‘锛�", 'error');
+ $.messager.alert('璀﹀憡', "澶栬〃瀛楁涓庤嚜韬瓧娈典釜鏁颁笉涓�鑷达紝璇锋鏌ュ琛ㄥ瓧娈典笌鑷韩瀛楁鏄惁璁剧疆姝ｇ‘锛�", 'error');
return;
}
if (mes&&mes.indexOf("&") != -1 && t == "22") {
@@ -1333,8 +1418,8 @@
//$.messager.defaults = { ok: "鏄�", cancel: "鍚�" };
$.messager.confirm('鎻愮ず', mes, function(r) {
if (r) {
- funcLink$(f, t, sfs, lfs, lk, sd, ld, isp, ef, ref, clo,
- autoSave, sortid, messageTip, mes);
+ funcLink$(f, t, sfs, lfs, lk, sd, ld, isp, ef, ref, clo,
+ autoSave, sortid, messageTip, mes, rowid);
$('.panel-tool-close').show();
}else {
closeLoading(); //鏇存柊瀹㈡埛鐘舵�佺殑鍙栨秷
@@ -1343,7 +1428,7 @@
}, "warning");
$('.panel-tool-close').hide(); //鍙栨秷鏇存柊瀹㈡埛鐘舵�佺殑寮瑰嚭妗嗙孩鍙� yang 2020-04-26
} else {
- funcLink$(f, t, sfs, lfs, lk, sd, ld, isp, ef, ref, clo, autoSave,sortid,messageTip);
+ funcLink$(f, t, sfs, lfs, lk, sd, ld, isp, ef, ref, clo, autoSave,sortid,messageTip,"",rowid);
}
// 绯荤粺娑堟伅
if(messageTip!=null && messageTip.indexOf(",")!=-1){
@@ -1356,18 +1441,18 @@
//moreWindowClose(); // 2銆�3绫诲瀷鏇村鎸夐挳鐨勫叧闂簨浠�
}
-function funcLink$(f, t, sfs, lfs, lk, sd, ld, isp, ef, ref, clo, autoSave, sortid, messageTip, mes) {
+function funcLink$(f, t, sfs, lfs, lk, sd, ld, isp, ef, ref, clo, autoSave, sortid, messageTip, mes,rowid) {
if (isp && isp == "1") {
showPwd(f, t, function () {
- funcLink$$(f, t, sfs, lfs, lk, sd, ld, ef, ref, clo, autoSave, sortid, messageTip, mes);
+ funcLink$$(f, t, sfs, lfs, lk, sd, ld, ef, ref, clo, autoSave, sortid, messageTip, mes,rowid);
});
} else {
- funcLink$$(f, t, sfs, lfs, lk, sd, ld, ef, ref, clo, autoSave, sortid, messageTip, mes);
+ funcLink$$(f, t, sfs, lfs, lk, sd, ld, ef, ref, clo, autoSave, sortid, messageTip, mes,rowid);
}
}
var savedExecFunclink;
-function funcLink$$(f, t, sfs, lfs, lk, sd, ld, ef, ref, clo, autoSave, sortid, messageTip, mes) {
+function funcLink$$(f, t, sfs, lfs, lk, sd, ld, ef, ref, clo, autoSave, sortid, messageTip, mes,rowid) {
savedExecFunclink = null;
if (t == "22") {
// autoSave=='1'鏄鍏堟墽琛屼繚瀛�
@@ -1379,11 +1464,11 @@
} else {
savedExecFunclink = $(function () {
execProc(param[0], param[1], param[2], param[3], param[4],
- param[8], param[9], messageTip, mes);
+ param[8], param[9], messageTip, mes,rowid);
});
}
} else {
- execProc(f, t, sfs, lfs, lk, ref, clo, messageTip, mes);
+ execProc(f, t, sfs, lfs, lk, ref, clo, messageTip, mes,rowid);
}
} else {
// autoSave=='1'鏄鍏堟墽琛屼繚瀛�
@@ -1391,7 +1476,7 @@
var param = arguments;
savedExecFunclink = $(function(){
funclink$$$(param[0], param[1], param[2], param[3], param[4],
- param[5], param[6], param[7], param[8], param[9]);
+ param[5], param[6], param[7], param[8], param[9],rowid);
});
} else {
var lfsStr=lfs.join(","); // 鎶婁紶杩涙潵鐨勫琛ㄥ瓧娈�(鏁扮粍绫诲瀷)璺熻嚜琛ㄥ瓧娈�(鏁扮粍绫诲瀷)杞崲鎴愬瓧绗︿覆
@@ -1410,7 +1495,7 @@
}
- funclink$$$(f, t, sfs, lfs, lk, sd, ld, ef, ref, clo,messageTip);
+ funclink$$$(f, t, sfs, lfs, lk, sd, ld, ef, ref, clo,messageTip,rowid);
}
}
}
@@ -1422,12 +1507,16 @@
}
}catch(e){}
}
-function funclink$$$(f, t, sfs, lfs, lk, sd, ld, ef, ref, clo,messageTip) {
+function funclink$$$(f, t, sfs, lfs, lk, sd, ld, ef, ref, clo,messageTip,rowid) {
var rows=[];
var num=0;
if (typeof (mygrid) != "undefined") {
- rows=mygrid.getFieldForNew();
+ if(rowid!=undefined&&rowid!=""){
+ rows.push(mygrid.Rows[rowid]);
+ }else{
+ rows=mygrid.getFieldForNew();
+ }
if(rows.length==0){
num=1;
}else {
@@ -1496,27 +1585,31 @@
- var wp = $.trim(selfStr).length > 0 ? ("wherePan=" + strPam) : "";
+ let wp = $.trim(strPam).length > 0 ? (strPam) : "";
if (ef != undefined && ef != null && ef != "")
- wp = (wp == "") ? "wherePan=" + encodeURI(encodeURI(ef)) : wp + " and "
+ wp = (wp == "") ? encodeURI(encodeURI(ef)) : wp + " and "
+ encodeURI(encodeURI(ef));
try {
closeLoading();
- parent.addTab("", f, t, wp);
+ parent.addTab("", f, t, "wherePan=" +encodeURIComponent(wp));
} catch (e) {
closeLoading();
- showWindow("/app" + spellPath + f + "/" + t + "/index.jsp?" + wp, "");
+ showWindow("/app" + spellPath + f + "/" + t + "/index.jsp?" + "wherePan=" +wp, "");
}
}
var execParams = []; // 22绐椾綋浼犲�� lk琛ㄧず鏄惁鎵撳紑鐣岄潰鎴栧脊鍑哄眰
-function execProc(f, ft, sfs, lfs, lk, ref, clo, exec, mes) { // 鍌ㄥ瓨杩囩▼
+function execProc(f, ft, sfs, lfs, lk, ref, clo, exec, mes,rowid) { // 鍌ㄥ瓨杩囩▼
var paramVa = "";
var t = null;
var rows = [];
var num = 0;
if (typeof (mygrid) != "undefined") {
- rows = mygrid.getFieldForNew();
+ if(rowid!=undefined&&rowid!=""){
+ rows.push(mygrid.Rows[rowid]);
+ }else {
+ rows = mygrid.getFieldForNew();
+ }
if(rows.length==0){
num=1;
}else {
@@ -1601,6 +1694,8 @@
data: {
"formid": f,
"param": paramVa,
+ "paramFields": lfs.join(";"),//鍊煎搴旇鐨勫瓧娈靛垪琛�
+ "paramExprs": paramExprs.join(";"),//鍊煎搴旇鐨勫瓧娈垫潈闄�=0鍒楄〃
"disableDuplicateSubmitUUID": systemUuid.uuid //by danaus 2019/11/22 11:12
},
beforeSend: function (XMLHttpRequest) {
@@ -1732,10 +1827,54 @@
}
}
$.messager.alert('鎻愮ず', msg || '鍑虹幇閿欒', "info");
- } else {
+ }else if(data.state != null && data.state==-1007){//
+ //鐧炬湜浜戝钩鍙拌处鍙峰凡杩囨湡锛岄噸鏂扮櫥褰�
+ $.messager.alert('鎻愮ず', data.msg, "info", function () {
+ /*layer.open({
+ type: 2,
+ title: '鐧诲綍鐧炬湜浜戝钩鍙�',
+ maxmin: false,
+ skin: 'layui-layer-molv',
+ shadeClose: true, //鐐瑰嚮閬僵鍏抽棴灞�
+ area : ['1300px' , '800px'],
+ content: 'https://www.baiwang.com/mainsite/src/html/login/login.html'
+ });*/
+ window.open(data.data.url,'',' width='+ (screen.availWidth - 10) +',height='+ (screen.availHeight-50) +',scrollbars,resizable=yes,toolbar=no');
+ return;
+ });
+
+ }else if(data.state != null && data.state==-1008){
+ //鐧炬湜浜戝钩鍙板埛鑴搁獙璇�
+ layer.open({
+ type: 2,
+ area: ['788px', '680px'],
+ title: ['椋庢帶妫�娴�', 'font-size:18px;text-align:center;font-weight:600;'],
+ resize: false,
+ fixed: false,
+ shade: 0,
+ content: '/js/faceswiping/faceswiping.html',
+ isOutAnim: false,
+ success: function (layero, index) {
+ // 鑾峰彇寮瑰嚭鐨� iframe 椤甸潰瀵硅薄
+ top.layIframeWindow = window[layero.find("iframe")[0]['name']];
+ //obj={info:{taxNo:"xxxx",taxUserName:"寮犱笁",authId:"336363636"}}
+ // console.log("faceswip:"+JSON.stringify(obj))
+ top.layIframeWindow.faceSwipingInit(data);
+ top.layeerFace=layero;
+ }
+ });
+ } else if (data.errcode != null && data.errcode == 0) {
+ $.messager.confirm('鎻愮ず', "鎷夊彇浼佷笟寰俊鏍囩宸插悓姝�", function(r) {
+ if(r){
+ location.reload();
+ }else{
+ location.reload();
+ }
+ });
+ }else {
try{
var obj=JSON.parse(data);
- $.messager.alert('鎻愮ず', obj.msg, "info");
+ $.messager.alert('鎻愮ず', obj.msg, "info");
}catch (e) {
$.messager.alert('鎻愮ず', data || '鐘舵�佹棤娉曡瘑鍒細' + data.state, "info");
}
@@ -1841,18 +1980,19 @@
if(info.indexOf("buildv2.do") > -1){ // 鐢熸垚椤甸潰 by danaus 13-6-28 澧炲姞杩斿洖鐢熸垚椤甸潰鍜屾墦寮�澶氫釜鍔熻兘鍙峰寮犲崟鐨勫姛鑳�
$.get(info);
}else if(info.indexOf("open.callBack|") ==0){//澶勭悊绗笁鏂硅繑鍥炵殑鏁版嵁锛屾墦寮�鍙︿竴涓〉鍗�
- var url=info.replace("open.callBack|","");
- // showLayerGrid(url,1,'900px','600px');
- var perContent= layer.open({
+ info=info.replace("open.callBack|","").split("|");
+ var obj=JSON.parse(info[1]);
+ /* var perContent= layer.open({
type: 2,
title: '寰风珛娴嬮噺鍗曚俊鎭�',
maxmin: false,
skin: 'layui-layer-molv',
shadeClose: true, //鐐瑰嚮閬僵鍏抽棴灞�
area : ['1300px' , '800px'],
- content: url //'/app/67/0/cnzh/110502/1/index.jsp'
+ content: info[0]+obj.Url //'/app/67/0/cnzh/110502/1/index.jsp'
});
- layer.full(perContent);
+ layer.full(perContent);*/
+ window.open(info[0]+obj.Url,'',' width='+ (screen.availWidth - 10) +',height='+ (screen.availHeight-50) +',scrollbars,resizable=yes,toolbar=no');
}else{ // 鎵撳紑椤甸潰
var tt=info.split("|");
for(var i=0;i<tt.length;i++){
@@ -1894,7 +2034,10 @@
if (r == "1") {
if(location) location.reload();
}else if(r=="2"){
- if(mygrid) mygrid.ReloadBody();
+ if(mygrid){
+ mygrid.ReloadBody();
+ mygrid.AllSelected=0;//鍒锋柊琛ㄦ牸鏃舵竻闄ゅ叏閫夌姸鎬� by danaus 2023-08-26 15:14
+ }
}
if (c == "1") {
if(parent) parent.closeTab();
@@ -1967,6 +2110,18 @@
}
}
+//鑷畾涔夋帶浠跺竷灞�鐨勬柟娉�
+function editCustomControl(){
+ let formid = formId;
+ let formtype = formType;
+ let docCode = '';
+ if (typeof getDoc !="undefined") {
+ getDoc("doccode", ".value");
+ }
+ let queryString = "";
+ let url = "/general/CustomControl/editLayout.html?formId=" + formid + "&formType=" + formtype + "&docCode=" + docCode+"&tabIndex="+top.tabindex;
+ top.addTab(top.layoutTitle+'甯冨眬', '', '', '', url, '', '');
+}
/**
* top椤甸潰info鎸夐挳鎵ц鍑芥暟
* @returns
@@ -1991,8 +2146,21 @@
function showLoading() {
$("#loading").show();
}
+function closeLoadingButton(){
+ let close = $(".loadingClose");
+ if (close) {close.remove();}
+ $(".loadingMsg").after("<p class=\"loadingClose\">" +
+ "<button class='easyui-linkbutton l-btn l-btn-small' onclick='javascript: closeLoading()'>鍏抽棴" +
+ "</button></p>");
+}
function closeLoading() {
$("#loading").hide();
+}
+//閿欒寮傚父鐨勬崟鑾� xin 2023-8-22 10:34:29
+window.onerror=function (message, source, lineno, colno, error) {
+ closeLoadingButton();
+ console.log(message);
+ return true; // 闃叉寮傚父鐨勯粯璁よ涓�
}
/** ***************************************** */
Object.extend = function(destination, source) {
@@ -2102,39 +2270,54 @@
}
return str;
}
-function getValue(str,format,row) { // 鑾峰彇椤甸潰鍊�
- var t;
+
+function getValue(fieldId, format, row) { // 鑾峰彇椤甸潰鍊�
+ let value;
try {
- t = getDoc(str.toLowerCase(), ".value");
+ //TODO銆�鏄疄鐜伴潰鏉块渶瑕佹牴鎹潈闄愭槸鍚︿负0鍙栦笉鍚岀殑鍊� by danaus 2024-03-08 14:53
+ value = getDoc(fieldId.toLowerCase(), ".value");
+ let value_expr = getDoc(fieldId.toLowerCase() + "_expr", ".value");
+ let value_expr_val = getDoc(fieldId.toLowerCase() + "_expr_val", ".value");
+ if (value_expr != undefined&&value_expr != null&&value_expr !=="" && value_expr == 0) {
+ value = value_expr_val;
+ paramExprs.push(fieldId.toLowerCase());
+ }
} catch (e) {
- t=undefined; // by danaus 鍑虹幇寮傚父璧嬪�� 浣滀负鍒ゆ柇璇嗗埆
+ value = undefined; // by danaus 鍑虹幇寮傚父璧嬪�� 浣滀负鍒ゆ柇璇嗗埆
}
- if(t==null){ // 鍙湁鏄繖绉嶆儏鍐垫墠闇�瑕佺户缁悜涓嬫煡鎵� by danaus 鍘熷垯锛氬鏋滈〉闈笂鏈夎繖涓瓧娈靛畾涔夛紝涓嶇瀹冩槸浠�涔堝�硷紝閮芥妸瀹冩浛鎹紝濡傛灉娌℃湁杩欎釜瀛楁锛屽氨缁х画鍚戜笅鏌ユ壘锛岀洿鍒版病鏈� 鍒欎笉鐢ㄦ浛锛堜紶浠�涔堝氨鏄粈涔堬級
+ if (value == null) { // 鍙湁鏄繖绉嶆儏鍐垫墠闇�瑕佺户缁悜涓嬫煡鎵� by danaus 鍘熷垯锛氬鏋滈〉闈笂鏈夎繖涓瓧娈靛畾涔夛紝涓嶇瀹冩槸浠�涔堝�硷紝閮芥妸瀹冩浛鎹紝濡傛灉娌℃湁杩欎釜瀛楁锛屽氨缁х画鍚戜笅鏌ユ壘锛岀洿鍒版病鏈� 鍒欎笉鐢ㄦ浛锛堜紶浠�涔堝氨鏄粈涔堬級
if (typeof (mygrid) != "undefined") {
try {
- if(row==undefined){
- var tempRow=mygrid.getFristRow(1);//鍐嶅垽鏂竴娆★紝浠ョ‘瀹氳繖涓瓧娈垫槸鍚﹀瓨鍦ㄤ簬琛ㄦ牸锛屽瓨鍦ㄦ墠闇�瑕佹彁绀�
- if(tempRow!=null&&tempRow[str.toLowerCase()]!=undefined) {
+ if (row == undefined) {
+ var tempRow = mygrid.getFristRow(1);//鍐嶅垽鏂竴娆★紝浠ョ‘瀹氳繖涓瓧娈垫槸鍚﹀瓨鍦ㄤ簬琛ㄦ牸锛屽瓨鍦ㄦ墠闇�瑕佹彁绀�
+ if (tempRow != null && tempRow[fieldId.toLowerCase()] != undefined) {
alert("璇蜂粠琛ㄦ牸閫変腑闇�瑕佹墽琛岀殑琛�");
return false;
}
}
- var d=t; // 淇濆瓨鍘熷��
- if(row!=undefined){
- t = (row[str.toLowerCase()+"Link"]!==undefined)?row[str.toLowerCase()+"Link"]:((row[str.toLowerCase()]==undefined)?null:row[str.toLowerCase()]);
- }else{
- t=mygrid.getField(str.toLowerCase());
+ let orgValue = value; // 淇濆瓨鍘熷��
+ if (row != undefined) {
+ value = (row[fieldId.toLowerCase() + "Link"] !== undefined) ? row[fieldId.toLowerCase() + "Link"] : ((row[fieldId.toLowerCase()] == undefined) ? null : row[fieldId.toLowerCase()]);
+ if (row[fieldId.toLowerCase() + "_expr"] != undefined&& row[fieldId.toLowerCase() + "_expr"]!=="" && row[fieldId.toLowerCase() + "_expr"] === 0) {
+ //瀵嗘枃锛屽彇_expr_val鐨勫��
+ value = row[fieldId.toLowerCase() + "_expr_val"];
+ paramExprs.push(fieldId.toLowerCase());
+ }
+ } else {
+ value = mygrid.getField(fieldId.toLowerCase());
}
- if (t==null&&d==null) return str;
+ if (value == null && orgValue == null) return fieldId;
} catch (e) {
- return str;
+ return fieldId;
}
}
- return t;
- }else{
- if(t=='null'){t="";}
- return t;
+ return value;
+ }else {
+ if (value == 'null') {
+ value = "";
+ }
+ return value;
}
}
@@ -2194,6 +2377,7 @@
}
if (Warnnessage == "" || Warn()) {
var proParam = "";
+ let doccodes=[];//澶氫釜鍗曟嵁鎵撳嵃鐨勫鐞嗭紙鏇存柊鎵撳嵃娆℃暟鐢ㄥ埌锛�
if ($.trim(param) != "") {
if (param.indexOf("@formid") != -1) {
param = param.replaceAll("@formid", formId);
@@ -2228,8 +2412,29 @@
continue;
}
t = getValue(tempx.toLowerCase(),null,rows[k]);
- if (t==null)
+ if (t==null){
t = tempx;
+ }else{
+ if (tempx.toLowerCase() == "doccode" && t != "") {//濡傛灉鑾峰彇鍒扮殑鏄崟鎹浐瀹氬瓧娈靛悕绉拌繘鍏ュ鐞�
+ doccodes.push(t);
+ }
+ }
+ //43鎺т欢澶勭悊
+ let panM = panMain[panIndex];
+ if (panM != null) {
+ if (panM.panInfo[tempx.toLowerCase()] != null) {
+ if (panM.panInfo[tempx.toLowerCase()].controltype == 43) {
+ t = $("#" + tempx.toLowerCase()).val();
+ if (t != null && t != "") {
+ if (t instanceof Array) {
+ t = t.join("#p#");//鐢ㄥ垎鍙凤紙;锛夊仛闂撮殧鐨勮瘽鍐嶄紶鍙傚悗鍙颁細琚埅鏂�
+ }
+ } else {
+ t = "";
+ }
+ }
+ }
+ }
proParam += t; // 缁勮鍊�
}
proParam +=";";
@@ -2240,6 +2445,9 @@
// var servlet = "/" + format.toLowerCase() + ".do?"
var servlet="/printReport.do?m="+format.toLowerCase()
var doccode = getDoc("doccode", ".value");//鍙彇琛ㄥご by danaus 2022/8/17 11:10 getValue('doccode');
+ if (doccode == null && doccodes.length > 0) {//娌℃壘鍒拌繖涓崟鍙�,澶氫釜鍗曞彿鏁扮粍閲屾湁鍊肩殑璇濆氨璧嬪�� xin 2023-10-13 10:57:54
+ doccode = doccodes.join(";");
+ }
var url = "formId=" + formid + "&reportId=" + reportid + "¶meter=" + proParam+";"
+ "&p=" + Math.round(Math.random() * 100000);
//html鏂规硶鎵撳嵃
@@ -2414,6 +2622,7 @@
if ((C_Grid != undefined && C_Grid != "" && eval('(' + C_Grid + ')').toP != "" && eval('(' + C_Grid + ')').toP != "null")
|| $.trim(postToThis).length > 0 || self_datafields != "") {
$("#tpselect").show();
+ $(".selected-icon-container").show();
}
parent.numId = ""; // 璁剧疆鍗曞彿鐨勫��
})
@@ -2620,6 +2829,63 @@
},'json')
})
+/**
+ * css鏍峰紡缂栬緫鍣� xin 2024-1-29 10:34:34
+ * @param grid
+ * @param panel
+ */
+//getTextCssEdit(option)//option鏄牸绾垮綋鍓嶈瑙﹀彂鐨勫璞″彲浠ヨ幏鍙栧�煎拰杩斿洖
+var textCssOption={};
+function getTextCssEdit(option){
+ if (option && option.close) {//鍏抽棴
+ if (option.type == 1 && option.value != null) {//缁欓潰鏉胯祴鍊�
+ $doc(textCssOption.id).val(option.value);
+ }
+ layer.closeAll();
+ return false;
+ }
+ let cssText = "";
+ let type = 0;
+ let pindex = 0;
+ if (typeof (panIndex) != "undefined") {
+ pindex = panIndex;
+ }
+ textCssOption = option;
+ if (option && option.id) {//鑾峰彇鍊�(闈㈡澘)
+ if (option.index != null) {//鍙栧搴斿厓绱犵殑鎺т欢鍊�
+ panIndex = option.index;
+ cssText = $doc(option.id).val();
+ } else {
+ cssText = $("#" + option.id).val();
+ }
+ type = 1;//闈㈡澘鎺т欢
+ }
+ if(option.grid || option.value){//鑾峰彇鍊硷紙鏍肩嚎锛�
+ cssText=option.value;
+ }
+ layer.open({
+ type: 2,
+ area: ['400px', '780px'],
+ closeBtn: 0,
+ isOutAnim: false,
+ title: false,
+ resize: false,
+ fixed: false,
+ shade: 0.6,
+ skin: 'layui-layer-molv',
+ shadeClose: false, // 鐐瑰嚮閬僵鍖哄煙锛屽叧闂脊灞�,
+ content: encodeURL('/general/textCssEdit/textCssEdit.html?cssText=' + cssText + '&type=' + type + '&grid=' + option.grid),//cssText鏈夊�兼椂鍊欏彲浠ヤ紶杩囧幓
+ move: false,
+ success: function (layero, index) {
+ // createFormElement();
+ }, cancel: function (index, layero) {
+ panIndex = pindex;
+ }, end: function () {
+ panIndex = pindex;
+ }
+ });
+}
+
function checkVersion(){
setTimeout(checkVersion, 86400000);
setTimeout(checkVersion2, 86400000);//24灏忔椂璋冪敤涓�娆�
--
Gitblit v1.8.0