From 98004e2967b6d331fff2a35fe0e4883736eb2f1b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 03 十月 2021 21:11:47 +0800
Subject: [PATCH] 2021-10-03
---
src/tabviews/zshare/mutilform/index.jsx | 4
src/templates/zshare/modalform/index.jsx | 4
src/templates/modalconfig/index.jsx | 56 +++++++---
src/menu/modalconfig/index.jsx | 46 ++++++--
src/mob/modalconfig/index.jsx | 47 ++++++--
src/menu/components/form/tab-form/index.jsx | 57 ++++++++---
src/menu/components/form/normal-form/index.jsx | 60 ++++++++---
7 files changed, 195 insertions(+), 79 deletions(-)
diff --git a/src/menu/components/form/normal-form/index.jsx b/src/menu/components/form/normal-form/index.jsx
index 14b0bce..9d35b9e 100644
--- a/src/menu/components/form/normal-form/index.jsx
+++ b/src/menu/components/form/normal-form/index.jsx
@@ -430,25 +430,46 @@
let _tabfields = []
let _linkableFields = []
let _linksupFields = [{
- value: '',
- text: '绌�'
+ field: '',
+ label: '绌�'
}]
let standardform = null
- _inputfields = group.fields.filter(item => ['text', 'number', 'textarea', 'color'].includes(item.type) && _item.field !== item.field)
- if (appType === 'mob') {
- _tabfields = group.fields.filter(item => _form.field !== item.field && item.hidden !== 'true' && ['text', 'number'].includes(item.type))
- } else {
- _tabfields = group.fields.filter(item => _form.field !== item.field && item.hidden !== 'true' && ['text', 'number', 'select', 'link'].includes(item.type))
- }
- _tabfields.unshift({field: '', text: '鍘熻〃鍗�'})
-
let uniq = new Map()
- uniq.set(_form.field, true)
let index = null
+ uniq.set(_form.field, true)
+
+ let _inputIndex = 1
+ let _tabIndex = 1
+ let _linkIndex = 1
group.fields.forEach((item, i) => {
if (_form.uuid === item.uuid) {
index = i
+ }
+
+ if (['text', 'number', 'textarea', 'color'].includes(item.type) && _item.field !== item.field) {
+ _inputfields.push({
+ field: item.field,
+ label: _inputIndex + '銆�' + item.label
+ })
+ _inputIndex++
+ }
+ if (appType === 'mob') {
+ if (_form.field !== item.field && item.hidden !== 'true' && ['text', 'number'].includes(item.type)) {
+ _tabfields.push({
+ field: item.field,
+ label: _tabIndex + '銆�' + item.label
+ })
+ _tabIndex++
+ }
+ } else {
+ if (_form.field !== item.field && item.hidden !== 'true' && ['text', 'number', 'select', 'link'].includes(item.type)) {
+ _tabfields.push({
+ field: item.field,
+ label: _tabIndex + '銆�' + item.label
+ })
+ _tabIndex++
+ }
}
if (!['select', 'link', 'radio', 'checkcard'].includes(item.type)) return
@@ -456,15 +477,19 @@
uniq.set(item.field, true)
_linkableFields.push({
- value: item.field,
- text: item.label + ' (琛ㄥ崟)'
+ field: item.field,
+ label: _linkIndex + '銆�' + item.label + ' (琛ㄥ崟)'
})
_linksupFields.push({
- value: item.field,
- text: item.label
+ field: item.field,
+ label: _linkIndex + '銆�' + item.label
})
+ _linkIndex++
}
})
+
+ _tabfields.unshift({field: '', label: '鍘熻〃鍗�'})
+
if (index !== null) {
if (index === 0) {
standardform = group.fields[index + 1] || null
@@ -478,9 +503,10 @@
uniq.set(col.field, true)
_linkableFields.push({
- value: col.field,
- text: col.label + ' (鏄剧ず鍒�)'
+ field: col.field,
+ label: _linkIndex + '銆�' + col.label + ' (鏄剧ず鍒�)'
})
+ _linkIndex++
}
})
diff --git a/src/menu/components/form/tab-form/index.jsx b/src/menu/components/form/tab-form/index.jsx
index 8e47deb..5acecf2 100644
--- a/src/menu/components/form/tab-form/index.jsx
+++ b/src/menu/components/form/tab-form/index.jsx
@@ -422,25 +422,46 @@
let _tabfields = []
let _linkableFields = []
let _linksupFields = [{
- value: '',
- text: '绌�'
+ field: '',
+ label: '绌�'
}]
let standardform = null
- _inputfields = group.fields.filter(item => ['text', 'number', 'textarea', 'color'].includes(item.type) && _item.field !== item.field)
- if (appType === 'mob') {
- _tabfields = group.fields.filter(item => _form.field !== item.field && item.hidden !== 'true' && ['text', 'number'].includes(item.type))
- } else {
- _tabfields = group.fields.filter(item => _form.field !== item.field && item.hidden !== 'true' && ['text', 'number', 'select', 'link'].includes(item.type))
- }
- _tabfields.unshift({field: '', text: '鍘熻〃鍗�'})
-
let uniq = new Map()
- uniq.set(_form.field, true)
let index = null
+ uniq.set(_form.field, true)
+
+ let _inputIndex = 1
+ let _tabIndex = 1
+ let _linkIndex = 1
group.fields.forEach((item, i) => {
if (_form.uuid === item.uuid) {
index = i
+ }
+
+ if (['text', 'number', 'textarea', 'color'].includes(item.type) && _item.field !== item.field) {
+ _inputfields.push({
+ field: item.field,
+ label: _inputIndex + '銆�' + item.label
+ })
+ _inputIndex++
+ }
+ if (appType === 'mob') {
+ if (_form.field !== item.field && item.hidden !== 'true' && ['text', 'number'].includes(item.type)) {
+ _tabfields.push({
+ field: item.field,
+ label: _tabIndex + '銆�' + item.label
+ })
+ _tabIndex++
+ }
+ } else {
+ if (_form.field !== item.field && item.hidden !== 'true' && ['text', 'number', 'select', 'link'].includes(item.type)) {
+ _tabfields.push({
+ field: item.field,
+ label: _tabIndex + '銆�' + item.label
+ })
+ _tabIndex++
+ }
}
if (!['select', 'link', 'radio', 'checkcard'].includes(item.type)) return
@@ -449,14 +470,19 @@
_linkableFields.push({
value: item.field,
- text: item.label + ' (琛ㄥ崟)'
+ text: _linkIndex + '銆�' + item.label + ' (琛ㄥ崟)'
})
_linksupFields.push({
value: item.field,
- text: item.label
+ text: _linkIndex + '銆�' + item.label
})
+
+ _linkIndex++
}
})
+
+ _tabfields.unshift({field: '', label: '鍘熻〃鍗�'})
+
if (index !== null) {
if (index === 0) {
standardform = group.fields[index + 1] || null
@@ -470,9 +496,10 @@
uniq.set(col.field, true)
_linkableFields.push({
- value: col.field,
- text: col.label + ' (鏄剧ず鍒�)'
+ field: col.field,
+ label: _linkIndex + '銆�' + col.label + ' (鏄剧ず鍒�)'
})
+ _linkIndex++
}
})
diff --git a/src/menu/modalconfig/index.jsx b/src/menu/modalconfig/index.jsx
index 1e68e7d..4a8f734 100644
--- a/src/menu/modalconfig/index.jsx
+++ b/src/menu/modalconfig/index.jsx
@@ -114,34 +114,51 @@
let _tabfields = []
let _linkableFields = []
let _linksupFields = [{
- value: '',
- text: '绌�'
+ field: '',
+ label: '绌�'
}]
let standardform = null
- _inputfields = config.fields.filter(item => ['text', 'number', 'textarea', 'color'].includes(item.type) && card.field !== item.field)
- _tabfields = config.fields.filter(item => card.field !== item.field && item.hidden !== 'true' && ['text', 'number', 'select', 'link'].includes(item.type))
- _tabfields.unshift({field: '', text: '鍘熻〃鍗�'})
-
let uniq = new Map()
- uniq.set(card.field, true)
let index = null
+ uniq.set(card.field, true)
+
+ let _inputIndex = 1
+ let _tabIndex = 1
+ let _linkIndex = 1
config.fields.forEach((item, i) => {
if (card.uuid === item.uuid) {
index = i
}
+
+ if (['text', 'number', 'textarea', 'color'].includes(item.type) && card.field !== item.field) {
+ _inputfields.push({
+ field: item.field,
+ label: _inputIndex + '銆�' + item.label
+ })
+ _inputIndex++
+ }
+ if (card.field !== item.field && item.hidden !== 'true' && ['text', 'number', 'select', 'link'].includes(item.type)) {
+ _tabfields.push({
+ field: item.field,
+ label: _tabIndex + '銆�' + item.label
+ })
+ _tabIndex++
+ }
+
if (!['select', 'link', 'radio', 'checkcard'].includes(item.type)) return
if (item.field && !uniq.has(item.field)) {
uniq.set(item.field, true)
_linkableFields.push({
- value: item.field,
- text: item.label + ' (琛ㄥ崟)'
+ field: item.field,
+ label: _linkIndex + '銆�' + item.label + ' (琛ㄥ崟)'
})
_linksupFields.push({
- value: item.field,
- text: item.label
+ field: item.field,
+ label: _linkIndex + '銆�' + item.label
})
+ _linkIndex++
}
})
if (index !== null) {
@@ -152,14 +169,17 @@
}
}
+ _tabfields.unshift({field: '', label: '鍘熻〃鍗�'})
+
componentConfig.columns.forEach(col => {
if (col.field && !uniq.has(col.field)) {
uniq.set(col.field, true)
_linkableFields.push({
- value: col.field,
- text: col.label + ' (鏄剧ず鍒�)'
+ field: col.field,
+ label: _linkIndex + '銆�' + col.label + ' (鏄剧ず鍒�)'
})
+ _linkIndex++
}
})
diff --git a/src/mob/modalconfig/index.jsx b/src/mob/modalconfig/index.jsx
index 23be59f..f20e2a0 100644
--- a/src/mob/modalconfig/index.jsx
+++ b/src/mob/modalconfig/index.jsx
@@ -116,36 +116,56 @@
let _tabfields = []
let _linkableFields = []
let _linksupFields = [{
- value: '',
- text: '绌�'
+ field: '',
+ label: '绌�'
}]
let standardform = null
- _inputfields = config.fields.filter(item => ['text', 'number', 'textarea', 'color'].includes(item.type) && card.field !== item.field)
- _tabfields = config.fields.filter(item => card.field !== item.field && item.hidden !== 'true' && ['text', 'number', 'select', 'link'].includes(item.type))
- _tabfields.unshift({field: '', text: '鍘熻〃鍗�'})
-
let uniq = new Map()
- uniq.set(card.field, true)
let index = null
+ uniq.set(card.field, true)
+
+ let _inputIndex = 1
+ let _tabIndex = 1
+ let _linkIndex = 1
config.fields.forEach((item, i) => {
if (card.uuid === item.uuid) {
index = i
}
+
+ if (['text', 'number', 'textarea', 'color'].includes(item.type) && card.field !== item.field) {
+ _inputfields.push({
+ field: item.field,
+ label: _inputIndex + '銆�' + item.label
+ })
+ _inputIndex++
+ }
+ if (card.field !== item.field && item.hidden !== 'true' && ['text', 'number', 'select', 'link'].includes(item.type)) {
+ _tabfields.push({
+ field: item.field,
+ label: _tabIndex + '銆�' + item.label
+ })
+ _tabIndex++
+ }
+
if (!['select', 'link', 'radio', 'checkcard'].includes(item.type)) return
if (item.field && !uniq.has(item.field)) {
uniq.set(item.field, true)
_linkableFields.push({
- value: item.field,
- text: item.label + ' (琛ㄥ崟)'
+ field: item.field,
+ label: _linkIndex + '銆�' + item.label + ' (琛ㄥ崟)'
})
_linksupFields.push({
- value: item.field,
- text: item.label
+ field: item.field,
+ label: _linkIndex + '銆�' + item.label
})
+ _linkIndex++
}
})
+
+ _tabfields.unshift({field: '', label: '鍘熻〃鍗�'})
+
if (index !== null) {
if (index === 0) {
standardform = config.fields[index + 1] || null
@@ -159,9 +179,10 @@
uniq.set(col.field, true)
_linkableFields.push({
- value: col.field,
- text: col.label + ' (鏄剧ず鍒�)'
+ field: col.field,
+ label: _linkIndex + '銆�' + col.label + ' (鏄剧ず鍒�)'
})
+ _linkIndex++
}
})
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index 5e8af54..c855e56 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -756,13 +756,13 @@
if (item.type === 'funcvar') {
_item.value = ''
- } else if (_item.value && (item.type === 'text' || item.type === 'textarea' || item.type === 'linkMain')) {
+ } else if (_item.value && (item.type === 'text' || item.type === 'textarea' || item.type === 'linkMain') && typeof(_item.value) === 'string') {
_item.value = _item.value.replace(/\t*|\v*/g, '') // 鍘婚櫎鍒惰〃绗�
if (item.interception === 'true') { // 鍘婚櫎棣栧熬绌烘牸
_item.value = _item.value.replace(/(^\s*|\s*$)/g, '')
}
- if (item.type === 'text' && typeof(_item.value) === 'string') { // 鐗规畩瀛楁鏇挎崲
+ if (item.type === 'text') { // 鐗规畩瀛楁鏇挎崲
_item.value = _item.value.replace(/^(\s*)@appkey@(\s*)$/ig, window.GLOB.appkey)
_item.value = _item.value.replace(/^(\s*)@SessionUid@(\s*)$/ig, (localStorage.getItem('SessionUid') || ''))
_item.value = _item.value.replace(/^(\s*)@bid@(\s*)$/ig, (this.props.BID || ''))
diff --git a/src/templates/modalconfig/index.jsx b/src/templates/modalconfig/index.jsx
index 93f2dfb..d62c139 100644
--- a/src/templates/modalconfig/index.jsx
+++ b/src/templates/modalconfig/index.jsx
@@ -195,36 +195,55 @@
let _tabfields = []
let _linkableFields = []
let _linksupFields = [{
- value: '',
- text: '绌�'
+ field: '',
+ label: '绌�'
}]
let standardform = null
- _inputfields = config.fields.filter(item => ['text', 'number', 'textarea', 'color'].includes(item.type) && card.field !== item.field)
- _tabfields = config.fields.filter(item => card.field !== item.field && item.hidden !== 'true' && ['text', 'number', 'select', 'link'].includes(item.type))
- _tabfields.unshift({field: '', text: '鍘熻〃鍗�'})
-
let uniq = new Map()
- uniq.set(card.field, true)
let index = null
+ uniq.set(card.field, true)
+
+ let _inputIndex = 1
+ let _tabIndex = 1
+ let _linkIndex = 1
config.fields.forEach((item, i) => {
if (card.uuid === item.uuid) {
index = i
}
+
+ if (['text', 'number', 'textarea', 'color'].includes(item.type) && card.field !== item.field) {
+ _inputfields.push({
+ field: item.field,
+ label: _inputIndex + '銆�' + item.label
+ })
+ _inputIndex++
+ }
+ if (card.field !== item.field && item.hidden !== 'true' && ['text', 'number', 'select', 'link'].includes(item.type)) {
+ _tabfields.push({
+ field: item.field,
+ label: _tabIndex + '銆�' + item.label
+ })
+ _tabIndex++
+ }
+
if (!['select', 'link', 'radio', ''].includes(item.type)) return
if (item.field && !uniq.has(item.field)) {
uniq.set(item.field, true)
_linkableFields.push({
- value: item.field,
- text: item.label + ' (琛ㄥ崟)'
+ field: item.field,
+ label: _linkIndex + '銆�' + item.label + ' (琛ㄥ崟)'
})
_linksupFields.push({
- value: item.field,
- text: item.label
+ field: item.field,
+ label: _linkIndex + '銆�' + item.label
})
+ _linkIndex++
}
})
+
+ _tabfields.unshift({field: '', label: '鍘熻〃鍗�'})
if (index !== null) {
if (index === 0) {
@@ -240,9 +259,10 @@
uniq.set(col.field, true)
_linkableFields.push({
- value: col.field,
- text: col.label + ' (鏄剧ず鍒�)'
+ field: col.field,
+ label: _linkIndex + '銆�' + col.label + ' (鏄剧ず鍒�)'
})
+ _linkIndex++
}
})
} else if (tabConfig) {
@@ -251,9 +271,10 @@
uniq.set(col.field, true)
_linkableFields.push({
- value: col.field,
- text: col.label + ' (鏄剧ず鍒�)'
+ field: col.field,
+ label: _linkIndex + '銆�' + col.label + ' (鏄剧ず鍒�)'
})
+ _linkIndex++
}
})
} else if (menu.LongParam) {
@@ -262,9 +283,10 @@
uniq.set(col.field, true)
_linkableFields.push({
- value: col.field,
- text: col.label + ' (鏄剧ず鍒�)'
+ field: col.field,
+ label: _linkIndex + '銆�' + col.label + ' (鏄剧ず鍒�)'
})
+ _linkIndex++
}
})
}
diff --git a/src/templates/zshare/modalform/index.jsx b/src/templates/zshare/modalform/index.jsx
index 1e0b392..95db75a 100644
--- a/src/templates/zshare/modalform/index.jsx
+++ b/src/templates/zshare/modalform/index.jsx
@@ -589,8 +589,8 @@
filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
onChange={(value) => this.multiselectChange(item.key, value, item.options)}
>
- {item.options.map(option =>
- <Select.Option id={option.uuid} key={option.uuid} value={option.field}>{option.label}</Select.Option>
+ {item.options.map((option, i) =>
+ <Select.Option key={i} value={option.field}>{option.label}</Select.Option>
)}
</Select>
)}
--
Gitblit v1.8.0