vue2-client 1.9.78 → 1.9.80

package/package.json

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

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

@@ -40,7 +40,7 @@ export default {
       inputMessage: '', // 用户输入的内容
       additionalInfo: {},
       messages: [ // 消息列表
-        { type: 'bot', text: 'Hello! How can I assist you today?' },
+        { type: 'bot', text: '你好! 今天有什么能帮到您的?' },
       ],
     }
   },
@@ -54,6 +54,7 @@ export default {
         // 配置内容
         value
       } = params
+      console.log('=========')
       this.renderConfig = value
       this.loading = true
       this.serviceName = serviceName
@@ -73,7 +74,7 @@ export default {
             question: userMessage,
             additionalInfo: this.additionalInfo
         }, this.serviceName)
-       this.messages.push({ type: 'bot', text: response })
+       this.messages.push({ type: 'bot', text: response.value })
     },
   },
 }

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

@@ -615,10 +615,11 @@
   <x-form-col
     v-else-if="attr.type === 'recording' && show"
     :flex="attr.flex">
-    <recoding
+    <recording
       ref="recording"
+      @stop="emitFunc('recording',attr)"
     >
-    </recoding>
+    </recording>
   </x-form-col>
 </template>
 <script>
@@ -642,7 +643,7 @@ export default {
   name: 'XFormItem',
   components: {
     XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'),
-    Recoding: () => import('@vue2-client/base-client/components/common/Recording/Recoding.vue'),
+    Recording: () => import('@vue2-client/base-client/components/common/Recording/Recording.vue'),
     XLicensePlate,
     XTreeSelect,
     XFormCol,

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

@@ -274,6 +274,37 @@ export default {
       this.$refs[componentName] = component
       console.log('内部注册完成', this.$refs)
     },
+
+    transformArray (data) {
+      const result = []
+      const currentRow = []
+      let tempGroup = [] // Temporary group for combining cells
+
+      data.forEach(row => {
+        row.forEach(cell => {
+          // Check if the current cell should be part of the temporary group
+          if (cell.rowSpan === 1) {
+            tempGroup.push(cell) // Add to temporary group
+          } else {
+            // Push the temporary group if it has accumulated cells
+            if (tempGroup.length > 0) {
+              currentRow.push(tempGroup)
+              tempGroup = []
+            }
+            currentRow.push(cell)
+          }
+        })
+      })
+
+      // Add remaining temporary group to the row
+      if (tempGroup.length > 0) {
+        currentRow.push(tempGroup)
+      }
+
+      result.push(currentRow)
+      return result
+    },
+
     // 根据名字从注册到组件中获取组件
     getComponentByName (componentName) {
       console.log('内部取组件', this.$options.name, componentName)
@@ -859,6 +890,11 @@ export default {
       this.$nextTick(() => {
         this.scanFinish = true
       })
+
+      // 对配置进行转换
+      console.log('转换前配置', this.config)
+      const newColumns = this.transformArray(this.config.columns)
+      console.log('转换后的列描述', newColumns)
     },
     // 初始化JSON配置
     jsonConfigInit () {

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

@@ -4,8 +4,8 @@
       <XReport
         ref="main"
         :use-oss-for-img="false"
-        config-name="medicalRecordCover"
-        server-name="af-his"
+        config-name="测试栅格配置"
+        server-name="af-system"
         :show-img-in-cell="true"
         :display-only="true"
         :edit-mode="false"
@@ -27,7 +27,7 @@ export default {
     XReport, XAddReport
   },
   mounted () {
-      this.$refs.main.openDialog('surgerySchedCover', -1, {})
+      // this.$refs.main.openDialog('surgerySchedCover', -1, {})
   },
   data () {
     return {

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

@@ -15,7 +15,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', 'x-report', 'x-buttons'].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', 'x-buttons', 'x-conversation'].includes(cell.slotType)">
                 <component
                   :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
                   :key="cellIndex"
@@ -416,7 +416,8 @@ export default {
     XHisEditor: () => import('@vue2-client/base-client/components/his/XHisEditor/XHisEditor.vue'),
     XTab: () => import('@vue2-client/base-client/components/common/XTab/XTab.vue'),
     XReport: () => import('@vue2-client/base-client/components/common/XReport/XReport.vue'),
-    XButtons: () => import('@vue2-client/base-client/components/common/XButtons/XButtons.vue')
+    XButtons: () => import('@vue2-client/base-client/components/common/XButtons/XButtons.vue'),
+    XConversation: () => import('@vue2-client/base-client/components/common/XConversation/XConversation.vue'),
   },
   props: {
     // 每一行的配置
@@ -582,6 +583,14 @@ export default {
         const param = { ...this.mixinData }
         this.$refs[`dynamicComponent_${cell.slotRef || cellIndex}`][0].init(param)
       }
+      if (cell.slotType === 'x-conversation') {
+        getConfigByName(cell.slotConfig, cell.serviceName, (res) => {
+          this.$refs[`dynamicComponent_${cell.slotRef || cellIndex}`][0].init({
+            serviceName: cell.serviceName,
+            ...res,
+          })
+        }, this.env === 'dev')
+      }
     },
     getEventHandlers (cell) {
       const handlers = {}

package/src/pages/Recording/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/base-client/components/common/XReportGrid/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/router/async/config.async.js

@@ -9,6 +9,7 @@ const routesConfig = [
   'dynamicStatistics',
   'newDynamicStatistics',
   'XReportGrid',
+  'example',
   'settings',
   'createQuery',
   'root',

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

@@ -89,9 +89,9 @@ routerResource.example = {
           // 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/XConversation/XConversationDemo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XButtons/XButtonDemo.vue'),
           meta: {
               // 菜单中不显示