npm - vue2-client - Versions diffs - 1.14.12 → 1.14.14 - Mend

vue2-client 1.14.12 → 1.14.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.14.12",
+  "version": "1.14.14",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/XFormTable/XFormTable.vue CHANGED Viewed

@@ -82,6 +82,7 @@
             @editButtonStateDataClick="editButtonStateDataClick"
             @importExcelOk="importExcelOk"
             @rowClick="handleRowClick"
+            @beforeDataChange="beforeDataChange"
             @expand="onExpand">
             <template slot="leftButton" slot-scope="{selectedRowKeys, selectedRows}">
               <slot name="leftButton" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
@@ -824,6 +825,9 @@ export default {
     handleRowClick (record) {
       this.$emit('rowClick', record)
     },
+    beforeDataChange (record) {
+      this.$emit('beforeDataChange', record)
+    },
     onExpand (expanded, record) {
       this.$emit('expand', expanded, record)
     }

package/src/base-client/components/common/XReport/print.js CHANGED Viewed

@@ -1,186 +1,186 @@
-// print.js
-export function printElement (elementToPrint) {
-  // 创建一个新的浏览器窗口
-  const printWindow = window.open('', '_blank', 'height=1024,width=768')
-  // 设置新窗口的文档内容
-  printWindow.document.write(`
-    <html>
-      <head>
-        <title>Print</title>
-        <style>
-          @page {
-            size: auto;
-            margin: 0mm;
-          }
-          html, body {
-            margin: 0;
-            padding: 0;
-            width: 100%;
-            height: 100%;
-          }
-          #print-container {
-            display: none
-          }
-          .img{
-            width: 95%;
-            height: 180px;
-            object-fit: cover;
-          }
-          .reportMain {
-            text-align: center;
-            margin: 0 auto;
-            font-size: 16px;
-            color: #000;
-            background-color: #fff;
-            padding: 15px;
-            border-radius: 8px;
-            .reportTitle {
-              font-weight: bold;
-            }
-            .subTitle {
-              display: flex;
-              justify-content: space-between;
-              margin-bottom: 1%;
-              .subTitleItems {
-                max-width: 30%;
-              }
-            }
-            .inputsDiv {
-              display: flex;
-              justify-content: space-between;
-              .inputsDivItem {
-                display: flex;
-                align-items: center;
-                padding: 0 4px;
-                white-space: nowrap;
-                .inputsDivItemLabel {
-                  padding: 0 4px;
-                }
-              }
-            }
-            .reportTable {
-              width: 100%;
-              border-collapse: collapse;
-              table-layout:fixed;
-              word-break:break-all;
-              text-align: center;
-            }
-          }
-          .reportMainForDisplay {
-            text-align: center;
-            margin: 10% auto;
-            font-size: 16px;
-            color: #000;
-            background-color: #fff;
-            padding: 15px;
-            border-radius: 8px;
-            .reportTitle {
-              font-weight: bold;
-            }
-            .subTitle {
-              display: flex;
-              justify-content: space-between;
-              .subTitleItems {
-                max-width: 30%;
-              }
-            }
-            .inputsDiv {
-              display: flex;
-              justify-content: space-around;
-              .inputsDivItem {
-                display: flex;
-                align-items: center;
-                padding: 0 4px;
-                white-space: nowrap;
-                .inputsDivItemLabel {
-                  padding: 0 4px;
-                }
-              }
-            }
-            .reportTable {
-              width: 100%;
-              border-collapse: collapse;
-              table-layout:fixed;
-              word-break:break-all;
-            }
-          }
-          .reportMainNoPadding {
-            text-align: center;
-            margin: 0 auto;
-            font-size: 16px;
-            color: #000;
-            background-color: #fff;
-            border-radius: 8px;
-            .reportTitle {
-              font-weight: bold;
-            }
-            .subTitle {
-              display: flex;
-              justify-content: space-between;
-              .subTitleItems {
-                max-width: 30%;
-              }
-            }
-            .inputsDiv {
-              display: flex;
-              justify-content: space-between;
-              .inputsDivItem {
-                display: flex;
-                align-items: center;
-                padding: 0 4px;
-                white-space: nowrap;
-                .inputsDivItemLabel {
-                  padding: 0 4px;
-                }
-              }
-            }
-            .reportTable {
-              width: 100%;
-              border-collapse: collapse;
-              table-layout:fixed;
-              word-break:break-all;
-            }
-          }
-          .tools{
-            position: fixed;
-            right: 2%;
-            text-align: right;
-            width: 60%;
-            cursor: pointer;
-            .toolsItem{
-              width: 15%;
-              margin-right: 3%;
-              display: inline-block;
-            }
-          }
-        </style>
-      </head>
-      <body>
-        <!-- 将需要打印的元素内容复制到新窗口中 -->
-        ${elementToPrint.innerHTML}
-      </body>
-    </html>
-  `)
-  // 延迟执行打印，以确保新窗口的内容已加载完成
-  printWindow.document.close() // 关闭文档流，确保内容完全加载
-  setTimeout(() => {
-    printWindow.print() // 调用打印方法
-    printWindow.close()
-  }, 500) // 延迟500毫秒后执行打印
-}
+// print.js
+export function printElement (elementToPrint) {
+  // 创建一个新的浏览器窗口
+  const printWindow = window.open('', '_blank', 'height=1024,width=768')
+  // 设置新窗口的文档内容
+  printWindow.document.write(`
+    <html>
+      <head>
+        <title>Print</title>
+        <style>
+          @page {
+            size: auto;
+            margin: 0mm;
+          }
+          html, body {
+            margin: 0;
+            padding: 0;
+            width: 100%;
+            height: 100%;
+          }
+          #print-container {
+            display: none
+          }
+          .img{
+            width: 95%;
+            height: 180px;
+            object-fit: cover;
+          }
+          .reportMain {
+            text-align: center;
+            margin: 0 auto;
+            font-size: 16px;
+            color: #000;
+            background-color: #fff;
+            padding: 15px;
+            border-radius: 8px;
+            .reportTitle {
+              font-weight: bold;
+            }
+            .subTitle {
+              display: flex;
+              justify-content: space-between;
+              margin-bottom: 1%;
+              .subTitleItems {
+                max-width: 30%;
+              }
+            }
+            .inputsDiv {
+              display: flex;
+              justify-content: space-between;
+              .inputsDivItem {
+                display: flex;
+                align-items: center;
+                padding: 0 4px;
+                white-space: nowrap;
+                .inputsDivItemLabel {
+                  padding: 0 4px;
+                }
+              }
+            }
+            .reportTable {
+              width: 100%;
+              border-collapse: collapse;
+              table-layout:fixed;
+              word-break:break-all;
+              text-align: center;
+            }
+          }
+          .reportMainForDisplay {
+            text-align: center;
+            margin: 10% auto;
+            font-size: 16px;
+            color: #000;
+            background-color: #fff;
+            padding: 15px;
+            border-radius: 8px;
+            .reportTitle {
+              font-weight: bold;
+            }
+            .subTitle {
+              display: flex;
+              justify-content: space-between;
+              .subTitleItems {
+                max-width: 30%;
+              }
+            }
+            .inputsDiv {
+              display: flex;
+              justify-content: space-around;
+              .inputsDivItem {
+                display: flex;
+                align-items: center;
+                padding: 0 4px;
+                white-space: nowrap;
+                .inputsDivItemLabel {
+                  padding: 0 4px;
+                }
+              }
+            }
+            .reportTable {
+              width: 100%;
+              border-collapse: collapse;
+              table-layout:fixed;
+              word-break:break-all;
+            }
+          }
+          .reportMainNoPadding {
+            text-align: center;
+            margin: 0 auto;
+            font-size: 16px;
+            color: #000;
+            background-color: #fff;
+            border-radius: 8px;
+            .reportTitle {
+              font-weight: bold;
+            }
+            .subTitle {
+              display: flex;
+              justify-content: space-between;
+              .subTitleItems {
+                max-width: 30%;
+              }
+            }
+            .inputsDiv {
+              display: flex;
+              justify-content: space-between;
+              .inputsDivItem {
+                display: flex;
+                align-items: center;
+                padding: 0 4px;
+                white-space: nowrap;
+                .inputsDivItemLabel {
+                  padding: 0 4px;
+                }
+              }
+            }
+            .reportTable {
+              width: 100%;
+              border-collapse: collapse;
+              table-layout:fixed;
+              word-break:break-all;
+            }
+          }
+          .tools{
+            position: fixed;
+            right: 2%;
+            text-align: right;
+            width: 60%;
+            cursor: pointer;
+            .toolsItem{
+              width: 15%;
+              margin-right: 3%;
+              display: inline-block;
+            }
+          }
+        </style>
+      </head>
+      <body>
+        <!-- 将需要打印的元素内容复制到新窗口中 -->
+        ${elementToPrint.innerHTML}
+      </body>
+    </html>
+  `)
+  // 延迟执行打印，以确保新窗口的内容已加载完成
+  printWindow.document.close() // 关闭文档流，确保内容完全加载
+  setTimeout(() => {
+    printWindow.print() // 调用打印方法
+    printWindow.close()
+  }, 500) // 延迟500毫秒后执行打印
+}

package/src/base-client/components/common/XReportGrid/XReportTrGroup.vue CHANGED Viewed

@@ -34,6 +34,7 @@
                 :serverName="cell.serviceName"
                 v-on="getEventHandlers(cell)"
                 @hook:mounted="(h)=>onComponentMounted(h,cell,cellIndex)"
+                @beforeDataChange="beforeDataChange"
                 @rowClick="handleRowClick"
                 @onExpand="onExpand"
                 :queryParamsName="cell.slotConfig"
@@ -71,6 +72,7 @@
                 :serverName="cell.serviceName"
                 v-on="getEventHandlers(cell)"
                 @hook:mounted="(h)=>onComponentMounted(h,cell,cellIndex)"
+                @beforeDataChange="beforeDataChange"
                 @rowClick="handleRowClick"
                 @onExpand="onExpand"
                 :queryParamsName="cell.slotConfig"
@@ -220,6 +222,9 @@ export default {
     handleRowClick (record) {
       this.$emit('rowClick', record)
     },
+    beforeDataChange (record) {
+      this.$emit('beforeDataChange', record)
+    },
     onExpand (expanded, record) {
       this.$emit('expand', expanded, record)
     },

package/src/base-client/components/common/XTable/XTable.vue CHANGED Viewed

@@ -152,6 +152,7 @@
       <x-table-wrapper
         ref="table"
         @rowClick="handleRowClick"
+        @beforeDataChange="beforeDataChange"
         @expand="onExpand">
         <template slot="expandedRowRender">
           <!-- 列扩展栅格 -->
@@ -257,6 +258,7 @@
       <x-table-wrapper
         ref="selectedDataTable"
         :load-selected-data="true"
+        @beforeDataChange="beforeDataChange"
         @rowClick="handleRowClick">
       </x-table-wrapper>
     </a-modal>
@@ -1332,6 +1334,9 @@ export default {
     handleRowClick (record) {
       this.$emit('rowClick', record)
     },
+    beforeDataChange (record) {
+      this.$emit('beforeDataChange', record)
+    },
     onExpand (expanded, record) {
       this.$emit('expand', expanded, record)
     }

package/src/base-client/components/common/XTable/XTableWrapper.vue CHANGED Viewed

@@ -18,6 +18,7 @@
     :setScrollYHeight="tableContext.setScrollYHeight"
     :selectRowMode="tableContext.selectRowMode"
     :size="tableContext.tableSize"
+    @beforeDataChange="beforeDataChange"
     @expand="onExpand"
     @rowClick="handleRowClick"
   >
@@ -152,6 +153,7 @@
     :selectRowMode="tableContext.selectRowMode"
     :size="tableContext.tableSize"
     @rowClick="handleRowClick"
+    @beforeDataChange="beforeDataChange"
   >
     <template
       v-for="(item, c_index) in tableContext.tableColumns"
@@ -297,6 +299,9 @@ export default {
     handleRowClick (record) {
       this.$emit('rowClick', record)
     },
+    beforeDataChange (record) {
+      this.$emit('beforeDataChange', record)
+    },
     onExpand (expanded, record) {
       this.$emit('expand', expanded, record)
     },

package/src/base-client/components/his/XHisEditor/XHisEditor.vue CHANGED Viewed

@@ -85,6 +85,7 @@
     </a-modal></div>
 </template>
 <script>
 import { runLogic } from '@vue2-client/services/api/common'

package/src/base-client/components/his/XSidebar/XSidebar.vue CHANGED Viewed

@@ -132,14 +132,14 @@ export default {
               currentCol = currentCol.parentNode
             }
             if (currentCol) {
-              // 更新当前列的宽度
+              //  更新当前列的宽度
               const drawerWidth = isOpen ? 33.3 : 2
               // 强制更新样式
               currentCol.style.cssText = `
             flex: 0 0 ${drawerWidth}% !important;
             max-width: ${drawerWidth}% !important;
             transition: all 0.3s;`
-              // 触发XTab组件重新计算宽度
+              //  触发XTab组件重新计算宽度
               this.$nextTick(() => {
                 const tabComponent = this.$el.querySelector('.ant-tabs')
                 if (tabComponent) {
@@ -147,7 +147,7 @@ export default {
                   window.dispatchEvent(new Event('resize'))
                 }
               })
-              // 更新其他列宽度
+              //  更新其他列宽度
               otherCols.forEach((col, index) => {
                 if (index < this.mainWithData.length) {
                   const widthValue = isOpen ? this.mainWithData[index].min : this.mainWithData[index].max

package/src/base-client/components/his/XTitle/README.md ADDED Viewed

@@ -0,0 +1,113 @@
+# XTitle 组件
+## 概述
+XTitle 是一个多功能的标题组件，可以显示标题文本或按钮，支持自定义下划线样式、颜色和宽度。
+## 功能特点
+- 支持显示标题或按钮
+- 支持为标题添加下划线
+- 支持自定义下划线颜色
+- 支持自定义宽度
+- 支持点击事件触发
+## 使用方法
+### 基本用法
+```vue
+<x-title query-params-name="我的标题-title"></x-title>
+```
+### 配置参数格式
+XTitle 组件通过一个字符串参数进行配置
+各部分说明：
+1. `标题文本`: 显示的文本内容
+2. `类型`: 可选值为 `title` 或 `button`
+3. `点击事件名`: 点击时触发的事件名称
+4. `线条`: 设置为 `line` 时显示下划线
+5. `颜色`: 下划线的颜色（如 `red`、`#FF0000`）
+6. `宽度`: 组件宽度，单位为像素（如 `800`）
+## 使用示例
+### 1. 基本标题
+```vue
+<x-title query-params-name="患者信息-title"></x-title>
+```
+### 2. 带下划线的标题
+```vue
+<x-title query-params-name="患者信息-title--line"></x-title>
+```
+### 3. 自定义下划线颜色和宽度
+```vue
+<x-title query-params-name="患者信息-title--line-red-800"></x-title>
+```
+### 4. 带点击事件的标题
+```vue
+<x-title query-params-name="患者信息-title-showPatient-line" @showPatient="handleShowPatient"></x-title>
+```
+### 5. 按钮模式
+```vue
+<x-title query-params-name="提交-button-submit" @submit="handleSubmit"></x-title>
+```
+## 事件
+当组件类型为 `button` 或在标题配置中设置了点击事件名时，点击组件会触发相应的事件。
+```vue
+<template>
+  <x-title query-params-name="提交-button-submit" @submit="handleSubmit"></x-title>
+</template>
+<script>
+export default {
+  methods: {
+    handleSubmit() {
+      // 处理提交逻辑
+      console.log('提交按钮被点击');
+    }
+  }
+}
+</script>
+```
+## 样式自定义
+组件内部样式已预设，但可以通过父级样式或特定类名进行覆盖：
+```vue
+<template>
+  <div class="custom-container">
+    <x-title query-params-name="自定义标题-title"></x-title>
+  </div>
+</template>
+<style scoped>
+.custom-container :deep(.x-title) {
+  font-size: 20px;
+  color: blue;
+}
+</style>
+```
+## 注意事项
+1. 当未指定类型时，默认为 `title` 类型
+2. 线条颜色需要是合法的 CSS 颜色值
+3. 宽度值必须是数字，单位为像素
+4. 组件默认宽度为 100%，设置自定义宽度时会覆盖此值

package/src/base-client/components/his/XTitle/XTitle.vue CHANGED Viewed

@@ -1,62 +1,180 @@
 <template>
-    <div class="x-title" :class="{ 'with-underline': hasUnderline, 'only-line': isOnlyLine }">
-        <span v-show="!isOnlyLine">{{ processedTitle }}</span>
+  <div class="x-title-container">
+    <div
+      v-if="config.type === 'title'"
+      class="x-title"
+      :class="{ 'with-underline': config.line === 'line' }">
+      <span>{{ config.label }}</span>
+      <div
+        v-if="config.line === 'line'"
+        class="underline"
+        :style="getLineStyle()">
+      </div>
     </div>
+    <div v-else-if="config.type === 'button'" class="x-button-container">
+      <a-button type="primary" @click="handleClick">{{ config.label }}</a-button>
+    </div>
+  </div>
 </template>
 <script>
 export default {
-    name: 'XTitle',
-    props: {
-      queryParamsName: {
-        type: String,
-        default: null
-      }
-    },
-    data () {
-      return {
-        title: ''
+  name: 'XTitle',
+  props: {
+    queryParamsName: {
+      type: String,
+      default: ''
+    }
+  },
+  data () {
+    return {
+      config: {
+        label: '',
+        type: 'title',
+        clickName: '',
+        line: '',
+        color: '',
+        lineLength: ''
       }
-    },
-    computed: {
-        processedTitle () {
-            return this.title.replace('</br>', '')
-        },
-        hasUnderline () {
-            return this.title.includes('</br>')
-        },
-        isOnlyLine () {
-            return this.title === '</br>'
+    }
+  },
+  created () {
+    this.getData(this.queryParamsName)
+  },
+  methods: {
+    getData (data) {
+      if (!data) return
+      // 检查是否包含分隔符
+      if (data.includes('-')) {
+        const parts = data.split('-')
+        // 根据部分数量设置配置
+        if (parts.length >= 6) {
+          // 包含颜色和线长度
+          this.config = {
+            label: parts[0],
+            type: parts[1],
+            clickName: parts[2],
+            line: parts[3],
+            color: parts[4],
+            lineLength: parts[5]
+          }
+        } else if (parts.length === 5) {
+          // 只包含颜色
+          this.config = {
+            label: parts[0],
+            type: parts[1],
+            clickName: parts[2],
+            line: parts[3],
+            color: parts[4],
+            lineLength: ''
+          }
+        } else if (parts.length === 4) {
+          this.config = {
+            label: parts[0],
+            type: parts[1],
+            clickName: parts[2],
+            line: parts[3],
+            color: '',
+            lineLength: ''
+          }
+        } else if (parts.length === 3) {
+          this.config = {
+            label: parts[0],
+            type: parts[1],
+            clickName: parts[2],
+            line: '',
+            color: '',
+            lineLength: ''
+          }
+        } else if (parts.length === 2) {
+          this.config = {
+            label: parts[0],
+            type: parts[1],
+            clickName: '',
+            line: '',
+            color: '',
+            lineLength: ''
+          }
+        } else {
+          this.config = {
+            label: data,
+            type: 'title',
+            clickName: '',
+            line: '',
+            color: '',
+            lineLength: ''
+          }
+        }
+      } else {
+        // 没有分隔符，按原来的方式处理
+        this.config = {
+          label: data,
+          type: 'title',
+          clickName: '',
+          line: '',
+          color: '',
+          lineLength: ''
         }
+      }
     },
-    created () {
-      this.getData(this.queryParamsName)
+    handleClick () {
+      if (this.config.clickName) {
+        this.$emit(this.config.clickName)
+      }
     },
-    methods: {
-        getData (data) {
-            this.title = data
-        }
+    getLineStyle () {
+      const style = {}
+      // 设置线条颜色
+      if (this.config.color) {
+        style.backgroundColor = this.config.color
+      } else {
+        style.backgroundColor = '#5D5C5C'
+      }
+      // 设置线条宽度
+      if (this.config.lineLength) {
+        style.width = this.config.lineLength + 'px'
+      } else {
+        style.width = '800'
+      }
+      return style
     }
   }
+}
 </script>
 <style scoped>
+.x-title-container {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
 .x-title {
-    font-size: 18px;
-    font-weight: bold;
-    height: 26px;
-    width: 100%;
-    text-align: left;
-    font-family: "Source Han Sans", sans-serif;
-    color: #5D5C5C;
+  font-size: 18px;
+  font-weight: bold;
+  height: 26px;
+  width: 100%;
+  text-align: left;
+  font-family: "Source Han Sans", sans-serif;
+  color: #5D5C5C;
+  position: relative;
 }
-.with-underline {
-    border-bottom: 1px solid #5D5C5C;
+.underline {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  height: 1px;
+  width: 100%;
+  background-color: #5D5C5C;
 }
-.only-line {
-    height: 1px;
-    background-color: #5D5C5C;
-    margin: 13px 0;
+.x-button-container {
+  text-align: right;
 }
 </style>

package/src/components/STable/index.js CHANGED Viewed

@@ -187,6 +187,18 @@ export default {
         (this.sortOrder && { sortOrder: this.sortOrder }) || {},
         { ...filters }
       )
+      // 在加载新数据前，将当前数据传递给父组件
+      if (this.localDataSource && this.localDataSource.length > 0) {
+        // 变化前的数据: oldData, 分页信息: pagination, 过滤条件: filters, 排序信息: sorter
+        this.$emit('beforeDataChange', {
+          oldData: this.localDataSource,
+          pagination: this.localPagination,
+          filters: filters,
+          sorter: sorter
+        })
+      }
       const result = this.data(parameter)
       // 对接自己的通用数据接口需要修改下方代码中的 r.pageNo, r.totalCount, r.data
       // eslint-disable-next-line

package/src/router/async/router.map.js CHANGED Viewed

@@ -59,7 +59,7 @@ routerResource.example = {
   // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
-  component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDatePicker/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XRate/demo.vue'),
@@ -74,7 +74,7 @@ routerResource.example = {
   // component: () => import('@vue2-client/components/g2Charts/demo.vue'),
   // component: () => import('@vue2-client/pages/LogicCallExample/index.vue'),
   // component: () => import('@vue2-client/components/FilePreview/FilePreviewDemo.vue'),
-  // component: () => import('@vue2-client/pages/ReportGrid/index.vue'),
+  component: () => import('@vue2-client/pages/ReportGrid/index.vue'),
 }
 // routerResource.example = () =>
 //    import('@vue2-client/pages/Example')

package/src/utils/map-utils.js CHANGED Viewed

@@ -1,47 +1,47 @@
-import AMapLoader from '@amap/amap-jsapi-loader'
-let Amap
-async function GetGDMap (secretKey, key) {
-  if (!Amap) {
-    window._AMapSecurityConfig = {
-      securityJsCode: secretKey
-    }
-    //  解决高德地图加载报错 ---> 禁止多种API加载方式混用
-    AMapLoader.reset()
-    Amap = await AMapLoader.load({
-      key: key, // 申请好的Web端开发者Key，首次调用 load 时必填
-      version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-      plugins: ['AMap.IndexCluster', 'AMP.MarkerCluster', 'AMap.InfoWindow', 'AMap.HeatMap', 'AMap.HawkEye', 'AMap.DistrictSearch',
-        'AMap.ToolBar', 'AMap.Geolocation', 'AMap.MouseTool',
-        'AMap.Geocoder', 'AMap.MarkerClusterer', 'AMap.AutoComplete', 'AMap.Scale'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
-      AMapUI: {
-        version: '1.1', // AMapUI 缺省 1.1
-        plugins: ['misc/PositionPicker'] // 需要加载的 AMapUI ui插件
-      }
-    })
-  }
-  return Amap
-}
-async function getGDMap (address) {
-  new (await GetGDMap()).Geocoder({
-    radius: 500 // 范围，默认：500
-  }).getLocation(address, function (status, result) {
-    if (status === 'complete' && result.geocodes.length) {
-      return ({ lng: result.geocodes[0].location.lng, lat: result.geocodes[0].location.lat })
-    } else {
-      // eslint-disable-next-line prefer-promise-reject-errors
-      throw new Error('根据经纬度查询地址失败')
-    }
-  })
-}
-async function GetLocation (address) {
-  return new Promise((resolve, reject) => {
-    try {
-      resolve(getGDMap(address))
-    } catch (e) {
-      reject(e)
-    }
-  })
-}
-export { GetGDMap, GetLocation }
+import AMapLoader from '@amap/amap-jsapi-loader'
+let Amap
+async function GetGDMap (secretKey, key) {
+  if (!Amap) {
+    window._AMapSecurityConfig = {
+      securityJsCode: secretKey
+    }
+    //  解决高德地图加载报错 ---> 禁止多种API加载方式混用
+    AMapLoader.reset()
+    Amap = await AMapLoader.load({
+      key: key, // 申请好的Web端开发者Key，首次调用 load 时必填
+      version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+      plugins: ['AMap.IndexCluster', 'AMP.MarkerCluster', 'AMap.InfoWindow', 'AMap.HeatMap', 'AMap.HawkEye', 'AMap.DistrictSearch',
+        'AMap.ToolBar', 'AMap.Geolocation', 'AMap.MouseTool',
+        'AMap.Geocoder', 'AMap.MarkerClusterer', 'AMap.AutoComplete', 'AMap.Scale'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+      AMapUI: {
+        version: '1.1', // AMapUI 缺省 1.1
+        plugins: ['misc/PositionPicker'] // 需要加载的 AMapUI ui插件
+      }
+    })
+  }
+  return Amap
+}
+async function getGDMap (address) {
+  new (await GetGDMap()).Geocoder({
+    radius: 500 // 范围，默认：500
+  }).getLocation(address, function (status, result) {
+    if (status === 'complete' && result.geocodes.length) {
+      return ({ lng: result.geocodes[0].location.lng, lat: result.geocodes[0].location.lat })
+    } else {
+      // eslint-disable-next-line prefer-promise-reject-errors
+      throw new Error('根据经纬度查询地址失败')
+    }
+  })
+}
+async function GetLocation (address) {
+  return new Promise((resolve, reject) => {
+    try {
+      resolve(getGDMap(address))
+    } catch (e) {
+      reject(e)
+    }
+  })
+}
+export { GetGDMap, GetLocation }