From cc810edac6aec3c858fb352091ad8c11332447a5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 10 十二月 2023 19:12:53 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/utils/utils.js | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 7c45ab0..6754540 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -348,6 +348,9 @@
item.initval = ''
item.initType = ''
}
+ } else if ((item.type === 'select' || item.type === 'link') && item.initval === '$first' && item.resourceType === '1') {
+ item.initval = ''
+ item.$first = true
}
item.oriInitval = item.initval
@@ -1115,10 +1118,19 @@
let _insert = ''
if (btn.default !== 'false') {
+ let _fields = []
+ btn.columns.forEach(col => {
+ if (col.import === 'false' || col.import === 'init') return
+
+ _fields.push(col.Column)
+ })
+
+ _fields = _fields.join(',')
+
_insert = `
/* 榛樿sql */
- Insert into ${database}${sheet} (${fields},createuserid,createuser,createstaff,bid)
- Select ${fields},'${sessionStorage.getItem('UserID') || ''}',@username,@fullname,'${BID}' From #${sheet}
+ Insert into ${database}${sheet} (${_fields},createuserid,createuser,createstaff,bid)
+ Select ${_fields},'${sessionStorage.getItem('UserID') || ''}',@username,@fullname,'${BID}' From #${sheet}
`
}
--
Gitblit v1.8.0