vue2-client 1.9.89 → 1.9.91

package/package.json

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

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

@@ -24,8 +24,8 @@
           style="flex: 1; width: auto; min-width: 0;"
           @change="attr.dataChangeFunc && debouncedDataChangeFunc()"
           :suffix="attr.inputSuffix && mode !== '新增' ? attr.inputSuffix : ''"
-          @blur="attr.inputOnBlurFunc && emitFunc(attr.inputOnBlurFunc,attr)"
-          @keyup.enter="attr.inputOnEnterFunc && emitFunc(attr.inputOnEnterFunc, attr)"
+          @blur="mode !== '查询' && attr.inputOnBlurFunc && emitFunc(attr.inputOnBlurFunc,attr)"
+          @keyup.enter="mode !== '查询' && attr.inputOnEnterFunc && emitFunc(attr.inputOnEnterFunc, attr)"
           :placeholder="attr.placeholder ? attr.placeholder : '请输入'+attr.name.replace(/\s*/g, '')"
           :ref="`${attr.model}input`"/>
         <a-button
@@ -57,8 +57,8 @@
         :whitespace="true"
         :disabled="disabled && !readOnly"
         style="width:100%"
-        @blur="attr.inputOnBlurFunc && emitFunc(attr.inputOnBlurFunc,attr)"
-        @keyup.enter="attr.inputOnEnterFunc && emitFunc(attr.inputOnEnterFunc, attr)"
+        @blur="mode !== '查询' && attr.inputOnBlurFunc && emitFunc(attr.inputOnBlurFunc,attr)"
+        @keyup.enter="mode !== '查询' && attr.inputOnEnterFunc && emitFunc(attr.inputOnEnterFunc, attr)"
         :suffix="attr.inputSuffix && mode !== '新增' ? attr.inputSuffix : ''"
         :placeholder="attr.placeholder ? attr.placeholder : '请输入'+attr.name.replace(/\s*/g, '')"
         :ref="`${attr.model}input`"/>
@@ -70,11 +70,10 @@
         :disabled="disabled && !readOnly"
         :suffix="attr.inputSuffix && mode !== '新增' ? attr.inputSuffix : ''"
         style="width:100%"
-        @blur="attr.inputOnBlurFunc && emitFunc(attr.inputOnBlurFunc,attr)"
-        @keyup.enter="attr.inputOnEnterFunc && emitFunc(attr.inputOnEnterFunc, attr)"
+        @blur="mode !== '查询' && attr.inputOnBlurFunc && emitFunc(attr.inputOnBlurFunc,attr)"
+        @keyup.enter="mode !== '查询' && attr.inputOnEnterFunc && emitFunc(attr.inputOnEnterFunc, attr)"
         :placeholder="attr.placeholder ? attr.placeholder : '请输入'+attr.name.replace(/\s*/g, '')"
         :ref="`${attr.model}input`"/>
-
     </a-form-model-item>
   </x-form-col>
   <!-- 下拉框 -->

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

@@ -52,6 +52,9 @@ export default {
     },
     selectType (value) {
       this.selectedType = value
+      if (this.selectedType) { // 检查选中内容是否不为空
+        this.$emit('selected', this.selectedType) // 发送选中事件
+      }
     },
     updateUnderline () {
       // 动态更新下划线位置和宽度

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

@@ -182,6 +182,11 @@ export default {
       type: Array,
       default: undefined
     },
+    // 是否小插件模式，小插件模式不会有各种边境
+    isWidget: {
+      type: Boolean,
+      default: false
+    },
     // 图片是否使用OSS来保存
     useOssForImg: {
       type: Boolean,
@@ -264,6 +269,7 @@ export default {
       getComponentByName: this.getComponentByName,
       getParentComponentByName: this.getComponentByName,
       getConfigByName: getConfigByName,
+      isWidget: this.widget,
       currUser: this.currUser
     }
   },
@@ -1011,7 +1017,10 @@ export default {
     }
   },
   computed: {
-    ...mapState('account', { currUser: 'user' })
+    ...mapState('account', { currUser: 'user' }),
+    widget () {
+      return this.isWidget // 返回isWidget的值
+    }
   },
   mounted () {
     // 如果外界传来了registerMap，我们将本VM对象注册到map中

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

@@ -31,8 +31,8 @@ export default {
   },
   data () {
     return {
-      configName: 'medicalRecordCover'
-      // configName: 'physicianOrderEntryCover'
+      // configName: 'medicalRecordCover'
+      configName: 'physicianOrderEntryCover'
     }
   },
   methods: {

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

@@ -12,6 +12,64 @@
         :no-top-border="noTopBorder"
         :config="activatedConfig"/>
     </template>
+    <template v-else-if="isWidget">
+      <template v-for="(row, rowIndex) in activatedConfig.columns">
+        <!--  插槽展示  -->
+        <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"
+            :env="env"
+            :use-oss-for-img="useOssForImg"
+            :key="rowIndex"
+            :columns="row"
+            :no-top-border="noTopBorder"
+            :config-data="activatedConfig.data"
+            :config="activatedConfig"
+            :display="true">
+          </x-report-tr-group>
+        </template>
+        <!--  普通行  -->
+        <template v-else>
+          <template v-if="!forDisplay">
+            <x-report-tr-group
+              @updateImg="updateImg"
+              @selectRow="selectRow"
+              :show-img-in-cell="showImgInCell"
+              :img-prefix="imgPrefix"
+              :server-name="serverName"
+              :env="env"
+              :use-oss-for-img="useOssForImg"
+              :key="rowIndex"
+              :columns="row"
+              :no-top-border="noTopBorder"
+              :config-data="activatedConfig.data"
+              :config="activatedConfig">
+            </x-report-tr-group>
+          </template>
+          <template v-else>
+            <x-report-tr-group
+              @updateImg="updateImg"
+              @selectRow="selectRow"
+              :show-img-in-cell="showImgInCell"
+              :img-prefix="imgPrefix"
+              :server-name="serverName"
+              :env="env"
+              :use-oss-for-img="useOssForImg"
+              :config="activatedConfig"
+              :key="rowIndex"
+              :columns="row"
+              :no-top-border="noTopBorder"
+              :config-data="activatedConfig.data"
+              :display="true">
+            </x-report-tr-group>
+          </template>
+        </template>
+      </template>
+    </template>
     <template v-else>
       <div :class=" noPadding ? 'reportMainNoPadding' : 'reportMain'" :style="activatedConfig.width > 0 ? ('width:' + activatedConfig.width + 'px') : undefined">
         <!--      大标题      -->
@@ -298,6 +356,7 @@ export default {
     XReportTrGroup,
     XReportJsonRender
   },
+  inject: ['isWidget'],
   data () {
     return {
       // 表单的数据

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

@@ -1,5 +1,5 @@
 <template>
-  <a-row type="flex" :gutter="gutter" style="margin-bottom: .5rem;">
+  <a-row id="has_row" type="flex" :gutter="gutter" :style="isWidget ? {margin: '0px'} : {'margin-bottom': '.5rem'}">
     <!--  预览页展示  -->
     <template v-if="display">
       <template v-if="!inputColumns">
@@ -8,9 +8,49 @@
           v-for="(cell, cellIndex) in columns"
           v-if="Array.isArray(cell) || !cell.dontShowRow"
           :key="cellIndex"
-          :style="Array.isArray(cell) ? {} : determineCellStyle(cell)"
+          :style="isWidget ? {padding: '0px 2px'} : (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">
+          <div id="report_widget" v-if="isWidget">
+            <!-- 插槽渲染 -->
+            <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-label-select', 'x-conversation'].includes(cell.slotType)">
+                <component
+                  :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
+                  :key="cellIndex"
+                  :ref="`dynamicComponent_${ cell.slotRef || cellIndex}`"
+                  :serviceName="cell.serviceName"
+                  :serverName="cell.serviceName"
+                  v-on="getEventHandlers(cell)"
+                  @hook:mounted="(h)=>onComponentMounted(h,cell,cellIndex)"
+                  :queryParamsName="cell.slotConfig"
+                  :configName="cell.slotConfig"
+                  :countVisible="false"
+                  :env="env"
+                />
+              </template>
+            </template>
+          </div>
+          <a-card v-else class="flexItem" :bordered="false" :body-style="flexItemBodyState">
             <!-- 插槽渲染 -->
             <template v-if="Array.isArray(cell)">
               <!-- 处理 cell 是数组的情况 -->
@@ -525,7 +565,7 @@ export default {
       // tableConfig: {}
     }
   },
-  inject: ['openDialog', 'registerComponent', 'getComponentByName', 'runLogic', 'getMixinData', 'getSelectedId', 'isInAModal', 'getConfigByName', 'getSelectedData', 'getOutEnv', 'currUser'],
+  inject: ['openDialog', 'registerComponent', 'getComponentByName', 'runLogic', 'getMixinData', 'getSelectedId', 'isInAModal', 'getConfigByName', 'getSelectedData', 'getOutEnv', 'currUser', 'isWidget'],
   methods: {
     getWindow,
     isMicroAppEnv,
@@ -733,29 +773,6 @@ export default {
       if (this.config.style.borderColor) {
         color = this.config.style.borderColor
       }
-      // // 如果声明了borderWidth
-      // if (this.config.style.borderWidth) {
-      //   borderWidth = this.config.style.borderWidth
-      // }
-      // // 普通带边框单元格
-      // const withBorder = {
-      //   border: borderWidth + ' solid ' + color,
-      //   padding: '8px'
-      // }
-      // // 只有左右边框的单元格
-      // const noBorder = {
-      //   borderLeft: borderWidth + ' solid ' + color,
-      //   borderRight: borderWidth + ' solid ' + color,
-      //   padding: '8px'
-      // }
-      // // 只没有上边框的单元格
-      // const NoTopBorder = {
-      //   borderTopStyle: 'none',
-      //   borderLeft: borderWidth + ' solid ' + color,
-      //   borderRight: borderWidth + ' solid ' + color,
-      //   borderBottom: borderWidth + ' solid ' + color,
-      //   padding: '8px'
-      // }
       let result = {}
       // 如果表格也声明了样式，用表格样式将样式覆盖
       if (cell.style) {
@@ -772,6 +789,7 @@ export default {
       }
       return result
     },
+
     // 表格中数据key含有@@@，需要手动触发更新
     handleInputDeepChange () {
       this.$forceUpdate()

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

@@ -1,7 +1,7 @@
 <template>
   <div v-show="tableColumns.length > 0">
     <a-row :gutter="48">
-      <a-col v-show="showLeftOperaBtn" :span="8">
+      <a-col v-show="showLeftOperaBtn">
         <span :style="{ float: 'left', overflow: 'hidden', marginBottom: '8px' }">
           <a-space>
             <slot name="leftButton" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
@@ -11,7 +11,11 @@
             <a-button v-if="buttonState.move && buttonRendering('move')" type="primary" @click="move">
               <a-icon type="plus"/>添加
             </a-button>
-            <a-button v-if="buttonState.choose && buttonRendering('choose')" :disabled="!isChoose" type="primary" @click="choose">
+            <a-button
+              v-if="buttonState.choose && buttonRendering('choose')"
+              :disabled="!isChoose"
+              type="primary"
+              @click="choose">
               <a-icon type="check-square"/>选择
             </a-button>
             <a-button
@@ -72,28 +76,31 @@
               <a-icon type="dashed" :style="iconStyle"/>
               {{ button.buttonName }}
             </a-button>
-            <a-button v-if="allowedCardMode && !simpleMode" @click="changeViewMode" :type="isTableMode ? '' : 'primary'">
+            <a-button
+              v-if="allowedCardMode && !simpleMode"
+              @click="changeViewMode"
+              :type="isTableMode ? '' : 'primary'">
               看板模式
             </a-button>
+            <!-- 头部附加栅格 -->
+            <x-report
+              v-if="attachGrid"
+              :env="env"
+              :isWidget="true"
+              :use-oss-for-img="false"
+              :config-name="attachGrid"
+              :show-img-in-cell="true"
+              :display-only="true"
+              :edit-mode="false"
+              :show-save-button="false"
+              :dont-format="true"/>
+
             <slot name="button" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
           </a-space>
 
         </span>
       </a-col>
-      <a-col :span="8">
-        <!-- 头部附加栅格 -->
-        <x-report
-          v-if="attachGrid"
-          :env="env"
-          :use-oss-for-img="false"
-          :config-name="attachGrid"
-          :show-img-in-cell="true"
-          :display-only="true"
-          :edit-mode="false"
-          :show-save-button="false"
-          :dont-format="true"/>
-      </a-col>
-      <a-col v-show="showRightTools && !simpleMode" :span="8">
+      <a-col v-show="showRightTools && !simpleMode">
         <span :style="{ float: 'right', overflow: 'hidden', marginBottom: '8px' }">
           <a-button-group>
             <slot name="rightBtnExpand" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
@@ -137,7 +144,7 @@
           v-for="(item, c_index) in tableColumns"
           :slot="item.dataIndex"
           slot-scope="text, record, index">
-          <template v-if="isEditMode && getFromItem(item.dataIndex)">
+          <template v-if="isEditMode && getFromItem(item.dataIndex,text, record, index)">
             <x-form-item
               class="innerTable"
               :form="record"
@@ -304,7 +311,7 @@ import {
 import XImportExcel from '@vue2-client/base-client/components/common/XImportExcel'
 import { Modal } from 'ant-design-vue'
 import { mapState } from 'vuex'
-import { executeStrFunction } from '@vue2-client/utils/runEvalFunction'
+import { executeStrFunction, executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
 import debounce from 'lodash.debounce'
 import XDataCard from '@vue2-client/base-client/components/common/XDataCard/XDataCard.vue'
 import { getRealKeyData } from '@vue2-client/utils/formatter'
@@ -514,10 +521,15 @@ export default {
     columnClick (key, value, record) {
       this.$emit('columnClick', key, value, record)
     },
-    getFromItem (model) {
+    getFromItem (model, text, record, index) {
       const aa = this.formItems.find(item => item.model === model && item.editRow)
       if (aa) {
-        return JSON.parse(JSON.stringify(aa))
+        const tempConfig = JSON.parse(JSON.stringify(aa))
+        if (tempConfig.editRowShowFunc) {
+          if (executeStrFunctionByContext(this, tempConfig.editRowShowFunc, [text, record, index, tempConfig])) {
+            return tempConfig
+          }
+        }
       }
       return false
     },
@@ -1026,12 +1038,12 @@ export default {
     },
     // 行选择业务
     choose () {
-        if (this.isChoose) {
-          // 如果配置了自定义函数
-          this.$emit('rowChoose', this.selectedRows)
-        } else {
-          this.$message.warning(this.allowSelectRowNum === 0 ? '请选择数据' : `请选择${this.allowSelectRowNum}条数据`)
-        }
+      if (this.isChoose) {
+        // 如果配置了自定义函数
+        this.$emit('rowChoose', this.selectedRows)
+      } else {
+        this.$message.warning(this.allowSelectRowNum === 0 ? '请选择数据' : `请选择${this.allowSelectRowNum}条数据`)
+      }
     },
     // 自定义按钮点击
     editButtonStateDataClick (index) {

package/src/base-client/plugins/Recording.js

@@ -19,7 +19,14 @@ export default {
         this.setupWebSocket(url)
 
         // 等待 WebSocket 连接成功
-        await this.waitForWebSocketConnection()
+        const result = await this.waitForWebSocketConnection()
+
+        if (result) {
+          return {
+            code: 500,
+            msg: result
+          }
+        }
 
         this.isRecording = true
 
@@ -27,16 +34,22 @@ export default {
         this.audioContext = new (window.AudioContext || window.webkitAudioContext)()
 
         if (!navigator.mediaDevices || !navigator.mediaDevices.getUserMedia) {
-          throw new Error(
-            '录音软件不支持您的浏览器！请使用现代浏览器或确保您正在使用 HTTPS。'
-          )
+          this.ws.close()
+          return {
+            code: 500,
+            msg: '录音软件不支持您的浏览器！请使用现代浏览器或确保您正在使用 HTTPS。'
+          }
         }
-
         // 获取麦克风输入流
         this.audioStream = await navigator.mediaDevices.getUserMedia({ audio: true })
 
         // 设置音频处理流程
         this.setupAudioProcessing()
+
+        return {
+          code: 200,
+          msg: '开始录音'
+        }
       },
 
       setupWebSocket (url) {
@@ -59,14 +72,14 @@ export default {
       },
 
       waitForWebSocketConnection () {
-        return new Promise((resolve, reject) => {
+        return new Promise((resolve) => {
           this.ws.onopen = () => {
             console.log('WebSocket 连接成功')
             resolve()
           }
 
           this.ws.onerror = (error) => {
-            reject(new Error('WebSocket 连接失败: ' + error.message))
+            resolve('WebSocket 连接失败: ' + error.message)
           }
         })
       },
@@ -93,9 +106,16 @@ export default {
 
           source.connect(processor)
           processor.connect(this.audioContext.destination)
+          return {
+            code: 200,
+            msg: '录音初始化成功'
+          }
         } catch (error) {
           console.error('Error setting up audio processing:', error)
-          throw error
+          return {
+            code: 500,
+            msg: '录音初始化出错：' + error.message
+          }
         }
       },
 
@@ -110,6 +130,10 @@ export default {
         if (this.audioContext) {
           this.audioContext.close()
         }
+        return {
+          code: 200,
+          msg: '录音已停止'
+        }
       },
 
       saveAudioFile () {
@@ -199,10 +223,10 @@ export default {
       },
 
       getRecordingData () {
-        return new Promise((resolve, reject) => {
+        return new Promise((resolve) => {
           if (!this.ws) {
             // 如果 WebSocket 未初始化，直接拒绝
-            reject(this.inputData)
+            resolve(this.inputData)
             return
           }