vue2-client 1.16.68 → 1.16.70

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/XRadio/XRadio.vue

@@ -1,13 +1,35 @@
 <template>
   <div class="x-radio-container" :class="wrapperClassObject()">
-    <a-radio-group v-model="innerValue" @change="onChange" class="x-radio-group">
-      <div v-for="item in data" :key="item.value" class="x-radio-item-container">
-        <a-radio :value="item.value" class="x-radio-item">
-          {{ item.label }}
-        </a-radio>
+    <a-radio-group v-model="innerValue" @change="onChange" :class="['x-radio-group', { 'x-radio-group-left': config.alignLeft }]">
+      <div v-for="item in data"
+           :key="item.value"
+           class="x-radio-item-container"
+           :class="{
+             'x-radio-item-bordered': config.showBorder,
+             'x-radio-item-highlight': config.highlightBorder
+           }"
+           :style="getHighlightBorderStyle(item)">
+        <div class="x-radio-item-wrapper">
+          <div
+            v-if="config.showIndicator && item.bottomLine !== false"
+            class="x-radio-indicator-left"
+            :style="{
+              width: item.indicatorWidth || '4px',
+              backgroundColor: item.indicatorColor || config.indicatorActiveColor,
+              height: item.indicatorHeight || '16px'
+            }"
+          ></div>
+          <a-radio
+            :value="item.value"
+            class="x-radio-item"
+            :class="{ 'x-radio-item-no-dot': config.highlightBorder }"
+          >
+            {{ item.label }}
+          </a-radio>
+        </div>
         <div
-          v-if="config.showIndicator && item.bottomLine !== false"
-          class="x-radio-indicator"
+          v-if="config.showIndicator && item.bottomLine !== false && !config.showBorder && !config.highlightBorder"
+          class="x-radio-indicator-bottom"
           :style="{
             width: item.indicatorWidth || '100%',
             backgroundColor: item.indicatorColor || config.indicatorActiveColor,
@@ -37,7 +59,14 @@ export default {
     return {
       data: [],
       innerValue: null,
-      config: null
+      config: {
+        showIndicator: true,
+        indicatorHeight: 3,
+        indicatorActiveColor: '#1890ff',
+        alignLeft: false,
+        showBorder: false,
+        highlightBorder: false
+      }
     }
   },
   created () {
@@ -67,7 +96,16 @@ export default {
               }
             }
           }
-          // 3. 初始化默认值（优先级： 配置defaultValue > 第一个选项）
+          // 3. 加载布局配置
+          if (res.layout !== undefined) {
+            if (typeof res.layout === 'object') {
+              this.config = {
+                ...this.config,
+                ...res.layout
+              }
+            }
+          }
+          // 4. 初始化默认值（优先级： 配置defaultValue > 第一个选项）
           if (this.value !== undefined && this.value !== null) {
             this.innerValue = this.value // 优先使用外部传入的 value
           } else if (res.defaultValue !== undefined && res.defaultValue !== null) {
@@ -77,7 +115,7 @@ export default {
             // 如果没有默认值但有选项，使用第一个选项
             this.innerValue = this.data[0].value
           }
-          // 4. 触发初始化事件
+          // 5. 触发初始化事件
           this.$emit('init', this.innerValue)
         } else {
           this.$message.error('配置错误，radio字段不是数组')
@@ -101,6 +139,26 @@ export default {
       })
       return classes
     },
+    getHighlightBorderStyle (item) {
+      if (!this.config.highlightBorder) return {}
+
+      // 如果当前选项被选中且有边框颜色配置，使用配置的颜色
+      if (this.innerValue === item.value && item.borderColor) {
+        return {
+          borderColor: item.borderColor
+        }
+      }
+
+      // 如果当前选项被选中且有indicatorColor配置，使用indicatorColor作为边框颜色
+      if (this.innerValue === item.value && item.indicatorColor) {
+        return {
+          borderColor: item.indicatorColor
+        }
+      }
+
+      // 默认返回空对象，使用CSS中的默认灰色边框
+      return {}
+    }
   }
 }
 </script>
@@ -114,6 +172,10 @@ export default {
 .x-radio-group {
   display: flex;
   justify-content: space-around;
+
+  &.x-radio-group-left {
+    justify-content: flex-start;
+  }
 }
 
 .x-radio-item-container {
@@ -124,13 +186,106 @@ export default {
   text-align: center;
   padding: 0 8px;
   box-sizing: border-box;
+
+  .x-radio-group-left & {
+    flex: none;
+    align-items: flex-start;
+    text-align: left;
+    margin-right: 16px;
+    padding: 0 4px;
+
+    &:last-child {
+      margin-right: 0;
+    }
+  }
+
+  &.x-radio-item-bordered {
+    border: 1px solid #d9d9d9;
+    border-radius: 173px;
+    padding: 8px 12px;
+    margin-right: 8px;
+    background-color: #fff;
+    transition: all 0.3s;
+
+    &:hover {
+      border-color: #40a9ff;
+    }
+
+    &:last-child {
+      margin-right: 0;
+    }
+
+    .x-radio-group-left & {
+      margin-right: 8px;
+
+      &:last-child {
+        margin-right: 0;
+      }
+    }
+  }
+
+  &.x-radio-item-highlight {
+    border: 2px solid #d9d9d9;
+    border-radius: 173px;
+    padding: 8px 12px;
+    margin-right: 8px;
+    background-color: #fff;
+    transition: all 0.3s;
+    position: relative;
+
+    &:last-child {
+      margin-right: 0;
+    }
+
+    .x-radio-group-left & {
+      margin-right: 8px;
+
+      &:last-child {
+        margin-right: 0;
+      }
+    }
+
+    // 动态边框颜色通过内联样式设置
+  }
+}
+
+.x-radio-item-wrapper {
+  display: flex;
+  align-items: center;
+  width: 100%;
+
+  .x-radio-group-left & {
+    justify-content: flex-start;
+  }
 }
 
 .x-radio-item {
   margin-bottom: 8px;
+
+  .x-radio-item-bordered & {
+    margin-bottom: 0;
+  }
+
+  &.x-radio-item-no-dot {
+    :deep(.ant-radio) {
+      display: none;
+    }
+
+    :deep(.ant-radio-wrapper) {
+      padding-left: 0;
+    }
+  }
+}
+
+.x-radio-indicator-left {
+  width: 4px;
+  height: 16px;
+  margin-right: 8px;
+  border-radius: 6px;
+  transition: all 0.3s;
 }
 
-.x-radio-indicator {
+.x-radio-indicator-bottom {
   height: 3px;
   transition: all 0.3s;
   max-width: 100%;

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

@@ -81,6 +81,7 @@ export default {
   overflow: hidden;
   display: flex;
   flex-direction: column;
+  padding-left: 13px; /* 整体左边距 */
 }
 
 /* 基础无边框样式 */
@@ -100,11 +101,39 @@ export default {
 /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 {
@@ -115,5 +144,16 @@ export default {
   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>