From e7bd0c09a594af697d77a68f892efc8bab11c87b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 25 一月 2025 20:08:15 +0800
Subject: [PATCH] 2025-01-25

---
 src/views/tabledesign/index.jsx         |    2 
 src/views/menudesign/popview/index.jsx  |    2 
 src/views/pcdesign/index.jsx            |    2 
 src/views/mobdesign/index.jsx           |    2 
 src/views/mobdesign/popview/index.jsx   |    2 
 src/menu/replaceField/index.jsx         |  782 ++++++++++++++++++++++++++-----------------------------
 src/views/menudesign/index.jsx          |    2 
 src/views/tabledesign/popview/index.jsx |    2 
 8 files changed, 373 insertions(+), 423 deletions(-)

diff --git a/src/menu/replaceField/index.jsx b/src/menu/replaceField/index.jsx
index d7d29ec..81403fe 100644
--- a/src/menu/replaceField/index.jsx
+++ b/src/menu/replaceField/index.jsx
@@ -12,7 +12,6 @@
 
 class ReplaceField extends Component {
   static propTpyes = {
-    type: PropTypes.string,
     config: PropTypes.object,
     updateConfig: PropTypes.func
   }
@@ -155,305 +154,281 @@
 
   // 渚濇嵁鍘熷瓧娈垫浛鎹负鏂板瓧娈�
   exec = (map) => {
-    const { type } = this.props
     let config = fromJS(this.props.config).toJS()
 
-    if (type === 'custom') {
-      let _replace = (components) => {
-        return components.map(item => {
-          if (item.type === 'tabs') {
-            item.subtabs.forEach(tab => {
-              tab.components = _replace(tab.components)
-            })
-            return item
-          } else if (item.type === 'group') {
-            item.components = _replace(item.components)
-            return item
-          }
-          
-          if (item.columns) {
-            item.columns = item.columns.map(col => {
-              let cell = map[col.field.toLowerCase()]
-              if (cell) {
-                col.field = cell.FieldName
-                if (cell.datatype) {
-                  col.datatype = cell.datatype
+    let _replace = (components) => {
+      return components.map(item => {
+        if (item.type === 'tabs') {
+          item.subtabs.forEach(tab => {
+            tab.components = _replace(tab.components)
+          })
+          return item
+        } else if (item.type === 'group') {
+          item.components = _replace(item.components)
+          return item
+        }
+        
+        if (item.columns) {
+          item.columns = item.columns.map(col => {
+            let cell = map[col.field.toLowerCase()]
+            if (cell) {
+              col.field = cell.FieldName
+              if (cell.datatype) {
+                col.datatype = cell.datatype
+              }
+            }
+            return col
+          })
+        }
+        if (item.search) {
+          item.search = item.search.map(col => {
+            if (col.field && map[col.field.toLowerCase()]) {
+              col.field = map[col.field.toLowerCase()].FieldName
+            }
+            return col
+          })
+        }
+
+        if (item.action) {
+          item.action.forEach(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 (item.search) {
-            item.search = item.search.map(col => {
-              if (col.field && map[col.field.toLowerCase()]) {
-                col.field = map[col.field.toLowerCase()].FieldName
-              }
-              return col
-            })
-          }
-
-          if (item.action) {
-            item.action.forEach(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)
-              }
-            })
-          }
-
-          if (item.subcards) {
-            item.subcards.forEach(card => {
-              if (card.elements) { // 鍗$墖
-                card.elements = card.elements.map(m => {
-                  if (m.datatype === 'dynamic' && map[m.field.toLowerCase()]) {
-                    m.field = map[m.field.toLowerCase()].FieldName
-                  }
-                  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
-                })
-              }
-
-              if (card.backElements) { // 鍗$墖
-                card.backElements = card.backElements.map(m => {
-                  if (m.datatype === 'dynamic' && map[m.field.toLowerCase()]) {
-                    m.field = map[m.field.toLowerCase()].FieldName
-                  }
-                  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
-                })
-              }
-
-              if (card.fields) { // 琛ㄥ崟
-                card.fields = card.fields.map(m => {
-                  if (m.field && map[m.field.toLowerCase()]) {
-                    m.field = map[m.field.toLowerCase()].FieldName
-                  }
-                  return m
-                })
-              }
-            })
-          }
-
-          if (item.elements) {
-            item.elements = item.elements.map(m => {
-              if (m.datatype === 'dynamic' && map[m.field.toLowerCase()]) {
-                m.field = map[m.field.toLowerCase()].FieldName
-              }
-              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
-            })
-          }
-
-          if (item.plot) {
-            if (item.plot.Xaxis && map[item.plot.Xaxis.toLowerCase()]) {
-              item.plot.Xaxis = map[item.plot.Xaxis.toLowerCase()].FieldName
-            }
-            // 缁熻鍥�
-            if (item.plot.InfoValue && map[item.plot.InfoValue.toLowerCase()]) {
-              item.plot.InfoValue = map[item.plot.InfoValue.toLowerCase()].FieldName
-            }
-            if (item.plot.InfoType && map[item.plot.InfoType.toLowerCase()]) {
-              item.plot.InfoType = map[item.plot.InfoType.toLowerCase()].FieldName
-            }
-            // 鍗犳瘮鍥�
-            if (item.plot.valueField && map[item.plot.valueField.toLowerCase()]) {
-              item.plot.valueField = map[item.plot.valueField.toLowerCase()].FieldName
-            }
-            if (item.plot.labelField && map[item.plot.labelField.toLowerCase()]) {
-              item.plot.labelField = map[item.plot.labelField.toLowerCase()].FieldName
-            }
-            // 楗煎浘
-            if (item.plot.type && map[item.plot.type.toLowerCase()]) {
-              item.plot.type = map[item.plot.type.toLowerCase()].FieldName
-            }
-            // 鏁g偣鍥�
-            if (item.plot.gender && map[item.plot.gender.toLowerCase()]) {
-              item.plot.gender = map[item.plot.gender.toLowerCase()].FieldName
-            }
-            if (item.Yaxis) {
-              if (Array.isArray(item.Yaxis)) {
-                item.Yaxis = item.Yaxis.map(m => {
-                  if (map[m.toLowerCase()]) {
-                    return map[m.toLowerCase()].FieldName
-                  }
-                  return m
-                })
-              } else {
-                if (item.Yaxis && map[item.Yaxis.toLowerCase()]) {
-                  item.Yaxis = map[item.Yaxis.toLowerCase()].FieldName
-                }
-              }
-            }
-          }
-
-          if (item.cols) {
-            let _update = (cols) => {
-              return cols.map(col => {
-                if (col.type === 'custom' && col.elements) {
-                  col.elements = col.elements.map(m => {
-                    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
-                  })
-                } else if (col.type === 'colspan') {
-                  col.subcols = _update(col.subcols)
-                } else if (col.field) {
-                  if (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)
+            }
+          })
+        }
 
-            item.cols = _update(item.cols)
+        if (item.subcards) {
+          item.subcards.forEach(card => {
+            if (card.elements) { // 鍗$墖
+              card.elements = card.elements.map(m => {
+                if (m.datatype === 'dynamic' && map[m.field.toLowerCase()]) {
+                  m.field = map[m.field.toLowerCase()].FieldName
+                }
+                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
+              })
+            }
+
+            if (card.backElements) { // 鍗$墖
+              card.backElements = card.backElements.map(m => {
+                if (m.datatype === 'dynamic' && map[m.field.toLowerCase()]) {
+                  m.field = map[m.field.toLowerCase()].FieldName
+                }
+                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
+              })
+            }
+
+            if (card.fields) { // 琛ㄥ崟
+              card.fields = card.fields.map(m => {
+                if (m.field && map[m.field.toLowerCase()]) {
+                  m.field = map[m.field.toLowerCase()].FieldName
+                }
+                return m
+              })
+            }
+          })
+        }
+
+        if (item.elements) {
+          item.elements = item.elements.map(m => {
+            if (m.datatype === 'dynamic' && map[m.field.toLowerCase()]) {
+              m.field = map[m.field.toLowerCase()].FieldName
+            }
+            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
+          })
+        }
+
+        if (item.plot) {
+          if (item.plot.Xaxis && map[item.plot.Xaxis.toLowerCase()]) {
+            item.plot.Xaxis = map[item.plot.Xaxis.toLowerCase()].FieldName
           }
-
-          if (item.subtype === 'basetable') {
-            item.cols = item.cols.map(col => {
-              if (col.field && map[col.field.toLowerCase()]) {
-                col.field = map[col.field.toLowerCase()].FieldName
+          // 缁熻鍥�
+          if (item.plot.InfoValue && map[item.plot.InfoValue.toLowerCase()]) {
+            item.plot.InfoValue = map[item.plot.InfoValue.toLowerCase()].FieldName
+          }
+          if (item.plot.InfoType && map[item.plot.InfoType.toLowerCase()]) {
+            item.plot.InfoType = map[item.plot.InfoType.toLowerCase()].FieldName
+          }
+          // 鍗犳瘮鍥�
+          if (item.plot.valueField && map[item.plot.valueField.toLowerCase()]) {
+            item.plot.valueField = map[item.plot.valueField.toLowerCase()].FieldName
+          }
+          if (item.plot.labelField && map[item.plot.labelField.toLowerCase()]) {
+            item.plot.labelField = map[item.plot.labelField.toLowerCase()].FieldName
+          }
+          // 楗煎浘
+          if (item.plot.type && map[item.plot.type.toLowerCase()]) {
+            item.plot.type = map[item.plot.type.toLowerCase()].FieldName
+          }
+          // 鏁g偣鍥�
+          if (item.plot.gender && map[item.plot.gender.toLowerCase()]) {
+            item.plot.gender = map[item.plot.gender.toLowerCase()].FieldName
+          }
+          if (item.Yaxis) {
+            if (Array.isArray(item.Yaxis)) {
+              item.Yaxis = item.Yaxis.map(m => {
+                if (map[m.toLowerCase()]) {
+                  return map[m.toLowerCase()].FieldName
+                }
+                return m
+              })
+            } else {
+              if (item.Yaxis && map[item.Yaxis.toLowerCase()]) {
+                item.Yaxis = map[item.Yaxis.toLowerCase()].FieldName
               }
+            }
+          }
+        }
+
+        if (item.cols) {
+          let _update = (cols) => {
+            return cols.map(col => {
+              if (col.type === 'custom' && col.elements) {
+                col.elements = col.elements.map(m => {
+                  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
+                })
+              } else if (col.type === 'colspan') {
+                col.subcols = _update(col.subcols)
+              } else if (col.field) {
+                if (map[col.field.toLowerCase()]) {
+                  col.field = map[col.field.toLowerCase()].FieldName
+                }
+              }
+              
               return col
             })
           }
 
-          return item
-        })
-      }
-
-      config.components = _replace(config.components)
-    // } else if (type === 'table') {
-    //   config.columns = config.columns.map(col => {
-    //     if (col.field && map[col.field.toLowerCase()]) {
-    //       col.field = map[col.field.toLowerCase()].FieldName
-    //     }
-    //     return col
-    //   })
-
-    //   config.search = config.search.map(col => {
-    //     if (col.field && map[col.field.toLowerCase()]) {
-    //       col.field = map[col.field.toLowerCase()].FieldName
-    //     }
-    //     if (col.datefield && map[col.datefield.toLowerCase()]) {
-    //       col.datefield = map[col.datefield.toLowerCase()].FieldName
-    //     }
-    //     return col
-    //   })
-
-    //   config.action = config.action.map(m => {
-    //     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
-    //       })
-    //     }
-    //     return m
-    //   })
-    } else if (type === 'form') {
-      config.fields = config.fields.map(col => {
-        if (col.field && map[col.field.toLowerCase()]) {
-          col.field = map[col.field.toLowerCase()].FieldName
+          item.cols = _update(item.cols)
         }
-        return col
+
+        if (item.subtype === 'basetable') {
+          item.cols = item.cols.map(col => {
+            if (col.field && map[col.field.toLowerCase()]) {
+              col.field = map[col.field.toLowerCase()].FieldName
+            }
+            return col
+          })
+        }
+
+        return item
       })
     }
+
+    config.components = _replace(config.components)
+
+    config.interfaces && config.interfaces.forEach(item => {
+      if (item.columns) {
+        item.columns = item.columns.map(col => {
+          let cell = map[col.field.toLowerCase()]
+          if (cell) {
+            col.field = cell.FieldName
+            if (cell.datatype) {
+              col.datatype = cell.datatype
+            }
+          }
+          return col
+        })
+      }
+    })
 
     this.setState({
       confirming: false,
@@ -470,156 +445,131 @@
 
   // 渚濇嵁瀛楁鏇挎崲鍚嶇О
   execLabel = (map) => {
-    const { type } = this.props
     let config = fromJS(this.props.config).toJS()
 
-    if (type === 'custom') {
-      let _replace = (components) => {
-        return components.map(item => {
-          if (item.type === 'tabs') {
-            item.subtabs.forEach(tab => {
-              tab.components = _replace(tab.components)
-            })
-            return item
-          } else if (item.type === 'group') {
-            item.components = _replace(item.components)
-            return item
-          }
-          
-          if (item.columns) {
-            item.columns = item.columns.map(col => {
-              if (col.field && map[col.field.toLowerCase()]) {
-                col.label = map[col.field.toLowerCase()].FieldDec
-              }
-              return col
-            })
-          }
-          if (item.search) {
-            item.search = item.search.map(col => {
-              if (col.field && map[col.field.toLowerCase()]) {
-                col.label = map[col.field.toLowerCase()].FieldDec
-              }
-              return col
-            })
-          }
+    let _replace = (components) => {
+      return components.map(item => {
+        if (item.type === 'tabs') {
+          item.subtabs.forEach(tab => {
+            tab.components = _replace(tab.components)
+          })
+          return item
+        } else if (item.type === 'group') {
+          item.components = _replace(item.components)
+          return item
+        }
+        
+        if (item.columns) {
+          item.columns = item.columns.map(col => {
+            if (col.field && map[col.field.toLowerCase()]) {
+              col.label = map[col.field.toLowerCase()].FieldDec
+            }
+            return col
+          })
+        }
+        if (item.search) {
+          item.search = item.search.map(col => {
+            if (col.field && map[col.field.toLowerCase()]) {
+              col.label = map[col.field.toLowerCase()].FieldDec
+            }
+            return col
+          })
+        }
 
-          if (item.action) {
-            item.action.forEach(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 (item.cols) {
-            let _update = (cols) => {
-              return cols.map(col => {
-                if (col.type === 'custom' && col.elements) {
-                  col.elements = col.elements.map(m => {
-                    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
-                  })
-                } else if (col.type === 'colspan') {
-                  col.subcols = _update(col.subcols)
-                } else if (col.field) {
-                  if (map[col.field.toLowerCase()]) {
-                    col.label = map[col.field.toLowerCase()].FieldDec
-                  }
+        if (item.action) {
+          item.action.forEach(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)
+            }
+          })
+        }
 
-            item.cols = _update(item.cols)
-          }
+        if (item.cols) {
+          let _update = (cols) => {
+            return cols.map(col => {
+              if (col.type === 'custom' && col.elements) {
+                col.elements = col.elements.map(m => {
+                  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)
+                    }
+                  }
 
-          if (item.subtype === 'basetable') {
-            item.cols = item.cols.map(col => {
-              if (col.field && map[col.field.toLowerCase()]) {
-                col.label = map[col.field.toLowerCase()].FieldDec
+                  return m
+                })
+              } else if (col.type === 'colspan') {
+                col.subcols = _update(col.subcols)
+              } else if (col.field) {
+                if (map[col.field.toLowerCase()]) {
+                  col.label = map[col.field.toLowerCase()].FieldDec
+                }
               }
+              
               return col
             })
           }
 
-          return item
-        })
-      }
-
-      config.components = _replace(config.components)
-    // } else if (type === 'table') {
-    //   config.columns = config.columns.map(col => {
-    //     if (col.field && map[col.field.toLowerCase()]) {
-    //       col.label = map[col.field.toLowerCase()].FieldDec
-    //     }
-    //     return col
-    //   })
-      
-    //   config.search = config.search.map(col => {
-    //     if (col.field && map[col.field.toLowerCase()]) {
-    //       col.label = map[col.field.toLowerCase()].FieldDec
-    //     }
-    //     return col
-    //   })
-
-    //   config.action = config.action.map(m => {
-    //     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
-    //       })
-    //     }
-    //     return m
-    //   })
-    } else if (type === 'form') {
-      config.fields = config.fields.map(col => {
-        if (col.field && map[col.field.toLowerCase()]) {
-          col.label = map[col.field.toLowerCase()].FieldDec
+          item.cols = _update(item.cols)
         }
-        return col
+
+        if (item.subtype === 'basetable') {
+          item.cols = item.cols.map(col => {
+            if (col.field && map[col.field.toLowerCase()]) {
+              col.label = map[col.field.toLowerCase()].FieldDec
+            }
+            return col
+          })
+        }
+
+        return item
       })
     }
 
+    config.components = _replace(config.components)
+
+    config.interfaces && config.interfaces.forEach(item => {
+      if (item.columns) {
+        item.columns = item.columns.map(col => {
+          if (col.field && map[col.field.toLowerCase()]) {
+            col.label = map[col.field.toLowerCase()].FieldDec
+          }
+          return col
+        })
+      }
+    })
+
     this.setState({
       confirming: false,
       visible: false
diff --git a/src/views/menudesign/index.jsx b/src/views/menudesign/index.jsx
index 6ca33fc..219e2ef 100644
--- a/src/views/menudesign/index.jsx
+++ b/src/views/menudesign/index.jsx
@@ -1382,7 +1382,7 @@
                     <StyleCombControlButton menu={config} />
                     <PasteController vType="admin" insert={this.insert} />
                     {config ? <Dropdown placement="bottomCenter" overlay={<div className="mk-opeartion-dropdown-wrap">
-                      <ReplaceField type="custom" config={config} updateConfig={this.resetConfig}/>
+                      <ReplaceField config={config} updateConfig={this.resetConfig}/>
                       <LowerField config={config} updateConfig={this.resetConfig}/>
                       <PictureController/>
                     </div>} trigger={['hover']}>
diff --git a/src/views/menudesign/popview/index.jsx b/src/views/menudesign/popview/index.jsx
index 496f116..3e4c060 100644
--- a/src/views/menudesign/popview/index.jsx
+++ b/src/views/menudesign/popview/index.jsx
@@ -279,7 +279,7 @@
             } bordered={false} extra={
               <div>
                 <Button className="mk-border-purple" onClick={() => this.setState({eyeopen: !eyeopen})}>{!eyeopen ? <EyeOutlined /> : <EyeInvisibleOutlined />} 缁勪欢鍚�</Button>
-                <ReplaceField type="custom" config={config} updateConfig={this.resetConfig}/>
+                <ReplaceField config={config} updateConfig={this.resetConfig}/>
                 <StyleCombControlButton menu={config} />
                 <PasteController insert={this.insert} />
                 <Switch className="big" checkedChildren="鍚�" unCheckedChildren="鍋�" checked={config.enabled} onChange={this.onEnabledChange} />
diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx
index af25601..d90214a 100644
--- a/src/views/mobdesign/index.jsx
+++ b/src/views/mobdesign/index.jsx
@@ -2316,7 +2316,7 @@
               <StyleCombControlButton menu={config} />
               <Button className="mk-border-green set-home" disabled={MenuId === appHomeId} data-title="褰撳墠鑿滃崟涓哄簲鐢ㄩ椤�" onClick={this.setHomeView}><HomeOutlined /> 璁句负棣栭〉</Button>
               <Button className="mk-border-purple" disabled={MenuId === appLoginId} data-title="褰撳墠鑿滃崟涓哄簲鐢ㄧ櫥褰曢〉" onClick={this.setLoginView}><LoginOutlined /> 璁句负鐧诲綍椤�</Button>
-              <ReplaceField type="custom" config={config} updateConfig={this.resetConfig}/>
+              <ReplaceField config={config} updateConfig={this.resetConfig}/>
               <LowerField config={config} updateConfig={this.resetConfig}/>
               <Transfer MenuID={MenuId} />
               {config ? <Versions MenuId={MenuId} Template="webPage" checklog={this.checklog} updateConfig={this.updateLogConfig}/> : null}
diff --git a/src/views/mobdesign/popview/index.jsx b/src/views/mobdesign/popview/index.jsx
index 15edee3..3443c43 100644
--- a/src/views/mobdesign/popview/index.jsx
+++ b/src/views/mobdesign/popview/index.jsx
@@ -291,7 +291,7 @@
             <Button className="mk-border-purple" onClick={() => this.setState({eyeopen: !eyeopen})}>{!eyeopen ? <EyeOutlined /> : <EyeInvisibleOutlined />} 缁勪欢鍚�</Button>
             <PasteController insert={this.insert} />
             <StyleCombControlButton menu={config} />
-            <ReplaceField type="custom" config={config} updateConfig={this.resetConfig}/>
+            <ReplaceField config={config} updateConfig={this.resetConfig}/>
             <Button type="default" onClick={this.closeView}>杩斿洖</Button>
           </div>
         </div>
diff --git a/src/views/pcdesign/index.jsx b/src/views/pcdesign/index.jsx
index 480cd9f..38c02ee 100644
--- a/src/views/pcdesign/index.jsx
+++ b/src/views/pcdesign/index.jsx
@@ -1941,7 +1941,7 @@
                 <StyleCombControlButton menu={config} />
                 <Button className="mk-border-green" disabled={MenuId === appHomeId} data-title="褰撳墠鑿滃崟涓哄簲鐢ㄩ椤�" onClick={this.setHomeView}><HomeOutlined /> 璁句负棣栭〉</Button>
                 <Button className="mk-border-purple" disabled={MenuId === appLoginId} data-title="褰撳墠鑿滃崟涓哄簲鐢ㄧ櫥褰曢〉" onClick={this.setLoginView}><LoginOutlined/> 璁句负鐧诲綍椤�</Button>
-                <ReplaceField type="custom" config={config} updateConfig={this.resetConfig}/>
+                <ReplaceField config={config} updateConfig={this.resetConfig}/>
                 <LowerField config={config} updateConfig={this.resetConfig}/>
                 <Transfer MenuID={MenuId} />
                 {config ? <Versions MenuId={MenuId} Template="webPage" checklog={this.checklog} updateConfig={this.updateLogConfig}/> : null}
diff --git a/src/views/tabledesign/index.jsx b/src/views/tabledesign/index.jsx
index 28e3c2b..1e20f9d 100644
--- a/src/views/tabledesign/index.jsx
+++ b/src/views/tabledesign/index.jsx
@@ -1098,7 +1098,7 @@
                     <TableNodes config={config} />
                     <PasteBaseTable type="page" insert={this.insert}/>
                     {config ? <Dropdown placement="bottomCenter" overlay={<div className="mk-opeartion-dropdown-wrap">
-                      <ReplaceField type="custom" config={config} updateConfig={this.resetConfig}/>
+                      <ReplaceField config={config} updateConfig={this.resetConfig}/>
                       <LowerField config={config} updateConfig={this.resetConfig}/>
                     </div>} trigger={['hover']}>
                       <div className="mk-button-more">鏇村<DownOutlined/></div>
diff --git a/src/views/tabledesign/popview/index.jsx b/src/views/tabledesign/popview/index.jsx
index dbac3df..e4aceb2 100644
--- a/src/views/tabledesign/popview/index.jsx
+++ b/src/views/tabledesign/popview/index.jsx
@@ -216,7 +216,7 @@
               <div> {config.MenuName} </div>
             } bordered={false} extra={
               <div>
-                <ReplaceField type="custom" config={config} updateConfig={this.resetConfig}/>
+                <ReplaceField config={config} updateConfig={this.resetConfig}/>
                 <Switch className="big" checkedChildren="鍚�" unCheckedChildren="鍋�" checked={config.enabled} onChange={this.onEnabledChange} />
                 <Button type="primary" id="save-pop-config" onClick={this.submitConfig} loading={menuloading}>淇濆瓨</Button>
                 <Button type="default" disabled={menuloading} onClick={this.closeView}>杩斿洖</Button>

--
Gitblit v1.8.0