vue2-client 1.2.86 → 1.2.90

package/.env

@@ -1,15 +1,15 @@
-VUE_APP_PUBLIC_PATH=/
-VUE_APP_NAME=Admin
-VUE_APP_ROUTES_KEY=admin.routes
-VUE_APP_PERMISSIONS_KEY=admin.permissions
-VUE_APP_ROLES_KEY=admin.roles
-VUE_APP_USER_KEY=admin.user
-VUE_APP_LOGIN_KEY=admin.login
-VUE_APP_SETTING_KEY=admin.setting
-VUE_APP_TBAS_KEY=admin.tabs
-VUE_APP_TBAS_TITLES_KEY=admin.tabs.titles
-VUE_APP_DICTIONARY_KEY=admin.dictionary
-VUE_APP_BADGE_KEY=admin.badge
-VUE_APP_SINGLEVALUE_KEY=admin.singlevalue
-VUE_APP_DIVISIONSOHCHINA=admin.divisionsohchina
-VUE_APP_API_BASE_URL=http://123.60.214.109:8405
+VUE_APP_PUBLIC_PATH=/
+VUE_APP_NAME=Admin
+VUE_APP_ROUTES_KEY=admin.routes
+VUE_APP_PERMISSIONS_KEY=admin.permissions
+VUE_APP_ROLES_KEY=admin.roles
+VUE_APP_USER_KEY=admin.user
+VUE_APP_LOGIN_KEY=admin.login
+VUE_APP_SETTING_KEY=admin.setting
+VUE_APP_TBAS_KEY=admin.tabs
+VUE_APP_TBAS_TITLES_KEY=admin.tabs.titles
+VUE_APP_DICTIONARY_KEY=admin.dictionary
+VUE_APP_BADGE_KEY=admin.badge
+VUE_APP_SINGLEVALUE_KEY=admin.singlevalue
+VUE_APP_DIVISIONSOHCHINA=admin.divisionsohchina
+VUE_APP_API_BASE_URL=http://123.60.214.109:8405

package/.eslintrc.js

@@ -1,82 +1,82 @@
-module.exports = {
-  root: true,
-  env: {
-    node: true
-  },
-  'extends': [
-    'plugin:vue/essential',
-    'plugin:vue/strongly-recommended',
-    '@vue/standard'
-  ],
-  rules: {
-    'comma-dangle': 'off',
-    'no-console': 'off',
-    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
-    'generator-star-spacing': 'off',
-    'no-mixed-operators': 0,
-    'vue/max-attributes-per-line': [
-      2,
-      {
-        'singleline': 5,
-        'multiline': {
-          'max': 1,
-          'allowFirstLine': false
-        }
-      }
-    ],
-    'vue/attribute-hyphenation': 0,
-    'vue/html-self-closing': 0,
-    'vue/component-name-in-template-casing': 0,
-    'vue/html-closing-bracket-spacing': 0,
-    'vue/singleline-html-element-content-newline': 0,
-    'vue/no-unused-components': 0,
-    'vue/multiline-html-element-content-newline': 0,
-    'vue/no-use-v-if-with-v-for': 0,
-    'vue/html-closing-bracket-newline': 0,
-    'vue/no-parsing-error': 0,
-    'vue/name-property-casing': 0,
-    'no-tabs': 0,
-    'quotes': [
-      2,
-      'single',
-      {
-        'avoidEscape': true,
-        'allowTemplateLiterals': true
-      }
-    ],
-    'semi': [
-      2,
-      'never',
-      {
-        'beforeStatementContinuationChars': 'never'
-      }
-    ],
-    'no-delete-var': 2,
-    'prefer-const': [
-      2,
-      {
-        'ignoreReadBeforeAssign': false
-      }
-    ],
-    'template-curly-spacing': 'off',
-    'indent': 'off',
-    // 必须使用全等: false
-    'eqeqeq': 0,
-    // 可以使用!! 双重否定
-    'no-extra-boolean-cast': 'off'
-  },
-  parserOptions: {
-    parser: 'babel-eslint'
-  },
-  overrides: [
-    {
-      files: [
-        '**/__tests__/*.{j,t}s?(x)',
-        '**/tests/unit/**/*.spec.{j,t}s?(x)'
-      ],
-      env: {
-        jest: true
-      }
-    }
-  ]
-}
+module.exports = {
+  root: true,
+  env: {
+    node: true
+  },
+  'extends': [
+    'plugin:vue/essential',
+    'plugin:vue/strongly-recommended',
+    '@vue/standard'
+  ],
+  rules: {
+    'comma-dangle': 'off',
+    'no-console': 'off',
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+    'generator-star-spacing': 'off',
+    'no-mixed-operators': 0,
+    'vue/max-attributes-per-line': [
+      2,
+      {
+        'singleline': 5,
+        'multiline': {
+          'max': 1,
+          'allowFirstLine': false
+        }
+      }
+    ],
+    'vue/attribute-hyphenation': 0,
+    'vue/html-self-closing': 0,
+    'vue/component-name-in-template-casing': 0,
+    'vue/html-closing-bracket-spacing': 0,
+    'vue/singleline-html-element-content-newline': 0,
+    'vue/no-unused-components': 0,
+    'vue/multiline-html-element-content-newline': 0,
+    'vue/no-use-v-if-with-v-for': 0,
+    'vue/html-closing-bracket-newline': 0,
+    'vue/no-parsing-error': 0,
+    'vue/name-property-casing': 0,
+    'no-tabs': 0,
+    'quotes': [
+      2,
+      'single',
+      {
+        'avoidEscape': true,
+        'allowTemplateLiterals': true
+      }
+    ],
+    'semi': [
+      2,
+      'never',
+      {
+        'beforeStatementContinuationChars': 'never'
+      }
+    ],
+    'no-delete-var': 2,
+    'prefer-const': [
+      2,
+      {
+        'ignoreReadBeforeAssign': false
+      }
+    ],
+    'template-curly-spacing': 'off',
+    'indent': 'off',
+    // 必须使用全等: false
+    'eqeqeq': 0,
+    // 可以使用!! 双重否定
+    'no-extra-boolean-cast': 'off'
+  },
+  parserOptions: {
+    parser: 'babel-eslint'
+  },
+  overrides: [
+    {
+      files: [
+        '**/__tests__/*.{j,t}s?(x)',
+        '**/tests/unit/**/*.spec.{j,t}s?(x)'
+      ],
+      env: {
+        jest: true
+      }
+    }
+  ]
+}

package/CHANGELOG.md

@@ -1,7 +1,7 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
-**1.2.81 - 1.2.86 -2022-07-21 @朱子峰**
+**1.2.81 - 1.2.89 -2022-07-21 @朱子峰**
 - 功能新增：
 - 兼容V4登陆
 

package/package.json

@@ -1,94 +1,94 @@
-{
-  "name": "vue2-client",
-  "version": "1.2.86",
-  "private": false,
-  "scripts": {
-    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
-    "test:unit": "vue-cli-service test:unit",
-    "lint": "vue-cli-service lint"
-  },
-  "dependencies": {
-    "@amap/amap-jsapi-loader": "^1.0.1",
-    "@antv/data-set": "^0.11.8",
-    "@antv/f2": "^3.8.11",
-    "@antv/g2plot": "^2.4.20",
-    "@babel/core": "^7.18.5",
-    "@logicflow/core": "^1.1.20",
-    "@logicflow/extension": "^1.1.20",
-    "@vue/babel-helper-vue-jsx-merge-props": "^1.2.1",
-    "@vue/babel-preset-jsx": "^1.2.4",
-    "animate.css": "^4.1.1",
-    "ant-design-vue": "^1.7.8",
-    "axios": "^0.27.2",
-    "clipboard": "^2.0.11",
-    "core-js": "^3.23.2",
-    "webpack": "^4.46.0",
-    "date-fns": "^2.28.0",
-    "default-passive-events": "^2.0.0",
-    "enquire.js": "^2.1.6",
-    "file-saver": "^2.0.5",
-    "highlight.js": "^11.5.1",
-    "js-cookie": "^3.0.1",
-    "jsencrypt": "^3.2.1",
-    "lodash.get": "^4.4.2",
-    "mockjs": "^1.1.0",
-    "nprogress": "^0.2.0",
-    "viser-vue": "^2.4.8",
-    "vue": "^2.6.14",
-    "vue-i18n": "^8.27.2",
-    "vue-infinite-scroll": "^2.0.2",
-    "vue-json-viewer": "^2.2.22",
-    "vue-router": "^3.5.4",
-    "vuedraggable": "^2.24.3",
-    "vuex": "^3.6.2",
-    "xlsx": "^0.18.5"
-  },
-  "devDependencies": {
-    "@ant-design/colors": "^6.0.0",
-    "@vue/cli-plugin-babel": "^4.5.18",
-    "@vue/cli-plugin-eslint": "^4.5.18",
-    "@vue/cli-plugin-router": "^4.5.18",
-    "@vue/cli-plugin-unit-jest": "~5.0.6",
-    "@vue/cli-plugin-vuex": "^4.5.18",
-    "@vue/cli-service": "^4.5.18",
-    "@vue/eslint-config-standard": "^4.0.0",
-    "@vue/test-utils": "^1.3.0",
-    "@vue/vue2-jest": "^27.0.0",
-    "@vuepress/plugin-back-to-top": "^1.9.7",
-    "babel-eslint": "^10.1.0",
-    "babel-jest": "^27.1.0",
-    "babel-plugin-transform-remove-console": "^6.9.4",
-    "babel-polyfill": "^6.26.0",
-    "compression-webpack-plugin": "^5.0.2",
-    "deepmerge": "^4.2.2",
-    "echarts": "^5.3.3",
-    "eslint": "^6.8.0",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-standard": "^5.0.0",
-    "eslint-plugin-vue": "^6.2.2",
-    "fast-deep-equal": "^3.1.3",
-    "gh-pages": "^3.2.3",
-    "jest": "^27.1.0",
-    "less": "^3.13.1",
-    "less-loader": "^7.3.0",
-    "react-bmap": "^1.0.130",
-    "script-loader": "^0.7.2",
-    "style-resources-loader": "^1.5.0",
-    "vue-amap": "^0.5.10",
-    "vue-baidu-map": "^0.21.22",
-    "vue-bmap-gl": "^0.0.30",
-    "vue-cli-plugin-style-resources-loader": "^0.1.5",
-    "vue-mapvgl": "^0.0.34",
-    "vue-template-compiler": "^2.6.14",
-    "vuepress": "^1.9.7",
-    "webpack-theme-color-replacer": "^1.4.1",
-    "whatwg-fetch": "^3.6.2"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not ie <= 10"
-  ]
-}
+{
+  "name": "vue2-client",
+  "version": "1.2.90",
+  "private": false,
+  "scripts": {
+    "serve": "vue-cli-service serve",
+    "build": "vue-cli-service build",
+    "test:unit": "vue-cli-service test:unit",
+    "lint": "vue-cli-service lint"
+  },
+  "dependencies": {
+    "@amap/amap-jsapi-loader": "^1.0.1",
+    "@antv/data-set": "^0.11.8",
+    "@antv/f2": "^3.8.11",
+    "@antv/g2plot": "^2.4.20",
+    "@babel/core": "^7.18.5",
+    "@logicflow/core": "^1.1.20",
+    "@logicflow/extension": "^1.1.20",
+    "@vue/babel-helper-vue-jsx-merge-props": "^1.2.1",
+    "@vue/babel-preset-jsx": "^1.2.4",
+    "animate.css": "^4.1.1",
+    "ant-design-vue": "^1.7.8",
+    "axios": "^0.27.2",
+    "clipboard": "^2.0.11",
+    "core-js": "^3.23.2",
+    "webpack": "^4.46.0",
+    "date-fns": "^2.28.0",
+    "default-passive-events": "^2.0.0",
+    "enquire.js": "^2.1.6",
+    "file-saver": "^2.0.5",
+    "highlight.js": "^11.5.1",
+    "js-cookie": "^3.0.1",
+    "jsencrypt": "^3.2.1",
+    "lodash.get": "^4.4.2",
+    "mockjs": "^1.1.0",
+    "nprogress": "^0.2.0",
+    "viser-vue": "^2.4.8",
+    "vue": "2.6.14",
+    "vue-i18n": "^8.27.2",
+    "vue-infinite-scroll": "^2.0.2",
+    "vue-json-viewer": "^2.2.22",
+    "vue-router": "^3.5.4",
+    "vuedraggable": "^2.24.3",
+    "vuex": "^3.6.2",
+    "xlsx": "^0.18.5"
+  },
+  "devDependencies": {
+    "@ant-design/colors": "^6.0.0",
+    "@vue/cli-plugin-babel": "^4.5.18",
+    "@vue/cli-plugin-eslint": "^4.5.18",
+    "@vue/cli-plugin-router": "^4.5.18",
+    "@vue/cli-plugin-unit-jest": "~4.5.19",
+    "@vue/cli-plugin-vuex": "^4.5.18",
+    "@vue/cli-service": "^4.5.18",
+    "@vue/eslint-config-standard": "^4.0.0",
+    "@vue/test-utils": "^1.3.0",
+    "@vue/vue2-jest": "^27.0.0",
+    "@vuepress/plugin-back-to-top": "^1.9.7",
+    "babel-eslint": "^10.1.0",
+    "babel-jest": "^27.1.0",
+    "babel-plugin-transform-remove-console": "^6.9.4",
+    "babel-polyfill": "^6.26.0",
+    "compression-webpack-plugin": "^5.0.2",
+    "deepmerge": "^4.2.2",
+    "echarts": "^5.3.3",
+    "eslint": "^6.8.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-standard": "^5.0.0",
+    "eslint-plugin-vue": "^6.2.2",
+    "fast-deep-equal": "^3.1.3",
+    "gh-pages": "^3.2.3",
+    "jest": "^27.1.0",
+    "less": "^3.13.1",
+    "less-loader": "^7.3.0",
+    "react-bmap": "^1.0.130",
+    "script-loader": "^0.7.2",
+    "style-resources-loader": "^1.5.0",
+    "vue-amap": "^0.5.10",
+    "vue-baidu-map": "^0.21.22",
+    "vue-bmap-gl": "^0.0.30",
+    "vue-cli-plugin-style-resources-loader": "^0.1.5",
+    "vue-mapvgl": "^0.0.34",
+    "vue-template-compiler": "2.6.14",
+    "vuepress": "^1.9.7",
+    "webpack-theme-color-replacer": "^1.4.1",
+    "whatwg-fetch": "^3.6.2"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not ie <= 10"
+  ]
+}

package/src/base-client/components/common/AmapMarker/AmapPointRendering.vue

@@ -1,113 +1,113 @@
-<template >
-  <div id="amap_point_rendering_map" :style="mapStyle">
-    <div v-show="false">
-      <div id="amap_point_rendering_template">
-        <a-descriptions :column="1">
-          <a-descriptions-item v-for="(des, index) in describeList" :key="index" :label="des.describe" >{{ markers[des.field] }}</a-descriptions-item>
-        </a-descriptions>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-  import { GetGDMap } from '@vue2-client/utils/map-utils'
-  export default {
-    name: 'AmapPointRendering',
-    props: {
-      // 选中点位后需要展示的信息描述
-      describeList: {
-        type: Array,
-        // eslint-disable-next-line vue/require-valid-default-prop
-        default: () => { return [ ] } // lng:描述信息 lat:描述信息对应的值的字段名 { describe: '用户名称', field: 'name' }
-      },
-      // 需要渲染的点位数据
-      markers: {
-        type: String,
-        default: null // lng:经度值 lat:纬度值
-      },
-      // 渲染点位的图片
-      imgurl: {
-        type: String,
-        default: '/image/success1.png'
-      },
-      mapStyle: {
-        type: Object,
-        default: () => {
-          return {
-            width: '100%',
-            height: '85vh',
-            border: '2px solid lightgray',
-            'border-radius': '5px'
-          }
-        }
-      }
-    },
-    data () {
-      return {
-        map: null,
-        geocoder: null, // 逆地理编码
-        infoWindow: null,
-        selectrow: {}
-      }
-    },
-    created () {
-    },
-    mounted () {
-      GetGDMap().then(aMap => {
-        this.initMap(aMap)
-        this.initData(aMap)
-      })
-    },
-    methods: {
-      initMap (aMap) {
-        this.map = new (aMap).Map('amap_point_rendering_map', { // 设置地图容器id
-          resizeEnable: true, // 是否监控地图容器尺寸变化
-          zoom: 17, // 初始化地图层级
-          center: [108.943784, 34.265] // 初始化地图中心点
-        })
-        this.geocoder = new (aMap).Geocoder({
-          radius: 500 // 范围，默认：500
-        })
-        this.map.addControl(new (aMap).ToolBar()) // 初始化工具插件
-        // 初始化窗体
-        this.infoWindow = new (aMap).InfoWindow({
-          anchor: 'bottom-center',
-          isCustom: false, // 使用自定义窗体
-          autoMove: true,
-          content: '',
-          showShadow: true,
-          offset: new (aMap).Pixel(0, -25)
-        })
-      },
-      initData (aMap) {
-        // 创建一个 Marker 实例：
-        if (this.markers) {
-          const lngLat = this.markers.split(',')
-          const lng = lngLat[0]
-          const lat = lngLat[1]
-          const marker = new (aMap).Marker({
-            // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-            position: new (aMap).LngLat(lng, lat),
-            title: '北京',
-            icon: new (aMap).Icon({
-              // 图标大小
-              size: new (aMap).Size(26, 28),
-              // 报警图标URL
-              url: this.imgurl,
-              // 图标偏移位置
-              anchor: new (aMap).Pixel(0, 0),
-            }),
-            extData: this.markers
-          })
-          marker.on('click', function (e) {
-            this.infoWindow.setContent(document.getElementById('amap_point_rendering_template'))
-            this.infoWindow.open(this.map, [e.target.getExtData().lng, e.target.getExtData().lat])
-          })
-          // 将创建的点标记添加到已有的地图实例：
-          this.map.add(marker)
-          this.map.setFitView()
-        }
-      }
-    }
-  }
-</script>
+<template >
+  <div id="amap_point_rendering_map" :style="mapStyle">
+    <div v-show="false">
+      <div id="amap_point_rendering_template">
+        <a-descriptions :column="1">
+          <a-descriptions-item v-for="(des, index) in describeList" :key="index" :label="des.describe" >{{ markers[des.field] }}</a-descriptions-item>
+        </a-descriptions>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+  import { GetGDMap } from '@vue2-client/utils/map-utils'
+  export default {
+    name: 'AmapPointRendering',
+    props: {
+      // 选中点位后需要展示的信息描述
+      describeList: {
+        type: Array,
+        // eslint-disable-next-line vue/require-valid-default-prop
+        default: () => { return [ ] } // lng:描述信息 lat:描述信息对应的值的字段名 { describe: '用户名称', field: 'name' }
+      },
+      // 需要渲染的点位数据
+      markers: {
+        type: String,
+        default: null // lng:经度值 lat:纬度值
+      },
+      // 渲染点位的图片
+      imgurl: {
+        type: String,
+        default: '/image/success1.png'
+      },
+      mapStyle: {
+        type: Object,
+        default: () => {
+          return {
+            width: '100%',
+            height: '85vh',
+            border: '2px solid lightgray',
+            'border-radius': '5px'
+          }
+        }
+      }
+    },
+    data () {
+      return {
+        map: null,
+        geocoder: null, // 逆地理编码
+        infoWindow: null,
+        selectrow: {}
+      }
+    },
+    created () {
+    },
+    mounted () {
+      GetGDMap().then(aMap => {
+        this.initMap(aMap)
+        this.initData(aMap)
+      })
+    },
+    methods: {
+      initMap (aMap) {
+        this.map = new (aMap).Map('amap_point_rendering_map', { // 设置地图容器id
+          resizeEnable: true, // 是否监控地图容器尺寸变化
+          zoom: 17, // 初始化地图层级
+          center: [108.943784, 34.265] // 初始化地图中心点
+        })
+        this.geocoder = new (aMap).Geocoder({
+          radius: 500 // 范围，默认：500
+        })
+        this.map.addControl(new (aMap).ToolBar()) // 初始化工具插件
+        // 初始化窗体
+        this.infoWindow = new (aMap).InfoWindow({
+          anchor: 'bottom-center',
+          isCustom: false, // 使用自定义窗体
+          autoMove: true,
+          content: '',
+          showShadow: true,
+          offset: new (aMap).Pixel(0, -25)
+        })
+      },
+      initData (aMap) {
+        // 创建一个 Marker 实例：
+        if (this.markers) {
+          const lngLat = this.markers.split(',')
+          const lng = lngLat[0]
+          const lat = lngLat[1]
+          const marker = new (aMap).Marker({
+            // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+            position: new (aMap).LngLat(lng, lat),
+            title: '北京',
+            icon: new (aMap).Icon({
+              // 图标大小
+              size: new (aMap).Size(26, 28),
+              // 报警图标URL
+              url: this.imgurl,
+              // 图标偏移位置
+              anchor: new (aMap).Pixel(0, 0),
+            }),
+            extData: this.markers
+          })
+          marker.on('click', function (e) {
+            this.infoWindow.setContent(document.getElementById('amap_point_rendering_template'))
+            this.infoWindow.open(this.map, [e.target.getExtData().lng, e.target.getExtData().lat])
+          })
+          // 将创建的点标记添加到已有的地图实例：
+          this.map.add(marker)
+          this.map.setFitView()
+        }
+      }
+    }
+  }
+</script>