vue2-client 1.16.68 → 1.16.70

package/src/base-client/components/common/XCheckList/XCheckListDemo.vue

@@ -1,41 +1,41 @@
-<template>
-  <div>
-    <x-check-list ref="xCheckList"></x-check-list>
-  </div>
-</template>
-
-<script>
-  import XCheckList from './XCheckList.vue'
-
-  export default {
-    name: 'XCheckListDemo',
-    components: {
-        XCheckList
-    },
-    data () {
-      return {}
-    },
-    mounted () {
-        // 模拟接口返回的配置数据
-        const mockResponse = {
-            leftItems: [
-            { value: 'left1', label: '左项1' },
-            { value: 'left2', label: '左项2' },
-            { value: 'left3', label: '左项3' }
-            ],
-            rightItems: [
-            { value: 'right1', label: '右项1' },
-            { value: 'right2', label: '右项2' },
-            { value: 'right3', label: '右项3' }
-            ]
-        }
-
-        // 模拟接口回调
-        this.$refs.xCheckList.init({
-            leftItems: mockResponse.leftItems,
-            rightItems: mockResponse.rightItems
-        })
-    },
-    methods: {}
-  }
-</script>
+<template>
+  <div>
+    <x-check-list ref="xCheckList"></x-check-list>
+  </div>
+</template>
+
+<script>
+  import XCheckList from './XCheckList.vue'
+
+  export default {
+    name: 'XCheckListDemo',
+    components: {
+        XCheckList
+    },
+    data () {
+      return {}
+    },
+    mounted () {
+        // 模拟接口返回的配置数据
+        const mockResponse = {
+            leftItems: [
+            { value: 'left1', label: '左项1' },
+            { value: 'left2', label: '左项2' },
+            { value: 'left3', label: '左项3' }
+            ],
+            rightItems: [
+            { value: 'right1', label: '右项1' },
+            { value: 'right2', label: '右项2' },
+            { value: 'right3', label: '右项3' }
+            ]
+        }
+
+        // 模拟接口回调
+        this.$refs.xCheckList.init({
+            leftItems: mockResponse.leftItems,
+            rightItems: mockResponse.rightItems
+        })
+    },
+    methods: {}
+  }
+</script>

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

@@ -33,7 +33,7 @@
                 class="info-item"
                 :style="config.title2Style">
                 <!-- 根据showTitle是否显示键名 -->
-                <span v-if="item.showTitle">{{ item.key }}；</span>
+                <span v-if="item.showTitle">{{ item.key }}：</span>
                 <span>{{ item.value }}</span>
               </span>
               </template>
@@ -191,7 +191,9 @@ export default {
       const attrs = this.$attrs || {}
       const classes = {}
       const booleanStyleKeys = [
-        'style1'
+        'style1',
+        'check-result',
+        'medical-entry'
       ]
       booleanStyleKeys.forEach(key => {
         const val = attrs[key]
@@ -477,10 +479,13 @@ export default {
   display: inline-flex;
   align-items: center;
   justify-content: center;
-  height: 100%;
-  line-height: 1;
+  width: 19.47px;
+  height: 20px;
+  line-height: 20px;
   vertical-align: middle;
-  margin-top: -20px; /* 微调偏移量（根据实际情况调整） */
+  color: #313131; /* 仅设置图标颜色，不设置背景 */
+  margin-top: 0; /* 去除向上偏移 */
+  margin-right: 47px; /* 与下拉箭头保持 20px 距离 */
 }
 
 :deep(.ant-collapse-extra) {
@@ -645,6 +650,75 @@ export default {
 
 // 基于根容器类进行样式整合：x-collapse-wrapper.xcollapse-style1
 .x-collapse-wrapper {
+  // 检查结果样式
+  &.xcollapse-check-result {
+    height: auto; /* 允许根据内容自适应高度，避免滚动被限制 */
+    min-height: 600px;
+    // 让每个面板成为独立卡片：去掉 antd 默认的分隔线，增加间距与圆角
+    :deep(.ant-collapse) {
+      background: transparent;
+      border: 0;
+    }
+
+    :deep(.ant-collapse > .ant-collapse-item) {
+      width: 562px;
+      min-height: auto;
+      height: auto;
+      margin-bottom:10px;
+      background: #FFFFFF;         // 独立白底
+      box-sizing: border-box;
+      border: 1px solid #E5E9F0;   // 每个面板自身边框
+    }
+
+    :deep(.ant-collapse > .ant-collapse-item:first-child) { margin-top: 0; }
+    :deep(.ant-collapse > .ant-collapse-item:last-child) { margin-bottom: 0; }
+
+    :deep(.ant-collapse-content > .ant-collapse-content-box) {
+      background: #FFFFFF;
+      padding: 0px !important;
+    }
+
+    // 表头：恢复合适的上下内边距，去掉顶部额外空白
+    :deep(.ant-collapse-header) {
+      background: #FFFFFF;
+      padding: 0px 0px !important;
+      height: 39px !important;
+      border-bottom: none !important; // 移除标题处下边线，避免与外边框连为一体
+      border: 1px solid #E5E9F0;   // 每个面板自身边框
+    }
+
+    /* 将右侧留白转移到标题与第一项之间 */
+    .header-content { padding-right: 0; }
+    .header-content .info-item:first-of-type { margin-left: 24px !important; }
+    .header-content .time-item:first-of-type { margin-left: 24px !important; }
+
+    .info-item {
+      height: 20px;
+      opacity: 1;
+      font-family: "Source Han Sans";
+      font-size: 14px;
+      font-weight: 400;
+      line-height: 20px;
+      text-align: right;
+      letter-spacing: 0em;
+      font-feature-settings: "kern" on;
+      color: #313131 !important;
+    }
+
+    .header-text {
+      height: 23px;
+      opacity: 1;
+      font-family: "Source Han Sans";
+      font-size: 16px;
+      font-weight: 700;
+      line-height: 23px;
+      letter-spacing: 0em;
+      padding-right: 40px;
+      font-feature-settings: "kern" on;
+      color: #313131 !important;
+    }
+  }
+  // 历史病历样式
   &.xcollapse-style1 {
     height: auto; /* 允许根据内容自适应高度，避免滚动被限制 */
     min-height: 600px;
@@ -692,7 +766,7 @@ export default {
     }
 
     :deep(.ant-collapse > .ant-collapse-item) {
-      width: 564px;
+      width: 562px;
       min-height: auto;
       height: auto;
       margin-bottom:10px;
@@ -706,7 +780,7 @@ export default {
 
     :deep(.ant-collapse-content > .ant-collapse-content-box) {
       background: #FFFFFF;
-      padding: 0px !important; /* 自定义边距：上9px 右12px 下10px 左11px */
+      padding: 0px !important;
     }
 
     // 表头：恢复合适的上下内边距，去掉顶部额外空白
@@ -718,5 +792,42 @@ export default {
       border: 1px solid #E5E9F0;   // 每个面板自身边框
     }
   }
+
+  // 医学词条样式
+  &.xcollapse-medical-entry {
+    height: auto;
+    min-height: 600px;
+    :deep(.ant-collapse) { background: transparent; border: 0; }
+    :deep(.ant-collapse > .ant-collapse-item) {
+      width: 564px;
+      min-height: auto;
+      height: auto;
+      margin-bottom: 14px;
+      background: #FFFFFF;
+      box-sizing: border-box;
+      border: 1px solid #E5E9F0;
+    }
+    :deep(.ant-collapse > .ant-collapse-item:first-child) { margin-top: 0; }
+    :deep(.ant-collapse > .ant-collapse-item:last-child) { margin-bottom: 0; }
+    :deep(.ant-collapse-content > .ant-collapse-content-box) { background: #FFFFFF; padding: 0px !important; }
+    :deep(.ant-collapse-header) {
+      background: #FFFFFF;
+      padding: 0px 0px !important;
+      height: 39px !important;
+      border-bottom: none !important;
+      border: 1px solid #E5E9F0;
+    }
+    .header-text {
+      font-family: "Source Han Sans";
+      font-size: 16px;
+      font-weight: 700;
+      line-height: 23px;
+      letter-spacing: 0em;
+      color: #313131;
+      margin-top: 7px;
+      margin-bottom: 7px;
+      margin-right: 0 !important;
+    }
+  }
 }
 </style>

package/src/base-client/components/common/XDataCard/index.js

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

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

@@ -1 +1 @@
-# XDataCard
+# XDataCard

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

@@ -1,180 +1,180 @@
-<template>
-  <a-drawer
-    :visible="visible"
-    :width="isMobile ? screenWidth : screenWidth * 0.85"
-    placement="right"
-    :title="title"
-    @close="onClose"
-  >
-    <a-spin :spinning="loading">
-      <a-page-header :title="getPageHeaderTitle">
-        <div class="row">
-          <div class="content">
-            <slot name="contentDescriptions" :datas="details"></slot>
-          </div>
-          <div class="extra">
-            <a-row class="status-list" v-for="(item,index) in extraStatusList" :key="'extraStatus' + index">
-              <a-col :sm="24" :xs="12">
-                <div class="text">{{ item.text }}</div>
-                <div class="heading">
-                  <x-badge :is-external-text="true" :value="item.key" :badge-key="item.keyMap ? item.keyMap : 'none'"/>
-                </div>
-              </a-col>
-            </a-row>
-          </div>
-        </div>
-        <!-- actions -->
-        <template #extra>
-          <a-button-group style="margin-right: 4px;">
-            <a-button :loading="loading" type="dashed" @click="initView('1')">刷新</a-button>
-          </a-button-group>
-          <a-button-group style="margin-right: 4px;">
-            <slot name="extraActions" :datas="details"></slot>
-          </a-button-group>
-        </template>
-        <template #footer>
-          <slot name="footerContent" :datas="details"></slot>
-        </template>
-      </a-page-header>
-    </a-spin>
-  </a-drawer>
-</template>
-
-<script>
-import { mapState } from 'vuex'
-import XBadge from '@vue2-client/base-client/components/common/XBadge/XBadge'
-
-export default {
-  name: 'InstructDetailsView',
-  components: {
-    XBadge
-  },
-  data () {
-    return {
-      // 页面宽度
-      screenWidth: document.documentElement.clientWidth,
-      // Tab页签
-      tabActiveKey: '1',
-      // 数据详情
-      details: {},
-      // 加载状态
-      loading: true
-    }
-  },
-  mounted () {
-    this.initView('1')
-  },
-  computed: {
-    ...mapState('account', { currUser: 'user' }),
-    ...mapState('setting', ['isMobile'])
-  },
-  props: {
-    title: {
-      type: String,
-      required: true
-    },
-    extraStatusList: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
-    visible: {
-      type: Boolean,
-      default: false
-    }
-  },
-  methods: {
-    // 初始化组件
-    initView (tabActiveKey) {
-      this.tabActiveKey = tabActiveKey || '1'
-      this.getDatas()
-    },
-    // 获取详情信息
-    getDatas () {
-      this.loading = true
-      this.$emit('load').then(res => {
-        this.details = res
-      }, err => {
-        console.error(err)
-      }).finally(() => {
-        this.loading = false
-      })
-    },
-    // 获取页头标题
-    getPageHeaderTitle () {
-      this.$emit('getPageHeaderTitle', this.details)
-    },
-    // 关闭抽屉时回调
-    onClose () {
-      this.$emit('update:visible', false)
-    }
-  },
-  watch: {
-    'visible' (val) {
-      if (val) {
-        this.initView('1')
-      }
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.detail-layout {
-  margin-left: 44px;
-}
-.text {
-  color: rgba(0, 0, 0, .45);
-}
-
-.heading {
-  color: rgba(0, 0, 0, .85);
-  font-size: 20px;
-}
-
-.no-data {
-  color: rgba(0, 0, 0, .25);
-  text-align: center;
-  line-height: 64px;
-  font-size: 16px;
-
-  i {
-    font-size: 24px;
-    margin-right: 16px;
-    position: relative;
-    top: 3px;
-  }
-}
-
-.mobile {
-  .detail-layout {
-    margin-left: unset;
-  }
-  .text {
-
-  }
-  .status-list {
-    text-align: left;
-  }
-}
-
-.row {
-  display: flex;
-
-  .content {
-    -webkit-box-flex: 1;
-    flex: auto;
-    -ms-flex: auto;
-  }
-
-  .extra {
-    flex: 0 1 auto;
-    -webkit-box-flex: 0;
-    -ms-flex: 0 1 auto;
-    min-width: 242px;
-    margin-left: 88px;
-    text-align: right;
-  }
-}
-</style>
+<template>
+  <a-drawer
+    :visible="visible"
+    :width="isMobile ? screenWidth : screenWidth * 0.85"
+    placement="right"
+    :title="title"
+    @close="onClose"
+  >
+    <a-spin :spinning="loading">
+      <a-page-header :title="getPageHeaderTitle">
+        <div class="row">
+          <div class="content">
+            <slot name="contentDescriptions" :datas="details"></slot>
+          </div>
+          <div class="extra">
+            <a-row class="status-list" v-for="(item,index) in extraStatusList" :key="'extraStatus' + index">
+              <a-col :sm="24" :xs="12">
+                <div class="text">{{ item.text }}</div>
+                <div class="heading">
+                  <x-badge :is-external-text="true" :value="item.key" :badge-key="item.keyMap ? item.keyMap : 'none'"/>
+                </div>
+              </a-col>
+            </a-row>
+          </div>
+        </div>
+        <!-- actions -->
+        <template #extra>
+          <a-button-group style="margin-right: 4px;">
+            <a-button :loading="loading" type="dashed" @click="initView('1')">刷新</a-button>
+          </a-button-group>
+          <a-button-group style="margin-right: 4px;">
+            <slot name="extraActions" :datas="details"></slot>
+          </a-button-group>
+        </template>
+        <template #footer>
+          <slot name="footerContent" :datas="details"></slot>
+        </template>
+      </a-page-header>
+    </a-spin>
+  </a-drawer>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+import XBadge from '@vue2-client/base-client/components/common/XBadge/XBadge'
+
+export default {
+  name: 'InstructDetailsView',
+  components: {
+    XBadge
+  },
+  data () {
+    return {
+      // 页面宽度
+      screenWidth: document.documentElement.clientWidth,
+      // Tab页签
+      tabActiveKey: '1',
+      // 数据详情
+      details: {},
+      // 加载状态
+      loading: true
+    }
+  },
+  mounted () {
+    this.initView('1')
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user' }),
+    ...mapState('setting', ['isMobile'])
+  },
+  props: {
+    title: {
+      type: String,
+      required: true
+    },
+    extraStatusList: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    visible: {
+      type: Boolean,
+      default: false
+    }
+  },
+  methods: {
+    // 初始化组件
+    initView (tabActiveKey) {
+      this.tabActiveKey = tabActiveKey || '1'
+      this.getDatas()
+    },
+    // 获取详情信息
+    getDatas () {
+      this.loading = true
+      this.$emit('load').then(res => {
+        this.details = res
+      }, err => {
+        console.error(err)
+      }).finally(() => {
+        this.loading = false
+      })
+    },
+    // 获取页头标题
+    getPageHeaderTitle () {
+      this.$emit('getPageHeaderTitle', this.details)
+    },
+    // 关闭抽屉时回调
+    onClose () {
+      this.$emit('update:visible', false)
+    }
+  },
+  watch: {
+    'visible' (val) {
+      if (val) {
+        this.initView('1')
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.detail-layout {
+  margin-left: 44px;
+}
+.text {
+  color: rgba(0, 0, 0, .45);
+}
+
+.heading {
+  color: rgba(0, 0, 0, .85);
+  font-size: 20px;
+}
+
+.no-data {
+  color: rgba(0, 0, 0, .25);
+  text-align: center;
+  line-height: 64px;
+  font-size: 16px;
+
+  i {
+    font-size: 24px;
+    margin-right: 16px;
+    position: relative;
+    top: 3px;
+  }
+}
+
+.mobile {
+  .detail-layout {
+    margin-left: unset;
+  }
+  .text {
+
+  }
+  .status-list {
+    text-align: left;
+  }
+}
+
+.row {
+  display: flex;
+
+  .content {
+    -webkit-box-flex: 1;
+    flex: auto;
+    -ms-flex: auto;
+  }
+
+  .extra {
+    flex: 0 1 auto;
+    -webkit-box-flex: 0;
+    -ms-flex: 0 1 auto;
+    min-width: 242px;
+    margin-left: 88px;
+    text-align: right;
+  }
+}
+</style>

package/src/base-client/components/common/XDataDrawer/index.js

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