jqh 4 years ago
parent
commit
4f962c7a9f

+ 1 - 0
resources/assets/dcat/extra/action.js

@@ -94,6 +94,7 @@
                 Object.assign(data, {
                     _action: options.calledClass,
                     _key: options.key,
+                    _token: Dcat.token,
                 });
 
                 Dcat.NP.start();

File diff suppressed because it is too large
+ 0 - 0
resources/dist/adminlte/adminlte-blue-light.css


File diff suppressed because it is too large
+ 0 - 0
resources/dist/adminlte/adminlte-blue.css


File diff suppressed because it is too large
+ 0 - 0
resources/dist/adminlte/adminlte-green.css


File diff suppressed because it is too large
+ 0 - 0
resources/dist/adminlte/adminlte.css


File diff suppressed because it is too large
+ 0 - 0
resources/dist/adminlte/adminlte.js


File diff suppressed because it is too large
+ 0 - 0
resources/dist/adminlte/adminlte.js.map


File diff suppressed because it is too large
+ 0 - 0
resources/dist/dcat/css/dcat-app-blue-light.css


File diff suppressed because it is too large
+ 0 - 0
resources/dist/dcat/css/dcat-app-blue.css


File diff suppressed because it is too large
+ 0 - 0
resources/dist/dcat/css/dcat-app-green.css


File diff suppressed because it is too large
+ 0 - 0
resources/dist/dcat/css/dcat-app.css


File diff suppressed because it is too large
+ 0 - 0
resources/dist/dcat/extra/action.js


File diff suppressed because it is too large
+ 0 - 0
resources/dist/dcat/extra/action.js.map


File diff suppressed because it is too large
+ 0 - 0
resources/dist/dcat/extra/grid-extend.js


File diff suppressed because it is too large
+ 0 - 0
resources/dist/dcat/extra/select-table.js.map


File diff suppressed because it is too large
+ 0 - 0
resources/dist/dcat/extra/upload.js


File diff suppressed because it is too large
+ 0 - 0
resources/dist/dcat/extra/upload.js.map


File diff suppressed because it is too large
+ 0 - 0
resources/dist/dcat/js/dcat-app.js


File diff suppressed because it is too large
+ 0 - 0
resources/dist/dcat/js/dcat-app.js.map


+ 3 - 1
src/Grid/Column/Condition.php

@@ -72,7 +72,9 @@ class Condition
 
     public function end()
     {
-        return $this->column;
+        return $this->if(function () {
+            return true;
+        });
     }
 
     protected function callCallbacks(array $callbacks)

Some files were not shown because too many files changed in this diff