vue2-client 1.15.92 → 1.15.93

package/src/base-client/components/common/richTextModal/richDemo.vue

@@ -1,48 +1,48 @@
-<template>
-  <div>
-    <h1>Canvas Editor 示例</h1>
-    <x-add-native-form ref="nativeForm" />
-  </div>
-</template>
-
-<script>
-import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
-import { getConfigByName } from '../../../../services/api/common'
-
-export default {
-  components: {
-    XAddNativeForm
-  },
-  mounted () {
-    this.$nextTick(() => {
-      getConfigByName('表单测试Form', 'af-his', (res) => {
-        const modifyModelData = {
-          data: {
-            t_f_file_id: 1,
-            t_f_path: '/usr/local/tomcat/files/af-his/txt/f7c758f6d5f14c53bb5246f82a25c0c4.txt'
-          },
-          images: [],
-          files: []
-        }
-        this.$refs.nativeForm.init({
-          serviceName: 'af-his',
-          formItems: res.formJson,
-          title: '收费',
-          businessType: '新增',
-          layout: 'inline',
-          modifyModelData: modifyModelData
-        })
-      })
-    })
-  },
-  methods: {
-    submit () {
-
-    }
-  }
-}
-</script>
-
-<style>
-/* 在这里添加您的样式 */
-</style>
+<template>
+  <div>
+    <h1>Canvas Editor 示例</h1>
+    <x-add-native-form ref="nativeForm" />
+  </div>
+</template>
+
+<script>
+import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
+import { getConfigByName } from '../../../../services/api/common'
+
+export default {
+  components: {
+    XAddNativeForm
+  },
+  mounted () {
+    this.$nextTick(() => {
+      getConfigByName('表单测试Form', 'af-his', (res) => {
+        const modifyModelData = {
+          data: {
+            t_f_file_id: 1,
+            t_f_path: '/usr/local/tomcat/files/af-his/txt/f7c758f6d5f14c53bb5246f82a25c0c4.txt'
+          },
+          images: [],
+          files: []
+        }
+        this.$refs.nativeForm.init({
+          serviceName: 'af-his',
+          formItems: res.formJson,
+          title: '收费',
+          businessType: '新增',
+          layout: 'inline',
+          modifyModelData: modifyModelData
+        })
+      })
+    })
+  },
+  methods: {
+    submit () {
+
+    }
+  }
+}
+</script>
+
+<style>
+/* 在这里添加您的样式 */
+</style>

package/src/base-client/components/his/XHisEditor/XHisEditor.vue

@@ -39,7 +39,9 @@
 <!--              >-->
 <!--                使用-->
 <!--              </a-button>-->
-
+              <a-button type="primary" @click="Recording" v-if="this.resId !== -1" v-model="recording">
+                {{recording? '停止' : '录音'}}
+              </a-button>
               <a-button type="primary" @click="openRenameModal" v-if="this.resId !== -1">
                 重命名
               </a-button>
@@ -76,7 +78,7 @@
               <a-modal
                 title="保存"
                 :visible="saveVisible"
-                confirm-loading = false
+                :confirm-loading = "false"
                 @ok="handleSaveConfirm"
                 @cancel="saveVisible = false"
               >
@@ -155,6 +157,7 @@ export default {
   },
   data () {
     return {
+      recording: false, // 是否正在录音
       readonly: false,
       ready: false,
       loading: false,
@@ -197,6 +200,7 @@ export default {
       ],
       // 编辑器实例
       editorRef: null,
+
       // 文档资源列表
       resList: [],
       // 文档资源ID
@@ -328,6 +332,7 @@ export default {
       }
     },
     init (params) {
+
       const {
         fileUrl,
         resId,
@@ -414,6 +419,51 @@ export default {
     changeMode (e) {
       this.editorRef.execCommand(this.modeType)
     },
+    // 启动录音功能
+    async Recording () {
+      this.recording = !this.recording
+      if (this.recording) {
+        const recording = await this.$recording.startRecording()
+        this.$message.warn(recording.msg)
+      } else {
+        try {
+          // 1. 获取录音和接口数据
+          const recording = this.$recording.stopRecording()
+          this.$message.warn(recording.msg)
+          const data = await this.$recording.getRecordingData()
+          const result = await this.runLogic('communacation', {record_content: data}, 'af-his')
+          // 验证基础结构
+          if (!result || typeof result.value !== 'string') {
+            throw new Error('接口返回格式错误，缺少有效的value字段')
+          }
+          // 2. 处理外层JSON字符串（关键修复）
+          let outerJsonStr = result.value
+          // 修复1：处理布尔值
+          outerJsonStr = outerJsonStr.replace(/\bTrue\b/g, 'true')
+          // 修复2：移除所有控制字符
+          outerJsonStr = outerJsonStr.replace(/[\x00-\x1F]/g, '')
+          // 修复3：精准转义data字段内的双引号
+          // 匹配 "data": "..." 结构并转义内容中的双引号
+          outerJsonStr = outerJsonStr.replace(/"data":\s*"([^"]*)"/g, (match, content) => {
+            // 转义内容中的双引号为\"
+            const escapedContent = content.replace(/"/g, '\\"')
+            return `"data": "${escapedContent}"`
+          })
+          // 直接在整个字符串里匹配 ```json{...}```
+          const regex = /```json([\s\S]*?)```/
+          const match = outerJsonStr.match(regex)
+          let extractedJsonStr = ''
+          if (match && match[1]) {
+            extractedJsonStr = match[1].trim()
+          }
+          const outerObj = JSON.parse(extractedJsonStr)
+          console.log("outerObj = ", outerObj)
+        } catch (e) {
+          console.error('总错误:', e.message)
+          this.$message.error(`解析失败: ${e.message}`)
+        }
+      }
+    },
     // 打开文档信息修改面板
     openRenameModal () {
       this.resDataModalMode = 'modify'

package/src/base-client/components/his/XHisEditor/dome.vue

@@ -0,0 +1,144 @@
+<template>
+  <div>
+    <a-spin :spinning="loading">
+      <XHisEditor
+        ref="editor"
+        :file-url="fileUrl"
+        :res-id="resId"
+        :curr-res-data="currResData"
+        :bind-object="bindObject"
+        :save-data-logic-name="saveDataLogicName"
+        :service-name="serviceName"
+        :logic-extra-params="logicExtraParams"
+        :drop-down-box-params="dropDownBoxParams"
+        @init="handleEditorInit"
+      />
+    </a-spin>
+  </div>
+</template>
+
+<script>
+import XHisEditor from '@vue2-client/base-client/components/his/XHisEditor/XHisEditor.vue'
+
+export default {
+  name: 'Test',
+  components: { XHisEditor },
+  data () {
+    return {
+      loading: false,
+      fileUrl: '/resource/af-his/html/bd40c834fcf94303a5db43e56852c6f2.html',
+      resId: '',
+      currResData: {
+        f_file_name: '测试文书'
+      },
+
+      bindObject: {
+        lxrdh: null,
+        yjs: null,
+        hys: null,
+        tw: null,
+        jws: null,
+        zyh: 381,
+        xbs: null,
+        pid: 506,
+        gms: null,
+        bq: '3楼',
+        hx: null,
+        hy: null,
+        mb: null,
+        lxrdz: null,
+        ssy: null,
+        jzys: '心血管内科医生2',
+        tgjc: null,
+        blh: 643,
+        ch: '13床',
+        ks: '心血管内科',
+        jlsj: null,
+        jts: null,
+        grs: null,
+        xb: 1,
+        rysj: '2025-07-01 14:36:00',
+        mz: '',
+        lxrxm: null,
+        hzgx: null,
+        szy: null,
+        xm: '张阿德',
+        csd: null,
+        hzxm: '张阿德',
+        gzdw: '',
+        xzz: null,
+        zs: null,
+        nl: 18,
+        rq: null
+      },
+      saveDataLogicName: 'saveMedicalRecordFile',
+      serviceName: 'af-his',
+      logicExtraParams: {
+        admissionId: 643,
+        templateId: 429
+      },
+      dropDownBoxParams: [],
+      initAttempts: 0,
+      maxInitAttempts: 10
+    }
+  },
+  mounted () {
+    this.$nextTick(() => {
+      this.waitForEditorReady().then(() => {
+        this.initEditor()
+      }).catch(error => {
+        console.error('编辑器初始化失败:', error)
+        this.loading = false
+      })
+    })
+  },
+  beforeDestroy () {
+    window.removeEventListener('unhandledrejection')
+  },
+  methods: {
+    waitForEditorReady () {
+      return new Promise((resolve, reject) => {
+        const checkInterval = setInterval(() => {
+          const editor = this.$refs.editor
+
+          if (editor && editor.editorRef && editor.editorRef.document) {
+            console.log('编辑器已完全初始化')
+            clearInterval(checkInterval)
+            resolve()
+          } else {
+            this.initAttempts++
+            console.log(`等待编辑器初始化...尝试次数: ${this.initAttempts}`)
+
+            if (this.initAttempts >= this.maxInitAttempts) {
+              clearInterval(checkInterval)
+              reject(new Error('编辑器初始化超时'))
+            }
+          }
+        }, 300)
+      })
+    },
+
+    initEditor () {
+      // this.loading = true
+      console.log('开始初始化编辑器...')
+
+      this.$refs.editor.init({
+        fileUrl: this.fileUrl,
+        resId: this.resId,
+        currResData: this.currResData,
+        bindObject: this.bindObject,
+        saveDataLogicName: this.saveDataLogicName,
+        serviceName: this.serviceName,
+        logicExtraParams: this.logicExtraParams,
+        dropDownBoxParams: this.dropDownBoxParams,
+        modeType: 'form'
+      })
+    },
+
+    handleEditorInit () {
+      this.loading = false
+      console.log('编辑器初始化完成，可以安全操作')
+    }
+  }
+}
+</script>

package/src/base-client/components/his/XHisEditor/index.js

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

package/src/base-client/components/his/XImportExcelButton/XFrontImportExcel.vue

@@ -0,0 +1,214 @@
+<template>
+  <a-modal
+    title="数据导入"
+    :visible="open"
+    :zIndex="1001"
+    :confirm-loading="uploading"
+    @cancel="importExcelHandleCancel"
+  >
+    <a-spin tip="上传中..." :spinning="uploading">
+      <a-upload-dragger
+        name="file"
+        accept=".xlsx, .xls"
+        :file-list="fileList"
+        :multiple="false"
+        :remove="handleRemove"
+        :before-upload="beforeUpload"
+      >
+        <p class="ant-upload-drag-icon">
+          <a-icon type="inbox" />
+        </p>
+        <p class="ant-upload-text">
+          请将文件拖拽到此处上传
+        </p>
+        <p class="ant-upload-hint">
+          支持单个上传，也可以点击后选择文件上传
+        </p>
+      </a-upload-dragger>
+      <a-divider v-if="$slots.importExcelSlot"/>
+      <a-collapse :bordered="false" v-if="$slots.importExcelSlot">
+        <a-collapse-panel key="0" header="查看导入说明">
+          <slot name="importExcelSlot"></slot>
+        </a-collapse-panel>
+      </a-collapse>
+    </a-spin>
+    <template slot="footer">
+      <a-row>
+        <a-button type="link" icon="download" v-if="queryParamsName !== 'none'" @click="importTemplate">
+          下载导入模板
+        </a-button>
+        <a-button key="back" @click="importExcelHandleCancel">
+          取消
+        </a-button>
+        <a-button key="submit" type="primary" :loading="uploading" @click="importExcelHandleChange">
+          导入
+        </a-button>
+      </a-row>
+    </template>
+  </a-modal>
+</template>
+
+<script>
+
+import { importData, downloadImportExcel, getConfigByName } from '@vue2-client/services/api/common'
+import { excleParseArrays } from '@vue2-client/utils/excel/Export2Excel'
+import { mapState } from 'vuex'
+
+export default {
+  name: 'XImportExcel',
+  props: {
+    serviceName: {
+      type: String,
+      default: undefined
+    },
+    importType: {
+      type: String,
+      default: undefined
+    },
+    env: {
+      type: String,
+      default: 'prod'
+    },
+    queryParamsName: {
+      type: String,
+      default: 'none'
+    },
+    // 业务名称
+    title: {
+      type: String,
+      default: ''
+    },
+    extraData: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    }
+  },
+  components: {
+  },
+  data () {
+    return {
+      open: false,
+      uploadStatus: '',
+      fileList: [],
+      // 是否禁用上传
+      uploading: false,
+      excelImportTemplate: [],
+    }
+  },
+  filters: {
+  },
+  created () {
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user' })
+  },
+  watch: {
+  },
+  methods: {
+    /** 导入excel窗体关闭 */
+    importExcelHandleCancel (e) {
+      this.open = false
+      this.fileList = []
+      // 关闭后刷新列表
+      this.$emit('ok')
+    },
+    /** 下载模板操作 */
+    importTemplate () {
+      downloadImportExcel({
+        queryParamsName: this.queryParamsName
+      }, this.serviceName, this.env === 'dev').then(res => {
+        if (!res || !res.value) {
+          this.$message.warn('导入模板不存在，请检查配置')
+           return
+        }
+        window.open(res.value)
+      })
+    },
+    /** 导入excel窗体开启 */
+    importExcelHandleOpen (e) {
+      this.open = true
+      console.log(this.importType)
+      if (this.importType == 'former') {
+        this.readTemplateConfig()
+      }
+    },
+    /** 读取excle导入模板 */
+    readTemplateConfig () {
+      getConfigByName(this.queryParamsName, 'af-his', res => {
+        console.log('res2=====>', res)
+        if (res != null && res != undefined) {
+          this.excelImportTemplate = res.excelImportTemplate[0]?.column
+        }
+      })
+    },
+    beforeUpload (file) {
+      this.fileList = [file]
+      return false
+    },
+    /** 导入excel */
+    importExcelHandleChange () {
+      const { fileList } = this
+      const formData = new FormData()
+      if (!fileList[0]) {
+        this.$message.warn('请选择需要上传的文件')
+        return
+      }
+      this.uploading = true
+      if (this.importType == 'former') {
+        try {
+          const parsedData = excleParseArrays(fileList[0], this.excelImportTemplate)
+          this.$emit('frontImport', parsedData, () => {
+          this.open = false
+          this.uploading = false
+        })
+        } catch (error) {
+          this.$message.error('Excel 解析失败，请检查文件格式')
+        } finally {
+          this.open = false
+          this.uploading = false
+        }
+      } else if (this.importType == 'customization') {
+       //  this.$emit('customization', fileList[0]) // 自定义处理方式
+      } else {
+        const userData = {
+          currUserName: this.currUser.name,
+          currUserId: this.currUser.id,
+          orgId: this.currUser.orgid,
+          orgName: this.currUser.orgs,
+          depId: this.currUser.depids,
+          depName: this.currUser.deps
+        }
+        formData.append('file', fileList[0])
+        formData.append('queryParamsName', this.queryParamsName)
+        formData.append('userData', JSON.stringify(userData))
+        formData.append('otherParams', JSON.stringify(this.extraData))
+        importData(formData, this.serviceName, this.env === 'dev').then(res => {
+          this.fileList = []
+          const msg = res.msg || '导入成功'
+          if (res?.successLen && !res?.msg) {
+            this.$message.success(`${msg}，成功导入${res.successLen}条数据`)
+          } else {
+            this.$message.success(msg)
+          }
+          this.open = false
+          this.$emit('ok', res)
+        }).catch(e => {
+          this.$message.error(e)
+        }).finally(() => {
+          this.uploading = false
+        })
+      }
+    },
+    handleRemove () {
+      this.fileList = []
+      this.uploading = false
+    },
+    excleParse () {
+      return []
+    }
+
+  }
+}
+</script>

package/src/base-client/components/his/XImportExcelButton/XFrontImportExcelDemo.vue

@@ -0,0 +1,21 @@
+<script>
+import XImportExcelButton from './XImportExcelButton.vue'
+export default {
+  name: 'XFrontImportExcelDemo',
+  components: {
+    XImportExcelButton,
+  },
+  data () {
+    return {
+      queryParamsName: 'testImprot'
+    }
+  }
+}
+</script>
+
+<template>
+  <x-import-excel-button :queryParamsName="queryParamsName"></x-import-excel-button>
+</template>
+
+<style scoped>
+</style>

package/src/base-client/components/his/XImportExcelButton/XImportExcelButton.vue

@@ -0,0 +1,103 @@
+<template>
+  <div class="import-button">
+    <a-button
+      type="type"
+      ref="importExcelButton"
+      @click="importData">
+      <a-icon :style="iconStyle" type="import"/>{{ this.label }}
+    </a-button>
+    <x-front-import-excel
+      ref="importExcel"
+      :title="title"
+      :extraData="extraData"
+      :service-name="serviceName"
+      :import-type="importType"
+      :env="env"
+      @frontImport="fronImport"
+      :query-params-name="crudQueryParamsName"
+    >
+    </x-front-import-excel>
+  </div>
+</template>
+
+<script>
+
+import { getConfigByName } from '@vue2-client/services/api/common'
+import XFrontImportExcel from './XFrontImportExcel.vue'
+
+export default {
+  name: 'XImportExcelButton',
+  props: {
+    queryParamsName: {
+      type: Object,
+      default: null
+    }
+  },
+  inject: ['getComponentByName'],
+  components: {
+    XFrontImportExcel
+  },
+  data () {
+    return {
+      // 图标样式
+      iconStyle: {
+        position: 'relative',
+        top: '1px'
+      },
+      type: 'primary',
+      label: '导入',
+      title: '',
+      extraData: '',
+      serviceName: '',
+      env: 'dev',
+      crudQueryParamsName: '',
+      importType: undefined,
+      fronImportEvent: 'fronImport'
+    }
+  },
+  created () {
+    this.getData(this.queryParamsName)
+  },
+  methods: {
+    // 获取配置
+    async getData (queryParamsName) {
+      getConfigByName(queryParamsName, 'af-his', res => {
+        if (res != null) {
+          this.crudQueryParamsName = res.queryParamsName
+          this.env = res.env || 'dev'
+          this.serviceName = res.serviceName || ''
+          this.title = res.title || ''
+          this.extraData = res.extraData || ''
+          this.label = res.label || '导入'
+          this.importType = res.importType
+          this.fronImportEvent = res.fronImportEvent || 'fronImport'
+          this.type = res.type || 'primary'
+        }
+      })
+    },
+    // 导入业务
+    importData () {
+      this.$refs.importExcel.importExcelHandleOpen()
+    },
+    // 导入操作
+    fronImport (dataList, callback) {
+      console.log('条件事件', dataList)
+      console.log('条件事件', this.fronImportEvent)
+      if (this.$listeners[this.fronImportEvent]) {
+        // 交由父级处理
+        this.$emit(this.fronImportEvent, dataList, callback)
+      } else {
+        this.defaultAction(this.fronImportEvent, { key: '导入' }, callback)
+      }
+    },
+    defaultAction (clickEventName, item, callback) {
+      setTimeout(() => {
+        this.$message.warn(`已触发按钮 [${item.key}]，注册事件名 [${clickEventName}]，未实现事件函数`)
+        callback()
+      }, 200)
+    },
+  },
+}
+</script>
+<style scoped>
+</style>

package/src/base-client/components/his/XList/XList.vue

@@ -452,7 +452,7 @@ export default {
 .demo-infinite-container{
   overflow-x: hidden;
   overflow-y: auto;
-  height: 80vh;
+  height: 85vh;
 }
 .card-row{
   height: 100%;