vue2-client 1.16.80 → 1.16.81

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

@@ -131,7 +131,7 @@ export default {
       const attrs = this.$attrs || {}
       const classes = {}
       const booleanStyleKeys = [
-        'item-0padding'
+        'item-0padding', 'compact'
       ]
       booleanStyleKeys.forEach(key => {
         const val = attrs[key]
@@ -303,4 +303,20 @@ export default {
     }
   }
 }
+.x-radio-compact {
+  &.x-radio-container,
+  .x-radio-container {
+    :deep(.simple-inline-item){
+      padding: 0px !important;
+    }
+    :deep(.ant-radio-group){
+      display: flex;
+      justify-content: space-between;
+    }
+    :deep(.ant-radio-wrapper-checked) > span:last-child {
+      padding-right: 2px;
+      padding-left: 2px;
+    }
+  }
+}
 </style>

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

@@ -212,7 +212,7 @@ export default {
         return []
       }
     },
-
+    // 计算mainCol,currentCol可以设置的总宽度
     computeRemainingWidth (allElements, mainCol, currentCol) {
       if (!allElements || allElements.length === 0) {
         return '0px'
@@ -223,33 +223,34 @@ export default {
         element !== mainCol && element !== currentCol
       )
 
-      if (filteredElements.length === 0) {
-        return '0px'
-      }
-
       let totalWidth = 0
 
+      // 计算过滤后元素的总宽度（包括外边距）
       filteredElements.forEach(element => {
         if (element && element.style) {
-          // 获取元素的计算样式
           const computedStyle = window.getComputedStyle(element)
-
-          // 获取宽度（包括padding和border）
           const width = parseFloat(computedStyle.width) || 0
-
-          // 获取左右margin
           const marginLeft = parseFloat(computedStyle.marginLeft) || 0
           const marginRight = parseFloat(computedStyle.marginRight) || 0
-
-          // 累加总宽度（宽度 + 左右margin）
           totalWidth += width + marginLeft + marginRight
         }
       })
 
-      // 返回计算出的宽度，如果计算失败则返回默认值
+      // 添加 mainCol 和 currentCol 的左右外边距
+      const addMarginsFromElements = (element) => {
+        if (element && element.style) {
+          const computedStyle = window.getComputedStyle(element)
+          const marginLeft = parseFloat(computedStyle.marginLeft) || 0
+          const marginRight = parseFloat(computedStyle.marginRight) || 0
+          totalWidth += marginLeft + marginRight
+        }
+      }
+
+      addMarginsFromElements(mainCol)
+      addMarginsFromElements(currentCol)
+
       return totalWidth > 0 ? `${totalWidth}px` : '0px'
     },
-
     updateLayout (isOpen) {
       this.$nextTick(() => {
         try {

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

@@ -1,159 +1,159 @@
-<template>
-  <div class="table-container" :style="{ height: tableHeight }">
-    <a-table
-      :columns="processedColumns"
-      :dataSource="tableData"
-      :pagination="false"
-      :bordered="false"
-      :rowKey="rowKey"
-      :scroll="{ y: scrollY }"
-    />
-  </div>
-</template>
-
-<script>
-import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
-
-export default {
-  props: {
-    queryParamsName: String,
-    rowKey: {
-      type: String,
-      default: 'id'
-    },
-    parameter: {
-      type: Object,
-      default: () => ({})
-    }
-  },
-  data () {
-    return {
-      columns: [],
-      tableData: [],
-      tableHeight: 'auto', // 默认高度
-      scrollY: undefined
-    }
-  },
-  watch: {
-    queryParamsName: {
-      immediate: true,
-      handler (val) {
-        val && this.init(val, this.parameter)
-      }
-    }
-  },
-  computed: {
-    processedColumns () {
-      return this.columns.map(column => ({
-        ...column,
-        customHeaderCell: column.headerStyle
-          ? () => ({ style: column.headerStyle })
-          : undefined
-      }))
-    }
-  },
-  methods: {
-    init (config, parameterData) {
-      getConfigByName(config, 'af-his', res => {
-        // 从配置中获取表格高度
-        this.tableHeight = res.tableHeight || '400px' // 默认400px
-        this.columns = res.columns || []
-
-        runLogic(res.logicName, parameterData, 'af-his').then(result => {
-          this.tableData = result.map((item, index) => ({
-            ...item,
-            key: item[this.rowKey] || `row_${index}`
-          }))
-
-          this.$nextTick(() => {
-            this.scrollY = this.tableHeight
-          })
-        })
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-/* 表格容器 */
-.table-container {
-  overflow: hidden;
-  display: flex;
-  flex-direction: column;
-  padding-left: 13px; /* 整体左边距 */
-}
-
-/* 基础无边框样式 */
-/deep/ .ant-table {
-  border: none !important;
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-}
-
-/deep/ .ant-table-content {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-}
-
-/deep/ .ant-table-body {
-  flex: 1;
-  overflow-y: auto !important;
-  padding-top: 5px; /* 表头与第一行的间距 */
-}
-
-/* 自定义滚动条样式 */
-/deep/ .ant-table-body {
-  /* Firefox */
-  scrollbar-width: thin; /* auto | thin | none */
-  scrollbar-color: #E5E5E5 transparent; /* thumb track */
-}
-/deep/ .ant-table-body::-webkit-scrollbar {
-  width: 8px;
-  height: 8px;
-}
-/deep/ .ant-table-body::-webkit-scrollbar-track {
-  background: transparent;
-}
-/deep/ .ant-table-body::-webkit-scrollbar-thumb {
-  background: #E5E5E5;
-  border-radius: 25px;
-}
-
-/deep/ .ant-table-tbody > tr > td {
-  border-bottom: none !important;
-  padding: 6px !important;
-  /* 表体字体样式 */
-  font-family: 'Source Han Sans', sans-serif;
-  font-size: 14px;
-  font-weight: 400; /* normal */
-  line-height: 18px;
-  letter-spacing: 0em;
-  font-optical-sizing: auto; /* 替代 font-variation-settings:"opsz" auto */
-  font-feature-settings: 'kern' on;
-  color: #5D5C5C;
-}
-
-/deep/ .ant-table-thead > tr > th {
-  border-bottom: none !important;
-  background: none !important;
-  padding: 8px 6px !important;
-  position: sticky;
-  top: 0;
-  z-index: 1;
-  background-color: white !important;
-  /* 头部字体样式 */
-  height: 20px;
-  opacity: 1;
-  font-family: 'Source Han Sans', sans-serif;
-  font-size: 14px;
-  font-weight: 700; /* bold */
-  line-height: normal;
-  letter-spacing: 0em;
-  font-optical-sizing: auto; /* 替代 font-variation-settings:"opsz" auto 以通过校验 */
-  font-feature-settings: 'kern' on;
-  color: #5D5C5C;
-}
-</style>
+<template>
+  <div class="table-container" :style="{ height: tableHeight }">
+    <a-table
+      :columns="processedColumns"
+      :dataSource="tableData"
+      :pagination="false"
+      :bordered="false"
+      :rowKey="rowKey"
+      :scroll="{ y: scrollY }"
+    />
+  </div>
+</template>
+
+<script>
+import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
+
+export default {
+  props: {
+    queryParamsName: String,
+    rowKey: {
+      type: String,
+      default: 'id'
+    },
+    parameter: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data () {
+    return {
+      columns: [],
+      tableData: [],
+      tableHeight: 'auto', // 默认高度
+      scrollY: undefined
+    }
+  },
+  watch: {
+    queryParamsName: {
+      immediate: true,
+      handler (val) {
+        val && this.init(val, this.parameter)
+      }
+    }
+  },
+  computed: {
+    processedColumns () {
+      return this.columns.map(column => ({
+        ...column,
+        customHeaderCell: column.headerStyle
+          ? () => ({ style: column.headerStyle })
+          : undefined
+      }))
+    }
+  },
+  methods: {
+    init (config, parameterData) {
+      getConfigByName(config, 'af-his', res => {
+        // 从配置中获取表格高度
+        this.tableHeight = res.tableHeight || '400px' // 默认400px
+        this.columns = res.columns || []
+
+        runLogic(res.logicName, parameterData, 'af-his').then(result => {
+          this.tableData = result.map((item, index) => ({
+            ...item,
+            key: item[this.rowKey] || `row_${index}`
+          }))
+
+          this.$nextTick(() => {
+            this.scrollY = this.tableHeight
+          })
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+/* 表格容器 */
+.table-container {
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+  padding-left: 13px; /* 整体左边距 */
+}
+
+/* 基础无边框样式 */
+/deep/ .ant-table {
+  border: none !important;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+}
+
+/deep/ .ant-table-content {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+}
+
+/deep/ .ant-table-body {
+  flex: 1;
+  overflow-y: auto !important;
+  padding-top: 5px; /* 表头与第一行的间距 */
+}
+
+/* 自定义滚动条样式 */
+/deep/ .ant-table-body {
+  /* Firefox */
+  scrollbar-width: thin; /* auto | thin | none */
+  scrollbar-color: #E5E5E5 transparent; /* thumb track */
+}
+/deep/ .ant-table-body::-webkit-scrollbar {
+  width: 8px;
+  height: 8px;
+}
+/deep/ .ant-table-body::-webkit-scrollbar-track {
+  background: transparent;
+}
+/deep/ .ant-table-body::-webkit-scrollbar-thumb {
+  background: #E5E5E5;
+  border-radius: 25px;
+}
+
+/deep/ .ant-table-tbody > tr > td {
+  border-bottom: none !important;
+  padding: 6px !important;
+  /* 表体字体样式 */
+  font-family: 'Source Han Sans', sans-serif;
+  font-size: 14px;
+  font-weight: 400; /* normal */
+  line-height: 18px;
+  letter-spacing: 0em;
+  font-optical-sizing: auto; /* 替代 font-variation-settings:"opsz" auto */
+  font-feature-settings: 'kern' on;
+  color: #5D5C5C;
+}
+
+/deep/ .ant-table-thead > tr > th {
+  border-bottom: none !important;
+  background: none !important;
+  padding: 8px 6px !important;
+  position: sticky;
+  top: 0;
+  z-index: 1;
+  background-color: white !important;
+  /* 头部字体样式 */
+  height: 20px;
+  opacity: 1;
+  font-family: 'Source Han Sans', sans-serif;
+  font-size: 14px;
+  font-weight: 700; /* bold */
+  line-height: normal;
+  letter-spacing: 0em;
+  font-optical-sizing: auto; /* 替代 font-variation-settings:"opsz" auto 以通过校验 */
+  font-feature-settings: 'kern' on;
+  color: #5D5C5C;
+}
+</style>

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

@@ -1,7 +1,8 @@
 <template>
-  <div class="x-time-select">
+  <div class="x-time-select" :class="wrapperClassObject">
     <div class="time-select-container">
       <div v-if="type === 'range'" class="picker-wrapper">
+        <span v-if="showCalendarIcon" class="left-calendar-icon"><a-icon type="calendar" /></span>
         <a-range-picker
           :value="dateRange"
           :placeholder="['开始日期', '结束日期']"
@@ -14,6 +15,7 @@
         />
       </div>
       <div v-if="type === 'date'" class="picker-wrapper">
+        <span v-if="showCalendarIcon" class="left-calendar-icon"><a-icon type="calendar" /></span>
         <a-date-picker
           :value="dateRange[0]"
           :format="format"
@@ -64,10 +66,27 @@ export default {
   data () {
     return {
       dateRange: [],
-      type: 'range'
+      type: 'range',
+      showCalendarIcon: false
     }
   },
   computed: {
+    // 与 XHDescriptions 一致的样式配置模式：通过 $attrs 映射布尔/尺寸类
+    wrapperClassObject () {
+      const attrs = this.$attrs || {}
+      const classes = {}
+      const booleanStyleKeys = [
+        'yizhu-date'
+      ]
+      booleanStyleKeys.forEach(key => {
+        const val = attrs[key]
+        const truthy = val === true || val === '' || val === 'true'
+        if (truthy) classes[`xtime-${key}`] = true
+      })
+      const size = attrs.size
+      if (size && typeof size === 'string') classes[`xtime-size-${size}`] = true
+      return classes
+    },
     showTime () {
       // 根据format判断是否需要显示时间选择器
       return this.format && (this.format.includes('HH:mm') || this.format.includes('hh:mm'))
@@ -134,6 +153,8 @@ export default {
           if (res.format !== undefined) {
             this.format = res.format
           }
+          // 处理图标开关配置（默认关闭）
+          this.showCalendarIcon = res && res.showCalendarIcon === true
           // 处理defaultTime配置
           if (res.defaultTime !== undefined) {
             if (res.defaultTime === 'now') {
@@ -157,7 +178,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="less">
 .x-time-select {
   position: relative;
   width: 100%;
@@ -172,6 +193,7 @@ export default {
 
 .picker-wrapper {
   flex: 1;
+  position: relative;
 }
 
 .x-time-select :deep(.ant-picker-range),
@@ -197,4 +219,51 @@ export default {
 .x-time-select :deep(.ant-input) {
   width: 100%;
 }
+
+/* 左侧日历图标 */
+.left-calendar-icon {
+  position: absolute;
+  left: 10px;
+  top: 1.8px;
+  width: 18.2px;
+  height: 91%;
+  opacity: 1;
+  color: #848484;
+  z-index: 2;
+  pointer-events: none;
+  display: inline-flex;
+  align-items: center;
+}
+
+/* 为日期输入增加左内边距，避免与图标重叠（兼容 ant 不同版本） */
+.x-time-select :deep(.ant-picker-input > input) {
+  padding-left: 26px;
+}
+.x-time-select :deep(.ant-calendar-picker-input) {
+  padding-left: 26px;
+}
+
+/* yizhu-date 样式（通过 $attrs 使用：<XTimeSelect yizhu-date />） */
+.x-time-select.xtime-yizhu-date {
+  margin: 2px 2px 0 10px;
+  width: 224px;
+  height: 32px;
+  border-radius: 7px;
+  opacity: 1;
+  background: #FFFFFF;
+  box-sizing: border-box;
+  border: 1px solid #E5E9F0;
+}
+
+/* 覆盖内部 antd 选择器在该样式下的尺寸与边框 */
+.x-time-select.xtime-yizhu-date :deep(.ant-picker-range),
+.x-time-select.xtime-yizhu-date :deep(.ant-picker),
+.x-time-select.xtime-yizhu-date :deep(.ant-calendar-picker),
+.x-time-select.xtime-yizhu-date :deep(.ant-calendar-picker-input) {
+  width: 224px;
+  height: 32px;
+  border-radius: 7px;
+  background: #FFFFFF;
+  border: 1px solid #E5E9F0;
+}
 </style>