fix: 打印表格的字段优先使用表格字段

gmfe · Dec 5, 2024 · f3fa9a9 · f3fa9a9
1 parent 2cf1be3
commit f3fa9a9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/common/editor_add_field.js b/src/common/editor_add_field.js
@@ -45,17 +45,18 @@ FieldList.propTypes = {
 class EditorAddField extends React.Component {
   render() {
     const {
-      addFields: { tableFields, commonFields },
+      addFields: { tableFields, commonFields, ...rest },
       editStore
     } = this.props
 
     let content = null
     if (editStore.selectedRegion === null || editStore.isSelectingCombine) {
       content = null
     } else if (editStore.computedRegionIsTable) {
+      const dataKey = editStore.selectedTableDataKey
       content = (
         <FieldList
-          fields={tableFields}
+          fields={rest?.[dataKey] ?? tableFields}
           handleAddField={editStore.addFieldToTable}
         />
       )

diff --git a/src/common/editor_store.js b/src/common/editor_store.js
@@ -401,6 +401,16 @@ class EditorStore {
     }
   }
 
+  /** 选中的表格数据DataKey  */
+  @computed
+  get selectedTableDataKey() {
+    if (this.computedRegionIsTable) {
+      const arr = this.selectedRegion.split('.')
+      return this.config.contents[arr[2]].dataKey
+    }
+    return null
+  }
+
   @computed
   get computedIsSelectBlock() {
     if (this.selected) {