From 496bf836a5560bc2e2f67b1e2f38fc01c9274906 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 30 四月 2024 01:58:49 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/utils/utils-datamanage.js | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index 1291a36..6210d62 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -48,6 +48,10 @@
param.mk_year = year
}
+ if (setting.hasExtend) {
+ param.mk_time = setting.extendTime
+ }
+
if (setting.interType === 'inner') {
param.func = setting.innerFunc
@@ -150,6 +154,9 @@
{ reg: /@typename@/ig, value: `'admin'`},
)
+ if (setting.hasExtend) {
+ regoptions.push({ reg: /@mk_time@/ig, value: setting.extendTime })
+ }
if (setting.$re_year) {
regoptions.push({ reg: /@mk_year@/ig, value: year })
}
--
Gitblit v1.8.0