vue2-client 1.8.132 → 1.8.135

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.132",
+  "version": "1.8.135",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

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
@@ -53,6 +69,10 @@ export default {
     localConfig: {
       type: Object,
       default: undefined
+    },
+    dontFormat: {
+      type: Boolean,
+      default: false
     }
   },
   components: {
@@ -72,10 +92,31 @@ 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) {
       const slotsDeclare = config.slotsDeclare
@@ -98,6 +139,20 @@ export default {
       this.scanFinish = false
       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
       })
@@ -204,7 +259,14 @@ export default {
         }
 
         if (cell.text && total !== 0) { // 如果遇到了下一个声明行，证明rowspan少了一行，需要补充一个占位格
-          const nullObj = { type: 'placeHolderColumn', order: subRowIndex, noBoarder: true, needSplit: true, colSpan: preColSpan, dontShowRow: true }
+          const nullObj = {
+            type: 'placeHolderColumn',
+            order: subRowIndex,
+            noBoarder: true,
+            needSplit: true,
+            colSpan: preColSpan,
+            dontShowRow: true
+          }
           subRowIndex++
           waitForAddArr.push(nullObj)
           total = 0
@@ -213,7 +275,14 @@ export default {
           firstSubLine = false
         } else if ((total !== count + cell.rowSpan) && forEachCount === rowArr.length) {
           // 如果没有遇到了下一个声明行，但已经是当前行最后一个数据，也证明rowspan少了一行，需要补充一个占位格
-          const nullObj = { type: 'placeHolderColumn', order: subRowIndex, noBoarder: true, needSplit: true, colSpan: preColSpan, dontShowRow: true }
+          const nullObj = {
+            type: 'placeHolderColumn',
+            order: subRowIndex,
+            noBoarder: true,
+            needSplit: true,
+            colSpan: preColSpan,
+            dontShowRow: true
+          }
           subRowIndex++
           waitForAddArr.push(nullObj)
           total = 0
@@ -394,7 +463,7 @@ export default {
 
         // 挨个获取插槽
         waitForDownloadSlotName.forEach(configName => {
-          getConfigByName(configName, undefined, res => {
+          getConfigByName(configName, 'af-system', res => {
             this.configFromWeb[configName] = res
             count++
           })
@@ -435,8 +504,10 @@ export default {
           clearInterval(this.timer)
           console.log('拼接完成', this.config)
           this.originalConfig = Object.assign({}, this.config)
-          // 扫描配置文件中有没有rowSpan，进行格式化调整
-          this.formatConfigRow(this.config)
+          if (!this.dontFormat) {
+            // 扫描配置文件中有没有rowSpan，进行格式化调整
+            this.formatConfigRow(this.config)
+          }
           this.activeConfig = this.config
           this.$nextTick(() => {
             this.scanFinish = true
@@ -448,10 +519,16 @@ export default {
   beforeMount () {
     if (this.localConfig) {
       this.config = this.localConfig
+      if (this.config.data.images === undefined) {
+        this.config.data.images = {}
+      }
       this.configInit()
     } else {
-      getConfigByName(this.configName, undefined, res => {
+      getConfigByName(this.configName, 'af-system', res => {
         this.config = res
+        if (this.config.data.images === undefined) {
+          this.config.data.images = {}
+        }
         this.configInit()
       })
     }
@@ -460,10 +537,11 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.tools{
+.tools {
   text-align: center;
   cursor: pointer;
-  .toolsItem{
+
+  .toolsItem {
     display: inline-block;
   }
 }

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;