Skip to content

Commit b5d91da

Browse files
committed
同步最新代码
1 parent ccf0d81 commit b5d91da

File tree

20 files changed

+417
-602
lines changed

20 files changed

+417
-602
lines changed

LICENSE

Lines changed: 205 additions & 205 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Mars2D 基础项目 是基于[Mars2D 平台](http://mars2d.cn)做的一个应用
3434

3535
## 视频讲解
3636

37-
建议先看一遍视频讲解,再实际操作。您可以[新页面查看高清视频](https://www.bilibili.com/video/bv1JF411q7Ut/)
37+
建议先看一遍视频讲解,再实际操作。您可以[新页面查看高清视频](https://www.bilibili.com/video/BV1DR4y1G75T/)
3838

3939

4040

@@ -109,23 +109,12 @@ npm run build
109109

110110
## 运行效果
111111

112-
访问[基础项目 Vue 版](http://mars2d.cn/project/jcxm-vue/index.html) 在线体验效果和功能
112+
访问[基础项目 Vue 版](http://mars2d.cn/project/vue/index.html) 在线体验效果和功能
113113

114114
![image](https://muyao1987.gitee.io/cdn/mars2d.cn/xm/jcxm-vue/1.jpg)
115115

116116

117117

118-
## 浏览器支持
119-
120-
本地开发推荐使用`Chrome 80+` 浏览器
121-
122-
支持现代浏览器, 不支持 IE
123-
124-
| [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt=" Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>IE | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt=" Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Safari |
125-
| :-: | :-: | :-: | :-: | :-: |
126-
| not support | last 2 versions | last 2 versions | last 2 versions | last 2 versions |
127-
128-
129118

130119

131120
## 如何反馈问题?
@@ -470,7 +459,7 @@ export function onUnmounted(): void {
470459
#### `map.ts``index.vue`各自代码业务分离的原则
471460

472461
- 涉及地图业务的操作均写在 map.ts 中
473-
- 涉及 UI 层面、和地图无关的操作均写在 index.vue 中,vue 中尽量不使用 mars2d 和 Leaflet 开头的类
462+
- 涉及 UI 层面、和地图无关的操作均写在 index.vue 中,vue 中尽量不使用 mars2d 和 L 开头的类
474463

475464
#### index.vue 与 map.ts 交互
476465

@@ -606,7 +595,7 @@ const show = (name: string) => {
606595
```json
607596
// dependencies中添加
608597
{
609-
"mars2d": "^3.2.0",
598+
"mars2d": "^3.0.0",
610599
"mars2d-cesium": "^1.89.0",
611600
"@turf/turf": "^6.5.0",
612601
"kml-geojson": "^1.2.0",
@@ -682,7 +671,7 @@ app.use(injectState(widgetStore), key)
682671

683672
### 1. 如果切换mars2d到授权版
684673

685-
参考 [获取Mars2D](http://mars2d.cn/dev/guide/basics/download.html)中“从 Mars2D官网 下载获取”章节介绍。
674+
参考 [获取Mars2D SDK类库](http://mars2d.cn/dev/guide/basics/download.html)中“从 Mars2D官网 下载获取”章节介绍。
686675

687676
流程大概是:
688677
- 将npm安装后的`node_modules/mars2d/`下的所有文件拷贝一份放在`src\common\mars2d-sdk\`目录。
@@ -702,7 +691,7 @@ chainWebpack: (config) => {
702691
"mars2d-cesium": "^1.89.0",
703692
},
704693
```
705-
![image](http://mars2d.cn/dev/img/guide/basics-download-import.jpg)
694+
![image](http://mars2d.cn/dev/img/guide/start-download-import.jpg)
706695

707696

708697
### 2. 局域网离线使用时注意事项
@@ -715,7 +704,7 @@ chainWebpack: (config) => {
715704

716705
- 修改 config.json 中`terrain`配置中,将已有的`"show": true`配置,改为`"show": false`
717706
- 修改 config.json 中`basemaps`数组配置中,将已有的`"show": true`的图层,将该值改为`"show": false` ,并将单张图片或离线地图加上`"show": true`,并修改相关 URL 地址。
718-
- 您也可以参考教程[发布三维数据服务](http://mars2d.cn/dev/guide/data/server.html)进行部署离线地图服务,里面也有一些示例离线数据。
707+
- 您也可以参考教程[发布地图服务](http://mars2d.cn/dev/guide/data/server.html)进行部署离线地图服务,里面也有一些示例离线数据。
719708

720709

721710

package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,36 @@
33
"version": "3.0.0",
44
"description": "在Vue3技术栈下的Mars2D平台 基础项目",
55
"scripts": {
6-
"serve": "vite",
7-
"dev": "npm run clean-cache && vite",
6+
"dev": "vite",
7+
"serve": "npm run clean-cache && vite",
88
"clean-cache": "rimraf node_modules/.cache/ && rimraf node_modules/.vite",
99
"clean-lib": "rimraf node_modules",
1010
"preview": "vite preview",
1111
"build": "npm run lint && vite build",
12-
"build-tsc": "vue-tsc --noEmit && vite build",
13-
"lint": "eslint ./src/**/*.{js,jsx,vue,ts,tsx} --fix"
12+
"lint": "eslint ./src/**/*.{js,jsx,vue,ts,tsx} --fix && vue-tsc --noEmit"
1413
},
1514
"dependencies": {
16-
"leaflet": "^1.7.1",
1715
"@iconify/vue": "^3.1.3",
1816
"@turf/turf": "^6.5.0",
19-
"ant-design-vue": "3.0.0-beta.10",
17+
"ant-design-vue": "3.0.0-beta.13",
2018
"axios": "^0.25.0",
2119
"core-js": "^3.20.3",
2220
"echarts": "^5.2.2",
2321
"echarts-gl": "^2.0.8",
2422
"kml-geojson": "^1.2.0",
23+
"leaflet": "^1.7.1",
2524
"localforage": "^1.10.0",
26-
"mars2d": "^3.0.9",
27-
"mars2d-esri": "^3.0.9",
25+
"mars2d": "^3.0.12",
26+
"mars2d-esri": "^3.0.12",
2827
"nprogress": "^0.2.0",
2928
"uuid": "^8.3.2",
3029
"vue": "^3.2.31",
3130
"vue-color-kit": "^1.0.5",
3231
"vuex": "^4.0.2"
3332
},
3433
"devDependencies": {
35-
"@types/node": "^17.0.18",
34+
"@types/leaflet": "^1.7.1",
35+
"@types/node": "^17.0.21",
3636
"@vitejs/plugin-vue": "^2.1.0",
3737
"@vue/eslint-config-typescript": "^10.0.0",
3838
"consola": "^2.15.3",
@@ -48,7 +48,7 @@
4848
"standard": "^16.0.4",
4949
"typescript": "^4.5.5",
5050
"unplugin-vue-components": "^0.17.13",
51-
"vite": "^2.8.4",
51+
"vite": "^2.8.6",
5252
"vite-plugin-eslint": "^1.3.0",
5353
"vite-plugin-style-import": "^2.0.0",
5454
"vue-tsc": "^0.31.1"

src/common/uses/use-lifecycle.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
* @copyright 火星科技 mars2d.cn
44
* @author 火星吴彦祖 2022-02-19
55
*/
6-
import { inject, onMounted, onUnmounted } from "vue"
6+
import { inject, onBeforeMount, onBeforeUnmount } from "vue"
77

88
export default function useLifecycle(mapWork: any): void {
99
const getMapInstance = inject<any>("getMapInstance")
10-
onMounted(() => {
10+
onBeforeMount(() => {
1111
if (mapWork.onMounted) {
1212
const map = getMapInstance()
1313
mapWork.onMounted(map)
1414
}
1515
})
16-
onUnmounted(() => {
16+
onBeforeUnmount(() => {
1717
if (mapWork.onUnmounted) {
1818
mapWork.onUnmounted()
1919
}

src/components/mars-ui/base.less

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
@font-size-base: 13px; // 主要字体大小
1+
22

33
@mars-basecolor: #000; // 基础字体颜色
44
@mars-basecolor-reverse: #fff; // 基础字体颜色-反色
5-
@dropdown-color-base: #76838f; //下拉菜单字体颜色
5+
@primary-color: #20a0ff; // 主要颜色
66
@mars-disable-color: rgb(51, 32, 32); // 禁用字体颜色
7-
@button-color-base: #fff; // 按钮字体颜色
8-
@button-color-active: #fff; // 按钮激活字体颜色
9-
7+
@mars-background-active: rgba(37, 49, 63, 0.788); // 全局激活背景色
8+
@font-size-base: 13px; // 主要字体大小
109
@border-color-ordinary: #666; // 普通边框颜色
1110
@border-color-base: #4db3ff; // 基础边框颜色
12-
13-
@primary-color: #20a0ff; // 主要颜色
11+
@tree-border-color: #ccc; //树控件复选框边框颜色
1412
@mars-ordinary-color: #6fcaff; // 普通颜色
15-
@background-base: rgba(255, 255, 255, 0.75); // 基础背景色
16-
@mars-background-active: rgba(37, 49, 63, 0.788); // 全局激活背景色
1713
@form-input-background: rgb(255 255 255 / 9%); // input 背景色
1814
@input-background-active: rgba(37, 49, 63, 0.788); // input 激活背景色
15+
@background-base: rgba(255, 255, 255, 0.75); // 基础背景色
1916
@button-background-base: #20a0ff; // 按钮背景
17+
@button-color-base: #fff; // 按钮字体颜色
18+
@button-color-active: #fff; // 按钮激活字体颜色
2019
@button-background-active: #4db3ff; // 按钮激活背景颜色
2120
@collapse-header-color: #4db3ff; // 折叠面板头部颜色
21+
@dropdown-color-base: #76838f; //下拉菜单字体颜色
2222

2323
.mars-main-view {
2424
color: @mars-basecolor;

src/components/mars-ui/mars-color-picker/mars-color-picker.css

Lines changed: 0 additions & 172 deletions
This file was deleted.

src/components/mars-ui/mars-input/index.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ export default defineComponent({
2525
color: @mars-basecolor;
2626
background-color: @form-input-background !important;
2727
border-color: @border-color-ordinary;
28+
font-size: 12px !important;
29+
2830
:deep(.ant-input) {
2931
background-color: @form-input-background !important;
3032
border-color: @border-color-ordinary;

0 commit comments

Comments
 (0)