From 36333811f3907e0bfb0ed88e65c6559d9d880a1f Mon Sep 17 00:00:00 2001
From: richie <richie@fanruan.com>
Date: Thu, 14 Jan 2021 17:29:40 +0800
Subject: [PATCH] =?UTF-8?q?clone=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin.xml                                                  | 3 ++-
 .../com/fr/plugin/db/es/fun/ElasticsearchTableData.java     | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/plugin.xml b/plugin.xml
index 0ddfc10..90d817b 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -3,12 +3,13 @@
     <id>com.fr.plugin.db.es.v10</id>
     <name><![CDATA[Elasticsearch数据集]]></name>
     <active>yes</active>
-    <version>2.0.2</version>
+    <version>2.0.3</version>
     <env-version>10.0</env-version>
     <jartime>2019-10-25</jartime>
     <vendor>fanruan.richie</vendor>
     <description><![CDATA[Elasticsearch数据查询。]]></description>
     <change-notes><![CDATA[
+        [2021-01-14]修复配置文件克隆不完整的问题。<br/>
         [2021-01-14]修改链表的生成方式,解决配置无法被克隆的问题。<br/>
         [2020-11-04]修复取消预览时连接没有被关闭的问。<br/>
         [2020-11-03]支持通过https协议连接服务器。<br/>
diff --git a/src/main/java/com/fr/plugin/db/es/fun/ElasticsearchTableData.java b/src/main/java/com/fr/plugin/db/es/fun/ElasticsearchTableData.java
index fb596c6..089a302 100644
--- a/src/main/java/com/fr/plugin/db/es/fun/ElasticsearchTableData.java
+++ b/src/main/java/com/fr/plugin/db/es/fun/ElasticsearchTableData.java
@@ -279,6 +279,7 @@ public class ElasticsearchTableData extends BaseTableData {
         cloned.query = (Conf<String>) query.clone();
         cloned.queryType = (Conf<String>) queryType.clone();
         cloned.script = (Conf<String>) script.clone();
+        cloned.configAttribute = (Conf<ConfigAttribute>) configAttribute.clone();
         return cloned;
     }
 
@@ -293,11 +294,12 @@ public class ElasticsearchTableData extends BaseTableData {
                 && AssistKit.equals(paraType, ((ElasticsearchTableData) obj).paraType)
 
                 && AssistKit.equals(query, ((ElasticsearchTableData) obj).query)
-                && AssistKit.equals(script, ((ElasticsearchTableData) obj).script);
+                && AssistKit.equals(script, ((ElasticsearchTableData) obj).script)
+                && AssistKit.equals(configAttribute, ((ElasticsearchTableData) obj).configAttribute);
     }
 
     @Override
     public int hashCode() {
-        return AssistKit.hashCode(database.get(), endPoint.get(), converterType.get(), paraType.get(), query.get(), script.get());
+        return AssistKit.hashCode(database.get(), endPoint.get(), converterType.get(), paraType.get(), query.get(), script.get(), converterType.hashCode());
     }
 }