Merge branch 'dev-v2' into pr@dev-v2@fixds

core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java

@@ -486,6 +486,7 @@ public class ExcelUtils {
                 tableFiled.setName(filedName);
                 tableFiled.setOriginName(filedName);
                 tableFiled.setFieldType(null);
+                tableFiled.setChecked(true);
                 fields.add(tableFiled);
             }
 

core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java

@@ -810,19 +810,11 @@ public class DatasourceServer implements DatasourceApi {
                 datasourceRequest.setDatasource(transDTO(coreDatasource));
                 List<DatasetTableDTO> datasetTableDTOS = ExcelUtils.getTables(datasourceRequest);
                 for (ExcelSheetData sheet : excelFileData.getSheets()) {
-                    boolean find = false;
                     for (DatasetTableDTO datasetTableDTO : datasetTableDTOS) {
                         if (excelDataTableName(datasetTableDTO.getTableName()).equals(sheet.getTableName()) || isCsv(file.getOriginalFilename())) {
-                            find = true;
                             sheet.setDeTableName(datasetTableDTO.getTableName());
-                            datasourceRequest.setTable(datasetTableDTO.getTableName());
-                            List<TableField> oldTableFields = ExcelUtils.getTableFields(datasourceRequest);
-                            mergeFields(oldTableFields, sheet.getFields());
                         }
                     }
-                    if (!find) {
-                        sheet.setNewSheet(true);
-                    }
                 }
             }
         }

core/core-frontend/src/views/visualized/data/datasource/form/ApiHttpRequestDraw.vue

@@ -289,7 +289,11 @@ const saveItem = () => {
     }
   } else {
     for (let i = 0; i < apiItem.fields.length; i++) {
-      if (apiItem.fields[i].primaryKey && !apiItem.fields[i].length) {
+      if (
+        apiItem.fields[i].primaryKey &&
+        !apiItem.fields[i].length &&
+        apiItem.fields[i].deExtractType === 0
+      ) {
         ElMessage.error(t('datasource.primary_key_length') + apiItem.fields[i].name)
         return
       }

core/core-frontend/src/views/visualized/data/datasource/form/ExcelDetail.vue

@@ -207,6 +207,7 @@ const saveExcelDs = (params, successCb, finallyCb) => {
   let effectExtField = false
   let changeFiled = false
   let selectNode = state.excelData[0]?.sheets
+  console.log(1)
   for (let i = 0; i < selectNode.length; i++) {
     if (selectNode[i].sheet) {
       if (selectNode[i].effectExtField) {
@@ -243,6 +244,7 @@ const saveExcelDs = (params, successCb, finallyCb) => {
       sheetFileMd5.push(selectNode[i].fieldsMd5)
     }
   }
+  console.log(2)
   if (!selectedSheet.length) {
     ElMessage({
       message: t('dataset.ple_select_excel'),
@@ -644,7 +646,7 @@ defineExpose({
         ></SheetTabs>
 
         <div class="table-select_mode">
-          <div class="btn-select" v-if="param.id === '0' || sheetObj.newSheet">
+          <div class="btn-select" v-if="param.editType === 0">
             <el-button
               @click="changeCurrentMode('preview')"
               :class="[currentMode === 'preview' && 'is-active']"
@@ -705,7 +707,7 @@ defineExpose({
             <el-table-column
               prop="length"
               :label="t('datasource.length')"
-              v-if="param.id === '0' || sheetObj.newSheet"
+              v-if="param.editType === 0"
             >
               <template #default="scope">
                 <el-input-number
@@ -728,7 +730,7 @@ defineExpose({
               class-name="checkbox-table"
               :label="t('datasource.set_key')"
               width="100"
-              v-if="param.id === '0' || sheetObj.newSheet"
+              v-if="param.editType === 0"
             >
               <template #default="scope">
                 <el-checkbox

sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartExtFilterDTO.java

@@ -1,10 +1,13 @@
 package io.dataease.extensions.view.dto;
 
 
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO;
 import lombok.Data;
 
+
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
@@ -23,4 +26,16 @@ public class ChartExtFilterDTO {
     @JsonIgnore
     private List<String> originValue;
     private int filterType;// 0-过滤组件，1-下钻，2-联动，外部参数
+
+
+    public List<String> getValue() {
+        if (CollectionUtils.isNotEmpty(value)) {
+            List<String> values = new ArrayList<>();
+            value.forEach(v -> {
+                values.add(v.replace("\n", "\\n"));
+            });
+            return values;
+        }
+        return value;
+    }
 }