vue2-client 1.2.72 → 1.2.75

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,6 +1,19 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**1.2.75 -2022-06-18 @江超**
+- 功能修改：
+- 依赖更新
+- 提交物联网设备统计（完成60%）
+
+**1.2.74 -2022-06-17 @张振宇**
+- 功能修改：
+- 拖拽样式修改
+
+**1.2.73 -2022-06-16 @江超**
+- 功能修改：
+- 现在表格列排序不再通过前端判断，而是从后端生成了
+
 **1.2.71 - 1.2.72 2022-06-16 @张振宇**
 - 功能修改：
 - 基础表单bug修改

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.2.72",
+  "version": "1.2.75",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -11,77 +11,77 @@
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@antv/data-set": "^0.11.4",
-    "@antv/f2": "^3.6.4",
-    "@antv/g2plot": "^2.3.33",
-    "@logicflow/core": "^1.1.7",
-    "@logicflow/extension": "^1.1.7",
+    "@antv/f2": "^3.8.11",
+    "@antv/g2plot": "^2.4.19",
+    "@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.0",
+    "animate.css": "^4.1.1",
     "ant-design-vue": "1.7.8",
-    "axios": "^0.19.2",
-    "clipboard": "^2.0.6",
-    "core-js": "^3.6.5",
-    "date-fns": "^2.14.0",
+    "axios": "^0.27.2",
+    "clipboard": "^2.0.11",
+    "core-js": "^3.23.1",
+    "date-fns": "^2.28.0",
     "default-passive-events": "^2.0.0",
     "enquire.js": "^2.1.6",
     "file-saver": "^2.0.5",
-    "highlight.js": "^10.2.1",
+    "highlight.js": "^10.7.3",
     "js-cookie": "^2.2.1",
-    "jsencrypt": "^3.0.0-rc.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.11",
-    "vue-i18n": "^8.18.2",
-    "vue-json-viewer": "^2.2.15",
+    "vue": "^2.6.14",
+    "vue-i18n": "^8.27.1",
     "vue-infinite-scroll": "^2.0.2",
-    "vue-router": "^3.3.4",
-    "vuedraggable": "^2.23.2",
-    "vuex": "^3.4.0",
-    "xlsx": "0.17.5"
+    "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": "^4.0.1",
-    "@vue/cli-plugin-babel": "^4.4.0",
-    "@vue/cli-plugin-eslint": "^4.4.0",
-    "@vue/cli-plugin-router": "^4.4.0",
-    "@vue/cli-plugin-unit-jest": "~5.0.0",
-    "@vue/cli-plugin-vuex": "^4.4.0",
-    "@vue/cli-service": "^4.4.0",
+    "@ant-design/colors": "^4.0.5",
+    "@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.1.3",
-    "@vue/vue2-jest": "^27.0.0-alpha.2",
-    "@vuepress/plugin-back-to-top": "^1.5.2",
+    "@vue/test-utils": "^1.3.0",
+    "@vue/vue2-jest": "^28.0.0",
+    "@vuepress/plugin-back-to-top": "^1.9.7",
     "babel-eslint": "^10.1.0",
-    "babel-jest": "^27.0.6",
+    "babel-jest": "^28.1.1",
     "babel-plugin-transform-remove-console": "^6.9.4",
     "babel-polyfill": "^6.26.0",
-    "compression-webpack-plugin": "^2.0.0",
+    "compression-webpack-plugin": "^4.0.1",
     "deepmerge": "^4.2.2",
-    "echarts": "^4.9.0",
-    "eslint": "^6.7.2",
-    "eslint-plugin-import": "^2.25.3",
+    "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.1.0",
-    "jest": "^27.0.5",
-    "less-loader": "^6.1.1",
-    "react-bmap": "^1.0.121",
+    "gh-pages": "^3.2.3",
+    "jest": "^28.1.1",
+    "less-loader": "^6.2.0",
+    "react-bmap": "^1.0.130",
     "script-loader": "^0.7.2",
-    "style-resources-loader": "^1.3.2",
+    "style-resources-loader": "^1.5.0",
     "vue-amap": "^0.5.10",
     "vue-baidu-map": "^0.21.22",
-    "vue-bmap-gl": "0.0.29",
-    "vue-cli-plugin-style-resources-loader": "^0.1.4",
-    "vue-mapvgl": "0.0.28",
-    "vue-template-compiler": "^2.6.11",
-    "vuepress": "^1.5.2",
-    "webpack-theme-color-replacer": "1.3.18",
-    "whatwg-fetch": "^3.0.0"
+    "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%",