diff --git a/WebVue/src/components/basic/Search.vue b/WebVue/src/components/basic/Search.vue
index b888ec3..a4d0746 100644
--- a/WebVue/src/components/basic/Search.vue
+++ b/WebVue/src/components/basic/Search.vue
@@ -30,7 +30,7 @@
-
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;
}
+
+
diff --git a/WebVue/src/components/basic/SearchCriteria.vue b/WebVue/src/components/basic/SearchCriteria.vue
index eb1ce53..d34059c 100644
--- a/WebVue/src/components/basic/SearchCriteria.vue
+++ b/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%;
+}
diff --git a/WebVue/src/views/security/ActorEnquiry.vue b/WebVue/src/views/security/ActorEnquiry.vue
index 9cf39ab..13b7119 100644
--- a/WebVue/src/views/security/ActorEnquiry.vue
+++ b/WebVue/src/views/security/ActorEnquiry.vue
@@ -22,9 +22,9 @@
查看
+ :disabled="!(keys && keys.length ==1)" @click.prevent="onView">查看
修改
+ :disabled="!(keys && keys.length ==1)" @click.prevent="onAmend">修改
删除
diff --git a/WebVue/src/views/security/ActorOperation.vue b/WebVue/src/views/security/ActorOperation.vue
index 1435e99..0905090 100644
--- a/WebVue/src/views/security/ActorOperation.vue
+++ b/WebVue/src/views/security/ActorOperation.vue
@@ -570,6 +570,7 @@ const onViewUserOperation = ((userName: string) => {
padding-bottom: 8px;
padding-right: 12px;
border-bottom: 1px solid silver;
+ margin-left: 6px;
}
.page-header .ant-input-search .ant-input {
diff --git a/WebVue/src/views/security/FunctionEnquiry.vue b/WebVue/src/views/security/FunctionEnquiry.vue
index d09e4bd..80e90dc 100644
--- a/WebVue/src/views/security/FunctionEnquiry.vue
+++ b/WebVue/src/views/security/FunctionEnquiry.vue
@@ -21,9 +21,9 @@
查看
+ :disabled="!(keys && keys.length ==1)" @click.prevent="onView">查看
修改
+ :disabled="!(keys && keys.length ==1)" @click.prevent="onAmend">修改
删除
diff --git a/WebVue/src/views/security/FunctionOperation.vue b/WebVue/src/views/security/FunctionOperation.vue
index c6599e1..744d174 100644
--- a/WebVue/src/views/security/FunctionOperation.vue
+++ b/WebVue/src/views/security/FunctionOperation.vue
@@ -683,6 +683,7 @@ const handleSelectPermission = (async () => {
padding-bottom: 8px;
padding-right: 12px;
border-bottom: 1px solid silver;
+ margin-left: 6px;
}
.page-header .ant-input-search .ant-input {
diff --git a/WebVue/src/views/security/GroupEnquiry.vue b/WebVue/src/views/security/GroupEnquiry.vue
index f3858a4..e889186 100644
--- a/WebVue/src/views/security/GroupEnquiry.vue
+++ b/WebVue/src/views/security/GroupEnquiry.vue
@@ -16,9 +16,9 @@
查看
+ :disabled="!(keys && keys.length ==1)" @click.prevent="onView">查看
修改
+ :disabled="!(keys && keys.length ==1)" @click.prevent="onAmend">修改
删除
diff --git a/WebVue/src/views/security/GroupOperation.vue b/WebVue/src/views/security/GroupOperation.vue
index 2722980..9d13a01 100644
--- a/WebVue/src/views/security/GroupOperation.vue
+++ b/WebVue/src/views/security/GroupOperation.vue
@@ -827,6 +827,7 @@ const onViewPermissionOperation = ((permissionName: string) => {
padding-bottom: 8px;
padding-right: 12px;
border-bottom: 1px solid silver;
+ margin-left: 6px;
}
.page-header .ant-input-search .ant-input {
diff --git a/WebVue/src/views/security/MasterEnquiry.vue b/WebVue/src/views/security/MasterEnquiry.vue
index cf015bf..14d3f22 100644
--- a/WebVue/src/views/security/MasterEnquiry.vue
+++ b/WebVue/src/views/security/MasterEnquiry.vue
@@ -21,9 +21,9 @@
查看
+ :disabled="!(keys && keys.length ==1)" @click.prevent="onView">查看
修改
+ :disabled="!(keys && keys.length ==1)" @click.prevent="onAmend">修改
删除
diff --git a/WebVue/src/views/security/MasterOperation.vue b/WebVue/src/views/security/MasterOperation.vue
index d16dae0..1a8fcec 100644
--- a/WebVue/src/views/security/MasterOperation.vue
+++ b/WebVue/src/views/security/MasterOperation.vue
@@ -452,6 +452,7 @@ const handleSelect = (async () => {
padding-bottom: 8px;
padding-right: 12px;
border-bottom: 1px solid silver;
+ margin-left: 6px;
}
.page-header .ant-input-search .ant-input {
diff --git a/WebVue/src/views/security/PermissionEnquiry.vue b/WebVue/src/views/security/PermissionEnquiry.vue
index 7558e3e..0295fa7 100644
--- a/WebVue/src/views/security/PermissionEnquiry.vue
+++ b/WebVue/src/views/security/PermissionEnquiry.vue
@@ -16,9 +16,9 @@
查看
+ :disabled="!(keys && keys.length ==1)" @click.prevent="onView">查看
修改
+ :disabled="!(keys && keys.length ==1)" @click.prevent="onAmend">修改
删除
diff --git a/WebVue/src/views/security/PermissionOperation.vue b/WebVue/src/views/security/PermissionOperation.vue
index 7f0a8d1..4eeda79 100644
--- a/WebVue/src/views/security/PermissionOperation.vue
+++ b/WebVue/src/views/security/PermissionOperation.vue
@@ -446,6 +446,7 @@ const handleSelect = (async () => {
padding-bottom: 8px;
padding-right: 12px;
border-bottom: 1px solid silver;
+ margin-left: 6px;
}
.page-header .ant-input-search .ant-input {
diff --git a/WebVue/src/views/security/UserEnquiry.vue b/WebVue/src/views/security/UserEnquiry.vue
index 364d720..f125788 100644
--- a/WebVue/src/views/security/UserEnquiry.vue
+++ b/WebVue/src/views/security/UserEnquiry.vue
@@ -22,9 +22,9 @@
查看
+ :disabled="!(keys && keys.length == 1)" @click.prevent="onView">查看
修改
+ :disabled="!(keys && keys.length ==1)" @click.prevent="onAmend">修改
无效
diff --git a/WebVue/src/views/security/UserOperation.vue b/WebVue/src/views/security/UserOperation.vue
index 43425f3..94b7ffb 100644
--- a/WebVue/src/views/security/UserOperation.vue
+++ b/WebVue/src/views/security/UserOperation.vue
@@ -470,6 +470,7 @@ const onViewActorOperation = ((actorName: string) => {
padding-bottom: 8px;
padding-right: 12px;
border-bottom: 1px solid silver;
+ margin-left: 6px;
}
.page-header .ant-input-search .ant-input {