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 | 432 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 354 insertions(+), 78 deletions(-)
diff --git a/src/templates/zshare/modalform/index.jsx b/src/templates/zshare/modalform/index.jsx
index 74ed039..ffe236a 100644
--- a/src/templates/zshare/modalform/index.jsx
+++ b/src/templates/zshare/modalform/index.jsx
@@ -1,47 +1,51 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Form, Row, Col, Input, Select, Radio, notification, InputNumber, Tooltip, Checkbox } from 'antd'
+import { Form, Row, Col, Input, Select, Radio, notification, InputNumber, Tooltip, Checkbox, AutoComplete, Modal } from 'antd'
import { QuestionCircleOutlined } from '@ant-design/icons'
+import Api from '@/api'
import { formRule } from '@/utils/option.js'
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'
const { TextArea } = Input
const ColorSketch = asyncComponent(() => import('@/mob/colorsketch'))
-const FieldsTable = asyncComponent(() => import('./fieldtable'))
-const DataTable = asyncComponent(() => import('./datatable'))
+const FieldsTable = asyncComponent(() => import('@/templates/zshare/editTable'))
const MkEditIcon = asyncComponent(() => import('@/components/mkIcon'))
const modalTypeOptions = {
- text: ['initval', 'readonly', 'required', 'hidden', 'readin', 'fieldlength', 'regular', 'interception', 'span', 'labelwidth', 'encryption', 'tooltip', 'extra', 'enter', 'cursor', 'scan', 'splitline', 'placeholder', 'place', 'marginTop', 'marginBottom', 'lenControl'],
+ text: ['initval', 'readonly', 'required', 'hidden', 'readin', 'fieldlength', 'regular', 'interception', 'span', 'labelwidth', 'encryption', 'tooltip', 'extra', 'enter', 'cursor', 'scan', 'splitline', 'placeholder', 'place', 'marginTop', 'marginBottom', 'lenControl', 'inputType', 'constant'],
number: ['initval', 'readonly', 'hidden', 'decimal', 'min', 'max', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'enter', 'cursor', 'splitline', 'place', 'marginTop', 'marginBottom'],
- select: ['initval', 'readonly', 'required', 'hidden', 'readin', 'resourceType', 'declare', 'setAll', 'linkSubField', 'span', 'labelwidth', 'tooltip', 'extra', 'emptyText', 'enter', 'splitline', 'dropdown', 'marginTop', 'marginBottom'],
- checkbox: ['initval', 'readonly', 'required', 'hidden', 'readin', 'resourceType', 'fieldlength', 'span', 'labelwidth', 'tooltip', 'extra', 'splitline', 'arrange', 'marginTop', 'marginBottom'],
- radio: ['initval', 'readonly', 'required', 'hidden', 'readin', 'resourceType', 'declare', 'linkSubField', 'span', 'labelwidth', 'tooltip', 'extra', 'setAll', 'emptyText', 'splitline', 'arrange', 'marginTop', 'marginBottom'],
- checkcard: ['initval', 'readonly', 'required', 'hidden', 'readin', 'resourceType', 'span', 'labelwidth', 'display', 'tooltip', 'extra', 'width', 'multiple', 'splitline', 'marginTop', 'marginBottom'],
+ select: ['initval', 'readonly', 'required', 'hidden', 'readin', 'resourceType', 'declare', 'linkSubField', 'span', 'labelwidth', 'tooltip', 'extra', 'place', 'enter', 'splitline', 'dropdown', 'marginTop', 'marginBottom', 'pickerMode'],
+ checkbox: ['initval', 'readonly', 'required', 'hidden', 'readin', 'resourceType', 'fieldlength', 'span', 'labelwidth', 'tooltip', 'extra', 'place', 'splitline', 'arrange', 'marginTop', 'marginBottom'],
+ radio: ['initval', 'readonly', 'required', 'hidden', 'readin', 'resourceType', 'declare', 'linkSubField', 'span', 'labelwidth', 'tooltip', 'extra', 'place', 'splitline', 'arrange', 'marginTop', 'marginBottom'],
+ checkcard: ['initval', 'readonly', 'required', 'hidden', 'readin', 'resourceType', 'span', 'labelwidth', 'display', 'tooltip', 'extra', 'place', 'width', 'multiple', 'splitline', 'marginTop', 'marginBottom'],
multiselect: ['initval', 'readonly', 'required', 'hidden', 'readin', 'resourceType', 'fieldlength', 'span', 'labelwidth', 'tooltip', 'extra', 'marginTop', 'marginBottom', 'dropdown'],
- link: ['initval', 'readonly', 'required', 'hidden', 'readin', 'resourceType', 'declare', 'setAll', 'linkField', 'linkSubField', 'span', 'labelwidth', 'tooltip', 'extra', 'emptyText', 'enter', 'splitline', 'dropdown', 'marginTop', 'marginBottom'],
- fileupload: ['readonly', 'required', 'readin', 'fieldlength', 'maxfile', 'fileType', 'span', 'labelwidth', 'tooltip', 'extra', 'compress', 'miniSet', 'splitline', 'marginTop', 'marginBottom', 'maxSize'],
- switch: ['initval', 'openVal', 'closeVal', 'openText', 'closeText', 'readonly', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'splitline', 'marginTop', 'marginBottom'],
- date: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'declareType', 'mode', 'splitline', 'marginTop', 'marginBottom', 'minDate', 'maxDate', 'precision'],
- datemonth: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'declareType', 'splitline', 'marginTop', 'marginBottom'],
- datetime: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'declareType', 'mode', 'splitline', 'marginTop', 'marginBottom', 'minDate', 'maxDate'],
- textarea: ['initval', 'readonly', 'required', 'hidden', 'readin', 'fieldlength', 'span', 'labelwidth', 'maxRows', 'encryption', 'interception', 'tooltip', 'extra', 'count', 'placeholder', 'marginTop', 'marginBottom'],
- cascader: ['readonly', 'required', 'hidden', 'readin', 'resourceType', 'fieldlength', 'span', 'labelwidth', 'tooltip', 'extra', 'splitline', 'marginTop', 'marginBottom', 'separator'],
- color: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'marginTop', 'marginBottom'],
+ link: ['initval', 'readonly', 'required', 'hidden', 'readin', 'resourceType', 'declare', 'linkField', 'linkSubField', 'span', 'place', 'labelwidth', 'tooltip', 'extra', 'enter', 'splitline', 'dropdown', 'marginTop', 'marginBottom', 'pickerMode'],
+ fileupload: ['readonly', 'required', 'hidden', 'readin', 'fieldlength', 'maxfile', 'fileType', 'span', 'labelwidth', 'linkSubField', 'tooltip', 'extra', 'compress', 'miniSet', 'splitline', 'marginTop', 'marginBottom', 'maxSize'],
+ switch: ['initval', 'openVal', 'closeVal', 'openText', 'closeText', 'readonly', 'hidden', 'readin', 'span', 'labelwidth', 'linkSubField', 'tooltip', 'extra', 'splitline', 'marginTop', 'marginBottom'],
+ check: ['initval', 'openVal', 'closeVal', 'readonly', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'splitline', 'marginTop', 'marginBottom', 'checkTip'],
+ date: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'declareType', 'mode', 'splitline', 'place', 'marginTop', 'marginBottom', 'minDate', 'maxDate', 'precision'],
+ datemonth: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'splitline', 'place', 'marginTop', 'marginBottom'],
+ // datetime: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'declareType', 'mode', 'splitline', 'marginTop', 'marginBottom', 'minDate', 'maxDate'],
+ textarea: ['initval', 'readonly', 'required', 'hidden', 'readin', 'fieldlength', 'span', 'labelwidth', 'maxRows', 'encryption', 'interception', 'tooltip', 'extra', 'place', 'count', 'placeholder', 'marginTop', 'marginBottom'],
+ cascader: ['readonly', 'required', 'hidden', 'readin', 'resourceType', 'fieldlength', 'span', 'labelwidth', 'tooltip', 'extra', 'place', 'splitline', 'marginTop', 'marginBottom', 'separator'],
+ color: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'colorType', 'extra', 'marginTop', 'marginBottom'],
rate: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'splitline', 'tooltip', 'extra', 'marginTop', 'marginBottom', 'allowHalf', 'color', 'rateCount', 'character', 'place'],
hint: ['label', 'field', 'type', 'blacklist', 'message', 'span', 'labelwidth', 'splitline', 'marginTop', 'marginBottom'],
- split: ['label', 'type', 'marginTop', 'marginBottom', 'splitline'],
+ split: ['label', 'type', 'marginTop', 'marginBottom', 'splitline', 'splitctrl'],
formula: ['label', 'type', 'marginTop', 'marginBottom', 'splitline', 'span', 'labelwidth', 'formula', 'eval', 'postfix'],
brafteditor: ['required', 'hidelabel', 'hidden', 'readin', 'fieldlength', 'readonly', 'span', 'labelwidth', 'tooltip', 'extra', 'encryption', 'marginTop', 'marginBottom'],
funcvar: ['span', 'labelwidth', 'splitline', 'marginTop', 'marginBottom'],
- linkMain: ['readonly', 'required', 'hidden','declare', 'span', 'labelwidth', 'tooltip', 'interception', 'extra', 'marginTop', 'marginBottom']
+ linkMain: ['readonly', 'required', 'hidden','declare', 'span', 'labelwidth', 'tooltip', 'interception', 'extra', 'place', 'marginTop', 'marginBottom'],
+ popSelect: ['initval', 'readonly', 'required', 'hidden', 'readin', 'linkSubField', 'span', 'labelwidth', 'tooltip', 'extra', 'place', 'enter', 'dataSource', 'columns', 'primaryKey', 'order', 'controlField', 'laypage', 'onload', 'searchKey', 'showField', 'popWidth'],
+ vercode: ['label', 'field', 'type', 'blacklist', 'supField', 'readonly', 'required', 'hidden', 'span', 'labelwidth', 'tooltip', 'marginTop', 'marginBottom', 'placeholder', 'enter', 'smsId', 'phoneField', 'sendType']
}
class MainSearch extends Component {
@@ -66,7 +70,7 @@
if (item.key === 'linkSubField') {
item.options.forEach(cell => {
- transfield[cell.field] = cell.label
+ transfield[cell.field] = cell.label.replace(/^\d+銆�/, '')
})
}
})
@@ -120,7 +124,7 @@
reRequired.field = true
- if (['hint', 'split', 'formula'].includes(type)) {
+ if (['hint', 'split', 'formula', 'vercode'].includes(type)) {
reRequired.field = false
shows = fromJS(modalTypeOptions[type]).toJS()
}
@@ -141,6 +145,12 @@
}
if (this.record.regular !== '') {
shows.push('regularText')
+ if (this.record.regular !== 'phone' && this.record.regular !== 'email') {
+ shows.push('regularExtra')
+ }
+ }
+ if (this.record.interception === 'func') {
+ shows.push('func')
}
} else if (type === 'number') {
reTypes.initval = 'number'
@@ -151,11 +161,18 @@
if (sessionStorage.getItem('appType') === 'mob') { // 绉诲姩绔彸渚ф墿灞曚俊鎭�
shows.push('placeholder')
}
+ } else if (type === 'vercode') {
+ if (this.record.enter === 'tab' || this.record.enter === 'sub') {
+ shows.push('tabField')
+ }
} else if (type === 'linkMain') {
if (this.record.declare === 'nvarchar') {
shows.push('fieldlength')
} else if (this.record.declare === 'decimal') {
shows.push('decimal')
+ }
+ if (this.record.interception === 'func') {
+ shows.push('func')
}
} else if (['multiselect', 'select', 'link', 'radio', 'checkbox'].includes(type)) {
if (this.record.resourceType === '0') { // 鑷畾涔夎祫婧�
@@ -190,14 +207,14 @@
if (this.record.resourceType === '0') { // 鑷畾涔夎祫婧�
shows.push('options', 'fields')
} else if (this.record.resourceType === '1') { // 鏁版嵁婧�
- shows.push('dataSource', 'cardValField', 'fields', 'orderBy', 'orderType', 'database')
+ shows.push('dataSource', 'cardValField', 'colorField', 'fields', 'orderBy', 'orderType', 'database')
}
} else {
reRequired.fields = true
if (this.record.resourceType === '0') { // 鑷畾涔夎祫婧�
- shows.push('options', 'fields', 'selectStyle')
+ shows.push('options', 'fields', 'selectStyle', 'border')
} else if (this.record.resourceType === '1') { // 鏁版嵁婧�
- shows.push('dataSource', 'cardValField', 'fields', 'orderBy', 'orderType', 'disableField', 'database', 'selectStyle')
+ shows.push('dataSource', 'cardValField', 'fields', 'orderBy', 'orderType', 'disableField', 'database', 'selectStyle', 'border')
}
if (this.record.selectStyle === 'custom') {
shows.push('backgroundColor')
@@ -212,8 +229,8 @@
shows.push('decimal')
}
} else {
- shows.push('fieldlength')
- reTooltip.initval = '娣诲姞澶氫釜鍒濆鍊艰浣跨敤閫楀彿鍒嗛殧銆�'
+ shows.push('fieldlength', 'checkAll')
+ reTooltip.initval = '娣诲姞澶氫釜鍒濆鍊艰浣跨敤閫楀彿鍒嗛殧銆�'
}
shows.push('linkField')
@@ -222,10 +239,21 @@
if (sessionStorage.getItem('appType') === 'mob') {
shows.push('hidelabel')
}
- } else if (['date', 'datemonth', 'datetime'].includes(type)) {
+ if (this.record.readonly === 'true' && this.record.hidden !== 'true') {
+ shows.push('unchecked')
+ }
+ } else if (['date', 'datemonth'].includes(type)) {
reOptions.initval = dateOptions[type]
reTypes.initval = 'select'
- } else if (type === 'switch') {
+ if (type === 'date') {
+ if (this.record.minDate === 'custom') {
+ shows.push('minDateField')
+ }
+ if (this.record.maxDate === 'custom') {
+ shows.push('maxDateField')
+ }
+ }
+ } else if (type === 'switch' || type === 'check') {
reOptions.initval = [
{value: true, text: '寮�'},
{value: false, text: '鍏�'}
@@ -257,6 +285,19 @@
} else if (type === 'textarea') {
if (this.record.encryption === 'false') {
shows.push('enterReplace')
+ }
+ 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)) {
+ if (this.record.hidden !== 'true') {
+ shows.push('empty')
}
}
@@ -321,6 +362,10 @@
shows.push('supvalue')
}
+ if (this.record.hidden === 'true') {
+ shows = shows.filter(s => !['supField', 'supvalue', 'tooltip', 'extra', 'enter', 'tabField'].includes(s))
+ }
+
return {
shows,
reOptions,
@@ -342,14 +387,14 @@
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'
}
if (value === 'number' || value === 'rate') {
this.record.initval = 0
_fieldval.initval = 0
- } else if (value === 'switch') {
+ } else if (value === 'switch' || value === 'check') {
this.record.initval = false
_fieldval.initval = false
}
@@ -386,43 +431,49 @@
this.record.resourceType = '0'
_fieldval.resourceType = '0'
}
+ } else if (this.record.type === 'funcvar' && value !== 'funcvar') {
+ this.record.readonly = 'false'
}
- if (this.record.options.length > 0) {
- if (value === 'checkcard') {
+ if (value === 'checkcard') {
+ if (this.record.options.length > 0) {
this.record.options = this.record.options.map(cell => {
cell.$value = cell.Value || ''
delete cell.Value
return cell
})
+ }
- if (this.record.options[0].Text) {
- let key = Utils.getuuid()
-
- this.record.fields = [{
- $index: 1,
- align: 'left',
- color: 'rgba(0, 0, 0, 0.85)',
- field: 'Text',
- fontSize: 14,
- key: key,
- uuid: key
- }]
- }
- } else if (['multiselect', 'select', 'link', 'radio', 'checkbox'].includes(value)) {
+ if (this.record.options[0] && this.record.options[0].Text) {
+ let key = Utils.getuuid()
+
+ this.record.fields = [{
+ $index: 1,
+ align: 'left',
+ color: 'rgba(0, 0, 0, 0.85)',
+ field: 'Text',
+ fontSize: 14,
+ key: key,
+ uuid: key
+ }]
+ } else {
+ this.record.fields = []
+ }
+ } else if (['multiselect', 'select', 'link', 'radio', 'checkbox'].includes(value)) {
+ if (this.record.options.length > 0) {
if (!this.record.options[0].Text && this.record.fields.length > 0) {
let field = this.record.fields[0].field
this.record.options = this.record.options.map(cell => {
cell.Value = cell.Value || cell.$value || ''
cell.Text = cell[field] || ''
-
+ delete cell.$value
return cell
})
} else {
this.record.options = this.record.options.map(cell => {
cell.Value = cell.Value || cell.$value || ''
-
+ delete cell.$value
return cell
})
}
@@ -473,12 +524,8 @@
this.record[key] = value
}
- changeField = (data) => {
- this.record.fields = data || []
- }
-
- changeOptions = (data) => {
- this.record.options = data || []
+ changeOptions = (data, key) => {
+ this.record[key] = data || []
}
changeVal = (val, type) => {
@@ -557,9 +604,19 @@
let resource = this.props.form.getFieldValue('dataSource') || ''
- resource = `select '' as ${field},'鍏ㄩ儴' as ${text} union all \n${resource}`
+ if (field === text) {
+ resource = `select '' as ${field} union all \n${resource}`
+ } else {
+ resource = `select '' as ${field},'鍏ㄩ儴' as ${text} union all \n${resource}`
+ }
this.props.form.setFieldsValue({dataSource: resource})
+ }
+
+ complete = (option) => {
+ let label = option.props.label
+
+ this.props.form.setFieldsValue({label: label})
}
getFields() {
@@ -585,7 +642,9 @@
message: '涓嶅彲浣跨敤鑻辨枃鐘舵�佺殑鍗曞紩鍙凤紒'
}
]
- if (item.key === 'field') {
+ if (item.rules) {
+ rules.push(...item.rules)
+ } else if (item.key === 'field') {
rules.push({
pattern: formRule.field.pattern,
message: formRule.field.message
@@ -605,7 +664,20 @@
})
}
- content = <Input placeholder="" autoComplete="off" onPressEnter={this.handleSubmit} />
+ if (['field', 'minDateField', 'maxDateField'].includes(item.key) && item.options && item.options.length > 0) {
+ content = <AutoComplete
+ dataSource={item.options.map((cell) => <AutoComplete.Option label={cell.label} value={cell.field} key={cell.uuid}>
+ {cell.field}
+ </AutoComplete.Option>)}
+ filterOption={(input, option) => option.props.children.indexOf(input) > -1}
+ onSelect={(val, option) => item.key === 'field' && this.complete(option)}
+ placeholder=""
+ >
+ <Input placeholder="" autoComplete="off" onPressEnter={this.handleSubmit} />
+ </AutoComplete>
+ } else {
+ content = <Input placeholder={item.placeholder || ''} autoComplete="off" onPressEnter={this.handleSubmit} />
+ }
} else if (item.type === 'number') {
rules = [
{ required: item.required, message: '璇疯緭鍏�' + item.label + '!' }
@@ -621,6 +693,12 @@
rules = [
{ required: item.required, message: '璇烽�夋嫨' + item.label + '!' }
]
+
+ let options = item.options
+ if (typeof(item.options) === 'string') {
+ options = this.record[item.options] || []
+ }
+
content = <Select
showSearch
allowClear={item.allowClear === true}
@@ -628,7 +706,7 @@
onChange={(value) => {this.optionChange(item.key, value)}}
getPopupContainer={() => document.getElementById('modal-fields-form-box')}
>
- {item.options.map((option, i) =>
+ {options.map((option, i) =>
<Select.Option key={`${i}`} value={option.value || option.field || ''}>
{option.text || option.label}
</Select.Option>
@@ -672,16 +750,17 @@
{ 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>
+ }
+ if (item.placeholder) {
+ extra = <><span className="resource-public-var">{item.placeholder}</span>{extra}</>
}
content = <CodeMirror />
} else if (item.type === 'textarea') {
span = 24
- className = 'text-msg'
rules = [
{ required: item.required, message: '璇疯緭鍏�' + item.label + '!' }
]
@@ -689,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 || []
@@ -706,7 +784,21 @@
linkSubFields = []
}
}
- content = <EditTable type={type} module="form" transfield={transfield} linkSubFields={linkSubFields} onChange={this.changeOptions}/>
+
+ let columns = []
+ if (type === 'link') {
+ columns.push({ title: 'ParentID', key: 'ParentID', strict: true })
+ }
+ columns.push({ title: 'Value', key: 'Value', strict: true })
+ columns.push({ title: 'Text', key: 'Text' })
+
+ linkSubFields.forEach(field => {
+ if (field === 'Value' || field === 'Text') return
+
+ columns.push({ title: transfield[field] || field, key: field })
+ })
+
+ content = <EditTable columns={columns} module="form" onChange={(data) => this.changeOptions(data, item.key)}/>
} else {
if (this.record.multiple === 'true') {
linkSubFields = []
@@ -714,16 +806,43 @@
if (this.record.linkField) {
type = 'link'
}
- content = <DataTable type={type} display={this.record.display} linkSubFields={linkSubFields} transfield={transfield} fields={this.record.fields || []} onChange={this.changeOptions}/>
+
+ let columns = []
+ let fields = this.record.fields || []
+ let keys = ['ParentID', 'pid']
+
+ if (type === 'link') {
+ columns.push({ title: 'ParentID', key: 'ParentID', strict: true })
+ }
+ columns.push({ title: 'Value', key: '$value', strict: true })
+
+ if (this.record.display === 'picture') {
+ 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 => {
+ keys.push(item.field)
+ columns.push({ title: item.field, key: item.field })
+ })
+
+ linkSubFields.forEach(m => {
+ if (keys.includes(m)) return
+
+ columns.push({ title: transfield[m] || m, key: m })
+ })
+
+ content = <EditTable columns={columns} onChange={(data) => this.changeOptions(data, item.key)}/>
}
} else if (item.type === 'fields') {
span = 24
- className = 'text-area'
rules = [
{ required: item.required, message: '璇锋坊鍔�' + item.label + '!' }
]
- content = <FieldsTable onChange={this.changeField}/>
+ content = <FieldsTable indexShow={false} actions={['edit', 'move', 'del', 'add']} columns={item.columns} data={this.record[item.key] || []} onChange={(data) => this.changeOptions(data, item.key)}/>
} else if (item.type === 'color') {
className = 'color-form-item'
rules = [
@@ -759,12 +878,82 @@
return fields
}
- handleConfirm = () => {
+ transfer = (options) => {
+ if (options.length === 0) return options
+
+ let isNumber = true
+ options.forEach(item => {
+ if (!item.Value || isNaN(item.Value)) {
+ isNumber = false
+ }
+ })
+
+ if (isNumber) {
+ return options.map(item => {
+ item.Value = +item.Value
+ return item
+ })
+ } else {
+ return options.map(item => {
+ item.Value = item.Value + ''
+ return item
+ })
+ }
+ }
+
+ transferCard = (options) => {
+ if (options.length === 0) return options
+
+ let isNumber = true
+ options.forEach(item => {
+ if (!/^([0-9]|[1-9]\d{0,2})$/.test(item.$value)) {
+ isNumber = false
+ }
+ })
+
+ if (isNumber) {
+ return options.map(item => {
+ item.$value = +item.$value
+ return item
+ })
+ } else {
+ return options.map(item => {
+ item.$value = item.$value + ''
+ return item
+ })
+ }
+ }
+
+ handleConfirm = (fields) => {
+ const { card } = this.props
// 琛ㄥ崟鎻愪氦鏃舵鏌ヨ緭鍏ュ�兼槸鍚︽纭�
return new Promise((resolve, reject) => {
this.props.form.validateFieldsAndScroll((err, values) => {
if (!err) {
- values.uuid = this.props.card.uuid
+ values.uuid = card.uuid
+
+ if (card.style) {
+ values.style = card.style
+ }
+
+ let fieldrepet = false // 瀛楁閲嶅
+
+ fields.forEach(item => {
+ if (item.uuid === card.uuid || !values.field || !item.field) return
+ if (item.field.toLowerCase() === values.field.toLowerCase()) {
+ fieldrepet = true
+ }
+ })
+
+ if (fieldrepet) {
+ notification.warning({
+ top: 92,
+ message: '瀛楁宸插瓨鍦紒',
+ duration: 10
+ })
+ return
+ }
+
// 涓嬫媺鑿滃崟鎴栬仈鍔ㄨ彍鍗�
if (['multiselect', 'select', 'link', 'radio', 'checkbox'].includes(values.type)) {
if (values.resourceType === '0') {
@@ -774,6 +963,8 @@
if (values.type === 'radio' && values.linkField) {
type = 'link'
}
+
+ values.options = this.transfer(values.options)
if (values.options.filter(op => op.Text === '').length > 0) {
notification.warning({
@@ -828,6 +1019,8 @@
return m
})
+ values.options = this.transferCard(values.options)
+
let type = values.type
if (values.linkField) {
type = 'link'
@@ -875,26 +1068,109 @@
values.initval = ''
} else if (values.type === 'split') {
values.span = 24
+ } else if (values.type === 'text') {
+ if (values.regularExtra) {
+ values.regularExtra = Array.from(new Set(values.regularExtra.split(''))).join('')
+ }
}
['linkField', 'valueField', 'valueText', 'orderBy'].forEach(item => {
if (values[item]) {
- values[item] = values[item].replace(/\s*|\t*|\v*|\r*/ig, '')
+ values[item] = values[item].replace(/\s+|\t+|\v+|\r+/ig, '')
}
})
- 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
+
+ if (['select', 'multiselect', 'link', 'checkbox', 'radio', 'checkcard'].includes(values.type) && values.resourceType === '1' && values.dataSource) {
+ let _option = Utils.getSelectQueryOptions(values)
+
+ let sql = `declare @mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20)
+ ${_option.sql}`
+
+ // LoginUID|SessionUid|UserID|Appkey 宸叉浛鎹�
+ sql = sql.replace(/@\$|\$@/ig, '').replace(/@(BID|ID|time_id)@/ig, `'1949-10-01 15:00:00'`)
+
+ let rduri = ''
+ if (window.GLOB.mainSystemApi && values.database === 'sso') {
+ rduri = window.GLOB.mainSystemApi
+ }
+
+ resolve({values, loading: true, promise: () => new Promise((resolve, reject) => {
+ Api.sDebug(sql, rduri).then(result => {
+ if (result.status || result.ErrCode === '-2') {
+ resolve()
+ } else {
+ Modal.error({
+ title: result.message
+ })
+ reject()
+ }
+ })
+ })})
+ } else if (values.type === 'popSelect') {
+ let arrfield = values.columns.map(f => f.field)
+
+ if (values.linkSubField && values.linkSubField.length > 0) {
+ values.linkSubField.forEach(n => {
+ if (!arrfield.includes(n)) {
+ arrfield.push(n)
+ }
+ })
+ }
+
+ let _datasource = values.dataSource
+ let sql = ''
+
+ if (/\s/.test(_datasource)) { // 鎷兼帴鍒悕
+ _datasource = '(' + _datasource + ') tb'
+ }
+
+ arrfield = arrfield.join(',')
+
+ let _search = ''
+
+ if (values.searchKey) {
+ let fields = values.searchKey.split(',').map(field => field + ' like \'%mk%\'')
+ _search = 'where ' + fields.join(' OR ')
+ }
+
+ if (values.laypage === 'true') {
+ sql = `/*system_query*/select top 10 ${arrfield} from (select ${arrfield} ,ROW_NUMBER() over(order by ${values.order}) as rows from ${_datasource} ${_search}) tmptable where rows > 0 order by tmptable.rows `
+ } else if (values.order) {
+ sql = `/*system_query*/select ${arrfield} from (select ${arrfield} ,ROW_NUMBER() over(order by ${values.order}) as rows from ${_datasource} ${_search}) tmptable order by tmptable.rows `
+ } else {
+ sql = `/*system_query*/select ${arrfield} from ${_datasource} ${_search} `
+ }
+
+ sql = `declare @mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20)
+ ${sql}`
+
+ sql = sql.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
+ sql = sql.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
+ sql = sql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
+ sql = sql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
+ sql = sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
+
+ resolve({values, loading: true, promise: () => new Promise((resolve, reject) => {
+ Api.sDebug(sql).then(result => {
+ if (result.status || result.ErrCode === '-2') {
+ resolve()
+ } else {
+ Modal.error({
+ title: result.message
+ })
+ reject()
+ }
+ })
+ })})
+ } else {
+ resolve({values})
}
-
- resolve(values)
} else {
reject(err)
}
--
Gitblit v1.8.0