vue2-client 1.2.38 → 1.2.40

package/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**##1.2.40 -2022-04-24 @苗艳强**
+- 问题修复：
+- 修复 singlepage 页面不能缓存的问题
+
+**##1.2.39 -2022-04-22 @朱子峰**
+- 问题修复：
+- [工单提交] 修复数据库时区问题，正确显示时间
+
 **##1.2.38 -2022-04-22 @朱子峰**
 - 功能修改：
 - [工单提交] 要求联系方式必须明确填写，不再从vuex中获取

package/docs/notice.md

@@ -1,22 +1,22 @@
-# 开发规范(持续跟新)
-## 引入各种文件时,必须写绝对路径, 不允许写相对路径
-```js
-// 引自己项目时文件时,  @ 表示自己项目的src目录
-import('@vue2-client/pages/system/queryParams')
-```
-## 编写vue文件的样式时, 必须使用less, 样式必须在最外层添加当前页面html的id, id与vue文件名相同
-```vue
-helloWorld.vue
-<template>
-  <div id="helloWorld">
-  
-  </div>
-</template>
-
-<style lang="less">
- #helloWorld{
-  /*写自己的样式*/
- }
-</style>
-```
-
+# 开发规范(持续跟新)
+## 引入各种文件时,必须写绝对路径, 不允许写相对路径
+```js
+// 引自己项目时文件时,  @ 表示自己项目的src目录
+import('@vue2-client/pages/system/queryParams')
+```
+## 编写vue文件的样式时, 必须使用less, 样式必须在最外层添加当前页面html的id, id与vue文件名相同
+```vue
+helloWorld.vue
+<template>
+  <div id="helloWorld">
+  
+  </div>
+</template>
+
+<style lang="less">
+ #helloWorld{
+  /*写自己的样式*/
+ }
+</style>
+```
+

package/package.json

@@ -1,90 +1,90 @@
-{
-  "name": "vue2-client",
-  "version": "1.2.38",
-  "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": {
-    "@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",
-    "@vue/babel-helper-vue-jsx-merge-props": "^1.2.1",
-    "@vue/babel-preset-jsx": "^1.2.4",
-    "animate.css": "^4.1.0",
-    "ant-design-vue": "1.7.8",
-    "axios": "^0.19.2",
-    "clipboard": "^2.0.6",
-    "core-js": "^3.6.5",
-    "date-fns": "^2.14.0",
-    "default-passive-events": "^2.0.0",
-    "enquire.js": "^2.1.6",
-    "file-saver": "^2.0.5",
-    "highlight.js": "^10.2.1",
-    "js-cookie": "^2.2.1",
-    "jsencrypt": "^3.0.0-rc.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-infinite-scroll": "^2.0.2",
-    "vue-router": "^3.3.4",
-    "vuedraggable": "^2.23.2",
-    "vuex": "^3.4.0",
-    "xlsx": "0.17.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",
-    "@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",
-    "babel-eslint": "^10.1.0",
-    "babel-jest": "^27.0.6",
-    "babel-plugin-transform-remove-console": "^6.9.4",
-    "babel-polyfill": "^6.26.0",
-    "compression-webpack-plugin": "^2.0.0",
-    "deepmerge": "^4.2.2",
-    "echarts": "^4.9.0",
-    "eslint": "^6.7.2",
-    "eslint-plugin-import": "^2.25.3",
-    "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",
-    "script-loader": "^0.7.2",
-    "style-resources-loader": "^1.3.2",
-    "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"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not ie <= 10"
-  ]
-}
+{
+  "name": "vue2-client",
+  "version": "1.2.40",
+  "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": {
+    "@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",
+    "@vue/babel-helper-vue-jsx-merge-props": "^1.2.1",
+    "@vue/babel-preset-jsx": "^1.2.4",
+    "animate.css": "^4.1.0",
+    "ant-design-vue": "1.7.8",
+    "axios": "^0.19.2",
+    "clipboard": "^2.0.6",
+    "core-js": "^3.6.5",
+    "date-fns": "^2.14.0",
+    "default-passive-events": "^2.0.0",
+    "enquire.js": "^2.1.6",
+    "file-saver": "^2.0.5",
+    "highlight.js": "^10.2.1",
+    "js-cookie": "^2.2.1",
+    "jsencrypt": "^3.0.0-rc.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-infinite-scroll": "^2.0.2",
+    "vue-router": "^3.3.4",
+    "vuedraggable": "^2.23.2",
+    "vuex": "^3.4.0",
+    "xlsx": "0.17.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",
+    "@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",
+    "babel-eslint": "^10.1.0",
+    "babel-jest": "^27.0.6",
+    "babel-plugin-transform-remove-console": "^6.9.4",
+    "babel-polyfill": "^6.26.0",
+    "compression-webpack-plugin": "^2.0.0",
+    "deepmerge": "^4.2.2",
+    "echarts": "^4.9.0",
+    "eslint": "^6.7.2",
+    "eslint-plugin-import": "^2.25.3",
+    "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",
+    "script-loader": "^0.7.2",
+    "style-resources-loader": "^1.3.2",
+    "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"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not ie <= 10"
+  ]
+}

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

@@ -1,149 +1,149 @@
-<template>
-  <a-drawer
-    title="选择参数组"
-    placement="right"
-    :width="isMobile ? screenWidth : screenWidth * 0.85"
-    :visible="visible"
-    @close="onClose"
-  >
-    <x-add-form
-      business-title="参数设置"
-      business-type="编辑"
-      :visible.sync="editQueryVisible"
-      :json-data="formObj.formJson"
-      :modify-model-data="this.modifyModelData[this.formObj.groupName]"
-      :loading="loading"
-      @onSubmit="submit"/>
-    <a-list
-      :grid="{gutter: 24, lg: 4, md: 3, sm: 1, xs: 1}"
-      :dataSource="columnJson.groups"
-    >
-      <a-list-item slot="renderItem" slot-scope="item">
-        <a-card :hoverable="true" @click="toEdit(item)">
-          <a-card-meta >
-            <div style="margin-bottom: 3px" slot="title">{{ item.group }}</div>
-            <a-icon type="tags" slot="avatar" :style="{ fontSize:'2em' }"/>
-            <div class="meta-content" slot="description">{{ item.describe }}</div>
-          </a-card-meta>
-        </a-card>
-      </a-list-item>
-    </a-list>
-  </a-drawer>
-</template>
-
-<script>
-import { mapState } from 'vuex'
-import XAddForm from '@vue2-client/base-client/components/common/XAddForm/XAddForm'
-import { commonApi, post } from '@vue2-client/services/api'
-
-export default {
-  name: 'FormGroupEdit',
-  components: {
-    XAddForm
-  },
-  data () {
-    return {
-      // 页面宽度
-      screenWidth: document.documentElement.clientWidth,
-      // 是否显示参数下发抽屉
-      editQueryVisible: false,
-      targetIndex: 0,
-      columnJson: {},
-      editIndex: -1,
-      formObj: {
-        groupName: '',
-        formJson: []
-      },
-      // 参数设置业务执行状态
-      loading: false
-    }
-  },
-  mounted () {
-    this.initView()
-  },
-  computed: {
-    ...mapState('setting', ['isMobile'])
-  },
-  props: {
-    visible: {
-      type: Boolean,
-      default: false
-    },
-    modifyModelData: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    }
-  },
-  watch: {
-    visible (rel) {
-      if (rel) {
-        this.initView()
-      }
-    }
-  },
-  methods: {
-    // 初始化组件
-    initView () {
-      this.$emit('getColumnJson', val => {
-        this.columnJson = val
-      })
-    },
-    toEdit (item) {
-      post(commonApi.getColumnsJson, { queryObject: item }).then(res => {
-        this.formObj = res
-        this.editQueryVisible = true
-      })
-    },
-    onClose () {
-      this.$emit('update:visible', false)
-    },
-    submit (res) {
-      if (res.valid) {
-        this.loading = true
-        const requestParameters = {
-          paramsJson: {}
-        }
-        requestParameters.paramsJson[this.formObj.groupName] = {}
-        for (const key of Object.keys(res.form)) {
-          const realKey = key.substring(key.indexOf('_') + 1)
-          requestParameters.paramsJson[this.formObj.groupName][realKey] = res.form[key]
-        }
-        this.$emit('onSubmit', requestParameters, result => {
-          if (result) {
-            this.$message.success('参数设置成功！')
-          } else {
-            this.$message.error('参数设置失败！')
-          }
-          this.loading = false
-          this.editQueryVisible = false
-        })
-      } else {
-        return false
-      }
-    }
-  }
-}
-</script>
-<style lang="less" scoped>
-  .card-avatar {
-    width: 48px;
-    height: 48px;
-    border-radius: 48px;
-  }
-  .new-btn{
-    border-radius: 2px;
-    width: 100%;
-    height: 187px;
-  }
-  .meta-content{
-    position: relative;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    display: -webkit-box;
-    height: 64px;
-    -webkit-line-clamp: 3;
-    -webkit-box-orient: vertical;
-  }
-</style>
+<template>
+  <a-drawer
+    title="选择参数组"
+    placement="right"
+    :width="isMobile ? screenWidth : screenWidth * 0.85"
+    :visible="visible"
+    @close="onClose"
+  >
+    <x-add-form
+      business-title="参数设置"
+      business-type="编辑"
+      :visible.sync="editQueryVisible"
+      :json-data="formObj.formJson"
+      :modify-model-data="this.modifyModelData[this.formObj.groupName]"
+      :loading="loading"
+      @onSubmit="submit"/>
+    <a-list
+      :grid="{gutter: 24, lg: 4, md: 3, sm: 1, xs: 1}"
+      :dataSource="columnJson.groups"
+    >
+      <a-list-item slot="renderItem" slot-scope="item">
+        <a-card :hoverable="true" @click="toEdit(item)">
+          <a-card-meta >
+            <div style="margin-bottom: 3px" slot="title">{{ item.group }}</div>
+            <a-icon type="tags" slot="avatar" :style="{ fontSize:'2em' }"/>
+            <div class="meta-content" slot="description">{{ item.describe }}</div>
+          </a-card-meta>
+        </a-card>
+      </a-list-item>
+    </a-list>
+  </a-drawer>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+import XAddForm from '@vue2-client/base-client/components/common/XAddForm/XAddForm'
+import { commonApi, post } from '@vue2-client/services/api'
+
+export default {
+  name: 'FormGroupEdit',
+  components: {
+    XAddForm
+  },
+  data () {
+    return {
+      // 页面宽度
+      screenWidth: document.documentElement.clientWidth,
+      // 是否显示参数下发抽屉
+      editQueryVisible: false,
+      targetIndex: 0,
+      columnJson: {},
+      editIndex: -1,
+      formObj: {
+        groupName: '',
+        formJson: []
+      },
+      // 参数设置业务执行状态
+      loading: false
+    }
+  },
+  mounted () {
+    this.initView()
+  },
+  computed: {
+    ...mapState('setting', ['isMobile'])
+  },
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    modifyModelData: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    }
+  },
+  watch: {
+    visible (rel) {
+      if (rel) {
+        this.initView()
+      }
+    }
+  },
+  methods: {
+    // 初始化组件
+    initView () {
+      this.$emit('getColumnJson', val => {
+        this.columnJson = val
+      })
+    },
+    toEdit (item) {
+      post(commonApi.getColumnsJson, { queryObject: item }).then(res => {
+        this.formObj = res
+        this.editQueryVisible = true
+      })
+    },
+    onClose () {
+      this.$emit('update:visible', false)
+    },
+    submit (res) {
+      if (res.valid) {
+        this.loading = true
+        const requestParameters = {
+          paramsJson: {}
+        }
+        requestParameters.paramsJson[this.formObj.groupName] = {}
+        for (const key of Object.keys(res.form)) {
+          const realKey = key.substring(key.indexOf('_') + 1)
+          requestParameters.paramsJson[this.formObj.groupName][realKey] = res.form[key]
+        }
+        this.$emit('onSubmit', requestParameters, result => {
+          if (result) {
+            this.$message.success('参数设置成功！')
+          } else {
+            this.$message.error('参数设置失败！')
+          }
+          this.loading = false
+          this.editQueryVisible = false
+        })
+      } else {
+        return false
+      }
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+  .card-avatar {
+    width: 48px;
+    height: 48px;
+    border-radius: 48px;
+  }
+  .new-btn{
+    border-radius: 2px;
+    width: 100%;
+    height: 187px;
+  }
+  .meta-content{
+    position: relative;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    height: 64px;
+    -webkit-line-clamp: 3;
+    -webkit-box-orient: vertical;
+  }
+</style>