浏览代码

HUE-7491 [fb] Newly uploaded file via the Upload button does not get the blue selection anymore

Enrico Berti 8 年之前
父节点
当前提交
c0b5496

文件差异内容过多而无法显示
+ 0 - 0
apps/filebrowser/src/filebrowser/static/filebrowser/css/listdir_components.css


+ 3 - 3
apps/filebrowser/src/filebrowser/static/filebrowser/less/listdir_components.less

@@ -199,15 +199,15 @@
 }
 
 .row-selected {
-  background-color: @cui-gray-100;
+  background-color: @cui-gray-100!important;
 }
 
 .row-highlighted {
-  background-color: @cui-blue-050;
+  background-color: @cui-blue-050!important;
 }
 
 .row-deleted {
-  background-color: @cui-pink-050;
+  background-color: @cui-pink-050!important;
 }
 
 .context-menu {

+ 22 - 6
apps/filebrowser/src/filebrowser/templates/listdir_components.mako

@@ -1622,7 +1622,24 @@ from filebrowser.conf import ENABLE_EXTRACT_UPLOADED_ARCHIVE
           dataType:  'json',
           success: function() {
             $("#deleteModal").modal('hide');
-            self.retrieveData(true);
+            window.setTimeout(function () {
+              $(self.selectedFiles()).each(function (index, file) {
+                file.deleted(true);
+              });
+              var $scrollable = $(window);
+              %if is_embeddable:
+                $scrollable = $('.page-content');
+              %endif
+              if ($('.row-deleted').length > 0 && $('.row-deleted:eq(0)').offset()) {
+                $scrollable.scrollTop($('.row-deleted:eq(0)').offset().top - 150);
+              }
+            }, 500);
+            window.setTimeout(function () {
+              $(self.selectedFiles()).each(function (index, file) {
+                self.files.remove(file);
+              });
+              self.retrieveData(true);
+            }, 1000);
           },
           error: function(xhr, textStatus, errorThrown) {
             $(document).trigger("error", xhr.responseText);
@@ -2267,12 +2284,11 @@ from filebrowser.conf import ENABLE_EXTRACT_UPLOADED_ARCHIVE
         $("#newRepFactorInput").removeClass("fieldError");
       });
 
-      viewModel.currentPath.subscribe(function (path) {
-        if (!path) return;
-        huePubSub.subscribe('assist.' + viewModel.fs() + '.refresh', function () {
+      huePubSub.subscribe('fb.' + viewModel.fs() + '.refresh', function (path) {
+        if (path === viewModel.currentPath()) {
           viewModel.retrieveData();
-        });
-      });
+        }
+      }, 'filebrowser');
 
       huePubSub.subscribe('update.autocompleters', function(){
         $("#moveDestination").jHueHdfsAutocomplete({

+ 1 - 1
desktop/core/src/desktop/templates/assist.mako

@@ -459,7 +459,7 @@ from notebook.conf import ENABLE_QUERY_BUILDER, ENABLE_QUERY_SCHEDULING, get_ord
             params: { dest: path },
             paramName: 'hdfs_file',
             onError: function(x, e){ $(document).trigger('error', e); },
-            onComplete: function () { huePubSub.publish('assist.hdfs.refresh'); } }" title="${_('Upload file')}" href="javascript:void(0)">
+            onComplete: function () { huePubSub.publish('assist.hdfs.refresh'); huePubSub.publish('fb.hdfs.refresh', path); } }" title="${_('Upload file')}" href="javascript:void(0)">
         <div class="dz-message inline" data-dz-message><i class="pointer fa fa-plus" title="${_('Upload file')}"></i></div>
       </a>
       <a class="inactive-action" href="javascript:void(0)" data-bind="click: function () { huePubSub.publish('assist.hdfs.refresh'); }" title="${_('Manual refresh')}"><i class="pointer fa fa-refresh" data-bind="css: { 'fa-spin blue' : loading }"></i></a>

部分文件因为文件数量过多而无法显示