From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/mob/modalconfig/index.jsx | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/mob/modalconfig/index.jsx b/src/mob/modalconfig/index.jsx
index 6be97f8..2bc3d6c 100644
--- a/src/mob/modalconfig/index.jsx
+++ b/src/mob/modalconfig/index.jsx
@@ -277,10 +277,10 @@
LText: res.dataSource
}
- param.LText = param.LText.replace(/@\$|\$@/ig, '')
+ param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+ param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id)@/ig, `'${param.timestamp}'`)
param.LText = Utils.formatOptions(param.LText)
- param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
if (window.GLOB.mainSystemApi && res.database === 'sso') {
@@ -442,6 +442,7 @@
}
render () {
+ const { btn } = this.props
const { config, dict, saving } = this.state
return (
@@ -472,7 +473,7 @@
<div className="mob-shell-inner">
<div className="am-navbar">
<LeftOutlined />
- <div className="am-navbar-title">{config.setting.title}</div>
+ <div className="am-navbar-title">{btn.label}</div>
{config.setting.btnPosition === 'top' ? <Button className="modal-submit-top">{config.setting.btnName || '纭畾'}</Button> : null}
</div>
<DragElement
--
Gitblit v1.8.0