diff --git a/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java b/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java
index 27461a0363..7fbda9ee6b 100644
--- a/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java
+++ b/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java
@@ -185,6 +185,7 @@ public class DataVisualizationServer implements DataVisualizationApi {
         List<DatasetGroupInfoDTO> newDsGroupInfo = new ArrayList<>();
         Map<Long,Long> dsTableIdMap = new HashMap<>();
         Map<Long,Long> dsTableFieldsIdMap = new HashMap<>();
+        List<CoreDatasetTableField> dsTableFieldsList = new ArrayList();
         Map<Long,Long> datasourceIdMap = new HashMap<>();
         Map<Long,Map<String,String>> dsTableNamesMap = new HashMap<>();
         List<Long> newDatasourceId = new ArrayList<>();
@@ -273,10 +274,19 @@ public class DataVisualizationServer implements DataVisualizationApi {
                     dsDsField.setDatasetTableId(dsTableIdMap.get(dsDsField.getDatasetTableId()));
                     dsDsField.setDatasourceId(datasourceIdMap.get(dsDsField.getDatasourceId()));
                     dsDsField.setId(newId);
-                    coreDatasetTableFieldMapper.insert(dsDsField);
+                    dsTableFieldsList.add(dsDsField);
                     dsTableFieldsIdMap.put(oldId,newId);
                 });
 
+                // dsTableFields 中存在计算字段在OriginName中 也需要替换
+                dsTableFieldsList.forEach(dsTableFields ->{
+                    dsTableFieldsIdMap.forEach((key,value) ->{
+                        dsTableFields.setOriginName(dsTableFields.getOriginName().replaceAll(key.toString(),value.toString()));
+                    });
+                    coreDatasetTableFieldMapper.insert(dsTableFields);
+                });
+
+
                 // 持久化数据集
                 newDsGroupInfo.forEach(dsGroup ->{
                     dsTableIdMap.forEach((key,value) ->{
diff --git a/core/core-frontend/src/utils/canvasUtils.ts b/core/core-frontend/src/utils/canvasUtils.ts
index f8d739e742..dbb286d0d3 100644
--- a/core/core-frontend/src/utils/canvasUtils.ts
+++ b/core/core-frontend/src/utils/canvasUtils.ts
@@ -454,7 +454,7 @@ export async function canvasSave(callBack) {
     })
   }
   if (dsNameCheck === 'repeat') {
-    ElMessage.error('数据集名称已存在')
+    ElMessage.error('数据集分组名称已存在')
     return
   }