From 67a307d8f0fa25fbc56ee9f84c313d521280925f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 04 三月 2022 15:33:09 +0800
Subject: [PATCH] 2022-03-04
---
src/utils/utils.js | 26 ++++----------------------
1 files changed, 4 insertions(+), 22 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index e195f6b..460b65f 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -1114,19 +1114,6 @@
database = database ? (database[0] || '') : ''
- let getuuid = () => {
- let uuid = []
- let timestamp = new Date().getTime()
- let _options = '0123456789abcdefghigklmnopqrstuv'
- for (let i = 0; i < 19; i++) {
- uuid.push(_options.substr(Math.floor(Math.random() * 0x20), 1))
- }
- uuid = timestamp + uuid.join('')
- return uuid
- }
-
- // let upId = getuuid()
-
let _initCustomScript = '' // 鍒濆鍖栬剼鏈�
let _prevCustomScript = '' // 榛樿sql鍓嶆墽琛岃剼鏈�
let _backCustomScript = '' // 榛樿sql鍚庢墽琛岃剼鏈�
@@ -1168,13 +1155,7 @@
})
let key = item.$$uuid
- let type = 'upt'
- if (key === '$new') {
- key = getuuid()
- type = 'add'
- } else if (item.$deleted) {
- type = 'del'
- }
+ let type = item.$type || 'upt'
vals.push(`'${key}'`)
vals.push(`'${type}'`)
@@ -1395,7 +1376,7 @@
}
_initFormfields.push(`@${_key}=${val}`)
} else if (['date', 'datemonth', 'datetime'].includes(form.type)) {
- _initFormfields.push(`@${_key}='${form.value || '1900-01-01'}'`)
+ _initFormfields.push(`@${_key}='${form.value || '1949-10-01'}'`)
} else {
_initFormfields.push(`@${_key}='${form.value}'`)
}
@@ -1440,7 +1421,7 @@
let _val = datavars.hasOwnProperty(_key) ? datavars[_key] : ''
if (col.datatype && /^date/ig.test(col.datatype) && !_val) {
- _val = '1900-01-01'
+ _val = '1949-10-01'
}
_initvars.push(_key)
@@ -2048,6 +2029,7 @@
let icon = null
let color = null
let position = null
+ style = JSON.parse(JSON.stringify(style))
marks.some(mark => {
let originVal = record[mark.field[0]] + ''
--
Gitblit v1.8.0