update: 更新

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/widgets/form-detail/form-button.hbs

@@ -7,7 +7,7 @@
     style="{{#if item.width}}width: {{item.width}}px;{{/if}}{{#if item.height}}height: {{item.height}}px;{{/if}}">
     {{#if item.psSysImage}}
     <template #icon>
-      <IbizIconText {{#if item.psSysImage.cssClass}}:iconClass="{{item.psSysImage.cssClass}}"{{/if}} {{#if item.psSysImage.imagePath}}:imgPath="{{item.psSysImage.imagePath}}"{{/if}}/>
+      <AppIconText {{#if item.psSysImage.cssClass}}:iconClass="{{item.psSysImage.cssClass}}"{{/if}} {{#if item.psSysImage.imagePath}}:imgPath="{{item.psSysImage.imagePath}}"{{/if}}/>
     </template>
     {{/if}}
     {{#if item.showCaption}}
@@ -25,7 +25,7 @@
     style="{{#if item.width}}width: {{item.width}}px;{{/if}}{{#if item.height}}height: {{item.height}}px;{{/if}}">
     {{#if item.psSysImage}}
     <template #icon>
-      <IbizIconText {{#if item.psSysImage.cssClass}}:iconClass="{{item.psSysImage.cssClass}}"{{/if}} {{#if item.psSysImage.imagePath}}:imgPath="{{item.psSysImage.imagePath}}"{{/if}}/>
+      <AppIconText {{#if item.psSysImage.cssClass}}:iconClass="{{item.psSysImage.cssClass}}"{{/if}} {{#if item.psSysImage.imagePath}}:imgPath="{{item.psSysImage.imagePath}}"{{/if}}/>
     </template>
     {{/if}}
     {{#if item.showCaption}}

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/widgets/form-detail/form-group-panel.hbs

 {{#eq item.psLayoutPos 'FLEX'}}
 <div style="flex-grow: {{#if item.psLayoutPos.grow}}{{item.psLayoutPos.grow}}{{else}}0{{/if}};">
-  <IbizFormGroup 
+  <AppFormGroup 
     v-show="state.detailsModel.{{item.codeName}}.visible" 
     name="{{item.codeName}}" 
     title="{{item.caption}}"
@@ -31,7 +31,7 @@
 {{else}}
 <a-col
 {{> @macro/front-end/widgets/common/layout-pos.hbs item=item.psLayoutPos}} >
-  <IbizFormGroup 
+  <AppFormGroup 
     v-show="state.detailsModel.{{item.codeName}}.visible" 
     name="{{item.codeName}}" 
     title="{{item.caption}}"

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/widgets/form-detail/form-rawitem.hbs

 {{#eq item.psLayoutPos 'FLEX'}}
 <div style="flex-grow: {{#if item.psLayoutPos.grow}}{{item.psLayoutPos.grow}}{{else}}0{{/if}};">
-  <IbizRaw 
+  <AppRaw 
     v-show="state.detailsModel.{{item.codeName}}.visible"
     {{#if item.psSysCss}}class="{{item.psSysCss.cssName}}"{{/if}}
     {{#if item.psSysImage}}{{#if item.psSysImage.cssClass}}iconClass="{{item.psSysImage.cssClass}}"{{/if}}{{#if item.psSysImage.imagePath}}imgPath="{{item.psSysImage.imagePath}}"{{/if}}{{/if}}
@@ -11,7 +11,7 @@
 {{else}}
 <a-col
 {{> @macro/front-end/widgets/common/layout-pos.hbs item=item.psLayoutPos}} >
-  <IbizRaw 
+  <AppRaw 
     v-show="state.detailsModel.{{item.codeName}}.visible"
     {{#if item.psSysCss}}class="{{item.psSysCss.cssName}}"{{/if}}
     {{#if item.psSysImage}}{{#if item.psSysImage.cssClass}}iconClass="{{item.psSysImage.cssClass}}"{{/if}}{{#if item.psSysImage.imagePath}}imgPath="{{item.psSysImage.imagePath}}"{{/if}}{{/if}}

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/widgets/grid-detail/grid-column.hbs

@@ -24,7 +24,7 @@
   </div>
     {{/if}}
   {{else if (eq item.columnType 'UAGRIDCOLUMN')}}
-  <ibizToolbar
+  <AppToolbar
     mode="link"
     name="{{lowerCase item.codeName}}"
     :actionModel="record.{{lowerCase item.codeName}}"

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

@@ -51,7 +51,7 @@ const emit = defineEmits<EditorEmit>();
     </div>
     <div v-else-if="Object.is(contentType, 'HTML')" v-html="value" />
     <div v-else-if="Object.is(contentType, 'IMAGE')">
-      <IbizIconText :iconClass="iconClass" :imgPath="imgPath"/>
+      <AppIconText :iconClass="iconClass" :imgPath="imgPath"/>
     </div>
   </div>
 </template>

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

@@ -8,6 +8,7 @@
       <slot name="caption" />
     </template>
     <template v-slot:header-right>
+      <slot name="quickSearch" />
       <slot name="toolbar" />
     </template>
     <template v-slot:header-bottom>

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

@@ -40,7 +40,7 @@ const handleMenuGroupAction = ($event: IParam) => {
     :bordered="false">
     <template v-if="showCaption" #title>
       <p :class="['app-form-group-title', `${titleStyle}`]">
-        <IbizIconText :iconClass="iconClass" :imgPath="imgPath" :text="title"/>
+        <AppIconText :iconClass="iconClass" :imgPath="imgPath" :text="title"/>
       </p>
     </template>
     <template v-if="showCaption" #extra>
@@ -57,7 +57,7 @@ const handleMenuGroupAction = ($event: IParam) => {
                     v-if="item.visible"
                     :key="item.uIActionTag"
                     :disabled="item.disabled">
-                      <IbizIconText 
+                      <AppIconText 
                         :iconClass="item.showIcon && item.iconClass" 
                         :imgPath="item.showIcon && item.imgPath" 
                         :text="item.showCaption && item.caption"/>
@@ -75,7 +75,7 @@ const handleMenuGroupAction = ($event: IParam) => {
                 type="link"
                 :disabled="item.disabled"
                 @click="handleGroupAction(item)">
-                  <IbizIconText 
+                  <AppIconText 
                     :iconClass="item.showIcon && item.iconClass" 
                     :imgPath="item.showIcon && item.imgPath" 
                     :text="item.showCaption && item.caption"/>

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

@@ -14,7 +14,7 @@ const props = withDefaults(defineProps<Props>(), {
     <template v-if="!item.items">
       <a-menu-item v-if="!item.hidden" :key="item.name" class="ibiz-menu-item">
         <template #icon>
-          <IbizIconText :iconClass="item.iconClass" :imgPath="item.imgPath" :text="collapsed && item.caption[0]"/>
+          <AppIconText :iconClass="item.iconClass" :imgPath="item.imgPath" :text="collapsed && item.caption[0]"/>
         </template>
         \{{item.caption}}
       </a-menu-item>
@@ -22,10 +22,10 @@ const props = withDefaults(defineProps<Props>(), {
     <template v-else>
       <a-sub-menu v-if="!item.hidden" :key="item.name" class="ibiz-menu-item">
         <template #icon>
-          <IbizIconText :iconClass="item.iconClass" :imgPath="item.imgPath" :text="collapsed && item.caption[0]"/>
+          <AppIconText :iconClass="item.iconClass" :imgPath="item.imgPath" :text="collapsed && item.caption[0]"/>
         </template>
         <template #title>\{{item.caption}}</template>
-        <IbizMenuItem :items="item.items" />
+        <AppMenuItem :items="item.items" />
       </a-sub-menu>
     </template>
   </template>

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

@@ -48,7 +48,7 @@ const itemClick = (item: IParam) => {
           :disabled="item.disabled"
           @click="itemClick(item)"
         >
-          <IbizIconText 
+          <AppIconText 
           :text="item.showCaption && item.caption"  
           :iconClass="item.showIcon && item.iconClass" 
           :imgPath="item.showIcon && item.imgPath"/>
@@ -67,7 +67,7 @@ const itemClick = (item: IParam) => {
               :disabled="childItem.disabled"
               @click="itemClick(childItem)"
             >
-              <IbizIconText 
+              <AppIconText 
                 :text="item.showCaption && item.caption"  
                 :iconClass="item.showIcon && item.iconClass" 
                 :imgPath="item.showIcon && item.imgPath"/>
@@ -90,7 +90,7 @@ const itemClick = (item: IParam) => {
           type="link"
           @click="itemClick(item)"
         >
-          <IbizIconText 
+          <AppIconText 
           :text="item.showCaption && item.caption"  
           :iconClass="item.showIcon && item.iconClass" 
           :imgPath="item.showIcon && item.imgPath"/>

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

@@ -77,7 +77,7 @@ const dropdownList = [
     <span class="user-name">\{{ user.name }}</span>
     <a-dropdown>
       <a-avatar size="large" :src="user.avatar" @click.prevent>
-        <template #icon><IbizIconText iconClass="fa fa-user-o"></IbizIconText></template>
+        <template #icon><AppIconText iconClass="fa fa-user-o"></AppIconText></template>
         <DownOutlined />
       </a-avatar>
       <template #overlay>

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

-// 视图样式汇总
\ No newline at end of file
+// 视图样式汇总
+@use './view-base.scss';
\ No newline at end of file

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

+.app-quick-search {
+  display: flex;
+  align-items: center;
+}
\ No newline at end of file

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

@@ -52,7 +52,7 @@ const collapsedChange = () => {
       </div>
     </template>
     <template #user>
-        <IbizUser/>
+        <AppUser/>
     </template>
     <template #menu>
       <{{#page.ctrls}}{{#eq controlType "APPMENU"}}{{codeName}}Menu{{/eq}}{{/page.ctrls}}

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

 <script setup lang="ts">
 import { Subject } from 'rxjs';
+import { FilterOutlined } from '@ant-design/icons-vue';
 import { GridView, IActionParam, IParam, IContext } from '@core';
 import { ViewConfig } from './{{spinalCase page.codeName}}-config';
 {{#page.ctrls}}
@@ -52,6 +53,25 @@ const { state, grid, handleCtrlEvent, handleToolbarEvent } = new GridView(ViewCo
     </template>
     {{/eq}}
     {{#eq controlType "SEARCHFORM"}}
+    {{#if page.enableFilter}}
+    <template v-slot:quickSearch>
+      <div class='app-quick-search'>
+      <a-input />
+      <a-popover>
+        <template #content>
+          <{{codeName}}SearchForm
+            :context="state.context"
+            :viewParams="state.viewParams"
+            :controlAction="state.{{camelCase name}}.action"
+            :viewSubject="state.viewSubject"
+            @ctrlEvent="handleCtrlEvent"
+          ></{{codeName}}SearchForm>
+        </template>
+        <a-button trigger="click"><filter-outlined /></a-button>
+      </a-popover>
+      </div>
+    </template>
+    {{else}}
     <template v-slot:searchForm>
       <{{codeName}}SearchForm
       :context="state.context"
@@ -61,6 +81,7 @@ const { state, grid, handleCtrlEvent, handleToolbarEvent } = new GridView(ViewCo
       @ctrlEvent="handleCtrlEvent"
     ></{{codeName}}SearchForm>
     </template>
+    {{/if}}
     {{/eq}}
     {{#eq controlType "GRID"}}
     <{{codeName}}Grid