同步v3.4.0代码

package.json

 {
   "name": "mars3d-react-example",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "description": "基于 React 的 Mars3D 功能示例项目",
   "scripts": {
     "serve": "vite --host",
@@ -8,23 +8,25 @@
     "clean-cache": "rimraf node_modules/.cache/ && rimraf node_modules/.vite",
     "clean-lib": "rimraf node_modules",
     "preview": "vite preview",
-    "build": "vite build",
+    "build": "npm run lint && vite build",
     "serve:dist": "http-server ./dist",
     "lint": "npm run eslint",
-    "eslint": "eslint ./src/**/*.{js,jsx,vue,ts,tsx} --fix"
+    "eslint": "eslint ./src/**/*.{js,jsx,vue,ts,tsx} --fix",
+    "prepare": "husky install"
   },
   "dependencies": {
     "@icon-park/svg": "^1.4.0",
-    "@marsgis/editor": "^1.0.11",
-    "classnames": "^2.3.1",
+    "@marsgis/editor": "^1.1.3",
     "antd": "^4.19.3",
     "axios": "^0.26.1",
+    "classnames": "^2.3.1",
     "echarts": "^5.3.2",
     "lodash": "^4.17.21",
-    "mars3d": "^3.3.0",
-    "monaco-editor": "^0.29.1",
+    "mars3d": "^3.4.0",
+    "monaco-editor": "^0.33.0",
     "nprogress": "^0.2.0",
     "react": "^18.1.0",
+    "react-color": "^2.19.3",
     "react-dom": "^18.1.0",
     "react-redux": "^8.0.1",
     "redux": "^4.2.0",
@@ -32,33 +34,34 @@
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "babel-eslint": "^10.1.0",
+    "@types/node": "^17.0.22",
+    "@types/react": "^18.0.8",
+    "@types/react-dom": "^18.0.3",
     "@typescript-eslint/eslint-plugin": "^4.33.0",
     "@typescript-eslint/parser": "^4.33.0",
+    "@vitejs/plugin-react": "^1.0.7",
+    "autoprefixer": "^10.4.4",
+    "babel-eslint": "^10.1.0",
+    "consola": "^2.15.3",
     "eslint": "^7.32.0",
+    "eslint-config-react-app": "^6.0.0",
+    "eslint-config-standard": "^16.0.3",
     "eslint-plugin-flowtype": "^5.10.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-jsx-a11y": "^6.5.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^5.2.0",
     "eslint-plugin-react": "^7.29.4",
-    "http-server": "^14.1.0",
-    "@types/node": "^17.0.22",
-    "@types/react": "^18.0.8",
-    "@types/react-dom": "^18.0.3",
-    "@vitejs/plugin-react": "^1.0.7",
-    "autoprefixer": "^10.4.4",
-    "consola": "^2.15.3",
-    "eslint-config-react-app": "^6.0.0",
-    "eslint-config-standard": "^16.0.3",
     "eslint-plugin-react-hooks": "^4.3.0",
+    "http-server": "^14.1.0",
+    "husky": "^7.0.4",
     "less": "^4.1.2",
     "rollup-plugin-copy": "^3.4.0",
     "typescript": "^4.5.4",
-    "vite": "2.8.6",
+    "vite": "^2.9.14",
     "vite-plugin-eslint": "^1.3.0",
-    "vite-plugin-mars3d": "^1.1.2",
-    "vite-plugin-monaco-editor": "^1.0.10",
+    "vite-plugin-mars3d": "^1.1.4",
+    "vite-plugin-monaco-editor": "^1.1.0",
     "vite-plugin-style-import": "^2.0.0"
   },
   "engines": {
@@ -83,5 +86,10 @@
   ],
   "author": "火星科技",
   "license": "Apache-2.0",
-  "homepage": "http://mars3d.cn"
+  "homepage": "http://mars3d.cn",
+  "lint-staged": {
+    "*.{js,jsx,vue,ts,tsx}": [
+      "npm run eslint"
+    ]
+  }
 }

public/config/config.json

@@ -417,18 +417,17 @@
         "onWidget": "layer-picture-guihua"
       },
       { "id": 30, "name": "矢量数据", "type": "group" },
-      { "id": 3040, "pid": 30, "name": "平台标绘JSON", "type": "group" },
+      { "id": 3030, "pid": 30, "name": "GeoJSON数据", "type": "group" },
       {
         "id": 303011,
-        "pid": 3040,
+        "pid": 3030,
         "type": "geojson",
-        "name": "示例数据",
+        "name": "平台标绘",
         "url": "{dataServer}/file/geojson/mars3d-draw.json",
         "popup": "{type}{name}",
         "show": false,
         "flyTo": true
       },
-      { "id": 3030, "pid": 30, "name": "GeoJSON数据", "type": "group" },
       {
         "pid": 3030,
         "type": "geojson",
@@ -487,10 +486,11 @@
           "type": "polygon",
           "styleOptions": {
             "materialType": "PolyGradient",
-            "color": "rgb(15,176,255)",
-            "opacity": 0.7,
-            "alphaPower": 1.3,
-            "diffHeight": "{gdp}",
+            "materialOptions": {
+              "color": "rgb(15,176,255)",
+              "opacity": 0.7,
+              "alphaPower": 1.3
+            },
             "label": {
               "text": "{name}",
               "opacity": 1,
@@ -553,8 +553,7 @@
         "url": "{dataServer}/file/geojson/xizangyakou.json",
         "symbol": {
           "styleOptions": {
-            "image": "img/marker/mark1.png",
-            "scale": 1,
+            "image": "img/marker/mark-red.png",
             "scaleByDistance": true,
             "scaleByDistance_far": 5000000,
             "scaleByDistance_farValue": 0.5,
@@ -597,7 +596,7 @@
         "url": "{dataServer}/file/geojson/hfty-point.json",
         "symbol": {
           "styleOptions": {
-            "image": "img/marker/mark1.png",
+            "image": "img/marker/mark-red.png",
             "scale": 1,
             "scaleByDistance": true,
             "scaleByDistance_far": 20000,
@@ -682,11 +681,10 @@
         "symbol": {
           "type": "billboardP",
           "styleOptions": {
-            "image": "img/marker/mark1.png",
-            "scale": 0.7,
+            "image": "img/marker/mark-red.png",
             "scaleByDistance": true,
             "scaleByDistance_far": 20000,
-            "scaleByDistance_farValue": 0.5,
+            "scaleByDistance_farValue": 0.6,
             "scaleByDistance_near": 1000,
             "scaleByDistance_nearValue": 1,
             "clampToGround": true,
@@ -718,11 +716,10 @@
         "symbol": {
           "type": "billboardP",
           "styleOptions": {
-            "image": "img/marker/mark3.png",
-            "scale": 0.7,
+            "image": "img/marker/mark-blue.png",
             "scaleByDistance": true,
             "scaleByDistance_far": 20000,
-            "scaleByDistance_farValue": 0.5,
+            "scaleByDistance_farValue": 0.6,
             "scaleByDistance_near": 1000,
             "scaleByDistance_nearValue": 1,
             "clampToGround": true,
@@ -740,9 +737,9 @@
           },
           "styleField": "address",
           "styleFieldOptions": {
-            "AB03": { "image": "img/marker/mark1.png" },
-            "A980": { "image": "img/marker/mark2.png" },
-            "A900": { "image": "img/marker/mark4.png" }
+            "AB03": { "image": "img/marker/mark-red.png" },
+            "A980": { "image": "img/marker/mark-blue.png" },
+            "A900": { "image": "img/marker/mark-green.png" }
           }
         },
         "popup": "名称：{NAME}<br />地址：{address}",
@@ -834,21 +831,38 @@
       { "id": 2010, "pid": 20, "name": "gltf模型", "type": "group" },
       {
         "pid": 2010,
-        "type": "gltf",
+        "type": "graphic",
         "name": "风力发电机",
-        "url": "{dataServer}/gltf/mars/fengche.gltf",
-        "position": { "lng": 117.219071, "lat": 31.828783, "alt": 39.87 },
-        "style": { "scale": 50, "heading": -93 },
+        "data": [
+          {
+            "type": "modelP",
+            "position": [117.219071, 31.828783, 39.87],
+            "style": {
+              "url": "//data.mars3d.cn/gltf/mars/fengche.gltf",
+              "scale": 50,
+              "heading": -93
+            }
+          }
+        ],
         "popup": "示例信息，这是一个风力发电机",
         "center": { "lat": 31.821083, "lng": 117.21832, "alt": 832.64, "heading": 2.3, "pitch": -39.2 }
       },
       {
         "pid": 2010,
-        "type": "gltf",
+        "type": "graphic",
         "name": "起重车",
-        "url": "{dataServer}/gltf/mars/qzcar/GKZY_anim.gltf",
-        "position": { "lng": 117.217458, "lat": 31.815349, "alt": 35.03 },
-        "style": { "scale": 2, "heading": -95, "clampToGround": true },
+        "data": [
+          {
+            "type": "modelP",
+            "position": [117.217458, 31.815349, 35.03],
+            "style": {
+              "url": "//data.mars3d.cn/gltf/mars/qzcar/GKZY_anim.gltf",
+              "scale": 2,
+              "heading": -95,
+              "clampToGround": true
+            }
+          }
+        ],
         "center": { "lat": 31.815363, "lng": 117.215958, "alt": 107.35, "heading": 90.7, "pitch": -26.1 }
       },
       { "id": 2040, "pid": 20, "name": "城市白模", "type": "group" },
@@ -920,6 +934,7 @@
             ]
           }
         },
+        "hasOpacity": false,
         "center": { "lat": 31.504746, "lng": 118.264278, "alt": 580, "heading": 29, "pitch": -49 }
       },
       { "id": 2060, "pid": 20, "name": "BIM模型", "type": "group" },
@@ -1009,11 +1024,18 @@
       },
       {
         "pid": 202030,
-        "type": "gltf",
         "name": "闸门",
-        "url": "{dataServer}/gltf/mars/zhamen.glb",
-        "position": { "lng": 121.479813, "lat": 29.791278, "alt": 16 },
-        "style": { "heading": 105 },
+        "type": "graphic",
+        "data": [
+          {
+            "type": "modelP",
+            "position": [121.479813, 29.791278, 16],
+            "style": {
+              "url": "//data.mars3d.cn/gltf/mars/zhamen.glb",
+              "heading": 105
+            }
+          }
+        ],
         "center": { "lat": 29.791607, "lng": 121.479925, "alt": 27, "heading": 198, "pitch": -18 }
       },
       {
@@ -1059,6 +1081,19 @@
         "center": { "lat": 31.795308, "lng": 117.21948, "alt": 1820, "heading": 0, "pitch": -39 }
       },
       {
+        "pid": 2030,
+        "type": "3dtiles",
+        "name": "大雁塔",
+        "url": "{dataServer}/3dtiles/qx-dyt/tileset.json",
+        "position": { "alt": -27 },
+        "maximumScreenSpaceError": 1,
+        "maximumMemoryUsage": 1024,
+        "center": { "lat": 34.215516, "lng": 108.960251, "alt": 834, "heading": 4, "pitch": -48 },
+        "flat":{},
+        "flyTo": false,
+        "show": false
+      },
+      {
         "id": 203013,
         "pid": 2030,
         "type": "geojson",

public/config/tileset.json

@@ -214,11 +214,18 @@
     },
     {
       "pid": 202030,
-      "type": "gltf",
       "name": "闸门",
-      "url": "//data.mars3d.cn/gltf/mars/zhamen.glb",
-      "position": { "lng": 121.479813, "lat": 29.791278, "alt": 16 },
-      "style": { "heading": 105 },
+      "type": "graphic",
+      "data": [
+        {
+          "type": "modelP",
+          "position":[ 121.479813, 29.791278,16 ],
+          "style": {
+            "url": "//data.mars3d.cn/gltf/mars/zhamen.glb",
+            "heading": 105
+          }
+        }
+      ],
       "center": { "lat": 29.791607, "lng": 121.479925, "alt": 27, "heading": 198, "pitch": -18 }
     },
     {