Jelajahi Sumber

HUE-7949 [dashboard] Swap edit and move dimension

Enrico Berti 7 tahun lalu
induk
melakukan
f910748

File diff ditekan karena terlalu besar
+ 0 - 0
desktop/libs/dashboard/src/dashboard/static/dashboard/css/common_dashboard.css


+ 4 - 1
desktop/libs/dashboard/src/dashboard/static/dashboard/less/common_dashboard.less

@@ -530,12 +530,15 @@
         color: @cui-gray-700;
         color: @cui-gray-700;
       }
       }
     }
     }
+    .move-dimension {
+      cursor: move;
+    }
     &:hover {
     &:hover {
       .action-icon {
       .action-icon {
         opacity: 1;
         opacity: 1;
       }
       }
       .dimensions-badge-container {
       .dimensions-badge-container {
-        cursor: move;
+        cursor: pointer;
         border-color: @cui-gray-200;
         border-color: @cui-gray-200;
         &.is-editing {
         &.is-editing {
           border-color: @cui-blue-700;
           border-color: @cui-blue-700;

+ 3 - 3
desktop/libs/dashboard/src/dashboard/templates/common_search.mako

@@ -600,14 +600,14 @@ ${ dashboard.layout_skeleton(suffix='search') }
 
 
   <!-- ko if: !$parents[1].isLoading() || widgetType() == 'hit-widget' -->
   <!-- ko if: !$parents[1].isLoading() || widgetType() == 'hit-widget' -->
   <div class="edit-dimensions">
   <div class="edit-dimensions">
-    <div data-bind="sortable: { data: properties.facets, allowDrop: false, options: { axis: 'x', containment: 'parent'}}" class="inline-block">
-      <div class="badge dimensions-badge-container" data-bind="css: { 'is-editing': isEditing }">
+    <div data-bind="sortable: { data: properties.facets, allowDrop: false, options: { axis: 'x', containment: 'parent', handle: '.move-dimension'}}" class="inline-block">
+      <div class="badge dimensions-badge-container" data-bind="css: { 'is-editing': isEditing }, click: function(){ $parent.isAdding(false); $parent.properties.facets().forEach(function(f){ f.isEditing(false); }); isEditing(true); }">
         <span data-bind="text: getPrettyMetric($data)"></span>
         <span data-bind="text: getPrettyMetric($data)"></span>
         <span class="badge badge-info dimensions-badge" data-bind="text: field, attr: {'title': field}"></span>
         <span class="badge badge-info dimensions-badge" data-bind="text: field, attr: {'title': field}"></span>
         <!-- ko if: aggregate.function() != 'field' && aggregate.metrics && $parent.widgetType() != 'hit-widget' -->
         <!-- ko if: aggregate.function() != 'field' && aggregate.metrics && $parent.widgetType() != 'hit-widget' -->
           <i class="fa" data-bind="css: { 'fa-long-arrow-down': sort() == 'desc', 'fa-long-arrow-up': sort() == 'asc' }"></i>
           <i class="fa" data-bind="css: { 'fa-long-arrow-down': sort() == 'desc', 'fa-long-arrow-up': sort() == 'asc' }"></i>
         <!-- /ko -->
         <!-- /ko -->
-        <div class="action-icon margin-left-5" data-bind="click: function(){ $parent.isAdding(false); $parent.properties.facets().forEach(function(f){ f.isEditing(false); }); isEditing(true); }"><i class="fa fa-pencil"></i></div>
+        <div class="action-icon margin-left-5 move-dimension"><i class="fa fa-bars"></i></div>
         <!-- ko if: isEditing -->
         <!-- ko if: isEditing -->
         <div class="metric-form" data-bind="template: { name: 'metric-form' }"></div>
         <div class="metric-form" data-bind="template: { name: 'metric-form' }"></div>
         <!-- /ko -->
         <!-- /ko -->

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini