vue2-client 1.8.133 → 1.8.136

package/.env

@@ -15,3 +15,5 @@ VUE_APP_DIVISIONSOHCHINA=admin.divisionsohchina
 VUE_APP_WEB_CONFIG_KEY=admin.webconfig
 VUE_APP_API_BASE_URL=http://123.60.214.109:8405
 VUE_APP_SYSTEM_NAME=af-system
+VUE_APP_LOGIN_VERSION=V4
+

package/package.json

@@ -1,97 +1,97 @@
 {
-  "name": "vue2-client",
-  "version": "1.8.133",
-  "private": false,
-  "scripts": {
-    "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
-    "mac-serve": "vue-cli-service serve --no-eslint --mode mac",
-    "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
-    "test:unit": "vue-cli-service test:unit",
-    "lint": "vue-cli-service lint",
-    "build:preview": "vue-cli-service build --mode preview",
-    "lint:nofix": "vue-cli-service lint --no-fix",
-    "test": "jest"
-  },
-  "dependencies": {
-    "@amap/amap-jsapi-loader": "^1.0.1",
-    "@antv/data-set": "^0.11.8",
-    "@antv/g2plot": "^2.4.31",
-    "@vue/babel-preset-jsx": "^1.4.0",
-    "amis": "^3.4.3",
-    "animate.css": "^4.1.1",
-    "ant-design-vue": "^1.7.8",
-    "axios": "^0.27.2",
-    "clipboard": "^2.0.11",
-    "core-js": "^3.33.0",
-    "crypto-js": "^4.1.1",
-    "date-fns": "^2.29.3",
-    "default-passive-events": "^2.0.0",
-    "dotenv": "^16.3.1",
-    "echarts": "^5.5.0",
-    "enquire.js": "^2.1.6",
-    "file-saver": "^2.0.5",
-    "highlight.js": "^11.7.0",
-    "html2canvas": "^1.4.1",
-    "js-base64": "^3.7.5",
-    "js-cookie": "^2.2.1",
-    "jsencrypt": "^3.3.2",
-    "jspdf": "^2.5.1",
-    "lodash.clonedeep": "^4.5.0",
-    "lodash.get": "^4.4.2",
-    "mockjs": "^1.1.0",
-    "nprogress": "^0.2.0",
-    "qs": "^6.11.2",
-    "regenerator-runtime": "^0.14.0",
-    "videojs-contrib-hls": "^5.15.0",
-    "viser-vue": "^2.4.8",
-    "vue": "^2.7.14",
-    "vue-codemirror": "4.0.6",
-    "vue-i18n": "^8.28.2",
-    "vue-json-viewer": "^2.2.22",
-    "vue-router": "^3.6.5",
-    "vue-video-player": "^5.0.2",
-    "vue-virtual-scroller": "^1.1.2",
-    "vuedraggable": "^2.24.3",
-    "vuex": "^3.6.2",
-    "xlsx": "0.18.5"
-  },
-  "devDependencies": {
-    "@ant-design/colors": "^7.0.0",
-    "@babel/core": "^7.22.20",
-    "@babel/eslint-parser": "^7.22.15",
-    "@babel/preset-env": "^7.22.20",
-    "@vue/cli-plugin-babel": "^5.0.8",
-    "@vue/cli-plugin-eslint": "^5.0.8",
-    "@vue/cli-service": "^5.0.8",
-    "@vue/eslint-config-standard": "^8.0.1",
-    "@vue/test-utils": "^1.3.6",
-    "babel-jest": "^26.6.3",
-    "babel-plugin-transform-remove-console": "^6.9.4",
-    "compression-webpack-plugin": "^10.0.0",
-    "copy-webpack-plugin": "^11.0.0",
-    "css-minimizer-webpack-plugin": "^5.0.1",
-    "deepmerge": "^4.3.1",
-    "eslint": "^8.51.0",
-    "eslint-plugin-vue": "^9.17.0",
-    "fast-deep-equal": "^3.1.3",
-    "ignore-loader": "^0.1.2",
-    "jest": "^26.6.3",
-    "jest-environment-jsdom": "^26.6.2",
-    "jest-transform-stub": "^2.0.0",
-    "less-loader": "^6.2.0",
-    "script-loader": "^0.7.2",
-    "style-resources-loader": "^1.5.0",
-    "vue-cli-plugin-style-resources-loader": "^0.1.5",
-    "vue-jest": "^4.0.1",
-    "vue-template-compiler": "^2.7.14",
-    "webpack": "^5.88.2",
-    "webpack-theme-color-replacer": "^1.4.7",
-    "whatwg-fetch": "^3.6.19"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not dead",
-    "not ie 11"
-  ]
-}
+    "name": "vue2-client",
+    "version": "1.8.136",
+    "private": false,
+    "scripts": {
+        "serve": "vue-cli-service serve --no-eslint",
+        "mac-serve": "vue-cli-service serve --no-eslint --mode mac",
+        "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
+        "test:unit": "vue-cli-service test:unit",
+        "lint": "vue-cli-service lint",
+        "build:preview": "vue-cli-service build --mode preview",
+        "lint:nofix": "vue-cli-service lint --no-fix",
+        "test": "jest"
+    },
+    "dependencies": {
+        "@amap/amap-jsapi-loader": "^1.0.1",
+        "@antv/data-set": "^0.11.8",
+        "@antv/g2plot": "^2.4.31",
+        "@vue/babel-preset-jsx": "^1.4.0",
+        "amis": "^3.4.3",
+        "animate.css": "^4.1.1",
+        "ant-design-vue": "^1.7.8",
+        "axios": "^0.27.2",
+        "clipboard": "^2.0.11",
+        "core-js": "^3.33.0",
+        "crypto-js": "^4.1.1",
+        "date-fns": "^2.29.3",
+        "default-passive-events": "^2.0.0",
+        "dotenv": "^16.3.1",
+        "echarts": "^5.5.0",
+        "enquire.js": "^2.1.6",
+        "file-saver": "^2.0.5",
+        "highlight.js": "^11.7.0",
+        "html2canvas": "^1.4.1",
+        "js-base64": "^3.7.5",
+        "js-cookie": "^2.2.1",
+        "jsencrypt": "^3.3.2",
+        "jspdf": "^2.5.1",
+        "lodash.clonedeep": "^4.5.0",
+        "lodash.get": "^4.4.2",
+        "mockjs": "^1.1.0",
+        "nprogress": "^0.2.0",
+        "qs": "^6.11.2",
+        "regenerator-runtime": "^0.14.0",
+        "videojs-contrib-hls": "^5.15.0",
+        "viser-vue": "^2.4.8",
+        "vue": "^2.7.14",
+        "vue-codemirror": "4.0.6",
+        "vue-i18n": "^8.28.2",
+        "vue-json-viewer": "^2.2.22",
+        "vue-router": "^3.6.5",
+        "vue-video-player": "^5.0.2",
+        "vue-virtual-scroller": "^1.1.2",
+        "vuedraggable": "^2.24.3",
+        "vuex": "^3.6.2",
+        "xlsx": "0.18.5"
+    },
+    "devDependencies": {
+        "@ant-design/colors": "^7.0.0",
+        "@babel/core": "^7.22.20",
+        "@babel/eslint-parser": "^7.22.15",
+        "@babel/preset-env": "^7.22.20",
+        "@vue/cli-plugin-babel": "^5.0.8",
+        "@vue/cli-plugin-eslint": "^5.0.8",
+        "@vue/cli-service": "^5.0.8",
+        "@vue/eslint-config-standard": "^8.0.1",
+        "@vue/test-utils": "^1.3.6",
+        "babel-jest": "^26.6.3",
+        "babel-plugin-transform-remove-console": "^6.9.4",
+        "compression-webpack-plugin": "^10.0.0",
+        "copy-webpack-plugin": "^11.0.0",
+        "css-minimizer-webpack-plugin": "^5.0.1",
+        "deepmerge": "^4.3.1",
+        "eslint": "^8.51.0",
+        "eslint-plugin-vue": "^9.17.0",
+        "fast-deep-equal": "^3.1.3",
+        "ignore-loader": "^0.1.2",
+        "jest": "^26.6.3",
+        "jest-environment-jsdom": "^26.6.2",
+        "jest-transform-stub": "^2.0.0",
+        "less-loader": "^6.2.0",
+        "script-loader": "^0.7.2",
+        "style-resources-loader": "^1.5.0",
+        "vue-cli-plugin-style-resources-loader": "^0.1.5",
+        "vue-jest": "^4.0.1",
+        "vue-template-compiler": "^2.7.14",
+        "webpack": "^5.88.2",
+        "webpack-theme-color-replacer": "^1.4.7",
+        "whatwg-fetch": "^3.6.19"
+    },
+    "browserslist": [
+        "> 1%",
+        "last 2 versions",
+        "not dead",
+        "not ie 11"
+    ]
+}

package/src/ReportView.js

@@ -0,0 +1,19 @@
+import Vue from 'vue'
+import App from './pages/XReportView/index.vue'
+import Vuex from 'vuex'
+import { bootstrap, i18n, message, modules } from '../index'
+
+Vue.use(Vuex)
+
+// 创建router store
+const store = new Vuex.Store({ modules })
+
+// 绑定原型，用于amis
+Vue.$store = store
+
+bootstrap({ i18n, message }).then(() => {
+  new Vue({
+    i18n,
+    render: h => h(App)
+  }).$mount('#app')
+})

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

@@ -18,18 +18,30 @@
         支持单个或多个文件
       </p>
     </a-upload-dragger>
-    <a-upload
-      v-if=" model.type === 'image'"
-      :accept="model.accept.join('')"
-      :customRequest="uploadFiles"
-      :file-list="uploadedFileList"
-      :remove="deleteFileItem"
-      list-type="picture-card">
-      <a-icon type="plus"/>
-      <div class="ant-upload-text">
-        Upload
-      </div>
-    </a-upload>
+    <template v-if="uploadStyle === 'simple'">
+      <a-upload
+        v-if=" model.type === 'image'"
+        :accept="model.accept.join('')"
+        :customRequest="uploadFiles"
+        :file-list="uploadedFileList"
+        :remove="deleteFileItem">
+        <a-button style="margin-top: 2%"> <a-icon type="upload" /> 上传 </a-button>
+      </a-upload>
+    </template>
+    <template v-else>
+      <a-upload
+        v-if=" model.type === 'image'"
+        :accept="model.accept.join('')"
+        :customRequest="uploadFiles"
+        :file-list="uploadedFileList"
+        :remove="deleteFileItem"
+        list-type="picture-card">
+        <a-icon type="plus"/>
+        <div class="ant-upload-text">
+          Upload
+        </div>
+      </a-upload>
+    </template>
   </div>
 </template>
 
@@ -68,6 +80,14 @@ export default {
     serviceName: {
       type: String,
       default: undefined
+    },
+    uploadStyle: {
+      type: String,
+      default: undefined
+    },
+    outerContainerIndex: {
+      type: [String, Number],
+      default: undefined
     }
   },
   computed: {
@@ -80,7 +100,11 @@ export default {
     } else {
       this.uploadedFileList = list
     }
-    this.$emit('setFiles', this.uploadedFileList.filter(item => item.status === 'done').map(item => item.id))
+    if (this.outerContainerIndex !== undefined) {
+      this.$emit('setFiles', this.uploadedFileList.filter(item => item.status === 'done'), this.outerContainerIndex)
+    } else {
+      this.$emit('setFiles', this.uploadedFileList.filter(item => item.status === 'done').map(item => item.id))
+    }
   },
   methods: {
     uploadFiles (info) {
@@ -131,7 +155,11 @@ export default {
           fileInfo.response = dataObj
           fileInfo.id = dataObj.id
           fileInfo.url = dataObj.f_downloadpath
-          this.$emit('setFiles', this.uploadedFileList.filter(item => item.status === 'done').map(item => item.id))
+          if (this.outerContainerIndex !== undefined) {
+            this.$emit('setFiles', this.uploadedFileList.filter(item => item.status === 'done'), this.outerContainerIndex)
+          } else {
+            this.$emit('setFiles', this.uploadedFileList.filter(item => item.status === 'done').map(item => item.id))
+          }
           this.$message.success('上传成功！')
         } else {
           fileInfo.status = 'error'
@@ -154,7 +182,11 @@ export default {
       const index = this.uploadedFileList.indexOf(file)
       // 从列表中移除该文件
       this.uploadedFileList.splice(index, 1)
-      this.$emit('setFiles', this.uploadedFileList.filter(item => item.status === 'done').map(item => item.id))
+      if (this.outerContainerIndex !== undefined) {
+        this.$emit('setFiles', this.uploadedFileList.filter(item => item.status === 'done'), this.outerContainerIndex)
+      } else {
+        this.$emit('setFiles', this.uploadedFileList.filter(item => item.status === 'done').map(item => item.id))
+      }
       return true
     }
   }

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

@@ -7,17 +7,23 @@
         <a-radio-button value="design">
           设计
         </a-radio-button>
-        <a-radio-button value="display">
+        <a-radio-button value="display" style="border-radius: 0">
           预览
         </a-radio-button>
       </a-radio-group>
+      <a-radio-button @click="saveConfig" style="border-radius: 0 4px 4px 0">
+        保存
+      </a-radio-button>
       <!--   主体表格   -->
       <XReportDesign
         v-if="scanFinish"
         :config="type === 'display' ? originalConfig : activeConfig"
         :slot-config-name="type === 'display' ? undefined : activatedSlotName"
         :for-display="type === 'display'"
-        id="printReady">
+        ref="XReportDesign"
+        id="printReady"
+        :show-images="hasImages"
+        :image-list="imageList">
       </XReportDesign>
       <!--   导出按钮   -->
       <template v-if="type === 'display'">
@@ -42,6 +48,16 @@ import XReportDesign from '@vue2-client/base-client/components/common/XReport/XR
 export default {
   name: 'XReport',
   props: {
+    files: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    authority: {
+      type: String,
+      default: 'user'
+    },
     configName: {
       type: String,
       required: true
@@ -62,7 +78,7 @@ export default {
   components: {
     XReportDesign
   },
-  data() {
+  data () {
     return {
       config: undefined,
       type: 'design',
@@ -76,12 +92,33 @@ export default {
       originalConfig: null,
       // 扫描到的配置
       configFromWeb: {},
-      timer: undefined
+      timer: undefined,
+      hasImages: false,
+      imageList: []
+    }
+  },
+  watch: {
+    configName (val) {
+      if (val) {
+        getConfigByName(this.configName, undefined, res => {
+          this.config = res
+          this.configInit()
+        })
+      }
+    },
+    localConfig (val) {
+      if (val) {
+        this.config = val
+        this.configInit()
+      }
     }
   },
   methods: {
+    saveConfig () {
+      this.$emit('saveConfig', this.$refs.XReportDesign.activatedConfig)
+    },
     // 检查slot是否在配置文件中包含，如果没有包含，则视为非法获取
-    checkSlotDefine(config) {
+    checkSlotDefine (config) {
       const slotsDeclare = config.slotsDeclare
       const total = slotsDeclare.length
       let count = 0
@@ -98,16 +135,30 @@ export default {
       return count === total
     },
     // 切换了标签页
-    tabChanged(key) {
+    tabChanged (key) {
       this.scanFinish = false
-      this.originalConfig.data = {...this.originalConfig.data, ...this.config.data}
+      this.originalConfig.data = { ...this.originalConfig.data, ...this.config.data }
       this.config.data = this.originalConfig.data
+      if (this.type === 'display') {
+        let count = 0
+        this.imageList = []
+        const keys = Object.keys(this.config.data.images)
+        keys.forEach(key => {
+          if (this.config.data.images[key].length > 0) {
+            this.imageList = [...this.imageList, ...this.config.data.images[key]]
+            count++
+          }
+        })
+        this.hasImages = count > 0
+      } else {
+        this.hasImages = false
+      }
       this.$nextTick(() => {
         this.scanFinish = true
       })
     },
     // 获取当前日期，为保存文件命名用
-    getDate() {
+    getDate () {
       const currentDate = new Date()
 
       const year = currentDate.getFullYear()
@@ -119,7 +170,7 @@ export default {
       return formattedDate
     },
     // 导出PDF
-    exportPDF() {
+    exportPDF () {
       const date = this.getDate()
       let title = this.config.title
       title = title.replace(/<[^>]+>/g, '')
@@ -127,7 +178,7 @@ export default {
       HtmlToPdf.getPdf(fileName, '#printReady')
     },
     // 用于分割配置中的colums，将需要处理的数组提取出来
-    formatConfigRow() {
+    formatConfigRow () {
       for (let i = 0; i < this.config.columns.length; i++) {
         // 对原始数组进行递归，依次将该位置拆分为三个部分，当前处理位置之前的，当前处理位置，当前处理位置之后的
         const before = this.config.columns.slice(0, i)
@@ -177,7 +228,7 @@ export default {
       }
     },
     // 处理colums数组，为声明了rowspan的单元格，自动匹配格式
-    checkRow(rowArr) {
+    checkRow (rowArr) {
       // 不需要更改的数据
       const original = []
       // 需要更改新加的数据
@@ -322,7 +373,7 @@ export default {
       }
     },
     // 扫描配置，如果有插槽则拼接插槽
-    scanConfigSlot(config) {
+    scanConfigSlot (config) {
       const columnsArr = config.columns
       for (let i = 0; i < columnsArr.length; i++) {
         for (let j = 0; j < columnsArr[i].length; j++) {
@@ -383,7 +434,7 @@ export default {
               config.slotsDeclare = []
             }
 
-            config.data = {...config.data, ...this.configFromWeb[targetName].data}
+            config.data = { ...config.data, ...this.configFromWeb[targetName].data }
             this.configFromWeb = {}
           }
         }
@@ -391,7 +442,7 @@ export default {
       this.config = config
     },
     // 扫描所有插槽名
-    scanConfigName(config, resut) {
+    scanConfigName (config, resut) {
       if (config.slotsDeclare) {
         config.slotsDeclare.forEach(name => {
           resut.push(name)
@@ -399,7 +450,7 @@ export default {
       }
     },
     // 获取插槽
-    getConfigAndJoin(config, outerLock) {
+    getConfigAndJoin (config, outerLock) {
       // 检查主配置插槽声明是否合法
       const check = this.checkSlotDefine(config)
       const waitForDownloadSlotName = []
@@ -424,7 +475,7 @@ export default {
             clearInterval(timer)
             this.scanConfigSlot(config)
             if (config.slotsDeclare.length > 0) {
-              const lock = {status: true}
+              const lock = { status: true }
               this.getConfigAndJoin(config, lock)
               const innerTimer = setInterval(() => {
                 if (!lock.status) {
@@ -443,8 +494,8 @@ export default {
       }
     },
     // 获取配置之后的初始化
-    configInit() {
-      const lock = {status: true}
+    configInit () {
+      const lock = { status: true }
 
       this.getConfigAndJoin(this.config, lock)
 
@@ -465,13 +516,19 @@ export default {
       }, 100)
     }
   },
-  beforeMount() {
+  beforeMount () {
     if (this.localConfig) {
       this.config = this.localConfig
+      if (this.config.data.images === undefined) {
+        this.config.data.images = {}
+      }
       this.configInit()
     } else {
       getConfigByName(this.configName, 'af-system', res => {
         this.config = res
+        if (this.config.data.images === undefined) {
+          this.config.data.images = {}
+        }
         this.configInit()
       })
     }

package/src/base-client/components/common/XReport/XReportDesign.vue

@@ -68,6 +68,15 @@
         </template>
       </tbody>
     </table>
+    <div v-if="showImages" style="margin-top: 5%; display: flex;margin-bottom: 5%">
+      <p>图片：</p>
+      <template v-for="(img,imgIndex) in imageList">
+        <div :key="imgIndex" style="margin-left: 3%;width: 200px">
+          <img :src="img.url" class="img" :alt="img.name"/>
+          <p style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width: 100%;">{{img.name}}</p>
+        </div>
+      </template>
+    </div>
   </div>
 </template>
 
@@ -90,6 +99,14 @@ export default {
     slotConfigName: {
       type: String,
       default: undefined
+    },
+    showImages: {
+      type: Boolean,
+      default: false
+    },
+    imageList: {
+      type: Array,
+      default: undefined
     }
   },
   components: {
@@ -174,6 +191,11 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.img{
+  width: 95%;
+  height: 180px;
+  object-fit: cover;
+}
 .reportMain {
   text-align: center;
   margin: 0 auto;