Merge remote-tracking branch 'origin/master'

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/views/{{appModules}}/{{pages@DEPICKUPGRIDVIEW}}/{{pages@DEPICKUPGRIDVIEW}}.vue.hbs

 <script setup lang="ts">
 import { Subject } from 'rxjs';
+import { FilterOutlined } from '@ant-design/icons-vue';
 import { PickupGridView, IActionParam, IParam, IContext } from '@core';
 import { viewState } from './{{spinalCase page.codeName}}-state';
 //  todo 表格部件拿不到目前导入固定表格
@@ -49,6 +50,11 @@ const { state, grid, onCtrlEvent, onQuickGroupEvent, onQuickSearchEvent } = new
     <template v-slot:header-left>
       <AppIconText class="app-view__caption" size="large" :text="state.viewCaption" />
     </template>
+    {{#if page.enableQuickGroup}}
+    <template v-slot:quickGroupSearch>
+      <AppQuickGroup v-if="state.enableQuickGroup" :quickGroupModel="state.quickGroupPSCodeList" @onQuickGroupEvent="onQuickGroupEvent" />
+    </template>
+    {{/if}}    
     {{#page.ctrls}}
     {{#if (and (eq controlType "SEARCHFORM") (eq name 'searchform'))}}
     {{#if page.enableFilter}}