vue2-client 1.8.395 → 1.8.397

package/package.json

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

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

@@ -8,13 +8,14 @@
     height="60%"
     okText="提交"
     @cancel="close"
-    @ok="$refs.main.onSubmit()">
+    @ok="onSubmit">
     <div style="max-height: 70vh; overflow-y: auto;" v-if="showReport">
       <x-report
         @updateImg="updateImg"
+        @selectRow="selectRow"
         ref="main"
         :use-oss-for-img="false"
-        config-name="medicalRecordCover"
+        :config-name="configName"
         server-name="af-his"
         :show-img-in-cell="true"
         :display-only="displayOnly"
@@ -26,12 +27,12 @@
 </template>
 <script>
 import { mapState } from 'vuex'
-import XReport from '@vue2-client/pages/XReportGridView/XReport.vue'
+// import XReport from '@vue2-client/pages/XReportGridView/XReport.vue'
 
 export default {
     name: 'XAddReport',
     components: {
-      XReport
+      XReport: () => import('@vue2-client/pages/XReportGridView/XReport.vue'),
     },
     props: {
 
@@ -51,7 +52,14 @@ export default {
         // 新增或修改业务是否执行中
         loading: false,
         // 是否显示新增/修改模态框
-        visible: false
+        visible: false,
+        // 选中的处理对象的id号
+        selectedId: null,
+      }
+    },
+    provide () {
+      return {
+        getSelectedId: () => { return this.selectedId }
       }
     },
     computed: {
@@ -64,19 +72,29 @@ export default {
       init (params) {
         console.log('params', params)
         const {
-          configName = 'medicalRecordCover', serverName = 'af-his', displayOnly = true
+          configName = 'medicalRecordCover', serverName = 'af-his', displayOnly = true, selectedId = null
         } = params
         this.configName = configName
         this.serverName = serverName
         this.displayOnly = displayOnly
         this.visible = true
+        // 有选中项，给选中项赋值
+        if (selectedId) {
+          this.selectedId = selectedId
+        }
+      },
+      selectRow (selectedRowKeys, selectedRows) {
+        this.table_selectedRowKeys = selectedRowKeys
+        this.table_selectedRows = selectedRows
+        console.log('XAddReport')
+        this.$emit('selectRow', selectedRowKeys, selectedRows)
       },
       close () {
         this.loading = false
         this.visible = false
         this.$emit('close')
       },
-      onSubmit (params) {
+      onSubmit () {
         this.loading = true
         this.close()
       },

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -662,7 +662,10 @@ export default {
     }
     // 人员联动框增加监听
     if (this?.attr?.keyName?.toString()?.startsWith('search@根据表单项[') && this?.attr?.keyName?.toString().endsWith(']联动人员')) {
-      this.debouncedUserLinkFunc = debounce(this.updateUserOptions, 200)
+      this.debouncedUserLinkFunc = debounce(() => this.updateResOptions('人员'), 200)
+    }
+    if (this?.attr?.keyName?.toString()?.startsWith('search@根据表单项[') && this?.attr?.keyName?.toString().endsWith(']联动部门')) {
+      this.debouncedDepLinkFunc = debounce(() => this.updateResOptions('部门'), 200)
     }
     if (this.attr.type === 'richText') {
       this.richText = await this.getRichText()
@@ -700,6 +703,10 @@ export default {
         if (this?.attr?.keyName?.toString()?.startsWith('search@根据表单项[') && this?.attr?.keyName?.toString().endsWith(']联动人员')) {
           this.debouncedUserLinkFunc()
         }
+        // 数据源来自人员联动时更新数据
+        if (this?.attr?.keyName?.toString()?.startsWith('search@根据表单项[') && this?.attr?.keyName?.toString().endsWith(']联动部门')) {
+          this.debouncedDepLinkFunc()
+        }
       },
       deep: true
     }
@@ -787,29 +794,27 @@ export default {
       }
     },
     // 更新人员下拉框数据
-    async updateUserOptions () {
-      if (this?.attr?.keyName?.toString()?.startsWith('search@根据表单项[') && this?.attr?.keyName?.toString()?.endsWith(']联动人员')) {
-        const searchData = { source: '获取人员', userid: this.currUser.id }
+    async updateResOptions (type) {
+      if (this?.attr?.keyName?.toString()?.startsWith('search@根据表单项[') && this?.attr?.keyName?.toString()?.endsWith(`]联动${type}`)) {
+        const searchData = { source: `获取${type}`, userid: this.currUser.id }
         const startIndex = this.attr.keyName.indexOf('[') + 1
         const endIndex = this.attr.keyName.indexOf(']', startIndex)
         const fromModel = this.attr.keyName.substring(startIndex, endIndex).replace('.', '_')
         const formModelData = this.form[fromModel]
-        await searchToListOption(searchData, res => {
-          this.getDataCallback(
-            res.filter(h => {
-                if (fromModel && fromModel.length) {
+        if (fromModel?.length && formModelData?.length) {
+          await searchToListOption(searchData, res => {
+            this.getDataCallback(
+              res.filter(h => {
                   if (fromModel.indexOf('org') > -1) {
-                    return formModelData?.includes(h.orgid || h.f_organization_id)
+                    return formModelData?.includes(h.orgid || h.f_organization_id || h.parentid)
                   } else {
                     return formModelData?.includes(h?.parentid)
                   }
-                } else {
-                  return false
                 }
-              }
+              )
             )
-          )
-        })
+          })
+        }
       }
     },
     // js 函数作为数据源
@@ -904,7 +909,9 @@ export default {
         const searchData = { source, userid, roleName }
         // 判断是否根据某个表单项联动 仅返回列表结构并筛选
         if (source.startsWith('根据表单项[') && source.endsWith(']联动人员')) {
-          this.updateUserOptions()
+          this.updateResOptions('人员')
+        } else if (source.startsWith('根据表单项[') && source.endsWith(']联动部门')) {
+          this.updateResOptions('部门')
         } else if (this.attr.type === 'select' || this.attr.type === 'checkbox') {
           // 仅获取最内层数据
           searchToListOption(searchData, res => this.getDataCallback(res))

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

@@ -138,6 +138,7 @@ export default {
     XAddReport,
     XImportExcel
   },
+  inject: ['getSelectedId'],
   data () {
     return {
       // 加载状态
@@ -601,6 +602,11 @@ export default {
           break
       }
     }
+  },
+  mounted () {
+    console.log('注入数据', this.getSelectedId()) // 访问祖先组件的数据
+    Object.assign(this.fixedAddForm, { selected_id: this.getSelectedId() })
+    Object.assign(this.fixedQueryForm, { selected_id: this.getSelectedId() })
   }
 }
 </script>

package/src/pages/DefaultExample/index.vue

@@ -8,7 +8,6 @@
       @action="action"
       ref="xFormTable">
     </x-form-table>
-    <router-view></router-view>
     <a-button @click="navigateToAnotherPage">跳转到另一个页面</a-button> <!-- 使用方法进行跳转 -->
     <a-drawer
       title="详情信息"

package/src/pages/Example/index.vue

@@ -1,5 +1,6 @@
 <template>
   <div>
+    <report-grid />
     <router-view />
     <child-index /> <!-- 添加 childIndex 组件 -->
   </div>
@@ -7,11 +8,13 @@
 
 <script>
 import ChildIndex from './childIndex.vue' // 引入 ChildIndex 组件
+import ReportGrid from '../ReportGrid/index.vue'
 
 export default {
   name: 'Example',
   components: {
     ChildIndex, // 注册 ChildIndex 组件
+    ReportGrid,
   },
   data () {
     return {

package/src/pages/ReportGrid/index.vue

@@ -0,0 +1,76 @@
+<template>
+  <div id="test" v-if="showReport">
+    <XReport
+      @updateImg="updateImg"
+      ref="main"
+      :use-oss-for-img="false"
+      config-name="medicineMouldCover"
+      server-name="af-his"
+      :show-img-in-cell="true"
+      :display-only="displayOnly"
+      :edit-mode="false"
+      :show-save-button="false"
+      :dont-format="true"/>
+  </div>
+</template>
+
+<script>
+import XReport from '@vue2-client/pages/XReportGridView/XReport'
+// eslint-disable-next-line no-unused-vars
+import { exportHTMLNodeToPDF } from '@vue2-client/utils/htmlToPDFApi'
+
+export default {
+  name: 'Example',
+  components: {
+    XReport
+  },
+  mounted () {
+    console.log(this.$route)
+  },
+  data () {
+    return {
+      test: {
+        title: {
+          type: 'titleKey',
+          value: 'f_type'
+        },
+        designMode: 'json',
+      },
+      total: 1,
+      registerMap: [],
+      displayOnly: true,
+      showReport: true
+    }
+  },
+  methods: {
+    updateImg (data) {
+      console.warn('demo', data)
+    },
+    testExport () {
+      this.showReport = false
+      this.displayOnly = true
+      this.$nextTick(() => {
+        this.showReport = true
+        setTimeout(() => {
+          exportHTMLNodeToPDF('123', '#test')
+          this.showReport = false
+          this.displayOnly = false
+          this.$nextTick(() => {
+            this.showReport = true
+          })
+        }, 500)
+      })
+    },
+    testSave () {
+      const result = []
+      this.registerMap.forEach(item => {
+        result.push(item.exportData())
+      })
+      console.warn('save', result)
+    }
+  }
+}
+</script>
+<style scoped>
+
+</style>

package/src/pages/XReportGridView/XReport.vue

@@ -8,6 +8,7 @@
       <!--   主体表格   -->
       <XReportDesign
         @updateImg="updateImg"
+        @selectRow="selectRow"
         v-if="scanFinish"
         :show-img-in-cell="showImgInCell"
         :img-prefix="imgPrefix"
@@ -50,6 +51,7 @@
         <XReportDesign
           v-if="scanFinish"
           @updateImg="updateImg"
+          @selectRow="selectRow"
           :show-img-in-cell="showImgInCell"
           :img-prefix="imgPrefix"
           :use-oss-for-img="useOssForImg"
@@ -68,6 +70,10 @@
         </XReportDesign>
       </a-card>
     </template>
+    <!-- 弹出框 -->
+    <x-add-report
+      ref="xAddReport"
+    />
   </div>
 </template>
 
@@ -77,6 +83,7 @@ import HtmlToPdf from '@vue2-client/utils/htmlToPDF'
 import { getConfigByName } from '@vue2-client/services/api/common'
 import XReportDesign from './XReportDesign.vue'
 import { printElement } from './print'
+// import XAddReport from '@vue2-client/base-client/components/common/XAddReport'
 
 export default {
   name: 'XReport',
@@ -173,6 +180,7 @@ export default {
     }
   },
   components: {
+    XAddReport: () => import('@vue2-client/base-client/components/common/XAddReport'),
     XReportDesign
   },
   data () {
@@ -233,7 +241,20 @@ export default {
       }
     },
   },
+  provide () {
+    return {
+      openDialog: this.openDialog
+    }
+  },
   methods: {
+    // 打开弹出框
+    openDialog (configName, selectedId) {
+      console.log('openDialog', configName, selectedId)
+      this.$refs.xAddReport.init({
+        configName: configName,
+        selectedId: selectedId
+      })
+    },
     // 向外暴露图片修改后的数据，某些外部需要自己管理图片的保存与修改
     updateImg (data) {
       this.$emit('updateImg', data)
@@ -288,6 +309,13 @@ export default {
         }
       }
     },
+    selectRow (selectedRowKeys, selectedRows) {
+      this.table_selectedRowKeys = selectedRowKeys
+      this.table_selectedRows = selectedRows
+      console.log('')
+      this.$emit('selectRow', selectedRowKeys, selectedRows)
+    },
+
     // 正常的保存方法，当前修改内容会直接全部导出到外部
     saveConfig () {
       if (this.activeConfig === undefined || this.activeConfig === null) {
@@ -783,6 +811,10 @@ export default {
         })
       }
     },
+    onSubmit () {
+      console.log('this.table_selectedRowKeys', this.table_selectedRowKeys)
+      console.log('this.table_selectedRows', this.table_selectedRows)
+    },
   },
   beforeMount () {
     // 如果只是展示

package/src/pages/XReportGridView/XReportDesign.vue

@@ -3,6 +3,7 @@
     <template v-if="this.activatedConfig.designMode === 'json'">
       <XReportJsonRender
         @updateImg="updateImg"
+        @selectRow="selectRow"
         :img-prefix="imgPrefix"
         :server-name="serverName"
         :display-only="displayOnly"
@@ -50,6 +51,7 @@
               <template v-if="row[0].type === 'slot'">
                 <x-report-tr-group
                   @updateImg="updateImg"
+                  @selectRow="selectRow"
                   :show-img-in-cell="showImgInCell"
                   :img-prefix="imgPrefix"
                   :server-name="serverName"
@@ -68,6 +70,7 @@
                   <template v-if="!forDisplay">
                     <x-report-tr-group
                       @updateImg="updateImg"
+                      @selectRow="selectRow"
                       :show-img-in-cell="showImgInCell"
                       :img-prefix="imgPrefix"
                       :server-name="serverName"
@@ -83,6 +86,7 @@
                   <template v-else>
                     <x-report-tr-group
                       @updateImg="updateImg"
+                      @selectRow="selectRow"
                       :show-img-in-cell="showImgInCell"
                       :img-prefix="imgPrefix"
                       :server-name="serverName"
@@ -103,6 +107,7 @@
                 <template v-if="forDisplay">
                   <x-report-tr-group
                     @updateImg="updateImg"
+                    @selectRow="selectRow"
                     :show-img-in-cell="showImgInCell"
                     :img-prefix="imgPrefix"
                     :server-name="serverName"
@@ -120,6 +125,7 @@
                 <template v-if="!forDisplay">
                   <x-report-tr-group
                     @updateImg="updateImg"
+                    @selectRow="selectRow"
                     :show-img-in-cell="showImgInCell"
                     :img-prefix="imgPrefix"
                     :server-name="serverName"
@@ -135,6 +141,7 @@
                   <!--  动态行交互按钮  -->
                   <x-report-tr-group
                     @updateImg="updateImg"
+                    @selectRow="selectRow"
                     :show-img-in-cell="showImgInCell"
                     :img-prefix="imgPrefix"
                     :server-name="serverName"
@@ -154,6 +161,7 @@
                 <template v-if="!forDisplay">
                   <x-report-tr-group
                     @updateImg="updateImg"
+                    @selectRow="selectRow"
                     :show-img-in-cell="showImgInCell"
                     :img-prefix="imgPrefix"
                     :server-name="serverName"
@@ -168,6 +176,7 @@
                 <template v-else>
                   <x-report-tr-group
                     @updateImg="updateImg"
+                    @selectRow="selectRow"
                     :show-img-in-cell="showImgInCell"
                     :img-prefix="imgPrefix"
                     :server-name="serverName"
@@ -292,6 +301,12 @@ export default {
     updateImg (data) {
       this.$emit('updateImg', data)
     },
+    selectRow (selectedRowKeys, selectedRows) {
+      this.table_selectedRowKeys = selectedRowKeys
+      this.table_selectedRows = selectedRows
+      console.log('XReportDesign')
+      this.$emit('selectRow', selectedRowKeys, selectedRows)
+    },
     // 根据format计算需要多少个输入框
     calcFormatInputNum (formatStr) {
       let count = 0

package/src/pages/XReportGridView/XReportTrGroup.vue

@@ -17,6 +17,7 @@
                 :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
                 :key="cellIndex"
                 :serviceName="cell.serviceName"
+                @selectRow="selectRow"
                 @[cell.eventType]="(...args)=>executeCustomFunction( cell,...args)"
                 :queryParamsName="cell.slotConfig"/>
             </template>
@@ -475,6 +476,7 @@ export default {
       // tableConfig: {}
     }
   },
+  inject: ['openDialog'],
   methods: {
     executeCustomFunction (cell, ...args) {
       console.info('Event handled:', cell.eventType, args)
@@ -767,6 +769,12 @@ export default {
 
       return result
     },
+    selectRow (selectedRowKeys, selectedRows) {
+      this.table_selectedRowKeys = selectedRowKeys
+      this.table_selectedRows = selectedRows
+      console.log('1123123123')
+      this.$emit('selectRow', selectedRowKeys, selectedRows)
+    },
   },
   beforeMount () {
     if (this.useOssForImg) {