vue2-client 1.12.103 → 1.13.2

package/package.json

@@ -1,107 +1,107 @@
-{
-  "name": "vue2-client",
-  "version": "1.12.103",
-  "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.2",
+  "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/his/XHDescriptions/XHDescriptions.vue

@@ -1,14 +1,17 @@
 <template>
   <div class="patient-info-descriptions">
     <a-descriptions
-      :column="configurationParameters?.layout"
-      :size="configurationParameters?.style?.size"
-      :bordered="configurationParameters?.style?.bordered"
+      :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 configurationParameters?.items"
-          :key="item.field">
+          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
@@ -24,6 +27,49 @@
             {{ data[item.field] }}
           </div>
         </a-descriptions-item>
+
+        <!-- 详情按钮 -->
+        <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-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>
+
+          <!-- 收起按钮 -->
+          <a-descriptions-item>
+            <a-button type="link" @click="toggleDetails">
+              <a-icon type="up" />
+              收起
+            </a-button>
+          </a-descriptions-item>
+        </template>
       </template>
     </a-descriptions>
   </div>
@@ -36,7 +82,8 @@ export default {
   data () {
     return {
       data: null,
-      configurationParameters: null
+      config: null,
+      showAllItems: false // 控制是否显示所有标签
     }
   },
   props: {
@@ -51,20 +98,70 @@ export default {
       }
     }
   },
+  computed: {
+    // 获取详情按钮应该显示在第几个标签后
+    detailsAfterIndex () {
+      // 只有明确配置了detailsConfig且设置了showAfterIndex时才使用配置值
+      // 否则返回一个很大的值，使所有字段都显示
+      return this.config?.detailsConfig?.showAfterIndex || 999
+    },
+    // 判断是否有更多标签需要显示
+    hasMoreItems () {
+      // 只有明确配置了detailsConfig时才显示详情按钮
+      if (!this.config?.detailsConfig) return false
+      // 如果没有数据或没有配置项，不显示详情按钮
+      if (!this.data || !this.config?.items || !Array.isArray(this.config.items)) return false
+      // 获取隐藏项索引
+      const hiddenStartIndex = this.detailsAfterIndex || 0
+      if (hiddenStartIndex >= this.config.items.length) return false
+      // 检查隐藏的项中是否有非空值
+      for (let i = hiddenStartIndex; i < this.config.items.length; i++) {
+        const item = this.config.items[i]
+        if (item && item.field && this.data[item.field] !== null && this.data[item.field] !== undefined) {
+          return true
+        }
+      }
+      return false
+    },
+    // 获取应该显示的标签
+    visibleItems () {
+      if (!this.config?.items) return []
+      // 如果没有配置detailsConfig或者已经展开，则显示所有项
+      if (!this.config?.detailsConfig || this.showAllItems) return this.config.items
+      return this.config.items.slice(0, this.detailsAfterIndex)
+    },
+    // 获取隐藏的标签
+    hiddenItems () {
+      if (!this.config?.items) return []
+      if (!this.config?.detailsConfig) return [] // 如果没有配置detailsConfig，没有隐藏的项
+      return this.config.items.slice(this.detailsAfterIndex)
+    },
+    // 获取有效的visible项目数量（排除null值）
+    validVisibleItemsCount () {
+      if (!this.config?.items || !this.data) return 0
+      const items = this.visibleItems
+      return items.filter(item => this.data[item.field] !== null && this.data[item.field] !== undefined).length
+    }
+  },
   created () {
     this.getData(this.queryParamsName)
   },
   methods: {
     async getData (data) {
       this.data = null
+      this.showAllItems = false // 重置展开状态
       getConfigByName(data, 'af-his', res => {
-        this.configurationParameters = res
-        console.log(this.configurationParameters)
+        this.config = res
+        console.log(this.config)
         const parameter = { ...res.parameter, ...this.parameter }
         runLogic(res.logicName, parameter, 'af-his').then(result => {
           this.data = result
         })
       })
+    },
+    // 切换详情显示状态
+    toggleDetails () {
+      this.showAllItems = !this.showAllItems
     }
   },
   watch: {
@@ -138,14 +235,14 @@ export default {
   color: rgba(0, 0, 0, 0.65);
   padding: 0 !important;
   margin: 0 !important;
-  font-size: v-bind('configurationParameters?.style?.fontSize');
+  font-size: v-bind('config?.style?.fontSize');
   display: inline-flex !important;
   align-items: center !important;
   white-space: nowrap !important;
 }
 
 :deep(.ant-descriptions-item-content) {
-  font-size: v-bind('configurationParameters?.style?.fontSize');
+  font-size: v-bind('config?.style?.fontSize');
   display: inline-flex !important;
   align-items: center !important;
   padding: 0 !important;
@@ -176,4 +273,16 @@ export default {
   background-color: rgba(0, 0, 0, 0.02);
   border-radius: 4px;
 }
+
+/* 添加详情按钮样式 */
+:deep(.ant-btn-link) {
+  padding: 0;
+  height: auto;
+  line-height: 1;
+}
+
+:deep(.ant-btn-link:hover) {
+  color: #1890ff;
+  background: transparent;
+}
 </style>

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

@@ -0,0 +1,232 @@
+# XHDescriptions 患者信息描述组件
+
+## 组件介绍
+
+`XHDescriptions` 是一个基于 Ant Design Vue 的描述列表组件封装，专用于显示患者基本信息。该组件具有以下特点：
+
+- 支持响应式布局，在不同屏幕尺寸下自动调整列数
+- 支持折叠/展开功能，控制信息的显示量
+- 支持自定义样式和头像
+- 自动隐藏值为 null 或 undefined 的字段
+
+## 配置说明
+
+组件通过 JSON 配置文件进行配置，主要包含以下部分：
+
+### 1. 布局配置 (layout)
+
+```json
+"layout": {
+    "xl": 8,
+    "md": 3,
+    "sm": 2,
+    "lg": 4,
+    "xs": 1,
+    "xxl": 8
+}
+```
+
+- 用于设置在不同屏幕尺寸下的列数
+- 键名对应不同的屏幕尺寸（xs, sm, md, lg, xl, xxl）
+- 值为每行显示的列数
+
+### 2. 样式配置 (style)
+
+```json
+"style": {
+    "size": "small",
+    "fontSize": "14px",
+    "bordered": false
+}
+```
+
+- `size`: 设置尺寸，可选值为 "default", "middle", "small"
+- `fontSize`: 控制文字大小
+- `bordered`: 是否显示边框
+
+### 3. 字段配置 (items)
+
+```json
+"items": [
+    {
+        "field": "patientName",
+        "style": {
+            "minHeight": "24px",
+            "width": "120px",
+            "minWidth": "100px",
+            "height": "24px"
+        },
+        "label": "患者",
+        "avatar": {
+            "size": 20,
+            "background": "#5D5C5C",
+            "icon": "user"
+        },
+        "showAvatar": true
+    }
+]
+```
+
+每个字段可配置的属性：
+
+- `field`: 字段名，用于从数据源获取值
+- `label`: 显示的标签名
+- `style`: 控制字段的样式（宽度、高度等）
+- `showAvatar`: 是否显示头像
+- `avatar`: 头像配置（仅当 showAvatar 为 true 时有效）
+  - `size`: 头像大小
+  - `background`: 头像背景色
+  - `icon`: 头像图标名称
+
+### 4. 详情按钮配置 (detailsConfig)
+
+```json
+"detailsConfig": {
+    "buttonText": "详细",
+    "buttonType": "link",
+    "showAfterIndex": 3
+}
+```
+
+- `buttonText`: 详情按钮显示的文本
+- `buttonType`: 按钮类型，可选值为 "default", "primary", "dashed", "link" 等
+- `showAfterIndex`: 控制在显示多少个字段后显示详情按钮
+- **重要说明**：
+  - 只有明确配置了 `detailsConfig` 对象时，才会启用折叠功能
+  - 如果没有配置 `detailsConfig`，将直接显示所有字段，不会出现详情按钮
+  - 如果配置了 `detailsConfig` 但字段总数少于或等于 `showAfterIndex`，则不会显示详情按钮
+
+### 5. 其他配置
+
+```json
+"logicName": "patientBasicInfo",
+"serverName": "af-his",
+"parameter": {}
+```
+
+- `logicName`: 用于获取数据的逻辑名称
+- `serverName`: 服务名称
+- `parameter`: 可选的参数对象
+
+## 使用示例
+
+```vue
+<template>
+  <XHDescriptions queryParamsName="DescriptionsExampleConfig" />
+</template>
+
+<script>
+import XHDescriptions from '@/base-client/components/his/XHDescriptions/XHDescriptions.vue'
+
+export default {
+  components: {
+    XHDescriptions
+  }
+}
+</script>
+```
+
+## 特殊说明
+
+1. **响应式布局**：
+   - 组件会根据屏幕尺寸自动调整列数
+   - 可在 `layout` 配置中自定义不同尺寸下的列数
+
+2. **折叠/展开功能**：
+   - 折叠功能只在明确配置了 `detailsConfig` 对象时启用
+   - 没有配置 `detailsConfig` 时，会直接显示所有字段，不会出现详情按钮
+   - 配置了 `detailsConfig` 后，只显示 `showAfterIndex` 指定数量的字段，超出部分需点击详情按钮查看
+   - 点击详情按钮后会展开显示全部字段，可通过收起按钮恢复
+
+3. **空值处理**：
+   - 当字段值为 `null` 或 `undefined` 时，该字段不会显示
+   - 折叠功能会忽略值为 `null` 的字段，只有有值的隐藏字段才会触发显示详情按钮
+   - 这个特性可以用于根据数据动态控制字段的显示，无需修改配置
+
+## 配置示例
+
+### 启用折叠功能示例
+
+以下配置将启用折叠功能，只显示前3个字段，其余字段需点击"详细"按钮查看：
+
+```json
+{
+    "layout": {
+        "xl": 8,
+        "md": 3,
+        "sm": 2,
+        "lg": 4,
+        "xs": 1,
+        "xxl": 8
+    },
+    "style": {
+        "size": "small",
+        "fontSize": "14px",
+        "bordered": false
+    },
+    "items": [
+        {
+            "field": "patientName",
+            "label": "患者",
+            "showAvatar": true,
+            "avatar": {
+                "size": 20,
+                "background": "#5D5C5C",
+                "icon": "user"
+            }
+        },
+        {
+            "field": "patientType",
+            "label": "类别"
+        },
+        {
+            "field": "diagnosisNo",
+            "label": "诊号"
+        },
+        {
+            "field": "gender",
+            "label": "性别"
+        },
+        {
+            "field": "age",
+            "label": "年龄"
+        }
+        // ... 更多字段
+    ],
+    "detailsConfig": {
+        "buttonText": "详细",
+        "buttonType": "link",
+        "showAfterIndex": 3  // 设置为3表示只显示前3个字段，其余字段点击"详细"后显示
+    },
+    "logicName": "patientBasicInfo",
+    "serverName": "af-his"
+}
+```
+
+### 禁用折叠功能示例
+
+如果不希望使用折叠功能，希望一次性显示所有字段，只需要移除 `detailsConfig` 对象：
+
+```json
+{
+    "layout": {
+        "xl": 8,
+        "md": 3,
+        "sm": 2,
+        "lg": 4,
+        "xs": 1,
+        "xxl": 8
+    },
+    "style": {
+        "size": "small",
+        "fontSize": "14px",
+        "bordered": false
+    },
+    "items": [
+        // 字段配置...
+    ],
+    "logicName": "patientBasicInfo",
+    "serverName": "af-his"
+    // 没有 detailsConfig，将直接显示所有字段
+}
+```