Quellcode durchsuchen

merge backend provided files 20260320

apple vor 16 Stunden
Ursprung
Commit
9a193fb7c1

+ 188 - 105
js/mp_common/common.js

@@ -2,88 +2,160 @@
  * H5公共工具函数
  * 避免在多个文件中重复定义相同的函数
  */
+const ENTRY_SOURCE_KEY = "entrySource";
+const ENTRY_SOURCE_MY = "my";
+const AUTH_REDIRECT_DONE_KEY = "authRedirectDone";
 
 // 获取URL参数的工具函数
 function getUrlParams() {
-  const params = {}
-  const urlSearchParams = new URLSearchParams(window.location.search)
+  const params = {};
+  const urlSearchParams = new URLSearchParams(window.location.search);
   for (const [key, value] of urlSearchParams) {
-    params[key] = decodeURIComponent(value)
+    params[key] = decodeURIComponent(value);
   }
-  return params
+  return params;
+}
+
+function isAuthPage(pathname = window.location.pathname) {
+  return /\/(login|autoLogin)\.html$/i.test(pathname || "");
+}
+
+function getCurrentPageUrl() {
+  return `${window.location.origin}${window.location.pathname}${window.location.search}`;
+}
+
+function getStoredAuthToken() {
+  const userInfo = localStorage.getItem("userInfo");
+  if (userInfo) {
+    try {
+      const parsed = JSON.parse(userInfo);
+      const token = parsed?.yhsbToken || parsed?.onlineToken || "";
+      if (token) {
+        return token;
+      }
+    } catch (error) {
+      console.warn("解析 userInfo 获取 token 失败:", error);
+    }
+  }
+
+  return (
+    localStorage.getItem("yhsbToken") ||
+    localStorage.getItem("onlineToken") ||
+    ""
+  );
+}
+
+// 小程序进入 H5 时,只有 my 页面主动点击进入的场景才会带 entrySource=my。
+// 因此这里把“from=miniprogram 且不是认证页 且没有 entrySource=my”的页面
+// 统一视为消息直达等需先认证的入口,进入登录/自动登录分流。
+// 但如果已经带了 authRedirectDone=1,说明当前页是登录成功后回跳回来的,
+// 本次不应再重复进入登录分流,否则会在业务页和 autoLogin.html 之间循环跳转。
+function isMiniProgramMessageEntry(params = getUrlParams()) {
+  return (
+    params.from === "miniprogram" &&
+    params[ENTRY_SOURCE_KEY] !== ENTRY_SOURCE_MY &&
+    params[AUTH_REDIRECT_DONE_KEY] !== "1" &&
+    !isAuthPage()
+  );
+}
+
+// 公共层在每个业务 H5 页面初始化前都会先调用这个函数。
+// 一旦命中消息直达分流,就立即跳到 login.html 或 autoLogin.html,
+// 并把当前业务页完整地址放到 redirect 参数里,登录成功后再尝试回到这里。
+function handleMessageEntryAuthRedirect() {
+  const params = getUrlParams();
+  if (!isMiniProgramMessageEntry(params)) {
+    return false;
+  }
+
+  const redirectUrl = getCurrentPageUrl();
+  const token = getStoredAuthToken();
+  const authPage = token ? "autoLogin" : "login";
+  const authUrl = `/page/${authPage}.html?entryScene=message&redirect=${encodeURIComponent(
+    redirectUrl
+  )}`;
+
+  console.log("🔐 检测到消息直达页面,准备跳转认证页:", {
+    authPage,
+    redirectUrl,
+    hasToken: !!token,
+  });
+
+  window.location.replace(authUrl);
+  return true;
 }
 
 // 获取设备信息 (优先从URL参数获取,备用从localStorage获取)
 function getDeviceInfo() {
-  const urlParams = getUrlParams()
+  const urlParams = getUrlParams();
 
   // 优先从URL参数获取
-  let deviceId = urlParams.devId || ''
-  let model = urlParams.sbmc || ''
+  let deviceId = urlParams.devId || "";
+  let model = urlParams.sbmc || "";
 
   // 如果URL参数中没有,尝试从localStorage获取
   if (!deviceId || !model) {
-    const cachedDeviceInfo = localStorage.getItem('deviceInfo')
+    const cachedDeviceInfo = localStorage.getItem("deviceInfo");
     if (cachedDeviceInfo) {
       try {
-        const parsed = JSON.parse(cachedDeviceInfo)
-        deviceId = deviceId || parsed.deviceId || ''
-        model = model || parsed.model || ''
-        console.log('🔄 从localStorage获取设备信息:', { deviceId, model })
+        const parsed = JSON.parse(cachedDeviceInfo);
+        deviceId = deviceId || parsed.deviceId || "";
+        model = model || parsed.model || "";
+        console.log("🔄 从localStorage获取设备信息:", { deviceId, model });
       } catch (e) {
-        console.warn('解析localStorage中的设备信息失败:', e)
+        console.warn("解析localStorage中的设备信息失败:", e);
       }
     }
   }
 
   // 如果获取到了设备信息,保存到localStorage作为备用
   if (deviceId && model) {
-    const deviceInfo = { deviceId, model }
-    localStorage.setItem('deviceInfo', JSON.stringify(deviceInfo))
+    const deviceInfo = { deviceId, model };
+    localStorage.setItem("deviceInfo", JSON.stringify(deviceInfo));
   }
 
   return {
     deviceId: deviceId,
-    model: model
-  }
+    model: model,
+  };
 }
 
 // 获取JSESSIONID (多源获取,确保可用性)
 function getJSessionId() {
   // 优先级:localStorage > URL参数 > Cookie
-  let jsessionId = localStorage.getItem('JSESSIONID')
-  
+  let jsessionId = localStorage.getItem("JSESSIONID");
+
   if (!jsessionId) {
-    const urlParams = getUrlParams()
-    jsessionId = urlParams.JSESSIONID
+    const urlParams = getUrlParams();
+    jsessionId = urlParams.JSESSIONID;
   }
-  
+
   if (!jsessionId) {
     // 尝试从document.cookie中获取
-    const cookies = document.cookie.split(';')
+    const cookies = document.cookie.split(";");
     for (let cookie of cookies) {
-      const [name, value] = cookie.trim().split('=')
-      if (name === 'JSESSIONID') {
-        jsessionId = value
-        break
+      const [name, value] = cookie.trim().split("=");
+      if (name === "JSESSIONID") {
+        jsessionId = value;
+        break;
       }
     }
   }
-  
-  console.log('🔍 获取JSESSIONID:', {
-    fromLocalStorage: localStorage.getItem('JSESSIONID'),
+
+  console.log("🔍 获取JSESSIONID:", {
+    fromLocalStorage: localStorage.getItem("JSESSIONID"),
     fromURL: getUrlParams().JSESSIONID,
-    final: jsessionId
-  })
-  
-  return jsessionId || ''
+    final: jsessionId,
+  });
+
+  return jsessionId || "";
 }
 
 // 保存JSESSIONID到localStorage
 function saveJSessionId(jsessionId) {
   if (jsessionId) {
-    localStorage.setItem('JSESSIONID', jsessionId)
-    console.log('✅ H5 JSESSIONID已保存:', jsessionId)
+    localStorage.setItem("JSESSIONID", jsessionId);
+    console.log("✅ H5 JSESSIONID已保存:", jsessionId);
   }
 }
 
@@ -91,154 +163,165 @@ function saveJSessionId(jsessionId) {
 function getMockWechatCode() {
   // 在H5环境下,我们可以生成一个模拟的code
   // 实际项目中可能需要接入微信H5授权
-  return 'h5_mock_code_' + Date.now()
+  return "h5_mock_code_" + Date.now();
 }
 
 // 用户信息管理
 const userManager = {
   // 保存用户信息
   saveUserInfo(userInfo) {
-    console.log('💾 H5保存用户信息:', userInfo)
-    localStorage.setItem('userInfo', JSON.stringify(userInfo))
+    console.log("💾 H5保存用户信息:", userInfo);
+    localStorage.setItem("userInfo", JSON.stringify(userInfo));
   },
 
   // 获取保存的用户信息
   getSavedUserInfo() {
-    const userInfo = localStorage.getItem('userInfo')
-    return userInfo ? JSON.parse(userInfo) : null
+    const userInfo = localStorage.getItem("userInfo");
+    return userInfo ? JSON.parse(userInfo) : null;
   },
 
   // 检查登录状态
   checkLoginStatus() {
-    const userInfo = localStorage.getItem('userInfo')
-    const jsessionId = localStorage.getItem('JSESSIONID')
-    
-    console.log('🔍 H5检查登录状态:', { 
-      hasUserInfo: !!userInfo, 
-      hasJSessionId: !!jsessionId 
-    })
+    const userInfo = localStorage.getItem("userInfo");
+    const jsessionId = localStorage.getItem("JSESSIONID");
+
+    console.log("🔍 H5检查登录状态:", {
+      hasUserInfo: !!userInfo,
+      hasJSessionId: !!jsessionId,
+    });
 
     return {
       isLoggedIn: !!(userInfo && jsessionId),
       userInfo: userInfo ? JSON.parse(userInfo) : null,
-      jsessionId: jsessionId
-    }
+      jsessionId: jsessionId,
+    };
   },
 
   // 清除登录信息
   clearLoginInfo() {
-    localStorage.removeItem('userInfo')
-    localStorage.removeItem('JSESSIONID')
-    localStorage.removeItem('deviceInfo')
-    console.log('🧹 已清除登录信息')
-  }
-}
+    localStorage.removeItem("userInfo");
+    localStorage.removeItem("JSESSIONID");
+    localStorage.removeItem("deviceInfo");
+    console.log("🧹 已清除登录信息");
+  },
+};
 
 // 获取图片URL (用于图片回显)
 function getImageUrl(path) {
-  if (!path) return ''
+  if (!path) return "";
 
   // 如果已经是完整URL,直接返回
-  if (path.startsWith('http://') || path.startsWith('https://') || path.startsWith('blob:')) {
-    return path
+  if (
+    path.startsWith("http://") ||
+    path.startsWith("https://") ||
+    path.startsWith("blob:")
+  ) {
+    return path;
   }
 
   // 获取baseUrl (从request中获取或使用默认值)
-  const baseUrl = window.request?.defaults?.baseURL || window.location.origin
+  const baseUrl = window.request?.defaults?.baseURL || window.location.origin;
 
   // 构造图片下载URL
-  return baseUrl + '/service?ssServ=dlByHttp&wdConfirmationCaptchaService=0&type=img&path=' + path
+  return baseUrl + "/service?ssServ=dlByHttp&type=img&path=" + path;
 }
 
 // 获取文件URL (用于文件下载)
 function getFileUrl(path) {
-  if (!path) return ''
+  if (!path) return "";
 
   // 如果已经是完整URL,直接返回
-  if (path.startsWith('http://') || path.startsWith('https://')) {
-    return path
+  if (path.startsWith("http://") || path.startsWith("https://")) {
+    return path;
   }
 
   // 获取baseUrl
-  const baseUrl = window.request?.defaults?.baseURL || window.location.origin
+  const baseUrl = window.request?.defaults?.baseURL || window.location.origin;
 
   // 构造文件下载URL
-  return baseUrl + '/service?ssServ=dlByHttp&wdConfirmationCaptchaService=0&type=file&path=' + path
+  return baseUrl + "/service?ssServ=dlByHttp&type=file&path=" + path;
 }
 
 // 格式化日期时间 (使用 dayjs)
-function formatDate(dateStr, format = 'YYYY-MM-DD HH:mm:ss') {
+function formatDate(dateStr, format = "YYYY-MM-DD HH:mm:ss") {
   if (!dateStr) {
-    console.log('formatDate: 时间字符串为空')
-    return ''
+    console.log("formatDate: 时间字符串为空");
+    return "";
   }
 
-  console.log('formatDate 输入:', dateStr, '格式要求:', format)
+  console.log("formatDate 输入:", dateStr, "格式要求:", format);
 
   // 检查 dayjs 是否可用
-  if (typeof dayjs === 'undefined') {
-    console.error('❌ dayjs 未加载,无法格式化时间')
-    return dateStr
+  if (typeof dayjs === "undefined") {
+    console.error("❌ dayjs 未加载,无法格式化时间");
+    return dateStr;
   }
 
   // 清理字符串:移除特殊空格字符(如 \u202F),替换为普通空格
   const cleanedDateStr = String(dateStr)
-    .replace(/[\u202F\u00A0]/g, ' ')  // 替换不间断空格
-    .replace(/\s+/g, ' ')              // 多个空格合并为一个
-    .trim()
+    .replace(/[\u202F\u00A0]/g, " ") // 替换不间断空格
+    .replace(/\s+/g, " ") // 多个空格合并为一个
+    .trim();
 
-  console.log('清理后的字符串:', cleanedDateStr)
+  console.log("清理后的字符串:", cleanedDateStr);
 
   // 尝试使用原生 Date 解析(兼容性最好)
-  let date = null
+  let date = null;
   try {
-    const jsDate = new Date(cleanedDateStr)
+    const jsDate = new Date(cleanedDateStr);
     if (!isNaN(jsDate.getTime())) {
-      date = dayjs(jsDate)
-      console.log('✅ 使用 Date 解析成功')
+      date = dayjs(jsDate);
+      console.log("✅ 使用 Date 解析成功");
     }
   } catch (e) {
-    console.warn('Date 解析失败:', e)
+    console.warn("Date 解析失败:", e);
   }
 
   // 如果 Date 解析失败,尝试直接用 dayjs
   if (!date || !date.isValid()) {
-    date = dayjs(cleanedDateStr)
-    console.log('尝试使用 dayjs 直接解析')
+    date = dayjs(cleanedDateStr);
+    console.log("尝试使用 dayjs 直接解析");
   }
 
-  console.log('dayjs 解析结果 isValid:', date ? date.isValid() : 'null')
+  console.log("dayjs 解析结果 isValid:", date ? date.isValid() : "null");
 
   if (!date || !date.isValid()) {
-    console.warn('⚠️ 无效的日期格式:', dateStr)
-    return '' // 解析失败返回空字符串
+    console.warn("⚠️ 无效的日期格式:", dateStr);
+    return ""; // 解析失败返回空字符串
   }
 
   // dayjs 的格式化 (支持常见格式)
   // dayjs 使用大写的格式标记: YYYY-MM-DD HH:mm:ss
-  const result = date.format(format)
-  console.log('格式化结果:', result)
+  const result = date.format(format);
+  console.log("格式化结果:", result);
 
-  return result
+  return result;
 }
 
-// 导出到全局
-window.getUrlParams = getUrlParams
-window.getDeviceInfo = getDeviceInfo
-window.getJSessionId = getJSessionId
-window.saveJSessionId = saveJSessionId
-window.getMockWechatCode = getMockWechatCode
-window.userManager = userManager
-window.getImageUrl = getImageUrl
-window.getFileUrl = getFileUrl
-window.formatDate = formatDate
+window.ENTRY_SOURCE_KEY = ENTRY_SOURCE_KEY;
+window.ENTRY_SOURCE_MY = ENTRY_SOURCE_MY;
+window.getUrlParams = getUrlParams;
+
+window.isAuthPage = isAuthPage;
+window.getCurrentPageUrl = getCurrentPageUrl;
+window.getStoredAuthToken = getStoredAuthToken;
+window.isMiniProgramMessageEntry = isMiniProgramMessageEntry;
+window.handleMessageEntryAuthRedirect = handleMessageEntryAuthRedirect;
+window.getDeviceInfo = getDeviceInfo;
+window.getJSessionId = getJSessionId;
+window.saveJSessionId = saveJSessionId;
+window.getMockWechatCode = getMockWechatCode;
+window.userManager = userManager;
+window.getImageUrl = getImageUrl;
+window.getFileUrl = getFileUrl;
+window.formatDate = formatDate;
 
 // 同时挂载到SS.utils下(兼容组件调用)
 if (!window.SS.utils) {
-  window.SS.utils = {}
+  window.SS.utils = {};
 }
-window.SS.utils.getImageUrl = getImageUrl
-window.SS.utils.getFileUrl = getFileUrl
-window.SS.utils.formatDate = formatDate
+window.SS.utils.getImageUrl = getImageUrl;
+window.SS.utils.getFileUrl = getFileUrl;
+window.SS.utils.formatDate = formatDate;
 
-console.log('✅ H5公共工具已加载')
+console.log("✅ H5公共工具已加载");

+ 1 - 1
page/clip/footer.jsp

@@ -2,5 +2,5 @@
 <%@ page language="java" contentType="text/html;charset=UTF-8" pageEncoding="utf-8" isELIgnored="false"%>
 <script type="module" src="/js/vue/initVue.js"></script><%-- 新UI vue组件初始化 Ben(20251217) --%>
 <script type="text/javascript">
-	tokenCleanser("<ss:serv name='ss.clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
+	tokenCleanser("<ss:serv name='clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
 </script>

+ 1 - 1
page/desktop.jsp

@@ -385,5 +385,5 @@
 	</script>
 </html>
 <script type="text/javascript">
-tokenCleanser("<ss:serv name='ss.clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
+tokenCleanser("<ss:serv name='clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
 </script>

+ 6 - 6
page/env/addChk.jsp

@@ -96,7 +96,7 @@
 						<script type="text/javascript" charset="utf-8" src="/ss/js/edit.js"></script>
 						<ss:inper />
 						<ss:equal val="${empty inputter.encode_ynrid}" val2="false">
-							<input type="hidden" name="ynr_WATCHURL" value='ss.display.showComponent({show:["ssDialog"],url:"<ss:serv parm='{"wdConfirmationCaptchaService":"0","id":"ssVal{id}"}' dest='convInp'/>",title:"转换",width:1024,height:350});' />
+							<input type="hidden" name="ynr_WATCHURL" value='ss.display.showComponent({show:["ssDialog"],url:"<ss:serv parm='{"id":"ssVal{id}"}' dest='convInp'/>",title:"转换",width:1024,height:350});' /> <%-- "{wdConfirmationCaptchaService":"0",。Lin --%>
 						</ss:equal>
 						<script>
 							document.querySelector('form').addEventListener('submit', function(){
@@ -110,16 +110,16 @@
 								this.subfun();
 							};
 							function addCyy() {
-								wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='p_gryy_zj' parm='{"wdConfirmationCaptchaService":"0"}' dest='gryyInp'/>",title:"录入常用语",width:571,height:105,minHeight:54,maxHeight:158});
+								wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='p_gryy_zj' dest='gryyInp'/>",title:"录入常用语",width:571,height:105,minHeight:54,maxHeight:158});	// parm='{"wdConfirmationCaptchaService":"0"}'。Lin
 							}
 						
 							function fjidfjEdit(){
 								var fjName='fjid';var fjid=document.getElementsByName('fjid')[0].value;
 								if(fjid==null||fjid==''){
-									$.ajax({type:'post',url:'<ss:serv name='makeAttCms' parm='{"wdConfirmationCaptchaService":"0"}'/>',async:false,data:{name:'fjid',ssNrObjName:'sh',ssNrObjId:'${shid}'},success:function(_fjid){fjid=_fjid;document.getElementsByName('fjid')[0].value=fjid;}});
+									$.ajax({type:'post',url:'<ss:serv name='makeAttCms'/>',async:false,data:{name:'fjid',ssNrObjName:'sh',ssNrObjId:'${shid}'},success:function(_fjid){fjid=_fjid;document.getElementsByName('fjid')[0].value=fjid;}});	// parm='{"wdConfirmationCaptchaService":"0"}'。Lin
 								};
 								var str='&nrid=T-'+fjid+'&objectId='+fjid+'&objectName='+fjName+'&callback='+(window['fjidCallbackName']||'');
-								wd.display.showComponent({show: ['wdDialog'],url:'<ss:serv name='regCms' parm='{"wdConfirmationCaptchaService":"0"}' dest='cmsHome'/>'+str,title: '编辑',width: 900,high: 664});
+								wd.display.showComponent({show: ['wdDialog'],url:'<ss:serv name='regCms' dest='cmsHome'/>'+str,title: '编辑',width: 900,high: 664});	// parm='{"wdConfirmationCaptchaService":"0"}'。Lin
 							}
 						
 							var inputterfjJson={"fj":{"key":"fjid","value":"","name":null,"jlztm":null}};
@@ -202,7 +202,7 @@
 				</div>
 				<div class="right-side-content">
 					<iframe width="100%" height="100%" frameborder="0"
-					src="<ss:serv name='selSh' parm='{"wdConfirmationCaptchaService":"0","sqid":"${sqid}"}' dest='shList'/>">
+					src="<ss:serv name='selSh' parm='{"sqid":"${sqid}"}' dest='shList'/>"> <%-- "wdConfirmationCaptchaService":"0",。Lin --%>
 					</iframe>
 				</div>
 
@@ -238,7 +238,7 @@ try{wd.display.setCloseWindowParam('${wdclosewindowparam}');
 </ss:equal>
 </html>
 <script type="text/javascript">
-tokenCleanser("<ss:serv name='ss.clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
+tokenCleanser("<ss:serv name='clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
 </script>
 <script type="module">
 	SS.ready(function() {

+ 2 - 2
page/env/chgChk.jsp

@@ -45,7 +45,7 @@
 			<%@include file="/ss/clip/miniInfo.jsp"%>
 		</div>
 		<iframe style="width: calc(100% - 4px);margin: 12px 0px 18px 0px;" class="scrollbar" height="100%" frameborder="0"
-			src="<ss:serv name='selChgInfo' parm='{"wdConfirmationCaptchaService":"0","sqid":"${sqid}"}' dest='chgList'/>">
+			src="<ss:serv name='selChgInfo' parm='{"sqid":"${sqid}"}' dest='chgList'/>"> <%-- "wdConfirmationCaptchaService":"0",。Lin --%>
 		</iframe>
 		<%-- <div ssDragh='{max:500,min:100,lvl:2,pct:50}'>
 			
@@ -173,5 +173,5 @@ try{wd.display.setCloseWindowParam('${wdclosewindowparam}');
 </ss:equal>
 </html>
 <script type="text/javascript">
-tokenCleanser("<ss:serv name='ss.clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
+tokenCleanser("<ss:serv name='clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
 </script>

+ 7 - 7
page/env/chgChkTab.jsp

@@ -97,7 +97,7 @@
 							<script type="text/javascript" charset="utf-8" src="/ss/js/edit.js"></script>
 							<ss:inper />
 							<ss:equal val="${empty inputter.encode_ynrid}" val2="false">
-								<input type="hidden" name="ynr_WATCHURL" value='ss.display.showComponent({show:["ssDialog"],url:"<ss:serv parm='{"wdConfirmationCaptchaService":"0","id":"ssVal{id}"}' dest='convInp'/>",title:"转换",width:1024,height:350});' />
+								<input type="hidden" name="ynr_WATCHURL" value='ss.display.showComponent({show:["ssDialog"],url:"<ss:serv parm='{"id":"ssVal{id}"}' dest='convInp'/>",title:"转换",width:1024,height:350});' /> <%-- {"wdConfirmationCaptchaService":"0",。Lin --%>
 							</ss:equal>
 							<script>
 								document.querySelector('form').addEventListener('submit', function(){
@@ -111,16 +111,16 @@
 									this.subfun();
 								};
 								function addCyy() {
-									wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='p_gryy_zj' parm='{"wdConfirmationCaptchaService":"0"}' dest='gryyInp'/>",title:"录入常用语",width:571,height:105,minHeight:54,maxHeight:158});
+									wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='p_gryy_zj' dest='gryyInp'/>",title:"录入常用语",width:571,height:105,minHeight:54,maxHeight:158});	// parm='{"wdConfirmationCaptchaService":"0"}'。Lin
 								}
 							
 								function fjidfjEdit(){
 									var fjName='fjid';var fjid=document.getElementsByName('fjid')[0].value;
 									if(fjid==null||fjid==''){
-										$.ajax({type:'post',url:'<ss:serv name='makeAttCms' parm='{"wdConfirmationCaptchaService":"0"}'/>',async:false,data:{name:'fjid',ssNrObjName:'sh',ssNrObjId:'${shid}'},success:function(_fjid){fjid=_fjid;document.getElementsByName('fjid')[0].value=fjid;}});
+										$.ajax({type:'post',url:'<ss:serv name='makeAttCms'/>',async:false,data:{name:'fjid',ssNrObjName:'sh',ssNrObjId:'${shid}'},success:function(_fjid){fjid=_fjid;document.getElementsByName('fjid')[0].value=fjid;}});	// parm='{"wdConfirmationCaptchaService":"0"}'。Lin
 									};
 									var str='&nrid=T-'+fjid+'&objectId='+fjid+'&objectName='+fjName+'&callback='+(window['fjidCallbackName']||'');
-									wd.display.showComponent({show: ['wdDialog'],url:'<ss:serv name='regCms' parm='{"wdConfirmationCaptchaService":"0"}' dest='cmsHome'/>'+str,title: '编辑',width: 900,high: 664});
+									wd.display.showComponent({show: ['wdDialog'],url:'<ss:serv name='regCms' dest='cmsHome'/>'+str,title: '编辑',width: 900,high: 664});	// parm='{"wdConfirmationCaptchaService":"0"}'。Lin
 								}
 							
 								var inputterfjJson={"fj":{"key":"fjid","value":"","name":null,"jlztm":null}};
@@ -255,7 +255,7 @@
 				</div>
 				<div class="right-side-content">
 					<iframe width="100%" height="100%" frameborder="0"
-					src="<ss:serv name='selSh' parm='{"wdConfirmationCaptchaService":"0","sqid":"${sqid}"}' dest='shList'/>">
+					src="<ss:serv name='selSh' parm='{"sqid":"${sqid}"}' dest='shList'/>"> <%-- "{wdConfirmationCaptchaService":"0",。Lin --%>
 					</iframe>
 				</div>
 			</div>
@@ -344,7 +344,7 @@ window.SS.dom.tabConfig = window.SS.dom.tabConfig || [];
 	</ss:rpt>
 
 	console.log('tabConfig:'+JSON.stringify(window.SS.dom.tabConfig));
-tokenCleanser("<ss:serv name='ss.clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
+tokenCleanser("<ss:serv name='clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
 </script>
 <script type="text/javascript" src="/ss/instructor/instructor-drag.js"></script>
 <script type="text/javascript" src="/ss/instructor/instructor-writer.js"></script>
@@ -485,7 +485,7 @@ SS.ready(function () {
 					}
 				}
 			
-			this.showTagState("<ss:serv name='ss.wrTabState' parm='{ssObjName:"${ssObjName}",ssObjId:"${ssObjId}","${ssObjIdName}":"${ssObjId}",wdConfirmationCaptchaService:"0",dataType:"${dataType}"}'/>");	
+			this.showTagState("<ss:serv name='wrTabState' parm='{ssObjName:"${ssObjName}",ssObjId:"${ssObjId}","${ssObjIdName}":"${ssObjId}",dataType:"${dataType}"}'/>");	// ,wdConfirmationCaptchaService:"0",。Lin
 			this.contentHeight = window.innerHeight - 170;
 
 			const rightSide = document.querySelector('.right-side');

+ 9 - 9
page/env/chgList.jsp

@@ -82,7 +82,7 @@
 		var wTopBody = window.top.document.body;
 		var str1="<div style='float: left;width: 47%;position: relative;min-height:600px;'><p style='font-size:46px;text-align:center;position:absolute;left:50%;top:50%;transform:translate(-50%,-50%);-webkit-transform:translate(-50%,-50%);-o-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);-moz-transform:translate(-50%,-50%);'>(无)</p></div>";
 		var str2 = "<div style='float: left;width: 47%;position: relative;min-height:600px;'><p style='font-size:46px;text-align:center;position:absolute;left:50%;top:50%;transform:translate(-50%,-50%);-webkit-transform:translate(-50%,-50%);-o-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);-moz-transform:translate(-50%,-50%);'>(无)</p></div>";
-		var src = "<ss:serv parm='{"wdConfirmationCaptchaService":"0","shrink":"1","nrid":"ssVal{nrid}"}' dest='ccmsPlay'/>";
+		var src = "<ss:serv parm='{"shrink":"1","nrid":"ssVal{nrid}"}' dest='ccmsPlay'/>";	// {"wdConfirmationCaptchaService":"0",。Lin
 		if(nrid1&&nrid1!=""){
 			var url = wd.display.replaceDynamicParam(src, {"nrid": nrid1});
 			str1 = "<div style='float: left;width: 47%;overflow-x:hidden;'><iframe width='100%' height='100%' frameborder='0' src='"+url+"' /></iframe></div>";
@@ -105,12 +105,12 @@
 		var url1="",url2="",str1="",str2 = "";
 		$(wTopBody).find('.wd').remove();
 		if(path1){
-			url1 = "<ss:serv name='dlByHttp' parm='{"wdConfirmationCaptchaService":"0","path":"ssVal{path}","type":"img"}'/>";	// 再增加 type="img"。Lin
+			url1 = "<ss:serv name='dlByHttp' parm='{"path":"ssVal{path}","type":"img"}'/>";	// 再增加 type="img"。{"wdConfirmationCaptchaService":"0",。Lin
 			var json = JSON.parse('{"path":"' + path1 + '"}');
 			url1 = wd.display.replaceDynamicParam(url1,json);
 		}
 		if(path2){
-			url2 = "<ss:serv name='dlByHttp' parm='{"wdConfirmationCaptchaService":"0","path":"ssVal{path}","type":"img"}'/>";	// 再增加 type="img"。Lin
+			url2 = "<ss:serv name='dlByHttp' parm='{"path":"ssVal{path}","type":"img"}'/>";	// 再增加 type="img"。{"wdConfirmationCaptchaService":"0",。Lin
 			var json = JSON.parse('{"path":"' + path2 + '"}');
 			url2 = wd.display.replaceDynamicParam(url2,json);
 		}
@@ -156,7 +156,7 @@
 								<%--html,text--%>
 								<td>
 									<input type="button" data-type="${item.type}" value="对比" class="content-button"
-											onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv parm='{"wdConfirmationCaptchaService":"0","newValue":"${item.newVal}","oldValue":"${item.origVal}"}' dest='bd_zwdb'/>",title:"正文对比",width:1010,height:540});'/>
+											onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv parm='{"newValue":"${item.newVal}","oldValue":"${item.origVal}"}' dest='bd_zwdb'/>",title:"正文对比",width:1010,height:540});'/> <%-- {"wdConfirmationCaptchaService":"0",。Lin --%>
 								</td>
 								<ss:equal val='${empty item.origVal}' val2='true'> <%-- 改 equal:val1='${item.origVal==""}' val2="true"。Lin --%>
 										<td>(无)</td>
@@ -164,15 +164,15 @@
 								<ss:notEqual val='${empty item.origVal}' val2='false'> <%-- 改 equal:val1='${item.origVal==""}' val2="false"。Lin --%>
 									<td>
 										<input type="button" data-type="${item.type}" value="对比" class="content-button"
-												onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv parm='{"wdConfirmationCaptchaService":"0","newValue":"${item.newVal}","oldValue":"${item.origVal}"}' dest='bd_zwdb'/>",title:"正文对比",width:1010,height:540});'/>
+												onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv parm='{"newValue":"${item.newVal}","oldValue":"${item.origVal}"}' dest='bd_zwdb'/>",title:"正文对比",width:1010,height:540});'/> <%-- {"wdConfirmationCaptchaService":"0",。Lin --%>
 									</td>
 								</ss:notEqual>
 							</ss:equal>
 							<ss:equal val='${item.type}' valList='1,4,2'> <%-- "text,boolean,number" --%>
-								<td onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv parm='{"wdConfirmationCaptchaService":"0","newValue":"${item.newVal}","oldValue":"${item.origVal}"}' dest='bd_zwdb'/>",title:"正文对比",width:1010,height:540});'>
+								<td onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv parm='{"newValue":"${item.newVal}","oldValue":"${item.origVal}"}' dest='bd_zwdb'/>",title:"正文对比",width:1010,height:540});'> <%-- {"wdConfirmationCaptchaService":"0",。Lin --%>
 									<h3><ss:txt val='${item.newVal}'/></h3>
 								</td>
-								<td onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv parm='{"wdConfirmationCaptchaService":"0","newValue":"${item.newVal}","oldValue":"${item.origVal}"}' dest='bd_zwdb'/>",title:"正文对比",width:1010,height:540});'>
+								<td onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv parm='{"newValue":"${item.newVal}","oldValue":"${item.origVal}"}' dest='bd_zwdb'/>",title:"正文对比",width:1010,height:540});'> <%-- {"wdConfirmationCaptchaService":"0",。Lin --%>
 									<h3><ss:txt val='${item.origVal}'/></h3>
 								</td>
 							</ss:equal>
@@ -224,7 +224,7 @@
 									$(function(){
 										$.ajax({
 											type: "post",
-											url: "<ss:serv name='regCms' parm='{"wdConfirmationCaptchaService":"0"}'/>",	// ='register'。Lin
+											url: "<ss:serv name='regCms'/>",	// ='register'。 parm='{"wdConfirmationCaptchaService":"0"}'。Lin
 											data: {
 												'nrid':"T-${item.newVal}"
 											},
@@ -330,5 +330,5 @@ try{wd.display.setCloseWindowParam('${wdclosewindowparam}');
 </ss:equal>
 </html>
 <script type="text/javascript">
-tokenCleanser("<ss:serv name='ss.clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
+tokenCleanser("<ss:serv name='clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
 </script>

+ 6 - 6
page/env/chgSure.jsp

@@ -126,12 +126,12 @@ function showPhoto(path1,path2){
 		var url1="",url2="",str1="",str2 = "";
 		$(wTopBody).find('.wd').remove();
 		if(path1){
-				url1 = "<ss:serv name='dlByHttp' parm='{"wdConfirmationCaptchaService":"0","path":"ssVal{path}","type":"img"}'/>";	// 再增加 type="img"。Lin
+				url1 = "<ss:serv name='dlByHttp' parm='{"path":"ssVal{path}","type":"img"}'/>";	// 再增加 type="img"。{"wdConfirmationCaptchaService":"0",。Lin
 				var json = JSON.parse('{"path":"' + path1 + '"}');
 				url1 = wd.display.replaceDynamicParam(url1,json);
 		}
 		if(path2){
-				url2 = "<ss:serv name='dlByHttp' parm='{"wdConfirmationCaptchaService":"0","path":"ssVal{path}","type":"img"}'/>";	// 再增加 type="img"。Lin
+				url2 = "<ss:serv name='dlByHttp' parm='{"path":"ssVal{path}","type":"img"}'/>";	// 再增加 type="img"。{"wdConfirmationCaptchaService":"0",。Lin
 				var json = JSON.parse('{"path":"' + path2 + '"}');
 				url2 = wd.display.replaceDynamicParam(url2,json);
 		}
@@ -185,7 +185,7 @@ function showPhoto(path1,path2){
 							<ss:equal val='${item.type}' val2='8'> <%-- "html" --%>
 								<td>
 									<input type="button" data-type="${item.type}" value="对比" class="content-button"
-										onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv parm='{"wdConfirmationCaptchaService":"0","newValue":"${item.newVal}","oldValue":"${item.origVal}"}' dest='bd_zwdb'/>",title:"正文对比",width:1010,height:540});'
+										onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv parm='{"newValue":"${item.newVal}","oldValue":"${item.origVal}"}' dest='bd_zwdb'/>",title:"正文对比",width:1010,height:540});' <%-- {"wdConfirmationCaptchaService":"0",。Lin --%>
 									/>
 								</td>
 <%-- 改 equal:val1="${item.origVal == &quot;&quot;}" val2="true"。Lin --%>
@@ -196,7 +196,7 @@ function showPhoto(path1,path2){
 								<ss:equal val='${empty item.origVal}' val2='false'>
 									<td>
 										<input type="button" data-type="${item.type}" value="对比" class="content-button"
-											onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv parm='{"wdConfirmationCaptchaService":"0","newValue":"${item.newVal}","oldValue":"${item.origVal}"}' dest='bd_zwdb'/>",title:"正文对比",width:1010,height:540});'
+											onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv parm='{"newValue":"${item.newVal}","oldValue":"${item.origVal}"}' dest='bd_zwdb'/>",title:"正文对比",width:1010,height:540});' <%-- {"wdConfirmationCaptchaService":"0",。Lin --%>
 										/>
 									</td>
 								</ss:equal>
@@ -256,7 +256,7 @@ function showPhoto(path1,path2){
 									$(function(){
 										$.ajax({
 											type: "post",
-											url: "<ss:serv name='regCms' parm='{"wdConfirmationCaptchaService":"0"}'/>",	// ='register'。Lin
+											url: "<ss:serv name='regCms'/>",	// ='register'。parm='{"wdConfirmationCaptchaService":"0"}'。Lin
 											data: {
 												'nrid':"T-${item.newVal}"
 											},
@@ -381,5 +381,5 @@ try{wd.display.setCloseWindowParam('${wdclosewindowparam}');
 </script>
 </html>
 <script type="text/javascript">
-tokenCleanser("<ss:serv name='ss.clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
+tokenCleanser("<ss:serv name='clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
 </script>

+ 21 - 15
page/env/cobjList.jsp

@@ -530,11 +530,11 @@
                      传到 objList.ss.jsp 的是 ${ssObjName},传给 addPstat 的是 dxm(统计指标.对象名、个人统计.对象名)
                     <input name="addgrtjUrl" type="hidden" value="<serv@ss name='add_grtj' parm='{dxm:"${dxm}"}'/>"/> --%>
             <input name="addgrtjUrl" type="hidden"
-                   value="<ss:serv name='addPcht' parm='{"wdConfirmationCaptchaService":"0","dxm":"${ssObjName}"}'/>"/>
+                   value="<ss:serv name='addPcht' parm='{"dxm":"${ssObjName}"}'/>"/> <%-- {"wdConfirmationCaptchaService":"0",。Lin --%>
             <input name="grtjSizeUrl" type="hidden"
-                   value="<ss:serv name='savePstatSize' parm='{"wdConfirmationCaptchaService":"0","grtjSize":"ssVal{grtjSize}"}'/>"/> <%-- name='save_grtjSize'。Lin --%>
+                   value="<ss:serv name='savePstatSize' parm='{"grtjSize":"ssVal{grtjSize}"}'/>"/> <%-- name='save_grtjSize'。{"wdConfirmationCaptchaService":"0",。Lin --%>
             <input name="getgrtjJsonUrl" type="hidden"
-                   value="<ss:serv name='getgrtjJson' parm='{"wdConfirmationCaptchaService":"0"}'/>"/>
+                   value="<ss:serv name='getgrtjJson'/>"/> <%-- parm='{"wdConfirmationCaptchaService":"0"}'。Lin --%>
             <div class="graph scrollbar" style="padding-right: 16px;">
                 <ss:rpt name='${grtjList}' id='item'>
                     <div class="graph-list" grtjid="${item.grtjid}" style="width:${item.kd};height:${item.gd};">
@@ -549,8 +549,9 @@
                             <%-- 再改为 WebC.REQ_objName,避免与数据表里的 对象名 字段重名。用到再确认。Lin
                                                     onclick='<serv@ss dlg="true" name="getZbInfo" dest="grtj_sz" parm="{grtjid:&quot;${item.grtjid}&quot;,dxm:&quot;${dxm}&quot;}"/>'> --%>
                               onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='getZbInfo'
-                                                                                                 parm='{"wdConfirmationCaptchaService":"0","grtjid":"${item.grtjid}","ssObjName":"${ssObjName}"}'
+                                                                                                 parm='{"grtjid":"${item.grtjid}","ssObjName":"${ssObjName}"}'
                                                                                                  dest='grtj_sz'/>",title:"挑选指标",width:1000,height:800});'>
+																																																	<%-- {"wdConfirmationCaptchaService":"0",。Lin --%>
 					</span>
                     </div>
                 </ss:rpt>
@@ -670,7 +671,7 @@
                 item.onclick = function () {
                     wd.display.showComponent({
                         show: ["wdDialog"],
-                        url: "<ss:serv name='delChildChg' parm='{"wdConfirmationCaptchaService":"0","sqid":"${item.sqid}"}' dest='childChgDelSure'/>",
+                        url: "<ss:serv name='delChildChg' parm='{"sqid":"${item.sqid}"}' dest='childChgDelSure'/>",	// {"wdConfirmationCaptchaService":"0",。Lin
                         title: "删除二级对象的变动",
                         width: 901,
                         height: 380,
@@ -686,7 +687,7 @@
                 item.onclick = function () {
                     wd.display.showComponent({
                         show: ["wdDialog"],
-                        url: "<ss:serv name='selChgInfo' parm='{"wdConfirmationCaptchaService":"0","sqid":"${item.sqid}"}' dest='childChgInfo'/>",
+                        url: "<ss:serv name='selChgInfo' parm='{"sqid":"${item.sqid}"}' dest='childChgInfo'/>",	// {"wdConfirmationCaptchaService":"0",。Lin
                         title: "二级对象的变动信息",
                         width: 1020,
                         height: 215,
@@ -722,7 +723,7 @@
                 item.thumb = "${sessionScope['ssUser'].skinDir}image/object/default-${item.ssObjName}.png";
                 </ss:equal>
                 <ss:notEqual val='${item.service.state}' val2='0'>
-                item.thumb = "<ss:serv name='dlByHttp' parm='{"wdConfirmationCaptchaService":"0","path":"${item.thumbnail.value}","type":"img"}'/>";
+                item.thumb = "<ss:serv name='dlByHttp' parm='{"path":"${item.thumbnail.value}","type":"img"}'/>";	// {"wdConfirmationCaptchaService":"0",。Lin
                 </ss:notEqual>
                 item.errorThumb = '${sessionScope['ssUser'].skinDir}image/object/default.png';
                 </ss:equal>
@@ -797,7 +798,7 @@
                         <ss:equal val='${item3.field["type"]}' val2='8'> <%-- ="html" --%>
                         wd.display.showComponent({
                             show: ["wdDialog"],
-                            url: "<ss:serv parm='{"wdConfirmationCaptchaService":"0","newValue":"${item3.newValue}","oldValue":"${item3.oldValue}","type":"html"}' dest='bd_zwdb'/>",
+                            url: "<ss:serv parm='{"newValue":"${item3.newValue}","oldValue":"${item3.oldValue}","type":"html"}' dest='bd_zwdb'/>",	// {"wdConfirmationCaptchaService":"0",。Lin
                             title: "正文对比",
                             width: 1010,
                             height: 540
@@ -806,7 +807,7 @@
                         <ss:equal val='${item3.field["type"]}' valList='5,6'> <%-- ="picture,photo" --%>
                         wd.display.showComponent({
                             show: ["wdDialog"],
-                            url: "<ss:serv parm='{"wdConfirmationCaptchaService":"0","newValue":"${item3.newValue}","oldValue":"${item3.oldValue}"}' dest='bd_tpdb'/>",
+                            url: "<ss:serv parm='{"newValue":"${item3.newValue}","oldValue":"${item3.oldValue}"}' dest='bd_tpdb'/>",	// {"wdConfirmationCaptchaService":"0",。Lin
                             title: "图片对比",
                             width: 1010,
                             height: 530
@@ -863,7 +864,7 @@
                 item.onclick = function () {
                     wd.display.showComponent({
                         show: ["wdDialog"],
-                        url: "<ss:serv name='ydsq_tj' parm='{"wdConfirmationCaptchaService":"0","ssObjId":"${item.ssObjId}","ssObjName":"${item.ssObjName}"}' dest='ydsq_tj'/>",
+                        url: "<ss:serv name='ydsq_tj' parm='{"ssObjId":"${item.ssObjId}","ssObjName":"${item.ssObjName}"}' dest='ydsq_tj'/>",	// {"wdConfirmationCaptchaService":"0",。Lin
                         title: "借阅",
                         width: 613,
                         height: 387
@@ -892,7 +893,7 @@
                 item.errorThumb = '${sessionScope['ssUser'].skinDir}image/object/default.png';
                 </ss:equal>
                 <ss:notEqual val='${item.service.state}' val2='0'>
-                item.thumb = "<ss:serv name='dlByHttp' parm='{"wdConfirmationCaptchaService":"0","path":"${item.thumbnail.value}","type":"img"}'/>";
+                item.thumb = "<ss:serv name='dlByHttp' parm='{"path":"${item.thumbnail.value}","type":"img"}'/>";	// {"wdConfirmationCaptchaService":"0",。Lin
                 </ss:notEqual>
                 </ss:equal>
 
@@ -1222,7 +1223,8 @@
         btnElemConfig: window.SS.dom.btnElemConfig,
         // 功能说明:二级对象查询服务名(首次/后续统一一个),用于初始化时调接口打印返回 by xu 20260115
         ssSearchCobjServName: "${ssSearchCobjServName}",
-        requestParentViewObject:"${requestParentViewObject}",
+ssPobjName:"${ssPobjName}",	// requestParentViewObject:"${requestParentViewObject}",。Lin
+dataType:"${dataType}",	// 增加,传递给 searchCobjByA()。Lin
         // 功能说明:从 JSP 注入当前对象信息,供二级对象初始化接口拼参使用(key=ssObjName+'id') by xu 20260115
         ssObjName: "${ssObjName}",
         ssObjId: "${ssObjId}",
@@ -1389,8 +1391,12 @@
 	                        }
 	                        // 功能说明:二级对象查询额外携带 requestParentViewObject(由 JSP 注入),用于后端识别父视图对象请求场景 by xu 20260126
 	                        try {
-	                            var rpv = String(this.requestParentViewObject || "").trim();
-	                            if (rpv) params.requestParentViewObject = rpv;
+	                            var rpv = String(this.ssPobjName || "").trim();	// (this.requestParentViewObject ||。Lin
+	                            if (rpv) params.ssPobjName = rpv;	// .requestParentViewObject =。Lin
+/// 增加,传递给 searchCobjByA()。Lin
+															var dtv = String(this.dataType || "").trim();
+															if (dtv) params.dataType = dtv;
+///
 	                        } catch (e) {
 	                        }
 	                        // 功能说明:打印最终请求参数,避免不清楚拼接了什么 by xu 20260115
@@ -1633,5 +1639,5 @@
             console.log("cobjList error:", e)
         }
     });
-    tokenCleanser("<ss:serv name='ss.clearPageToken'/>", {tokenList: "<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
+    tokenCleanser("<ss:serv name='clearPageToken'/>", {tokenList: "<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
 </script>

+ 2 - 2
page/env/objChg.jsp

@@ -152,7 +152,7 @@ console.log(window.SS.dom.tabConfig);
     <%-- 增加初始化选项卡json end Ben --%>
 
 
-tokenCleanser("<ss:serv name='ss.clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
+tokenCleanser("<ss:serv name='clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
 
 </script>
 <script type="module">
@@ -325,7 +325,7 @@ tokenCleanser("<ss:serv name='ss.clearPageToken'/>", {tokenList:"<%= pageContext
 				}
 			},
 			mounted() {
-				this.showTagState("<ss:serv name='ss.wrTabState' parm='{ssObjName:"${ssObjName}",ssObjId:"${ssObjId}","${ssObjIdName}":"${ssObjId}",wdConfirmationCaptchaService:"0",dataType:"${dataType}"}'/>");	
+				this.showTagState("<ss:serv name='wrTabState' parm='{ssObjName:"${ssObjName}",ssObjId:"${ssObjId}","${ssObjIdName}":"${ssObjId}",dataType:"${dataType}"}'/>");	// ,wdConfirmationCaptchaService:"0",。Lin
 			}
 		})
 		

+ 2 - 2
page/env/objEdit.jsp

@@ -151,7 +151,7 @@ try{wd.display.setCloseWindowParam('${wdclosewindowparam}');
 
 	<%-- 增加初始化选项卡json end Ben --%>
 
-tokenCleanser("<ss:serv name='ss.clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
+tokenCleanser("<ss:serv name='clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
 </script>
 <script type="module">
 	//在本窗口提交表单
@@ -282,7 +282,7 @@ SS.ready(function () {
 			}
 		},
 		mounted() {
-			this.showTagState("<ss:serv name='ss.wrTabState' parm='{ssObjName:"${ssObjName}",ssObjId:"${ssObjId}","${ssObjIdName}":"${ssObjId}",wdConfirmationCaptchaService:"0",dataType:"${dataType}"}'/>");	
+			this.showTagState("<ss:serv name='wrTabState' parm='{ssObjName:"${ssObjName}",ssObjId:"${ssObjId}","${ssObjIdName}":"${ssObjId}",dataType:"${dataType}"}'/>");	// ,wdConfirmationCaptchaService:"0",。Lin
 		}
 	})
 	

+ 2 - 2
page/env/objInfo.jsp

@@ -143,7 +143,7 @@ try{wd.display.setCloseWindowParam('${wdclosewindowparam}');
 
 	<%-- 增加初始化选项卡json end Ben --%>
 
-	tokenCleanser("<ss:serv name='ss.clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
+	tokenCleanser("<ss:serv name='clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
 </script>
 <script type="module">
 
@@ -205,7 +205,7 @@ const data = {
 			}
 		},
 		mounted() {
-			this.showTagState("<ss:serv name='ss.wrTabState' parm='{ssObjName:"${ssObjName}",ssObjId:"${ssObjId}","${ssObjIdName}":"${ssObjId}",wdConfirmationCaptchaService:"0",dataType:"${dataType}"}'/>");	
+			this.showTagState("<ss:serv name='wrTabState' parm='{ssObjName:"${ssObjName}",ssObjId:"${ssObjId}","${ssObjIdName}":"${ssObjId}",dataType:"${dataType}"}'/>");	// ,wdConfirmationCaptchaService:"0",。Lin
 		}
 	})
 	

+ 3 - 3
page/env/objInp.jsp

@@ -88,7 +88,7 @@
 			<ss:equal val='${changeNoSize}' val2='1'>
 				<ss-bottom-button
 						text="${changeNoFunctions[0].desc}"
-						onclick='ss.form.submit({url:"<ss:serv name='${changeNoFunctions[0].servName}' dest='${changeNoFunctions[0].dest}' parm='{ssObjId:"${ssObjId}",ssObjName:"${ssObjName}","${ssObjIdName}":"${ssObjId}",dataType:"${empty dataType?1:dataType}",requestParentViewObject:"${requestParentViewObject}"}'/>",width:${changeNoFunctions[0].width},height:${changeNoFunctions[0].height},minHeight:${changeNoFunctions[0].minHeight},maxHeight:${changeNoFunctions[0].maxHeight},targetWin:parent});'
+						onclick='ss.form.submit({url:"<ss:serv name='${changeNoFunctions[0].servName}' dest='${changeNoFunctions[0].dest}' parm='{ssObjId:"${ssObjId}",ssObjName:"${ssObjName}","${ssObjIdName}":"${ssObjId}",dataType:"${empty dataType?1:dataType}",ssPobjName:"${ssPobjName}"}'/>",width:${changeNoFunctions[0].width},height:${changeNoFunctions[0].height},minHeight:${changeNoFunctions[0].minHeight},maxHeight:${changeNoFunctions[0].maxHeight},targetWin:parent});'
 						icon-class="bottom-div-close"
 				></ss-bottom-button>
 				<%-- <input type="button" value="${changeNoFunctions[0].name}" class="bottom-button"
@@ -113,7 +113,7 @@
 								{
 									desc:'${item.desc}',<%-- 按钮名 --%>
 									callback: function(){
-										ss.form.submit({url:"<ss:serv name='${item.servName}' dest='${item.dest}' parm='{ssObjId:"${ssObjId}",ssObjName:"${ssObjName}","${ssObjIdName}":"${ssObjId}",dataType:"${empty dataType?1:dataType}",requestParentViewObject:"${requestParentViewObject}"}'/>",width:${item.width},height:${item.height},minHeight:${item.minHeight},maxHeight:${item.maxHeight},targetWin:parent});
+										ss.form.submit({url:"<ss:serv name='${item.servName}' dest='${item.dest}' parm='{ssObjId:"${ssObjId}",ssObjName:"${ssObjName}","${ssObjIdName}":"${ssObjId}",dataType:"${empty dataType?1:dataType}",ssPobjName:"${ssPobjName}"}'/>",width:${item.width},height:${item.height},minHeight:${item.minHeight},maxHeight:${item.maxHeight},targetWin:parent});
 									}
 								}
 						);
@@ -353,5 +353,5 @@
 
 </script>
 <%--<script type="text/javascript">--%>
-<%--	tokenCleanser("<ss:serv name='ss.clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});--%>
+<%--	tokenCleanser("<ss:serv name='clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});--%>
 <%--</script>--%>

+ 7 - 7
page/env/objList.jsp

@@ -661,7 +661,7 @@
                             onclick: () => {
                                 wd.display.showComponent({
                                     show: ["wdDialog"],
-                                    url: "<ss:serv name='deleteSq' parm='{"wdConfirmationCaptchaService":"0","sqid":"${item.sqid}"}' dest='info'/>",
+                                    url: "<ss:serv name='deleteSq' parm='{"sqid":"${item.sqid}"}' dest='info'/>",	// {"wdConfirmationCaptchaService":"0",。Lin
                                     title: "提示信息",
                                     width: 715,
                                     height: 483
@@ -681,7 +681,7 @@
                     </ss:equal>
 
                     <ss:notEqual val='${item.service.state}' val2='0'>
-                    item.thumb = "<ss:serv name='dlByHttp' parm='{"wdConfirmationCaptchaService":"0","path":"${item.thumbnail.value}","type":"img"}'/>";
+                    item.thumb = "<ss:serv name='dlByHttp' parm='{"path":"${item.thumbnail.value}","type":"img"}'/>";	// {"wdConfirmationCaptchaService":"0",。Lin
                     </ss:notEqual>
 
                     </ss:equal>
@@ -776,7 +776,7 @@
                     item.onclick = function () {
                         wd.display.showComponent({
                             show: ["wdDialog"],
-                            url: "<ss:serv name='ydsq_tj' parm='{"wdConfirmationCaptchaService":"0","ssObjId":"${item.ssObjId}","ssObjName":"${item.ssObjName}"}' dest='ydsq_tj'/>",
+                            url: "<ss:serv name='ydsq_tj' parm='{"ssObjId":"${item.ssObjId}","ssObjName":"${item.ssObjName}"}' dest='ydsq_tj'/>",	// {"wdConfirmationCaptchaService":"0",。Lin
                             title: "借阅",
                             width: 613,
                             height: 387
@@ -808,7 +808,7 @@
                     </ss:equal>
                     <ss:notEqual val='${item.service.state}' val2='0'>
                     console.log('@@@图片:${item.thumbnail.value}');
-                    item.thumb = "<ss:serv name='dlByHttp' parm='{"wdConfirmationCaptchaService":"0","path":"${item.thumbnail.value}","type":"img"}'/>";
+                    item.thumb = "<ss:serv name='dlByHttp' parm='{"path":"${item.thumbnail.value}","type":"img"}'/>";	// {"wdConfirmationCaptchaService":"0",。Lin
                     </ss:notEqual>
                     </ss:equal>
 
@@ -1120,7 +1120,7 @@
 	                    try {
 	                        wd.display.showComponent({
 	                            show: ["wdDialog"],
-	                            url: "<ss:serv name='addPform' parm='{\"wdConfirmationCaptchaService\":\"0\",\"dxm\":\"${ssObjName}\"}' dest='pformSet'/>",
+	                            url: "<ss:serv name='addPform' parm='{\"dxm\":\"${ssObjName}\"}' dest='pformSet'/>",	// {\"wdConfirmationCaptchaService\":\"0\",。Lin
 	                            title: "设置统计表",
 	                            width: 800,
 	                            height: 580
@@ -1134,7 +1134,7 @@
 	                    try {
 	                        wd.display.showComponent({
 	                            show: ["wdDialog"],
-	                            url: "<ss:serv name='addPcht' parm='{\"wdConfirmationCaptchaService\":\"0\",\"dxm\":\"${ssObjName}\",\"use_grtjmbid\":\"${use_grtjmbid}\"}' dest='pchtSet'/>",
+	                            url: "<ss:serv name='addPcht' parm='{\"dxm\":\"${ssObjName}\",\"use_grtjmbid\":\"${use_grtjmbid}\"}' dest='pchtSet'/>",	// {\"wdConfirmationCaptchaService\":\"0\",。Lin
 	                            title: "设置统计图",
 	                            width: 800,
 	                            height: 580
@@ -2233,5 +2233,5 @@
 
 
     <%-- 原有的清令牌 --%>
-    tokenCleanser("<ss:serv name='ss.clearPageToken'/>", {tokenList: "<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
+    tokenCleanser("<ss:serv name='clearPageToken'/>", {tokenList: "<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
 </script>

+ 3 - 3
page/env/objPlay.jsp

@@ -71,7 +71,7 @@
 		<ss:equal val='${hasAuthorize}' val2='true'>
 <%-- 再改为 WebC.REQ_objName、WebC.REQ_objId,避免与数据表里的 对象名、对象ID 字段重名。用到再确认。Lin
 			eval('<serv@ss dlg="true" name="dxsq_djlsq" dest="djlsq" parm="{fromWdService:&quot;${wdService}&quot;,dxm:&quot;${dxm}&quot;,dxid:&quot;${dxid}&quot;}"/>') --%>
-			eval('wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='dxsq_djlsq' parm='{"wdConfirmationCaptchaService":"0","ssObjId":"${ssObjId}","ssObjName":"${ssObjName}","fromWdService":"${wdService}"}' dest='rowAuth'/>",title:"记录授权",width:800,height:590,minHeight:271,maxHeight:541});')
+			eval('wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='dxsq_djlsq' parm='{"ssObjId":"${ssObjId}","ssObjName":"${ssObjName}","fromWdService":"${wdService}"}' dest='rowAuth'/>",title:"记录授权",width:800,height:590,minHeight:271,maxHeight:541});')	// {"wdConfirmationCaptchaService":"0",。Lin
 <%--			//'@service{name:"djlsq",dest:"djlsq",show:"wdDialog",param:{fromWdService:"${wdService}",dxm:"${dxm}",dxid:"${dxid}"}}@' 应该用错注释了吧?Lin --%>
 		</ss:equal>
 	}
@@ -98,7 +98,7 @@
 			<ss:equal val='${empty shid}' val2='false'> <%-- 改 equal:val1="true" val2="${not empty shid}"。Lin --%>
 <%-- 去掉 check < wd.completeTask < wd.core.service.BpmService.completeTask() + sfty:"1",直接用 ss.agrTask。Lin
 				$.post("@service{name:'check',dest:'sys_info',param:{shid:"${shid}",sfty:'1'}}@", --%>
-				$.post("<ss:serv name='ss.agrTask' parm='{"wdConfirmationCaptchaService":"0","shid":"${shid}"}' dest='info'/>",
+				$.post("<ss:serv name='agrTask' parm='{"shid":"${shid}"}' dest='info'/>",	// {"wdConfirmationCaptchaService":"0",。Lin
 					function(data){
 						wd.display.refreshOpener();
 					wd.display.closeDialog();
@@ -196,5 +196,5 @@ try{wd.display.setCloseWindowParam('${wdclosewindowparam}');
 </ss:equal>
 </html>
 <script type="text/javascript">
-tokenCleanser("<ss:serv name='ss.clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
+tokenCleanser("<ss:serv name='clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
 </script>

+ 4 - 4
page/env/shList.jsp

@@ -208,7 +208,7 @@
 						<ss:rpt name='${item.ryList}' id='ry'>
 							<ss:equal val='${index}' val2='0'> <%-- 改 equal:val1="${index == 0}" val2="true"。Lin --%>
 								<tr data-num="1111" onClick='if($(window.event.srcElement).is("a,img"))return;
-										wd.display.showComponent({show:["wdDialog"],url:"<ss:serv parm='{"fjid":"${ry.fjid}","wdConfirmationCaptchaService":"0","ynrid":"${ry.ynrid}","sm":"${ry.sm}"}' dest='shInfo'/>",title:"审核内容",width:945,height:800,minHeight:54,maxHeight:853});'
+										wd.display.showComponent({show:["wdDialog"],url:"<ss:serv parm='{"fjid":"${ry.fjid}","ynrid":"${ry.ynrid}","sm":"${ry.sm}"}' dest='shInfo'/>",title:"审核内容",width:945,height:800,minHeight:54,maxHeight:853});' <%-- ,"wdConfirmationCaptchaService":"0",。Lin --%>
 										class="trtable folder1 list" style="height: 41px;line-height: 41px;width: 100%;position: relative;font-size: 14px;display: block;" data-tt-id="${item.type}${index}${ry.ryid}">
 									<td style="width:100%;padding-left: 15px;box-sizing: border-box;display: block;font-size: 14px" taskCount="${item.count}">
 										<span class="folder"></span>
@@ -263,7 +263,7 @@
 							</ss:equal>
 							<ss:equal val='${index > 0}' val2='true'>
 								<tr onClick='if($(window.event.srcElement).is("a,img"))return;
-										wd.display.showComponent({show:["wdDialog"],url:"<ss:serv parm='{"fjid":"${ry.fjid}","wdConfirmationCaptchaService":"0","ynrid":"${ry.ynrid}","sm":"${ry.sm}"}' dest='shInfo'/>",title:"审核内容",width:945,height:800,minHeight:54,maxHeight:853});'
+										wd.display.showComponent({show:["wdDialog"],url:"<ss:serv parm='{"fjid":"${ry.fjid}","ynrid":"${ry.ynrid}","sm":"${ry.sm}"}' dest='shInfo'/>",title:"审核内容",width:945,height:800,minHeight:54,maxHeight:853});' <%-- ,"wdConfirmationCaptchaService":"0",。Lin --%>
 										class="file2 list" style="height: 41px;line-height: 41px;width: 100%;position: relative;font-size: 14px;display: block;" data-tt-id="${item.type}${index}${ry.ryid}" data-tt-parent-id="${item.type}0${item.groupId}">
 									<td style="padding-left: 15px;width: 100%;box-sizing: border-box;display: block;">
 										<span class="file"></span>
@@ -507,7 +507,7 @@ window.SS.dom.listConfig.shList = [];<%-- 审核列表--%>
 <%--		</ss:equal>--%>
 
 	item.onclick = function (){
-			wd.display.showComponent({show:["wdDialog"],url:"<ss:serv parm='{"fjid":"${ry.fjid}","wdConfirmationCaptchaService":"0","ynrid":"${ry.ynrid}","sm":"${ry.sm}"}' dest='shInfo'/>",title:"审核内容",width:945,height:800,minHeight:54,maxHeight:853});
+			wd.display.showComponent({show:["wdDialog"],url:"<ss:serv parm='{"fjid":"${ry.fjid}","ynrid":"${ry.ynrid}","sm":"${ry.sm}"}' dest='shInfo'/>",title:"审核内容",width:945,height:800,minHeight:54,maxHeight:853});	// ,"wdConfirmationCaptchaService":"0",。Lin
 			}
 	item.xm="${ry.xm}";<%-- 审核人员姓名 --%>
 	<%--item.ysz="${ry.yszwj}";&lt;%&ndash; 审核人员艺术照文件 &ndash;%&gt;--%>
@@ -555,7 +555,7 @@ window.SS.dom.listConfig.shList = [];<%-- 审核列表--%>
 
 <%-- 新UI end Ben--%>
 
-tokenCleanser("<ss:serv name='ss.clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
+tokenCleanser("<ss:serv name='clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
 </script>
 
 <script type="module">

+ 3 - 4
page/fstLogin.jsp

@@ -43,8 +43,7 @@
                                         <img src="${sessionScope['XMMC']}/image/logo/largeLogo.png" />
                                     </div>
                                     <div class="box-container">
-                                        <form class="box-form" name="Form1" action="<ss:serv name='ss.login' parm='{"
-                                            wdConfirmationCaptchaService":"0"}' />" method="post">
+                                        <form class="box-form" name="Form1" action="<ss:serv name='ssLogin'/>" method="post"> <%-- parm='{"wdConfirmationCaptchaService":"0"}'。Lin --%>
                                         <input name="sbmc" type="hidden" />
                                         <ss:equal val='${empty LOGIN_PAGE_YHSB}' val2='false'>
                                             <input name="sbbs" type="hidden" value="${LOGIN_PAGE_YHSB.bs}" />
@@ -143,7 +142,7 @@
                     function qrcode() {
                         $.ajax({
                             type: "post",
-                            url: "<ss:serv name='wrQrcodeLoginKey' parm='{"wdConfirmationCaptchaService":"0"}'/>",	// ='getPrivateKey'。Lin
+                            url: "<ss:serv name='wrQrcodeLoginKey'/>",	// ='getPrivateKey'。 parm='{"wdConfirmationCaptchaService":"0"}'。Lin
                             async: true,
                             dataType:"json",
                             success: function(data) {
@@ -183,7 +182,7 @@
                         var sbmc = $("input[name='sbmc']").val();
                             $.ajax({
                                     type: "post",
-                                    url: "<ss:serv name='ifWrQrcodeLoginParmBySess' parm='{"wdConfirmationCaptchaService":"0"}'/>",	// :'resetCookie'。Lin
+                                    url: "<ss:serv name='ifWrQrcodeLoginParmBySess'/>",	// :'resetCookie'。parm='{"wdConfirmationCaptchaService":"0"}'。Lin
                                     async: true,
                                     dataType:"json",
                                     data: { sbbs: sbbs, sbmc: sbmc,ysbbs:ysbbs },

+ 13 - 13
page/home.jsp

@@ -182,14 +182,14 @@
 
 				/** 锁屏监听处理开始 **/
 				var lockScreenData = {
-					url1: '<ss:serv name='wd.lockSession' parm='{"wdConfirmationCaptchaService":"0"}'/>',
-					url2: '<ss:serv name='wd.checkIsUnlockedByApp' parm='{"wdConfirmationCaptchaService":"0"}'/>',
-					url3: '<ss:serv name='unlockByPwd' parm='{"wdConfirmationCaptchaService":"0"}'/>',
-					url4: '<ss:serv name='loadDeskImg' parm='{"wdConfirmationCaptchaService":"0"}'/>',
-					url5: '<ss:serv name='pl_cxajax' parm='{"wdConfirmationCaptchaService":"0"}'/>',
-					url6: 'wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='pl_cx' parm='{"wdConfirmationCaptchaService":"0"}' dest='pl_cx'/>",title:"pl_cx",width:650,height:555});',
-					url7: '<ss:serv name='nr_dz' parm='{"wdConfirmationCaptchaService":"0"}'/>',
-					url8: '<ss:serv name='wrLockStat' parm='{"wdConfirmationCaptchaService":"0"}'/>'
+					url1: '<ss:serv name='wd.lockSession'/>',	// parm='{"wdConfirmationCaptchaService":"0"}'。Lin
+					url2: '<ss:serv name='wd.checkIsUnlockedByApp'/>',	// parm='{"wdConfirmationCaptchaService":"0"}'。Lin
+					url3: '<ss:serv name='unlockByPwd'/>',	// parm='{"wdConfirmationCaptchaService":"0"}'。Lin
+					url4: '<ss:serv name='loadDeskImg'/>',	// parm='{"wdConfirmationCaptchaService":"0"}'。Lin
+					url5: '<ss:serv name='pl_cxajax'/>',	// parm='{"wdConfirmationCaptchaService":"0"}'。Lin
+					url6: 'wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='pl_cx' dest='pl_cx'/>",title:"pl_cx",width:650,height:555});',	// parm='{"wdConfirmationCaptchaService":"0"}'。Lin
+					url7: '<ss:serv name='nr_dz'/>',	// parm='{"wdConfirmationCaptchaService":"0"}'。Lin
+					url8: '<ss:serv name='wrLockStat'/>'	// parm='{"wdConfirmationCaptchaService":"0"}'。Lin
 				};
 				// 将锁屏需要的东西放进sessionStorage里
 				sessionStorage.setItem("lockScreenData",JSON.stringify(lockScreenData));
@@ -221,7 +221,7 @@
 					$(top.document).find('#background-desktop').css('display','block');
 					$.ajax({
 						type: 'POST',
-						url: '<ss:serv name='wrLockStat' parm='{"wdConfirmationCaptchaService":"0"}'/>',
+						url: '<ss:serv name='wrLockStat'/>',	// parm='{"wdConfirmationCaptchaService":"0"}'。Lin
 						data: {},
 						async: false,
 						success: function (data) {
@@ -385,11 +385,11 @@
               },
 				  iconItems: [
 					{ name: 'qiehuan', class: 'header-toolbar-icon', action: () => eventBus.publish('toggleGlobalMenuMode') }, //功能: 切换左侧菜单模式(图标跟随菜单模式切换)by xu 20251222
-				 	{ name: 'question', class: 'header-toolbar-icon icon-help-bold', action: () => wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='querySYSHelp' parm='{"wdConfirmationCaptchaService":"0","ishelp":"true","dialogid":"1"}' dest='cmsPlay'/>",title:"使用指南",width:900,height:800,minHeight:1,maxHeight:800}) }, //功能: 顶部帮助图标 by xu 20251222
+				 	{ name: 'question', class: 'header-toolbar-icon icon-help-bold', action: () => wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='querySYSHelp' parm='{"ishelp":"true","dialogid":"1"}' dest='cmsPlay'/>",title:"使用指南",width:900,height:800,minHeight:1,maxHeight:800}) }, //功能: 顶部帮助图标 by xu 20251222	// {"wdConfirmationCaptchaService":"0",。Lin
 					{ name: 'check', class: 'header-toolbar-icon icon-save', condition: () => currentMode.value === sysMode.edit.key, action: () => toggoleSysMode()}, //功能 by xu 20251222
 					{ name: 'setting-fill', class: 'header-toolbar-icon icon-set-bold', condition: () => currentMode.value !== sysMode.edit.key, action: () => toggoleSysMode() }, //功能 by xu 20251222
 					// { name: 'list-fill', class: 'header-toolbar-icon', action: () => console.log('list-fill clicked') }, //功能: 顶部菜单按钮暂时隐藏 by xu 20251222
-					{ name: 'topic-fill', class: 'header-toolbar-icon icon-skin', action: () => wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='gxhpf_cx' parm='{"wdConfirmationCaptchaService":"0"}' dest='ty_hf'/>",title:"换肤",width:799,height:757}) }, //功能 by xu 20251222
+					{ name: 'topic-fill', class: 'header-toolbar-icon icon-skin', action: () => wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='gxhpf_cx' dest='ty_hf'/>",title:"换肤",width:799,height:757}) }, //功能 by xu 20251222	// parm='{"wdConfirmationCaptchaService":"0"}'。Lin
 					{ name: 'lock-fill', class: 'header-toolbar-icon icon-lock-bold', action: () => this.lockScreenFun() }, //功能 by xu 20251222
 					{ name: 'quit', class: 'header-toolbar-logout-icon icon-exit', action: () => wd.display.exit() }, //功能 by xu 20251222
 				  ],
@@ -457,7 +457,7 @@
 				wd.display.beaconLogin("loginOut");
 				$.ajax({
 					type: 'POST',
-					url: '<ss:serv name='wrLockStat' parm='{"wdConfirmationCaptchaService":"0"}'/>',
+					url: '<ss:serv name='wrLockStat'/>',	// parm='{"wdConfirmationCaptchaService":"0"}'。Lin
 					data: {},
 					async: false,
 					success: function (data) {
@@ -478,7 +478,7 @@
 				}
 				var that = this;
 				$.ajax({
-					url: '<ss:serv name='unlockByPwd' parm='{"wdConfirmationCaptchaService":"0"}'/>',
+					url: '<ss:serv name='unlockByPwd'/>',	// parm='{"wdConfirmationCaptchaService":"0"}'。Lin
 					dataType: 'json',
 					type: 'POST',
 					data: {

+ 10 - 10
page/homep/infoHomep.jsp

@@ -36,7 +36,7 @@
                 <span class="icon-helpButton" style="position: relative;">
                 </span>
                 <span class="icon-set" style="position: relative;display: inline-block;"
-                onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='ryxxGrtjTx' parm='{"wdConfirmationCaptchaService":"0","ryid":"${ry.ryid}"}' dest='homep_info_set'/>",title:"个人头像上传",width:800,height:670});' >
+                onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='ryxxGrtjTx' parm='{"ryid":"${ry.ryid}"}' dest='homep_info_set'/>",title:"个人头像上传",width:800,height:670});' > <%-- {"wdConfirmationCaptchaService":"0",。Lin --%>
                 </span>
             </span>
             <div id="sybjBody" class="seif-info"  >
@@ -51,7 +51,7 @@
                                  onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='ry_bd_jbqk' dest='2objInp' parm='{ssObjId:"${sessionScope.ssUser.ryid}",ssObjName:ry,"ryid":"111141",dataType:"change"}'/>",title:"个人资料",width:970,height:670,minHeight:32,maxHeight:701});'
 <%-- 再增加 type="img"。Lin
                             src="<serv@ss name='dlByHttp' parm='{path:"${empty ry.yszwj?ry.zjzwj:ry.yszwj}"}'/>" --%>
-                            src="<ss:serv name='dlByHttp' parm='{"wdConfirmationCaptchaService":"0","path":"${empty ry.yszwj?ry.zjzwj:ry.yszwj}","type":"img"}'/>"
+                            src="<ss:serv name='dlByHttp' parm='{"path":"${empty ry.yszwj?ry.zjzwj:ry.yszwj}","type":"img"}'/>" <%-- {"wdConfirmationCaptchaService":"0",。Lin --%>
                             onerror="this.src='${sessionScope.ssUser.skinDir}image/default-personalPhoto.png'"/>
 						
                         </div>
@@ -59,7 +59,7 @@
                             <div style="padding-bottom: 7px;width: 100%;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;" >
                                 <%-- 问候语 --%>
                                 <span class="plugin-boldText" name="p_ry_ck"
-                                onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv parm='{"wdConfirmationCaptchaService":"0"}' dest='persHome'/>",title:"个人资料",width:970,height:670,minHeight:32,maxHeight:701});'>
+                                onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv dest='persHome'/>",title:"个人资料",width:970,height:670,minHeight:32,maxHeight:701});'> <%-- parm='{"wdConfirmationCaptchaService":"0"}'。Lin --%>
                                 <ss:txt val='${xm}'/></span>
                                 <span id="msg" class="plugin-text"  style="display: inline-block;height: 14px;line-height: 14px;">,${whymsg}</span>
                             </div>
@@ -85,7 +85,7 @@
                                                 <img style="max-width: 100%;max-height: 100%;" title="${item.topmsg}"
 <%-- 再增加 type="img"。Lin
                                                     src="<serv@ss name='dlByHttp' parm='{path:"${item.sltwj}"}'/>" /> --%>
-                                                    src="<ss:serv name='dlByHttp' parm='{"wdConfirmationCaptchaService":"0","path":"${item.sltwj}","type":"img"}'/>" />
+                                                    src="<ss:serv name='dlByHttp' parm='{"path":"${item.sltwj}","type":"img"}'/>" /> <%-- {"wdConfirmationCaptchaService":"0",。Lin --%>
                                             </div>
                                         </ss:equal>
                                             
@@ -98,7 +98,7 @@
                                                 <img style="max-height: 100%;max-width: 100%;" title="${item.topmsg}"
 <%-- 再增加 type="img"。Lin
                                                     src="<serv@ss name='dlByHttp' parm='{path:"${item.sltwj}"}'/>" /> --%>
-                                                    src="<ss:serv name='dlByHttp' parm='{"wdConfirmationCaptchaService":"0","path":"${item.sltwj}","type":"img"}'/>" />
+                                                    src="<ss:serv name='dlByHttp' parm='{"path":"${item.sltwj}","type":"img"}'/>" /> <%-- {"wdConfirmationCaptchaService":"0",。Lin --%>
                                             </div>
                                         </ss:equal>
 
@@ -197,7 +197,7 @@
                     <ss:equal val='${empty rclist}' val2='false'>
                         <ss:rpt name='rclist' id='item'>
                             <ss:equal val='${index}' val2='0'> <%-- 改 equal:val1="${index==0}" val2="true"。Lin --%>
-                                <div class="dHover2 cursor-click" style="height: 40px;text-align: left;" onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='getSystemTime' parm='{"wdConfirmationCaptchaService":"0"}' dest='Sched'/>",title:"日历",width:930,height:710});'>
+                                <div class="dHover2 cursor-click" style="height: 40px;text-align: left;" onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='getSystemTime' dest='Sched'/>",title:"日历",width:930,height:710});'> <%-- parm='{"wdConfirmationCaptchaService":"0"}'。Lin --%>
                                     <div class="plugin-largeText" style="display: inline-block;max-width: calc(100% - 4px);margin-left: 2px;margin-top: 12px;height: 20px;position: relative;text-indent: 0px;">
                                         ${item.mc}
                                     </div>
@@ -211,7 +211,7 @@
                             </ss:equal>
                             <ss:equal val='${index > 0}' val2='true'>
                                 <div class="plugin-largeText hLine" style="height: 40px;line-height: 40px;text-align: left;text-indent: 6px;">
-                                    <div onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='getSystemTime' parm='{"wdConfirmationCaptchaService":"0"}' dest='Sched'/>",title:"日历",width:930,height:710});'>
+                                    <div onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='getSystemTime' dest='Sched'/>",title:"日历",width:930,height:710});'> <%-- parm='{"wdConfirmationCaptchaService":"0"}'。Lin --%>
                                     ${item.mc}</div>
                                 </div>
                             </ss:equal>
@@ -224,7 +224,7 @@
                             </ss:equal>
                         </ss:rpt>
                     </ss:equal>
-                    <div id="nowDate" onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='getSystemTime' parm='{"wdConfirmationCaptchaService":"0"}' dest='Sched'/>",title:"日历",width:930,height:710});'
+                    <div id="nowDate" onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='getSystemTime' dest='Sched'/>",title:"日历",width:930,height:710});' <%-- parm='{"wdConfirmationCaptchaService":"0"}'。Lin --%>
                      class="plugin-largeText nowDateGrxx"
                      style="display:
                          <ss:equal val='${empty rclist}' val2='true'>
@@ -276,7 +276,7 @@
     
         var initJs${sybjId} = init
 
-        var a = 'wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='bj_cxgz' parm='{"wdConfirmationCaptchaService":"0","sfgxwkh":"1"}' dest='cmsPlay'/>",title:"内容播放器",width:900,height:800,minHeight:1,maxHeight:800});'
+        var a = 'wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='bj_cxgz' parm='{"sfgxwkh":"1"}' dest='cmsPlay'/>",title:"内容播放器",width:900,height:800,minHeight:1,maxHeight:800});'	// {"wdConfirmationCaptchaService":"0",。Lin
     </script>                
 
 <script type="text/javascript">var wdRecordValue='${wdRecordValue}';</script>
@@ -290,5 +290,5 @@ wd.display.resizeComponent(${resizeComponent.width}, ${resizeComponent.height},
 <ss:help/>
 
 <script type="text/javascript">
-tokenCleanser("<ss:serv name='ss.clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
+tokenCleanser("<ss:serv name='clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
 </script>

+ 1 - 1
page/homep/taskHomep.jsp

@@ -301,5 +301,5 @@ wd.display.resizeComponent(${resizeComponent.width}, ${resizeComponent.height},
 <ss:help/>
 
 <script type="text/javascript">
-tokenCleanser("<ss:serv name='ss.clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
+tokenCleanser("<ss:serv name='clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
 </script>

+ 3 - 3
page/homep/urgeHomep.jsp

@@ -61,7 +61,7 @@
 									<%-- cc = 催促。sfbl(是否办理),按规范反过来 -- 0 = 未办理,1 = 已办理。Lin
 									     去掉 name:"cc" > urgeHomep_searchTask,在 urgeHomep_tab.ss.jsp 里的选项卡有调用
 									sqid="${item.sqid}" onclick='@service{name:"cc",dest:"cc",show:"wdDialog",param:{sqid:"${item.sqid}",sfbl:"1"}}@'> --%>
-									sqid="${item.sqid}" onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv parm='{"wdConfirmationCaptchaService":"0","sqid":"${item.sqid}"}' dest='urgeHomep_tab'/>",title:"催办(Tab)",width:800,height:750,minHeight:33,maxHeight:782});'>
+									sqid="${item.sqid}" onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv parm='{"sqid":"${item.sqid}"}' dest='urgeHomep_tab'/>",title:"催办(Tab)",width:800,height:750,minHeight:33,maxHeight:782});'> <%-- {"wdConfirmationCaptchaService":"0",。Lin --%>
 								<div style="overflow: hidden;">
 									<span class="" style="width: calc(100% - 120px);overflow: hidden;text-overflow: ellipsis;white-space: nowrap;display: inline-block;">${item.mc}</span>
 									<a class="bb1" href="javascript:void(0)" name="cc" appAttr='${item.sqid}'>
@@ -69,7 +69,7 @@
 												<%-- sqlc_ck = 申请流程查看。Lin
 												 		 "grxx_shlist" 与 "cc" 完全一样 = urgeHomep_searchTask
 												onclick='@service{name:"grxx_shlist",dest:"sqlc_ck",show:"wdDialog",param:{sqid:"${item.sqid}"}}@'> --%>
-												onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='urgeHomep_searchTask' parm='{"wdConfirmationCaptchaService":"0","sqid":"${item.sqid}"}' dest='urgeHomep_diag'/>",title:"申请流程查看",width:1010,height:590});'>
+												onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='urgeHomep_searchTask' parm='{"sqid":"${item.sqid}"}' dest='urgeHomep_diag'/>",title:"申请流程查看",width:1010,height:590});'> <%-- {"wdConfirmationCaptchaService":"0",。Lin --%>
 											<div class="vLine-dashed cursor" style="display:inline-block;line-height: 27px;width: 37px;text-align: right;box-sizing: border-box;padding-right: 3px;font-size: 16px;">
 												<span class="cursor">${item.status}</span>
 											</div>
@@ -117,5 +117,5 @@ wd.display.resizeComponent(${resizeComponent.width}, ${resizeComponent.height},
 <ss:help/>
 
 <script type="text/javascript">
-tokenCleanser("<ss:serv name='ss.clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
+tokenCleanser("<ss:serv name='clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
 </script>

+ 4 - 4
page/homep/urgeHomep_curTask.jsp

@@ -367,7 +367,7 @@ function dq(){
 /* 再改,去掉 initPp,去掉 "代签人" 字段的默认值 "$@{sh.dlryid}" -- 就算原来有代理人员,也不会用了。Lin
 	    先不实现 <serv po="ShPo",用到再弄
 	var url='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='initPp' parm='{"wdConfirmationCaptchaService":"0","shid":"wdVal{shid}","ryid":"wdVal{ryid}"}' dest='urgeHomep_ppSure'/>",title:"代签确认",width:500,height:300});'; */
-	var url='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv parm='{"wdConfirmationCaptchaService":"0","shid":"ssVal{shid}","ryid":"ssVal{ryid}"}' dest='urgeHomep_ppSure'/>",title:"代签确认",width:500,height:300});';
+	var url='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv parm='{"shid":"ssVal{shid}","ryid":"ssVal{ryid}"}' dest='urgeHomep_ppSure'/>",title:"代签确认",width:500,height:300});';	// {"wdConfirmationCaptchaService":"0",。Lin
 	url=wd.display.replaceDynamicParam(url,json);
 	eval(url);
 }
@@ -397,7 +397,7 @@ function ch() {
 	  wd.display.confirm("收回", taskMsg +"<br><br>没有上下级的部门内审,只能选择一个审核人<br>等同于审核人的退回,并根据流程图退回,确定吗?", function() {	// 增加确认过程。Lin
 <%-- 改。Lin
 		$('#sendMsgDialog').attr('action', '@service{name:"ch",dest:"sys_info",param:{sqid:"${sqid}"}}@').submit(); --%>
-		$('#sendMsgDialog').attr('action', "<ss:serv name='ss.forceRejTask' parm='{"wdConfirmationCaptchaService":"0","sqid":"${sqid}"}' dest='info'/>").submit();
+		$('#sendMsgDialog').attr('action', "<ss:serv name='forceRejTask' parm='{"sqid":"${sqid}"}' dest='info'/>").submit();	// {"wdConfirmationCaptchaService":"0",。Lin
 		})	// 增加确认过程。Lin
 	} else {
 		wd.display.alert("请选人")
@@ -419,7 +419,7 @@ function forceClBpm() {
 	})
 	if (shidList) {
 	  wd.display.confirm("终止整个流程", taskMsg +"<br><br>整个流程将被终止,确定吗?", function(){
-			$('#sendMsgDialog').attr('action', "<ss:serv name='ss.forceClBpm' parm='{"wdConfirmationCaptchaService":"0","sqid":"${sqid}"}' dest='info'/>").submit();
+			$('#sendMsgDialog').attr('action', "<ss:serv name='forceClBpm' parm='{"sqid":"${sqid}"}' dest='info'/>").submit();	// {"wdConfirmationCaptchaService":"0",。Lin
 	  })
 	} else {
 		wd.display.alert("没有审核人")
@@ -428,7 +428,7 @@ function forceClBpm() {
 </script>
 </html>
 <script type="text/javascript">
-tokenCleanser("<ss:serv name='ss.clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
+tokenCleanser("<ss:serv name='clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
 </script>
 <script type="module">
 	SS.ready(function() {

+ 1 - 1
page/homep/urgeHomep_hstTask.jsp

@@ -194,7 +194,7 @@ try{wd.display.setCloseWindowParam('${wdclosewindowparam}');
 </ss:equal>
 </html>
 <script type="text/javascript">
-tokenCleanser("<ss:serv name='ss.clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
+tokenCleanser("<ss:serv name='clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
 </script>
 <script type="module">
 	SS.ready(function() {

+ 4 - 4
page/homep/urgeHomep_tab.jsp

@@ -89,7 +89,7 @@ window.SS.dom.tabConfig = window.SS.dom.tabConfig || [];
 {
 	let item = {
 		title:"未办理",
-		url:"<ss:serv name='urgeHomep_searchTask' parm='{"wdConfirmationCaptchaService":"0","sfbl":"0","sqid":"${sqid}"}' dest='urgeHomep_curTask'/>&rowHigh=66&removeHigh=150",
+		url:"<ss:serv name='urgeHomep_searchTask' parm='{"sfbl":"0","sqid":"${sqid}"}' dest='urgeHomep_curTask'/>&rowHigh=66&removeHigh=150",	// {"wdConfirmationCaptchaService":"0",。Lin
 		name:"db"
 	};
 
@@ -100,7 +100,7 @@ window.SS.dom.tabConfig = window.SS.dom.tabConfig || [];
 {
 	let item = {
 		title:"已办理",
-		url:"<ss:serv name='urgeHomep_searchTask' parm='{"wdConfirmationCaptchaService":"0","sfbl":"1","sqid":"${sqid}"}' dest='urgeHomep_hstTask'/>&rowHigh=66&removeHigh=53",
+		url:"<ss:serv name='urgeHomep_searchTask' parm='{"sfbl":"1","sqid":"${sqid}"}' dest='urgeHomep_hstTask'/>&rowHigh=66&removeHigh=53",	// {"wdConfirmationCaptchaService":"0",。Lin
 		name:"yb"
 	};
 
@@ -112,7 +112,7 @@ console.log('tabConfig:'+JSON.stringify(window.SS.dom.tabConfig));
 
 
 
-tokenCleanser("<ss:serv name='ss.clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
+tokenCleanser("<ss:serv name='clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
 </script>
 <script type="module">
 	
@@ -167,7 +167,7 @@ SS.ready(function () {
 			}
 		},
 		mounted() {
-			this.showTagState("<ss:serv name='ss.wrTabState' parm='{ssObjName:"${ssObjName}",ssObjId:"${ssObjId}","${ssObjIdName}":"${ssObjId}",wdConfirmationCaptchaService:"0",dataType:"${dataType}"}'/>");	
+			this.showTagState("<ss:serv name='wrTabState' parm='{ssObjName:"${ssObjName}",ssObjId:"${ssObjId}","${ssObjIdName}":"${ssObjId}",dataType:"${dataType}"}'/>");	// ,wdConfirmationCaptchaService:"0",。Lin
 		}
 	})
 	

+ 6 - 6
page/sys/mainMenuDefEdit.jsp

@@ -22,7 +22,7 @@
 
 
 
-<form name="ddpOptionForm" action="<ss:serv parm='{"wdConfirmationCaptchaService":"0"}' dest='menuDefOptList'/>" method="post"> <!-- "cdOptionForm"。Lin -->
+<form name="ddpOptionForm" action="<ss:serv dest='menuDefOptList'/>" method="post"> <!-- "cdOptionForm"。parm='{"wdConfirmationCaptchaService":"0"}'。Lin -->
 	<input type="hidden" name="cdOptionHtml" value="" id="cdOptionHtml" />
 	<!-- <@input type='submit' id="cx" value="查询" class="content-invertButton" /> -->
 <input name='wdComponentID' type='hidden' value='mainMenuDefEdit'/></form>
@@ -431,7 +431,7 @@ var shortcutMenuInfo={
     */
 	///// Start 改用 wd.display.confirm({ -- 新UI,增加 个人菜单.业务名 -- 实现 新UI 的图标体系。Lin
 	function addGroup() {
-		wd.display.confirm({ title: "增加菜单组", url: "<ss:serv parm='{"wdConfirmationCaptchaService":"0"}' dest='menuGrpAdd'/>", width: 300, height: 240, callback: addGroupCallback });<%-- addcallback改为addGroupCallback Ben(20251220) --%>
+		wd.display.confirm({ title: "增加菜单组", url: "<ss:serv dest='menuGrpAdd'/>", width: 300, height: 240, callback: addGroupCallback });<%-- addcallback改为addGroupCallback Ben(20251220)。 parm='{"wdConfirmationCaptchaService":"0"}'。Lin --%>
 	}
 
 	var addGroupCallback = (function (t) {
@@ -678,7 +678,7 @@ var shortcutMenuInfo={
 //	var mbid = $('#cdmbselected').val();
 		var mbid = $('#grcdmbid').val();
 		var json = JSON.parse('{"mbid":"' + mbid + '"}');
-		var url = "<ss:serv name='initMenuDef' parm='{"wdConfirmationCaptchaService":"0","mblx":"1","del":"ssVal{mbid}"}' dest='menuDefSaveOk'/>"
+		var url = "<ss:serv name='initMenuDef' parm='{"mblx":"1","del":"ssVal{mbid}"}' dest='menuDefSaveOk'/>"	// {"wdConfirmationCaptchaService":"0",。Lin
 		url = wd.display.replaceDynamicParam(url, json);
 
 		$('form[name="shortcutForm"]').attr('action', url);
@@ -706,7 +706,7 @@ var shortcutMenuInfo={
 			generateHiddenForm(_form,'shortcutMenuInfo',shortcutInfoStr);
 			generateHiddenForm(_form,'cdz','1');
 
-			$('form[name="shortcutForm"]').attr('action', "<ss:serv name='saveMenuDef' parm='{"wdConfirmationCaptchaService":"0","mblx":"1"}' dest='menuDefSaveOk'/>");
+			$('form[name="shortcutForm"]').attr('action', "<ss:serv name='saveMenuDef' parm='{"mblx":"1"}' dest='menuDefSaveOk'/>");	// {"wdConfirmationCaptchaService":"0",。Lin
 			$('form[name="shortcutForm"]').submit();
 		// });
 	}
@@ -738,7 +738,7 @@ var shortcutMenuInfo={
 				generateHiddenForm(_form, 'shortcutMenuInfo', shortcutInfoStr);
 				generateHiddenForm(_form, 'cdz', '1');
 
-				$('form[name="shortcutForm"]').attr('action', "<ss:serv name='saveMenuDef' parm='{"wdConfirmationCaptchaService":"0","mblx":"1"}' dest='menuDefSaveOk'/>");
+				$('form[name="shortcutForm"]').attr('action', "<ss:serv name='saveMenuDef' parm='{"mblx":"1"}' dest='menuDefSaveOk'/>");	// {"wdConfirmationCaptchaService":"0",。Lin
 				$('form[name="shortcutForm"]').submit();
 			}
 		}
@@ -746,7 +746,7 @@ var shortcutMenuInfo={
 
 	function doAddcallback(){
 		// $('#addmb').click(function () {
-		wd.display.confirm({ title: "另存为新模板", url: "<ss:serv parm='{"wdConfirmationCaptchaService":"0"}' dest='menuDefAdd'/>", width: 300, height: 240, callback: addcallback });
+		wd.display.confirm({ title: "另存为新模板", url: "<ss:serv dest='menuDefAdd'/>", width: 300, height: 240, callback: addcallback });	// parm='{"wdConfirmationCaptchaService":"0"}'。Lin
 		// });
 	}
 

+ 2 - 2
ss/clip/miniInfo.jsp

@@ -8,7 +8,7 @@
 						class="xxxfilter"
 <%-- 再改为 WebC.REQ_objName、WebC.REQ_objId,避免与数据表里的 对象名、对象ID 字段重名。Lin
 						onClick='wd.display.showComponent({show:["wdDialog"],url:"<ss@serv name='ydsq_tj' parm='{"dxid":"${item.dxid}","wdConfirmationCaptchaService":"0","dxm":"${item.dxm}"}' dest='ydsq_tj'/>",title:"借阅",width:613,height:387});' --%>
-						onClick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='ydsq_tj' dest='ydsq_tj' parm='{ssObjName:"${item.ssObjName}",ssObjId:"${item.ssObjId}",wdConfirmationCaptchaService:"0"}'/>",title:"借阅",width:613,height:387});'
+						onClick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='ydsq_tj' dest='ydsq_tj' parm='{ssObjName:"${item.ssObjName}",ssObjId:"${item.ssObjId}"}'/>",title:"借阅",width:613,height:387});'	<%-- ,wdConfirmationCaptchaService:"0"。Lin --%>
 					</ss:equal>
 				>
 				<td class="hLine"
@@ -21,7 +21,7 @@
 						<div class="longCardList-thumbnail" style="margin-right: 18px;margin-bottom: 2px;">
 <%-- 再增加 type="img"。Lin
 							<img src="<ss@serv name='dlByHttp' parm='{"wdConfirmationCaptchaService":"0","path":"${item.thn}"}'/>"/> --%>
-							<img src="<ss:serv name='dlByHttp' parm='{type:"img",path:"${item.thn}",wdConfirmationCaptchaService:0}'/>"/>
+							<img src="<ss:serv name='dlByHttp' parm='{type:"img",path:"${item.thn}"}'/>"/> <%-- ,wdConfirmationCaptchaService:0。Lin --%>
 						</div>
 					</ss:equal>
 					<div class="longCardList-info" style="font-size: 0px;display: inline-block;float: left;">

+ 1 - 1
ss/clip/tabState.jsp

@@ -1 +1 @@
-<script>
<%-- 再改为 WebC.REQ_objName、WebC.REQ_objId,避免与数据表里的 对象名、对象ID 字段重名。Lin
wd.display.showTagState("<ss@serv name='ss.wrTabState' parm='{"dxid":"${dxid}","wdConfirmationCaptchaService":"0","dataType":"${dataType}","dxm":"${dxm}","${dxidName}":"${dxid}"}'/>"); --%>
wd.display.showTagState("<ss:serv name='ss.wrTabState' parm='{ssObjName:"${ssObjName}",ssObjId:"${ssObjId}","${ssObjIdName}":"${ssObjId}",wdConfirmationCaptchaService:"0",dataType:"${dataType}"}'/>");
		<%-- 注:${ssObjIdName} 做为属性名,需要加 ""。否则,${ssObjIdName} 为空时,解析 parm 参数串时抛出错误。Lin --%>
</script>
+<script>
<%-- 再改为 WebC.REQ_objName、WebC.REQ_objId,避免与数据表里的 对象名、对象ID 字段重名。Lin
wd.display.showTagState("<ss@serv name='ss.wrTabState' parm='{"dxid":"${dxid}","wdConfirmationCaptchaService":"0","dataType":"${dataType}","dxm":"${dxm}","${dxidName}":"${dxid}"}'/>"); --%>
wd.display.showTagState("<ss:serv name='wrTabState' parm='{ssObjName:"${ssObjName}",ssObjId:"${ssObjId}","${ssObjIdName}":"${ssObjId}",dataType:"${dataType}"}'/>");	// ,wdConfirmationCaptchaService:"0",。Lin
		<%-- 注:${ssObjIdName} 做为属性名,需要加 ""。否则,${ssObjIdName} 为空时,解析 parm 参数串时抛出错误。Lin --%>
</script>

Datei-Diff unterdrückt, da er zu groß ist
+ 2786 - 2671
ss/js/display.js


Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.