From e62161e7754ae6d0488203727f5ad6c569f27d03 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 3 Jul 2024 10:49:41 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E8=84=B1?=
 =?UTF-8?q?=E6=95=8F=E5=AD=97=E6=AE=B5=E5=88=B6=E4=BD=9C=E5=9B=BE=E8=A1=A8?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E6=81=A2=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/editor/drag-item/DimensionItem.vue      |  9 +--------
 .../chart/components/editor/drag-item/DrillItem.vue    |  8 +-------
 .../chart/components/editor/drag-item/QuotaItem.vue    |  9 +--------
 .../src/views/chart/components/editor/index.vue        | 10 ----------
 4 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/editor/drag-item/DimensionItem.vue b/core/core-frontend/src/views/chart/components/editor/drag-item/DimensionItem.vue
index d8b7612099..4d025fbfa9 100644
--- a/core/core-frontend/src/views/chart/components/editor/drag-item/DimensionItem.vue
+++ b/core/core-frontend/src/views/chart/components/editor/drag-item/DimensionItem.vue
@@ -159,10 +159,6 @@ const removeItem = () => {
 }
 
 const getItemTagType = () => {
-  if (props.chart.type !== 'table-info' && props.item.desensitized) {
-    tagType.value = '#F54A45'
-    return
-  }
   tagType.value = getItemType(props.dimensionData, props.quotaData, props.item)
 }
 
@@ -213,10 +209,7 @@ onMounted(() => {
           :content="item.chartShowName ? item.chartShowName : item.name"
         >
           <span class="item-span-style">
-            <span class="item-name"
-              >{{ item.chartShowName ? item.chartShowName : item.name
-              }}{{ item.desensitized ? '(已脱敏)' : '' }}</span
-            >
+            <span class="item-name">{{ item.chartShowName ? item.chartShowName : item.name }}</span>
           </span>
         </el-tooltip>
 
diff --git a/core/core-frontend/src/views/chart/components/editor/drag-item/DrillItem.vue b/core/core-frontend/src/views/chart/components/editor/drag-item/DrillItem.vue
index fb4feaba3f..d28d220da6 100644
--- a/core/core-frontend/src/views/chart/components/editor/drag-item/DrillItem.vue
+++ b/core/core-frontend/src/views/chart/components/editor/drag-item/DrillItem.vue
@@ -74,10 +74,6 @@ const removeItem = () => {
   emit('onDimensionItemRemove', item.value)
 }
 const getItemTagType = () => {
-  if (props.chart.type !== 'table-info' && props.item.desensitized) {
-    tagType.value = '#F54A45'
-    return
-  }
   tagType.value = getItemType(props.dimensionData, props.quotaData, props.item)
 }
 onMounted(() => {
@@ -101,9 +97,7 @@ onMounted(() => {
             ></Icon>
           </el-icon>
         </span>
-        <span class="item-span-style" :title="item.name"
-          >{{ item.name }}{{ item.desensitized ? '(已脱敏)' : '' }}</span
-        >
+        <span class="item-span-style" :title="item.name">{{ item.name }}</span>
         <el-icon class="child remove-icon" size="14px">
           <Icon name="icon_delete-trash_outlined" class-name="inner-class" @click="removeItem" />
         </el-icon>
diff --git a/core/core-frontend/src/views/chart/components/editor/drag-item/QuotaItem.vue b/core/core-frontend/src/views/chart/components/editor/drag-item/QuotaItem.vue
index 5256db3634..22b5e00eab 100644
--- a/core/core-frontend/src/views/chart/components/editor/drag-item/QuotaItem.vue
+++ b/core/core-frontend/src/views/chart/components/editor/drag-item/QuotaItem.vue
@@ -214,10 +214,6 @@ const removeItem = () => {
 }
 
 const getItemTagType = () => {
-  if (props.chart.type !== 'table-info' && props.item.desensitized) {
-    tagType.value = '#F54A45'
-    return
-  }
   tagType.value = getItemType(props.dimensionData, props.quotaData, props.item)
 }
 
@@ -308,10 +304,7 @@ onMounted(() => {
           :content="item.chartShowName ? item.chartShowName : item.name"
         >
           <span class="item-span-style">
-            <span class="item-name"
-              >{{ item.chartShowName ? item.chartShowName : item.name
-              }}{{ item.desensitized ? '(已脱敏)' : '' }}</span
-            >
+            <span class="item-name">{{ item.chartShowName ? item.chartShowName : item.name }}</span>
             <span v-if="item.summary !== ''" class="item-right-summary">
               ({{ t('chart.' + item.summary) }})
             </span>
diff --git a/core/core-frontend/src/views/chart/components/editor/index.vue b/core/core-frontend/src/views/chart/components/editor/index.vue
index 9d6116b6b0..37786e0e67 100644
--- a/core/core-frontend/src/views/chart/components/editor/index.vue
+++ b/core/core-frontend/src/views/chart/components/editor/index.vue
@@ -1555,16 +1555,10 @@ const dragOver = (ev: MouseEvent) => {
 }
 
 const drop = (ev: MouseEvent, type = 'xAxis') => {
-  let hasSesensitized = false
   ev.preventDefault()
   const arr = activeDimension.value.length ? activeDimension.value : activeQuota.value
   for (let i = 0; i < arr.length; i++) {
     const obj = cloneDeep(arr[i])
-    if (obj.desensitized && view.value.type !== 'table-info') {
-      hasSesensitized = true
-      continue
-    }
-
     state.moveId = obj.id as unknown as number
     view.value[type].push(obj)
     const e = { newDraggableIndex: view.value[type].length - 1 }
@@ -1575,10 +1569,6 @@ const drop = (ev: MouseEvent, type = 'xAxis') => {
       addAxis(e, type as AxisType)
     }
   }
-
-  if (hasSesensitized) {
-    ElMessage.error('脱敏字段不能用于制作该图表!')
-  }
 }
 
 const fieldLoading = ref(false)