Browse Source

更改$.get为$.ajax

jqh 5 years ago
parent
commit
38774fc646

+ 0 - 1
src/Extension/Grid/ImportButton.php

@@ -36,7 +36,6 @@ $('.import-extension').on('click', function () {
     if (req) return;
     
     Dcat.confirm("{$text}", '', function () {
-        var url = '$url';
         req = 1;
         
         Dcat.loading();

+ 8 - 5
src/Form/Field/Select.php

@@ -102,11 +102,13 @@ class Select extends Field
             $class = $field;
         }
 
+        $sourceUrl = admin_url($sourceUrl);
+
         $script = <<<JS
 $(document).off('change', "{$this->getElementClassSelector()}");
 $(document).on('change', "{$this->getElementClassSelector()}", function () {
     var target = $(this).closest('.fields-group').find(".$class");
-    $.get("$sourceUrl?q="+this.value, function (data) {
+    $.ajax("$sourceUrl?q="+this.value).then(function (data) {
         target.find("option").remove();
         $(target).select2({
             data: $.map(data, function (d) {
@@ -143,7 +145,7 @@ var fields = '$fieldsStr'.split('.');
 var urls = '$urlsStr'.split('^');
 
 var refreshOptions = function(url, target) {
-    $.get(url).then(function(data) {
+    $.ajax(url).then(function(data) {
         target.find("option").remove();
         $(target).select2({
             data: $.map(data, function (d) {
@@ -228,7 +230,7 @@ JS;
     protected function loadRemoteOptions($url, $parameters = [], $options = [])
     {
         $ajaxOptions = [
-            'url' => $url.'?'.http_build_query($parameters),
+            'url' => admin_url($url.'?'.http_build_query($parameters)),
         ];
         $configs = array_merge([
             'allowClear'  => true,
@@ -244,8 +246,7 @@ JS;
         $ajaxOptions = json_encode(array_merge($ajaxOptions, $options));
 
         $this->script = <<<JS
-
-$.ajax($ajaxOptions).done(function(data) {
+$.ajax({$ajaxOptions}).done(function(data) {
 
   var select = $("{$this->getElementClassSelector()}");
 
@@ -287,6 +288,8 @@ JS;
         $configs = json_encode($configs);
         $configs = substr($configs, 1, strlen($configs) - 2);
 
+        $url = admin_url($url);
+
         $this->script = <<<JS
 
 $("{$this->getElementClassSelector()}").select2({

+ 4 - 4
src/Grid/Displayers/DialogTree.php

@@ -187,13 +187,13 @@ EOF;
             <<<JS
 $('.{$this->getSelectorPrefix()}-open-tree').off('click').on('click', function () {
     var tpl = '<div class="jstree-wrapper p-1" style="border:0"><div class="da-tree" style="margin-top:10px"></div></div>', 
-        opts = $opts,
         url = '{$this->url}',
         t = $(this),
         val = t.data('val'),
         ckall = t.data('checked'),
         idx,
-        requesting;
+        requesting,
+        opts = $opts;
 
     val = val ? String(val).split(',') : [];
         
@@ -202,7 +202,7 @@ $('.{$this->getSelectorPrefix()}-open-tree').off('click').on('click', function (
         requesting = 1;
         
         t.buttonLoading();
-        $.getJSON(url, {_token: Dcat.token, value: val}, function (resp) {
+        $.ajax(url, {data: {value: val}}).then(function (resp) {
              requesting = 0;
              t.buttonLoading(false);
              
@@ -221,7 +221,7 @@ $('.{$this->getSelectorPrefix()}-open-tree').off('click').on('click', function (
     
         idx = layer.open({
             type: 1,
-            area: $area,
+            area: {$area},
             content: tpl,
             title: '{$title}',
             success: function (a, idx) {

+ 3 - 3
src/Grid/Filter/Presenter/MultipleSelect.php

@@ -21,13 +21,13 @@ class MultipleSelect extends Select
         $column = $this->filter->column();
 
         $script = <<<JS
-
 $(document).on('change', ".{$this->getClass($column)}", function () {
     var target = $(this).closest('form').find(".{$this->getClass($target)}");
-     var ids = $(this).find("option:selected").map(function(index,elem) {
+    var ids = $(this).find("option:selected").map(function(index,elem) {
             return $(elem).val();
         }).get().join(',');
-    $.get("$resourceUrl?q="+ids, function (data) {
+     
+    $.ajax("$resourceUrl?q="+ids).then(function (data) {
         target.find("option").remove();
         $.each(data, function (i, item) {
             $(target).append($('<option>', {

+ 1 - 1
src/Grid/Filter/Presenter/Select.php

@@ -305,7 +305,7 @@ JS;
 $(document).off('change', ".{$class}");
 $(document).on('change', ".{$class}", function () {
     var target = $(this).closest('form').find(".{$this->getClass($target)}");
-    $.get("$resourceUrl?q="+this.value, function (data) {
+    $.ajax("$resourceUrl?q="+this.value).then(function (data) {
         target.find("option").remove();
         $.each(data, function (i, item) {
             $(target).append($('<option>', {