From 96989af7e330a08d376002b0759705a477039f61 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 19 十月 2023 19:46:41 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/templates/sharecomponent/searchcomponent/searchform/index.jsx | 79 ++++++++++++++++++++++++++++++++++++---
1 files changed, 73 insertions(+), 6 deletions(-)
diff --git a/src/templates/sharecomponent/searchcomponent/searchform/index.jsx b/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
index 34b71e8..2acd0d3 100644
--- a/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
+++ b/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
@@ -11,9 +11,8 @@
import './index.scss'
const ColorSketch = asyncComponent(() => import('@/mob/colorsketch'))
-const FieldsTable = asyncComponent(() => import('@/templates/zshare/modalform/fieldtable'))
-const DataTable = asyncComponent(() => import('@/templates/zshare/modalform/datatable'))
const EditTable = asyncComponent(() => import('@/templates/zshare/modalform/modaleditable'))
+const FieldsTable = asyncComponent(() => import('@/templates/zshare/editTable'))
const groupOptions = [
{
@@ -190,6 +189,14 @@
}
} else if (type === 'checkcard') {
reRequired.fields = false
+ reOptions.multiple = [{
+ value: 'false',
+ text: '鍗曢��'
+ }, {
+ value: 'true',
+ text: '澶氶��'
+ }]
+
if (this.record.display === 'picture') {
if (this.record.resourceType === '0') { // 鑷畾涔夎祫婧�
shows.push('options', 'fields', 'picratio')
@@ -203,6 +210,20 @@
shows.push('dataSource', 'cardValField', 'colorField', 'fields', 'orderBy', 'orderType', 'database')
}
} else {
+ let appType = sessionStorage.getItem('appType')
+ if (appType === '') {
+ reOptions.multiple = [{
+ value: 'false',
+ text: '鍗曢��'
+ }, {
+ value: 'true',
+ text: '澶氶��'
+ }, {
+ value: 'dropdown',
+ text: '涓嬫媺鑿滃崟'
+ }]
+ }
+
reRequired.fields = true
if (this.record.resourceType === '0') { // 鑷畾涔夎祫婧�
shows.push('options', 'fields', 'selectStyle', 'border')
@@ -257,6 +278,8 @@
if (type === 'text' || type === 'select') {
reTooltip.field = '瀛楁鍚嶅彲浠ヤ娇鐢ㄩ�楀彿鍒嗛殧锛岃繘琛岀患鍚堟悳绱€��'
+ } else if (type === 'daterange') {
+ reTooltip.field = '瀛楁鍚嶅彲浠ヤ娇鐢ㄩ�楀彿鍒嗛殧锛屼緥濡俿tartTime,endTime銆�'
} else if (type === 'group') {
reTooltip.field = '鏌ヨ鏁版嵁鏃讹紙鑷畾涔夎剼鏈垨缁熻鏁版嵁婧愶級锛岀被鍨嬪瓧娈靛皢鐢ㄤ綔鏇挎崲鑴氭湰涓殑 @瀛楁@ 锛岀被鍨嬪瓧娈靛搴斿�间负锛氭棩 -> day锛涘懆 -> week锛涙湀 -> month锛涘 -> quarter锛涘勾 -> year锛涜嚜瀹氫箟 -> customized'
reLabel.field = '绫诲瀷瀛楁'
@@ -347,6 +370,9 @@
this.record.match = 'like'
_fieldval.match = 'like'
}
+ } else if (key === 'display') {
+ this.record.multiple = 'false'
+ _fieldval.multiple = 'false'
} else if (key === 'items') {
let _initval = this.props.form.getFieldValue('initval')
if (_initval && !value.includes(_initval[0])) {
@@ -463,7 +489,7 @@
]
if (item.key === 'field' || item.key === 'datefield') {
rules.push({
- pattern: (type === 'text' || type === 'select') ? formRule.field.multipattern : formRule.field.pattern,
+ pattern: (type === 'text' || type === 'select' || type === 'daterange') ? formRule.field.multipattern : formRule.field.pattern,
message: formRule.field.message
}, {
max: formRule.field.max,
@@ -550,12 +576,44 @@
let type = this.record.type
if (type !== 'checkcard') {
- content = <EditTable type={type} module="search" transfield={{}} 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' })
+
+ content = <EditTable columns={columns} module="search" onChange={this.changeOptions}/>
} else {
if (this.record.linkField) {
type = 'link'
}
- content = <DataTable type={type} multiple={this.record.multiple} display={this.record.display} linkSubFields={[]} 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 })
+ } else if (this.record.multiple === 'dropdown' && this.record.display === 'text') {
+ columns.push({ title: 'pid', key: 'pid', 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' })
+ }
+
+ fields.forEach(item => {
+ keys.push(item.field)
+ columns.push({ title: item.field, key: item.field })
+ })
+
+ content = <EditTable columns={columns} onChange={this.changeOptions}/>
}
} else if (item.type === 'fields') {
span = 24
@@ -565,7 +623,7 @@
{ 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.fields || []} onChange={this.changeField}/>
} else if (item.type === 'checkbox') {
rules = [
{ required: item.required, message: '璇烽�夋嫨' + item.label + '!' }
@@ -619,6 +677,15 @@
this.props.form.validateFieldsAndScroll((err, values) => {
if (!err) {
values.uuid = this.props.card.uuid
+
+ if (/,/.test(values.field)) {
+ values.field = values.field.split(',').filter(Boolean)
+ if (values.type === 'daterange' && values.field.length > 2) {
+ values.field.length = 2
+ }
+ values.field = values.field.join(',')
+ }
+
// 涓嬫媺鑿滃崟鎴栬仈鍔ㄨ彍鍗�
if (['multiselect', 'select', 'link', 'radio'].includes(values.type)) {
if (values.resourceType === '0') {
--
Gitblit v1.8.0