ry-vue-map 0.1.2 → 0.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ry-vue-map",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "private": false,
   "main": "lib/ryui.umd.min.js",
   "description": "ry公共组件库",

package/src/components/maps/ryClustersMarker/src/index.vue

@@ -39,7 +39,7 @@
 				type: Number,
 				default: 0,
 			},
-			color: {
+			fontColor: {
 				type: String,
 				default: '#fff',
 			},

package/src/components/maps/ryMap/src/index.vue

@@ -160,14 +160,14 @@
 					this.setMaxZoom(18);
 				}
 			},
-			loadMap(el,layers) {
+			loadMap(el) {
 				// const dto =
 				this.lMap.init({
 					el,
 					type: this.mapType,
 					layerType: this.layerType,
 					viewOptions: this.getViewOptions(),
-					callback: map => {
+					callback: (map,layers) => {
 						this.map = map;
 
 						if (this.bbox.length > 0) {
@@ -185,6 +185,7 @@
 						this.$emit('load', {
 							map,
 							mapServices: this.lMap,
+							layers,
 							ryMapTool: this.$refs.mapTool
 						});
 

package/src/utils/lMapServices.js

@@ -131,8 +131,8 @@ export default class LMapServices {
           this.map = null;
         }
         const {map,layers} = await this.lmap.onLoad(el,type, layerType);
-		this.map=map;
-		this.layers=layers;
+	    this.map=map;
+	    this.layers=layers;
         MapConfig.View = viewOptions;
         this.map.setView(MapConfig.View);
         if (callback) {
@@ -351,7 +351,6 @@ export default class LMapServices {
 
   getPolygonGeoJson() {
     if (!this._lPolygon) return null;
-    // console.log('getPolygonGeoJson',this._lPolygon.getGeoJsonNew())
     return this._lPolygon.getGeoJson();
   }
 

package/src/views/map/index.vue

@@ -9,7 +9,7 @@
 			:switchMapDefaultTypeOrLayer="[1,2]" @mapMoveend="mapMoveend($event)"
 			@loadDrawPolygonEvent="loadDrawPolygonEvent($event)" :initModifyPolygon="geoJson"
 			@changeSwitchMap="changeSwitchMap($event)"  :isShowSwitchMap="true"
-			:layerType="1" :mapType="2">
+			>
 			<!--    <template slot="maptool">
         <button>ry</button>
       </template> -->
@@ -37,8 +37,15 @@
       :map="mapDto.map"
       :modelArr="modelArr"
       @onLoad="onLoad($event)"
-      :isShowPolygon="showPolygon" :isCheckPointHide="isCheckPoint" :inserts="inserts" :gpsType="gpsType"></ry-polygons>
-       <ry-clusters :src="src" text="台" :gpsType="gpsType" @callback="clusterCallback($event)"  :map="mapDto.map" :modelArr="modelArr2"></ry-clusters>
+      :isShowPolygon="showPolygon" 
+	  :isCheckPointHide="isCheckPoint" 
+	  :inserts="inserts" 
+	  :gpsType="gpsType"></ry-polygons>
+       <ry-clusters 
+	   :src="src" text="个" 
+	   fontColor="red" :fontSize="23" 
+	   :gpsType="gpsType" @callback="clusterCallback($event)"  :map="mapDto.map" :modelArr="modelArr2" :offsetY="0"></ry-clusters>
+
 			</template>
 
 		</ry-map>
@@ -309,6 +316,7 @@
 			load(obj) {
 				this.lMap = obj.mapServices;
 				this.map = obj.map;
+				console.log(obj);
 				// let g10 = GPS.convertGCJ02(gJson2);
 				// convertWGS84
 				// convertWGS84,convertGCJ02