From d32f55d666c8ebbaa7ee14f3bc6f6aae0a2ce633 Mon Sep 17 00:00:00 2001
From: wangzhibo <wangzhibo@shsening.com>
Date: 星期三, 08 九月 2021 09:42:21 +0800
Subject: [PATCH] change compass position
---
widgets/toolBarRight/view.html | 23 -------
widgets/toolBarRight/widget.js | 7 +-
widgetsTS/logoAndMenu/widget.js | 112 ------------------------------------
config/widget.json | 4
config/config.json | 3
5 files changed, 9 insertions(+), 140 deletions(-)
diff --git a/config/config.json b/config/config.json
index ba8f6cd..e42e324 100644
--- a/config/config.json
+++ b/config/config.json
@@ -47,10 +47,9 @@
"geocoder": false,
"geocoderConfig": { "key": ["ae29a37307840c7ae4a785ac905927e0"] },
"selectionIndicator": false,
-
"defaultContextMenu": true,
"mouseDownView": true,
- "compass": { "bottom": "240px", "right": "5px" },
+ "compass": { "top": "10px", "right": "5px" },
"distanceLegend": { "left": "100px", "bottom": "2px" },
"locationBar": {
"fps": false,
diff --git a/config/widget.json b/config/widget.json
index 3875d55..1bb090c 100644
--- a/config/widget.json
+++ b/config/widget.json
@@ -29,9 +29,9 @@
"name": "鍙充笂瑙掑伐鍏锋爮",
"uri": "widgets/toolBarRight/widget.js",
"css": {
- "top": "10px",
+ "top": "15px",
"left": "auto",
- "right": "10px"
+ "right": "80px"
}
},
{
diff --git a/widgets/toolBarRight/view.html b/widgets/toolBarRight/view.html
index cc5e76b..43fe80e 100644
--- a/widgets/toolBarRight/view.html
+++ b/widgets/toolBarRight/view.html
@@ -1,24 +1,3 @@
-<!-- 2017-12-5 14:50:08 | 淇敼 鏈ㄩ仴锛堝井淇�: http://marsgis.cn/weixin.html 锛� -->
<div class="toolBarRight animation-slide-top no-print-view">
- <!--<button type="button" class="widget-btn btn btn-link toolBarRight-btn " onclick="mars3d.widget.disableAll()">
- <i class="fa fa-globe"></i>婕父
- </button>
-
- <button type="button" class="widget-btn btn btn-link toolBarRight-btn " data-widget="widgets/manageBasemaps/widget.js">
- <i class="fa fa-map"></i>鍦板浘
- </button>
- <button type="button" class="widget-btn btn btn-link toolBarRight-btn " data-widget="widgets/measure/widget.js">
- <i class="fa fa-share-alt"></i>娴嬮噺
- </button>
-
- <div class="btn-group">
- <button type="button" class="btn btn-link toolBarRight-btn dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
- <i class="fa fa-cubes"></i>宸ュ叿 <span class="caret"></span>
- </button>
- <ul class="dropdown-menu dropdown-menu-right" style="min-width: 110px;">
- <li class="widget-btn" data-widget="widgets/manageLayers/widget.js"><a href="javascript:void(0)"><i class="fa fa-tasks"></i>鍥惧眰鎺у埗</a></li>
- <li class="widget-btn" data-widget="widgets/addmarker/widget.js"><a href="javascript:void(0)"><i class="fa fa-edit"></i>鎴戠殑鏍囪</a></li>
-
- </ul>
- </div>-->
+
</div>
diff --git a/widgets/toolBarRight/widget.js b/widgets/toolBarRight/widget.js
index 3bff44a..de05ba9 100644
--- a/widgets/toolBarRight/widget.js
+++ b/widgets/toolBarRight/widget.js
@@ -15,17 +15,16 @@
create() {
//姝ゆ暟鎹篃鍙互鏀惧湪widget.json鐨勯厤缃腑锛屼絾鏄彂鐜板緢澶氫汉瀹规槗寮曡捣鍚屽悕璇В锛屾墍浠ヨ繕鏄斁鍦ㄨ繖閲�
this.data = this.config.data || [
- { name: "搴曞浘", icon: "fa fa-map", widget: "widgets/manageBasemaps/widget.js" },
- { name: "鍥惧眰", icon: "fa fa-tasks", widget: "widgets/manageLayers/widget.js" },
+ { name: "鐩戞祴涓氬姟", icon: "fa fa-tasks", widget: "widgets/manageLayers/widget.js" },
+ { name: "鍦板浘搴曞浘", icon: "fa fa-map", widget: "widgets/manageBasemaps/widget.js" },
{
- name: "宸ュ叿",
+ name: "鍦板浘宸ュ叿",
icon: "fa fa-cubes",
children: [
{ name: "鍥句笂閲忕畻", icon: "fa fa-calculator", widget: "widgets/measure/widget.js" },
{ name: "鍧愭爣瀹氫綅", icon: "fa fa-map-pin", widget: "widgets/centerXY/widget.js" },
{ name: "瑙嗚涔︾", icon: "fa fa-tags", widget: "widgets/bookmark/widget.js" },
{ name: "鍦板浘鎵撳嵃", icon: "fa fa-print", widget: "widgets/print/widget.js" },
-
{ name: "椋炶婕父", icon: "fa fa-send-o", widget: "widgets/roamLine/widget.js" },
{ name: "璺嚎瀵艰埅", icon: "fa fa-level-up", widget: "widgets/queryRoute/widget.js" }
diff --git a/widgetsTS/logoAndMenu/widget.js b/widgetsTS/logoAndMenu/widget.js
index 2994734..8a8b193 100644
--- a/widgetsTS/logoAndMenu/widget.js
+++ b/widgetsTS/logoAndMenu/widget.js
@@ -14,32 +14,7 @@
//鍒濆鍖朳浠呮墽琛�1娆
create() {
//姝ゆ暟鎹篃鍙互鏀惧湪widget.json鐨勯厤缃腑锛屼絾鏄彂鐜板緢澶氫汉瀹规槗寮曡捣鍚屽悕璇В锛屾墍浠ヨ繕鏄斁鍦ㄨ繖閲�
- this.data = this.config.data || [
- { name: "搴曞浘", icon: "fa fa-map", widget: "widgets/manageBasemaps/widget.js" },
- { name: "鍥惧眰", icon: "fa fa-tasks", widget: "widgets/manageLayers/widget.js" },
- {
- name: "宸ュ叿",
- icon: "fa fa-cubes",
- children: [
- { name: "鍥句笂閲忕畻", icon: "fa fa-calculator", widget: "widgets/measure/widget.js" },
- { name: "绌洪棿鍒嗘瀽", icon: "fa fa-bar-chart", widget: "widgets/analysis/widget.js" },
-
- { name: "鍧愭爣瀹氫綅", icon: "fa fa-map-pin", widget: "widgets/centerXY/widget.js" },
- { name: "鍦板尯瀵艰埅", icon: "fa fa-paper-plane", widget: "widgets/navXZQH/widget.js" },
- { name: "鎴戠殑鏍囪", icon: "fa fa-edit", widget: "widgets/addmarker/widget.js" },
- { name: "瑙嗚涔︾", icon: "fa fa-tags", widget: "widgets/bookmark/widget.js" },
- { name: "鍦板浘鎵撳嵃", icon: "fa fa-print", widget: "widgets/print/widget.js" },
-
- { name: "鍥句笂鏍囩粯", icon: "fa fa-object-group", widget: "widgets/plot/widget.js" },
- { name: "椋炶婕父", icon: "fa fa-send-o", widget: "widgets/roamLine/widget.js" },
- { name: "璺嚎瀵艰埅", icon: "fa fa-level-up", widget: "widgets/queryRoute/widget.js" },
-
- { name: "鍗峰笜瀵规瘮", icon: "fa fa-columns", widget: "widgets/mapSplit/widget.js" },
- { name: "鍒嗗睆瀵规瘮", icon: "fa fa-window-restore", widget: "widgets/mapCompare/widget.js" },
- { name: "鐧惧害琛楁櫙", icon: "fa fa-street-view", widget: "widgets/streetscape/widget.js" },
- ],
- },
- ];
+
}
//姣忎釜绐楀彛鍒涘缓瀹屾垚鍚庤皟鐢�
@@ -48,91 +23,8 @@
return;
}
- var arr = this.data;
-
- //绉诲姩璁惧涓婏紝澶勭悊涓嬭彍鍗曞眰娆�
- if (!haoutil.system.isPCBroswer() && arr.length == 3 && arr[0].children) {
- var item1 = arr.shift();
- var item2 = arr.shift();
- arr[0].children.insert(item2, 0);
- arr[0].children.insert(item1, 0);
- }
-
- this.initMenu(arr);
}
- //鏋勯�� 鑿滃崟
- initMenu(arr) {
- var widgetObj = {};
-
- var inhtml = "";
- for (var i = 0, len = arr.length; i < len; i++) {
- var item = arr[i];
- if (item.hasOwnProperty("visible") && !item.visible) {
- continue;
- }
- if (item.children) {
- //鍒嗙粍
-
- inhtml += `<div class="btn-group">
- <button type="button" class="btn btn-link toolBarRight-btn dropdown-toggle" data-toggle="dropdown" aria-expanded="false" >
- <i class="${item.icon}"></i>${item.name}<span class="caret"></span>
- </button>
- <ul class="dropdown-menu dropdown-menu-right toolBarRight-dropdown-menu" >`;
-
- for (let j = 0, jlen = item.children.length; j < jlen; j++) {
- let children_item = item.children[j];
- if (children_item.hasOwnProperty("visible") && !children_item.visible) {
- continue;
- }
-
- let ex = "";
- if (children_item.onclick) {
- ex = 'onclick="' + children_item.onclick + '"';
- } else if (children_item.widget) {
- ex = 'data-widget="' + children_item.widget + '"';
- }
-
- inhtml += `<li class="widget-btn" ${ex} >
- <a href="javascript:void(0)"><i class="${children_item.icon}"></i>${children_item.name}</a>
- </li>`;
- widgetObj[children_item.widget] = children_item;
- }
- inhtml += " </ul></div>";
- } else {
- //涓嶆槸鍒嗙粍
- let ex = "";
- if (item.onclick) {
- ex = 'onclick="' + item.onclick + '"';
- } else if (item.widget) {
- ex = 'data-widget="' + item.widget + '"';
- }
-
- inhtml += `<button type="button" class="widget-btn btn btn-link toolBarRight-btn " ${ex} >\
- <i class="${item.icon}"></i>${item.name}
- </button>`;
- widgetObj[item.widget] = item;
- }
- }
- $(".toolBarRight").html(inhtml);
-
- $(".toolBarRight .widget-btn").click(function () {
- var uri = $(this).attr("data-widget");
- if (haoutil.isutil.isNull(uri)) {
- return;
- }
- // console.log('鍗曞嚮浜嗗伐鍏锋爮锛�' + uri);
-
- if (mars3d.widget.isActivate(uri)) {
- mars3d.widget.disable(uri);
- } else {
- var opt = {
- ...(widgetObj[uri] || {}),
- uri: uri,
- };
- mars3d.widget.activate(opt);
- }
- });
- }
+
//婵�娲绘彃浠�
activate() {}
//閲婃斁鎻掍欢
--
Gitblit v1.9.1