From 5e871a4164869bac7927ea6884dbadd650b1cadf Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 25 五月 2023 11:25:28 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/replaceField/index.jsx | 92 +++++++++++++++++++++++-----------------------
1 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/src/menu/replaceField/index.jsx b/src/menu/replaceField/index.jsx
index 93a303e..df1506a 100644
--- a/src/menu/replaceField/index.jsx
+++ b/src/menu/replaceField/index.jsx
@@ -358,34 +358,32 @@
if (item.cols) {
let _update = (cols) => {
return cols.map(col => {
- if (col.type === 'action' && col.elements) {
+ if (col.type === 'custom' && col.elements) {
col.elements = col.elements.map(m => {
- if (m.modal && m.modal.fields) {
- m.modal.fields = m.modal.fields.map(col => {
- if (col.field && map[col.field.toLowerCase()]) {
- col.field = map[col.field.toLowerCase()].FieldName
- }
- return col
- })
- }
- if (m.verify && m.verify.columns) {
- m.verify.columns = m.verify.columns.map(col => {
- if (col.Column && map[col.Column.toLowerCase()]) {
- col.Column = map[col.Column.toLowerCase()].FieldName
- }
- return col
- })
- }
- if (m.config && m.config.components) {
- m.config.components = _replace(m.config.components)
- }
-
- return m
- })
- } else if (col.type === 'custom' && col.elements) {
- col.elements = col.elements.map(m => {
- if (m.datatype === 'dynamic' && map[m.field.toLowerCase()]) {
- m.field = map[m.field.toLowerCase()].FieldName
+ if (m.eleType === 'button') {
+ if (m.modal && m.modal.fields) {
+ m.modal.fields = m.modal.fields.map(col => {
+ if (col.field && map[col.field.toLowerCase()]) {
+ col.field = map[col.field.toLowerCase()].FieldName
+ }
+ return col
+ })
+ }
+ if (m.verify && m.verify.columns) {
+ m.verify.columns = m.verify.columns.map(col => {
+ if (col.Column && map[col.Column.toLowerCase()]) {
+ col.Column = map[col.Column.toLowerCase()].FieldName
+ }
+ return col
+ })
+ }
+ if (m.config && m.config.components) {
+ m.config.components = _replace(m.config.components)
+ }
+ } else {
+ if (m.datatype === 'dynamic' && map[m.field.toLowerCase()]) {
+ m.field = map[m.field.toLowerCase()].FieldName
+ }
}
return m
@@ -532,26 +530,28 @@
if (item.cols) {
let _update = (cols) => {
return cols.map(col => {
- if (col.type === 'action' && col.elements) {
+ if (col.type === 'custom' && col.elements) {
col.elements = col.elements.map(m => {
- if (m.modal && m.modal.fields) {
- m.modal.fields = m.modal.fields.map(col => {
- if (col.field && map[col.field.toLowerCase()]) {
- col.label = map[col.field.toLowerCase()].FieldDec
- }
- return col
- })
- }
- if (m.verify && m.verify.columns) {
- m.verify.columns = m.verify.columns.map(col => {
- if (col.Column && map[col.Column.toLowerCase()]) {
- col.Text = map[col.Column.toLowerCase()].FieldDec
- }
- return col
- })
- }
- if (m.config && m.config.components) {
- m.config.components = _replace(m.config.components)
+ if (m.eleType === 'button') {
+ if (m.modal && m.modal.fields) {
+ m.modal.fields = m.modal.fields.map(col => {
+ if (col.field && map[col.field.toLowerCase()]) {
+ col.label = map[col.field.toLowerCase()].FieldDec
+ }
+ return col
+ })
+ }
+ if (m.verify && m.verify.columns) {
+ m.verify.columns = m.verify.columns.map(col => {
+ if (col.Column && map[col.Column.toLowerCase()]) {
+ col.Text = map[col.Column.toLowerCase()].FieldDec
+ }
+ return col
+ })
+ }
+ if (m.config && m.config.components) {
+ m.config.components = _replace(m.config.components)
+ }
}
return m
--
Gitblit v1.8.0