vue2-client 1.9.83 → 1.9.85

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "vue2-client",
-  "version": "1.9.83",
+  "version": "1.9.85",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
     "serve:gaslink": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode gaslink",
     "serve:revenue": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode revenue",
     "serve:his": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode his",
-    "mac-serve": "vue-cli-service serve --no-eslint --mode mac",
+    "mac-serve": "vue-cli-service serve --no-eslint --mode his",
     "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
     "test:unit": "vue-cli-service test:unit",
     "lint": "vue-cli-service lint",

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

@@ -217,6 +217,12 @@ export default {
     },
     ...mapState('account', { currUser: 'user' })
   },
+  provide () {
+    return {
+      getComponentByName: this.getComponentByName,
+      registerComponent: this.registerComponent
+    }
+  },
   methods: {
     runLogic,
     getConfigByNameAsync,
@@ -298,6 +304,17 @@ export default {
       }
       this.loaded = true
     },
+    registerComponent (componentName, component) {
+      console.log('内部注册', this.$options.name, componentName)
+      this.$refs[componentName] = component
+      console.log('内部注册完成', this.$refs)
+    },
+    // 根据名字从注册到组件中获取组件
+    getComponentByName (componentName) {
+      console.log('内部取组件', this.$options.name, componentName)
+      console.log('内部组件内容', this.$refs)
+      return this.$refs[componentName]
+    },
     // 兼容需要省略 传递 [formItems: res.formJson ] 可以使用 ...res 展开运算符 直接转递
     getFromItem (formItems, formJson) {
       const _formItems = formItems || formJson
@@ -747,6 +764,7 @@ export default {
       }).catch(e => {
         this.$message.error(this.businessType + '失败：' + e)
       }).finally(() => {
+        this.loading = false
         if (callback) {
           callback()
         }

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

@@ -30,6 +30,7 @@
 <script>
 import { runLogic } from '@vue2-client/services/api/common'
 export default {
+  inject: ['getSelectedId', 'getSelectedData', 'getMixinData', 'getOutEnv', 'currUser'],
   data () {
     return {
       serviceName: undefined,
@@ -52,10 +53,10 @@ export default {
       const {
         serviceName,
         // 配置内容
-        value
+        logicName
       } = params
-      console.log('=========')
-      this.renderConfig = value
+      console.log('调用会话框init方法', params)
+      this.renderConfig = { logicName: logicName }
       this.loading = true
       this.serviceName = serviceName
     },
@@ -77,6 +78,9 @@ export default {
        this.messages.push({ type: 'bot', text: response.value })
     },
   },
+  mounted () {
+    this.setAddtionalInfo(this.getMixinData())
+  },
 }
 </script>
 

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

@@ -29,12 +29,19 @@
           :placeholder="attr.placeholder ? attr.placeholder : '请输入'+attr.name.replace(/\s*/g, '')"
           :ref="`${attr.model}input`"/>
         <a-button
-          v-if="attr.inputOnAfterName && attr.inputOnAfterFunc"
+          v-if="attr.inputOnAfterName && attr.inputOnAfterFunc && !attr.inputOnAfterName.includes('|')"
           style="flex: 1; width: auto; min-width: 4rem;max-width: 6rem"
           type="primary"
           @click="emitFunc(attr.inputOnAfterFunc,attr)">
           {{ attr.inputOnAfterName }}
         </a-button>
+        <!-- 状态按钮 -->
+        <x-status-button
+          v-else
+          :states="parseStates(attr.inputOnAfterName, attr.inputOnAfterFunc)"
+          v-on="generateDynamicEvents(attr.inputOnAfterFunc, attr)"
+          style="flex: 1; width: auto; min-width: 4rem; max-width: 6rem"
+        />
         <!--    仅可以配置 一个按钮 以及 一个图标插槽    -->
         <a-button
           style="width: 2rem; flex-shrink: 0;"
@@ -621,6 +628,26 @@
     >
     </recording>
   </x-form-col>
+  <!-- 表格录入 -->
+  <x-form-col
+    v-else-if="attr.type === 'rowEdit' && show"
+    :flex="attr.flex">
+    <a-form-model-item
+      :ref="attr.model"
+      :label="showLabel?attr.name:undefined"
+      :prop="attr.prop ? attr.prop : attr.model">
+      <x-form-table
+        :key="'childTable_' + attr.model"
+        :title="attr.name"
+        :queryParamsName="attr.crud"
+        :localEditMode="true"
+        :fixed-query-form="childTableFixedQueryForm(attr)"
+        :service-name="serviceName"
+        @hook:mounted="(h)=>onComponentMounted(h, attr)"
+        :ref="'childXFormTable_' + attr.model">
+      </x-form-table>
+    </a-form-model-item>
+  </x-form-col>
 </template>
 <script>
 import { debounce } from 'ant-design-vue/lib/vc-table/src/utils'
@@ -636,8 +663,9 @@ import util from '@vue2-client/utils/util'
 import XTreeSelect from '@vue2-client/base-client/components/common/XForm/XTreeSelect'
 import { searchToListOption, searchToOption } from '@vue2-client/services/v3Api'
 import { mapState } from 'vuex'
-import { executeStrFunction } from '@vue2-client/utils/runEvalFunction'
+import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
 import XLicensePlate from '@vue2-client/base-client/components/common/XLicensePlate/XLicensePlate.vue'
+import XStatusButton from './XStatusButton.vue'
 
 export default {
   name: 'XFormItem',
@@ -651,7 +679,8 @@ export default {
     CitySelect,
     PersonSetting,
     AddressSearchCombobox,
-    Upload
+    Upload,
+    XStatusButton
   },
   data () {
     // 检索去抖
@@ -849,7 +878,46 @@ export default {
       deep: true
     }
   },
+  inject: ['registerComponent', 'getComponentByName'],
   methods: {
+    // 把内部的crud表单录入放到表单中，以便外部可以调用
+    onComponentMounted (h, attr) {
+      console.log('crud表单', h)
+      if (cell.slotRef) {
+        this.registerComponent(attr.key, this.$refs["'childXFormTable_' + attr.model"])
+      }
+    },
+    childTableFixedQueryForm (item) {
+      console.log('传递的form', this.form)
+      if (this.modifyModelData?.primaryKeyData) {
+        const fixedForm = {}
+        fixedForm[item.childTableForeignKeyName] = Object.values(this.modifyModelData.primaryKeyData)[0]
+        return fixedForm
+      }
+      return null
+    },
+    // 动态生成事件绑定对象
+    generateDynamicEvents (inputOnAfterFunc, attr) {
+      const events = {}
+      const states = this.parseStates(attr.inputOnAfterName, inputOnAfterFunc)
+
+      states.forEach((state) => {
+        // 动态绑定事件名到 emitFunc
+        events[state.event] = () => {
+          console.info('事件名', state.event)
+          this.emitFunc(state.event, attr)
+        }
+      })
+
+      return events // 返回 { state1Event: handler, state2Event: handler, ... }
+    },
+    parseStates (input, events) {
+      const eventNames = events.split('|')
+      return input.split('|').map((label, index) => ({
+        label,
+        event: eventNames[index] // 如果没有提供事件名称，则使用默认值
+      }))
+    },
     focusInput () {
       if (this.attr.defaultFocus) {
         this.$nextTick(h => {
@@ -904,17 +972,17 @@ export default {
     // js 函数作为数据源
     async updateOptions () {
       if (this.attr.keyName && (this.attr.keyName.indexOf('async ') !== -1 || this.attr.keyName.indexOf('function ') !== -1)) {
-        this.optionForFunc = await executeStrFunction(this.attr.keyName, [this.form, runLogic, this.mode, getConfigByNameAsync])
+        this.optionForFunc = await executeStrFunctionByContext(this, this.attr.keyName, [this.form, runLogic, this.mode, getConfigByNameAsync])
       }
     },
     async dataChangeFunc () {
       if (this.attr.dataChangeFunc) {
-        await executeStrFunction(this.attr.dataChangeFunc, [this.form, this.setForm, this.attr, util, this.mode, runLogic, getConfigByNameAsync])
+        await executeStrFunctionByContext(this, this.attr.dataChangeFunc, [this.form, this.setForm, this.attr, util, this.mode, runLogic, getConfigByNameAsync])
       }
     },
     async showFormItemFunc () {
       if (this.attr.showFormItemFunc) {
-        const obj = executeStrFunction(this.attr.showFormItemFunc, [this.form, this.setForm, this.attr, util, this.mode])
+        const obj = executeStrFunctionByContext(this, this.attr.showFormItemFunc, [this.form, this.setForm, this.attr, util, this.mode])
         // 判断是 bool 还是  obj  兼容
         if (typeof obj === 'boolean') {
           this.show = obj
@@ -929,7 +997,7 @@ export default {
     },
     async showQueryFormItemFunc () {
       if (this.attr.showQueryFormItemFunc) {
-        const obj = executeStrFunction(this.attr.showQueryFormItemFunc, [this.form, this.setForm, this.attr, util, this.mode])
+        const obj = executeStrFunctionByContext(this, this.attr.showQueryFormItemFunc, [this.form, this.setForm, this.attr, util, this.mode])
         // 判断是 bool 还是  obj  兼容
         if (typeof obj === 'boolean') {
           this.show = obj

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

@@ -0,0 +1,54 @@
+<template>
+  <div>
+    <a-button type="primary" @click="handleClick">{{ currentLabel }}</a-button>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'StateButton',
+  props: {
+    // 定义状态和对应的显示文本与事件
+    states: {
+      type: Array,
+      required: true,
+      default: () => [
+        { label: '状态1', event: 'state1Event' },
+        { label: '状态2', event: 'state2Event' },
+        { label: '状态3', event: 'state3Event' },
+      ],
+    },
+    initialIndex: {
+      type: Number,
+      default: 0,
+    },
+  },
+  data () {
+    return {
+      currentIndex: this.initialIndex,
+    }
+  },
+  computed: {
+    // 当前显示的按钮文本
+    currentLabel () {
+      return this.states[this.currentIndex]?.label || '按钮'
+    },
+  },
+  methods: {
+    handleClick () {
+      // 触发当前状态的事件
+      const currentState = this.states[this.currentIndex]
+      if (currentState && currentState.event) {
+        this.$emit(currentState.event)
+      }
+
+      // 切换到下一个状态
+      this.currentIndex = (this.currentIndex + 1) % this.states.length
+    },
+  },
+}
+</script>
+
+<style scoped>
+/* 添加样式以适应项目需求 */
+</style>

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

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

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

@@ -770,6 +770,8 @@ export default {
       this.form = form
       if (this.createdQuery) {
         this.refresh(true)
+      } else {
+        this.createdQuery = true
       }
     },
     /**

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

@@ -0,0 +1,210 @@
+// recordingPlugin.js
+export default {
+  install (Vue) {
+    Vue.prototype.$recording = {
+      isRecording: false, // 标识是否正在录音
+      mediaRecorder: null, // MediaRecorder 实例
+      audioChunks: [], // 存储录音数据块
+      audioUrl: null, // 录音生成的 URL
+      inputData: '',
+      audioContext: null,
+      audioStream: null,
+      ws: null,
+
+      async startRecording () {
+        this.inputData = ''
+        this.audioChunks = []
+
+        const url = 'ws://192.168.50.67:31090/websocket/bash' // WebSocket地址
+        this.setupWebSocket(url)
+
+        // 等待 WebSocket 连接成功
+        await this.waitForWebSocketConnection()
+
+        this.isRecording = true
+
+        // 初始化 AudioContext
+        this.audioContext = new (window.AudioContext || window.webkitAudioContext)()
+
+        if (!navigator.mediaDevices || !navigator.mediaDevices.getUserMedia) {
+          throw new Error(
+            '录音软件不支持您的浏览器！请使用现代浏览器或确保您正在使用 HTTPS。'
+          )
+        }
+
+        // 获取麦克风输入流
+        this.audioStream = await navigator.mediaDevices.getUserMedia({ audio: true })
+
+        // 设置音频处理流程
+        this.setupAudioProcessing()
+      },
+
+      setupWebSocket (url) {
+        this.ws = new WebSocket(url)
+
+        this.ws.onmessage = (event) => {
+          const data = JSON.parse(event.data)
+          console.log('Result:', data.result)
+          if (data.result !== undefined) {
+            this.inputData += data.result
+          }
+          if (!this.isRecording) {
+            this.ws.close()
+            this.resRecordingData()
+          }
+        }
+
+        this.ws.onclose = () => console.log('WebSocket closed.')
+        this.ws.onerror = (error) => console.error('WebSocket error:', error)
+      },
+
+      waitForWebSocketConnection () {
+        return new Promise((resolve, reject) => {
+          this.ws.onopen = () => {
+            console.log('WebSocket 连接成功')
+            resolve()
+          }
+
+          this.ws.onerror = (error) => {
+            reject(new Error('WebSocket 连接失败: ' + error.message))
+          }
+        })
+      },
+
+      setupAudioProcessing () {
+        try {
+          const source = this.audioContext.createMediaStreamSource(this.audioStream)
+          const processor = this.audioContext.createScriptProcessor(4096, 1, 1)
+
+          processor.onaudioprocess = (e) => {
+            if (!this.isRecording) return
+
+            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)
+          }
+
+          source.connect(processor)
+          processor.connect(this.audioContext.destination)
+        } catch (error) {
+          console.error('Error setting up audio processing:', error)
+          throw error
+        }
+      },
+
+      stopRecording () {
+        this.isRecording = false
+
+        // 停止麦克风流
+        if (this.audioStream) {
+          this.audioStream.getTracks().forEach((track) => track.stop())
+        }
+
+        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)
+        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))
+          }
+        }
+
+        writeString(view, 0, 'RIFF')
+        view.setUint32(4, 36 + samples.length * 2, true)
+        writeString(view, 8, 'WAVE')
+
+        writeString(view, 12, 'fmt ')
+        view.setUint32(16, 16, true)
+        view.setUint16(20, 1, true)
+        view.setUint16(22, 1, true)
+        view.setUint32(24, sampleRate, true)
+        view.setUint32(28, sampleRate * 2, true)
+        view.setUint16(32, 2, true)
+        view.setUint16(34, 16, true)
+
+        writeString(view, 36, 'data')
+        view.setUint32(40, samples.length * 2, true)
+
+        let offset = 44
+        for (let i = 0; i < samples.length; i++) {
+          const s = Math.max(-1, Math.min(1, samples[i]))
+          view.setInt16(offset, s < 0 ? s * 0x8000 : s * 0x7fff, true)
+          offset += 2
+        }
+
+        return new Blob([buffer], { type: 'audio/wav' })
+      },
+
+      resample (data, inputSampleRate, outputSampleRate) {
+        if (inputSampleRate === outputSampleRate) {
+          return data
+        }
+        const sampleRateRatio = inputSampleRate / outputSampleRate
+        const newLength = Math.round(data.length / sampleRateRatio)
+        const resampledData = new Float32Array(newLength)
+        for (let i = 0; i < newLength; i++) {
+          const index = Math.round(i * sampleRateRatio)
+          resampledData[i] = data[index]
+        }
+        return resampledData
+      },
+
+      convertTo16BitPCM (data) {
+        const output = new Int16Array(data.length)
+        for (let i = 0; i < data.length; i++) {
+          output[i] = Math.max(-1, Math.min(1, data[i])) * 0x7fff
+        }
+        return new Uint8Array(output.buffer)
+      },
+
+      getRecordingData () {
+        return this.inputData
+      },
+
+      resRecordingData () {
+        // Custom logic for emitting recording data
+      }
+    }
+  }
+}

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

@@ -1,21 +1,23 @@
-import GetLoginInfoService from '@vue2-client/base-client/plugins/GetLoginInfoService'
-import GetAppDataService from '@vue2-client/base-client/plugins/AppData'
-import getConfig from '@vue2-client/base-client/plugins/Config'
-import moment from '@vue2-client/base-client/plugins/moment'
-
-import VueI18nPlugin from './i18n-extend'
-import AuthorityPlugin from './authority-plugin'
-import TabsPagePlugin from './tabs-page-plugin'
-
-const Plugins = {
-  install: function (Vue) {
-    Vue.use(GetLoginInfoService)
-    Vue.use(GetAppDataService)
-    Vue.use(getConfig)
-    Vue.use(moment)
-    Vue.use(VueI18nPlugin)
-    Vue.use(AuthorityPlugin)
-    Vue.use(TabsPagePlugin)
-  }
-}
-export default Plugins
+import GetLoginInfoService from '@vue2-client/base-client/plugins/GetLoginInfoService'
+import GetAppDataService from '@vue2-client/base-client/plugins/AppData'
+import getConfig from '@vue2-client/base-client/plugins/Config'
+import moment from '@vue2-client/base-client/plugins/moment'
+import recording from '@vue2-client/base-client/plugins/Recording'
+
+import VueI18nPlugin from './i18n-extend'
+import AuthorityPlugin from './authority-plugin'
+import TabsPagePlugin from './tabs-page-plugin'
+
+const Plugins = {
+  install: function (Vue) {
+    Vue.use(GetLoginInfoService)
+    Vue.use(GetAppDataService)
+    Vue.use(getConfig)
+    Vue.use(moment)
+    Vue.use(VueI18nPlugin)
+    Vue.use(AuthorityPlugin)
+    Vue.use(TabsPagePlugin)
+    Vue.use(recording)
+  }
+}
+export default Plugins

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

@@ -87,9 +87,9 @@ routerResource.example = {
           // 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/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'),