augustine-jkmap 1.1.2 → 1.1.4

package/dist/augustine-jkmap.umd.js

@@ -3083,7 +3083,7 @@ if (typeof window !== 'undefined') {
 // Indicate to webpack that this file can be concatenated
 /* harmony default export */ const setPublicPath = (null);
 
-;// ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[2]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/vue2/augustineGjMap.vue?vue&type=template&id=eb2cfe64
+;// ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[2]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/vue2/augustineGjMap.vue?vue&type=template&id=5cdfceff
 var render = function render(){var _vm=this,_c=_vm._self._c;return _c('loading-box',{attrs:{"loading":_vm.isLoading}},[_c('div',{staticClass:"arcgisMap-box"},[_c('div',{staticClass:"arcgisMapBox",attrs:{"id":_vm.mapId}}),(_vm.pathCoordinates.length > 0 && _vm.noAbleMoving)?_c('div',{staticClass:"controls",class:'controls_' + _vm.postion},[_c('div',{staticClass:"controls-item",class:{ 'controls-active': _vm.currentPathIndex > 0 },on:{"click":_vm.changeMove}},[_vm._v(" "+_vm._s(_vm.currentPathIndex == 0 ? '开始' : _vm.isPaused ? '继续' : '暂停')+" ")]),_c('div',{staticClass:"controls-item",on:{"click":_vm.changeSpeed}},[_c('p',[_vm._v(_vm._s(_vm.speedNum)+" "),_c('svgIcon',{attrs:{"name":"close","width":"14","color":"#000"}})],1),_c('p',[_vm._v("加速")])]),_c('div',{staticClass:"controls-item",on:{"click":_vm.stopAnimation}},[_vm._v("重置")]),(_vm.postion == 'top' || _vm.postion == 'bottom')?_c('div',{staticClass:"controls-item",on:{"click":function($event){return _vm.drawMeasurement('distance')}}},[_vm._v(" 测距 ")]):_vm._e(),(_vm.postion == 'top' || _vm.postion == 'bottom')?_c('div',{staticClass:"controls-item",on:{"click":function($event){return _vm.drawMeasurement('area')}}},[_vm._v("测面积")]):_vm._e(),(_vm.postion == 'top' || _vm.postion == 'bottom')?_c('div',{staticClass:"controls-item",on:{"click":_vm.clearMeasurement}},[_vm._v("清除")]):_vm._e()]):_vm._e(),_c('CustomTooltip',{ref:"tooltip",scopedSlots:_vm._u([{key:"default",fn:function({ data }){return [_c('div',[_vm._v(" 经纬度: "),_c('b',[_vm._v(_vm._s(data.longitude)+"-"+_vm._s(data.latitude))])]),_c('div',[_vm._v(" 时间: "),_c('b',[_vm._v(_vm._s(data.time))])])]}}])})],1)])
 }
 var staticRenderFns = []
@@ -5411,6 +5411,24 @@ async function createMaskLayer(polygonDataList = [], options, context = null, ma
     return null
   }
 }
+/**
+ * 防抖
+ * @param {*} fn
+ * @param {*} delay
+ * @returns
+ */
+function debounce(fn, delay = 300) {
+  let timer = null // 存储定时器
+  return function (...args) {
+    // 清除上一次的定时器
+    if (timer) clearTimeout(timer)
+    // 重新设置定时器，延迟执行
+    timer = setTimeout(() => {
+      fn.apply(this, args) // 保留 this 指向和函数参数
+      timer = null // 执行后清空定时器
+    }, delay)
+  }
+}
 
 
 ;// ./src/utils/bearing.js
@@ -5765,7 +5783,7 @@ var jk_map,
 /**
  * 防抖
  */
-function debounce(fn, delay) {
+function augustineGjMapvue_type_script_lang_js_debounce(fn, delay) {
   let timer
   return (...args) => {
     clearTimeout(timer)
@@ -5780,9 +5798,9 @@ function debounce(fn, delay) {
       type: Object,
       default: mapGj_config
     },
-    load: {
-      type: Function,
-      default: null
+    noAbleMoving: {
+      type: Boolean,
+      default: true
     },
     center: {
       type: Array,
@@ -5819,8 +5837,6 @@ function debounce(fn, delay) {
       mapId: 'map' + Math.round(Math.random() * 10000),
       //地图加载loading
       isLoading: true,
-      gjParams: null,
-      apiToken: null,
       currentPathIndex: 0,
       //轨迹点
       pathCoordinates: [],
@@ -5829,19 +5845,9 @@ function debounce(fn, delay) {
       isPaused: false,
       speedNum: 1,
       speed: 500,
-      noAbleMoving: true,
       imgPathData: null
     }
   },
-  activated() {
-    let route = this.$route
-    this.gjParams = route.query
-    this.noAbleMoving = route.query && route.query.cannotMove ? false : true
-    this.isLoading = true
-    if (route.query.token) {
-      this.apiToken = route.query.token
-    }
-  },
   mounted() {
     this.isLoading = true
     this.init(this.mapParams)
@@ -6186,7 +6192,7 @@ function debounce(fn, delay) {
         measurement = new window.jkEsri.Measurement({
           view: jk_view
         })
-        jk_view.on('pointer-move', debounce(this.debouncedHover, 300))
+        jk_view.on('pointer-move', augustineGjMapvue_type_script_lang_js_debounce(this.debouncedHover, 300))
         this.loadMapData()
       })
     },
@@ -6303,10 +6309,10 @@ const map_config_mapConfig = {
 }
 /* harmony default export */ const map_config = (map_config_mapConfig);
 
-;// ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[2]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/vue2/search_map.vue?vue&type=template&id=9a9e2760
-var search_mapvue_type_template_id_9a9e2760_render = function render(){var _vm=this,_c=_vm._self._c;return _c('div',{staticClass:"arcgis-search-wrapper"},[_c('div',{staticClass:"arcigs-search-box"},[_c('CustomSearchInput',{on:{"checked-point":_vm.changeCheckedPoint,"search":_vm.searchMap,"clear":_vm.clearSearch},model:{value:(_vm.keyWord),callback:function ($$v) {_vm.keyWord=$$v},expression:"keyWord"}}),(_vm.keyWord && _vm.isSearch && !_vm.checkedPoint)?_c('div',{staticClass:"search-item-box"},[_c('div',{staticClass:"arcgis-line"}),_c('div',{staticClass:"search-item-wrapper"},[(_vm.mapNameList.length > 0)?[_vm._l((_vm.mapNameList),function(item,idx){return _c('div',{key:idx,staticClass:"search-item",on:{"click":function($event){$event.stopPropagation();return _vm.goDetail(item)}}},[_c('div',{staticClass:"search-name"},[_vm._v(_vm._s(item.name))]),_c('div',{staticClass:"search-address"},[_vm._v(_vm._s(item.address))])])}),(_vm.loadPage)?_c('div',{staticClass:"loaded-box"},[_vm._v(" "+_vm._s(_vm.finished ? '数据加载中...' : '数据已到底!!!')+" ")]):_vm._e()]:_c('div',{staticClass:"search-no-data"},[_vm._v(" "+_vm._s(_vm.loadSearch ? '数据加载中...' : '暂无数据')+" ")])],2)]):_vm._e()],1),_c('CustomModal',{ref:"message",attrs:{"z-index":2000,"animation":"fade","width":"400px"}},[_c('p',[_vm._v("这是淡入弹框")])])],1)
+;// ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[2]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/vue2/search_map.vue?vue&type=template&id=7f480c77
+var search_mapvue_type_template_id_7f480c77_render = function render(){var _vm=this,_c=_vm._self._c;return _c('div',{staticClass:"arcgis-search-wrapper"},[_c('div',{staticClass:"arcigs-search-box"},[_c('CustomSearchInput',{on:{"checked-point":_vm.changeCheckedPoint,"search":_vm.searchMap,"clear":_vm.clearSearch},model:{value:(_vm.keyWord),callback:function ($$v) {_vm.keyWord=$$v},expression:"keyWord"}}),(_vm.keyWord && _vm.isSearch && !_vm.checkedPoint)?_c('div',{staticClass:"search-item-box"},[_c('div',{staticClass:"arcgis-line"}),_c('div',{staticClass:"search-item-wrapper"},[(_vm.mapNameList.length > 0)?[_vm._l((_vm.mapNameList),function(item,idx){return _c('div',{key:idx,staticClass:"search-item",on:{"click":function($event){$event.stopPropagation();return _vm.goDetail(item)}}},[_c('div',{staticClass:"search-name"},[_vm._v(_vm._s(item.name))]),_c('div',{staticClass:"search-address"},[_vm._v(_vm._s(item.address))])])}),(_vm.loadPage)?_c('div',{staticClass:"loaded-box"},[_vm._v(" "+_vm._s(_vm.finished ? '数据加载中...' : '数据已到底!!!')+" ")]):_vm._e()]:_c('div',{staticClass:"search-no-data"},[_vm._v(" "+_vm._s(_vm.loadSearch ? '数据加载中...' : '暂无数据')+" ")])],2)]):_vm._e()],1),_c('CustomModal',{ref:"message",attrs:{"z-index":2000,"animation":"fade","width":"400px"}},[_c('p',[_vm._v("这是淡入弹框")])])],1)
 }
-var search_mapvue_type_template_id_9a9e2760_staticRenderFns = []
+var search_mapvue_type_template_id_7f480c77_staticRenderFns = []
 
 
 ;// ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[2]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/vue2/CustomModal.vue?vue&type=template&id=867722ce
@@ -10858,7 +10864,6 @@ function getDriveRoute(data) {
 
 
 
-var search_Map = null
 /* harmony default export */ const search_mapvue_type_script_lang_js = ({
   name: 'SearchMap',
   components: { CustomSearchInput: CustomSearchInput, CustomModal: CustomModal },
@@ -10892,12 +10897,10 @@ var search_Map = null
     changeCheckedPoint(val) {
       this.checkedPoint = val
     },
-    initMap(data) {
-      search_Map = data.map
+    initMap() {
       this.isSearch = false
       this.checkedPoint = false
       this.clearSearch()
-      search_Map
     },
     goDetail(item) {
       if (item.lonlat) {
@@ -10980,8 +10983,8 @@ var search_Map = null
 ;
 var search_map_component = normalizeComponent(
   vue2_search_mapvue_type_script_lang_js,
-  search_mapvue_type_template_id_9a9e2760_render,
-  search_mapvue_type_template_id_9a9e2760_staticRenderFns,
+  search_mapvue_type_template_id_7f480c77_render,
+  search_mapvue_type_template_id_7f480c77_staticRenderFns,
   false,
   null,
   null,
@@ -11069,9 +11072,9 @@ const mapLocationMixin = {
     },
     setupMapEvents(view) {
       // 点击
-      this._clickHandler = view.on('click', this.debounce(this.handleMapClick, 300))
+      this._clickHandler = view.on('click', debounce(this.handleMapClick, 300))
       // 悬浮
-      this._hoverHandler = view.on('pointer-move', this.debounce(this.handleMapHover, 80))
+      this._hoverHandler = view.on('pointer-move', debounce(this.handleMapHover, 80))
     },
 
     handleMapClick(e) {
@@ -11127,14 +11130,6 @@ const mapLocationMixin = {
       } else arcgisView.container.style.cursor = 'default'
     },
 
-    debounce(fn, delay) {
-      let timer
-      return (...args) => {
-        clearTimeout(timer)
-        timer = setTimeout(() => fn.apply(this, args), delay)
-      }
-    },
-
     cleanupMapEvents() {
       this._clickHandler?.remove()
       this._hoverHandler?.remove()
@@ -11255,9 +11250,7 @@ const mapLocationMixin = {
       } else this.moveCenterPoint()
     },
 
-    clearSearchMap() {
-      console.log('')
-    },
+    clearSearchMap() {},
     clearSketch() {
       mapLocationMixin_pointLayer && mapLocationMixin_pointLayer.removeAll()
       if (this.$refs.searchRef && this.$refs.searchRef.clearSearch)
@@ -11289,7 +11282,7 @@ const mapLocationMixin = {
       this.pointData.address = ''
       if (options) {
         if (options.address) {
-          this.address = data.address
+          this.address = options.address
         }
         if (
           options.center &&
@@ -11297,7 +11290,7 @@ const mapLocationMixin = {
           options.center[0] &&
           options.center[1]
         ) {
-          this.center = data.center
+          this.center = options.center
         }
         if (arcgisMap && arcgisView) {
           setTimeout(() => {
@@ -11329,12 +11322,18 @@ const mapLocationMixin = {
         }
         return datas
       } else return datas
+    },
+    destroy() {
+      this.moveCenterPoint()
+      setTimeout(() => {
+        this.clearSketch()
+        this._clickHandler?.remove()
+        this._hoverHandler?.remove()
+      }, 200)
     }
   },
   beforeUnmount() {
-    this.clearSketch()
-    this._clickHandler?.remove()
-    this._hoverHandler?.remove()
+    this.destroy()
   }
 }
 
@@ -11939,6 +11938,7 @@ class SketchManager {
           this.drawIngArea = this.getArea(event.graphic.geometry)
         }
       }
+      this.isActive = true
       if (event.state === 'complete') {
         const graphic = event.graphic
         this.isActive = false
@@ -11958,6 +11958,7 @@ class SketchManager {
       if (selectedGrahic && selectedGrahic.length > 0) {
         this.drawIngArea = this.getArea(selectedGrahic[0].geometry)
       }
+      this.isActive = true
       if (event.state === 'complete') {
         this.isActive = false
         this.isNextList = []
@@ -12057,7 +12058,7 @@ const mapMixin = {
     module: {
       type: Array,
       default: () => {
-        return ['search', 'edit', 'screen'] //edit:编辑,screen:全屏,search:搜索-'search', 'edit', 'screen'
+        return [] //edit:编辑,screen:全屏,search:搜索-'search', 'edit', 'screen'
       }
     },
     //最大可绘制的图形数量
@@ -12097,9 +12098,17 @@ const mapMixin = {
       isPer: false,
       drawIngArea: 0,
       isDel: false,
-      isDelAll: false
+      isDelAll: false,
+      debouncedRetuanGraphics: null
     }
   },
+  created() {
+    // 包装 retuanGraphics 为防抖方法，延迟 500ms（可自定义）
+    // 此处用箭头函数确保 this 指向组件实例，或用 bind(this)
+    this.debouncedRetuanGraphics = debounce(() => {
+      this.retuanGraphics()
+    }, 500) // 防抖延迟与原 setTimeout 一致，也可调整
+  },
   methods: {
     /**
      * 给数值添加千分位（强制保留2位小数，兼容负数/0/超长字符串等场景）
@@ -12133,8 +12142,8 @@ const mapMixin = {
      * @param {*} view
      */
     setupMapEvents(view) {
-      this._clickHandler = view.on('click', this.debounce(this.handleMapClick, 300))
-      this._hoverHandler = view.on('pointer-move', this.debounce(this.handleMapHover, 80))
+      this._clickHandler = view.on('click', debounce(this.handleMapClick, 300))
+      this._hoverHandler = view.on('pointer-move', debounce(this.handleMapHover, 80))
     },
     /**
      * 鼠标点击
@@ -12183,13 +12192,6 @@ const mapMixin = {
         mapMixin_arcgisView.container.style.cursor = 'default'
       }
     },
-    debounce(fn, delay) {
-      let timer
-      return (...args) => {
-        clearTimeout(timer)
-        timer = setTimeout(() => fn.apply(this, args), delay)
-      }
-    },
     /**
      * 清除监听
      */
@@ -12241,9 +12243,8 @@ const mapMixin = {
             : 0
           graphics = data.graphics
           this.isDelAll = graphics.length > 0
-          setTimeout(() => {
-            this.retuanGraphics()
-          }, 500)
+
+          this.debouncedRetuanGraphics()
         })
       }
       this.setupMapEvents(data.view)
@@ -12356,7 +12357,6 @@ const mapMixin = {
         form.mArea = Number(area) * 0.0015 // 亩
         form.hectareArea = Number(area) * 0.0001 // 公顷
       }
-      console.log('formatMapData00', form, graphics)
       return form
     },
     /**
@@ -12371,8 +12371,9 @@ const mapMixin = {
      * @param {*} type
      */
     batchDraw(graphics) {
-      sketchLayer && sketchLayer.removeAll()
-      if (graphics.length > 0) {
+      if (graphics.length > 0 && sketchLayer) {
+        sketchLayer && sketchLayer.removeAll()
+
         let sketchArr = []
         graphics.map((item) => {
           let grahic = null
@@ -12393,8 +12394,8 @@ const mapMixin = {
       } else this.goToCenter()
     },
     batchNnselectDraw(graphics, textKey = 'text') {
-      unselectableLayer && unselectableLayer.removeAll()
-      if (graphics.length > 0) {
+      if (graphics.length > 0 && unselectableLayer) {
+        unselectableLayer && unselectableLayer.removeAll()
         let sketchArr = []
         graphics.map((item) => {
           let grahic = null
@@ -12430,10 +12431,15 @@ const mapMixin = {
     destroy() {
       this.cleanupMapEvents()
       if (mapMixin_sketch && mapMixin_sketch.destroy) mapMixin_sketch.destroy()
+      unselectableLayer && unselectableLayer.removeAll()
       this.goToCenter()
       if (this.$refs.searchRef && this.$refs.searchRef.clearSearch) {
         this.$refs.searchRef.clearSearch()
       }
+      if (this.debouncedRetuanGraphics) {
+        // 若防抖函数支持取消，可在此处取消（需修改防抖函数）
+        clearTimeout(this.debouncedRetuanGraphics.timer)
+      }
     }
   },
   beforeUnmount() {
@@ -12497,7 +12503,8 @@ var mapListMixin_arcgisMap = null,
   mapListMixin_arcgisView = null,
   mapListMixin_currentAbortController,
   mapListMixin_isClickLocked = false,
-  mapListMixin_pointLayer = null
+  mapListMixin_pointLayer = null,
+  textLayer = null
 const mapListMixin = {
   components: { loadingBox: loading },
   props: {
@@ -12510,6 +12517,10 @@ const mapListMixin = {
       default: () => {
         return []
       }
+    },
+    mapKey: {
+      type: String,
+      default: 'name'
     }
   },
   computed: {},
@@ -12537,9 +12548,9 @@ const mapListMixin = {
     },
     setupMapEvents(view) {
       // 点击
-      this._clickHandler = view.on('click', this.debounce(this.handleMapClick, 300))
+      this._clickHandler = view.on('click', debounce(this.handleMapClick, 300))
       // 悬浮
-      this._hoverHandler = view.on('pointer-move', this.debounce(this.handleMapHover, 80))
+      this._hoverHandler = view.on('pointer-move', debounce(this.handleMapHover, 80))
     },
     changeGraphic(data) {
       if (mapListMixin_pointLayer && mapListMixin_pointLayer.graphics && mapListMixin_pointLayer.graphics._items) {
@@ -12547,10 +12558,16 @@ const mapListMixin = {
           let url = item.attributes.url,
             width = item.attributes.width,
             height = item.attributes.height
-          if (data && item && item.attributes && item.attributes.name == data.name) {
+          if (
+            data &&
+            item &&
+            item.attributes &&
+            item.attributes[this.mapKey] == data[this.mapKey]
+          ) {
             url = data.activeUrl ? data.activeUrl : data.url
-            width = data.width + 5
+            width = data.width + 10
             height = (data.height * width) / data.width
+            mapJumpTo(data)
           }
           item.symbol = getPictureMarker({
             url: url,
@@ -12613,13 +12630,6 @@ const mapListMixin = {
         this.$emit('mapEventMouse', hitData)
       } else mapListMixin_arcgisView.container.style.cursor = 'default'
     },
-    debounce(fn, delay) {
-      let timer
-      return (...args) => {
-        clearTimeout(timer)
-        timer = setTimeout(() => fn.apply(this, args), delay)
-      }
-    },
     cleanupMapEvents() {
       this._clickHandler?.remove()
       this._hoverHandler?.remove()
@@ -12633,6 +12643,9 @@ const mapListMixin = {
       setTimeout(() => {
         mapListMixin_pointLayer = new window.jkEsri.GraphicsLayer({ id: 'pointLayer' })
         mapListMixin_arcgisMap.add(mapListMixin_pointLayer, 10)
+        textLayer = new window.jkEsri.GraphicsLayer({ id: 'textLayer' })
+        mapListMixin_arcgisMap.add(textLayer, 10)
+
         this.drawPoints()
         this.setupMapEvents(data.view)
         this.$emit('loadEdMap', data)
@@ -12660,10 +12673,26 @@ const mapListMixin = {
      */
     drawPoints() {
       if (this.pointsList && this.pointsList.length > 0) {
-        const validGraphics = this.pointsList
-          .map((item) => drawPoint({ ...item, symbol: getPictureMarker(item) }))
-          .filter((g) => g !== null) // 过滤掉失败项
+        let validGraphics = [],
+          textGrahics = []
+        this.pointsList.map((item) => {
+          const pointGraphic = drawPoint({ ...item, symbol: getPictureMarker(item) })
+          const textGrahic = drawPoint({
+            ...item,
+            symbol: getSimpleText(
+              {
+                ...item,
+                yoffset: item.yoffset ? item.yoffset : -(item.height / 2 + 15)
+              },
+              this.mapKey
+            )
+          })
+          if (pointGraphic) validGraphics.push(pointGraphic)
+          if (textGrahic) textGrahics.push(textGrahic)
+        })
+
         mapListMixin_pointLayer.addMany(validGraphics)
+        textLayer.addMany(textGrahics)
         mapJumpTo(mapListMixin_pointLayer)
       } else this.moveCenterPoint()
     },
@@ -12675,6 +12704,7 @@ const mapListMixin = {
       this.pointsList = data || []
       if (mapListMixin_arcgisMap && mapListMixin_arcgisView) {
         if (mapListMixin_pointLayer) mapListMixin_pointLayer.removeAll()
+        if (textLayer) textLayer.removeAll()
         this.drawPoints()
       }
     }
@@ -12731,17 +12761,16 @@ var mapList_component = normalizeComponent(
 
 
 
-// export { augustineGjMap, augustineMap, locationMap, mapList };
 // 所有组件列表
-const components = [augustineGjMap, augustineMap, locationMap, mapList];
+const components = [augustineGjMap, augustineMap, locationMap, mapList]
 // install 方法
 const install = (Vue) => {
-  if (install.installed) return;
-  install.installed = true;
+  if (install.installed) return
+  install.installed = true
   components.forEach((comp) => {
-    Vue.component(comp.name, comp);
-  });
-};
+    Vue.component(comp.name, comp)
+  })
+}
 
 // 支持 Vue.use(MyLib)
 /* harmony default export */ const src_0 = ({
@@ -12773,12 +12802,12 @@ const install = (Vue) => {
   drawPolyline: drawPolyline,
   drawPolygon: drawPolygon,
   drawPolygonArr: drawPolygonArr,
-  getArea: getArea,
+  getArea: getArea
 });
 
 // 浏览器环境自动安装
-if (typeof window !== "undefined" && window.Vue) {
-  install(window.Vue);
+if (typeof window !== 'undefined' && window.Vue) {
+  install(window.Vue)
 }
 
 ;// ./node_modules/@vue/cli-service/lib/commands/build/entry-lib.js