From ebb843610378db2b82639b021c236307ed36e438 Mon Sep 17 00:00:00 2001
From: liguohui <liguohui@cmss.chinamobile.com>
Date: Mon, 27 Nov 2017 13:51:16 +0800
Subject: [PATCH 1/2] Chart field is also draggable and sortable in the 'keys',
 'groups' and 'values'

---
 .../src/app/tabledata/pivot_settings.html     | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/zeppelin-web/src/app/tabledata/pivot_settings.html b/zeppelin-web/src/app/tabledata/pivot_settings.html
index abfe73069be..ce22e5361d3 100644
--- a/zeppelin-web/src/app/tabledata/pivot_settings.html
+++ b/zeppelin-web/src/app/tabledata/pivot_settings.html
@@ -49,7 +49,11 @@
             data-drop="true" jqyoui-droppable="{multiple:true, onDrop:'save()'}"
             class="list-unstyled"
             style="border-radius: 6px; margin-top: 7px;">
-          <li ng-repeat="item in config.keys">
+          <li ng-repeat="item in config.keys track by $index"
+              ng-model="config.keys"
+              data-drag="true"
+              jqyoui-draggable="{index: {{$index}}, animate: false}"
+              data-jqyoui-options="{revert: 'invalid', placeholder: 'keep', helper: 'clone'}">
             <div class="btn btn-default btn-xs"
                  style="background-color: #EFEFEF; margin: 2px 0px 0px 2px;">
               {{item.name}}
@@ -69,7 +73,11 @@
             jqyoui-droppable="{multiple:true, onDrop:'save()'}"
             class="list-unstyled"
             style="border-radius: 6px; margin-top: 7px;">
-          <li ng-repeat="item in config.groups">
+          <li ng-repeat="item in config.groups track by $index"
+              ng-model="config.groups"
+              data-drag="true"
+              jqyoui-draggable="{index: {{$index}}, animate: false}"
+              data-jqyoui-options="{revert: 'invalid', placeholder: 'keep', helper: 'clone'}">
             <div class="btn btn-default btn-xs"
                  style="background-color: #EFEFEF; margin: 2px 0px 0px 2px;">
               {{item.name}}
@@ -89,7 +97,11 @@
             jqyoui-droppable="{multiple:true, onDrop:'save()'}"
             class="list-unstyled"
             style="border-radius: 6px; margin-top: 7px;">
-          <li ng-repeat="item in config.values">
+          <li ng-repeat="item in config.values track by $index"
+              ng-model="config.values"
+              data-drag="true"
+              jqyoui-draggable="{index: {{$index}}, animate: false}"
+              data-jqyoui-options="{revert: 'invalid', placeholder: 'keep', helper: 'clone'}">
             <div class="btn-group">
               <div class="btn btn-default btn-xs dropdown-toggle"
                    style="background-color: #EFEFEF;"
@@ -111,4 +123,4 @@
       </div>
     </div>
   </div> <!-- panel-body -->
-</div> <!-- panel -->
+</div> <!-- panel -->
\ No newline at end of file

From 08b86b81bf7f42a0b19c72979d14bbdfc3de6f58 Mon Sep 17 00:00:00 2001
From: liguohui <liguohui@cmss.chinamobile.com>
Date: Tue, 28 Nov 2017 22:53:48 +0800
Subject: [PATCH 2/2] add a new line

---
 zeppelin-web/src/app/tabledata/pivot_settings.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/zeppelin-web/src/app/tabledata/pivot_settings.html b/zeppelin-web/src/app/tabledata/pivot_settings.html
index ce22e5361d3..68de019c275 100644
--- a/zeppelin-web/src/app/tabledata/pivot_settings.html
+++ b/zeppelin-web/src/app/tabledata/pivot_settings.html
@@ -123,4 +123,5 @@
       </div>
     </div>
   </div> <!-- panel-body -->
-</div> <!-- panel -->
\ No newline at end of file
+</div> <!-- panel -->
+