From 1f5c6ac307a134dfa45b64c5723f2481ead9f213 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 16 七月 2023 16:23:09 +0800
Subject: [PATCH] 2023-07-16
---
src/templates/modalconfig/index.jsx | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/src/templates/modalconfig/index.jsx b/src/templates/modalconfig/index.jsx
index 2a2d203..5e51140 100644
--- a/src/templates/modalconfig/index.jsx
+++ b/src/templates/modalconfig/index.jsx
@@ -126,6 +126,7 @@
}
componentDidMount() {
+ window.GLOB.formId = ''
MKEmitter.addListener('submitStyle', this.getStyle)
document.onkeydown = (event) => {
let e = event || window.event
@@ -254,6 +255,8 @@
index = i
}
+ if (!item.field) return
+
if (['text', 'number', 'textarea', 'color'].includes(item.type) && card.field !== item.field) {
_inputfields.push({
field: item.field,
@@ -267,25 +270,28 @@
})
}
- if (item.type === 'switch') {
+ if (item.type === 'switch' || item.type === 'check') {
_linksupFields.push({
field: item.field,
label: item.label
})
}
- if (!['select', 'link', 'radio', 'checkcard'].includes(item.type)) return
- if (item.type === 'checkcard' && item.multiple === 'true') return // 閫夐」鍗″閫�
- if (item.field && !uniq.has(item.field)) {
+ if (!['select', 'link', 'radio', 'checkcard', 'multiselect'].includes(item.type)) return
+
+ _linksupFields.push({
+ field: item.field,
+ label: item.label
+ })
+
+ if (item.type === 'multiselect' || (item.type === 'checkcard' && item.multiple === 'true')) return
+
+ if (!uniq.has(item.field)) {
uniq.set(item.field, true)
_linkableFields.push({
field: item.field,
label: item.label + '-琛ㄥ崟'
- })
- _linksupFields.push({
- field: item.field,
- label: item.label
})
}
})
@@ -391,6 +397,8 @@
_config.fields = _config.fields.filter(item => !item.origin)
+ window.GLOB.formId = res.uuid
+
if (['select', 'multiselect', 'link', 'checkbox', 'radio', 'checkcard'].includes(res.type) && res.resourceType === '1' && /\s/.test(res.dataSource)) {
this.setState({
sqlVerifing: true
@@ -399,7 +407,7 @@
let param = {
func: 's_debug_sql',
exec_type: 'y',
- LText: `declare @mk_organization nvarchar(512)
+ LText: `declare @mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20)
${res.dataSource}`
}
@@ -732,7 +740,6 @@
onCancel() {}
})
}
-
render () {
const { editAction } = this.props
--
Gitblit v1.8.0