From 89da62649161571834d3f8df7ce36f9967e6ba04 Mon Sep 17 00:00:00 2001
From: wangzhibo <wangzhibo@shsening.com>
Date: 星期二, 07 九月 2021 14:04:31 +0800
Subject: [PATCH] change cesium version

---
 widgets/bookmark/view.js |  162 ++++++++++++++++++++++++++---------------------------
 1 files changed, 80 insertions(+), 82 deletions(-)

diff --git a/widgets/bookmark/view.js b/widgets/bookmark/view.js
index d397af0..1c3427c 100644
--- a/widgets/bookmark/view.js
+++ b/widgets/bookmark/view.js
@@ -1,130 +1,128 @@
-锘�'use script' //寮�鍙戠幆澧冨缓璁紑鍚弗鏍兼ā寮�
+锘�"use script"; //寮�鍙戠幆澧冨缓璁紑鍚弗鏍兼ā寮�
 
 //瀵瑰簲widget.js涓璏yWidget瀹炰緥鍖栧悗鐨勫璞�
-var thisWidget
-var $table
+var thisWidget;
+var $table;
 
 function getHeight() {
-  return $(window).height() - 50
+  return $(window).height() - 50;
 }
 
 //褰撳墠椤甸潰涓氬姟
 function initWidgetView(_thisWidget) {
-  thisWidget = _thisWidget
+  thisWidget = _thisWidget;
 
+  $("#btn_bookmark_Add").bind("click", function () {
+    saveBookmark();
+  });
 
-  $('#btn_bookmark_Add').bind('click', function () {
-    saveBookmark()
-  })
-
-  $table = $('#table')
+  $table = $("#table");
   $table.bootstrapTable({
     height: getHeight(),
     singleSelect: true, //鍗曢��
     pagination: false,
     pageSize: 6,
-    iconsPrefix: 'fa',
+    iconsPrefix: "fa",
     showHeader: false,
     columns: [
       {
-        title: '',
+        title: "",
         sortable: true,
         editable: false,
-        align: 'center',
+        align: "center",
         events: {
-          'click .remove': function (e, value, row, index) {
-            delBookMark(row.id)
+          "click .remove": function (e, value, row, index) {
+            delBookMark(row.id);
           },
         },
         formatter: function (value, row, index) {
           return `<div class="bookmarkitem" title="${row.name}">
                       <img src="${row.icon}" style="width:100%;" />
                       <div class="title">
-                          ${row.name}
+                          <p>${row.name}</p>
                           <a class="remove" href="javascript:void(0)" title="鍒犻櫎"><i class="fa fa-trash"></i></a>
                         </div>
-                  </div>`
+                  </div>`;
         },
       },
     ],
     onClickRow: function (rowData, $element, field) {
-      var location = rowData.data
-      thisWidget.showExtent(location)
+      var location = rowData.data;
+      thisWidget.showExtent(location);
     },
-  })
+  });
   $(window).resize(function () {
-    $table.bootstrapTable('refreshOptions', {
+    $table.bootstrapTable("refreshOptions", {
       height: getHeight(),
-    })
-  })
+    });
+  });
 
   //璇诲彇localStorage
-  initBookMarkList()
+  initBookMarkList();
 }
 
-var storageName = 'mars3d_bookmark'
-var arrBookmark = []
+var storageName = "mars3d_bookmark";
+var arrBookmark = [];
 
 function initBookMarkList() {
   if (window.parent.hasServer) {
     //鍚庡彴鎺ュ彛
     parent.sendAjax({
-      url: 'v1/map/bookmark/list',
-      type: 'get',
-      dataType: 'json',
-      contentType: 'application/x-www-form-urlencoded',
+      url: "v1/map/bookmark/list",
+      type: "get",
+      dataType: "json",
+      contentType: "application/x-www-form-urlencoded",
       success: function (result) {
-        var arr = []
+        var arr = [];
         for (var i = 0; i < result.length; i++) {
-          var itme = result[i]
+          var itme = result[i];
           if (!itme) {
-            continue
+            continue;
           }
           arr.push({
             name: itme.name,
             data: JSON.parse(itme.center),
             id: itme.id,
-          })
+          });
         }
-        arrBookmark = arr
-        showListData(arrBookmark)
+        arrBookmark = arr;
+        showListData(arrBookmark);
       },
       error: function (XMLHttpRequest, textStatus, errorThrown) {
-        alert('鏈嶅姟鍑洪敊锛�' + XMLHttpRequest.statusText + '锛屼唬鐮� ' + XMLHttpRequest.status)
+        alert("鏈嶅姟鍑洪敊锛�" + XMLHttpRequest.statusText + "锛屼唬鐮� " + XMLHttpRequest.status);
       },
-    })
+    });
   } else {
-    var lastcookie = haoutil.storage.get(storageName) //璇诲彇localStorage鍊�
-    if (lastcookie != null) {
-      arrBookmark = eval(lastcookie)
-    }
-    if (arrBookmark == null || arrBookmark.length == 0) {
-      arrBookmark = []
-    }
-    showListData(arrBookmark)
+    localforage.getItem(storageName).then((arrBookmark) => {
+      if (arrBookmark == null) {
+        arrBookmark = [];
+      }
+      showListData(arrBookmark);
+    });
   }
 }
 
 //娣诲姞
 function saveBookmark() {
   if (arrBookmark == null) {
-    arrBookmark = []
+    arrBookmark = [];
   }
 
-  var name = $.trim($('#txt_bookmark_name').val()).replace("'", '').replace('"', '')
+  var name = $.trim($("#txt_bookmark_name").val()).replace("'", "").replace('"', "");
   if (name.length == 0) {
-    toastr.warning('璇疯緭鍏ュ悕绉�')
-    return
+    toastr.warning("璇疯緭鍏ュ悕绉�");
+    return;
   }
   for (var index = arrBookmark.length - 1; index >= 0; index--) {
     if (arrBookmark[index].name == name) {
-      toastr.info('璇ュ悕绉板凡瀛樺湪锛岃鏇存崲锛�')
-      return
+      toastr.info("璇ュ悕绉板凡瀛樺湪锛岃鏇存崲锛�");
+      return;
     }
   }
 
   thisWidget.getThisExtent(function (bounds, base64) {
-    arrBookmark.insert(
+    haoutil.array.insert(
+      arrBookmark,
       {
         name: name,
         data: bounds,
@@ -132,67 +130,67 @@
         id: new Date().getTime(),
       },
       0
-    )
+    );
 
     if (window.parent.hasServer) {
       //鍚庡彴淇濆瓨鎺ュ彛
       parent.sendAjax({
-        url: 'v1/map/bookmark/add',
+        url: "v1/map/bookmark/add",
         data: JSON.stringify({
           name: name, //鍚嶇О
           center: JSON.stringify(bounds), //涓績
         }),
-        type: 'post',
-        dataType: 'json',
-        contentType: 'application/json',
+        type: "post",
+        dataType: "json",
+        contentType: "application/json",
         success: function (result) {
-          $('#txt_bookmark_name').val('')
-          initBookMarkList()
+          $("#txt_bookmark_name").val("");
+          initBookMarkList();
         },
-      })
+      });
     } else {
       //鏈湴瀛樺偍
-      var lastcookie = JSON.stringify(arrBookmark)
-      haoutil.storage.add(storageName, lastcookie)
-      $('#txt_bookmark_name').val('')
-      initBookMarkList()
+      localforage.setItem(storageName, arrBookmark).then((value) => {
+        $("#txt_bookmark_name").val("");
+        initBookMarkList();
+      })
     }
-  })
+  });
 }
 
 function delBookMark(id) {
   if (window.parent.hasServer) {
     //鍚庡彴 鍒犻櫎
     parent.sendAjax({
-      url: 'v1/map/bookmark/' + id,
-      type: 'delete',
-      dataType: 'json',
-      contentType: 'application/json',
+      url: "v1/map/bookmark/" + id,
+      type: "delete",
+      dataType: "json",
+      contentType: "application/json",
       success: function (result) {
         for (var index = arrBookmark.length - 1; index >= 0; index--) {
           if (arrBookmark[index].id == id) {
-            arrBookmark.splice(index, 1)
-            showListData(arrBookmark)
-            break
+            arrBookmark.splice(index, 1);
+            showListData(arrBookmark);
+            break;
           }
         }
       },
-    })
+    });
   } else {
     for (var index = arrBookmark.length - 1; index >= 0; index--) {
       if (arrBookmark[index].id == id) {
-        arrBookmark.splice(index, 1)
-        var lastcookie = JSON.stringify(arrBookmark)
-        haoutil.storage.add(storageName, lastcookie)
-        showListData(arrBookmark)
-        break
+        arrBookmark.splice(index, 1);
+
+        localforage.setItem(storageName, arrBookmark);
+        showListData(arrBookmark);
+        break;
       }
     }
   }
 }
 
 function showListData(arr) {
-  var positon = $table.bootstrapTable('getScrollPosition')
-  $table.bootstrapTable('load', arr)
-  $table.bootstrapTable('scrollTo', positon)
+  var positon = $table.bootstrapTable("getScrollPosition");
+  $table.bootstrapTable("load", arr);
+  $table.bootstrapTable("scrollTo", positon);
 }

--
Gitblit v1.9.1