From ef8acbf3859bd13e759fbb9b8ba726039c1fb2c5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 14 十一月 2023 15:51:59 +0800
Subject: [PATCH] 2023-11-14
---
src/templates/zshare/modalform/index.jsx | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/src/templates/zshare/modalform/index.jsx b/src/templates/zshare/modalform/index.jsx
index 0c6a6b7..ffe236a 100644
--- a/src/templates/zshare/modalform/index.jsx
+++ b/src/templates/zshare/modalform/index.jsx
@@ -9,6 +9,7 @@
import { dateOptions } from '@/utils/option.js'
import Utils from '@/utils/utils.js'
import EditTable from './modaleditable'
+import { checkSQL } from '@/utils/utils-custom.js'
import asyncComponent from '@/utils/asyncComponent'
import CodeMirror from '@/templates/zshare/codemirror'
import './index.scss'
@@ -288,6 +289,10 @@
if (this.record.interception === 'func') {
shows.push('func')
}
+ } else if (type === 'popSelect') {
+ if (this.record.enter === 'tab' || this.record.enter === 'sub') {
+ shows.push('tabField')
+ }
}
if (['multiselect', 'select', 'link', 'radio', 'checkbox', 'checkcard', 'cascader'].includes(type)) {
@@ -382,7 +387,7 @@
if (value === 'text' || value === 'number') {
this.record.enter = 'sub'
_fieldval.enter = 'sub'
- } else if (value === 'select' || value === 'link') {
+ } else if (['select', 'link', 'popSelect', 'vercode'].includes(value)) {
_fieldval.enter = 'false'
}
@@ -745,7 +750,6 @@
{ required: item.required, message: '璇疯緭鍏�' + item.label + '!' }
]
span = 24
- className = 'text-area'
if (this.record.type === 'select' || this.record.type === 'link') {
extra = <span className="add-resource-empty" onClick={this.handleEmpty}>绌�</span>
@@ -757,7 +761,6 @@
content = <CodeMirror />
} else if (item.type === 'textarea') {
span = 24
- className = 'text-msg'
rules = [
{ required: item.required, message: '璇疯緭鍏�' + item.label + '!' }
]
@@ -765,7 +768,6 @@
content = <TextArea rows={item.rows || 4}/>
} else if (item.type === 'options') {
span = 24
- className = 'text-area'
let type = this.record.type
let linkSubFields = this.record.linkSubField || []
@@ -818,6 +820,7 @@
columns.push({ title: 'url', key: '$url', type: 'file' })
} else if (this.record.display === 'color') {
columns.push({ title: 'Color', key: '$color' })
+ extra = <span>浣跨敤鍗佸叚杩涘埗鑹插僵浠ｇ爜锛圚EX锛夋椂锛岃鍦ㄨ壊鍊煎墠娣诲姞 #</span>
}
fields.forEach(item => {
@@ -835,7 +838,6 @@
}
} else if (item.type === 'fields') {
span = 24
- className = 'text-area'
rules = [
{ required: item.required, message: '璇锋坊鍔�' + item.label + '!' }
]
@@ -1078,16 +1080,9 @@
}
})
- let error = Utils.verifySql(values.dataSource)
+ let pass = checkSQL(values.dataSource)
- if (error) {
- notification.warning({
- top: 92,
- message: '鏁版嵁婧愪腑涓嶅彲浣跨敤' + error,
- duration: 5
- })
- return
- }
+ if (!pass) return
window.GLOB.formId = card.uuid
--
Gitblit v1.8.0