update: 更新

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/form-detail/form-details-model.hbs

@@ -8,6 +8,14 @@
   detailStyle: '{{formDetail.detailStyle}}',
   resetItemName: '{{formDetail.resetItemName}}',
   valueItemName: '{{formDetail.valueItemName}}',
+  {{#each formDetail.psDEFDGroupLogics as | groupLogic |}}
+  groupOP: {{groupLogic.groupOP}},
+  relatedDetailNames: {{groupLogic.relatedDetailNames}},
+  logicCat: {{groupLogic.logicCat}},
+  logicType: {{groupLogic.logicType}},
+  notMode: {{groupLogic.notMode}},
+  Logics: []
+  {{/each}}
   {{/if}}
 },
 {{#if formDetail.psDEFormDetails}}

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

@@ -17,7 +17,7 @@
   </IbizFormGroup>
 </div>
 {{else}}
-<a-col :span="24">
+{{> @macro/front-end/view/common/layout.hbs item=item}}
   <IbizFormGroup name="{{item.codeName}}" title="{{item.caption}}">
     {{#eq item.psLayout.layout "FLEX"}}
     <div class="app-form-layout-flex" style="{{#if item.psLayout.dir}}flex-direction: {{item.psLayout.dir}};{{/if}}{{#if item.psLayout.align}}justify-content: {{item.psLayout.align}};{{/if}}{{#if item.psLayout.vAlign}}align-items: {{item.psLayout.vAlign}};{{/if}}">

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/form-detail/form-item.hbs

@@ -8,7 +8,7 @@
   </IbizFormItem>
 </div>
 {{else}}
-<a-col :span="24">
+{{> @macro/front-end/view/common/layout.hbs item=item.psLayoutPos}}
   <IbizFormItem name="{{item.codeName}}" label="{{item.caption}}">
     {{#if item.psEditor}}
     {{>(lookup . 'item.psEditor.editorType') item=item ctrlType="form"}}

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/view/common/layout.hbs

+<a-col 
+:span="{{#if item.colMD}}{{item.colMD}}{{else}}24{{/if}}"
+{{!-- :offset="{{#if item.colMD}}{{item.colMD}}{{/if}}"
+:lg="{{#if item.colLG}}{{item.colLG}}{{/if}}"
+:md="{{#if item.colMD}}{{item.colMD}}{{/if}}"
+:sm="{{#if item.colSM}}{{item.colSM}}{{/if}}"
+:xs="{{#if item.xs}}{{item.xs}}{{/if}}" --}}
+>

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/view/common/viewBaseConfig.hbs

@@ -15,7 +15,7 @@
   {{#page.ctrls}}
   {{#eq controlType "TOOLBAR"}}
     {{#psDEToolbarItems}}
-    { name:'{{name}}',caption:'{{caption}}',groupExtractMode:'{{groupExtractMode}}',itemType:'{{itemType}}',noPrivDisplayMode:'{{noPrivDisplayMode}}',showIcon:{{showIcon}},showCaption:{{showCaption}},tooltip:'{{tooltip}}' },
+    { name:'{{name}}',caption:'{{caption}}',groupExtractMode:'{{groupExtractMode}}',itemType:'{{itemType}}',noPrivDisplayMode:'{{noPrivDisplayMode}}',showIcon:{{showIcon}},showCaption:{{showCaption}},tooltip:'{{tooltip}}',disabled: false, visible: true,{{#if psUIAction.psSysImage}}{{#if psUIAction.psSysImage.imagePath}} imgPath: "{{psUIAction.psSysImage.imagePath}}",{{/if}}{{#if psUIAction.psSysImage.cssClass}} iconClass: "{{psUIAction.psSysImage.cssClass}}",{{/if}}{{/if}} },
     {{/psDEToolbarItems}}
   {{/eq}}
   {{/page.ctrls}}

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

@@ -18,46 +18,50 @@ const showHeader = computed(()=> props.showHeader && (props.viewCaption ||  slot
 
 <template>
   <div class="ibiz-view-layout ibiz-view-layout--default">
-    <div v-if="showHeader" class="ibiz-view-layout__header">
+    <div class="ibiz-view-layout__header">
+        <slot name="header-top" />
       <div class="ibiz-view-layout__header-content">
-        <slot name="header">
-          <div class="ibiz-view-layout__header-left">
-            <slot name="header-left"/>
-          </div>
-          <div class="ibiz-view-layout__header-right">
-            <slot name="header-right" />
-          </div>
-        </slot>
+        <slot name="header-left" />
+        <slot name="header-content" />
+        <slot name="header-right" />
       </div>
       <slot name="header-bottom" />
     </div>
     <div class="ibiz-view-layout__body">
+      <slot name="body-top" />
       <slot />
+      <slot name="body-bottom" />
     </div>
     <div class="ibiz-view-footer">
-      <slot name="footer" />
+      <slot name="footer-left" />
+      <slot name="footer-content" />
+      <slot name="footer-right" />
     </div>
   </div>
 </template>
 
 <style lang="scss">
 .ibiz-view-layout {
-  display: flex;
-  flex-direction: column;
   padding: 0 24px 24px;
   .ibiz-view-layout__header {
     flex: none;
+    display: flex;
+    flex-direction: column;
+    padding: 16px 0;
     .ibiz-view-layout__header-content {
       display: flex;
       justify-content: space-between;
-      padding: 16px 0;
     }
   }
   .ibiz-view-layout__body {
     flex: auto;
+    display: flex;
+    flex-direction: column;
   }
-  .ibiz-view-layout__footer {
+  .ibiz-view-footer {
     flex: none;
+    display: flex;
+    justify-content: space-between;
   }
 }
 

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

+<script setup lang="ts">
+interface Props {
+  viewCaption?: string
+  showHeader?: boolean
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  // 设定默认值,可选属性可以在这初始化
+  showHeader: true,
+})
+
+
+</script>
+
+<template>
+  <IbizDefaultViewLayout>
+    <template v-slot:header-left>
+      <slot name="caption" />
+    </template>
+    <template v-slot:header-right>
+      <slot name="toolbar" />
+    </template>
+    <template v-slot:header-bottom>
+      <slot name="topMessage" />
+      <slot name="searchForm" />
+    </template>
+    <template v-slot:body-top>
+      <slot name="bodyMessage" />
+    </template>
+    <slot />
+    <template v-slot:footer-content>
+      <slot name="bottomMessage" />
+    </template>
+  </IbizDefaultViewLayout>
+</template>
+
+<style lang="scss">
+
+
+</style>
\ No newline at end of file

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

@@ -29,11 +29,6 @@ console.log(items);
 const getItemClass = (item: IParam) => {
   return item?.class;
 };
-const getItemIcon = (item: IParam) => {
-  if (item.getPSSysImage) {
-    return item.getPSSysImage.cssClass;
-  }
-};
 const itemClick = (item: IParam) => {
   emit("toolbarEvent", {
     tag: props.name,
@@ -52,14 +47,16 @@ const itemClick = (item: IParam) => {
       >
       <!-- todo 无权限显示模式 -->
         <a-button
-          v-show="true"
+          v-show="item.visible"
           :class="['toolbar-item', getItemClass(item)]"
           :disabled="item.disabled"
           type="primary"
           @click="itemClick(item)"
         >
-          <!-- <a-icon v-show="item.showIcon" :type="getItemIcon(item)" /> -->
-          \{{ item.showCaption ? item.caption : "" }}
+          <IbizIconText 
+          :text="item.showCaption && item.caption"  
+          :iconClass="item.showIcon && item.iconClass" 
+          :imgPath="item.showIcon && item.imgPath"/>
         </a-button>
       </a-tooltip>
       <a-dropdown v-else-if="Object.is(item.itemType, 'items')">
@@ -76,11 +73,10 @@ const itemClick = (item: IParam) => {
               type="primary"
               @click="itemClick(childItem)"
             >
-              <!-- <a-icon
-                v-show="childItem.showIcon"
-                :type="getItemIcon(childItem)"
-              /> -->
-              \{{ childItem.showCaption ? childItem.caption : "" }}
+              <IbizIconText 
+                :text="item.showCaption && item.caption"  
+                :iconClass="item.showIcon && item.iconClass" 
+                :imgPath="item.showIcon && item.imgPath"/>
             </a-menu-item>
           </a-tooltip>
         </a-menu>
@@ -90,14 +86,16 @@ const itemClick = (item: IParam) => {
     <a-space v-else class="toolbar-link">
       <template v-for="(item, index) in items" :key="index">
         <a-button
-          v-show="item.visabled"
+          v-show="item.visible"
           :class="['toolbar-item', getItemClass(item)]"
           :disabled="item.disabled"
           type="link"
           @click="itemClick(item)"
         >
-          <!-- <a-icon v-show="item.showIcon" :type="getItemIcon(item)" /> -->
-          \{{ item.showCaption ? item.caption : "" }}
+          <IbizIconText 
+          :text="item.showCaption && item.caption"  
+          :iconClass="item.showIcon && item.iconClass" 
+          :imgPath="item.showIcon && item.imgPath"/>
         </a-button>
         <div v-if="item.separator" class="separator"></div>
       </template>
@@ -113,6 +111,9 @@ const itemClick = (item: IParam) => {
     flex-wrap: wrap;
     .ant-space-item {
       position: relative;
+      .ant-btn-link {
+        padding: 4px 10px;
+      }
       .separator {
         position: absolute;
         right: 0;
@@ -123,5 +124,10 @@ const itemClick = (item: IParam) => {
       }
     }
   }
+  .toolbar-item {
+    .ibiz-icon-text__icon {
+      vertical-align: unset;
+    }
+  }
 }
 </style>

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

@@ -34,8 +34,8 @@ const { state, handleToolbarEvent } = new EditView(ViewConfig).moduleInstall(pro
 </script>
 
 <template>
-  <IbizDefaultViewLayout :class="['ibiz-edit-view', state.viewSysCss]">
-    <template v-slot:header-left>
+  <IbizEditViewLayout :class="['ibiz-edit-view', state.viewSysCss]">
+    <template v-slot:caption>
       <IbizIconText
         class="ibiz-view__caption"
         size="large"
@@ -46,7 +46,7 @@ const { state, handleToolbarEvent } = new EditView(ViewConfig).moduleInstall(pro
     </template>
     {{#page.ctrls}}
     {{#eq controlType "TOOLBAR"}}
-    <template v-slot:header-right>
+    <template v-slot:toolbar>
       <IbizToolbar
         mode="button"
         name="{{lowerCase codeName}}"
@@ -64,7 +64,7 @@ const { state, handleToolbarEvent } = new EditView(ViewConfig).moduleInstall(pro
     ></{{codeName}}Form>
     {{/eq}}
     {{/page.ctrls}}
-  </IbizDefaultViewLayout>
+  </IbizEditViewLayout>
 </template>
 
 <style lang="scss">

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

@@ -48,7 +48,7 @@ export const CtrlConfig = {
   {{#if (eq column.columnType 'UAGRIDCOLUMN')}}
     {{#each column.psDEUIActionGroup.psUIActionGroupDetails as | action |}}
     {{#action}}
-    { name: "{{name}}", caption: "{{psUIAction.caption}}", showIcon: {{showIcon}}, showCaption: {{showCaption}}, separator: {{addSeparator}}, uIActionTag: "{{psUIAction.uIActionTag}}", noPrivDisplayMode: {{#if psUIAction.noPrivDisplayMode}}{{psUIAction.noPrivDisplayMode}}{{else}}6{{/if}}, disabled: false, visabled: true,{{#if psUIAction.psSysImage}}{{#if psUIAction.psSysImage.imagePath}} imgPath: "{{psUIAction.psSysImage.imagePath}}",{{/if}}{{#if psUIAction.psSysImage.cssClass}} iconCls: "{{psUIAction.psSysImage.cssClass}}",{{/if}}{{/if}} },
+    { name: "{{name}}", caption: "{{psUIAction.caption}}", showIcon: {{showIcon}}, showCaption: {{showCaption}}, separator: {{addSeparator}}, uIActionTag: "{{psUIAction.uIActionTag}}", noPrivDisplayMode: {{#if psUIAction.noPrivDisplayMode}}{{psUIAction.noPrivDisplayMode}}{{else}}6{{/if}}, disabled: false, visible: true,{{#if psUIAction.psSysImage}}{{#if psUIAction.psSysImage.imagePath}} imgPath: "{{psUIAction.psSysImage.imagePath}}",{{/if}}{{#if psUIAction.psSysImage.cssClass}} iconClass: "{{psUIAction.psSysImage.cssClass}}",{{/if}}{{/if}} },
     {{/action}}
     {{/each}}
   {{/if}}