From e6a6fb8d27b14581ae771325c1b99ee26d6618dd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 19 三月 2020 18:19:06 +0800
Subject: [PATCH] 2020-03-19
---
src/utils/utils.js | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index b5c9245..cbc715d 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -1,5 +1,6 @@
import moment from 'moment'
import md5 from 'md5'
+import options from '@/store/options.js'
const service = window.GLOB.service ? (/\/$/.test(window.GLOB.service) ? window.GLOB.service : window.GLOB.service + '/') : ''
@@ -288,6 +289,12 @@
newsearches[item.key] = item.value
}
})
+
+ Object.keys(newsearches).forEach(key => {
+ if (!newsearches[key]) {
+ delete newsearches[key]
+ }
+ })
return newsearches
}
@@ -391,6 +398,7 @@
*/
static getrealurl (url) {
if (!url) return ''
+
let baseurl = ''
if (process.env.NODE_ENV === 'production') {
baseurl = document.location.origin + '/' + service
@@ -402,6 +410,24 @@
// }
let realurl = url.match(/^http/) || url.match(/^\/\//) ? url : baseurl + url
return realurl
+ }
+
+ /**
+ * @description 鑾峰彇浜戠鍥剧墖鐪熷疄璺緞
+ * @return {String} url 鍥剧墖璺緞
+ */
+ static getcloudurl (url) {
+ if (!url) return ''
+
+ let baseurl = ''
+
+ if (options.cloudServiceApi) {
+ baseurl = options.cloudServiceApi.replace(/webapi(.*)$/, '')
+ } else {
+ baseurl = document.location.origin + '/' + service
+ }
+
+ return url.match(/^http/) || url.match(/^\/\//) ? url : baseurl + url
}
/**
@@ -1092,6 +1118,7 @@
let Ltext = `create proc ${param.innerFunc}
( /*${menu.MenuName}*/
+ @appkey nvarchar(50)='',
@BID nvarchar(50)='',${formParam}
@PageIndex nvarchar(50)='',
@PageSize nvarchar(50)='',
@@ -1249,8 +1276,15 @@
`
}
+ // 鎵撳嵃鑷畾涔夋ā鏉垮瓧娈垫彁绀�
+ let _printRemark = ''
+ if (btn.funcType === 'print') {
+ _printRemark = '/* 鑷畾涔夋暟鎹墦鍗版ā鏉挎椂锛岃浣跨敤TemplateID瀛楁 */'
+ }
+
let Ltext = `create proc ${param.funcName}
( /*${menu.MenuName} ${btn.label}*/
+ @appkey nvarchar(50)='',
@BID nvarchar(50)='',${formParam}
@sEPTMenuNo nvarchar(50)='${param.menuNo}',
@lang nvarchar(50)='',
@@ -1271,7 +1305,7 @@
/*浜嬪姟鎿嶄綔*/
BEGIN TRAN
/*鍏蜂綋涓氬姟鎿嶄綔*/
-
+ ${_printRemark}
/*
select top 10 * from sProcExcep order by id desc
@@ -1358,10 +1392,13 @@
let Ltext = `create proc ${param.funcName}
( /*${menu.MenuName} ${btn.label}*/
+ @appkey nvarchar(50)='',
@ID nvarchar(50)='',
@BID nvarchar(50)='',
@Ltext nvarchar(max)='',
@sEPTMenuNo nvarchar(50)='${param.menuNo}',
+ @secretkey nvarchar(50)='',
+ @timestamp nvarchar(50)='',
@lang nvarchar(50)='',
@LoginUID nvarchar(50)='',
@SessionUid nvarchar(50)='',
--
Gitblit v1.8.0