resource selector

update

resources/assets/dcat/extra/resource-selector.js

@@ -64,9 +64,11 @@
                 title: options.title,
                 shadeClose: true,
                 maxmin: false,
+                resize: false,
                 shade: false,
+                scrollbar: false,
                 skin: 'select-resource',
-                area: format_area(options.area),
+                area: formatArea(options.area),
                 content: options.source + '?_mini=1',
                 btn: options.showCloseButton ? [options.closeButtonText] : null,
                 success: function (layero) {
@@ -82,7 +84,7 @@
                 },
                 cancel: function () {
                     $layerWin.hide();
-                    
+
                     return false;
                 }
             });
@@ -204,7 +206,6 @@
         }
 
         function unchecked($ckb) {
-            $ckb.parents('tr').css('background-color', 'transparent');
             $ckb.prop('checked', false);
         }
 
@@ -242,7 +243,7 @@
             renderTags(originalItems);
         }
 
-        function format_area(area) {
+        function formatArea(area) {
             if (w.screen.width <= 750) {
                 return ['100%', '100%'];
             }

resources/assets/dcat/js/dcat-app.js

@@ -90,13 +90,15 @@ function listen(Dcat) {
         // 滚动条优化
         new PerfectScrollbar('html');
 
+        // layer弹窗设置
+        layer.config({maxmin: true, moveOut: true, shade: false});
+
+        //////////////////////////////////////////////////////////
+
         // 菜单点击选中效果
         new Menu(Dcat);
         // 返回顶部按钮
         new Footer(Dcat);
-
-        // layer弹窗设置
-        layer.config({maxmin: true, moveOut: true, shade: false});
     });
 
     // 每个请求都初始化

resources/assets/js/core/app.js

@@ -31,18 +31,18 @@
       $html.removeClass("loading").addClass("loaded");
     }, 1200);
 
-    $.app.menu.init(compactMenu);
+    $.app && $.app.menu.init(compactMenu);
 
     // Navigation configurations
     var config = {
       speed: 300 // set speed to expand / collpase menu
     };
-    if ($.app.nav.initialized === false) {
+    if ($.app && $.app.nav.initialized === false) {
       $.app.nav.init(config);
     }
 
     Unison.on("change", function (bp) {
-      $.app.menu.change();
+      $.app && $.app.menu.change();
     });
 
     // Tooltip Initialization
@@ -447,7 +447,7 @@
 
   // Update manual scroller when window is resized
   $(window).resize(function () {
-    $.app.menu.manualScroller.updateHeight();
+    $.app && $.app.menu.manualScroller.updateHeight();
   });
 
   $("#sidebar-page-navigation").on("click", "a.nav-link", function (e) {

resources/dist/dcat/extra/resource-selector.js

@@ -64,9 +64,11 @@
                 title: options.title,
                 shadeClose: true,
                 maxmin: false,
+                resize: false,
                 shade: false,
+                scrollbar: false,
                 skin: 'select-resource',
-                area: format_area(options.area),
+                area: formatArea(options.area),
                 content: options.source + '?_mini=1',
                 btn: options.showCloseButton ? [options.closeButtonText] : null,
                 success: function (layero) {
@@ -82,7 +84,7 @@
                 },
                 cancel: function () {
                     $layerWin.hide();
-                    
+
                     return false;
                 }
             });
@@ -204,7 +206,6 @@
         }
 
         function unchecked($ckb) {
-            $ckb.parents('tr').css('background-color', 'transparent');
             $ckb.prop('checked', false);
         }
 
@@ -242,7 +243,7 @@
             renderTags(originalItems);
         }
 
-        function format_area(area) {
+        function formatArea(area) {
             if (w.screen.width <= 750) {
                 return ['100%', '100%'];
             }

resources/dist/dcat/js/dcat-app.js

@@ -740,17 +740,18 @@ function listen(Dcat) {
       parent: '.app-content'
     }); // 滚动条优化
 
-    new PerfectScrollbar('html'); // 菜单点击选中效果
-
-    new _bootstrappers_Menu__WEBPACK_IMPORTED_MODULE_14__["default"](Dcat); // 返回顶部按钮
-
-    new _bootstrappers_Footer__WEBPACK_IMPORTED_MODULE_15__["default"](Dcat); // layer弹窗设置
+    new PerfectScrollbar('html'); // layer弹窗设置
 
     layer.config({
       maxmin: true,
       moveOut: true,
       shade: false
-    });
+    }); //////////////////////////////////////////////////////////
+    // 菜单点击选中效果
+
+    new _bootstrappers_Menu__WEBPACK_IMPORTED_MODULE_14__["default"](Dcat); // 返回顶部按钮
+
+    new _bootstrappers_Footer__WEBPACK_IMPORTED_MODULE_15__["default"](Dcat);
   }); // 每个请求都初始化
 
   Dcat.bootingEveryRequest(function () {

resources/dist/js/core/app.js

@@ -124,19 +124,19 @@
     setTimeout(function () {
       $html.removeClass("loading").addClass("loaded");
     }, 1200);
-    $.app.menu.init(compactMenu); // Navigation configurations
+    $.app && $.app.menu.init(compactMenu); // Navigation configurations
 
     var config = {
       speed: 300 // set speed to expand / collpase menu
 
     };
 
-    if ($.app.nav.initialized === false) {
+    if ($.app && $.app.nav.initialized === false) {
       $.app.nav.init(config);
     }
 
     Unison.on("change", function (bp) {
-      $.app.menu.change();
+      $.app && $.app.menu.change();
     }); // Tooltip Initialization
 
     $('[data-toggle="tooltip"]').tooltip({
@@ -480,7 +480,7 @@
   }); // Update manual scroller when window is resized
 
   $(window).resize(function () {
-    $.app.menu.manualScroller.updateHeight();
+    $.app && $.app.menu.manualScroller.updateHeight();
   });
   $("#sidebar-page-navigation").on("click", "a.nav-link", function (e) {
     e.preventDefault();

src/Grid/Tools/FilterButton.php

@@ -66,7 +66,7 @@ class FilterButton extends AbstractTool
             .find('.right-side-filter-container .header')
             .width(slider.\$container.width() - 20);
         
-        expand && setTimeout(slider.open, 10);
+        expand && setTimeout(slider.open.bind(slider), 10);
     }
     
     expand && setTimeout(initSlider, 10);

src/Layout/Assets.php

@@ -270,6 +270,10 @@ class Assets
             return;
         }
 
+        if ($this->usingFullPage) {
+            unset($this->baseJs['menu']);
+        }
+
         $this->js = array_merge($this->baseJs, $this->js);
     }