ow

WebVue/src/components/basic/Search.vue

@@ -30,7 +30,7 @@
     <columnModal :show-modal="showColumnModal" @on-change-columns="onChangeColumns" @handle-close="onHandleClose"
       @on-change-view-option="onChangeViewOption" />
   </div>
-  <a-table style="margin-right: 6px" :row-key="(index: any) => { return index }" :columns="columns" :data-source="datas"
+  <a-table style="margin-left: 2px;margin-right: 6px" :row-key="(index: any) => { return index }" :columns="columns" :data-source="datas"
     :row-selection="rowSelection" :pagination="pagination" @change="handleTableChange"
     :scroll="{ x: scrollx, y: resultH }" :custom-row="customRow" size="small" bordered>
     headerCell
@@ -149,30 +149,37 @@ watch(isModal, () => {
   computResultTableHeight();
 });
 
-const computResultTableHeight = () => {
-  if (width.value > 640) {
-    if (isModal.value) {
-      resultH.value = 'calc(100vh - ' + searchRef.value?.offsetHeight + 'px - 560px )'
-    }
-    else {
-      resultH.value = 'calc(100vh - ' + searchRef.value?.offsetHeight + 'px - 330px )'
-    }
-  }
-  else {
-    if (isModal.value) {
-      resultH.value = 'calc(100vh - ' + searchRef.value?.offsetHeight + 'px - 560px )'
-    }
-    else {
-      if (tableY.value > 0) {
-        resultH.value = 'calc(100vh - ' + searchRef.value?.offsetHeight + 'px - ' + tableY.value + 'px)';
-      }
-      else {
-        resultH.value = 'calc(100vh - ' + searchRef.value?.offsetHeight + 'px - 380px )'
-      }
+const HEIGHT_OFFSETS = {
+  modal: 560,
+  normalDesktop: 330,
+  normalMobileFallback: 420,
+};
 
-    }
+
+const computResultTableHeight = () => {
+  // 安全获取搜索区域高度，默认0
+  const searchHeight = searchRef.value?.offsetHeight ?? 0;
+  const base = `calc(100vh - ${searchHeight}px`;
+
+  // 合并重复的 isModal 分支
+  if (isModal.value) {
+    resultH.value = `${base} - ${HEIGHT_OFFSETS.modal}px)`;
+    return;
   }
-}
+
+  // 桌面端非弹窗
+  if (width.value > 640) {
+    resultH.value = `${base} - ${HEIGHT_OFFSETS.normalDesktop}px)`;
+    return;
+  }
+
+  // 移动端非弹窗
+  if (tableY.value > 0) {
+    resultH.value = `${base} - ${tableY.value}px)`;
+  } else {
+    resultH.value = `${base} - ${HEIGHT_OFFSETS.normalMobileFallback}px)`;
+  }
+};
 
 defineOptions({
   name: "search",
@@ -204,6 +211,7 @@ const handleChangeBindValue = ((bindValue: string, value: string) => {
 
 const onReset = (async () => {
   datas.value = [];
+  selected.value = [];
   emit('onReset');
 });
 
@@ -336,4 +344,6 @@ const { run, current, pageSize } = usePagination(queryData, {
   bottom: 8px;
   border-top: 1px solid silver;
 }
+
+
 </style>

WebVue/src/components/basic/SearchCriteria.vue

@@ -637,4 +637,8 @@ useSearchCriteriaProvide(getFilters);
 .search-criteria .ant-picker-input input[readonly] {
   background-color: #fff !important;
 }
+
+.search-criteria .gutter-row {
+  width: 100%;
+}
 </style>