同步最新代码

Author: muyao1987

src/marsgis/common/store/test.ts

@@ -1,7 +1,7 @@
 /**
  * store 状态管理
  * @copyright 火星科技 mars3d.cn
- * @author 火星吴彦祖 2021-12-30
+ * @author 火星吴彦祖 2022-02-19
  */
 import { Store, createStore } from "vuex"
 import { InjectionKey } from "vue"

src/marsgis/common/uses/use-lifecycle.ts

@@ -1,7 +1,7 @@
 /**
  * 组件中开启 map.ts 生命周期
  * @copyright 火星科技 mars3d.cn
- * @author 火星吴彦祖 2021-12-30
+ * @author 火星吴彦祖 2022-02-19
  */
 import { inject, onBeforeMount, onUnmounted } from "vue"
 

src/marsgis/components/mars-ui/function.less

@@ -2,7 +2,7 @@
  * 通用 class
  *
  * @copyright 火星科技 mars3d.cn
- * @author 火星吴彦祖 2021-11-01
+ * @author 火星吴彦祖 2022-01-01
  */
 
 .f-pt {

src/marsgis/components/mars-ui/index.less

@@ -2,7 +2,7 @@
  * 所有页面全局公共CSS
  *
  * @copyright 火星科技 mars3d.cn
- * @author 火星吴彦祖 2021-11-01
+ * @author 火星吴彦祖 2022-01-01
  */
 
 /* 清除内外边距 */

src/marsgis/components/mars-ui/index.ts

@@ -1,7 +1,7 @@
 /**
  * 统一导出公共组件, 按需初始化ant-design-vue
  * @copyright 火星科技 mars3d.cn
- * @author 木遥 2021-11-01
+ * @author 木遥 2022-01-01
  */
 import { App } from "vue"
 import MarsSelect from "./mars-select/index.vue"

src/marsgis/components/mars-ui/mars-alert/index.ts

@@ -7,7 +7,7 @@ import "./alert.less"
  * @export
  * @param {App} app vue实例
  * @copyright 火星科技 mars3d.cn
- * @author 木遥 2021-11-01
+ * @author 木遥 2022-01-01
  * @returns { void }
  */
 export const $alert = (content: any, title = "提示", type: keyof typeof Modal = "info") => {

src/marsgis/components/mars-ui/mars-color-picker/index.ts

@@ -8,7 +8,7 @@ import "./mars-color-picker.less"
  * 颜色选择器
  *
  * @copyright 火星科技 mars3d.cn
- * @author 木遥 2021-11-01
+ * @author 木遥 2022-01-01
  */
 const MarsColorPicker = defineComponent({
   name: "mars-color-picker",

src/marsgis/components/mars-ui/mars-color-picker/mars-color-picker.less

@@ -2,7 +2,7 @@
  * 颜色选择器
  *
  * @copyright 火星科技 mars3d.cn
- * @author 木遥 2021-11-01
+ * @author 木遥 2022-01-01
  */
 
 .hu-color-picker {

src/marsgis/components/mars-ui/mars-dialog/index.vue

@@ -34,7 +34,7 @@
 /**
  * dislog弹框
  * @copyright 火星科技 mars3d.cn
- * @author 火星吴彦祖 2021-12-30
+ * @author 火星吴彦祖 2022-02-19
  */
 import { computed, onMounted, onUnmounted, ref } from "vue"
 import { getConfig } from "../index"

src/marsgis/components/mars-ui/mars-dropdown/index.ts

@@ -6,7 +6,7 @@ import "./dropdown.less"
  * 下拉菜单
  *
  * @copyright 火星科技 mars3d.cn
- * @author 木遥 2021-11-01
+ * @author 木遥 2022-01-01
  */
 
 const MarsDropdown = defineComponent({

src/marsgis/components/mars-ui/mars-echarts/index.ts

@@ -2,7 +2,7 @@ import * as echarts from "echarts"
 /**
  * echarts公共样式配置
  * @copyright 火星科技 mars3d.cn
- * @author 火星吴彦祖 2021-12-30
+ * @author 火星吴彦祖 2022-02-19
  */
 
 echarts.registerTheme("dark", {

src/marsgis/components/mars-ui/mars-loading/index.ts

@@ -7,7 +7,7 @@ import { App } from "vue"
  * @export
  * @param {App} app vue实例
  * @copyright 火星科技 mars3d.cn
- * @author 火星吴彦祖 2021-12-30
+ * @author 火星吴彦祖 2022-02-19
  * @returns { void }
  */
 let loadingNum = 0

src/marsgis/components/mars-ui/mars-message/index.ts

@@ -7,7 +7,7 @@ import "./message.less"
  * @export
  * @param {App} app vue实例
  * @copyright 火星科技 mars3d.cn
- * @author 木遥 2021-11-01
+ * @author 木遥 2022-01-01
  * @returns {void}
  */
 

src/marsgis/components/mars-ui/mars-notify/index.ts

@@ -7,7 +7,7 @@ import "./notify.less"
  * @export
  * @param {App} app vue实例
  * @copyright 火星科技 mars3d.cn
- * @author 木遥 2021-11-01
+ * @author 木遥 2022-01-01
  * @returns { void }
  */
 export const $notify = (message: any, description: any, options: any = {}, type: keyof typeof notification = "info") => {

src/marsgis/components/mars-ui/mars-pannel/index.vue

@@ -16,7 +16,7 @@
 /**
  * pannel面板
  * @copyright 火星科技 mars3d.cn
- * @author 火星吴彦祖 2021-12-30
+ * @author 火星吴彦祖 2022-02-19
  */
 import { onMounted, ref, computed } from "vue"
 import { getConfig } from "../index"

src/marsgis/components/mars-ui/mars-tree/index.ts

@@ -6,7 +6,7 @@ import "./tree.less"
 /**
  * 树控件
  * @copyright 火星科技 mars3d.cn
- * @author 火星吴彦祖 2021-11-01
+ * @author 火星吴彦祖 2022-01-01
  */
 const MarsTree = defineComponent({
   name: "mars-tree",

src/marsgis/misc/env.d.ts

@@ -2,7 +2,7 @@
 /**
  * 统一定义ts模块类型
  * @copyright 火星科技 mars3d.cn
- * @author 木遥 2021-11-01
+ * @author 木遥 2022-01-01
  */
 
 declare module "*.vue" {

src/marsgis/utils/file-util.ts

@@ -1,10 +1,17 @@
+/**
+ * 文件处理相关 静态Util方法
+ *
+ * @copyright 火星科技 mars3d.cn
+ * @author 木遥 2022-01-01
+ */
+import { toKml } from "kml-geojson"
 
 /**
- * 读取json文件内容 
+ * 读取json文件内容
  *
  * @template T 返回的数据类型
  * @param {*} file 文件选择框选择的文件对象
- * @return {*}  {Promise<T>} 
+ * @return {*}  {Promise<T>}
  */
 export function readJSON<T>(file: any): Promise<T> {
   return new Promise((resolve) => {
@@ -25,6 +32,18 @@ export function readJSON<T>(file: any): Promise<T> {
   })
 }
 
+export function saveGeoJSON2Kml(geojson: string, options: any): any {
+  const geojsonObject = clone(geojson, null, null)
+
+  const kml = toKml(geojsonObject, {
+    name: "Mars3D标绘数据",
+    documentName: "Mars3D标绘数据文件",
+    documentDescription: "标绘数据 by mars3d.cn",
+    simplestyle: true,
+    ...options
+  })
+  return kml
+}
 
 function clone(obj: any, removeKeys: any, level: any): any {
   // 避免死循环，拷贝的层级最大深度

src/marsgis/utils/mars-util.ts

@@ -1,8 +1,8 @@
 /**
- * 公共静态Util方法
+ * 项目内通用 静态Util方法
  *
  * @copyright 火星科技 mars3d.cn
- * @author 木遥 2021-11-01
+ * @author 木遥 2022-01-01
  */
 
 /**

src/marsgis/widget-store.ts

@@ -1,7 +1,7 @@
 /**
  * index页面的widget配置
  * @copyright 火星科技 mars3d.cn
- * @author 火星吴彦祖 2021-12-30
+ * @author 火星吴彦祖 2022-02-19
  */
 import { defineAsyncComponent, markRaw } from "vue"
 import { WidgetState } from "@mars/common/store/widget"
@@ -31,7 +31,7 @@ const store: StoreOptions<WidgetState> = {
         component: markRaw(defineAsyncComponent(() => import(/* webpackChunkName: "manage-layers" */ "@mars/widgets/basic/manage-layers/index.vue"))),
         name: "manage-layers",
         group: "manage",
-        disableOther: ["roamfly"]
+        disableOther: ["roamLine"]
       },
       {
         component: markRaw(
@@ -56,8 +56,8 @@ const store: StoreOptions<WidgetState> = {
         name: "layer-picture-guihua"
       },
       {
-        component: markRaw(defineAsyncComponent(() => import(/* webpackChunkName: "select-point" */ "@mars/widgets/basic/select-point/index.vue"))),
-        name: "select-point",
+        component: markRaw(defineAsyncComponent(() => import(/* webpackChunkName: "location-point" */ "@mars/widgets/basic/location-point/index.vue"))),
+        name: "location-point",
         group: "tools"
       }
     ],

src/marsgis/widgets/basic/select-point/index.vue renamed to src/marsgis/widgets/basic/location-point/index.vue

@@ -1,7 +1,7 @@
 /**
  * 图上选点
  * @copyright 火星科技 mars3d.cn
- * @author 火星 胡椒 2021-12-20
+ * @author 火星胡椒 2022-01-10
  */
 import * as mars3d from "mars3d"
 let map: mars3d.Map // 地图对象

src/marsgis/widgets/basic/select-point/map.ts renamed to src/marsgis/widgets/basic/location-point/map.ts

@@ -1,7 +1,7 @@
 /**
  * 底图控制
  * @copyright 火星科技 mars3d.cn
- * @author 火星吴彦祖 2021-12-10
+ * @author 火星吴彦祖 2022-01-10
  */
 import * as mars3d from "mars3d"
 

src/marsgis/widgets/basic/manage-basemap/map.ts

@@ -1,7 +1,7 @@
 /**
  * 图层管理
  * @copyright 火星科技 mars3d.cn
- * @author 火星吴彦祖 2021-12-10
+ * @author 火星吴彦祖 2022-01-10
  */
 import * as mars3d from "mars3d"
 const Cesium = mars3d.Cesium

src/marsgis/widgets/basic/manage-layers/map.ts

@@ -1,7 +1,7 @@
 /**
  * 高德POI 查询栏 （左上角）
  * @copyright 火星科技 mars3d.cn
- * @author 火星吴彦祖 2021-12-10
+ * @author 火星吴彦祖 2022-01-10
  */
 import * as mars3d from "mars3d"
 const Cesium = mars3d.Cesium

src/marsgis/widgets/basic/query-poi/map.ts

@@ -29,7 +29,7 @@
 /**
  * 导航菜单按钮 （右上角）
  * @copyright 火星科技 mars3d.cn
- * @author 火星吴彦祖 2021-12-10
+ * @author 火星吴彦祖 2022-01-10
  */
 import { useWidget } from "@mars/common/store/widget"
 
@@ -43,17 +43,17 @@ const data = [
     icon: "icon-park-outline:tool",
     children: [
       // { name: "图上量算", icon: "icon-park-outline:ruler", widget: "measure" },
-      // { name: "空间分析", icon: "icon-park-outline:analysis", widget: "analysis" },
-      { name: "坐标定位", icon: "icon-park-outline:local", widget: "select-point" }
-      // { name: "地区导航", icon: "icon-park-outline:navigation", widget: "navigation" },
+      // { name: "空间分析", icon: "icon-park-outline:analysis", widget: "analysis" }
+      { name: "坐标定位", icon: "icon-park-outline:local", widget: "location-point" }
+      // { name: "地区导航", icon: "icon-park-outline:location-region", widget: "location-region" },
       // { name: "我的标记", icon: "icon-park-outline:mark", widget: "addmarker" },
       // { name: "视角书签", icon: "icon-park-outline:bookmark", widget: "bookmark" },
       // { name: "地图打印", icon: "icon-park-outline:printer", widget: "print" },
-      // { name: "飞行漫游", icon: "icon-park-outline:take-off", widget: "roamLine" },
+      // { name: "飞行漫游", icon: "icon-park-outline:take-off", widget: "roamLine-list" },
       // { name: "图上标绘", icon: "icon-park-outline:hand-painted-plate", widget: "plot" },
       // { name: "路线导航", icon: "icon-park-outline:connection", widget: "query-route" },
       // { name: "卷帘对比", icon: "icon-park-outline:switch-contrast", widget: "map-split" },
-      // { name: "分屏对比", icon: "icon-park-outline:full-screen-play", widget: "screen-compare" }
+      // { name: "分屏对比", icon: "icon-park-outline:full-screen-play", widget: "map-compare" }
       // { name: "百度街景", icon: h(City, { theme: "outline", size: "18" }), widget: "street-view" }
     ]
   }