update: 选择视图、选择表格视图串通逻辑、UI绘制快速分组等

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/components/layout/app-pickup-grid-view-layout.vue

@@ -4,14 +4,21 @@
 
 <template>
   <AppViewBaseLayout>
+    <template v-slot:header-top>
+      <slot name="topMessage" />
+    </template>    
     <template v-slot:header-left>
       <slot name="caption" />
     </template>
+    <template v-slot:header-content>
+      <slot name="quickGroupSearch" />
+      <slot name="quickSearch" />
+    </template>    
     <template v-slot:header-right>
       <slot name="toolbar" />
     </template>
     <template v-slot:header-bottom>
-      <slot name="topMessage" />
+      <slot name="quickSearchForm" />
       <slot name="searchForm" />
     </template>
     <template v-slot:body-top>

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/core/modules/views/pickup-grid-view/pickup-grid-view.ts

-import { IActionParam } from "@core";
-import { PickupView } from "../pickup-view";
+import { IActionParam, IParam } from "@core";
+import { MDView } from "../md-view";
 import { PickupGridViewProps } from "./pickup-grid-view-prop";
 import { PickupGridViewState } from "./pickup-grid-view-state";
 
@@ -9,7 +9,7 @@ import { PickupGridViewState } from "./pickup-grid-view-state";
  * @class PickupGridView
  * @extends {MainView}
  */
-export class PickupGridView extends PickupView {
+export class PickupGridView extends MDView {
 
   /**
    * @description 视图状态
@@ -18,6 +18,24 @@ export class PickupGridView extends PickupView {
    */
   public declare state: PickupGridViewState;
 
+  /**
+   * 当前视图表格部件
+   *
+   * @type {IParam}
+   * @memberof PickupGridView
+   */
+  public declare grid: IParam;
+
+  /**
+   * @description 处理视图初始化
+   *
+   * @memberof PickupGridView
+   */
+  public useViewInit() {
+    super.useViewInit();
+    // 初始化搜索表格引用
+    this.grid = ref(null);
+  }
 
   /**
    * @description 使用加载功能模块
@@ -31,7 +49,6 @@ export class PickupGridView extends PickupView {
     })
   }
 
-
   /**
    * 部件事件
    *
@@ -44,11 +61,19 @@ export class PickupGridView extends PickupView {
       return;
     }
     if (action === 'selectionChange') {
-      this.selectData = data;
       this.emit('viewEvent', actionParam)
     }
   }
 
+  /**
+   *  获取多数据部件
+   *
+   * @return {*}  {*}
+   * @memberof PickupGridView
+   */
+  public getMDCtrl(): any {
+    return unref(this.grid);
+  }
 
   /**
    * @description 安装视图所有功能模块的方法
@@ -60,7 +85,8 @@ export class PickupGridView extends PickupView {
   public moduleInstall() {
     const superParams = super.moduleInstall();
     return {
-      ...superParams
+      ...superParams,
+      grid: this.grid      
     };
   }
 }
\ No newline at end of file

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/core/modules/views/pickup-view/pickup-view.ts

@@ -73,6 +73,7 @@ export class PickupView extends MainView {
     const superParams = super.moduleInstall();
     return {
       ...superParams,
+      selectData:this.selectData,      
       onCancel: this.onCancel.bind(this),
       onConfirm: this.onConfirm.bind(this)
     };

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/core/modules/widgets/grid-control/grid-control.ts

@@ -55,16 +55,16 @@ export class GridControl extends MDControl {
                     if (!rowEditState) {
                         selectedRowKeys.value = [record.srfkey];
                         if (!record.children) {
-                            this.emit("ctrlEvent", { tag: this.props.name, action: "selectionChange", data: [deepCopy(record)] })
+                            this.emit("ctrlEvent", { tag: 'grid', action: "selectionChange", data: [deepCopy(record)] })
                             if (Object.is(rowActiveMode, 1)) {
-                                this.emit("ctrlEvent", { tag: this.props.name, action: "rowClick", data: [deepCopy(record)] })
+                                this.emit("ctrlEvent", { tag: 'grid', action: "rowClick", data: [deepCopy(record)] })
                             }
                         }
                     }
                 },
                 onDblclick: () => {
                     if (!record.children && Object.is(rowActiveMode, 2)) {
-                        this.emit("ctrlEvent", { tag: this.props.name, action: "rowDbClick", data: [deepCopy(record)] })
+                        this.emit("ctrlEvent", { tag: 'grid', action: "rowDbClick", data: [deepCopy(record)] })
                     }
                 }
             };
@@ -87,7 +87,7 @@ export class GridControl extends MDControl {
                             selection.push(select);
                         }
                     })
-                    this.emit("ctrlEvent", { tag: this.props.name, action: "selectionChange", data: selection })
+                    this.emit("ctrlEvent", { tag: 'grid', action: "selectionChange", data: selection })
                 },
             };
         });
@@ -191,7 +191,7 @@ export class GridControl extends MDControl {
         } else if (selectFirstDefault) {
             if (items && items.length > 0) {
                 this.emit("ctrlEvent", {
-                    tag: this.props.name,
+                    tag: 'grid',
                     action: "selectionChange",
                     data: [deepCopy(items[0])],
                 });

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/core/modules/widgets/pickup-view-panel-control/pickup-view-panel-control.ts

@@ -28,7 +28,7 @@ export class PickupViewPanelControl extends MainControl {
     if (viewSubject) {
       let subscription = viewSubject.subscribe(({ tag, action, data }: IActionParam) => {
         if (Object.is(controlName, tag) && Object.is("load", action)) {
-
+          viewSubject.next({ tag: tag, action: "load", data: data });
         }
       })
       // 部件卸载时退订viewSubject
@@ -62,6 +62,7 @@ export class PickupViewPanelControl extends MainControl {
     const superParams = super.moduleInstall();
     return {
       ...superParams,
+      load:this.useLoad.bind(this),      
       onViewEvent: this.onViewEvent.bind(this)
     };
   }

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

 export const viewState = {
+  enableQuickSearch: {{#if page.enableQuickSearch}}{{page.enableQuickSearch}}{{else}}false{{/if}},
+  expandSearchForm: {{#if page.expandSearchForm}}{{page.expandSearchForm}}{{else}}false{{/if}},  
 {{> @macro/front-end/views/view-base-config.hbs}}
 };
\ No newline at end of file

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

@@ -4,10 +4,18 @@ import { PickupGridView, IActionParam, IParam, IContext } from '@core';
 import { viewState } from './{{spinalCase page.codeName}}-state';
 //  todo 表格部件拿不到目前导入固定表格
 import { MainGrid } from '@widgets/chart-data/main-grid';
+import { DefaultSearchForm } from '@widgets/chart-data/default-search-form';
+
 {{#each page.controls as |control|}}
-     {{#if (eq control.controlType 'GRID') }}
+{{#if (eq control.controlType 'GRID') }}
 import { {{control.codeName}}Grid } from '@widgets/{{spinalCase appEntity.codeName}}/{{spinalCase codeName}}-grid';
-     {{/if}}
+{{/if}}
+{{#if (and (eq controlType "SEARCHFORM") (eq name 'searchform'))}}
+import { {{codeName}}SearchForm } from '@widgets/{{spinalCase appEntity.codeName}}/{{spinalCase codeName}}-search-form';
+{{/if}}
+{{#if (and (eq controlType "SEARCHFORM") (eq name 'quicksearchform'))}}
+import { {{codeName}}QuickSearchForm } from '@widgets/{{spinalCase appEntity.codeName}}/{{spinalCase codeName}}-quick-search-form';
+{{/if}}     
 {{/each}}
 
 
@@ -17,6 +25,7 @@ interface Props {
   viewParams?: IParam;
   openType?: "ROUTE" | "MODAL" | "EMBED";
   viewSubject?: Subject<IActionParam>;
+  selectedData?: string;    
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -32,7 +41,7 @@ interface ViewEmit {
 const emit = defineEmits<ViewEmit>();
 
 // 安装功能模块，提供状态和能力方法
-const { state, confirm, onCtrlEvent } = new PickupGridView(viewState, props, emit).moduleInstall();
+const { state, grid, onCtrlEvent, onQuickGroupEvent, onQuickSearchEvent } = new PickupGridView(viewState, props, emit).moduleInstall();
 </script>
 
 <template>
@@ -41,8 +50,53 @@ const { state, confirm, onCtrlEvent } = new PickupGridView(viewState, props, emi
       <AppIconText class="app-view__caption" size="large" :text="state.viewCaption" />
     </template>
     {{#page.ctrls}}
+    {{#if (and (eq controlType "SEARCHFORM") (eq name 'searchform'))}}
+    {{#if page.enableFilter}}
+    <template v-slot:quickSearch>
+      <div class='app-quick-search'>
+      <a-input v-if="state.enableQuickSearch" @pressEnter="onQuickSearchEvent($event)" allowClear/>
+      <a-popover trigger="click" :overlayStyle="{width: '50%'}">
+        <template #content>
+          <{{codeName}}SearchForm
+            v-if="state.expandSearchForm"
+            :context="state.context"
+            :viewParams="state.viewParams"
+            :controlAction="state.{{camelCase name}}.action"
+            :viewSubject="state.viewSubject"
+            @ctrlEvent="onCtrlEvent"
+          ></{{codeName}}SearchForm>
+        </template>
+        <a-button><filter-outlined /></a-button>
+      </a-popover>
+      </div>
+    </template>
+    {{else}}
+    <template v-slot:searchForm>
+      <{{codeName}}SearchForm
+      v-if="state.expandSearchForm"
+      :context="state.context"
+      :viewParams="state.viewParams"
+      :controlAction="state.{{camelCase name}}.action"
+      :viewSubject="state.viewSubject"
+      @ctrlEvent="onCtrlEvent"
+    ></{{codeName}}SearchForm>
+    </template>
+    {{/if}}
+    {{/if}}
+    {{#if (and (eq controlType "SEARCHFORM") (eq name 'quicksearchform'))}}
+    <template v-slot:quickSearchForm>
+    <{{codeName}}QuickSearchForm
+      :context="state.context"
+      :viewParams="state.viewParams"
+      :controlAction="state.{{camelCase name}}.action"
+      :viewSubject="state.viewSubject"
+      @ctrlEvent="onCtrlEvent"
+    ></{{codeName}}QuickSearchForm>
+    </template>
+    {{/if}}    
     {{#eq controlType "GRID"}}
     <{{codeName}}Grid
+      ref="grid"
       :context="state.context"
       :multiple="false"
       :rowEditState="state.rowEditState"
@@ -51,6 +105,7 @@ const { state, confirm, onCtrlEvent } = new PickupGridView(viewState, props, emi
       :viewParams="state.viewParams"
       :controlAction="state.{{name}}.action"
       :viewSubject="state.viewSubject"
+      @ctrlEvent="onCtrlEvent"     
     ></{{codeName}}Grid>
     {{/eq}}
     {{/page.ctrls}}

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

@@ -28,7 +28,7 @@ interface ViewEmit {
 const emit = defineEmits<ViewEmit>();
 
 // 安装功能模块，提供状态和能力方法
-const { state, onCancel, onConfirm, onCtrlEvent } = new PickupView(viewState, props, emit).moduleInstall();
+const { state, onCancel, onConfirm, onCtrlEvent, selectData } = new PickupView(viewState, props, emit).moduleInstall();
 </script>
 
 <template>
@@ -55,6 +55,7 @@ const { state, onCancel, onConfirm, onCtrlEvent } = new PickupView(viewState, pr
               :viewParams="state.viewParams"
               :controlAction="state.{{name}}.action"
               :viewSubject="state.viewSubject"
+              :selectData="selectData"                   
               @onCtrlEvent="onCtrlEvent"
             ></{{codeName}}PickupViewPanel>
             {{/eq}}

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/widgets/{{appEntities}}/{{ctrls@PICKUPVIEWPANEL}}-pickup-view-panel/{{ctrls@PICKUPVIEWPANEL}}-pickup-view-panel.vue.hbs

@@ -33,7 +33,7 @@ interface CtrlEmit {
 const emit = defineEmits <CtrlEmit> ();
 
 // 安装功能模块，提供状态和能力方法
-const { state } = new PickupViewPanelControl(ctrlState, props, emit).moduleInstall();
+const { state, onViewEvent } = new PickupViewPanelControl(ctrlState, props, emit).moduleInstall();
 
 // 暴露内部状态及能力
 defineExpose({ state, name: '{{ctrl.name}}' });
@@ -46,6 +46,8 @@ defineExpose({ state, name: '{{ctrl.name}}' });
     <{{ctrl.embeddedPSAppDEView.codeName}}
       :isShowButton="state.isShowButton" 
       :selectedData="state.selectedData"
+      :viewSubject="state.viewSubject"
+      @viewEvent="onViewEvent"      
     />
     {{else}}
     <div class="app-pickup-view-panel--empty">视图不存在，请配置选择视图</div>