2
0

5 Коммитууд b399ef3f27 ... d71c830fdf

Эзэн SHA1 Мессеж Огноо
  cc12458 d71c830fdf Merge tag 'bug-349' into develop 2 долоо хоног өмнө
  cc12458 ccb0a36624 Merge branch 'release/bug-349' 2 долоо хоног өмнө
  cc12458 14b4f1eede fix(@six/hospital-guide): 修复请求接口分页字段取值问题 2 долоо хоног өмнө
  谦元吉 6a85b3ab84 fix(@vben/common-ui): resolve #6698 (#6700) 2 сар өмнө
  谦元吉 c57592f3a6 fix(@vben-core/shadcn-ui): 修复VbenPinInput组件在点击获取验证码和回车同时进行时会重复触发计时器的问题 (#6705) 2 сар өмнө

+ 2 - 2
apps/hospital-guide/src/api/index.ts

@@ -21,11 +21,11 @@ export const http = createRequestClient({
     const result = { code, message, data, ...r };
 
     if (
-      result.data?.TotalPageCount !== void 0 &&
+      result.data?.TotalRecordCount !== void 0 &&
       Array.isArray(result.data?.Items)
     ) {
       const {
-        TotalPageCount: total,
+        TotalRecordCount: total,
         PageIndex: page,
         PageSize: size,
         Items: items,

+ 3 - 9
packages/effects/common-ui/src/components/page/page.vue

@@ -25,7 +25,7 @@ const footerRef = useTemplateRef<HTMLDivElement>('footerRef');
 const contentStyle = computed<StyleValue>(() => {
   if (autoContentHeight) {
     return {
-      height: `calc(var(${CSS_VARIABLE_LAYOUT_CONTENT_HEIGHT}) - ${headerHeight.value}px - ${typeof heightOffset === 'number' ? `${heightOffset}px` : heightOffset})`,
+      height: `calc(var(${CSS_VARIABLE_LAYOUT_CONTENT_HEIGHT}) - ${headerHeight.value}px - ${footerHeight.value}px - ${typeof heightOffset === 'number' ? `${heightOffset}px` : heightOffset})`,
       overflowY: shouldAutoHeight.value ? 'auto' : 'unset',
     };
   }
@@ -50,7 +50,7 @@ onMounted(() => {
 </script>
 
 <template>
-  <div class="relative">
+  <div class="relative flex min-h-full flex-col">
     <div
       v-if="
         description ||
@@ -89,16 +89,10 @@ onMounted(() => {
     <div :class="cn('h-full p-4', contentClass)" :style="contentStyle">
       <slot></slot>
     </div>
-
     <div
       v-if="$slots.footer"
       ref="footerRef"
-      :class="
-        cn(
-          'bg-card align-center absolute bottom-0 left-0 right-0 flex px-6 py-4',
-          footerClass,
-        )
-      "
+      :class="cn('bg-card align-center flex px-6 py-4', footerClass)"
     >
       <slot name="footer"></slot>
     </div>