|
|
@@ -110,7 +110,7 @@
|
|
|
var win=wd.topWindow.dhxWins.window(wdDialogId);
|
|
|
win.button("wdBatchPrint").show();
|
|
|
win.button("wdBatchPrint").onclick=function(){
|
|
|
- <varServ@ss dlg="true" name="${prt.service}" dest="${prt.dest}" parm="${prt.param}" title="${prt.title}" width="${prt.width}" height="${prt.height}" minHeight="${prt.minHeight}" maxHeight="${prt.maxHeight}"/>
|
|
|
+ <varServ@ss dlg="true" name="${prt.servName}" dest="${prt.dest}" parm="${prt.parm}" title="${prt.title}" width="${prt.width}" height="${prt.height}" minHeight="${prt.minHeight}" maxHeight="${prt.maxHeight}"/>
|
|
|
}
|
|
|
}catch(e){
|
|
|
console.log(e);
|
|
|
@@ -128,7 +128,7 @@
|
|
|
<body>
|
|
|
<div id="app">
|
|
|
<form class="page-container" id="myForm"
|
|
|
- action="<ss:serv name='${currentService.service}' dest='${currentService.dest}' parm='${currentService.param}'/>"
|
|
|
+ action="<ss:serv name='${currentService.servName}' dest='${currentService.dest}' parm='${currentService.parm}'/>"
|
|
|
method="post">
|
|
|
<input type="hidden" name="isAnd" value='${isAnd}'/>
|
|
|
<input name="management" type="hidden" value="${management}"/>
|
|
|
@@ -153,7 +153,7 @@
|
|
|
:opt="searchFieldOptMap[f.name] || []"
|
|
|
:placeholder="f.desc || ''"
|
|
|
width="120"
|
|
|
- :inp="true"
|
|
|
+ inp="true"
|
|
|
url="/service?ssServ=loadObjpOpt&objectpickerdropdown1=1"
|
|
|
:cb="f.cbName"
|
|
|
></ss-objp>
|
|
|
@@ -355,16 +355,16 @@
|
|
|
<ss:rpt name='buttonList' id='button'>
|
|
|
<ss:equal val='${dataType}'
|
|
|
valList='normal,update,change,bdplay'> <%-- 增加,查看时隐去管理按钮。原来会去掉管理按钮,不知在哪去掉的???Lin --%>
|
|
|
- <ss:auth serv='${button.service}'>
|
|
|
+ <ss:auth serv='${button.servName}'>
|
|
|
<ss:equal val='${empty button.pluginList}' val2='true'>
|
|
|
<%--<input type="button" name="${button.name}" value="${button.buttonName}" class="content-button"
|
|
|
- onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='${button.service}' dest='${button.dest}' parm='${button.param}'/>",title:"${button.title}",width:"${button.width}",height:"${button.height}",minHeight:"${button.minHeight}",maxHeight:"${button.maxHeight}",showTitle:"${button.showTitle}"});'/>--%>
|
|
|
+ onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='${button.servName}' dest='${button.dest}' parm='${button.parm}'/>",title:"${button.title}",width:"${button.width}",height:"${button.height}",minHeight:"${button.minHeight}",maxHeight:"${button.maxHeight}",showTitle:"${button.showTitle}"});'/>--%>
|
|
|
|
|
|
<script>
|
|
|
function ${button.id}handleClick() {
|
|
|
wd.display.showComponent({
|
|
|
show: ["wdDialog"],
|
|
|
- url: "<ss:serv name='${button.service}' dest='${button.dest}' parm='${button.param}'/>",
|
|
|
+ url: "<ss:serv name='${button.servName}' dest='${button.dest}' parm='${button.parm}'/>",
|
|
|
title: "${button.title}",
|
|
|
width: "${button.width}",
|
|
|
height: "${button.height}",
|
|
|
@@ -381,7 +381,7 @@
|
|
|
onclick: () => {
|
|
|
wd.display.showComponent({
|
|
|
show: ["wdDialog"],
|
|
|
- url: "<ss:serv name='${button.service}' dest='${button.dest}' parm='${button.param}'/>",
|
|
|
+ url: "<ss:serv name='${button.servName}' dest='${button.dest}' parm='${button.parm}'/>",
|
|
|
title: "${button.title}",
|
|
|
width: "${button.width}",
|
|
|
height: "${button.height}",
|
|
|
@@ -404,7 +404,7 @@
|
|
|
<ss:equal val='${empty button.pluginList}' val2='false'>
|
|
|
<ss:rpt name='${button.pluginList}' id='plugin'>
|
|
|
<%--<span style="display:none;" class="${button.id}children" value="${plugin.plugin.desc}"
|
|
|
- onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='${plugin.service}' dest='${plugin.dest}' parm='${plugin.param}'/>",title:"${plugin.title}",width:"${plugin.width}",height:"${plugin.height}",minHeight:"${plugin.minHeight}",maxHeight:"${plugin.maxHeight}",showTitle:"${plugin.showTitle}"});'>
|
|
|
+ onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='${plugin.servName}' dest='${plugin.dest}' parm='${plugin.parm}'/>",title:"${plugin.title}",width:"${plugin.width}",height:"${plugin.height}",minHeight:"${plugin.minHeight}",maxHeight:"${plugin.maxHeight}",showTitle:"${plugin.showTitle}"});'>
|
|
|
</span>
|
|
|
</ss:rpt>
|
|
|
<input type="button" id="${button.id}" name="${button.name}" value="${button.buttonName}" class="content-button" onclick='void(0)'/>
|
|
|
@@ -424,7 +424,7 @@
|
|
|
function ${button.id}handleClick() {
|
|
|
wd.display.showComponent({
|
|
|
show: ["wdDialog"],
|
|
|
- url: "<ss:serv name='${plugin.service}' dest='${plugin.dest}' parm='${plugin.param}'/>",
|
|
|
+ url: "<ss:serv name='${plugin.servName}' dest='${plugin.dest}' parm='${plugin.parm}'/>",
|
|
|
title: "${plugin.title}",
|
|
|
width: "${plugin.width}",
|
|
|
height: "${plugin.height}",
|
|
|
@@ -439,7 +439,7 @@
|
|
|
onclick: () => {
|
|
|
wd.display.showComponent({
|
|
|
show: ["wdDialog"],
|
|
|
- url: "<ss:serv name='${plugin.service}' dest='${plugin.dest}' parm='${plugin.param}'/>",
|
|
|
+ url: "<ss:serv name='${plugin.servName}' dest='${plugin.dest}' parm='${plugin.parm}'/>",
|
|
|
title: "${plugin.title}",
|
|
|
width: "${plugin.width}",
|
|
|
height: "${plugin.height}",
|
|
|
@@ -460,7 +460,7 @@
|
|
|
callback: function () {
|
|
|
wd.display.showComponent({
|
|
|
show: ["wdDialog"],
|
|
|
- url: "<ss:serv name='${plugin.service}' dest='${plugin.dest}' parm='${plugin.param}'/>",
|
|
|
+ url: "<ss:serv name='${plugin.servName}' dest='${plugin.dest}' parm='${plugin.parm}'/>",
|
|
|
title: "${plugin.title}",
|
|
|
width: "${plugin.width}",
|
|
|
height: "${plugin.height}",
|
|
|
@@ -615,7 +615,7 @@
|
|
|
item.onclick = function () {
|
|
|
wd.display.showComponent({
|
|
|
show: ["wdDialog"],
|
|
|
- url: "<ss:serv name='${item.service.play.service}' dest='${item.service.play.dest}' parm='${item.service.play.param}'/>",
|
|
|
+ url: "<ss:serv name='${item.service.play.servName}' dest='${item.service.play.dest}' parm='${item.service.play.parm}'/>",
|
|
|
title: "${item.service.play.title}",
|
|
|
width: "${item.service.play.width}",
|
|
|
height: "${item.service.play.height}",
|
|
|
@@ -628,7 +628,7 @@
|
|
|
item.onclick = function () {
|
|
|
wd.display.showComponent({
|
|
|
show: ["wdDialog"],
|
|
|
- url: "<ss:serv name='${item.service.update.service}' dest='${item.service.update.dest}' parm='${item.service.update.param}'/>",
|
|
|
+ url: "<ss:serv name='${item.service.update.servName}' dest='${item.service.update.dest}' parm='${item.service.update.parm}'/>",
|
|
|
title: "${item.service.update.title}",
|
|
|
width: "${item.service.update.width}",
|
|
|
height: "${item.service.update.height}",
|
|
|
@@ -641,7 +641,7 @@
|
|
|
item.onclick = function () {
|
|
|
wd.display.showComponent({
|
|
|
show: ["wdDialog"],
|
|
|
- url: "<ss:serv name='${item.service.change.service}' dest='${item.service.change.dest}' parm='${item.service.change.param}'/>",
|
|
|
+ url: "<ss:serv name='${item.service.change.servName}' dest='${item.service.change.dest}' parm='${item.service.change.parm}'/>",
|
|
|
title: "${item.service.change.title}",
|
|
|
width: "${item.service.change.width}",
|
|
|
height: "${item.service.change.height}",
|
|
|
@@ -817,7 +817,7 @@
|
|
|
onclick: () => {
|
|
|
wd.display.showComponent({
|
|
|
show: ["wdDialog"],
|
|
|
- url: "<ss:serv name='${btn.service}' dest='${btn.dest}' parm='${btn.param}'/>",
|
|
|
+ url: "<ss:serv name='${btn.servName}' dest='${btn.dest}' parm='${btn.parm}'/>",
|
|
|
title: "${btn.title}",
|
|
|
width: "${btn.width}",
|
|
|
height: "${btn.height}",
|
|
|
@@ -860,7 +860,7 @@
|
|
|
item.onclick = function () {
|
|
|
wd.display.showComponent({
|
|
|
show: ["wdDialog"],
|
|
|
- url: "<ss:serv name='${item.service.play.service}' dest='${item.service.play.dest}' parm='${item.service.play.param}'/>",
|
|
|
+ url: "<ss:serv name='${item.service.play.servName}' dest='${item.service.play.dest}' parm='${item.service.play.parm}'/>",
|
|
|
title: "${item.service.play.title}",
|
|
|
width: ((${item.service.play.width}+DOM_SIZE_objInfoTabWidth) + ""),
|
|
|
height: "${item.service.play.height}",
|
|
|
@@ -961,7 +961,7 @@
|
|
|
<%-- 下面的宽度width,如果是变动,则加上选项卡宽度 Ben(20251214) --%>
|
|
|
wd.display.showComponent({
|
|
|
show: ["wdDialog"],
|
|
|
- url: "<ss:serv name='${item.service.change.service}' dest='${item.service.change.dest}' parm='${item.service.change.param}'/>",
|
|
|
+ url: "<ss:serv name='${item.service.change.servName}' dest='${item.service.change.dest}' parm='${item.service.change.parm}'/>",
|
|
|
title: "${item.service.change.title}",
|
|
|
width: ((${item.service.change.width}+${'chg'==item.service.change.function.name?'DOM_SIZE_objInfoTabWidth':'0'}) + ""),
|
|
|
height: "${item.service.change.height}",
|
|
|
@@ -982,7 +982,7 @@
|
|
|
onclick: () => {
|
|
|
wd.display.showComponent({
|
|
|
show: ["wdDialog"],
|
|
|
- url: "<ss:serv name='${item.service.update.service}' dest='${item.service.update.dest}' parm='${item.service.update.param}'/>",
|
|
|
+ url: "<ss:serv name='${item.service.update.servName}' dest='${item.service.update.dest}' parm='${item.service.update.parm}'/>",
|
|
|
title: "${item.service.update.title}",
|
|
|
width: ((${item.service.update.width}+DOM_SIZE_objInfoTabWidth) + ""),
|
|
|
height: "${item.service.update.height}",
|
|
|
@@ -1429,44 +1429,12 @@
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- function formatValByFmt(val, fmt) {
|
|
|
- if (!fmt) return String(val == null ? "" : val);
|
|
|
- var d = toDate(val);
|
|
|
- if (!d) return String(val == null ? "" : val);
|
|
|
- var yyyy = String(d.getFullYear());
|
|
|
- var MM = pad2(d.getMonth() + 1);
|
|
|
- var dd = pad2(d.getDate());
|
|
|
- var HH = pad2(d.getHours());
|
|
|
- var mm = pad2(d.getMinutes());
|
|
|
- var ss = pad2(d.getSeconds());
|
|
|
- var map = {
|
|
|
- "yyyy": yyyy,
|
|
|
- "MM": MM,
|
|
|
- "dd": dd,
|
|
|
- "HH": HH,
|
|
|
- "mm": mm,
|
|
|
- "ss": ss,
|
|
|
- "M": String(d.getMonth() + 1),
|
|
|
- "d": String(d.getDate()),
|
|
|
- "H": String(d.getHours()),
|
|
|
- "m": String(d.getMinutes()),
|
|
|
- "s": String(d.getSeconds()),
|
|
|
- };
|
|
|
- var out = String(fmt);
|
|
|
- Object.keys(map).sort(function (a, b) {
|
|
|
- return b.length - a.length;
|
|
|
- }).forEach(function (k) {
|
|
|
- out = out.split(k).join(map[k]);
|
|
|
- });
|
|
|
- return out;
|
|
|
- }
|
|
|
-
|
|
|
function normalizeVal(v) {
|
|
|
if (v === undefined || v === null) return "";
|
|
|
if (typeof v === "string" || typeof v === "number" || typeof v === "boolean") return String(v);
|
|
|
if (typeof v === "object") {
|
|
|
if (v.val != null) {
|
|
|
- if (v.fmt) return formatValByFmt(v.val, v.fmt);
|
|
|
+ if (v.fmt) return window.ssTools.formatValByFmt(v.val, v.fmt);
|
|
|
return String(v.val);
|
|
|
}
|
|
|
}
|
|
|
@@ -1490,7 +1458,7 @@
|
|
|
// 功能说明:thn 不为空 => 有图片(否则组件按 thumbType 显示占位 icon);URL 走 dlByHttp by xu 20260115
|
|
|
try {
|
|
|
var thn = raw && raw.thn;
|
|
|
- if (thn) card.thumb = self.buildThumbUrl(thn);
|
|
|
+ if (thn) card.thumb = window.ssTools.buildThumbUrl(thn);
|
|
|
} catch (e) {
|
|
|
}
|
|
|
// 功能说明:二级对象卡片标签:由 catList(desc/val) 映射到组件 item.tags(key:desc, value:val) by xu 20260115
|
|
|
@@ -1501,7 +1469,7 @@
|
|
|
if (!c || typeof c !== "object") return null;
|
|
|
var k = c.desc != null ? String(c.desc) : "";
|
|
|
if (!k) return null;
|
|
|
- var v = c.fmt ? formatValByFmt(c.val, c.fmt) : normalizeVal(c.val);
|
|
|
+ var v = c.fmt ? window.ssTools.formatValByFmt(c.val, c.fmt) : normalizeVal(c.val);
|
|
|
var o = {};
|
|
|
o[k] = v;
|
|
|
return o;
|
|
|
@@ -1534,16 +1502,6 @@
|
|
|
this.listConfig = Object.assign({}, this.listConfig);
|
|
|
},
|
|
|
// 功能说明:缩略图 URL 构建(参考 objList:dlByHttp 直出图片) by xu 20260115
|
|
|
- buildThumbUrl(thn) {
|
|
|
- if (!thn) return "";
|
|
|
- var v = thn;
|
|
|
- try {
|
|
|
- if (typeof thn === "object" && thn.val != null) v = thn.val;
|
|
|
- else if (typeof thn === "object" && thn.value != null) v = thn.value;
|
|
|
- } catch (e) {
|
|
|
- }
|
|
|
- return "/service?ssServ=dlByHttp&type=img&path=" + encodeURIComponent(String(v));
|
|
|
- },
|
|
|
// 功能说明:拉取 searchFieldList 中 cbName 下拉的 options,并写入 searchFieldOptMap by xu 20260115
|
|
|
loadSearchFieldOptions() {
|
|
|
var self = this;
|
|
|
@@ -1573,37 +1531,9 @@
|
|
|
},
|
|
|
// 功能说明:二级对象页面打开服务(兼容 ssToken 与 servName/dest/parm) by xu 20260115
|
|
|
openServiceDialog(srv) {
|
|
|
+ // 功能说明:使用 tools.js 统一封装的 openServiceDialog by xu 20260122
|
|
|
if (!srv) return;
|
|
|
- var ssToken = srv.ssToken;
|
|
|
- var url = "";
|
|
|
- if (ssToken) {
|
|
|
- url = "/service?ssToken=" + encodeURIComponent(String(ssToken));
|
|
|
- } else {
|
|
|
- var servName = srv.servName || srv.service;
|
|
|
- var dest = srv.dest || "";
|
|
|
- var parm = srv.parm || srv.param || "";
|
|
|
- url = "/service?ssServ=" + encodeURIComponent(String(servName || ""));
|
|
|
- if (dest) url += "&ssDest=" + encodeURIComponent(String(dest));
|
|
|
- if (parm) url += "&parm=" + encodeURIComponent(String(parm));
|
|
|
- }
|
|
|
- try {
|
|
|
- console.log("[cobj] openServiceDialog url", url, srv);
|
|
|
- } catch (e) {
|
|
|
- }
|
|
|
- try {
|
|
|
- wd.display.showComponent({
|
|
|
- show: ["wdDialog"],
|
|
|
- url: url,
|
|
|
- title: srv.title || srv.desc || "",
|
|
|
- width: String(srv.width || 880),
|
|
|
- height: String(srv.height || 650),
|
|
|
- minHeight: String(srv.minHeight || 100),
|
|
|
- maxHeight: String(srv.maxHeight || 800),
|
|
|
- showTitle: String(srv.showTitle || false),
|
|
|
- });
|
|
|
- } catch (e) {
|
|
|
- console.log("openServiceDialog failed", e);
|
|
|
- }
|
|
|
+ window.ssTools.openServiceDialog(srv);
|
|
|
},
|
|
|
handlePageChange({pageNo, rowNumPer, rowNum}) {
|
|
|
// 功能说明:二级对象翻页:更新 ssPaging 后重新调用接口刷新列表 by xu 20260115
|