vue2-client 1.13.18 → 1.13.20

package/package.json

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

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

@@ -1,121 +1,128 @@
-<template>
-  <div class="x-input-wrapper">
-    <div class="input-container">
-      <span v-if="config?.label" class="input-label">{{ config.label }}</span>
-      <div class="input-wrapper">
-        <a-input
-          v-model="innerValue"
-          v-bind="$attrs"
-          :placeholder="config?.placeholder"
-          :size="config?.size"
-          :maxLength="config?.maxLength"
-          :disabled="config?.disabled"
-          :allowClear="config?.allowClear"
-          @change="handleInput"
-          @pressEnter="handleSearch"
-        >
-          <template v-if="config?.prefix" #prefix>
-            <a-icon :type="config.prefix" @click="handleSearch" class="clickable-icon" />
-          </template>
-          <template v-if="config?.suffix" #suffix>
-            <a-icon :type="config.suffix" @click="handleSearch" class="clickable-icon" />
-          </template>
-        </a-input>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'XInput',
-  inheritAttrs: false,
-  props: {
-    value: {
-      type: [String, Number],
-      default: ''
-    },
-    queryParamsName: {
-      type: String,
-      default: ''
-    }
-  },
-  data () {
-    return {
-      innerValue: this.value || '',
-      config: null
-    }
-  },
-  created () {
-    this.getData(this.queryParamsName)
-  },
-  emits: ['search'],
-  methods: {
-    runLogic,
-    async getData (data) {
-      getConfigByName(data, 'af-his', res => {
-        this.config = res
-        if (res.defaultValue !== undefined) {
-          this.innerValue = res.defaultValue
-        }
-      })
-    },
-    handleInput (e) {
-      const value = e.target.value
-      this.innerValue = value
-      this.$emit('search', value)
-    },
-    handleSearch () {
-      // 统一的搜索事件：将当前输入值发送给父组件
-      this.$emit('search', this.innerValue)
-    }
-  },
-  watch: {
-    value: {
-      handler (newValue) {
-        this.innerValue = newValue
-      },
-      immediate: true
-    },
-    queryParamsName: {
-      handler (newValue) {
-        this.getData(newValue)
-      },
-      deep: true
-    }
-  }
-}
-</script>
-
-<style scoped>
-.x-input-wrapper {
-  position: relative;
-  display: inline-block;
-  width: 100%;
-}
-
-.input-container {
-  display: flex;
-  align-items: center;
-}
-
-.input-label {
-  white-space: nowrap;
-  color: rgba(0, 0, 0, 0.85);
-  padding-right: 8px; /* 标签右侧固定间距 */
-}
-
-.input-wrapper {
-  flex: 1; /* 输入框占据剩余空间 */
-}
-
-:deep(.clickable-icon) {
-  cursor: pointer;
-}
-
-:deep(.clickable-icon:hover) {
-  color: #1890ff;
-}
-</style>
+<template>
+  <div class="x-input-wrapper">
+    <div class="input-container">
+      <span v-if="config?.label" class="input-label">{{ config.label }}</span>
+      <div class="input-wrapper">
+        <a-input
+          v-model="innerValue"
+          v-bind="$attrs"
+          :placeholder="config?.placeholder"
+          :size="config?.size"
+          :maxLength="config?.maxLength"
+          :disabled="config?.disabled"
+          :allowClear="config?.allowClear"
+          @change="handleInput"
+          @pressEnter="handleSearch"
+        >
+          <template v-if="config?.prefix" #prefix>
+            <a-icon :type="config.prefix" @click="handleSearch" class="clickable-icon" />
+          </template>
+          <template v-if="config?.suffix" #suffix>
+            <a-icon :type="config.suffix" @click="handleSearch" class="clickable-icon" />
+          </template>
+        </a-input>
+      </div>
+      <span v-if="config?.tail" class="input-tail">{{ config.tail }}</span>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'XInput',
+  inheritAttrs: false,
+  props: {
+    value: {
+      type: [String, Number],
+      default: ''
+    },
+    queryParamsName: {
+      type: String,
+      default: ''
+    }
+  },
+  data () {
+    return {
+      innerValue: this.value || '',
+      config: null
+    }
+  },
+  created () {
+    this.getData(this.queryParamsName)
+  },
+  emits: ['search'],
+  methods: {
+    runLogic,
+    async getData (data) {
+      getConfigByName(data, 'af-his', res => {
+        this.config = res
+        if (res.defaultValue !== undefined) {
+          this.innerValue = res.defaultValue
+        }
+      })
+    },
+    handleInput (e) {
+      const value = e.target.value
+      this.innerValue = value
+      this.$emit('search', value)
+    },
+    handleSearch () {
+      // 统一的搜索事件：将当前输入值发送给父组件
+      this.$emit('search', this.innerValue)
+    }
+  },
+  watch: {
+    value: {
+      handler (newValue) {
+        this.innerValue = newValue
+      },
+      immediate: true
+    },
+    queryParamsName: {
+      handler (newValue) {
+        this.getData(newValue)
+      },
+      deep: true
+    }
+  }
+}
+</script>
+
+<style scoped>
+.x-input-wrapper {
+  position: relative;
+  display: inline-block;
+  width: 100%;
+}
+
+.input-container {
+  display: flex;
+  align-items: center;
+}
+
+.input-label {
+  white-space: nowrap;
+  color: rgba(0, 0, 0, 0.85);
+  padding-right: 8px; /* 标签右侧固定间距 */
+}
+
+.input-label {
+  white-space: nowrap;
+  color: rgba(0, 0, 0, 0.85);
+  padding-left: 4px; /* 标签左侧固定间距 */
+}
+
+.input-wrapper {
+  flex: 1; /* 输入框占据剩余空间 */
+}
+
+:deep(.clickable-icon) {
+  cursor: pointer;
+}
+
+:deep(.clickable-icon:hover) {
+  color: #1890ff;
+}
+</style>

package/src/base-client/components/common/XInput/index.md

@@ -13,16 +13,18 @@ XInput 是一个封装了 Ant Design Vue 的输入框组件，提供搜索功能
 
 组件通过 `queryParamsName` 属性获取配置，配置内容如下：
 
-| 参数 | 说明 | 类型 | 默认值 |
-| --- | --- | --- | --- |
-| size | 输入框大小 | string | 'default' |
-| prefix | 前缀图标类型 | string | '' |
-| defaultValue | 默认值 | string/number | '' |
-| disabled | 是否禁用 | boolean | false |
-| placeholder | 占位文本 | string | '' |
-| allowClear | 是否允许清除 | boolean | true |
-| suffix | 后缀图标类型 | string | 'search' |
-| maxLength | 最大输入长度 | number | 50 |
+| 参数           | 说明     | 类型            | 默认值 |
+|--------------|--------|---------------| --- |
+| size         | 输入框大小  | string        | 'default' |
+| prefix       | 前缀图标类型 | string        | '' |
+| defaultValue | 默认值    | string/number | '' |
+| disabled     | 是否禁用   | boolean       | false |
+| placeholder  | 占位文本   | string        | '' |
+| allowClear   | 是否允许清除 | boolean       | true |
+| suffix       | 后缀图标类型 | string        | 'search' |
+| maxLength    | 最大输入长度 | number        | 50 |
+ | label        | 输入框前文字 | String        | '' |
+ | tail         | 输入框后文字 | String        | '' |
 
 ## 事件
 
@@ -36,8 +38,8 @@ XInput 是一个封装了 Ant Design Vue 的输入框组件，提供搜索功能
 
 ```vue
 <template>
-  <x-input 
-    v-model="searchValue" 
+  <x-input
+    v-model="searchValue"
     @search="handleSearch"
   />
 </template>
@@ -80,8 +82,8 @@ export default {
 
 ```vue
 <template>
-  <x-input 
-    v-model="searchValue" 
+  <x-input
+    v-model="searchValue"
     query-params-name="customInputConfig"
     @search="handleSearch"
   />

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

@@ -1,6 +1,6 @@
 <template>
   <a-card :bordered="false">
-    <a-tabs :tabBarGutter="10" :activeKey="activeKey" @change="tabPaneChange">
+    <a-tabs :tabBarGutter="10" :activeKey="activeKey" @change="tabPaneChange" :hideAdd="true" :tabBarStyle="{ display: showTabBar ? 'block' : 'none' }">
       <a-tab-pane
         :forceRender="true"
         v-for="(tab, index) in config.data"
@@ -50,7 +50,8 @@ export default {
       activeKey: 0,
       // 配置
       config: undefined,
-      attr: {}
+      attr: {},
+      showTabBar: true // 默认显示页签
     }
   },
   computed: {
@@ -133,11 +134,15 @@ export default {
         this.getConfig()
       } else if (this.localConfig) {
         this.config = this.localConfig
+        // 设置是否显示页签
+        this.showTabBar = this.localConfig.showTabBar !== false
       }
     },
     getConfig () {
       getConfigByName(this.configName, this.serverName, res => {
         this.config = res
+        // 设置是否显示页签
+        this.showTabBar = res.showTabBar !== false
       }, this.env === 'dev')
     },
     getEventHandlers (tab, index) {

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

@@ -162,10 +162,11 @@ export default {
       }
     }
   },
-  //      初始化    保存后        加载文件后
-  emits: ['init', 'saveafter', 'afterLoadFile'],
+  //      初始化    保存后        加载文件后    诊断选择
+  emits: ['init', 'saveafter', 'afterLoadFile', 'selected'],
   methods: {
     runLogic,
+    /* eslint-disable */
     async initDiagnosisAutocomplete (dropDownBoxParams) {
       if (!this.editorRef || !this.editorRef.document) {
         return
@@ -176,7 +177,21 @@ export default {
         return
       }
 
-      dropDownBoxParams.forEach(async (param) => {
+      // 创建一个简单的自定义事件系统
+      // 1. 创建一个隐藏的DOM元素作为事件通道
+      const eventChannel = this.editorRef.document.createElement('div');
+      eventChannel.id = 'diagnosis-event-channel';
+      eventChannel.style.display = 'none';
+      this.editorRef.document.body.appendChild(eventChannel);
+      // 2. 在iframe文档中监听自定义事件
+      const that = this;
+      this.editorRef.document.addEventListener('diagnosis-selected', function(e) {
+        if (e && e.detail) {
+          that.$emit('selected', { item: e.detail, editor: that.editorRef });
+        }
+      });
+
+      for (const param of dropDownBoxParams) {
         if (param.identificationCode && param.dataLogic) {
           try {
             let preliDiagnoData = null
@@ -185,15 +200,38 @@ export default {
               {}, 'af-his').then(res => {
               preliDiagnoData = res
             })
+
+            // 创建脚本元素
             const scriptElement = this.editorRef.document.createElement('script')
-            scriptElement.textContent = `(${initDiagnosisDropdown.toString()})(editor,${JSON.stringify(preliDiagnoData)},'${param.identificationCode}')`
-            this.editorRef.document.body.appendChild(scriptElement)
-          } catch (error) {
 
+            // 注入自定义事件触发函数和初始化代码
+            scriptElement.textContent = `
+              // 定义一个函数来触发自定义事件
+              function triggerDiagnosisSelected(data) {
+                const event = new CustomEvent('diagnosis-selected', {
+                  detail: data,
+                  bubbles: true
+                });
+                document.dispatchEvent(event);
+              }
+
+              // 初始化诊断下拉菜单，使用自定义事件触发函数
+              (${initDiagnosisDropdown.toString()})(
+                editor,
+                ${JSON.stringify(preliDiagnoData)},
+                '${param.identificationCode}',
+                triggerDiagnosisSelected
+              );
+            `;
+
+            this.editorRef.document.body.appendChild(scriptElement);
+          } catch (error) {
+            console.error('初始化诊断自动完成失败:', error);
           }
         }
-      })
+      }
     },
+    /* eslint-disable */
     // 初始化文档
     onload (e) {
       if (e && e.target && e.target.contentWindow) {
@@ -229,9 +267,9 @@ export default {
       this.modeType = modeType
       this.ready = true
       // 先加载文件
-      this.loadFile(fileUrl, bindObject, currResData).then(() => {
+      this.loadFile(fileUrl, bindObject, currResData).then(async () => {
         // 文件加载完成后再初始化自动完成
-        this.initDiagnosisAutocomplete(dropDownBoxParams)
+        await this.initDiagnosisAutocomplete(dropDownBoxParams)
       })
       this.loadResList()
     },

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

@@ -1,4 +1,5 @@
-export function initDiagnosisDropdown (editor, data, identificationCode) {
+/* eslint-disable */
+export function initDiagnosisDropdown (editor, data, identificationCode, emitFunc) {
   if (typeof editor === 'undefined' || !editor.$) {
     return
   }
@@ -213,6 +214,27 @@ export function initDiagnosisDropdown (editor, data, identificationCode) {
     e.stopPropagation()
     if (isEditableMode()) {
       const name = editor.$(this).find('.ant-list-item-title').text()
+      const code = editor.$(this).find('.ant-list-item-description').text()
+      // 根据选中的name和code查找完整数据
+      const selectedItem = mockDiagnosisList.find(item =>
+        item.name === name && item.code === code
+      )
+
+      // 打印完整数据，包括id、name和code
+      if (selectedItem) {
+        // 使用传入的emit函数触发事件
+        if (typeof emitFunc === 'function') {
+          // 只传递数据参数，不再传递事件名
+          emitFunc(selectedItem)
+        }
+      } else {
+        // 如果找不到完整数据，至少打印出已知信息
+        // 使用传入的emit函数触发事件，发送部分数据
+        if (typeof emitFunc === 'function') {
+          // 只传递数据参数，不再传递事件名
+          emitFunc({name, code, element: identificationCode})
+        }
+      }
       fieldElement.textContent = name
       dropdownList.style.display = 'none'
       fieldElement.focus()