vue2-client 1.9.30 → 1.9.32

package/docs//345/207/275/346/225/260/344/275/277/347/224/250/347/233/270/345/205/263.md

@@ -32,6 +32,20 @@ this.openDialog('xxx', 5, {}, {}, {})
     afterDelete( res (删除接口返回数据)) 删除后触发
     action(record (当前记录), id （当前记录主键）, actionType （操作类型）) 操作按钮触发
 
+# x-report 插槽 使用说明
+- init(configName,configData) 配置名称 / 报表数据
+- setData(configData) 主动设置数据
+- 当使用 openDialog 打开报表时，会自动调用 init 方法，传递参数为打开弹框时传递的 **mixinData**
+  ```js
+      this.$refs.main.openDialog('ceshishange',
+      -1,
+      {
+        configData: { arr: [{ 'defect@@@drug_name': '111' }, { 'defect@@@drug_name': '121', 'defect@@@num': '1' }] }
+      }
+    )
+  ```
+- 当没有 openDialog 打开报表时，需要手动调用 init 方法 或者 setData，传递参数为需要的数据
+
 # form 简易表单
 
 - asyncSubmit().then(res=>{}) 手动提交表单

package/package.json

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

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

@@ -30,7 +30,12 @@
       <!--  用以包裹整个页面  -->
       <a-card v-if="!showSkeleton">
         <!--   切换菜单   -->
-        <a-radio-group v-model="type" default-value="a" button-style="solid" @change="tabChanged" v-show="!onlyDisplay && editMode">
+        <a-radio-group
+          v-model="type"
+          default-value="a"
+          button-style="solid"
+          @change="tabChanged"
+          v-show="!onlyDisplay && editMode">
           <a-radio-button value="design" v-if="!onlyDisplay">
             设计
           </a-radio-button>
@@ -798,6 +803,36 @@ export default {
         })
       }
     },
+    initByConfigName () {
+      getConfigByName(this.configName, this.serverName, res => {
+        this.config = res
+        if (this.config.designMode === 'json') {
+          if (this.configData !== undefined) {
+            this.config.data = Object.assign(this.config.data, this.configData)
+          }
+          this.jsonConfigInit()
+        } else {
+          if (this.configData !== undefined) {
+            this.config.data = Object.assign(this.config.data, this.configData)
+          }
+          if (this.config.data.images === undefined) {
+            this.config.data.images = {}
+          }
+          this.configInit()
+        }
+      })
+    },
+    // 提供主动让外部调用的初始化方法
+    async init ({ configName, configData }) {
+      this.configName = configName
+      this.configData = configData
+      await this.initByConfigName()
+    },
+    // 提供主动赋值方法
+    setData (data) {
+      this.config.data = data
+      this.configInit()
+    }
   },
   beforeMount () {
     // 如果只是展示
@@ -825,25 +860,9 @@ export default {
         }
         this.configInit()
       }
-    } else {
+    } else if (this.configName) {
       // 如果本地配置没有值，则从琉璃中获取
-      getConfigByName(this.configName, this.serverName, res => {
-        this.config = res
-        if (this.config.designMode === 'json') {
-          if (this.configData !== undefined) {
-            this.config.data = Object.assign(this.config.data, this.configData)
-          }
-          this.jsonConfigInit()
-        } else {
-          if (this.configData !== undefined) {
-            this.config.data = Object.assign(this.config.data, this.configData)
-          }
-          if (this.config.data.images === undefined) {
-            this.config.data.images = {}
-          }
-          this.configInit()
-        }
-      })
+      this.initByConfigName()
     }
   },
   mounted () {
@@ -854,7 +873,7 @@ export default {
     // 将原始数据备份保存
     if (this.configData) {
       this.dataCache = JSON.parse(JSON.stringify(this.configData))
-    } else {
+    } else if (this.config) {
       this.dataCache = JSON.parse(JSON.stringify(this.config.data))
     }
   }

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

@@ -12,7 +12,9 @@
         :config="activatedConfig"/>
     </template>
     <template v-else>
-      <div :class=" noPadding ? 'reportMainNoPadding' : 'reportMain'" :style="activatedConfig.width > 0 ? ('width:' + activatedConfig.width + 'px') : undefined">
+      <div
+        :class=" noPadding ? 'reportMainNoPadding' : 'reportMain'"
+        :style="activatedConfig.width > 0 ? ('width:' + activatedConfig.width + 'px') : undefined">
         <!--      大标题      -->
         <h2 class="reportTitle" v-if="showTitle && activatedConfig.title" v-html="activatedConfig.title"></h2>
         <!--      小标题 / 介乎于标题与表格之间的内容      -->
@@ -25,14 +27,11 @@
               <div class="inputsDiv">
                 <div class="inputsDivItem" v-for="(num, index) of calcFormatInputNum(item.format)" :key="index">
                   <span class="inputsDivItemLabel">{{ displayFormatStartText(item.format) }}</span>
-                  <template v-if="!forDisplay">
-                    <template v-if="item.inputReadOnly === true">
-                      <a-input v-model="data[item.dataIndex][index]" :style="'width:' + (item.inputWidth ? item.inputWidth : '100') + '%'" :disabled="true"/>
-                    </template>
-                    <template v-else>
-                      <a-input v-model="data[item.dataIndex][index]" :style="'width:' + (item.inputWidth ? item.inputWidth : '100') + '%'"/>
-                    </template>
-                  </template>
+                  <a-input
+                    v-if="!forDisplay"
+                    v-model="data[item.dataIndex][index]"
+                    :style="'width:' + (item.inputWidth ? item.inputWidth : '100') + '%'"
+                    :disabled="item.inputReadOnly"/>
                   <template v-else>
                     {{ activatedConfig.data[item.dataIndex][index] }}
                   </template>
@@ -46,112 +45,56 @@
         <table class="reportTable" v-if="render" :style="activatedConfig.style ? activatedConfig.style : undefined">
           <tbody class="reportTable">
             <template v-for="(row, rowIndex) in activatedConfig.columns">
-              <!--  插槽展示  -->
-              <!--        <template v-if="row[0].type === 'slot'">-->
-              <!--          <XReportSlot :config="activatedConfig" v-if="render" :slot-config-name="row[0].slotConfig" :key="rowIndex" :for-display="forDisplay"></XReportSlot>-->
-              <!--        </template>-->
               <!--  普通行  -->
-              <template v-if="row[0].type !== 'inputColumns' && row[0].type !== 'list'">
-                <template v-if="!forDisplay">
-                  <x-report-tr-group
-                    @updateImg="updateImg"
-                    :show-img-in-cell="showImgInCell"
-                    :img-prefix="imgPrefix"
-                    :server-name="serverName"
-                    :use-oss-for-img="useOssForImg"
-                    :key="rowIndex"
-                    :columns="row"
-                    :no-top-border="noTopBorder"
-                    :config-data="activatedConfig.data"
-                    :config="activatedConfig">
-                  </x-report-tr-group>
-                </template>
-                <template v-else>
-                  <x-report-tr-group
-                    @updateImg="updateImg"
-                    :show-img-in-cell="showImgInCell"
-                    :img-prefix="imgPrefix"
-                    :server-name="serverName"
-                    :use-oss-for-img="useOssForImg"
-                    :config="activatedConfig"
-                    :key="rowIndex"
-                    :columns="row"
-                    :no-top-border="noTopBorder"
-                    :config-data="activatedConfig.data"
-                    :display="true">
-                  </x-report-tr-group>
-                </template>
-              </template>
+              <x-report-tr-group
+                v-if="row[0].type !== 'inputColumns' && row[0].type !== 'list'"
+                @updateImg="updateImg"
+                :show-img-in-cell="showImgInCell"
+                :img-prefix="imgPrefix"
+                :server-name="serverName"
+                :use-oss-for-img="useOssForImg"
+                :key="rowIndex"
+                :columns="row"
+                :no-top-border="noTopBorder"
+                :config-data="activatedConfig.data"
+                :config="activatedConfig"
+                :display="forDisplay">
+              </x-report-tr-group>
               <!--  列表  -->
-              <template v-else-if="row[0].type === 'list'" >
-                <template v-for="(num, listIndex) in row[0].listLength + 1">
-                  <template v-if="!forDisplay">
-                    <x-report-tr-group
-                      @updateImg="updateImg"
-                      :show-img-in-cell="showImgInCell"
-                      :img-prefix="imgPrefix"
-                      :server-name="serverName"
-                      :use-oss-for-img="useOssForImg"
-                      :config="activatedConfig"
-                      :key="rowIndex + listIndex"
-                      :columns="row"
-                      :no-top-border="noTopBorder"
-                      :config-data="activatedConfig.data"
-                      :list-index="listIndex">
-                    </x-report-tr-group>
-                  </template>
-                  <template v-else>
-                    <x-report-tr-group
-                      @updateImg="updateImg"
-                      :show-img-in-cell="showImgInCell"
-                      :img-prefix="imgPrefix"
-                      :server-name="serverName"
-                      :use-oss-for-img="useOssForImg"
-                      :config="activatedConfig"
-                      :key="rowIndex + listIndex"
-                      :columns="row"
-                      :no-top-border="noTopBorder"
-                      :config-data="activatedConfig.data"
-                      :list-index="listIndex"
-                      :display="true">
-                    </x-report-tr-group>
-                  </template>
-                </template>
-              </template>
+              <x-report-tr-group
+                v-else-if="row[0].type === 'list'"
+                v-for="(num, listIndex) in row[0].listLength + 1"
+                @updateImg="updateImg"
+                :show-img-in-cell="showImgInCell"
+                :img-prefix="imgPrefix"
+                :server-name="serverName"
+                :use-oss-for-img="useOssForImg"
+                :config="activatedConfig"
+                :key="rowIndex + listIndex"
+                :columns="row"
+                :no-top-border="noTopBorder"
+                :config-data="activatedConfig.data"
+                :list-index="listIndex"
+                :display="forDisplay">
+              </x-report-tr-group>
               <!--  动态行  -->
               <template v-else>
-                <template v-if="forDisplay">
-                  <x-report-tr-group
-                    @updateImg="updateImg"
-                    :show-img-in-cell="showImgInCell"
-                    :img-prefix="imgPrefix"
-                    :server-name="serverName"
-                    :use-oss-for-img="useOssForImg"
-                    :config="activatedConfig"
-                    :columns="row[0].definition"
-                    :config-data="{arr: activatedConfig.data[row[0].dataIndex]}"
-                    :input-columns="true"
-                    :no-top-border="noTopBorder"
-                    v-for="(item, definitionIndex) in activatedConfig.data[row[0].dataIndex]"
-                    :input-columns-definition-index="definitionIndex"
-                    :display="true"
-                    :key="row[0].dataIndex + definitionIndex + rowIndex"></x-report-tr-group>
-                </template>
+                <x-report-tr-group
+                  @updateImg="updateImg"
+                  :show-img-in-cell="showImgInCell"
+                  :img-prefix="imgPrefix"
+                  :server-name="serverName"
+                  :use-oss-for-img="useOssForImg"
+                  :config="activatedConfig"
+                  :columns="row[0].definition"
+                  :config-data="{arr: activatedConfig.data[row[0].dataIndex]}"
+                  :input-columns="true"
+                  :no-top-border="noTopBorder"
+                  v-for="(item, definitionIndex) in activatedConfig.data[row[0].dataIndex]"
+                  :input-columns-definition-index="definitionIndex"
+                  :display="forDisplay"
+                  :key="row[0].dataIndex + definitionIndex + rowIndex"></x-report-tr-group>
                 <template v-if="!forDisplay">
-                  <x-report-tr-group
-                    @updateImg="updateImg"
-                    :show-img-in-cell="showImgInCell"
-                    :img-prefix="imgPrefix"
-                    :server-name="serverName"
-                    :use-oss-for-img="useOssForImg"
-                    :config="activatedConfig"
-                    :columns="row[0].definition"
-                    :config-data="{arr: activatedConfig.data[row[0].dataIndex]}"
-                    :input-columns="true"
-                    :no-top-border="noTopBorder"
-                    v-for="(item, definitionIndex) in activatedConfig.data[row[0].dataIndex]"
-                    :input-columns-definition-index="definitionIndex"
-                    :key="row[0].dataIndex + definitionIndex + rowIndex"></x-report-tr-group>
                   <!--  动态行交互按钮  -->
                   <x-report-tr-group
                     @updateImg="updateImg"
@@ -196,7 +139,8 @@ export default {
     config: {
       type: Object,
       require: true,
-      default: () => {}
+      default: () => {
+      }
     },
     showImgInCell: {
       type: Boolean,
@@ -359,11 +303,12 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.img{
+.img {
   width: 95%;
   height: 180px;
   object-fit: cover;
 }
+
 .reportMain {
   text-align: center;
   margin: 0 auto;
@@ -390,11 +335,13 @@ export default {
   .inputsDiv {
     display: flex;
     justify-content: space-between;
+
     .inputsDivItem {
       display: flex;
       align-items: center;
       padding: 0 4px;
       white-space: nowrap;
+
       .inputsDivItemLabel {
         padding: 0 4px;
       }
@@ -404,10 +351,11 @@ export default {
   .reportTable {
     width: 100%;
     border-collapse: collapse;
-    table-layout:fixed;
-    word-break:break-all;
+    table-layout: fixed;
+    word-break: break-all;
   }
 }
+
 .reportMainForDisplay {
   text-align: center;
   margin: 10% auto;
@@ -433,11 +381,13 @@ export default {
   .inputsDiv {
     display: flex;
     justify-content: space-around;
+
     .inputsDivItem {
       display: flex;
       align-items: center;
       padding: 0 4px;
       white-space: nowrap;
+
       .inputsDivItemLabel {
         padding: 0 4px;
       }
@@ -447,10 +397,11 @@ export default {
   .reportTable {
     width: 100%;
     border-collapse: collapse;
-    table-layout:fixed;
-    word-break:break-all;
+    table-layout: fixed;
+    word-break: break-all;
   }
 }
+
 .reportMainNoPadding {
   text-align: center;
   margin: 0 auto;
@@ -475,11 +426,13 @@ export default {
   .inputsDiv {
     display: flex;
     justify-content: space-between;
+
     .inputsDivItem {
       display: flex;
       align-items: center;
       padding: 0 4px;
       white-space: nowrap;
+
       .inputsDivItemLabel {
         padding: 0 4px;
       }
@@ -489,17 +442,19 @@ export default {
   .reportTable {
     width: 100%;
     border-collapse: collapse;
-    table-layout:fixed;
-    word-break:break-all;
+    table-layout: fixed;
+    word-break: break-all;
   }
 }
-.tools{
+
+.tools {
   position: fixed;
   right: 2%;
   text-align: right;
   width: 60%;
   cursor: pointer;
-  .toolsItem{
+
+  .toolsItem {
     width: 15%;
     margin-right: 3%;
     display: inline-block;

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

@@ -251,7 +251,10 @@
           </template>
         </template>
         <template v-else-if="cell.type === 'list'">
-          <template v-if="cell.listType === 'input'">
+          <template v-if="listIndex === 0">
+            <span style="font-weight: bold">{{ cell.listHead }}</span>
+          </template>
+          <template v-else-if="cell.listType === 'input'">
             <a-input
               v-model="configData[cell.dataIndex][listIndex]"
               :style="'width:' + (cell.inputWidth ? cell.inputWidth : '100') + '%'"/>
@@ -259,6 +262,9 @@
           <template v-else-if="cell.listType === 'value'">
             {{ cell.content[listIndex] }}
           </template>
+          <template v-else-if="cell.listType === 'variable'">
+            {{ configData[cell.dataIndex][listIndex - 1][cell.listDataIndex] }}
+          </template>
         </template>
         <template v-else-if="cell.type === 'images'">
           <div>

package/src/base-client/components/common/XReportGrid/XReportDemo.vue

@@ -20,7 +20,6 @@
 import XReport from './XReport'
 import XAddReport from '../XAddReport/XAddReport.vue'
 // eslint-disable-next-line no-unused-vars
-import { exportHTMLNodeToPDF } from '@vue2-client/utils/htmlToPDFApi'
 
 export default {
   name: 'XReportDemo',
@@ -28,13 +27,15 @@ export default {
     XReport, XAddReport
   },
   mounted () {
-    // this.$refs.main.openDialog('skinTestExecuActionCover',
-    //   {
-    //     selectedId: 1,
-    //     name: '皮肤测试执行单'
-    //   },
-    //   {}
-    // )
+    this.$refs.main.openDialog('ceshishange',
+      {
+        selectedId: 1,
+        name: '皮肤测试执行单'
+      },
+      {
+        configData: { arr: [{ 'defect@@@drug_name': '111' }, { 'defect@@@drug_name': '121', 'defect@@@num': '1' }] }
+      }
+    )
   },
   data () {
     return {

package/src/base-client/components/common/XReportGrid/XReportTrGroup.vue

@@ -13,7 +13,7 @@
           <!-- 插槽渲染 -->
           <template v-if="cell.type === 'slot'">
             <template
-              v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group'].includes(cell.slotType)">
+              v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report'].includes(cell.slotType)">
               <component
                 :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
                 :key="cellIndex"
@@ -404,7 +404,8 @@ export default {
     XAddNativeForm: () => import('@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'),
     XTreePro: () => import('@vue2-client/base-client/components/common/XTree/XTreePro.vue'),
     XHisEditor: () => import('@vue2-client/base-client/components/his/XHisEditor/XHisEditor.vue'),
-    XTab: () => import('@vue2-client/base-client/components/common/XTab/XTab.vue')
+    XTab: () => import('@vue2-client/base-client/components/common/XTab/XTab.vue'),
+    XReport: () => import('@vue2-client/base-client/components/common/XReport/XReport.vue')
   },
   props: {
     // 每一行的配置
@@ -556,6 +557,10 @@ export default {
           }, this.env === 'dev')
         }
       }
+      if (cell.slotType === 'x-report') {
+        const param = { ...this.mixinData }
+        this.$refs[`dynamicComponent_${cell.slotRef || cellIndex}`][0].init(param)
+      }
     },
     getEventHandlers (cell) {
       const handlers = {}

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

@@ -46,6 +46,7 @@ export default {
     }
   },
   methods: {
+    // 自定义函数中调用的方法  这个不能删
     getWindow,
     isMicroAppEnv,
     microDispatch,

package/src/router/async/router.map.js

@@ -83,9 +83,10 @@ routerResource.example = {
       {
           path: 'default',
           name: '示例页面',
-          component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
+          // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
+          // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
-          // component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
+          component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
           // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
           meta: {
               // 菜单中不显示