vue2-client 1.9.81 → 1.9.83

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

@@ -31,6 +31,7 @@ this.openDialog('xxx', 5, {}, {}, {})
 - refreshTable 重新查询
 - clearRowKeys 清除选中的行
 - getTableData() 获取全部数据
+- setTableData(data) 设置表格内数据
 - Object.assign(this.fixedQueryForm, data) 给查询条件传值
 - 事件相关
   - afterSubmit( type(新增/修改/擦和讯), id: (所操作的主键id), form: (请求的表单内容))  提交后触发

package/package.json

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

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

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <button @click="startRecording" :disabled="isRecording">开始录音</button>
-    <button @click="stopRecording" :disabled="!isRecording">停止录音</button>
+    <a-button type="primary" @click="startRecording" :disabled="isRecording">开始录音</a-button>
+    <a-button type="primary" @click="stopRecording" :disabled="!isRecording">停止录音</a-button>
     <!--    <audio v-if="audioUrl" :src="audioUrl" controls></audio>-->
   </div>
 </template>
@@ -20,8 +20,7 @@ export default {
       config: {}
     }
   },
-  props: {
-  },
+  props: {},
   watch: {},
   components: {},
   created () {
@@ -31,29 +30,30 @@ export default {
   },
   methods: {
     async startRecording () {
-        this.inputData = ''
-        const url = this.config.webSocketURL // WebSocket地址
-        this.setupWebSocket(url)
+      this.inputData = ''
+      this.audioChunks = []
+      const url = this.config.webSocketURL ? this.config.webSocketURL : 'ws://192.168.50.67:31090/websocket/bash' // WebSocket地址
+      this.setupWebSocket(url)
 
-        // 等待 WebSocket 连接成功
-        await this.waitForWebSocketConnection()
+      // 等待 WebSocket 连接成功
+      await this.waitForWebSocketConnection()
 
-        this.isRecording = true
+      this.isRecording = true
 
-        // 初始化 AudioContext
-        this.audioContext = new (window.AudioContext || window.webkitAudioContext)()
+      // 初始化 AudioContext
+      this.audioContext = new (window.AudioContext || window.webkitAudioContext)()
 
-        if (!navigator.mediaDevices || !navigator.mediaDevices.getUserMedia) {
-          throw new Error(
-            '录音软件不支持您的浏览器！请使用现代浏览器或确保您正在使用 HTTPS。'
-          )
-        }
+      if (!navigator.mediaDevices || !navigator.mediaDevices.getUserMedia) {
+        throw new Error(
+          '录音软件不支持您的浏览器！请使用现代浏览器或确保您正在使用 HTTPS。'
+        )
+      }
 
-        // 获取麦克风输入流
-        this.audioStream = await navigator.mediaDevices.getUserMedia({ audio: true })
+      // 获取麦克风输入流
+      this.audioStream = await navigator.mediaDevices.getUserMedia({ audio: true })
 
-        // 设置音频处理流程
-        this.setupAudioProcessing()
+      // 设置音频处理流程
+      this.setupAudioProcessing()
     },
     setupWebSocket (url) {
       this.ws = new WebSocket(url)
@@ -64,6 +64,10 @@ export default {
         if (data.result !== undefined) {
           this.inputData += data.result
         }
+        if (!this.isRecording) {
+          this.ws.close()
+          this.resRecordingData()
+        }
       }
 
       this.ws.onclose = () => console.log('WebSocket closed.')
@@ -93,9 +97,13 @@ export default {
 
           const inputData = e.inputBuffer.getChannelData(0)
 
+          // 收集音频数据块
+
           // Resample to 16000 Hz if needed
           const resampledData = this.resample(inputData, this.audioContext.sampleRate, 16000)
 
+          this.audioChunks.push(new Float32Array(resampledData))
+
           // Convert to 16-bit PCM and send via WebSocket
           const byteArray = this.convertTo16BitPCM(resampledData)
           this.ws.send(byteArray)
@@ -108,24 +116,97 @@ export default {
         throw error
       }
     },
+
     stopRecording () {
       this.isRecording = false
-      if (this.ws) {
-        // 可以添加一个事件处理器来处理WebSocket关闭
-        this.ws.onclose = () => {
-          console.log('WebSocket closed.')
-          // 这里可以添加WebSocket关闭后的清理工作
-        }
-        // 关闭WebSocket连接
-        this.ws.close()
-      }
+
+      // 停止麦克风流
       if (this.audioStream) {
-        this.audioStream.getTracks().forEach(track => track.stop())
+        this.audioStream.getTracks().forEach((track) => track.stop())
       }
+
+      // 合并音频数据块并保存为文件
+      // this.saveAudioFile()
+
+      // 关闭 WebSocket
+      // if (this.ws) {
+      //   this.ws.close()
+      // }
+
       if (this.audioContext) {
         this.audioContext.close()
       }
     },
+
+    saveAudioFile () {
+      // 合并所有音频块
+      const audioBuffer = this.mergeAudioChunks(this.audioChunks)
+
+      // 转换为 WAV 格式
+      const wavBlob = this.encodeWAV(audioBuffer, 16000)
+
+      // 创建下载链接并触发下载
+      const url = URL.createObjectURL(wavBlob)
+      const a = document.createElement('a')
+      a.style.display = 'none'
+      a.href = url
+      a.download = 'recording.wav'
+      document.body.appendChild(a)
+      a.click()
+      window.URL.revokeObjectURL(url)
+    },
+
+    mergeAudioChunks (chunks) {
+      const length = chunks.reduce((sum, chunk) => sum + chunk.length, 0)
+      const result = new Float32Array(length)
+      let offset = 0
+      for (const chunk of chunks) {
+        result.set(chunk, offset)
+        offset += chunk.length
+      }
+      return result
+    },
+
+    encodeWAV (samples, sampleRate) {
+      const buffer = new ArrayBuffer(44 + samples.length * 2) // 每个样本占2字节
+      const view = new DataView(buffer)
+
+      const writeString = (view, offset, string) => {
+        for (let i = 0; i < string.length; i++) {
+          view.setUint8(offset + i, string.charCodeAt(i))
+        }
+      }
+
+      // WAV文件头
+      writeString(view, 0, 'RIFF') // ChunkID
+      view.setUint32(4, 36 + samples.length * 2, true) // ChunkSize
+      writeString(view, 8, 'WAVE') // Format
+
+      // fmt子块
+      writeString(view, 12, 'fmt ') // Subchunk1ID
+      view.setUint32(16, 16, true) // Subchunk1Size (PCM格式固定为16)
+      view.setUint16(20, 1, true) // AudioFormat (PCM为1)
+      view.setUint16(22, 1, true) // NumChannels (单声道为1)
+      view.setUint32(24, sampleRate, true) // SampleRate
+      view.setUint32(28, sampleRate * 2, true) // ByteRate (SampleRate * NumChannels * BitsPerSample/8)
+      view.setUint16(32, 2, true) // BlockAlign (NumChannels * BitsPerSample/8)
+      view.setUint16(34, 16, true) // BitsPerSample
+
+      // data子块
+      writeString(view, 36, 'data') // Subchunk2ID
+      view.setUint32(40, samples.length * 2, true) // Subchunk2Size
+
+      // 写入PCM数据
+      let offset = 44
+      for (let i = 0; i < samples.length; i++) {
+        const s = Math.max(-1, Math.min(1, samples[i])) // 限制范围为[-1, 1]
+        view.setInt16(offset, s < 0 ? s * 0x8000 : s * 0x7FFF, true) // 转换为16位PCM
+        offset += 2
+      }
+
+      return new Blob([buffer], { type: 'audio/wav' })
+    },
+
     resample (data, inputSampleRate, outputSampleRate) {
       if (inputSampleRate === outputSampleRate) {
         return data
@@ -148,6 +229,9 @@ export default {
     },
     getRecordingData () {
       return this.inputData
+    },
+    resRecordingData () {
+      this.$emit('recordingData', this.inputData)
     }
   }
 }

package/src/base-client/components/common/Recording/index.js

@@ -1,3 +1,3 @@
-import Recoding from './Recoding.vue'
+import Recording from './Recording.vue'
 
-export default Recoding
+export default Recording

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

@@ -235,7 +235,7 @@ export default {
       } else {
         this.layout = layout
       }
-      if (isHandleFormKey && !isKeyHandle) {
+      if ((isHandleFormKey === null || isHandleFormKey === undefined) && !isKeyHandle) {
         this.isHandleFormKey = isKeyHandle
       } else if (isHandleFormKey) {
         this.isHandleFormKey = isHandleFormKey
@@ -246,7 +246,6 @@ export default {
       this.configContent = configContent
       this.formItems = this.getFromItem(formItems, formJson)
       this.viewMode = viewMode
-      this.isHandleFormKey = isHandleFormKey
       this.showSubmitBtn = showSubmitBtn
       this.serviceName = serviceName
       this.businessType = businessType

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

@@ -617,7 +617,7 @@
     :flex="attr.flex">
     <recording
       ref="recording"
-      @stop="emitFunc('recording',attr)"
+      @recordingData="recordingData"
     >
     </recording>
   </x-form-col>
@@ -1151,7 +1151,11 @@ export default {
     // 获取 recording 转换后的数据
     getRecodingData () {
       return this.$refs.recording.getRecordingData()
+    },
+    recordingData (data) {
+      this.emitFunc('recordingData', data)
     }
+
   }
 }
 </script>

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

@@ -525,7 +525,7 @@ export default {
           formItems: res.formJson,
           viewMode: this.viewMode,
           localEditMode: this.localEditMode,
-          isHandleFormKey: this.localEditMode ? false : undefined,
+          isKeyHandle: !Boolean(this.localEditMode),
           serviceName: this.serviceName,
           fixedAddForm: this.fixedAddForm,
           getDataParams: this.getDataParams,
@@ -566,7 +566,7 @@ export default {
           formItems: res.formJson,
           viewMode: this.viewMode,
           localEditMode: this.localEditMode,
-          isHandleFormKey: this.localEditMode ? false : undefined,
+          isKeyHandle: !Boolean(this.localEditMode),
           serviceName: this.serviceName,
           fixedAddForm: this.fixedAddForm,
           getDataParams: this.getDataParams,
@@ -648,6 +648,12 @@ export default {
     getTableData () {
       return this.$refs.xTable.getTableData()
     },
+    /**
+     * 设置表格数据
+     */
+    setTableData (data) {
+     this.$refs.xTable.setTableData(data)
+    },
     /**
      * 表单本地提交
      */

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

@@ -275,34 +275,80 @@ export default {
       console.log('内部注册完成', this.$refs)
     },
 
-    transformArray (data) {
-      const result = []
-      const currentRow = []
-      let tempGroup = [] // Temporary group for combining cells
+    transformArray (inputList) {
+      let operationIndex = 0
+      let operationList = []
+      const outputList = []
+      for (const lst of inputList) {
+        // 如果列表为空或只有一个元素，则所有元素相等。比较列表中每个元素是否与第一个元素相等
+        if (lst.length >= 1 && !lst.every(x => Array.isArray(x) || Array.isArray(lst[0]) || x.rowSpan === lst[0].rowSpan)) {
+            operationList = lst
+            break // 使用 break 退出整个循环
+        } else {
+            // 被操作的行
+            operationIndex += 1
+        }
+      }
 
-      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)
+      let maxMergeRow = 0
+
+      // 没有需要合并的行,直接返回
+      if (operationList.length === 0) {
+          return inputList
+      } else {
+          // 当前行的最大值
+          const maxRow = Math.max(...operationList.map(item => item.rowSpan))
+          let mergeIndexCol = 0
+          for (let index = 0; index < operationList.length; index++) {
+              const row = operationList[index]
+              let rowSpan = row.rowSpan
+              // 需要合并的行
+              let mergeIndexRow = operationIndex + 1
+              // 存放合并后的行
+              const rows = []
+              // 添加当前行
+              if (rowSpan < maxRow && mergeIndexRow < inputList.length) {
+                rows.push([row])
+              }
+              // 当前需要被操作并且操作行没有超出列表的高度
+              while (rowSpan < maxRow && mergeIndexRow < inputList.length) {
+                  rowSpan += inputList[mergeIndexRow][mergeIndexCol].rowSpan
+                  // 放一行到合并结果
+                  rows.push([inputList[mergeIndexRow][mergeIndexCol]])
+                  if (mergeIndexRow > maxMergeRow) {
+                      // 记录最多操作到了哪行
+                      maxMergeRow = mergeIndexRow
+                  }
+                  mergeIndexRow++
+              }
+              // operation_list赋值, 没有变化的，不处理
+              if (rows.length !== 0) {
+                operationList[index] = rows
+              }
+              if (row.rowSpan !== maxRow) {
+                  mergeIndexCol++ // 操作列转为下一列
+              }
           }
-        })
-      })
+      }
 
-      // Add remaining temporary group to the row
-      if (tempGroup.length > 0) {
-        currentRow.push(tempGroup)
+      // 组成outputlist, operation_list前部填入
+      let putindex = 0
+      while (operationIndex > 0) {
+          outputList.push(inputList[putindex])
+          putindex++
+          operationIndex -= 1
       }
 
-      result.push(currentRow)
-      return result
+      outputList.push(operationList)
+
+      // 组成outputlist, operation_list后部填入
+      while (maxMergeRow < inputList.length - 1) {
+          outputList.push(inputList[maxMergeRow + 1])
+          maxMergeRow += 1
+      }
+
+      console.log('转换完成了', outputList)
+      return this.transformArray(outputList)
     },
 
     // 根据名字从注册到组件中获取组件
@@ -887,14 +933,15 @@ export default {
           }
         })
       })
-      this.$nextTick(() => {
-        this.scanFinish = true
-      })
 
       // 对配置进行转换
       console.log('转换前配置', this.config)
-      const newColumns = this.transformArray(this.config.columns)
-      console.log('转换后的列描述', newColumns)
+      this.originalConfig.columns = this.transformArray(this.config.columns)
+      console.log('转换后的列描述', this.originalConfig.columns)
+
+      this.$nextTick(() => {
+        this.scanFinish = true
+      })
     },
     // 初始化JSON配置
     jsonConfigInit () {

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

@@ -4,7 +4,7 @@
       <XReport
         ref="main"
         :use-oss-for-img="false"
-        config-name="medicalRecordCover"
+        config-name="pharStockCover"
         server-name="af-his"
         :show-img-in-cell="true"
         :display-only="true"

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

@@ -504,7 +504,8 @@ export default {
   color: #000;
   // background-color: #fff;
   border-radius: 8px;
-  height: 85vh;
+  height: auto;
+  min-height : 20vh;
   overflow-y: auto;
   overflow-x: hidden;
 

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

@@ -1,19 +1,37 @@
 <template>
-  <a-row type="flex" :gutter="gutter" style="margin-bottom: 20px;">
+  <a-row type="flex" :gutter="gutter" style="margin-bottom: .5rem;">
     <!--  预览页展示  -->
     <template v-if="display">
       <template v-if="!inputColumns">
         <a-col
           name="trGroup"
-          style="flex: 1;"
           v-for="(cell, cellIndex) in columns"
-          v-if="!cell.dontShowRow"
+          v-if="Array.isArray(cell) || !cell.dontShowRow"
           :key="cellIndex"
-          :style="determineCellStyle(cell)"
-          :span="cell.colSpan ? cell.colSpan * 2 : undefined">
+          :style="Array.isArray(cell) ? {} : determineCellStyle(cell)"
+          :span="Array.isArray(cell) ? cell[0][0].colSpan * 2 : (cell.colSpan ? cell.colSpan * 2 : undefined)">
           <a-card class="flexItem" :bordered="false" :body-style="flexItemBodyState">
             <!-- 插槽渲染 -->
-            <template v-if="cell.type === 'slot'">
+            <template v-if="Array.isArray(cell)">
+              <!-- 处理 cell 是数组的情况 -->
+              <div v-for="(item, index) in cell" :key="index">
+                <x-report-tr-group
+                  @updateImg="updateImg"
+                  :show-img-in-cell="showImgInCell"
+                  :img-prefix="imgPrefix"
+                  :server-name="serverName"
+                  :env="env"
+                  :use-oss-for-img="useOssForImg"
+                  :key="index"
+                  :columns="recalculateItem(item)"
+                  :no-top-border="noTopBorder"
+                  :config-data="configData"
+                  :config="config"
+                  :display="true">
+                </x-report-tr-group>
+              </div>
+            </template>
+            <template v-else-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', 'x-conversation'].includes(cell.slotType)">
                 <component
@@ -592,6 +610,19 @@ export default {
         }, this.env === 'dev')
       }
     },
+
+    // 对于嵌套情况，对colSpan重新分配
+    recalculateItem (item) {
+      const totalColSpan = item.reduce((sum, cell) => sum + (cell.colSpan || 1), 0) // 计算总的 colSpan
+      return item.map(cell => {
+        const newColSpan = Math.round((cell.colSpan || 1) / totalColSpan * 12) // 按比例重新分配 colSpan
+        return {
+          ...cell,
+          colSpan: newColSpan // 更新 colSpan
+        }
+      })
+    },
+
     getEventHandlers (cell) {
       const handlers = {}
       if (!cell?.events || cell?.events?.length === 0) {

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

@@ -1124,6 +1124,10 @@ export default {
     getTableData () {
       return this.$refs.table.localDataSource
     },
+    // 设置表格内数据
+    setTableData (data) {
+      Object.assign(this.$refs.table, { localDataSource: data })
+    },
     // 获取所有本地数据
     getLocalData () {
       return this.localEditModeDataSource

package/src/pages/Recording/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="test" v-if="showReport">
-    <XReport
+    <recording
       @updateImg="updateImg"
       ref="main"
       :use-oss-for-img="false"
@@ -22,7 +22,8 @@ import { exportHTMLNodeToPDF } from '@vue2-client/utils/htmlToPDFApi'
 export default {
   name: 'Example',
   components: {
-    XReport
+    XReport,
+    Recording: () => import('@vue2-client/base-client/components/common/Recording')
   },
   mounted () {
     console.log(this.$route)