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 | 232 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 170 insertions(+), 62 deletions(-)
diff --git a/WebRoot/js/index/funcLink.js b/WebRoot/js/index/funcLink.js
index f4aa3f1..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 : {
@@ -238,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;
@@ -257,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) {
@@ -270,6 +287,8 @@
}).on('filedeleted', function(event, key) {
// 鍦ㄥ垹闄nitialPreview鍐呭闆嗕腑鐨勬瘡涓缉鐣ュ浘鏂囦欢涔嬪悗瑙﹀彂姝や簨浠�
// 鏍肩嚎璋冪敤
+ debugger;
+ fileUploadCount_Panel--;
if (isGrid != null && isGrid == 'grid') {
if (g) {
let grid = g.id;
@@ -280,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 = "";
@@ -289,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);
}
});
@@ -427,6 +448,7 @@
var isReadOnly = false;
try {
// 涓婁紶闄勪欢闇�瑕佺殑鍙傛暟
+ formid_Panel = formid;
var param = {};
var panelautoSave = "";//鏍囪鏄惁涓哄崟鎹�
var readerUserCodes = $('#readerusercodes').val();
@@ -497,6 +519,8 @@
param.dbid = jsons[0].dbid;
param.usercode = jsons[0].userCode;
param.username = jsons[0].userName;
+ //鏄柊鍗曢偅灏辫〃绀烘槸娌℃湁闄勪欢鐨勶紝瑕佹竻绌哄崟鎹噷闈㈠瓧娈电殑鍊�
+ $doc(id).val('');//娓呯┖
break;
}
// 鍥剧墖灞炴��
@@ -1394,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,rowid);
+ funcLink$(f, t, sfs, lfs, lk, sd, ld, isp, ef, ref, clo,
+ autoSave, sortid, messageTip, mes, rowid);
$('.panel-tool-close').show();
}else {
closeLoading(); //鏇存柊瀹㈡埛鐘舵�佺殑鍙栨秷
@@ -1561,16 +1585,16 @@
- 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, "");
}
}
@@ -1671,6 +1695,7 @@
"formid": f,
"param": paramVa,
"paramFields": lfs.join(";"),//鍊煎搴旇鐨勫瓧娈靛垪琛�
+ "paramExprs": paramExprs.join(";"),//鍊煎搴旇鐨勫瓧娈垫潈闄�=0鍒楄〃
"disableDuplicateSubmitUUID": systemUuid.uuid //by danaus 2019/11/22 11:12
},
beforeSend: function (XMLHttpRequest) {
@@ -1836,6 +1861,14 @@
// 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 {
@@ -2081,10 +2114,13 @@
function editCustomControl(){
let formid = formId;
let formtype = formType;
- let docCode = getDoc("doccode", ".value");
+ let docCode = '';
+ if (typeof getDoc !="undefined") {
+ getDoc("doccode", ".value");
+ }
let queryString = "";
- let url = "/general/CustomControl/editLayout.html?formId=" + formid + "&formType=" + formtype + "&docCode=" + docCode;
- top.addTab('鑷畾涔夋帶浠跺竷灞�', '', '', '', url, '', '');
+ let url = "/general/CustomControl/editLayout.html?formId=" + formid + "&formType=" + formtype + "&docCode=" + docCode+"&tabIndex="+top.tabindex;
+ top.addTab(top.layoutTitle+'甯冨眬', '', '', '', url, '', '');
}
/**
* top椤甸潰info鎸夐挳鎵ц鍑芥暟
@@ -2234,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;
}
}
@@ -2778,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