vue2-client 1.13.3 → 1.13.5

package/package.json

@@ -1,107 +1,107 @@
-{
-  "name": "vue2-client",
-  "version": "1.13.3",
-  "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:liuli": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode liuli",
-    "serve:scada": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode scada",
-    "serve:iot": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode iot",
-    "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 his",
-    "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
-    "test:unit": "vue-cli-service test:unit",
-    "lint": "vue-cli-service lint",
-    "build:preview": "vue-cli-service build --mode preview",
-    "lint:nofix": "vue-cli-service lint --no-fix",
-    "test": "jest"
-  },
-  "dependencies": {
-    "@afwenming123/vue-easy-tree": "^1.0.1",
-    "@afwenming123/vue-plugin-hiprint": "^0.0.70",
-    "@amap/amap-jsapi-loader": "^1.0.1",
-    "@antv/data-set": "^0.11.8",
-    "@antv/g2plot": "^2.4.31",
-    "@hufe921/canvas-editor": "^0.9.49",
-    "@microsoft/fetch-event-source": "^2.0.1",
-    "@vue/babel-preset-jsx": "^1.4.0",
-    "animate.css": "^4.1.1",
-    "ant-design-vue": "^1.7.8",
-    "axios": "^0.27.2",
-    "clipboard": "^2.0.11",
-    "core-js": "^3.33.0",
-    "crypto-js": "^4.1.1",
-    "date-fns": "^2.29.3",
-    "default-passive-events": "^2.0.0",
-    "dotenv": "^16.3.1",
-    "echarts": "^5.5.0",
-    "enquire.js": "^2.1.6",
-    "file-saver": "^2.0.5",
-    "highlight.js": "^11.7.0",
-    "html2canvas": "^1.4.1",
-    "js-base64": "^3.7.5",
-    "js-cookie": "^2.2.1",
-    "jsencrypt": "^3.3.2",
-    "jspdf": "^2.5.1",
-    "lodash.clonedeep": "^4.5.0",
-    "lodash.debounce": "^4",
-    "lodash.get": "^4.4.2",
-    "marked": "^4",
-    "mockjs": "^1.1.0",
-    "nprogress": "^0.2.0",
-    "qs": "^6.11.2",
-    "regenerator-runtime": "^0.14.0",
-    "videojs-contrib-hls": "^5.15.0",
-    "viser-vue": "^2.4.8",
-    "vue": "^2.7.14",
-    "vue-codemirror": "4.0.6",
-    "vue-draggable-resizable": "^2",
-    "vue-i18n": "^8.28.2",
-    "vue-json-viewer": "^2.2.22",
-    "vue-router": "^3.6.5",
-    "vue-video-player": "^5.0.2",
-    "vue-virtual-scroller": "^1.1.2",
-    "vuedraggable": "^2.24.3",
-    "vuex": "^3.6.2",
-    "xlsx": "0.18.5"
-  },
-  "devDependencies": {
-    "@ant-design/colors": "^7.0.0",
-    "@babel/core": "^7.22.20",
-    "@babel/eslint-parser": "^7.22.15",
-    "@babel/preset-env": "^7.22.20",
-    "@vue/cli-plugin-babel": "^5.0.8",
-    "@vue/cli-plugin-eslint": "^5.0.8",
-    "@vue/cli-service": "^5.0.8",
-    "@vue/eslint-config-standard": "^8.0.1",
-    "@vue/test-utils": "^1.3.6",
-    "babel-plugin-transform-remove-console": "^6.9.4",
-    "compression-webpack-plugin": "^10.0.0",
-    "css-minimizer-webpack-plugin": "^5.0.1",
-    "deepmerge": "^4.3.1",
-    "eslint": "^8.51.0",
-    "eslint-plugin-vue": "^9.17.0",
-    "fast-deep-equal": "^3.1.3",
-    "ignore-loader": "^0.1.2",
-    "jest": "^29.7.0",
-    "jest-environment-jsdom": "^29.7.0",
-    "jest-transform-stub": "^2.0.0",
-    "less-loader": "^6.2.0",
-    "script-loader": "^0.7.2",
-    "style-resources-loader": "^1.5.0",
-    "vue-cli-plugin-style-resources-loader": "^0.1.5",
-    "vue-jest": "^4.0.1",
-    "vue-template-compiler": "^2.7.14",
-    "webpack": "^5.88.2",
-    "webpack-theme-color-replacer": "^1.4.7",
-    "whatwg-fetch": "^3.6.19"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not dead",
-    "not ie 11"
-  ]
-}
+{
+  "name": "vue2-client",
+  "version": "1.13.5",
+  "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:liuli": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode liuli",
+    "serve:scada": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode scada",
+    "serve:iot": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode iot",
+    "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 his",
+    "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
+    "test:unit": "vue-cli-service test:unit",
+    "lint": "vue-cli-service lint",
+    "build:preview": "vue-cli-service build --mode preview",
+    "lint:nofix": "vue-cli-service lint --no-fix",
+    "test": "jest"
+  },
+  "dependencies": {
+    "@afwenming123/vue-easy-tree": "^1.0.1",
+    "@afwenming123/vue-plugin-hiprint": "^0.0.70",
+    "@amap/amap-jsapi-loader": "^1.0.1",
+    "@antv/data-set": "^0.11.8",
+    "@antv/g2plot": "^2.4.31",
+    "@hufe921/canvas-editor": "^0.9.49",
+    "@microsoft/fetch-event-source": "^2.0.1",
+    "@vue/babel-preset-jsx": "^1.4.0",
+    "animate.css": "^4.1.1",
+    "ant-design-vue": "^1.7.8",
+    "axios": "^0.27.2",
+    "clipboard": "^2.0.11",
+    "core-js": "^3.33.0",
+    "crypto-js": "^4.1.1",
+    "date-fns": "^2.29.3",
+    "default-passive-events": "^2.0.0",
+    "dotenv": "^16.3.1",
+    "echarts": "^5.5.0",
+    "enquire.js": "^2.1.6",
+    "file-saver": "^2.0.5",
+    "highlight.js": "^11.7.0",
+    "html2canvas": "^1.4.1",
+    "js-base64": "^3.7.5",
+    "js-cookie": "^2.2.1",
+    "jsencrypt": "^3.3.2",
+    "jspdf": "^2.5.1",
+    "lodash.clonedeep": "^4.5.0",
+    "lodash.debounce": "^4",
+    "lodash.get": "^4.4.2",
+    "marked": "^4",
+    "mockjs": "^1.1.0",
+    "nprogress": "^0.2.0",
+    "qs": "^6.11.2",
+    "regenerator-runtime": "^0.14.0",
+    "videojs-contrib-hls": "^5.15.0",
+    "viser-vue": "^2.4.8",
+    "vue": "^2.7.14",
+    "vue-codemirror": "4.0.6",
+    "vue-draggable-resizable": "^2",
+    "vue-i18n": "^8.28.2",
+    "vue-json-viewer": "^2.2.22",
+    "vue-router": "^3.6.5",
+    "vue-video-player": "^5.0.2",
+    "vue-virtual-scroller": "^1.1.2",
+    "vuedraggable": "^2.24.3",
+    "vuex": "^3.6.2",
+    "xlsx": "0.18.5"
+  },
+  "devDependencies": {
+    "@ant-design/colors": "^7.0.0",
+    "@babel/core": "^7.22.20",
+    "@babel/eslint-parser": "^7.22.15",
+    "@babel/preset-env": "^7.22.20",
+    "@vue/cli-plugin-babel": "^5.0.8",
+    "@vue/cli-plugin-eslint": "^5.0.8",
+    "@vue/cli-service": "^5.0.8",
+    "@vue/eslint-config-standard": "^8.0.1",
+    "@vue/test-utils": "^1.3.6",
+    "babel-plugin-transform-remove-console": "^6.9.4",
+    "compression-webpack-plugin": "^10.0.0",
+    "css-minimizer-webpack-plugin": "^5.0.1",
+    "deepmerge": "^4.3.1",
+    "eslint": "^8.51.0",
+    "eslint-plugin-vue": "^9.17.0",
+    "fast-deep-equal": "^3.1.3",
+    "ignore-loader": "^0.1.2",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
+    "jest-transform-stub": "^2.0.0",
+    "less-loader": "^6.2.0",
+    "script-loader": "^0.7.2",
+    "style-resources-loader": "^1.5.0",
+    "vue-cli-plugin-style-resources-loader": "^0.1.5",
+    "vue-jest": "^4.0.1",
+    "vue-template-compiler": "^2.7.14",
+    "webpack": "^5.88.2",
+    "webpack-theme-color-replacer": "^1.4.7",
+    "whatwg-fetch": "^3.6.19"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not dead",
+    "not ie 11"
+  ]
+}

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

@@ -1,6 +1,5 @@
 <template>
-  <div class="x-input-wrapper" v-click-outside="handleClickOutside">
-    <!-- 输入框部分 -->
+  <div class="x-input-wrapper">
     <a-input
       v-model="innerValue"
       v-bind="$attrs"
@@ -9,70 +8,25 @@
       :maxLength="config?.maxLength"
       :disabled="config?.disabled"
       :allowClear="config?.allowClear"
-      @change="handleChange"
-      @pressEnter="handlePressEnter"
-      @focus="handleFocus"
+      @change="handleInput"
+      @pressEnter="handleSearch"
     >
       <template v-if="config?.prefix" #prefix>
-        <a-icon :type="config.prefix" @click="handlePrefixClick" class="clickable-icon" />
+        <a-icon :type="config.prefix" @click="handleSearch" class="clickable-icon" />
       </template>
       <template v-if="config?.suffix" #suffix>
-        <a-icon :type="config.suffix" @click="handleSuffixClick" class="clickable-icon" />
+        <a-icon :type="config.suffix" @click="handleSearch" class="clickable-icon" />
       </template>
     </a-input>
-
-    <!-- 搜索结果列表 -->
-    <div v-if="isListVisible" class="search-list">
-      <a-list
-        v-if="searchList.length > 0"
-        size="small"
-        bordered
-      >
-        <a-list-item
-          v-for="item in searchList"
-          :key="item.id"
-          @click="handleSelect(item)"
-        >
-          <div class="item-content">
-            <span class="item-name">{{ item.name }}</span>
-            <span class="item-code">{{ item.code }}</span>
-          </div>
-        </a-list-item>
-      </a-list>
-      <div v-else class="empty-data">
-        <a-empty :image="simpleImage" :description="'暂无数据'" />
-      </div>
-    </div>
   </div>
 </template>
 
 <script>
 import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
-import debounce from 'lodash/debounce'
-import { Empty } from 'ant-design-vue'
-
-// 自定义指令：点击外部关闭
-const clickOutside = {
-  bind (el, binding) {
-    el.__vueClickOutside__ = function (event) {
-      if (!(el === event.target || el.contains(event.target))) {
-        binding.value(event)
-      }
-    }
-    document.body.addEventListener('click', el.__vueClickOutside__)
-  },
-  unbind (el) {
-    document.body.removeEventListener('click', el.__vueClickOutside__)
-    delete el.__vueClickOutside__
-  }
-}
 
 export default {
   name: 'XInput',
   inheritAttrs: false,
-  directives: {
-    'click-outside': clickOutside
-  },
   props: {
     value: {
       type: [String, Number],
@@ -80,117 +34,37 @@ export default {
     },
     queryParamsName: {
       type: String,
-      default: 'inputTestConfig'
+      default: ''
     }
   },
   data () {
     return {
-      innerValue: this.value,
-      config: null,
-      searchList: [],
-      isListVisible: false,
-      simpleImage: Empty.PRESENTED_IMAGE_SIMPLE
+      innerValue: this.value || '',
+      config: null
     }
   },
   created () {
     this.getData(this.queryParamsName)
-    this.debouncedSearch = debounce(this.handleSearch, 300)
   },
+  emits: ['search'],
   methods: {
+    runLogic,
     async getData (data) {
       getConfigByName(data, 'af-his', res => {
-        console.warn(res)
         this.config = res
         if (res.defaultValue !== undefined) {
           this.innerValue = res.defaultValue
-          // 当配置中有默认值时，向父组件同步默认值
-          this.$emit('input', res.defaultValue)
-        }
-        if (res.logicName) {
-          runLogic(res.logicName, res.parameter, 'af-his').then(result => {
-            if (result) {
-              this.handleLogicResult(result)
-            }
-          })
         }
       })
     },
-    handleChange (e) {
+    handleInput (e) {
       const value = e.target.value
-      // 双向绑定：将输入框的值同步给父组件
-      this.$emit('input', value)
-      // 发送change事件：当输入框值变化时触发，携带原生事件对象
-      this.$emit('change', e)
-      this.debouncedSearch(value)
-    },
-    handlePressEnter (e) {
-      // 发送回车事件：当用户按下回车键时触发
-      this.$emit('pressEnter', e)
-      this.handleSearch(e.target.value)
-    },
-    handleFocus () {
-      this.isListVisible = true
-      // 当获取焦点时，如果输入框为空，显示所有数据
-      if (!this.innerValue) {
-        this.handleSearch('')
-      }
-    },
-    handleClickOutside () {
-      this.isListVisible = false
-    },
-    async handleSearch (value) {
-      if (!this.config?.searchConfig?.logicName) return
-
-      try {
-        // 调用后端搜索接口
-        const result = await runLogic(
-          this.config.searchConfig.logicName,
-          {
-            ...this.config.searchConfig.parameter,
-            searchValue: value
-          },
-          'af-his'
-        )
-
-        if (result) {
-          // 更新搜索结果列表
-          this.searchList = result || []
-          console.warn(result)
-          // 发送搜索结果
-          this.$emit('search-result', result)
-        }
-      } catch (error) {
-        console.error('搜索失败:', error)
-        this.searchList = []
-      }
+      this.innerValue = value
+      this.$emit('search', value)
     },
-    handlePrefixClick (e) {
-      e.stopPropagation()
-      // 发送前缀图标点击事件：当用户点击输入框前缀图标时触发
-      this.$emit('prefix-click', this.innerValue)
-      this.handleSearch(this.innerValue)
-    },
-    handleSuffixClick (e) {
-      e.stopPropagation()
-      // 发送后缀图标点击事件：当用户点击输入框后缀图标时触发
-      this.$emit('suffix-click', this.innerValue)
-      this.handleSearch(this.innerValue)
-    },
-    handleLogicResult (result) {
-      if (result.value !== undefined) {
-        this.innerValue = result.value
-        // 发送输入值：当逻辑处理返回新值时，同步给父组件
-        this.$emit('input', result.value)
-      }
-    },
-    handleSelect (item) {
-      this.innerValue = item.name
-      this.searchList = [] // 清空列表
-      this.isListVisible = false // 选择后关闭列表
-      // 发送选中项的名称：用于更新输入框的值
-      this.$emit('input', item.name)
-      // 发送选中事件：当用户从搜索结果列表中选择一项时触发，携带完整的选中项数据
-      this.$emit('select', item)
+    handleSearch () {
+      // 统一的搜索事件：将当前输入值发送给父组件
+      this.$emit('search', this.innerValue)
     }
   },
   watch: {
@@ -206,9 +80,6 @@ export default {
       },
       deep: true
     }
-  },
-  beforeDestroy () {
-    this.debouncedSearch.cancel()
   }
 }
 </script>
@@ -220,36 +91,6 @@ export default {
   width: 100%;
 }
 
-.search-list {
-  position: absolute;
-  top: 100%;
-  left: 0;
-  width: 100%;
-  max-height: 300px;
-  overflow-y: auto;
-  background: #fff;
-  z-index: 1000;
-  margin-top: 4px;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
-}
-
-.item-content {
-  display: flex;
-  justify-content: space-between;
-  width: 100%;
-  padding: 8px 12px;
-  cursor: pointer;
-}
-
-.item-content:hover {
-  background-color: #f5f5f5;
-}
-
-.item-code {
-  color: rgba(0, 0, 0, 0.45);
-  font-size: 12px;
-}
-
 :deep(.clickable-icon) {
   cursor: pointer;
 }
@@ -257,11 +98,4 @@ export default {
 :deep(.clickable-icon:hover) {
   color: #1890ff;
 }
-.empty-data {
-  padding: 16px;
-  text-align: center;
-  background: #fff;
-  border: 1px solid #d9d9d9;
-  border-radius: 2px;
-}
 </style>

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

@@ -0,0 +1,95 @@
+# XInput 组件
+
+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 |
+
+## 事件
+
+| 事件名称 | 说明 | 回调参数 |
+| --- | --- | --- |
+| search | 搜索事件，在输入值变化、按下回车键或点击图标时触发 | function(value) |
+
+## 使用示例
+
+### 基础用法
+
+```vue
+<template>
+  <x-input 
+    v-model="searchValue" 
+    @search="handleSearch"
+  />
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      searchValue: ''
+    }
+  },
+  methods: {
+    handleSearch(value) {
+      console.log('搜索值:', value)
+      // 执行搜索逻辑
+    }
+  }
+}
+</script>
+```
+
+### 自定义配置
+
+在后端配置中定义如下配置：
+
+```json
+{
+  "size": "default",
+  "prefix": "",
+  "defaultValue": "",
+  "disabled": false,
+  "placeholder": "请输入关键词",
+  "allowClear": true,
+  "suffix": "search",
+  "maxLength": 50
+}
+```
+
+然后在组件中使用：
+
+```vue
+<template>
+  <x-input 
+    v-model="searchValue" 
+    query-params-name="customInputConfig"
+    @search="handleSearch"
+  />
+</template>
+```
+
+## 注意事项
+
+1. 组件会在每次输入值变化时触发 `search` 事件
+2. 点击前缀/后缀图标或按下回车键也会触发 `search` 事件
+3. 组件通过 `v-model` 支持双向绑定

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

@@ -25,7 +25,7 @@
           </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', 'x-check-list', 'x-cardSet', 'x-collapse','x-h-descriptions', 'x-sidebar', 'x-list','x-input','x-time-line', 'x-radio','x-calendar', 'x-time-select' ,'x-checkbox', 'x-title'].includes(cell.slotType)">
+              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', 'x-check-list', 'x-cardSet', 'x-collapse','x-h-descriptions', 'x-sidebar', 'x-list','x-input','x-time-line', 'x-radio','x-calendar', 'x-time-select' ,'x-checkbox', 'x-title', 'x-select'].includes(cell.slotType)">
               <component
                 :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
                 :key="cellIndex"
@@ -60,7 +60,7 @@
           </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', 'x-check-list', 'x-cardSet', 'x-collapse', 'x-h-descriptions', 'x-sidebar', 'x-list','x-input','x-time-line', 'x-radio','x-calendar', 'x-time-select','x-checkbox', 'x-title'].includes(cell.slotType)">
+              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', 'x-check-list', 'x-cardSet', 'x-collapse', 'x-h-descriptions', 'x-sidebar', 'x-list','x-input','x-time-line', 'x-radio','x-calendar', 'x-time-select','x-checkbox', 'x-title', 'x-select'].includes(cell.slotType)">
               <component
                 :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
                 :key="cellIndex"
@@ -116,7 +116,8 @@ export default {
     XCalendar: () => import('@vue2-client/base-client/components/common/XCalendar/XCalendar.vue'),
     XTimeSelect: () => import('@vue2-client/base-client/components/his/XTimeSelect/XTimeSelect.vue'),
     XCheckbox: () => import('@vue2-client/base-client/components/his/XCheckbox/XCheckbox.vue'),
-    XTitle: () => import('@vue2-client/base-client/components/his/XTitle/XTitle.vue')
+    XTitle: () => import('@vue2-client/base-client/components/his/XTitle/XTitle.vue'),
+    XSelect: () => import('@vue2-client/base-client/components/his/XSelect/XSelect.vue')
   },
   props: {
     // 每一行的配置

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

@@ -1,51 +1,29 @@
 <template>
   <div class="patient-info-descriptions">
-    <a-descriptions
-      :column="config?.layout"
-      :size="config?.style?.size"
-      :bordered="config?.style?.bordered"
-      layout="horizontal">
-      <template v-if="data">
-        <!-- 显示前N个标签 -->
-        <a-descriptions-item
-          v-for="(item) in visibleItems"
-          :key="item.field"
-          :colon="item.colon !== false"
-          v-if="data[item.field] !== null && data[item.field] !== undefined">
-          <template #label>
-            <div :class="['label-wrapper', { 'with-avatar': item.showAvatar }]">
-              <a-avatar
-                v-if="item.showAvatar"
-                :size="item.avatar.size"
-                :icon="item.avatar.icon"
-                :style="{ background: item.avatar.background }"
-              />
-              <span class="label-text">{{ item.label }}</span>
-            </div>
-          </template>
-          <div class="content-wrapper">
-            {{ data[item.field] }}
-          </div>
-        </a-descriptions-item>
+    <div class="descriptions-container">
+      <!-- 详情/收起按钮 -->
+      <div v-if="hasMoreItems" class="detail-button-wrapper">
+        <a-button
+          :type="config?.detailsConfig?.buttonType || 'link'"
+          @click="toggleDetails"
+        >
+          <a-icon :type="showAllItems ? 'up' : 'down'" />
+          {{ showAllItems ? '收起' : (config?.detailsConfig?.buttonText || '详情') }}
+        </a-button>
+      </div>
 
-        <!-- 详情按钮 -->
-        <a-descriptions-item v-if="hasMoreItems && !showAllItems">
-          <a-button
-            :type="config?.detailsConfig?.buttonType || 'link'"
-            @click="toggleDetails"
-          >
-            <a-icon type="down" />
-            {{ config?.detailsConfig?.buttonText || '详情' }}
-          </a-button>
-        </a-descriptions-item>
-
-        <!-- 展开后显示剩余标签 -->
-        <template v-if="showAllItems">
+      <a-descriptions
+        :column="config?.layout"
+        :size="config?.style?.size"
+        :bordered="config?.style?.bordered"
+        layout="horizontal">
+        <template v-if="data">
+          <!-- 显示前N个标签 -->
           <a-descriptions-item
-            v-for="item in hiddenItems"
+            v-for="(item) in visibleItems"
             :key="item.field"
             :colon="item.colon !== false"
-            v-if="data[item.field] !== null && data[item.field] !== undefined">
+            v-if="data[item.field] !== null && data[item.field] !== undefined && (!showAllItems || showAllItems && !hiddenItems.some(i => i.field === item.field))">
             <template #label>
               <div :class="['label-wrapper', { 'with-avatar': item.showAvatar }]">
                 <a-avatar
@@ -62,16 +40,32 @@
             </div>
           </a-descriptions-item>
 
-          <!-- 收起按钮 -->
-          <a-descriptions-item>
-            <a-button type="link" @click="toggleDetails">
-              <a-icon type="up" />
-              收起
-            </a-button>
-          </a-descriptions-item>
+          <!-- 展开后显示剩余标签 -->
+          <template v-if="showAllItems">
+            <a-descriptions-item
+              v-for="item in hiddenItems"
+              :key="item.field"
+              :colon="item.colon !== false"
+              v-if="data[item.field] !== null && data[item.field] !== undefined">
+              <template #label>
+                <div :class="['label-wrapper', { 'with-avatar': item.showAvatar }]">
+                  <a-avatar
+                    v-if="item.showAvatar"
+                    :size="item.avatar.size"
+                    :icon="item.avatar.icon"
+                    :style="{ background: item.avatar.background }"
+                  />
+                  <span class="label-text">{{ item.label }}</span>
+                </div>
+              </template>
+              <div class="content-wrapper">
+                {{ data[item.field] }}
+              </div>
+            </a-descriptions-item>
+          </template>
         </template>
-      </template>
-    </a-descriptions>
+      </a-descriptions>
+    </div>
   </div>
 </template>
 <script>
@@ -89,7 +83,7 @@ export default {
   props: {
     queryParamsName: {
       type: String,
-      default: 'DescriptionsExampleConfig'
+      default: ''
     },
     parameter: {
       type: Object,
@@ -126,8 +120,18 @@ export default {
     // 获取应该显示的标签
     visibleItems () {
       if (!this.config?.items) return []
-      // 如果没有配置detailsConfig或者已经展开，则显示所有项
-      if (!this.config?.detailsConfig || this.showAllItems) return this.config.items
+
+      if (!this.config?.detailsConfig) {
+        // 如果没有配置detailsConfig，直接显示所有项
+        return this.config.items
+      }
+
+      if (this.showAllItems) {
+        // 如果已经展开，也返回前N项，后面的项目会通过hiddenItems显示
+        return this.config.items.slice(0, this.detailsAfterIndex)
+      }
+
+      // 否则显示前N项
       return this.config.items.slice(0, this.detailsAfterIndex)
     },
     // 获取隐藏的标签
@@ -183,6 +187,20 @@ export default {
   border-radius: 4px;
 }
 
+.descriptions-container {
+  position: relative; /* 为绝对定位的按钮提供参考点 */
+}
+
+.detail-button-wrapper {
+  position: absolute;
+  right: 0;
+  top: 0;
+  z-index: 10;
+  padding: 4px 8px;
+  border-radius: 4px;
+  background-color: rgba(255, 255, 255, 0.9);
+}
+
 .label-wrapper {
   display: flex;
   align-items: center;

package/src/base-client/components/his/XHDescriptions/index.md

@@ -7,7 +7,8 @@
 - 支持响应式布局，在不同屏幕尺寸下自动调整列数
 - 支持折叠/展开功能，控制信息的显示量
 - 支持自定义样式和头像
-- 自动隐藏值为 null 或 undefined 的字段
+- 自动隐藏值为 null、undefined的字段
+- 右上角悬浮"详情/收起"按钮，布局更整洁
 
 ## 配置说明
 
@@ -17,18 +18,19 @@
 
 ```json
 "layout": {
-    "xl": 8,
+    "xl": 4, 
     "md": 3,
     "sm": 2,
     "lg": 4,
     "xs": 1,
-    "xxl": 8
+    "xxl": 5
 }
 ```
 
 - 用于设置在不同屏幕尺寸下的列数
 - 键名对应不同的屏幕尺寸（xs, sm, md, lg, xl, xxl）
 - 值为每行显示的列数
+- 建议根据字段宽度合理设置，避免一行过多字段导致布局问题
 
 ### 2. 样式配置 (style)
 
@@ -84,7 +86,7 @@
 "detailsConfig": {
     "buttonText": "详细",
     "buttonType": "link",
-    "showAfterIndex": 3
+    "showAfterIndex": 5
 }
 ```
 
@@ -105,14 +107,14 @@
 ```
 
 - `logicName`: 用于获取数据的逻辑名称
-- `serverName`: 服务名称
-- `parameter`: 可选的参数对象
+- `serverName`: 服务名称，默认为 "af-his"
+- `parameter`: 可选的参数对象，会与组件的 parameter 属性合并后传递给后端
 
 ## 使用示例
 
 ```vue
 <template>
-  <XHDescriptions queryParamsName="DescriptionsExampleConfig" />
+  <XHDescriptions queryParamsName="patientBasicInfoConfig" />
 </template>
 
 <script>
@@ -126,38 +128,70 @@ export default {
 </script>
 ```
 
+也可以传递参数：
+
+```vue
+<template>
+  <XHDescriptions 
+    queryParamsName="patientBasicInfoConfig" 
+    :parameter="{ patientId: '123456' }" 
+  />
+</template>
+```
+
 ## 特殊说明
 
 1. **响应式布局**：
    - 组件会根据屏幕尺寸自动调整列数
    - 可在 `layout` 配置中自定义不同尺寸下的列数
+   - 建议根据字段数量和宽度合理设置列数，例如字段较多时可减少列数
 
 2. **折叠/展开功能**：
    - 折叠功能只在明确配置了 `detailsConfig` 对象时启用
    - 没有配置 `detailsConfig` 时，会直接显示所有字段，不会出现详情按钮
-   - 配置了 `detailsConfig` 后，只显示 `showAfterIndex` 指定数量的字段，超出部分需点击详情按钮查看
-   - 点击详情按钮后会展开显示全部字段，可通过收起按钮恢复
+   - 详情按钮会悬浮在组件右上角，点击可展开/收起全部字段
+   - 按钮显示"详情"或"收起"，会根据当前状态自动切换
 
 3. **空值处理**：
-   - 当字段值为 `null` 或 `undefined` 时，该字段不会显示
-   - 折叠功能会忽略值为 `null` 的字段，只有有值的隐藏字段才会触发显示详情按钮
+   - 当字段值为 `null`、`undefined` 或空字符串 `""` 时，该字段不会显示
+   - 折叠功能会忽略空值的字段，只有有值的隐藏字段才会触发显示详情按钮
    - 这个特性可以用于根据数据动态控制字段的显示，无需修改配置
 
+4. **字段重复问题处理**：
+   - 组件已经优化处理了展开时的字段重复显示问题
+   - 采用智能过滤机制，确保同一字段不会在多个位置显示
+
+## 配置优化建议
+
+1. **字段数量**：
+   - 建议将最重要、最常用的信息放在前 `showAfterIndex` 个位置
+   - 避免配置过多字段，通常不建议超过 20 个字段
+   - 如有大量相关字段，考虑拆分为多个不同的描述组件
+
+2. **布局优化**：
+   - 根据字段的宽度调整 `layout` 配置
+   - 较宽的字段（如地址、证件号等）可能需要更多的列宽
+   - 建议在大屏幕下（xl, xxl）不要超过 4-5 列
+
+3. **样式设置**：
+   - 为了统一视觉效果，建议所有相似的描述组件使用统一的样式设置
+   - 字段宽度设置合理的 `minWidth`，确保在各种屏幕下显示正常
+
 ## 配置示例
 
 ### 启用折叠功能示例
 
-以下配置将启用折叠功能，只显示前3个字段，其余字段需点击"详细"按钮查看：
+以下配置将启用折叠功能，只显示前6个字段，其余字段需点击"详细"按钮查看：
 
 ```json
 {
     "layout": {
-        "xl": 8,
+        "xl": 4,
         "md": 3,
         "sm": 2,
-        "lg": 4,
+        "lg": 3,
         "xs": 1,
-        "xxl": 8
+        "xxl": 5
     },
     "style": {
         "size": "small",
@@ -190,15 +224,31 @@ export default {
         {
             "field": "age",
             "label": "年龄"
+        },
+        {
+            "field": "diagnosis",
+            "label": "诊断"
+        },
+        {
+            "field": "phone_no",
+            "label": "电话号码"
+        },
+        {
+            "field": "identification_no",
+            "label": "身份证号"
+        },
+        {
+            "field": "allergies",
+            "label": "过敏史"
         }
         // ... 更多字段
     ],
     "detailsConfig": {
         "buttonText": "详细",
         "buttonType": "link",
-        "showAfterIndex": 3  // 设置为3表示只显示前3个字段，其余字段点击"详细"后显示
+        "showAfterIndex": 6  // 设置为6表示只显示前6个字段，其余字段点击"详细"后显示
     },
-    "logicName": "patientBasicInfo",
+    "logicName": "patientBasicInfoLogic",
     "serverName": "af-his"
 }
 ```
@@ -210,12 +260,12 @@ export default {
 ```json
 {
     "layout": {
-        "xl": 8,
+        "xl": 4,
         "md": 3,
         "sm": 2,
-        "lg": 4,
+        "lg": 3,
         "xs": 1,
-        "xxl": 8
+        "xxl": 5
     },
     "style": {
         "size": "small",
@@ -225,7 +275,7 @@ export default {
     "items": [
         // 字段配置...
     ],
-    "logicName": "patientBasicInfo",
+    "logicName": "patientBasicInfoLogic",
     "serverName": "af-his"
     // 没有 detailsConfig，将直接显示所有字段
 }

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

@@ -0,0 +1,66 @@
+<template>
+  <div>
+    <a-select
+      v-model="selectedValue"
+      :placeholder="placeholder"
+      style="width: 150px"
+      :allowClear="true"
+      :showSearch="true"
+      @change="handleChange"
+    >
+      <a-select-option v-for="(item, index) in data" :key="index" :value="item.value">
+        {{ item.label }}
+      </a-select-option>
+    </a-select>
+  </div>
+</template>
+
+<script>
+import { runLogic } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'XSelect',
+  props: {
+    queryParamsName: {
+      type: Object,
+      default: null
+    }
+  },
+  data () {
+    return {
+      data: [],
+      selectedValue: undefined,
+      placeholder: ''
+    }
+  },
+  created () {
+    this.getData(this.queryParamsName)
+  },
+  methods: {
+    async getData (config) {
+      try {
+        const res = await runLogic(config, {}, 'af-his')
+        this.data = res.data || []
+        if (res.placeholder) {
+          this.placeholder = res.placeholder
+        }
+        this.selectedValue = undefined
+      } catch (error) {
+        console.error('获取数据失败：', error)
+      }
+    },
+    handleChange (value) {
+      this.selectedValue = value === '' ? undefined : value
+      this.$emit('change', this.selectedValue)
+    },
+  },
+  watch: {
+    selectedValue (val) {
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

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

@@ -1,20 +1,14 @@
 <template>
   <div>
     <div class="text-card">
-      <!-- 添加顶部按钮区域 -->
-      <div class="text-card-header">
-        <div class="add-button" @click="handleAddClick">
-          <span class="plus-icon">+</span>
-        </div>
-      </div>
       <div
         v-for="(item, index) in displayItems"
         :key="index"
         class="text-item"
-        @click="handleItemClick(index)"
-        @contextmenu.prevent="handleContextMenu(index)">
+        @click="handleItemClick(index, item.id)"
+        @contextmenu.prevent="handleContextMenu(index, item.id)">
         <div class="text-content" :class="{ 'is-empty': !item.content }">
-          {{ item.content || '点击添加内容' }}
+          {{ item.content || '+' }}
         </div>
       </div>
       <!-- 编辑弹出框 -->
@@ -49,7 +43,7 @@ import { runLogic } from '@vue2-client/services/api/common'
 export default {
   name: 'XTextCard',
   props: {
-    // logic配置名,要求返回一个数组[]
+    // logic配置名,要求返回一个数组[{ id: , content: }]
     queryParamsName: {
       type: String,
       default: 'memorandumLOGIC'
@@ -72,6 +66,7 @@ export default {
       editingContent: '', // 编辑框的内容
       showDeleteModal: false, // 是否显示删除确认框
       deleteIndex: -1, // 要删除的项目索引
+      ID: 0
     }
   },
   computed: {
@@ -86,18 +81,9 @@ export default {
     }
   },
   methods: {
-    // 添加新方法
-    handleAddClick () {
-      // 直接打开编辑框，索引设为数组长度（等同于点击最后一个空行）
-      this.editingIndex = this.localItems.length
-      this.editingContent = ''
-      this.showEdit = true
-      this.$nextTick(() => {
-        this.$refs.textarea?.focus()
-      })
-    },
     // 点击项目
-    handleItemClick (index) {
+    handleItemClick (index, id) {
+      this.ID = id
       this.editingIndex = index
       this.editingContent = this.displayItems[index].content
       this.showEdit = true
@@ -119,8 +105,9 @@ export default {
           // 否则更新现有内容
           this.localItems[this.editingIndex].content = this.editingContent.trim()
         }
+        const addData = { data: this.editingContent.trim(), ID: this.ID }
         // 触发更新事件
-        this.$emit('add', this.editingContent.trim())
+        this.$emit('add', addData)
       }
       this.showEdit = false
       this.editingIndex = -1
@@ -130,15 +117,16 @@ export default {
     async initData (data, parameter) {
       // 从配置中获取数据
       const resData = await runLogic(data, parameter, 'af-his')
-      this.localItems = resData.map(content => ({ content: content }))
+      this.localItems = resData
       return resData
     },
     // 处理右键菜单
-    handleContextMenu (index) {
+    handleContextMenu (index, id) {
       // 如果是最后一个空行，不显示删除框
       if (index === this.localItems.length) {
         return
       }
+      this.ID = id
       this.deleteIndex = index
       this.showDeleteModal = true
     },
@@ -146,7 +134,8 @@ export default {
     handleDeleteConfirm () {
       if (this.deleteIndex > -1) {
         this.localItems.splice(this.deleteIndex, 1)
-        this.$emit('delete', [...this.localItems][this.deleteIndex])
+        const addData = { data: [...this.localItems][this.deleteIndex], ID: this.ID }
+        this.$emit('delete', addData)
         this.deleteIndex = -1
       }
       this.showDeleteModal = false
@@ -168,37 +157,12 @@ export default {
 .text-card {
   position: relative;
   width: 100%;
-  // 添加头部样式
-  .text-card-header {
-    padding: 8px 12px;
-    border-bottom: 1px solid #f0f0f0;
-    .add-button {
-      display: inline-flex;
-      align-items: center;
-      justify-content: center;
-      width: 24px;
-      height: 24px;
-      border-radius: 4px;
-      cursor: pointer;
-      transition: all 0.3s;
-      &:hover {
-        background-color: #f5f5f5;
-      }
-      .plus-icon {
-        font-size: 20px;
-        line-height: 1;
-        color: #5D5C5C;
-        font-weight: bold;
-      }
-    }
-  }
-
   .text-item {
     padding: 8px 12px;
     border-bottom: 1px solid #f0f0f0;
     cursor: pointer;
     transition: all 0.3s;
-    user-select: none; // 防止文本被选中
+    user-select: none;
 
     &:hover {
       background-color: #f5f5f5;
@@ -211,7 +175,8 @@ export default {
       line-height: 1.5;
 
       &.is-empty {
-        color: #bfbfbf;
+        color: #5D5C5C;
+        font-weight: 400;
       }
     }
   }

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

@@ -53,7 +53,8 @@ routerResource.example = {
   path: 'example',
   name: '示例主页面',
   // component: () => import('@vue2-client/base-client/components/his/XTimeSelect/XTimeSelect.vue'),
-  component: () => import('@vue2-client/base-client/components/his/XTitle/XTitle.vue'),
+  // component: () => import('@vue2-client/base-client/components/his/XTitle/XTitle.vue'),
+  component: () => import('@vue2-client/base-client/components/his/XSelect/XSelect.vue'),
   // component: () => import('@vue2-client/base-client/components/his/XRadio/XRadio.vue'),
   // component: () => import('@vue2-client/base-client/components/his/XList/XList.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XCollapse/XCollapse.vue'),