From a2cbc7cbb029eb97ab3c71ffabf6fd8a716fb70e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 29 三月 2021 11:05:46 +0800
Subject: [PATCH] 2021-03-29
---
src/menu/components/card/cardcellcomponent/formconfig.jsx | 1 +
src/tabviews/custom/components/card/cardcellList/index.jsx | 7 ++++++-
src/api/index.js | 15 ++++++++++-----
3 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 68cdff5..6e85dc6 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -158,7 +158,8 @@
let url = '/webapi/dologon/s_visitor_login'
if (window.GLOB.mainSystemApi) {
- url = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon/s_visitor_login')
+ // url = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon/s_visitor_login')
+ param.rduri = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon/s_visitor_login')
}
return axios({
@@ -188,13 +189,15 @@
if (isCloud) {
param.debug = 'Y'
if (options.cloudServiceApi) {
- url = options.cloudServiceApi.replace(/\/webapi(.*)/, '/webapi/dologon')
+ // url = options.cloudServiceApi.replace(/\/webapi(.*)/, '/webapi/dologon')
+ param.rduri = options.cloudServiceApi.replace(/\/webapi(.*)/, '/webapi/dologon')
}
} else if (window.GLOB.mainSystemApi) {
if (options.sysType !== 'cloud' && window.GLOB.systemType !== 'production') {
param.linkurl = window.GLOB.linkurl
}
- url = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon')
+ // url = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon')
+ param.rduri = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon')
}
return axios({
@@ -230,13 +233,15 @@
if (isCloud) {
param.debug = 'Y'
if (options.cloudServiceApi) {
- url = options.cloudServiceApi.replace(/\/webapi(.*)/, '/webapi/dologon')
+ // url = options.cloudServiceApi.replace(/\/webapi(.*)/, '/webapi/dologon')
+ param.rduri = options.cloudServiceApi.replace(/\/webapi(.*)/, '/webapi/dologon')
}
} else if (window.GLOB.mainSystemApi) {
if (options.sysType !== 'cloud' && window.GLOB.systemType !== 'production') {
param.linkurl = window.GLOB.linkurl
}
- url = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon')
+ // url = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon')
+ param.rduri = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon')
}
return axios({
diff --git a/src/menu/components/card/cardcellcomponent/formconfig.jsx b/src/menu/components/card/cardcellcomponent/formconfig.jsx
index 0e1c9f3..a83aee1 100644
--- a/src/menu/components/card/cardcellcomponent/formconfig.jsx
+++ b/src/menu/components/card/cardcellcomponent/formconfig.jsx
@@ -117,6 +117,7 @@
min: 0,
label: '鍐呭',
initVal: card.value || '',
+ tooltip: '鏂囨湰绫诲瀷锛屼細鏇挎崲鍐呭涓殑@username@鍜孈fullName@銆�',
required: true
},
{
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index e9604b6..05b9a24 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -278,7 +278,12 @@
let _style = card.style ? {...card.style} : {}
if (card.datatype === 'static') {
- val = card.value
+ val = card.value || ''
+ if (/@username@|@fullName@/ig.test(val)) {
+ let userName = sessionStorage.getItem('User_Name') || ''
+ let fullName = sessionStorage.getItem('Full_Name') || ''
+ val = val.replace(/@username@/ig, userName).replace(/@fullName@/ig, fullName)
+ }
} else if (data.hasOwnProperty(card.field)) {
val = data[card.field]
}
--
Gitblit v1.8.0