update: 更新

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

@@ -27,7 +27,7 @@ const emit = defineEmits<toolbarEmit>();
 const items: Ref<IParam[]> = ref(props.actionModel || []);
 console.log(items);
 const getItemClass = (item: IParam) => {
-  return item.class;
+  return item?.class;
 };
 const getItemIcon = (item: IParam) => {
   if (item.getPSSysImage) {
@@ -44,7 +44,7 @@ const itemClick = (item: IParam) => {
 </script>
 <template>
   <div class="toolbar">
-    <a-space :class="`toolbar-${mode}`">
+    <a-space v-if="Object.is(mode,'button')" class="toolbar-button">
       <template v-for="(item, index) in items" :key="index">
       <a-tooltip
         v-if="Object.is(item.itemType, 'DEUIACTION')"
@@ -55,13 +55,12 @@ const itemClick = (item: IParam) => {
           v-show="true"
           :class="['toolbar-item', getItemClass(item)]"
           :disabled="item.disabled"
-          :type="Object.is(mode,'link') ? 'link': 'primary'"
+          type="primary"
           @click="itemClick(item)"
         >
-          <a-icon v-show="item.showIcon" :type="getItemIcon(item)" />
-          \{{ item.showCaption ? item.caption : "" }}
+          <!-- <a-icon v-show="item.showIcon" :type="getItemIcon(item)" /> -->
+          {{ item.showCaption ? item.caption : "" }}
         </a-button>
-        <div v-if="item.addSeparator" class="separator"></div>
       </a-tooltip>
       <a-dropdown v-else-if="Object.is(item.itemType, 'items')">
         <a-menu slot="overlay" @click="itemClick">
@@ -77,17 +76,32 @@ const itemClick = (item: IParam) => {
               type="primary"
               @click="itemClick(childItem)"
             >
-              <a-icon
+              <!-- <a-icon
                 v-show="childItem.showIcon"
                 :type="getItemIcon(childItem)"
-              />
-              \{{ childItem.showCaption ? childItem.caption : "" }}
+              /> -->
+              {{ childItem.showCaption ? childItem.caption : "" }}
             </a-menu-item>
           </a-tooltip>
         </a-menu>
       </a-dropdown>
       </template>
     </a-space>
+    <a-space v-else class="toolbar-link">
+      <template v-for="(item, index) in items" :key="index">
+        <a-button
+          v-show="item.visabled"
+          :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 : "" }}
+        </a-button>
+        <div v-if="item.separator" class="separator"></div>
+      </template>
+    </a-space>
   </div>
 </template>
 
@@ -95,6 +109,7 @@ const itemClick = (item: IParam) => {
 .toolbar {
   .toolbar-link {
     gap: 0 !important;
+    display: inline;
     .ant-space-item {
       position: relative;
       .separator {