Skip to content

Commit 5b3ecc8

Browse files
committed
同步v3.1.6代码
1 parent 1022595 commit 5b3ecc8

File tree

83 files changed

+1848
-1221
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+1848
-1221
lines changed

README.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,7 @@ onUnmounted(() => {
278278

279279
mars-dialog 是弹窗组件,我们 widget 内可以按需选择下面 2 个使用:
280280

281-
- mars-dialog 弹框 组件: `src/components/mars-work/mars-dialog.vue`
282-
- mars-pannel 普通面板组件: `src/components/mars-work/mars-pannel.vue`
281+
- mars-dialog 弹框 组件: `src/components/mars-work/mars-dialog.vue`
283282

284283
mars-dialog 支持的配置参数包括:
285284

@@ -526,17 +525,17 @@ activate 和 disable 函数支持 string(直接传递 name) 和 Widget(传
526525

527526
```vue
528527
<template>
529-
<mars-pannel>
528+
<mars-dialog :draggable="false">
530529
<a-space>
531530
<mars-button @click="show('sample-pannel')">面板示例</mars-button>
532531
<mars-button @click="show('sample-dialog')">弹窗示例</mars-button>
533532
<mars-button @click="show('ui')">UI面板</mars-button>
534533
</a-space>
535-
</mars-pannel>
534+
</mars-dialog>
536535
</template>
537536
538537
<script setup lang="ts">
539-
import MarsPannel from "@mars/components/mars-work/mars-pannel.vue"
538+
import MarsDialog from "@mars/components/mars-work/mars-dialog.vue"
540539
import { useWidget } from "@mars/common/store/widget"
541540
542541
const { activate } = useWidget()

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@
99
"clean-lib": "rimraf node_modules",
1010
"preview": "vite preview",
1111
"build": "npm run lint && vite build",
12+
"build2": "node --max_old_space_size=1024000 ./node_modules/vite/bin/vite.js build",
1213
"serve:dist": "http-server ./dist",
1314
"lint": "vue-tsc --noEmit --skipLibCheck && npm run eslint",
1415
"eslint": "eslint ./src/**/*.{js,jsx,vue,ts,tsx} --fix",
1516
"prepare": "husky install"
1617
},
1718
"dependencies": {
18-
"@icon-park/vue-next": "^1.3.6",
19+
"@icon-park/svg": "^1.4.0",
1920
"@turf/turf": "^6.5.0",
2021
"ant-design-vue": "^3.2.5",
2122
"axios": "^0.25.0",

public/config/config.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@
151151
],
152152
"operationallayers": [
153153
{ "id": 20, "name": "辅助图层", "type": "group" },
154-
{ "pid": 20, "name": "实时路况", "type": "gaode", "layer": "time" },
155154
{ "pid": 20, "name": "经纬网", "type": "graticule" },
156155

157156
{
@@ -171,7 +170,7 @@
171170
"type": "pbf",
172171
"url": "http://server.mars2d.cn/geoserver/gwc/service/tms/1.0.0/mars%3Ahfgh3857@EPSG%3A3857@pbf/{z}/{x}/{-y}.pbf",
173172
"interactive": true,
174-
"style":{
173+
"style": {
175174
"color": "rgba(110, 110, 110, 255)",
176175
"opacity": 1,
177176
"weight": 1,

src/common/store/test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* store 状态管理
3-
* @copyright 火星科技 mars2d.cn
3+
* @copyright 火星科技 mars3d.cn
44
* @author 火星吴彦祖 2022-02-19
55
*/
66
import { Store, createStore } from "vuex"

src/common/uses/use-lifecycle.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* 组件中开启 map.ts 生命周期
3-
* @copyright 火星科技 mars2d.cn
3+
* @copyright 火星科技 mars3d.cn
44
* @author 火星吴彦祖 2022-02-19
55
*/
66
import { inject, onBeforeMount, onBeforeUnmount } from "vue"
836 Bytes
Loading
582 KB
Loading
1.11 MB
Loading
11.3 KB
Loading
2.2 KB
Loading

0 commit comments

Comments
 (0)