update：命名标准---u1

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

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

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/components/render/app-toolbar.vue

@@ -18,7 +18,7 @@ interface ToolbarProps {
   actionModel: IParam[];
 }
 interface toolbarEmit {
-  (name: "toolbarEvent", value: IActionParam): void;
+  (name: "onToolbarEvent", value: IActionParam): void;
 }
 const props = withDefaults(defineProps<ToolbarProps>(), {
   mode: 'button',
@@ -26,7 +26,7 @@ const props = withDefaults(defineProps<ToolbarProps>(), {
 const emit = defineEmits<toolbarEmit>();
 const items: Ref<IParam[]> = ref(props.actionModel || []);
 const itemClick = (item: IParam) => {
-  emit("toolbarEvent", {
+  emit("onToolbarEvent", {
     tag: props.name,
     action: "toolbarEvent",
     data: item,

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

@@ -69,7 +69,7 @@ export class MDView extends MainView {
   public handleCtrlEvent(actionParam: IActionParam) {
     const { tag, action, data } = actionParam;
     if (Object.is(tag, 'searchform')) {
-      this.searchFormEvent(action, data);
+      this.handleSearchFormEvent(action, data);
     }
   }
 
@@ -80,7 +80,7 @@ export class MDView extends MainView {
    * @param {*} [args={}]
    * @memberof MDView
    */
-  public searchFormEvent(eventName: string, args: any = {}): void {
+  public handleSearchFormEvent(eventName: string, args: any = {}): void {
     if (Object.is(eventName, 'load')) {
       this.onSearchFormLoad(args);
     }

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

@@ -54,7 +54,7 @@ export class FormControl extends MainControl {
    * @param {*} value 表单项值
    * @memberof FormControl
    */
-  public formDataChange(name: string, value: any) {
+  public handleFormDataChange(name: string, value: any) {
     const { enableAutoSave } = this.state;
     const { data } = toRefs(this.state);
     data.value[name] = value;
@@ -75,9 +75,9 @@ export class FormControl extends MainControl {
     const { detailsModel } = this.state;
     Object.values(detailsModel).forEach((item: IParam) => {
       if (item.resetItemName && Object.is(name, item.resetItemName)) {
-        this.formDataChange(item.name, null);
+        this.handleFormDataChange(item.name, null);
         if (item.valueItemName) {
-          this.formDataChange(item.valueItemName, null);
+          this.handleFormDataChange(item.valueItemName, null);
         }
       }
     })
@@ -609,7 +609,7 @@ export class FormControl extends MainControl {
     const { tag, action, data } = actionParam;
     switch (action) {
       case 'valueChange':
-        this.formDataChange(tag, data);
+        this.handleFormDataChange(tag, data);
         break;
       default:
         break;

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

@@ -33,7 +33,7 @@ export class GridControl extends MDControl {
         const { controlName, selectFirstDefault, rowEditState, rowActiveMode } = this.state;
         const { selectedRowKeys } = toRefs(this.state);
         // 滚动条配置
-        const scrollOption = computed(() => {
+        const useScrollOption = computed(() => {
             return {
                 scrollToFirstRowOnChange: true,
                 x: '110%',
@@ -41,15 +41,15 @@ export class GridControl extends MDControl {
             }
         });
         // 指定表格行key
-        const rowKey = (record: IParam) => {
+        const useRowKey = (record: IParam) => {
             return record.srfkey;
         }
         // 表格行样式
-        const rowClassName = (record: IParam, index: number) => {
+        const useRowClassName = (record: IParam, index: number) => {
             return index % 2 === 1 ? "table-striped" : null;
         }
         // 表格行自定义
-        const customRow = (record: IParam, index: number) => {
+        const useCustomRow = (record: IParam, index: number) => {
             return {
                 onClick: () => {
                     if (!rowEditState) {
@@ -70,7 +70,7 @@ export class GridControl extends MDControl {
             };
         }
         // 表格选择功能配置
-        const rowSelectionOption = computed(() => {
+        const useRowSelectionOption = computed(() => {
             if (selectFirstDefault) {
                 return false;
             }
@@ -91,23 +91,23 @@ export class GridControl extends MDControl {
             };
         });
         // 列拖动
-        const resizeColumn = (width: number, column: IParam) => {
+        const handleResizeColumn = (width: number, column: IParam) => {
             column.width = width;
         }
         // 处理表格变化（分页，过滤，排序）
-        const onGridChange = (pagination: IParam, filters: IParam, sorter: IParam, data: IParam) => {
+        const handleGridChange = (pagination: IParam, filters: IParam, sorter: IParam, data: IParam) => {
             if (pagination) {
                 this.useLoad().load();
             }
         }
         return {
-            scrollOption,
-            rowKey,
-            rowClassName,
-            customRow,
-            rowSelectionOption,
-            resizeColumn,
-            onGridChange
+            useScrollOption,
+            useRowKey,
+            useRowClassName,
+            useCustomRow,
+            useRowSelectionOption,
+            handleResizeColumn,
+            handleGridChange
         }
     }
 
@@ -431,7 +431,7 @@ export class GridControl extends MDControl {
         const superParams = super.moduleInstall();
         return {
             ...superParams,
-            custom: this.useCustom()
+            useCustom: this.useCustom()
         };
     }
 }

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

@@ -21,7 +21,7 @@ export class QuickSearchFormControl extends FormControl {
    */
    public handleEditorEvent(actionParam: IActionParam) {
     super.handleEditorEvent(actionParam);
-    this.emit("ctrlEvent", {
+    this.emit("onCtrlEvent", {
       tag: this.state.controlName,
       action: "selectionChange",
       data: this.state.data,
@@ -39,8 +39,6 @@ export class QuickSearchFormControl extends FormControl {
     const { loadDraft } = this.useLoadDraft();
     return {
       ...superParams,
-      loadDraft,
-      handleEditorEvent: this.handleEditorEvent.bind(this),
     };
   }
 }

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

@@ -20,7 +20,7 @@ export class SearchFormControl extends FormControl {
    */
   public onSearch() {
     const { controlName } = this.state;
-    this.emit("ctrlEvent", {
+    this.emit("onCtrlEvent", {
       tag: controlName,
       action: "selectionChange",
       data: this.state.data,
@@ -78,13 +78,10 @@ export class SearchFormControl extends FormControl {
     const { loadDraft } = this.useLoadDraft();
     return {
       ...superParams,
-      loadDraft,
       onSearch: this.onSearch.bind(this),
       onCancel: this.onCancel.bind(this),
       addHistoryItem: this.addHistoryItem.bind(this),
       removeHistoryItem: this.removeHistoryItem.bind(this),
-      handleEditorEvent: this.handleEditorEvent.bind(this),
-      handleComponentEvent: this.handleComponentEvent.bind(this),
     };
   }
 }

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/style/components/layout/app-view-base-layout.scss

@@ -12,14 +12,15 @@
   flex-direction: column;
   padding: 0 10px;
   background-color: var(--app-view-layout-header-bg-color);
+  border-bottom: 1px solid var(--app-view-layout-header-border-bottom);
 }
 .app-view-layout__header-content {
   display: flex;
   justify-content: space-between;
   height: var(--app-view-layout-header-height);
-  border-bottom: 1px solid var(--app-view-layout-header-border-bottom);
   margin: --app-view-layout-header-padding;
   .app-view__caption {
+    white-space: nowrap;
     font-size: var(--app-view-caption-font-size);
   }
 }

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/style/views/view-base.scss

 .app-view-layout--default {
-  .app-view-layout__header {
-    .app-view-layout__header-content {
-      white-space: nowrap;
-    }
-  }
   .app-quick-search {
     display: flex;
     align-items: center;
   }
+  .app-quick-search-form {
+    padding-top: 12px;
+  }
 }
\ No newline at end of file

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

@@ -23,7 +23,7 @@ const props = withDefaults(defineProps<Props>(), {
 
 // emit声明
 interface ViewEmit {
-  (name: "viewEvent", value: IActionParam): void;
+  (name: "onViewEvent", value: IActionParam): void;
 }
 
 const emit = defineEmits<ViewEmit>();
@@ -51,7 +51,7 @@ const { state, form, handleToolbarEvent } = new EditView(viewState, props, emit)
         mode="button"
         name="{{lowerCase codeName}}"
         :actionModel="state.toolbar"
-        @toolbarEvent="handleToolbarEvent"/>
+        @onToolbarEvent="handleToolbarEvent"/>
     </template>
     {{/eq}}
     {{#eq controlType "FORM"}}

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

@@ -30,13 +30,13 @@ const props = withDefaults(defineProps<Props>(), {
 
 // emit声明
 interface ViewEmit {
-  (name: "viewEvent", value: IActionParam): void;
+  (name: "onViewEvent", value: IActionParam): void;
 }
 
 const emit = defineEmits<ViewEmit>();
 
 // 安装功能模块，提供状态和能力方法
-const { state, grid, handleCtrlEvent, handleToolbarEvent, onSearchFormSearch } = new GridView(viewState, props, emit).moduleInstall();
+const { state, grid, handleCtrlEvent, handleToolbarEvent } = new GridView(viewState, props, emit).moduleInstall();
 
 </script>
 
@@ -52,14 +52,14 @@ const { state, grid, handleCtrlEvent, handleToolbarEvent, onSearchFormSearch } =
         mode="button"
         name="{{lowerCase codeName}}"
         :actionModel="state.toolbar"
-        @toolbarEvent="handleToolbarEvent"/>
+        @onToolbarEvent="handleToolbarEvent"/>
     </template>
     {{/eq}}
     {{#if (and (eq controlType "SEARCHFORM") (eq name 'searchform'))}}
     {{#if page.enableFilter}}
     <template v-slot:quickSearch>
       <div class='app-quick-search'>
-      <a-input @click="onSearchFormSearch"/>
+      <a-input/>
       <a-popover trigger="click" :overlayStyle="{width: '50%'}">
         <template #content>
           <{{codeName}}SearchForm
@@ -67,7 +67,7 @@ const { state, grid, handleCtrlEvent, handleToolbarEvent, onSearchFormSearch } =
             :viewParams="state.viewParams"
             :controlAction="state.{{camelCase name}}.action"
             :viewSubject="state.viewSubject"
-            @ctrlEvent="handleCtrlEvent"
+            @onCtrlEvent="handleCtrlEvent"
           ></{{codeName}}SearchForm>
         </template>
         <a-button><filter-outlined /></a-button>
@@ -81,7 +81,7 @@ const { state, grid, handleCtrlEvent, handleToolbarEvent, onSearchFormSearch } =
       :viewParams="state.viewParams"
       :controlAction="state.{{camelCase name}}.action"
       :viewSubject="state.viewSubject"
-      @ctrlEvent="handleCtrlEvent"
+      @onCtrlEvent="handleCtrlEvent"
     ></{{codeName}}SearchForm>
     </template>
     {{/if}}
@@ -93,7 +93,7 @@ const { state, grid, handleCtrlEvent, handleToolbarEvent, onSearchFormSearch } =
       :viewParams="state.viewParams"
       :controlAction="state.{{camelCase name}}.action"
       :viewSubject="state.viewSubject"
-      @ctrlEvent="handleCtrlEvent"
+      @onCtrlEvent="handleCtrlEvent"
     ></{{codeName}}QuickSearchForm>
     </template>
     {{/if}}
@@ -107,7 +107,7 @@ const { state, grid, handleCtrlEvent, handleToolbarEvent, onSearchFormSearch } =
       :viewParams="state.viewParams"
       :controlAction="state.{{name}}.action"
       :viewSubject="state.viewSubject"
-      @ctrlEvent="handleCtrlEvent"
+      @onCtrlEvent="handleCtrlEvent"
     ></{{codeName}}Grid>
     {{/eq}}
     {{/page.ctrls}}

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/widgets/{{appEntities}}/{{ctrls@FORM}}-form/{{ctrls@FORM}}-form.vue.hbs

@@ -19,7 +19,7 @@ const props = withDefaults(defineProps < Props > (), {
 
 // emit声明
 interface CtrlEmit {
-  (name: "ctrlEvent", value: IActionParam): void;
+  (name: "onCtrlEvent", value: IActionParam): void;
 }
 
 const emit = defineEmits < CtrlEmit > ();

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/widgets/{{appEntities}}/{{ctrls@GRID}}-grid/{{ctrls@GRID}}-grid.vue.hbs

@@ -27,11 +27,11 @@ const props = withDefaults(defineProps < Props > (), {
 })
 
 // emit声明
-const emit = defineEmits<{(event: 'ctrlevent', value: IActionParam): void;}>();
+const emit = defineEmits<{(event: 'onCtrlevent', value: IActionParam): void;}>();
 
 // 安装功能模块，提供状态和能力
-const { state, custom } = new GridControl(ctrlState, props, emit).moduleInstall();
-const { scrollOption, rowKey, rowClassName, customRow, rowSelectionOption, resizeColumn, onGridChange } = custom;
+const { state, useCustom } = new GridControl(ctrlState, props, emit).moduleInstall();
+const { useScrollOption, useRowKey, useRowClassName, useCustomRow, useRowSelectionOption, handleResizeColumn, handleGridChange } = useCustom;
 
 // 暴露内部状态及能力
 defineExpose({ state, name: '{{ctrl.name}}' });
@@ -51,8 +51,8 @@ defineExpose({ state, name: '{{ctrl.name}}' });
     :pagination="state.mdCtrlPaging.pagination"
     :customRow="customRow"
     :rowClassName="rowClassName"
-    @change="onGridChange"
-    @resizeColumn="resizeColumn"
+    @change="handleGridChange"
+    @resizeColumn="handleResizeColumn"
   >
     <template #emptyText>
       <div class="not-data">

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/widgets/{{appEntities}}/{{ctrls@QUICKSEARCHFORM}}-quick-search-form/{{ctrls@QUICKSEARCHFORM}}-quick-search-form.vue.hbs

@@ -20,7 +20,7 @@ const props = withDefaults(defineProps<Props>(), {
 
 // emit声明
 interface CtrlEmit {
-  (name: "ctrlEvent", value: IActionParam): void;
+  (name: "onCtrlEvent", value: IActionParam): void;
 }
 
 const emit = defineEmits<CtrlEmit>();

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/widgets/{{appEntities}}/{{ctrls@SEARCHFORM}}-search-form/{{ctrls@SEARCHFORM}}-search-form.vue.hbs

@@ -20,7 +20,7 @@ const props = withDefaults(defineProps<Props>(), {
 
 // emit声明
 interface CtrlEmit {
-  (name: "ctrlEvent", value: IActionParam): void;
+  (name: "onCtrlEvent", value: IActionParam): void;
 }
 
 const emit = defineEmits<CtrlEmit>();