Merge pull request #11609 from dataease/pr@dev-v2@refactor_table_url_field

Pr@dev v2@refactor table url field

core/core-frontend/src/components/visualization/UserViewEnlarge.vue

@@ -189,7 +189,8 @@ const DETAIL_CHART_ATTR: DeepPartial<ChartObj> = {
     scrollCfg: {
       open: false
     }
-  }
+  },
+  showPosition: 'dialog'
 }
 
 const state = reactive({
@@ -200,7 +201,8 @@ const DETAIL_TABLE_ATTR: DeepPartial<ChartObj> = {
     scrollCfg: {
       open: false
     }
-  }
+  },
+  showPosition: 'dialog'
 }
 
 const authShow = computed(() => editMode.value === 'edit' || dvInfo.value.weight > 3)

core/core-frontend/src/models/chart/chart.d.ts

@@ -67,6 +67,7 @@ declare interface Chart {
   seriesFieldObjs?: any[]
   flowMapStartName?: Axis[]
   flowMapEndName?: Axis[]
+  showPosition: string
 }
 declare type CustomAttr = DeepPartial<ChartAttr> | JSONString<DeepPartial<ChartAttr>>
 declare type CustomStyle = DeepPartial<ChartStyle> | JSONString<DeepPartial<ChartStyle>>

core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TableThresholdEdit.vue

@@ -267,6 +267,7 @@ init()
                 :key="fieldOption.id"
                 :label="fieldOption.name"
                 :value="fieldOption.id"
+                :disabled="chart.type === 'table-info' && fieldOption.deType === 7"
               >
                 <el-icon style="margin-right: 8px">
                   <Icon

core/core-frontend/src/views/chart/components/js/panel/charts/table/table-info.ts

@@ -18,8 +18,9 @@ class ImageCell extends TableDataCell {
       !this.cfg.children && (this.cfg.children = [])
       const { width: imgWidth, height: imgHeight } = img
       const ratio = Math.max(imgWidth / width, imgHeight / height)
-      const imgShowWidth = imgWidth / ratio
-      const imgShowHeight = imgHeight / ratio
+      // 不铺满，部分留白
+      const imgShowWidth = (imgWidth / ratio) * 0.8
+      const imgShowHeight = (imgHeight / ratio) * 0.8
       this.textShape = this.addShape('image', {
         attrs: {
           x: x + (imgShowWidth < width ? (width - imgShowWidth) / 2 : 0),
@@ -162,7 +163,7 @@ export class TableInfo extends S2ChartView<TableSheet> {
     }
     s2Options.dataCell = viewMeta => {
       const deType = axisMap[viewMeta.valueField]?.deType
-      if (deType === 7) {
+      if (deType === 7 && chart.showPosition !== 'dialog') {
         return new ImageCell(viewMeta, viewMeta?.spreadsheet)
       }
       if (viewMeta.colIndex === 0 && s2Options.showSeriesNumber) {

core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue

@@ -506,7 +506,7 @@ const trackMenuCalc = itemId => {
   // 明细表 URL 字段图片放大
   if (view.value.type === 'table-info') {
     view.value.xAxis?.forEach(axis => {
-      if (axis.id === itemId) {
+      if (axis.id === itemId && axis.deType === 7) {
         trackMenuInfo.push('enlarge')
       }
     })