vue2-client 1.16.94 → 1.16.97

package/src/base-client/components/common/richTextModal/richDemo.vue

@@ -1,48 +1,48 @@
-<template>
-  <div>
-    <h1>Canvas Editor 示例</h1>
-    <x-add-native-form ref="nativeForm" />
-  </div>
-</template>
-
-<script>
-import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
-import { getConfigByName } from '../../../../services/api/common'
-
-export default {
-  components: {
-    XAddNativeForm
-  },
-  mounted () {
-    this.$nextTick(() => {
-      getConfigByName('表单测试Form', 'af-his', (res) => {
-        const modifyModelData = {
-          data: {
-            t_f_file_id: 1,
-            t_f_path: '/usr/local/tomcat/files/af-his/txt/f7c758f6d5f14c53bb5246f82a25c0c4.txt'
-          },
-          images: [],
-          files: []
-        }
-        this.$refs.nativeForm.init({
-          serviceName: 'af-his',
-          formItems: res.formJson,
-          title: '收费',
-          businessType: '新增',
-          layout: 'inline',
-          modifyModelData: modifyModelData
-        })
-      })
-    })
-  },
-  methods: {
-    submit () {
-
-    }
-  }
-}
-</script>
-
-<style>
-/* 在这里添加您的样式 */
-</style>
+<template>
+  <div>
+    <h1>Canvas Editor 示例</h1>
+    <x-add-native-form ref="nativeForm" />
+  </div>
+</template>
+
+<script>
+import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
+import { getConfigByName } from '../../../../services/api/common'
+
+export default {
+  components: {
+    XAddNativeForm
+  },
+  mounted () {
+    this.$nextTick(() => {
+      getConfigByName('表单测试Form', 'af-his', (res) => {
+        const modifyModelData = {
+          data: {
+            t_f_file_id: 1,
+            t_f_path: '/usr/local/tomcat/files/af-his/txt/f7c758f6d5f14c53bb5246f82a25c0c4.txt'
+          },
+          images: [],
+          files: []
+        }
+        this.$refs.nativeForm.init({
+          serviceName: 'af-his',
+          formItems: res.formJson,
+          title: '收费',
+          businessType: '新增',
+          layout: 'inline',
+          modifyModelData: modifyModelData
+        })
+      })
+    })
+  },
+  methods: {
+    submit () {
+
+    }
+  }
+}
+</script>
+
+<style>
+/* 在这里添加您的样式 */
+</style>

package/src/base-client/components/his/XCharge/XChargeDemo.vue

@@ -1,145 +1,145 @@
-<script>
-import XCharge from './XCharge.vue'
-
-export default {
-  name: 'XChargeSimpleDemo',
-  components: { XCharge },
-  data () {
-    return {
-      queryParamsName: 'chargeConfig',
-      methods: [],
-      total: 0,
-      lastAmountChange: null,
-      lastAction: null,
-      currentMode: 'manual' // 当前模式：manual, auto, single
-    }
-  },
-  methods: {
-    onMethod (value) { console.log('【事件】单选支付方式(method)：', value) },
-    onMethods (values) {
-      console.log('【事件】多选支付方式(methods)：', values)
-      this.methods = values
-      // 在自动模式下，由外部决定金额分配
-      if (this.currentMode === 'auto') {
-        this.autoDistributeAmounts(values)
-      }
-    },
-    onTotal (total) { console.log('【事件】合计金额变更(totalPaymentAmount)：', total); this.total = total },
-    onAmountChange (payload) { console.log('【事件】单个方式金额变更(paymentAmountChange)：', payload, '→ 方式：', payload.method, ' 金额：', payload.amount); this.lastAmountChange = payload },
-    onAction (payload) { console.log('【事件】操作(action)：', payload); this.lastAction = payload },
-    switchMode (mode) {
-      this.currentMode = mode
-      // 根据模式切换配置
-      switch (mode) {
-        case 'manual':
-          this.queryParamsName = 'testChargeConfig'
-          break
-        case 'auto':
-          this.queryParamsName = 'testAutoMixedChargeConfig'
-          break
-        case 'single':
-          this.queryParamsName = 'testSingleChargeConfig'
-          break
-      }
-    },
-    getModeText (mode) {
-      const modeMap = {
-        manual: '混合支付-手动模式',
-        auto: '混合支付-自动模式',
-        single: '单选模式'
-      }
-      return modeMap[mode] || mode
-    },
-    // 外部金额分配逻辑（示例：平均分配）
-    autoDistributeAmounts (selectedMethods) {
-      if (!selectedMethods || selectedMethods.length === 0) return
-
-      // 示例：假设总金额为100，平均分配
-      const totalAmount = 100
-      const amountPerMethod = totalAmount / selectedMethods.length
-
-      const amounts = {}
-      selectedMethods.forEach(method => {
-        amounts[method] = amountPerMethod
-      })
-
-      // 调用组件的setPaymentAmounts方法
-      this.$refs.xCharge.setPaymentAmounts(amounts)
-    }
-  }
-}
-</script>
-
-<template>
-  <div class="demo">
-    <!-- 模式切换按钮 -->
-    <div class="mode-switcher">
-      <h3>XCharge 组件测试 - 混合支付模式切换</h3>
-      <div class="mode-buttons">
-        <a-button
-          :type="currentMode === 'manual' ? 'primary' : 'default'"
-          @click="switchMode('manual')"
-        >
-          混合支付-手动模式
-        </a-button>
-        <a-button
-          :type="currentMode === 'auto' ? 'primary' : 'default'"
-          @click="switchMode('auto')"
-        >
-          混合支付-自动模式
-        </a-button>
-        <a-button
-          :type="currentMode === 'single' ? 'primary' : 'default'"
-          @click="switchMode('single')"
-        >
-          单选模式
-        </a-button>
-      </div>
-      <p class="current-mode">当前模式：{{ getModeText(currentMode) }}</p>
-    </div>
-
-    <x-charge
-      ref="xCharge"
-      :queryParamsName="queryParamsName"
-      @method="onMethod"
-      @methods="onMethods"
-      @totalPaymentAmount="onTotal"
-      @paymentAmountChange="onAmountChange"
-      @action="onAction"
-    />
-
-    <div class="info">
-      <p>已选方式：{{ methods.join('、') || '无' }}</p>
-      <p>合计金额：{{ total }}</p>
-      <p v-if="lastAmountChange">最近金额变更：{{ lastAmountChange.method }} -> {{ lastAmountChange.amount }}</p>
-    </div>
-  </div>
-</template>
-
-<style scoped>
-.demo { padding: 16px; }
-.mode-switcher {
-  margin-bottom: 24px;
-  padding: 16px;
-  background: #f8f9fa;
-  border-radius: 8px;
-  border: 1px solid #e9ecef;
-}
-.mode-switcher h3 {
-  margin: 0 0 16px 0;
-  color: #333;
-  font-size: 18px;
-}
-.mode-buttons {
-  display: flex;
-  gap: 12px;
-  margin-bottom: 12px;
-}
-.current-mode {
-  margin: 0;
-  color: #666;
-  font-weight: 500;
-}
-.info { margin-top: 16px; color: #333; }
-.info p { margin: 6px 0; }
-</style>
+<script>
+import XCharge from './XCharge.vue'
+
+export default {
+  name: 'XChargeSimpleDemo',
+  components: { XCharge },
+  data () {
+    return {
+      queryParamsName: 'chargeConfig',
+      methods: [],
+      total: 0,
+      lastAmountChange: null,
+      lastAction: null,
+      currentMode: 'manual' // 当前模式：manual, auto, single
+    }
+  },
+  methods: {
+    onMethod (value) { console.log('【事件】单选支付方式(method)：', value) },
+    onMethods (values) {
+      console.log('【事件】多选支付方式(methods)：', values)
+      this.methods = values
+      // 在自动模式下，由外部决定金额分配
+      if (this.currentMode === 'auto') {
+        this.autoDistributeAmounts(values)
+      }
+    },
+    onTotal (total) { console.log('【事件】合计金额变更(totalPaymentAmount)：', total); this.total = total },
+    onAmountChange (payload) { console.log('【事件】单个方式金额变更(paymentAmountChange)：', payload, '→ 方式：', payload.method, ' 金额：', payload.amount); this.lastAmountChange = payload },
+    onAction (payload) { console.log('【事件】操作(action)：', payload); this.lastAction = payload },
+    switchMode (mode) {
+      this.currentMode = mode
+      // 根据模式切换配置
+      switch (mode) {
+        case 'manual':
+          this.queryParamsName = 'testChargeConfig'
+          break
+        case 'auto':
+          this.queryParamsName = 'testAutoMixedChargeConfig'
+          break
+        case 'single':
+          this.queryParamsName = 'testSingleChargeConfig'
+          break
+      }
+    },
+    getModeText (mode) {
+      const modeMap = {
+        manual: '混合支付-手动模式',
+        auto: '混合支付-自动模式',
+        single: '单选模式'
+      }
+      return modeMap[mode] || mode
+    },
+    // 外部金额分配逻辑（示例：平均分配）
+    autoDistributeAmounts (selectedMethods) {
+      if (!selectedMethods || selectedMethods.length === 0) return
+
+      // 示例：假设总金额为100，平均分配
+      const totalAmount = 100
+      const amountPerMethod = totalAmount / selectedMethods.length
+
+      const amounts = {}
+      selectedMethods.forEach(method => {
+        amounts[method] = amountPerMethod
+      })
+
+      // 调用组件的setPaymentAmounts方法
+      this.$refs.xCharge.setPaymentAmounts(amounts)
+    }
+  }
+}
+</script>
+
+<template>
+  <div class="demo">
+    <!-- 模式切换按钮 -->
+    <div class="mode-switcher">
+      <h3>XCharge 组件测试 - 混合支付模式切换</h3>
+      <div class="mode-buttons">
+        <a-button
+          :type="currentMode === 'manual' ? 'primary' : 'default'"
+          @click="switchMode('manual')"
+        >
+          混合支付-手动模式
+        </a-button>
+        <a-button
+          :type="currentMode === 'auto' ? 'primary' : 'default'"
+          @click="switchMode('auto')"
+        >
+          混合支付-自动模式
+        </a-button>
+        <a-button
+          :type="currentMode === 'single' ? 'primary' : 'default'"
+          @click="switchMode('single')"
+        >
+          单选模式
+        </a-button>
+      </div>
+      <p class="current-mode">当前模式：{{ getModeText(currentMode) }}</p>
+    </div>
+
+    <x-charge
+      ref="xCharge"
+      :queryParamsName="queryParamsName"
+      @method="onMethod"
+      @methods="onMethods"
+      @totalPaymentAmount="onTotal"
+      @paymentAmountChange="onAmountChange"
+      @action="onAction"
+    />
+
+    <div class="info">
+      <p>已选方式：{{ methods.join('、') || '无' }}</p>
+      <p>合计金额：{{ total }}</p>
+      <p v-if="lastAmountChange">最近金额变更：{{ lastAmountChange.method }} -> {{ lastAmountChange.amount }}</p>
+    </div>
+  </div>
+</template>
+
+<style scoped>
+.demo { padding: 16px; }
+.mode-switcher {
+  margin-bottom: 24px;
+  padding: 16px;
+  background: #f8f9fa;
+  border-radius: 8px;
+  border: 1px solid #e9ecef;
+}
+.mode-switcher h3 {
+  margin: 0 0 16px 0;
+  color: #333;
+  font-size: 18px;
+}
+.mode-buttons {
+  display: flex;
+  gap: 12px;
+  margin-bottom: 12px;
+}
+.current-mode {
+  margin: 0;
+  color: #666;
+  font-weight: 500;
+}
+.info { margin-top: 16px; color: #333; }
+.info p { margin: 6px 0; }
+</style>

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

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

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

@@ -103,7 +103,9 @@
           :style="getIconStyle(item)">
         </i>
         <span
-          class="item-text">
+          class="item-text"
+          :class="{ 'text-truncated': enableHoverOptions && hoveredIndex === index }"
+          :style="getTextStyle(index)">
           {{ item.number }} {{ item.name }}
         </span>
 
@@ -195,7 +197,7 @@ export default {
     titleSelectValue: {
       type: [String, Number],
       default: undefined
-    }
+    },
   },
   data () {
     return {
@@ -243,7 +245,7 @@ export default {
       const classes = {}
       // 多个布尔型样式开关（存在且为真则生效）
       const booleanStyleKeys = [
-        ''
+        'enableNewListStyle'
       ]
       booleanStyleKeys.forEach(key => {
         const val = a[key]
@@ -548,7 +550,11 @@ export default {
     // 选项框点击
     handleOptionClick (index, action) {
       this.$emit('optionClick', { data: this.data[index], action })
-    }
+    },
+    // 获取文本样式（简化版本，主要依赖CSS类控制）
+    getTextStyle (index) {
+      return {}
+    },
   },
   watch: {
     // 同步受控值变化
@@ -563,7 +569,7 @@ export default {
       handler (val) {
         this.refreshList(val)
       }
-    }
+    },
   },
   beforeDestroy () {
     const ref = this.$refs.listRef
@@ -575,7 +581,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="less">
 .list-wrapper {
   max-height: 240px;
   overflow-y: auto;
@@ -626,7 +632,7 @@ export default {
 
 .button-group {
   display: flex;
-  gap: 2px; /* 按钮之间的间距 */
+  gap: 4px; /* 按钮之间的间距 */
 }
 
 .list-item:hover .confirm-btn.hover-btn {
@@ -826,4 +832,107 @@ export default {
   box-sizing: border-box;
   margin: 10px;
 }
+
+/* 新列表样式 */
+.x-list-enableNewListStyle {
+  /* 重写 list-wrapper 样式，去除 padding-right、max-height 和滚动条 */
+  &.x-list-wrapper.list-wrapper {
+    padding-right: 0 !important;
+    max-height: none !important;
+    overflow: visible !important;
+    overflow-y: visible !important;
+  }
+
+  .list-item {
+    width: 100%; /* 正常情况下占据整个宽度 */
+    height: 35px;
+    border-radius: 6px;
+    opacity: 1;
+    background: #F4F4F4;
+    padding: 8px 12px;
+    margin-bottom: 8px !important;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    box-sizing: border-box;
+    transition: width 0.3s ease; /* 添加宽度过渡效果 */
+  }
+
+  /* 悬停时恢复固定宽度 */
+  .list-item:hover {
+    width: 234px; /* 悬停时恢复固定宽度 */
+  }
+
+  .item-text {
+    height: 20px;
+    opacity: 1;
+    font-family: Source Han Sans;
+    font-size: 14px;
+    font-weight: normal;
+    line-height: normal;
+    letter-spacing: 0em;
+    font-feature-settings: "kern" on;
+    color: #313131;
+    flex: 1; /* 占据剩余空间 */
+    margin-right: 1px; /* 与按钮组保持8px间距 */
+    transition: width 0.3s ease; /* 只对宽度进行过渡，避免溢出控制闪烁 */
+    white-space: nowrap; /* 不换行 */
+    overflow: visible; /* 正常情况下显示全部内容 */
+    text-overflow: initial; /* 正常情况下不显示省略号 */
+  }
+
+  /* 悬停时隐藏超出部分 - 立即生效，不添加过渡 */
+  .list-item:hover .item-text {
+    overflow: hidden; /* 悬停时隐藏溢出内容 */
+    text-overflow: ellipsis; /* 悬停时显示省略号 */
+    transition: none; /* 溢出控制立即生效，避免闪烁 */
+  }
+
+  .button-group {
+    gap: 4px; /* 按钮之间的间距 */
+    flex-shrink: 0; /* 防止按钮组被压缩 */
+  }
+
+  .confirm-btn {
+    height: 20px;
+    opacity: 0; /* 默认隐藏 */
+    transition: opacity 0.3s ease; /* 添加过渡效果 */
+    font-family: Source Han Sans;
+    font-size: 14px;
+    font-weight: normal;
+    line-height: normal;
+    letter-spacing: 0em;
+    font-feature-settings: "kern" on;
+    /* 移除固定颜色，继承默认颜色 */
+    padding: 0; /* 清除内边距 */
+    margin-left: 0; /* 移除左边距，使用 gap 控制间距 */
+
+    span {
+      height: 20px;
+      opacity: 1;
+      font-family: Source Han Sans;
+      font-size: 14px;
+      font-weight: normal;
+      line-height: normal;
+      letter-spacing: 0em;
+      font-feature-settings: "kern" on;
+      /* 移除固定颜色，继承默认颜色 */
+    }
+  }
+  /* 悬浮时显示按钮 */
+  .list-item:hover .confirm-btn {
+    opacity: 1;
+  }
+  /* 选中状态字体颜色 - 使用白色，与全局样式保持一致 */
+  .list-item.selected-active {
+    color: white !important; /* 使用白色文本 */
+  }
+  .list-item.selected-active .item-text {
+    color: white !important; /* 确保文本使用白色 */
+  }
+  .list-item.selected-active .confirm-btn,
+  .list-item.selected-active .confirm-btn span {
+    color: #ffffff !important; /* 按钮使用白色 */
+  }
+}
 </style>

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

@@ -337,7 +337,7 @@ export default {
 }
 
 .x-time-select.xtime-yizhu-date {
-  margin: 5px 11px auto 24px;
+  margin: 2px 11px 2px 24px;
   width: 234px;
   height: 32px;
   border-radius: 7px;
@@ -346,38 +346,9 @@ export default {
   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: 234px;
-  height: 32px;
-  border-radius: 7px;
-  background: #FFFFFF;
-  border: 1px solid #E5E9F0;
-}
-
-/* 范围选择时，避免分隔符遮挡文字：左输入靠右、右输入靠左，并在分隔符侧增加内边距 */
-.x-time-select.xtime-yizhu-date :deep(.ant-picker-range .ant-picker-input:first-child input) {
-  text-align: right;
-  padding-right: 28px;
-}
-.x-time-select.xtime-yizhu-date :deep(.ant-picker-range .ant-picker-input:last-child input) {
-  text-align: left;
-  padding-left: 28px;
-}
 /* 箭头模式下，让输入有左右内边距以避让箭头 */
 .x-time-select.has-nav-arrows :deep(.ant-picker-input > input) {
   padding-left: 30px;
   padding-right: 30px;
 }
-/* 分隔符与清除按钮占位优化，减少遮挡概率 */
-.x-time-select.xtime-yizhu-date :deep(.ant-picker-range .ant-picker-separator) {
-  margin: 0 4px;
-}
-.x-time-select.xtime-yizhu-date :deep(.ant-picker-clear) {
-  right: 6px;
-}
 </style>