vue2-client 1.2.89 → 1.2.93

package/CHANGELOG.md

@@ -1,6 +1,19 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**1.2.93 -2022-08-03 @江超**
+- 功能新增：
+- util增加uuid方法
+
+**1.2.90 - 1.2.92 -2022-08-01 @江超**
+- 功能新增：
+- XCard增加空状态显示
+- 修复依赖
+
+**1.2.89 - 1.2.90 -2022-07-31 @张振宇**
+- 功能新增：
+- 物联网表用气分析图表
+
 **1.2.81 - 1.2.89 -2022-07-21 @朱子峰**
 - 功能新增：
 - 兼容V4登陆

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.2.89",
+  "version": "1.2.93",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -13,7 +13,6 @@
     "@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",
@@ -22,14 +21,13 @@
     "ant-design-vue": "^1.7.8",
     "axios": "^0.27.2",
     "clipboard": "^2.0.11",
-    "core-js": "^3.23.2",
-    "webpack": "^4.46.0",
+    "core-js": "^3.23.5",
     "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",
+    "highlight.js": "^10.7.3",
+    "js-cookie": "^2.2.1",
     "jsencrypt": "^3.2.1",
     "lodash.get": "^4.4.2",
     "mockjs": "^1.1.0",
@@ -42,16 +40,16 @@
     "vue-router": "^3.5.4",
     "vuedraggable": "^2.24.3",
     "vuex": "^3.6.2",
-    "xlsx": "^0.18.5"
+    "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",
+    "@ant-design/colors": "^4.0.5",
+    "@vue/cli-plugin-babel": "^4.5.19",
+    "@vue/cli-plugin-eslint": "^4.5.19",
+    "@vue/cli-plugin-router": "^4.5.19",
     "@vue/cli-plugin-unit-jest": "~4.5.19",
-    "@vue/cli-plugin-vuex": "^4.5.18",
-    "@vue/cli-service": "^4.5.18",
+    "@vue/cli-plugin-vuex": "^4.5.19",
+    "@vue/cli-service": "^4.5.19",
     "@vue/eslint-config-standard": "^4.0.0",
     "@vue/test-utils": "^1.3.0",
     "@vue/vue2-jest": "^27.0.0",
@@ -60,7 +58,7 @@
     "babel-jest": "^27.1.0",
     "babel-plugin-transform-remove-console": "^6.9.4",
     "babel-polyfill": "^6.26.0",
-    "compression-webpack-plugin": "^5.0.2",
+    "compression-webpack-plugin": "^4.0.1",
     "deepmerge": "^4.2.2",
     "echarts": "^5.3.3",
     "eslint": "^6.8.0",
@@ -71,19 +69,18 @@
     "fast-deep-equal": "^3.1.3",
     "gh-pages": "^3.2.3",
     "jest": "^27.1.0",
-    "less": "^3.13.1",
-    "less-loader": "^7.3.0",
+    "less-loader": "^6.2.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-bmap-gl": "0.0.30",
     "vue-cli-plugin-style-resources-loader": "^0.1.5",
-    "vue-mapvgl": "^0.0.34",
+    "vue-mapvgl": "0.0.34",
     "vue-template-compiler": "2.6.14",
     "vuepress": "^1.9.7",
-    "webpack-theme-color-replacer": "^1.4.1",
+    "webpack-theme-color-replacer": "1.4.1",
     "whatwg-fetch": "^3.6.2"
   },
   "browserslist": [

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

@@ -1,59 +1,64 @@
-<template>
-  <div>
-    <a-card :bordered="false" :body-style="{ margin: 0, padding: 0 }">
-      <a-skeleton active v-show="loadState === 'loading'" style="padding: 16px"/>
-      <a-card
-        v-show="loadState === 'error'"
-        :body-style="{ margin: '0 auto' }"
-        :bordered="false"
-        class="retryCard"
-        :hoverable="true"
-        @click="retry" >
-        <a-icon type="global" :style="{ fontSize: '28px' }"/>
-        <p style="margin-top: 20px" class="noSelect">网络好像开小差了，点击重新加载...</p>
-      </a-card>
-      <div v-show="loadState === 'success'">
-        <slot></slot>
-      </div>
-    </a-card>
-  </div>
-</template>
-
-<script>
-
-export default {
-  name: 'XCard',
-  props: {
-    loadState: {
-      type: String,
-      default: 'success'
-    },
-    retry: {
-      type: Function,
-      default: () => {
-        console.error('未实现重新加载')
-      }
-    }
-  },
-  data () {
-    return {
-
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.retryCard {
-  text-align: center;
-}
-.noSelect {
-  -webkit-touch-callout: none; /* iOS Safari */
-  -webkit-user-select: none; /* Chrome/Safari/Opera */
-  -khtml-user-select: none; /* Konqueror */
-  -moz-user-select: none; /* Firefox */
-  -ms-user-select: none; /* Internet Explorer/Edge */
-  user-select: none; /* Non-prefixed version, currently
-  not supported by any browser */
-}
-</style>
+<template>
+  <div>
+    <a-card :body-style="{ margin: 0, padding: 0 }" :bordered="false">
+      <a-skeleton v-show="loadState === 'loading'" active style="padding: 16px"/>
+      <a-empty v-show="loadState === 'empty'">
+        <a-button type="dashed" @click="retry">
+          重新加载
+        </a-button>
+      </a-empty>
+      <a-card
+        v-show="loadState === 'error'"
+        :body-style="{ margin: '0 auto' }"
+        :bordered="false"
+        :hoverable="true"
+        class="retryCard"
+        @click="retry" >
+        <a-icon :style="{ fontSize: '28px' }" type="global"/>
+        <p class="noSelect" style="margin-top: 20px">网络好像开小差了，点击重新加载...</p>
+      </a-card>
+      <div v-show="loadState === 'success'">
+        <slot></slot>
+      </div>
+    </a-card>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'XCard',
+  props: {
+    loadState: {
+      type: String,
+      default: 'success'
+    },
+    retry: {
+      type: Function,
+      default: () => {
+        console.error('未实现重新加载')
+      }
+    }
+  },
+  data () {
+    return {
+
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.retryCard {
+  text-align: center;
+}
+.noSelect {
+  -webkit-touch-callout: none; /* iOS Safari */
+  -webkit-user-select: none; /* Chrome/Safari/Opera */
+  -khtml-user-select: none; /* Konqueror */
+  -moz-user-select: none; /* Firefox */
+  -ms-user-select: none; /* Internet Explorer/Edge */
+  user-select: none; /* Non-prefixed version, currently
+  not supported by any browser */
+}
+</style>

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -17,7 +17,7 @@
           <a-select-option
             v-for="(item,index) in attr.keys"
             :key="index"
-            :value="Object.keys(item)[0]">{{ item[Object.keys(item)[0]] }}
+            :value="item.value">{{ item.label }}
           </a-select-option>
         </a-select>
       </a-input>
@@ -62,8 +62,8 @@
           <a-select-option
             v-for="(item,index) in attr.keys"
             :key="index"
-            :value="Object.keys(item)[0]">
-            {{ item[Object.keys(item)[0]] }}
+            :value="item.value">
+            {{ item.label }}
           </a-select-option>
         </template>
         <template v-else>
@@ -71,7 +71,7 @@
             <a-select-option
               v-for="(item,index) in option"
               :key="index"
-              :value="Object.keys(item)[0]">{{ item[Object.keys(item)[0]] }}
+              :value="item.value">{{ item.label }}
             </a-select-option>
           </template>
           <template v-else>
@@ -104,7 +104,7 @@
         <a-select-option
           v-for="(item,index) in option"
           :key="index"
-          :value="Object.keys(item)[0]">{{ item[Object.keys(item)[0]] }}
+          :value="item.value">{{ item.label }}
         </a-select-option>
       </a-select>
     </a-form-model-item>