From 1c9ead2a778f0149076c8cce25dd8bbc74b7dad5 Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Thu, 24 Sep 2020 17:17:36 +0800
Subject: [PATCH] =?UTF-8?q?CHART-15947=20=E4=BF=AE=E6=94=B9=E5=AF=8C?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E7=BC=96=E8=BE=91=E5=99=A8=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/editor/script/editor.js          | 14 ++++++++++++++
 .../script/insertcombo/combo.insert_param.model.js |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/designer-chart/src/main/resources/com/fr/design/editor/script/editor.js b/designer-chart/src/main/resources/com/fr/design/editor/script/editor.js
index 2162430698..d0e49dd5f9 100644
--- a/designer-chart/src/main/resources/com/fr/design/editor/script/editor.js
+++ b/designer-chart/src/main/resources/com/fr/design/editor/script/editor.js
@@ -107,6 +107,16 @@
 
         _cleanHtml: function (value) {
             var editorService = BI.Services.getService("bi.service.design.chart.common.editor");
+            var dimensionIds = this.options.dimensionIds;
+            var dataIdMap = {};
+
+            for (var i = 0, len = dimensionIds.length; i < len; i++) {
+                var dimensionId = dimensionIds[i];
+                var key = BI.keys(dimensionId)[0];
+
+                dataIdMap[key] = dimensionId[key];
+            }
+
             var result = BI.replaceAll(value, "<p></p>", "");
             // 去掉image的src属性，因为数据太大了
             result = value.replaceAll("<img.*?>", function (imageStr) {
@@ -117,6 +127,10 @@
                         return;
                     }
                     str += " " + key + "=\"" + value + "\"";
+
+                    if (key === "alt" && dataIdMap[value]) {
+                        str += " " + "data-id" + "=\"" + dataIdMap[value] + "\"";
+                    }
                 });
 
                 return str + " />";
diff --git a/designer-chart/src/main/resources/com/fr/design/editor/script/insertcombo/combo.insert_param.model.js b/designer-chart/src/main/resources/com/fr/design/editor/script/insertcombo/combo.insert_param.model.js
index d0a8f084ef..10db72cd0e 100644
--- a/designer-chart/src/main/resources/com/fr/design/editor/script/insertcombo/combo.insert_param.model.js
+++ b/designer-chart/src/main/resources/com/fr/design/editor/script/insertcombo/combo.insert_param.model.js
@@ -21,7 +21,7 @@
                     return {
                         type: "bi.design.chart.common.editor.search",
                         text: key,
-                        value: dId[key]
+                        value: key
                     };
                 });
             }