From 76427d51a079a5fd1f45bf7188249e7a4647ae05 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 14 九月 2020 10:37:25 +0800
Subject: [PATCH] 2020-09-14
---
src/utils/utils.js | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 497baee..31c3abf 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -181,27 +181,36 @@
static UnformatOptions (value) {
if (!value) return ''
let salt = 'minKe' // 鐩愬��
+ let _value = ''
try {
- value = window.atob(value)
- value = value.replace(salt, '')
- value = window.decodeURIComponent(window.atob(value))
+ try {
+ _value = JSON.parse(window.decodeURIComponent(window.atob(value)))
+ } catch {
+ _value = ''
+ }
- value = value.replace(/\smpercent\s/g, '%')
-
- formatKeys.forEach(item => {
- let reg = new RegExp(item.value, 'g')
- value = value.replace(reg, ' ' + item.key + ' ')
- })
-
- value = value.replace(/\s\n\s/ig, '\n')
- value = value.replace(/(^\s+|\s+$)/ig, '')
+ if (!_value) {
+ _value = window.atob(value)
+ _value = _value.replace(salt, '')
+ _value = window.decodeURIComponent(window.atob(_value))
+
+ _value = _value.replace(/\smpercent\s/g, '%')
+
+ formatKeys.forEach(item => {
+ let reg = new RegExp(item.value, 'g')
+ _value = _value.replace(reg, ' ' + item.key + ' ')
+ })
+
+ _value = _value.replace(/\s\n\s/ig, '\n')
+ _value = _value.replace(/(^\s+|\s+$)/ig, '')
+ }
} catch {
console.warn('UnFormat Failure')
- value = ''
+ _value = ''
}
- return value
+ return _value
}
/**
@@ -849,7 +858,7 @@
let _sqlInsert = ''
let _sqlBottom = ''
- if (item.intertype === 'inner' && !item.innerFunc) {
+ if (item.intertype === 'system') {
let _uniquesql = ''
if (btn.uniques && btn.uniques.length > 0) {
btn.uniques.forEach(unique => {
--
Gitblit v1.8.0