vue2-client 1.16.44 → 1.16.46

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.16.44",
+  "version": "1.16.46",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/HIS/HFormTable/HFormTable.vue

@@ -1,244 +1,256 @@
-<script setup>
-import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
-import { ref, computed, useAttrs } from 'vue'
-
-const props = defineProps({
-  // HFormTable特有的属性
-  tableStyle: {
-    type: String,
-    default: 'formtable-col1'
-  }
-})
-
-// 兼容多种样式配置
-const attrs = useAttrs()
-const wrapperClassObject = computed(() => {
-  const a = attrs
-  const classes = {}
-
-  // 通用布尔样式开关（以存在/空字符串/'true' 为真）
-  const booleanStyleKeys = [
-    'button-row-0margin',
-    'top-hidden'
-  ]
-  for (const key of booleanStyleKeys) {
-    const val = a[key]
-    const truthy = val === true || val === '' || val === 'true'
-    if (truthy) classes[`h-form-table-${key}`] = true
-  }
-
-  // 兼容通过 attrs 透传的分页样式：将值映射为当前样式中存在的类名
-  const paginationAttr = a && a.paginationStyle
-  if (paginationAttr && ['pagination-center', 'custom-pagination'].includes(paginationAttr)) {
-    classes[`h-form-table-${paginationAttr}`] = true
-  }
-  return classes
-})
-
-// 通过暴露的实例访问 $slots，避免直接依赖 Composition API 的 useSlots
-// 在模板中使用 `$slots` 遍历以保持与 Vue2 兼容
-// 创建对XFormTable组件的引用
-const xFormTableRef = ref()
-
-// 暴露方法给父组件使用
-defineExpose({
-  // 为了兼容性，保留getXFormTableInstance方法
-  getXFormTableInstance: () => xFormTableRef.value
-})
-
-// 计算是否使用自定义分页（兼容 attrs 透传与 tableStyle 配置）
-const isCustomPagination = computed(() => {
-  const a = attrs
-  const paginationAttr = (a && a.paginationStyle) || ''
-  return props.tableStyle === 'custom-pagination' || paginationAttr === 'custom-pagination'
-})
-</script>
-
-<template>
-  <div
-    class="h-form-table-wrapper"
-    :class="[
-      `h-form-table-${tableStyle}`,
-      wrapperClassObject
-    ]"
-  >
-    <x-form-table
-      ref="xFormTableRef"
-      v-bind="$attrs"
-      :customPagination="isCustomPagination"
-      v-on="$listeners"
-    >
-      <template v-for="(_, name) in $slots" #[name]="slotData">
-        <slot :name="name" v-bind="slotData" />
-      </template>
-    </x-form-table>
-  </div>
-</template>
-
-<style scoped lang="less">
-.h-form-table-wrapper {
-  // 基础样式
-  :deep(.table-wrapper) {
-    .ant-table {
-      .ant-table-row {
-        margin: 0px;
-
-        .ant-form-item {
-          margin: 0px;
-
-          .ant-form-item-control-wrapper {
-            .ant-form-item-control {
-              line-height: 0px;
-
-              .ant-select-selection--multiple {
-                padding-bottom: 2px;
-              }
-            }
-            width: 100%;
-          }
-        }
-      }
-      font-size: 16px;
-    }
-
-    .ant-alert-info {
-      display: none;
-    }
-  }
-
-  :deep(.ant-card) {
-    margin: -10px 0px 29px 0px;
-  }
-
-  :deep(.ant-btn) {
-    border: 0px;
-    box-shadow: none;
-    padding: 0px;
-    color: #5D5C5C;
-    font-weight: bold;
-    letter-spacing: 0em;
-    font-size: 18px;
-    line-height: normal;
-    font-family: "Source Han Sans";
-  }
-
-  :deep(.ant-card-body) {
-    padding: 0 6px;
-  }
-
-  :deep(.ant-table-small) {
-    border-width: 0;
-
-    .ant-table-fixed {
-      border-radius: 0;
-      border-bottom: 1px solid #f0f0f0;
-    }
-  }
-
-  // 表格高度样式
-  &.h-form-table-height {
-    :deep(.table-wrapper) {
-      .ant-select-open ~ .ant-table-content {
-        height: 500px !important;
-      }
-    }
-  }
-
-  // 表格样式
-  &.h-form-table-table {
-    :deep(.ant-table-small .ant-table-fixed-header) {
-      .ant-table-content {
-        .ant-table-content {
-          .ant-table-body {
-            border-radius: 0 0 4px 4px;
-            overflow: visible !important;
-          }
-        }
-      }
-    }
-  }
-
-  // 隐藏按钮区域
-  &.h-form-table-button-area-hide {
-    :deep(.ant-btn) {
-      display: none;
-    }
-
-    :deep(.table-wrapper) {
-      margin-top: -39px;
-    }
-  }
-
-  // 顶部区域隐藏（与按钮隐藏一致的视觉需求）
-  &.h-form-table-top-hidden {
-    :deep(.ant-btn) {
-      display: none;
-    }
-
-    :deep(.table-wrapper) {
-      margin-top: -39px;
-    }
-  }
-
-  // 列样式1
-  &.h-form-table-formtable-col1 {
-    :deep(.table-wrapper) {
-      .ant-row {
-        .ant-col span {
-          border: none;
-          width: auto;
-          margin-bottom: auto;
-        }
-      }
-
-      .ant-table {
-        .ant-table-body {
-          .ant-table-fixed colgroup col:nth-child(2) {
-            width: 50px;
-            min-width: 50px;
-          }
-        }
-
-        .ant-table-header {
-          .ant-table-fixed colgroup col:nth-child(2) {
-            width: 50px;
-            min-width: 50px;
-          }
-        }
-      }
-    }
-  }
-
-  // 底部分页居中 & 自定义分页样式（共用样式）
-  &.h-form-table-bottom-center,
-  &.h-form-table-custom-pagination {
-    :deep(.table-wrapper) {
-      .ant-row-flex-start {
-        position: relative;
-        display: flex;
-        align-items: center;
-        margin-top: 24px !important;
-
-        // 防止第一个子元素无限拉伸，影响分页居中
-        > :first-child {
-          flex: 0 0 auto;
-        }
-
-        // 将第二个子元素（分页）绝对居中
-        > :nth-child(2) {
-          position: absolute;
-          left: 50%;
-          transform: translateX(-50%);
-        }
-      }
-    }
-  }
-
-  // 按钮行0margin
-  &.h-form-table-button-row-0margin {
-    :deep(.ant-row) {
-      margin: 0px;
-    }
-  }
-}
-</style>
+<script setup>
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
+import { ref, computed, useAttrs } from 'vue'
+
+const props = defineProps({
+  // HFormTable特有的属性
+  tableStyle: {
+    type: String,
+    default: 'formtable-col1'
+  }
+})
+
+// 兼容多种样式配置
+const attrs = useAttrs()
+const wrapperClassObject = computed(() => {
+  const a = attrs
+  const classes = {}
+
+  // 通用布尔样式开关（以存在/空字符串/'true' 为真）
+  const booleanStyleKeys = [
+    'button-row-0margin',
+    'top-hidden',
+    'dialog-style'
+  ]
+  for (const key of booleanStyleKeys) {
+    const val = a[key]
+    const truthy = val === true || val === '' || val === 'true'
+    if (truthy) classes[`h-form-table-${key}`] = true
+  }
+
+  // 兼容通过 attrs 透传的分页样式：将值映射为当前样式中存在的类名
+  const paginationAttr = a && a.paginationStyle
+  if (paginationAttr && ['pagination-center', 'custom-pagination'].includes(paginationAttr)) {
+    classes[`h-form-table-${paginationAttr}`] = true
+  }
+  return classes
+})
+
+// 通过暴露的实例访问 $slots，避免直接依赖 Composition API 的 useSlots
+// 在模板中使用 `$slots` 遍历以保持与 Vue2 兼容
+// 创建对XFormTable组件的引用
+const xFormTableRef = ref()
+
+// 暴露方法给父组件使用
+defineExpose({
+  // 为了兼容性，保留getXFormTableInstance方法
+  getXFormTableInstance: () => xFormTableRef.value
+})
+
+// 计算是否使用自定义分页（兼容 attrs 透传与 tableStyle 配置）
+const isCustomPagination = computed(() => {
+  const a = attrs
+  const paginationAttr = (a && a.paginationStyle) || ''
+  return props.tableStyle === 'custom-pagination' || paginationAttr === 'custom-pagination'
+})
+</script>
+
+<template>
+  <div
+    class="h-form-table-wrapper"
+    :class="[
+      `h-form-table-${tableStyle}`,
+      wrapperClassObject
+    ]"
+  >
+    <x-form-table
+      ref="xFormTableRef"
+      v-bind="$attrs"
+      :customPagination="isCustomPagination"
+      v-on="$listeners"
+    >
+      <template v-for="(_, name) in $slots" #[name]="slotData">
+        <slot :name="name" v-bind="slotData" />
+      </template>
+    </x-form-table>
+  </div>
+</template>
+
+<style scoped lang="less">
+.h-form-table-wrapper {
+  // 基础样式
+  :deep(.table-wrapper) {
+    .ant-table {
+      .ant-table-row {
+        margin: 0px;
+
+        .ant-form-item {
+          margin: 0px;
+
+          .ant-form-item-control-wrapper {
+            .ant-form-item-control {
+              line-height: 0px;
+
+              .ant-select-selection--multiple {
+                padding-bottom: 2px;
+              }
+            }
+            width: 100%;
+          }
+        }
+      }
+      font-size: 16px;
+    }
+
+    .ant-alert-info {
+      display: none;
+    }
+  }
+
+  :deep(.ant-card) {
+    margin: -10px 0px 29px 0px;
+  }
+
+  :deep(.ant-btn) {
+    border: 0px;
+    box-shadow: none;
+    padding: 0px;
+    color: #5D5C5C;
+    font-weight: bold;
+    letter-spacing: 0em;
+    font-size: 18px;
+    line-height: normal;
+    font-family: "Source Han Sans";
+  }
+
+  :deep(.ant-card-body) {
+    padding: 0 6px;
+  }
+
+  :deep(.ant-table-small) {
+    border-width: 0;
+
+    .ant-table-fixed {
+      border-radius: 0;
+      border-bottom: 1px solid #f0f0f0;
+    }
+  }
+
+  // 表格高度样式
+  &.h-form-table-height {
+    :deep(.table-wrapper) {
+      .ant-select-open ~ .ant-table-content {
+        height: 500px !important;
+      }
+    }
+  }
+
+  // 表格样式
+  &.h-form-table-table {
+    :deep(.ant-table-small .ant-table-fixed-header) {
+      .ant-table-content {
+        .ant-table-content {
+          .ant-table-body {
+            border-radius: 0 0 4px 4px;
+            overflow: visible !important;
+          }
+        }
+      }
+    }
+  }
+  &.h-form-table-dialog-style {
+    /* 选择前面的兄弟元素 */
+    :global(.ant-col.ant-col-24[name="trGroup"]:has(+ .ant-card .ant-card-body .h-form-table-wrapper.h-form-table-dialog-style)) {
+      padding-top: 0px !important;
+      padding-left: 0px !important;
+    }
+
+    :global(.ant-card-body:has(.h-form-table-wrapper.h-form-table-dialog-style)) {
+      padding-top: 0px !important;
+      padding-left: 0px !important;
+    }
+  }
+  // 隐藏按钮区域
+  &.h-form-table-button-area-hide {
+    :deep(.ant-btn) {
+      display: none;
+    }
+
+    :deep(.table-wrapper) {
+      margin-top: -39px;
+    }
+  }
+
+  // 顶部区域隐藏（与按钮隐藏一致的视觉需求）
+  &.h-form-table-top-hidden {
+    :deep(.ant-btn) {
+      display: none;
+    }
+
+    :deep(.table-wrapper) {
+      margin-top: -39px;
+    }
+  }
+
+  // 列样式1
+  &.h-form-table-formtable-col1 {
+    :deep(.table-wrapper) {
+      .ant-row {
+        .ant-col span {
+          border: none;
+          width: auto;
+          margin-bottom: auto;
+        }
+      }
+
+      .ant-table {
+        .ant-table-body {
+          .ant-table-fixed colgroup col:nth-child(2) {
+            width: 50px;
+            min-width: 50px;
+          }
+        }
+
+        .ant-table-header {
+          .ant-table-fixed colgroup col:nth-child(2) {
+            width: 50px;
+            min-width: 50px;
+          }
+        }
+      }
+    }
+  }
+
+  // 底部分页居中 & 自定义分页样式（共用样式）
+  &.h-form-table-bottom-center,
+  &.h-form-table-custom-pagination {
+    :deep(.table-wrapper) {
+      .ant-row-flex-start {
+        position: relative;
+        display: flex;
+        align-items: center;
+        margin-top: 24px !important;
+
+        // 防止第一个子元素无限拉伸，影响分页居中
+        > :first-child {
+          flex: 0 0 auto;
+        }
+
+        // 将第二个子元素（分页）绝对居中
+        > :nth-child(2) {
+          position: absolute;
+          left: 50%;
+          transform: translateX(-50%);
+        }
+      }
+    }
+  }
+
+  // 按钮行0margin
+  &.h-form-table-button-row-0margin {
+    :deep(.ant-row) {
+      margin: 0px;
+    }
+  }
+}
+</style>

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

@@ -68,6 +68,7 @@
       width="60vw"
       :dialogStyle="{ top: '20px' }"
       wrapClassName="image-preview-modal"
+      :zIndex="1010"
     >
       <div class="image-preview-container">
         <img

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

@@ -388,6 +388,7 @@ export default {
 // 基于根容器类进行样式整合：x-collapse-wrapper.xcollapse-style1
 .x-collapse-wrapper {
   &.xcollapse-style1 {
+    height: 1185px;
     .header-content {
       gap: 6px; // 圆点与title1更紧凑的基础间距
     }
@@ -432,7 +433,7 @@ export default {
     }
 
     :deep(.ant-collapse > .ant-collapse-item) {
-      width: 550px;
+      width: 100%;
       height: 410px;
       margin: 16px 0;              // 面板之间留白
       border-radius: 6px;          // 分离的圆角