vue2-client 1.9.116 → 1.9.118

package/package.json

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

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

@@ -138,7 +138,7 @@ export default {
     // 初始是否加载数据
     createdQuery: {
       type: Boolean,
-      default: true
+      default: false
     }
   },
   data () {
@@ -214,11 +214,12 @@ export default {
       }
     }
 
+    console.log('我的初始之', this.createdQuery)
     // 数据初始化
     if (this.cardData) {
-      if (this.createdQuery) {
-        this.loadData()
-      }
+      // if (this.createdQuery) {
+      //   this.loadData()
+      // }
     } else {
       this.data = {
         one: '无数据',

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

@@ -9,6 +9,7 @@
       <XReportDesign
         @updateImg="updateImg"
         @selectRow="selectRow"
+        @slotRendered="slotRendered"
         v-if="scanFinish"
         :show-img-in-cell="showImgInCell"
         :img-prefix="imgPrefix"
@@ -55,6 +56,7 @@
           v-if="scanFinish"
           @updateImg="updateImg"
           @selectRow="selectRow"
+          @slotRendered="slotRendered"
           :show-img-in-cell="showImgInCell"
           :img-prefix="imgPrefix"
           :use-oss-for-img="useOssForImg"
@@ -278,6 +280,15 @@ export default {
     }
   },
   methods: {
+    slotRendered () {
+      if (this.config?.mountedFunction) {
+        let func = this.config.mountedFunction
+        if (func && func.startsWith('function')) {
+          func = func.replace('function', 'async function')
+          executeStrFunctionByContext(this, func, [])
+        }
+      }
+    },
     // 把组件注册到refs中，方便调用
     registerComponent (componentName, component) {
       console.log('内部注册', this.$options.name, componentName)

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

@@ -5,7 +5,7 @@
         ref="main"
         :use-oss-for-img="false"
         :config-name="configName"
-        server-name="af-his"
+        server-name="af-system"
         :show-img-in-cell="true"
         :display-only="true"
         :edit-mode="false"
@@ -37,7 +37,8 @@ export default {
   data () {
     return {
       // configName: 'medicalRecordCover'
-      configName: 'threeHealthCenterCover'
+      // configName: 'physicianOrderEntryCover'
+      configName: '测试栅格配置'
       // configName: 'medOrderManaActCover'
     }
   },

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

@@ -110,6 +110,7 @@
                 <x-report-tr-group
                   @updateImg="updateImg"
                   @selectRow="selectRow"
+                  @slotRendered="slotRendered"
                   :show-img-in-cell="showImgInCell"
                   :img-prefix="imgPrefix"
                   :server-name="serverName"
@@ -370,6 +371,9 @@ export default {
     }
   },
   methods: {
+    slotRendered () {
+      this.$emit('slotRendered')
+    },
     updateImg (data) {
       this.$emit('updateImg', data)
     },

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

@@ -551,6 +551,26 @@ export default {
       default: undefined
     }
   },
+  computed: {
+    allSlotSum () {
+      // 计算总共有多少个Slot
+      let sum = 0
+      this.columns.forEach((item) => {
+        console.log('item', item)
+        if (Array.isArray(item)) {
+          item.forEach((cell) => {
+            if (cell.type === 'slot') {
+              sum++
+            }
+          })
+        } else if (item.type && item.type === 'slot') {
+          sum++
+        }
+      })
+      console.log(`=总共有 ${sum} 个插槽栅格`)
+      return sum
+    }
+  },
   data () {
     return {
       gutter: [8, { xs: 8, sm: 16, md: 24, lg: 32 }], // 设置水槽大小
@@ -562,7 +582,9 @@ export default {
         pathKey: 'cs'
       },
       mixinData: {},
-      flexItemBodyState: {}
+      flexItemBodyState: {},
+      // 已经渲染得插槽得数量
+      slotRendered: 0,
       // tableConfig: {}
     }
   },
@@ -574,6 +596,10 @@ export default {
     getMicroData,
     getRealKeyData,
     onComponentMounted (h, cell, cellIndex) {
+      this.slotRendered += 1
+      if (this.slotRendered >= this.allSlotSum) {
+        this.$emit('slotRendered')
+      }
       if (this.getMixinData && this.getMixinData()) {
         this.mixinData = this.getMixinData()
       }

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

@@ -466,7 +466,7 @@ export default {
       // 定义主键
       primaryKey: '',
       // 是否进行初始化查询
-      createdQuery: true,
+      createdQuery: false,
       // 允许看板模式
       allowedCardMode: false,
       // 看板模式配置
@@ -687,6 +687,7 @@ export default {
         cardModeConfig,
         summaryUpdate
       } = params
+      console.log('我的table', createdQuery)
       this.showSummary = Object.keys(tableSummaryMap).length > 0
       if (this.showSummary) {
         Object.keys(tableSummaryMap).forEach(item => {
@@ -967,7 +968,7 @@ export default {
     // 导出选中或本页数据
     handleExport (isSelected) {
       const tHeader = this.tableColumns.filter(res => res.slotType !== 'action').map(res => res.title)
-      const filterVal = this.tableColumns.map(res => res.dataIndex)
+      const filterVal = this.tableColumns.filter(res => res.slotType !== 'action').map(res => res.dataIndex)
       let exportData
       if (isSelected) {
         exportData = this.selectedRows

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

@@ -84,12 +84,12 @@ routerResource.example = {
           path: 'default',
           name: '示例页面',
           // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
-          component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
+          // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XFormGroup/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/XTab/XTabDemo.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'),
           // component: () => import('@vue2-client/base-client/components/common/XConversation/XConversationDemo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XButtons/XButtonDemo.vue'),