From da0d40b13b9b48bbb5ae0f936294b26ca1da8e57 Mon Sep 17 00:00:00 2001
From: likunming <likunming@163.com>
Date: Tue, 19 Aug 2025 14:25:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E7=BB=84=E4=BB=B6=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8C=89=E9=92=AE=E5=8F=8A=E6=89=A9=E5=B1=95=E5=8D=95?=
 =?UTF-8?q?=E9=80=89=E7=BB=84=E4=BB=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/grid/ts/toolbar/buttons/Query.ts    |  4 ++++
 .../src/platform/components/radio/WExtRadio.vue    | 14 +++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/ts/toolbar/buttons/Query.ts b/io.sc.platform.core.frontend/src/platform/components/grid/ts/toolbar/buttons/Query.ts
index d6503f81..ad7589f8 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/ts/toolbar/buttons/Query.ts
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/ts/toolbar/buttons/Query.ts
@@ -15,11 +15,15 @@ export class Query extends Button {
     if (args.grid?.getQueryForm()) {
       const formValidate = await args.grid.getQueryForm().validate();
       if (formValidate) {
+        // 查询之前将当前页码设置为1，否则如果用户先翻页带上页码给到后台查不到数据
+        this.table.store.pagination.page = 1;
         this.tools?.apiFM.operator.refreshGrid();
       } else {
         NotifyManager.error('查询表单存在不符合要求的字段');
       }
     } else {
+      // 查询之前将当前页码设置为1，否则如果用户先翻页带上页码给到后台查不到数据
+      this.table.store.pagination.page = 1;
       this.tools?.apiFM.operator.refreshGrid();
     }
   }
diff --git a/io.sc.platform.core.frontend/src/platform/components/radio/WExtRadio.vue b/io.sc.platform.core.frontend/src/platform/components/radio/WExtRadio.vue
index 20d961bf..a852e92a 100644
--- a/io.sc.platform.core.frontend/src/platform/components/radio/WExtRadio.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/radio/WExtRadio.vue
@@ -12,7 +12,7 @@
           color="primary"
           :icon="expandOptionsModelValue ? 'remove' : 'add'"
           size="xs"
-          @click="expandOptionsModelValue = !expandOptionsModelValue"
+          @click="expandOptions"
         />
       </template>
     </w-label>
@@ -66,6 +66,7 @@ interface FieldProps extends FormFieldProps {
   selectedLabelColor?: string;
   hideOptions?: boolean; // 隐藏选项
   lightNotHideOptionsLabel?: boolean; // 高亮非隐藏选项的label
+  onExpand?: (args: any) => void;// 展开与隐藏选项时触发的事件
 }
 const props = withDefaults(defineProps<FieldProps>(), {
   showIf: true,
@@ -77,6 +78,7 @@ const props = withDefaults(defineProps<FieldProps>(), {
   selectedLabelColor: undefined,
   hideOptions: false,
   lightNotHideOptionsLabel: false,
+  onExpand: undefined,
 });
 class FieldMethods extends FormFieldMethods {
   isTemplateSlot = this.getSlotType(slots);
@@ -116,6 +118,16 @@ const getExpandOptionsModelValue = () => {
 const setExpandOptionsModelValue = (val: boolean) => {
   expandOptionsModelValue.value = val;
 };
+const expandOptions = () => {
+  expandOptionsModelValue.value = !expandOptionsModelValue.value;
+  if (props.onExpand && typeof props.onExpand === 'function') {
+    props.onExpand({
+      value: modelValue.value,
+      expand: expandOptionsModelValue.value,
+      form: props['form'],
+    });
+  }
+}
 
 const lightLabelComputed = computed(() => {
   if (props.lightNotHideOptionsLabel && !props.hideOptions) {