同步分支new-iearth-11到主版本-src

SuperMap · Nov 6, 2023 · 737bd95 · 737bd95
1 parent 09299f6
commit 737bd95
Show file tree

Hide file tree

Showing 66 changed files with 6,870 additions and 2,224 deletions.
diff --git a/SuperMap iEarth/index.html b/SuperMap iEarth/index.html
@@ -8,6 +8,11 @@
   <link href="/SuperMap3D/Widgets/widgets.css" rel="stylesheet">
   <script src="/SuperMap3D/SuperMap3D.js"></script>
   <script src="/Resource/js/heatmap.min.js"></script>
+
+  <!-- 引入二维地图库：iclient-leaflet -->
+  <script type="text/javascript" src="/Resource/js/leaflet/leaflet.js"></script>
+  <script type="text/javascript" src="/Resource/js/iclient-leaflet/iclient-leaflet.js"></script>
+
   <title>iEarth</title>
   <style>
     body {

diff --git a/SuperMap iEarth/src/App.vue b/SuperMap iEarth/src/App.vue
@@ -93,10 +93,11 @@ const overridesTheme = {
   overflow: visible;
 }
 .drawCur {
-  cursor: url(./images/cur/draw.cur), auto;
+  // cursor: url(./images/cur/draw.cur), auto;
+  cursor: url(../public/images/cur/draw.cur), auto;
 }
 
 .measureCur {
-  cursor: url(./images/cur/measure.cur), auto;
+  cursor: url(../public/images/cur/measure.cur), auto;
 }
 </style>
diff --git a/SuperMap iEarth/src/assets/fonts/OptimizationTitleBlack.TTF b/SuperMap iEarth/src/assets/fonts/OptimizationTitleBlack.TTF
diff --git a/SuperMap iEarth/src/assets/icons/demo_index.html b/SuperMap iEarth/src/assets/icons/demo_index.html
@@ -54,6 +54,24 @@ <h1 class="logo"><a href="https://www.iconfont.cn/" title="iconfont 首页" targ
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
 
+            <li class="dib">
+              <span class="icon iconfont">&#xe891;</span>
+                <div class="name">点选</div>
+                <div class="code-name">&amp;#xe891;</div>
+              </li>
+
+            <li class="dib">
+              <span class="icon iconfont">&#xe890;</span>
+                <div class="name">shp查询</div>
+                <div class="code-name">&amp;#xe890;</div>
+              </li>
+
+            <li class="dib">
+              <span class="icon iconfont">&#xe88f;</span>
+                <div class="name">地图查询</div>
+                <div class="code-name">&amp;#xe88f;</div>
+              </li>
+
             <li class="dib">
               <span class="icon iconfont">&#xe88c;</span>
                 <div class="name">空间距离</div>
@@ -738,9 +756,9 @@ <h3 id="-font-face">第一步：拷贝项目下面生成的 <code>@font-face</co
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1688638347789') format('woff2'),
-       url('iconfont.woff?t=1688638347789') format('woff'),
-       url('iconfont.ttf?t=1688638347789') format('truetype');
+  src: url('iconfont.woff2?t=1692946974504') format('woff2'),
+       url('iconfont.woff?t=1692946974504') format('woff'),
+       url('iconfont.ttf?t=1692946974504') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -766,6 +784,33 @@ <h3 id="-">第三步：挑选相应图标并获取字体编码，应用于页面
       <div class="content font-class">
         <ul class="icon_lists dib-box">
 
+          <li class="dib">
+            <span class="icon iconfont icondianxuan"></span>
+            <div class="name">
+              点选
+            </div>
+            <div class="code-name">.icondianxuan
+            </div>
+          </li>
+
+          <li class="dib">
+            <span class="icon iconfont iconshpchaxun"></span>
+            <div class="name">
+              shp查询
+            </div>
+            <div class="code-name">.iconshpchaxun
+            </div>
+          </li>
+
+          <li class="dib">
+            <span class="icon iconfont icondituchaxun"></span>
+            <div class="name">
+              地图查询
+            </div>
+            <div class="code-name">.icondituchaxun
+            </div>
+          </li>
+
           <li class="dib">
             <span class="icon iconfont iconkongjianjuli"></span>
             <div class="name">
@@ -1792,6 +1837,30 @@ <h3 id="-">第二步：挑选相应图标并获取类名，应用于页面：</h
       <div class="content symbol">
           <ul class="icon_lists dib-box">
 
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icondianxuan"></use>
+                </svg>
+                <div class="name">点选</div>
+                <div class="code-name">#icondianxuan</div>
+            </li>
+
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#iconshpchaxun"></use>
+                </svg>
+                <div class="name">shp查询</div>
+                <div class="code-name">#iconshpchaxun</div>
+            </li>
+
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icondituchaxun"></use>
+                </svg>
+                <div class="name">地图查询</div>
+                <div class="code-name">#icondituchaxun</div>
+            </li>
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#iconkongjianjuli"></use>

diff --git a/SuperMap iEarth/src/assets/icons/iconfont.css b/SuperMap iEarth/src/assets/icons/iconfont.css
@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2397568 */
-  src: url('iconfont.woff2?t=1688638347789') format('woff2'),
-       url('iconfont.woff?t=1688638347789') format('woff'),
-       url('iconfont.ttf?t=1688638347789') format('truetype');
+  src: url('iconfont.woff2?t=1692946974504') format('woff2'),
+       url('iconfont.woff?t=1692946974504') format('woff'),
+       url('iconfont.ttf?t=1692946974504') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,18 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icondianxuan:before {
+  content: "\e891";
+}
+
+.iconshpchaxun:before {
+  content: "\e890";
+}
+
+.icondituchaxun:before {
+  content: "\e88f";
+}
+
 .iconkongjianjuli:before {
   content: "\e88c";
 }

diff --git a/SuperMap iEarth/src/assets/icons/iconfont.js b/SuperMap iEarth/src/assets/icons/iconfont.js
diff --git a/SuperMap iEarth/src/assets/icons/iconfont.json b/SuperMap iEarth/src/assets/icons/iconfont.json
@@ -5,6 +5,27 @@
   "css_prefix_text": "icon",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "37097694",
+      "name": "点选",
+      "font_class": "dianxuan",
+      "unicode": "e891",
+      "unicode_decimal": 59537
+    },
+    {
+      "icon_id": "37093927",
+      "name": "shp查询",
+      "font_class": "shpchaxun",
+      "unicode": "e890",
+      "unicode_decimal": 59536
+    },
+    {
+      "icon_id": "37088950",
+      "name": "地图查询",
+      "font_class": "dituchaxun",
+      "unicode": "e88f",
+      "unicode_decimal": 59535
+    },
     {
       "icon_id": "36324060",
       "name": "空间距离",

diff --git a/SuperMap iEarth/src/assets/icons/iconfont.ttf b/SuperMap iEarth/src/assets/icons/iconfont.ttf
diff --git a/SuperMap iEarth/src/assets/icons/iconfont.woff b/SuperMap iEarth/src/assets/icons/iconfont.woff
diff --git a/SuperMap iEarth/src/assets/icons/iconfont.woff2 b/SuperMap iEarth/src/assets/icons/iconfont.woff2
diff --git a/SuperMap iEarth/src/enums/styleEnum.ts b/SuperMap iEarth/src/enums/styleEnum.ts
@@ -7,6 +7,7 @@ export enum ThemeEnum {
 // 语言
 export enum LangEnum {
   ZH = 'zh',
-  EN = 'en'
+  EN = 'en',
+  JA = 'ja',
 }