From b6b3da678c4a43c42ae508180096061bb1e66c6b Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Thu, 27 Mar 2025 16:29:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E6=BA=90=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=20Excel=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=EF=BC=8C?=
 =?UTF-8?q?=E6=9C=89=E5=AD=97=E6=AE=B5=E7=B1=BB=E4=BC=BC=20007147=EF=BC=8C?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=BF=9B=E5=8E=BB=E8=87=AA=E5=8A=A8=E5=8F=98?=
 =?UTF-8?q?=E6=88=90=E4=BA=86=207147?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datasource/form/ExcelRemoteDetail.vue     | 97 ++++++++++++++++++-
 1 file changed, 94 insertions(+), 3 deletions(-)

diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/ExcelRemoteDetail.vue b/core/core-frontend/src/views/visualized/data/datasource/form/ExcelRemoteDetail.vue
index 79bdb04e5f..9692d70cbc 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/form/ExcelRemoteDetail.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/ExcelRemoteDetail.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup>
+<script lang="tsx" setup>
 import icon_calendar_outlined from '@/assets/svg/icon_calendar_outlined.svg'
 import {
   ref,
@@ -25,6 +25,7 @@ import { loadRemoteFile, save, update } from '@/api/datasource'
 import { Base64 } from 'js-base64'
 import { useEmitt } from '@/hooks/web/useEmitt'
 import { CustomPassword } from '@/components/custom-password'
+import { fieldType as fieldTypeLowercase } from '@/utils/attr'
 const { t } = useI18n()
 export interface Param {
   editType: number
@@ -43,6 +44,7 @@ export interface Field {
   fieldSize: number
   fieldType: string
   name: string
+  deExtractType: number
   checked: boolean
   primaryKey: boolean
   length: number
@@ -374,12 +376,27 @@ const generateColumns = (arr: Field[]) =>
   arr.map(ele => ({
     key: ele.originName,
     fieldType: ele.fieldType,
+    deExtractType: ele.deExtractType,
     dataKey: ele.originName,
     title: ele.name,
     checked: ele.checked,
     primaryKey: ele.primaryKey,
     length: ele.length,
-    width: 150
+    width: 150,
+    headerCellRenderer: ({ column }) => (
+      <div class="flex-align-center icon">
+        <ElIcon>
+          <Icon>
+            {h(iconFieldMap[fieldType[column.fieldType]], {
+              class: `svg-icon field-icon-${fieldType[column.fieldType]}`
+            })}
+          </Icon>
+        </ElIcon>
+        <span class="ellipsis" title={column.title} style={{ width: '100px' }}>
+          {column.title}
+        </span>
+      </div>
+    )
   }))
 
 const loadData = () => {
@@ -464,6 +481,9 @@ const changeCurrentMode = val => {
       }
       initMultipleTable.value = false
     })
+  } else {
+    const sheet = state.excelData[0]?.sheets.find(ele => ele.sheetId === activeTab.value)
+    handleNodeClick(sheet)
   }
 }
 
@@ -526,7 +546,7 @@ const disabledFieldLength = item => {
   if (!item.checked) {
     return true
   }
-  if (item.fieldType !== 'TEXT') {
+  if (item.deExtractType !== 0) {
     return true
   }
 }
@@ -633,6 +653,32 @@ const saveExcelDs = (params, successCb, finallyCb) => {
   }
 }
 
+const fieldOptions = [
+  { label: t('dataset.text'), value: 0 },
+  { label: t('dataset.value'), value: 2 },
+  {
+    label: t('dataset.value') + '(' + t('dataset.float') + ')',
+    value: 3
+  }
+]
+
+const deExtractTypeChange = item => {
+  item.deType = item.deExtractType
+  const sheet = state.excelData[0]?.sheets.find(ele => ele.sheetId === activeTab.value)
+  sheet.fields.forEach(row => {
+    if (row.originName === item.dataKey) {
+      row.deExtractType = item.deExtractType
+      row.deType = item.deExtractType
+      row.fieldType = fieldTypeToStr[item.deExtractType]
+    }
+  })
+}
+
+const fieldTypeToStr = {
+  0: 'TEXT',
+  2: 'LONG',
+  3: 'DOUBLE'
+}
 const saveExcelData = (sheetFileMd5, table, params, successCb, finallyCb) => {
   for (let i = 0; i < table.configuration.sheets.length; i++) {
     table.configuration.sheets[i].data = []
@@ -804,6 +850,51 @@ defineExpose({
             <el-table-column :label="t('data_set.field_name')">
               <template #default="scope">{{ scope.row.title }}</template>
             </el-table-column>
+
+            <el-table-column prop="deExtractType" :label="t('datasource.field_type')">
+              <template #default="scope">
+                <el-select
+                  v-model="scope.row.deExtractType"
+                  class="select-type"
+                  style="display: inline-block; width: 120px"
+                  @change="deExtractTypeChange(scope.row)"
+                >
+                  <template #prefix>
+                    <el-icon>
+                      <Icon :className="`field-icon-${fieldTypeLowercase[scope.row.deExtractType]}`"
+                        ><component
+                          class="svg-icon"
+                          :class="`field-icon-${fieldTypeLowercase[scope.row.deExtractType]}`"
+                          :is="iconFieldMap[fieldTypeLowercase[scope.row.deExtractType]]"
+                        ></component
+                      ></Icon>
+                    </el-icon>
+                  </template>
+                  <el-option
+                    v-for="item in fieldOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                    <span style="float: left">
+                      <el-icon>
+                        <Icon :className="`field-icon-${fieldTypeLowercase[item.value]}`"
+                          ><component
+                            class="svg-icon"
+                            :class="`field-icon-${fieldTypeLowercase[item.value]}`"
+                            :is="iconFieldMap[fieldTypeLowercase[item.value]]"
+                          ></component
+                        ></Icon>
+                      </el-icon>
+                    </span>
+                    <span style="float: left; font-size: 12px; color: #8492a6">{{
+                      item.label
+                    }}</span>
+                  </el-option>
+                </el-select>
+              </template>
+            </el-table-column>
+
             <el-table-column :label="t('data_set.field_type')">
               <template #default="scope">
                 <div class="flex-align-center">