vue2-client 1.8.396 → 1.8.397

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.396",
+  "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"
@@ -82,12 +83,18 @@ export default {
           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,10 +662,10 @@ export default {
     }
     // 人员联动框增加监听
     if (this?.attr?.keyName?.toString()?.startsWith('search@根据表单项[') && this?.attr?.keyName?.toString().endsWith(']联动人员')) {
-      this.debouncedUserLinkFunc = debounce(this.updateResOptions('人员'), 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)
+      this.debouncedDepLinkFunc = debounce(() => this.updateResOptions('部门'), 200)
     }
     if (this.attr.type === 'richText') {
       this.richText = await this.getRichText()
@@ -801,22 +801,20 @@ export default {
         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 函数作为数据源

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"
@@ -307,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) {
@@ -802,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>
@@ -768,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) {