vue2-client 1.2.83 → 1.2.84

package/package.json

@@ -1,94 +1,94 @@
-{
-  "name": "vue2-client",
-  "version": "1.2.83",
-  "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.84",
+  "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"
+  ]
+}

package/src/base-client/components/common/AddressSearchCombobox/AddressSearchCombobox.vue

@@ -18,7 +18,7 @@
             slot="label">
             <a-icon type="bank" /> {{ group.title }}
           </span>
-          <a-select-option v-for="address in group.children" :key="address.label + ' (' + address.value + ')'">
+          <a-select-option v-for="address in group.children" :key="address.label + ' <' + address.value + '>'">
             <p class="addressName"><a-icon type="environment" /> <span v-html="highLight(address.label, address.word)">{{ address.label }}</span></p>
             <p v-if="address.address !== '[]'" class="addressRemark">
               {{ address.address }}
@@ -87,7 +87,7 @@ export default {
     onSelect (value) {
       let result
       if (this.searchResultType !== 'Default') {
-        const _arr = value.replace(')', '').split('(')
+        const _arr = value.replace('>', '').split('<')
         if (this.searchResultType === 'Array') {
            result = _arr
         } else {
@@ -119,7 +119,7 @@ export default {
                 }
                 addressMap[res.district].push({
                   label: res.name,
-                  value: res.location.lng + ',' + res.location.lat + ',',
+                  value: res.location.lng + ',' + res.location.lat,
                   address: res.address + '',
                   word: value
                 })

package/src/base-client/components/common/AmapMarker/index.js

@@ -1,3 +1,3 @@
-import AmapPointRendering from './AmapPointRendering'
-
-export default AmapPointRendering
+import AmapPointRendering from './AmapPointRendering'
+
+export default AmapPointRendering

package/src/base-client/components/common/ScrollList/SrcollList.vue

@@ -1,113 +1,113 @@
-<template>
-  <a-list
-    :data-source="model.rows"
-    :bordered="bordered"
-    v-infinite-scroll="handleInfiniteOnLoad"
-    class="srcoll-list-infinite-container"
-    :infinite-scroll-disabled="busy"
-    :infinite-scroll-distance="distance"
-  >
-    <a-list-item slot="renderItem" class="srcoll_list_li" slot-scope="item,index" @click="selectItem(index,item)">
-      <slot :item="item" :index="index" >
-      </slot>
-    </a-list-item>
-    <div v-if="loading && !busy" class="srcoll-list-loading-container">
-      <a-spin />
-    </div>
-  </a-list>
-</template>
-
-<script>
-  import infiniteScroll from 'vue-infinite-scroll'
-  import { post } from '@vue2-client/services/api/restTools'
-
-  export default {
-    name: 'SrcollList1',
-    directives: { infiniteScroll },
-    props: {
-      'busy': { // 是否执行回调
-        type: Boolean,
-        default: false
-      },
-      'distance': { // 距底部多少像素触发回调
-        type: Number,
-        default: 1
-      },
-      'bordered': { // 是否显示列表边框
-        type: Boolean,
-        default: true
-      },
-      'model': {
-        type: Object,
-        default: () => {
-          return {}
-        }
-      }
-    },
-    data () {
-      return {
-        selectRow: {},
-        loading: false
-      }
-    },
-    mounted () {
-    },
-    methods: {
-      selectItem (index, item) {
-        this.$emit('selectItem', index, item)
-      },
-      handleInfiniteOnLoad () {
-        this.loading = true
-        if (this.model.pageNo < this.model.totalPage || this.model.pageNo == 0) {
-          this.model.pageNo = this.model.pageNo + 1
-          post(this.model.url, { data: this.model }).then((res) => {
-            this.model.rows = this.model.rows.concat(res.data).map((item, index) => ({ ...item, index }))
-            this.loading = false
-            this.model.totalPage = res.totalPage
-            this.model.totalCount = res.totalCount
-          })
-        } else {
-          this.loading = false
-        }
-      },
-      search () {
-        this.model.pageNo = 0
-        this.model.rows = []
-        this.handleInfiniteOnLoad()
-      }
-    }
-  }
-</script>
-
-<style scoped>
-  .srcoll-list-infinite-container {
-    border-radius: 4px;
-    height: 100%;
-    overflow-y: scroll;
-  }
-  /*滚动条样式*/
-  .srcoll-list-infinite-container::-webkit-scrollbar {
-    width: 4px;
-    /*height: 4px;*/
-  }
-  .srcoll-list-infinite-container::-webkit-scrollbar-thumb {
-    border-radius: 10px;
-    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-    background: rgba(0,0,0,0.2);
-  }
-  .srcoll-list-infinite-container::-webkit-scrollbar-track {
-    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-    border-radius: 0;
-    background: rgba(0,0,0,0.1);
-
-  }
-  .srcoll-list-loading-container {
-    position: absolute;
-    bottom: 10%;
-    width: 100%;
-    text-align: center;
-  }
-  .srcoll_list_li:hover{
-    background-color: rgb(203,234,241);
-  }
-</style>
+<template>
+  <a-list
+    :data-source="model.rows"
+    :bordered="bordered"
+    v-infinite-scroll="handleInfiniteOnLoad"
+    class="srcoll-list-infinite-container"
+    :infinite-scroll-disabled="busy"
+    :infinite-scroll-distance="distance"
+  >
+    <a-list-item slot="renderItem" class="srcoll_list_li" slot-scope="item,index" @click="selectItem(index,item)">
+      <slot :item="item" :index="index" >
+      </slot>
+    </a-list-item>
+    <div v-if="loading && !busy" class="srcoll-list-loading-container">
+      <a-spin />
+    </div>
+  </a-list>
+</template>
+
+<script>
+  import infiniteScroll from 'vue-infinite-scroll'
+  import { post } from '@vue2-client/services/api/restTools'
+
+  export default {
+    name: 'SrcollList1',
+    directives: { infiniteScroll },
+    props: {
+      'busy': { // 是否执行回调
+        type: Boolean,
+        default: false
+      },
+      'distance': { // 距底部多少像素触发回调
+        type: Number,
+        default: 1
+      },
+      'bordered': { // 是否显示列表边框
+        type: Boolean,
+        default: true
+      },
+      'model': {
+        type: Object,
+        default: () => {
+          return {}
+        }
+      }
+    },
+    data () {
+      return {
+        selectRow: {},
+        loading: false
+      }
+    },
+    mounted () {
+    },
+    methods: {
+      selectItem (index, item) {
+        this.$emit('selectItem', index, item)
+      },
+      handleInfiniteOnLoad () {
+        this.loading = true
+        if (this.model.pageNo < this.model.totalPage || this.model.pageNo == 0) {
+          this.model.pageNo = this.model.pageNo + 1
+          post(this.model.url, { data: this.model }).then((res) => {
+            this.model.rows = this.model.rows.concat(res.data).map((item, index) => ({ ...item, index }))
+            this.loading = false
+            this.model.totalPage = res.totalPage
+            this.model.totalCount = res.totalCount
+          })
+        } else {
+          this.loading = false
+        }
+      },
+      search () {
+        this.model.pageNo = 0
+        this.model.rows = []
+        this.handleInfiniteOnLoad()
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .srcoll-list-infinite-container {
+    border-radius: 4px;
+    height: 100%;
+    overflow-y: scroll;
+  }
+  /*滚动条样式*/
+  .srcoll-list-infinite-container::-webkit-scrollbar {
+    width: 4px;
+    /*height: 4px;*/
+  }
+  .srcoll-list-infinite-container::-webkit-scrollbar-thumb {
+    border-radius: 10px;
+    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+    background: rgba(0,0,0,0.2);
+  }
+  .srcoll-list-infinite-container::-webkit-scrollbar-track {
+    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+    border-radius: 0;
+    background: rgba(0,0,0,0.1);
+
+  }
+  .srcoll-list-loading-container {
+    position: absolute;
+    bottom: 10%;
+    width: 100%;
+    text-align: center;
+  }
+  .srcoll_list_li:hover{
+    background-color: rgb(203,234,241);
+  }
+</style>

package/src/base-client/components/common/ScrollList/index.js

@@ -1,3 +1,3 @@
-import SrcollList from './SrcollList'
-
-export default SrcollList
+import SrcollList from './SrcollList'
+
+export default SrcollList