@ibiz-template/vue3-components 0.7.37-alpha.5 → 0.7.38-alpha.21

package/es/control/list/list.mjs

@@ -1,8 +1,8 @@
-import { isVNode, computed, ref, watch, resolveComponent, createVNode, resolveDirective, withDirectives, defineComponent } from 'vue';
+import { isVNode, defineComponent, computed, ref, watch, createVNode, resolveComponent, withDirectives, resolveDirective } from 'vue';
 import { useControlController, useNamespace } from '@ibiz-template/vue3-util';
 import { isNil } from 'lodash-es';
 import { createUUID } from 'qx-util';
-import { ListController } from '@ibiz-template/runtime';
+import { ListController, ControlVO } from '@ibiz-template/runtime';
 import './list.css';
 import { showTitle } from '@ibiz-template/core';
 import '../../util/index.mjs';
@@ -57,6 +57,10 @@ const ListControl = /* @__PURE__ */ defineComponent({
       type: Boolean,
       required: false
     },
+    data: {
+      type: Array,
+      required: false
+    },
     loadDefault: {
       type: Boolean,
       default: true
@@ -79,17 +83,12 @@ const ListControl = /* @__PURE__ */ defineComponent({
       }
       return c.state.items.length >= c.state.total || c.state.isLoading || c.state.total <= c.state.size;
     });
+    const isCollapse = ref(false);
+    const showCollapseOrExpandIcon = computed(() => {
+      return !c.model.enableGroup && (c.model.pagingMode === 2 || c.model.pagingMode === 3);
+    });
     const infiniteScroll = ref();
     const infiniteScrollKey = ref(createUUID());
-    const defaultOpens = ref();
-    if (c.controlParams.defaultexpandall === "true") {
-      watch(() => c.state.groups, () => {
-        if (c.state.groups.length > 0) {
-          defaultOpens.value = c.state.groups.map((x) => x.key);
-        }
-      });
-      defaultOpens.value = c.state.groups.map((x) => x.key);
-    }
     watch(() => c.state.curPage, () => {
       var _a, _b;
       if (c.state.curPage === 1 && (c.model.pagingMode === 2 || c.model.pagingMode === 3)) {
@@ -101,6 +100,27 @@ const ListControl = /* @__PURE__ */ defineComponent({
         }
       }
     });
+    const initSimpleData = () => {
+      if (!props.data) {
+        return;
+      }
+      c.state.items = props.data.map((item) => new ControlVO(item));
+      c.afterLoad({}, c.state.items);
+    };
+    c.evt.on("onCreated", async () => {
+      if (props.isSimple) {
+        initSimpleData();
+        c.state.isSimple = true;
+        c.state.isLoaded = true;
+      }
+    });
+    watch(() => props.data, () => {
+      if (props.isSimple) {
+        initSimpleData();
+      }
+    }, {
+      deep: true
+    });
     const renderPanelItem = (item, modelData) => {
       const {
         context,
@@ -132,27 +152,66 @@ const ListControl = /* @__PURE__ */ defineComponent({
         "onDblclick": () => c.onDbRowClick(item)
       }, ["".concat(isNil(item.srfmajortext) ? "" : item.srfmajortext)]);
     };
+    const renderGroupAction = (group) => {
+      if (c.model.groupUIActionGroup && group.groupActionGroupState) {
+        return createVNode(resolveComponent("iBizActionToolbar"), {
+          "class": ns.be("group-content", "header-actions"),
+          "action-details": c.model.groupUIActionGroup.uiactionGroupDetails,
+          "actions-state": group.groupActionGroupState,
+          "onActionClick": (detail, event) => {
+            c.onGroupToolbarClick(detail, event, group);
+          }
+        }, null);
+      }
+    };
     const renderGroup = (group) => {
       const panel = props.modelData.itemLayoutPanel;
       return createVNode(resolveComponent("el-collapse-item"), {
-        "title": showTitle(group.caption),
         "class": ns.be("group-content", "item"),
         "name": group.key
       }, {
-        default: () => [group.children.length > 0 ? group.children.map((item) => {
+        title: () => {
+          return createVNode("div", {
+            "class": ns.be("group-content", "item-header")
+          }, [createVNode("span", {
+            "class": ns.be("group-content", "item-title")
+          }, [showTitle(group.caption)]), createVNode("span", {
+            "class": ns.be("group-content", "item-action")
+          }, [renderGroupAction(group)])]);
+        },
+        default: () => group.children.length > 0 ? group.children.map((item) => {
           return panel ? renderPanelItem(item, panel) : renderDefaultItem(item);
         }) : createVNode("div", {
           "class": ns.bem("group-content", "item", "empty")
-        }, [ibiz.i18n.t("app.noData")])]
+        }, [ibiz.i18n.t("app.noData")])
       });
     };
+    const scrollToTop = () => {
+      var _a;
+      (_a = infiniteScroll.value) == null ? void 0 : _a.scrollTo({
+        top: 0,
+        behavior: "smooth"
+      });
+    };
+    c.evt.on("onScrollToTop", () => {
+      scrollToTop();
+    });
+    const onCollapseData = () => {
+      isCollapse.value = true;
+      scrollToTop();
+    };
+    const onShowNavView = () => {
+      c.state.showNavView = !c.state.showNavView;
+    };
+    const onExpandData = () => {
+      isCollapse.value = false;
+    };
     const renderListContent = () => {
-      let _slot;
       if (c.model.enableGroup && !c.state.isSimple) {
         return createVNode(resolveComponent("el-collapse"), {
-          "modelValue": defaultOpens.value,
-          "onUpdate:modelValue": ($event) => defaultOpens.value = $event,
-          "class": [ns.b("group-content"), ns.b("content")]
+          "modelValue": c.state.expandedKeys,
+          "onUpdate:modelValue": ($event) => c.state.expandedKeys = $event,
+          "class": [ns.b("group-content"), ns.b("content"), ns.is("show-underLine", c.model.controlStyle !== "EXTVIEW1")]
         }, {
           default: () => {
             var _a;
@@ -165,24 +224,51 @@ const ListControl = /* @__PURE__ */ defineComponent({
         });
       }
       const panel = props.modelData.itemLayoutPanel;
+      let tempItems = c.state.items;
+      if (isCollapse.value) {
+        tempItems = c.state.items.slice(0, c.state.size);
+      }
       return withDirectives(createVNode("div", {
-        "class": [ns.b("scroll"), ns.b("content")],
+        "class": [ns.b("scroll"), ns.b("content"), ns.is("show-underLine", c.model.controlStyle !== "EXTVIEW1")],
         "infinite-scroll-distance": 10,
         "infinite-scroll-disabled": isLodeMoreDisabled.value,
         "ref": "infiniteScroll",
         "key": infiniteScrollKey.value
-      }, [c.state.items.map((item) => {
+      }, [tempItems.map((item) => {
         return createVNode("div", {
           "class": [ns.b("scroll-item")]
         }, [panel ? renderPanelItem(item, panel) : renderDefaultItem(item)]);
-      }), c.model.pagingMode === 3 && !(c.state.items.length >= c.state.total || c.state.isLoading || c.state.total <= c.state.size) && createVNode("div", {
-        "class": ns.e("load-more-button")
-      }, [createVNode(resolveComponent("el-button"), {
-        "text": true,
-        "onClick": () => c.loadMore()
-      }, _isSlot(_slot = ibiz.i18n.t("control.common.loadMore")) ? _slot : {
-        default: () => [_slot]
-      })])]), [[resolveDirective("infinite-scroll"), () => c.loadMore()]]);
+      })]), [[resolveDirective("infinite-scroll"), () => c.loadMore()]]);
+    };
+    const upIcon = () => {
+      return createVNode("div", {
+        "class": ns.e("collapse-expand-icon")
+      }, [createVNode("i", {
+        "class": "fa fa-angle-double-up",
+        "title": ibiz.i18n.t("control.common.collapseData"),
+        "onClick": onCollapseData,
+        "aria-hidden": "true"
+      }, null)]);
+    };
+    const downIcon = () => {
+      return createVNode("div", {
+        "class": ns.e("collapse-expand-icon")
+      }, [createVNode("i", {
+        "class": "fa fa-angle-double-down",
+        "title": ibiz.i18n.t("control.common.expandData"),
+        "onClick": onExpandData,
+        "aria-hidden": "true"
+      }, null)]);
+    };
+    const loadMoreIcon = () => {
+      return createVNode("div", {
+        "class": ns.e("load-more")
+      }, [createVNode("i", {
+        "class": "fa fa-angle-double-down",
+        "title": ibiz.i18n.t("control.common.loadMore"),
+        "onClick": () => c.loadMore(),
+        "aria-hidden": "true"
+      }, null)]);
     };
     const renderQuickToolBar = () => {
       var _a;
@@ -215,7 +301,7 @@ const ListControl = /* @__PURE__ */ defineComponent({
       }, null)]);
     };
     const renderNoData = () => {
-      let _slot2;
+      let _slot;
       const {
         isLoaded
       } = c.state;
@@ -227,20 +313,45 @@ const ListControl = /* @__PURE__ */ defineComponent({
         "text": c.model.emptyText,
         "emptyTextLanguageRes": c.model.emptyTextLanguageRes,
         "enableShowImage": c.state.hideNoDataImage
-      }, _isSlot(_slot2 = renderQuickToolBar()) ? _slot2 : {
-        default: () => [_slot2]
+      }, _isSlot(_slot = renderQuickToolBar()) ? _slot : {
+        default: () => [_slot]
       });
     };
+    const renderCollapseExpandIcon = () => {
+      let icon = null;
+      const loadMore = !(c.state.items.length >= c.state.total || c.state.total <= c.state.size);
+      if (showCollapseOrExpandIcon.value) {
+        if (c.model.pagingMode === 2) {
+          if (isCollapse.value) {
+            icon = downIcon();
+          } else if (c.state.items.length > c.state.size) {
+            icon = upIcon();
+          }
+        }
+        if (c.model.pagingMode === 3) {
+          if (isCollapse.value) {
+            icon = downIcon();
+          } else if (loadMore) {
+            icon = loadMoreIcon();
+          } else if (c.state.isCreated && c.state.items.length > c.state.size) {
+            icon = upIcon();
+          }
+        }
+      }
+      return icon;
+    };
     return {
       c,
       ns,
       infiniteScroll,
+      onShowNavView,
       renderListContent,
       renderNoData,
       renderBatchToolBar,
       onPageChange,
       onPageRefresh,
-      onPageSizeChange
+      onPageSizeChange,
+      renderCollapseExpandIcon
     };
   },
   render() {
@@ -257,11 +368,25 @@ const ListControl = /* @__PURE__ */ defineComponent({
         "onPageRefresh": this.onPageRefresh
       }, null) : null];
     }
-    return createVNode(resolveComponent("iBizControlBase"), {
-      "class": [this.ns.is("enable-page", !!this.c.state.enablePagingBar)],
+    return createVNode(resolveComponent("iBizControlNavigation"), {
       "controller": this.c
-    }, _isSlot(content) ? content : {
-      default: () => [content]
+    }, {
+      default: () => [createVNode(resolveComponent("iBizControlBase"), {
+        "class": [this.ns.is("enable-page", !!this.c.state.enablePagingBar)],
+        "controller": this.c
+      }, {
+        default: () => [content, this.c.state.enableNavView ? !this.c.state.showNavView ? createVNode("ion-icon", {
+          "class": this.ns.e("nav-icon"),
+          "title": ibiz.i18n.t("component.controlNavigation.showNav"),
+          "name": "eye-outline",
+          "onClick": this.onShowNavView
+        }, null) : createVNode("ion-icon", {
+          "class": this.ns.e("nav-icon"),
+          "title": ibiz.i18n.t("component.controlNavigation.hiddenNav"),
+          "name": "eye-off-outline",
+          "onClick": this.onShowNavView
+        }, null) : null, this.renderCollapseExpandIcon()]
+      })]
     });
   }
 });

package/es/control/map/index.mjs

@@ -1,4 +1,4 @@
-import { ControlType, registerControlProvider } from '@ibiz-template/runtime';
+import { registerControlProvider, ControlType } from '@ibiz-template/runtime';
 import MapControl from './map.mjs';
 import { MapProvider } from './map.provider.mjs';
 

package/es/control/map/map.d.ts

@@ -22,6 +22,10 @@ declare const MapControl: import("vue").DefineComponent<{
         type: NumberConstructor;
         default: undefined;
     };
+    isSimple: {
+        type: BooleanConstructor;
+        required: false;
+    };
     loadDefault: {
         type: BooleanConstructor;
         default: boolean;
@@ -65,6 +69,10 @@ declare const MapControl: import("vue").DefineComponent<{
         type: NumberConstructor;
         default: undefined;
     };
+    isSimple: {
+        type: BooleanConstructor;
+        required: false;
+    };
     loadDefault: {
         type: BooleanConstructor;
         default: boolean;
@@ -72,6 +80,7 @@ declare const MapControl: import("vue").DefineComponent<{
 }>>, {
     params: IParams;
     mdctrlActiveMode: number;
+    isSimple: boolean;
     loadDefault: boolean;
 }, {}>;
 export default MapControl;

package/es/control/map/map.mjs

@@ -1,4 +1,4 @@
-import { ref, computed, resolveComponent, createVNode, defineComponent } from 'vue';
+import { defineComponent, ref, computed, createVNode, resolveComponent } from 'vue';
 import { useControlController, useNamespace } from '@ibiz-template/vue3-util';
 import './map.css';
 import { MapController } from '@ibiz-template/runtime';
@@ -26,6 +26,10 @@ const MapControl = /* @__PURE__ */ defineComponent({
       type: Number,
       default: void 0
     },
+    isSimple: {
+      type: Boolean,
+      required: false
+    },
     loadDefault: {
       type: Boolean,
       default: true

package/es/control/medit-view-panel/index.mjs

@@ -1,4 +1,4 @@
-import { ControlType, registerControlProvider } from '@ibiz-template/runtime';
+import { registerControlProvider, ControlType } from '@ibiz-template/runtime';
 import { withInstall } from '@ibiz-template/vue3-util';
 import { MEditViewPanelControl } from './medit-view-panel.mjs';
 import { MEditViewPanelProvider } from './medit-view-panel.provider.mjs';

package/es/control/medit-view-panel/medit-view-panel.mjs

@@ -1,4 +1,4 @@
-import { isVNode, ref, onMounted, onUnmounted, resolveComponent, createVNode, h, defineComponent } from 'vue';
+import { isVNode, defineComponent, ref, onMounted, onUnmounted, resolveComponent, createVNode, h } from 'vue';
 import { useControlController, useNamespace } from '@ibiz-template/vue3-util';
 import { MEditViewPanelController } from '@ibiz-template/runtime';
 import './medit-view-panel.css';

package/es/control/pickup-view-panel/index.mjs

@@ -1,4 +1,4 @@
-import { ControlType, registerControlProvider } from '@ibiz-template/runtime';
+import { registerControlProvider, ControlType } from '@ibiz-template/runtime';
 import { withInstall } from '@ibiz-template/vue3-util';
 import { PickupViewPanelControl } from './pickup-view-panel.mjs';
 import { PickupViewPanelProvider } from './pickup-view-panel.provider.mjs';

package/es/control/pickup-view-panel/pickup-view-panel.mjs

@@ -1,4 +1,4 @@
-import { resolveComponent, h, createVNode, defineComponent } from 'vue';
+import { defineComponent, createVNode, resolveComponent, h } from 'vue';
 import { useControlController, useNamespace } from '@ibiz-template/vue3-util';
 import { PickupViewPanelController } from '@ibiz-template/runtime';
 import './pickup-view-panel.css';

package/es/control/report-panel/index.mjs

@@ -1,4 +1,4 @@
-import { ControlType, registerControlProvider } from '@ibiz-template/runtime';
+import { registerControlProvider, ControlType } from '@ibiz-template/runtime';
 import { withInstall } from '@ibiz-template/vue3-util';
 import { ReportPanelControl } from './report-panel.mjs';
 import { ReportPanelProvider } from './report-panel.provider.mjs';

package/es/control/report-panel/report-detail/bi-report-panel/bi-report-panel.mjs

@@ -1,4 +1,4 @@
-import { resolveComponent, createVNode, defineComponent } from 'vue';
+import { defineComponent, createVNode, resolveComponent } from 'vue';
 import { useNamespace } from '@ibiz-template/vue3-util';
 import './bi-report-panel.css';
 

package/es/control/report-panel/report-detail/user-report-panel/user-report-panel.mjs

@@ -1,4 +1,4 @@
-import { resolveComponent, createVNode, defineComponent } from 'vue';
+import { defineComponent, createVNode, resolveComponent } from 'vue';
 import { useNamespace } from '@ibiz-template/vue3-util';
 import './user-report-panel.css';
 

package/es/control/report-panel/report-detail/user2-report-panel/user2-report-panel.mjs

@@ -1,4 +1,4 @@
-import { createVNode, defineComponent } from 'vue';
+import { defineComponent, createVNode } from 'vue';
 import { UIActionUtil } from '@ibiz-template/runtime';
 import { useNamespace } from '@ibiz-template/vue3-util';
 import './user2-report-panel.css';

package/es/control/report-panel/report-panel.mjs

@@ -1,4 +1,4 @@
-import { isVNode, createVNode, resolveComponent, defineComponent } from 'vue';
+import { isVNode, defineComponent, createVNode, resolveComponent } from 'vue';
 import { ReportPanelController } from '@ibiz-template/runtime';
 import { useControlController, useNamespace } from '@ibiz-template/vue3-util';
 import './report-panel.css';

package/es/control/search-bar/filter-mode-select/filter-mode-select.mjs

@@ -1,4 +1,4 @@
-import { isVNode, computed, resolveComponent, createVNode, defineComponent } from 'vue';
+import { isVNode, defineComponent, computed, createVNode, resolveComponent } from 'vue';
 import { ValueOP } from '@ibiz-template/runtime';
 
 "use strict";

package/es/control/search-bar/filter-tree/filter-tree.mjs

@@ -1,4 +1,4 @@
-import { isVNode, computed, ref, watch, resolveComponent, h, createVNode, createTextVNode, defineComponent } from 'vue';
+import { isVNode, defineComponent, computed, ref, watch, resolveComponent, h, createVNode, createTextVNode } from 'vue';
 import { ValueOP } from '@ibiz-template/runtime';
 import { useNamespace } from '@ibiz-template/vue3-util';
 import './filter-tree.css';

package/es/control/search-bar/index.mjs

@@ -1,4 +1,4 @@
-import { ControlType, registerControlProvider } from '@ibiz-template/runtime';
+import { registerControlProvider, ControlType } from '@ibiz-template/runtime';
 import { withInstall } from '@ibiz-template/vue3-util';
 import { SearchBarControl } from './search-bar.mjs';
 import { SearchBarProvider } from './search-bar.provider.mjs';

package/es/control/search-bar/quick-search-select/quick-search-select.mjs

@@ -1,4 +1,4 @@
-import { isVNode, resolveComponent, createVNode, defineComponent } from 'vue';
+import { isVNode, defineComponent, createVNode, resolveComponent } from 'vue';
 import { SearchBarController } from '@ibiz-template/runtime';
 import { useNamespace } from '@ibiz-template/vue3-util';
 import './quick-search-select.css';
@@ -26,6 +26,8 @@ const QuickSearchSelect = /* @__PURE__ */ defineComponent({
       if (index === -1) {
         quickSearchFieldNames.push(key);
       } else {
+        if (quickSearchFieldNames.length <= 1)
+          return;
         quickSearchFieldNames.splice(index, 1);
       }
       props.controller.calcQuickSearchPlaceHolder();

package/es/control/search-bar/search-bar.mjs

@@ -1,4 +1,4 @@
-import { computed, ref, resolveComponent, createVNode, defineComponent } from 'vue';
+import { defineComponent, computed, ref, createVNode, resolveComponent } from 'vue';
 import { useControlController, useLocalCacheKey, useNamespace } from '@ibiz-template/vue3-util';
 import './search-bar.css';
 import { SearchBarController } from '@ibiz-template/runtime';

package/es/control/search-bar/search-groups/search-groups.mjs

@@ -1,4 +1,4 @@
-import { isVNode, ref, computed, createVNode, resolveComponent, defineComponent } from 'vue';
+import { isVNode, defineComponent, ref, computed, createVNode, resolveComponent } from 'vue';
 import { useNamespace } from '@ibiz-template/vue3-util';
 import './search-groups.css';
 import { ElMessageBox } from 'element-plus';
@@ -392,8 +392,8 @@ const SearchGroups = /* @__PURE__ */ defineComponent({
             default: () => [_slot5]
           }), createVNode(resolveComponent("el-link"), {
             "type": "danger",
-            "disabled": !groupItem.saved,
-            "title": showTitle(!groupItem.saved ? ibiz.i18n.t("control.searchBar.searchGroups.savePrompt") : ""),
+            "disabled": !groupItem.saved || groupItem.ownerType === "SYSTEM",
+            "title": showTitle(!groupItem.saved || groupItem.ownerType === "SYSTEM" ? ibiz.i18n.t("control.searchBar.searchGroups.savePrompt") : ""),
             "onClick": () => this.removeGroup(groupItem)
           }, _isSlot(_slot6 = ibiz.i18n.t("app.delete")) ? _slot6 : {
             default: () => [_slot6]

package/es/control/tab-exp-panel/index.mjs

@@ -1,4 +1,4 @@
-import { ControlType, registerControlProvider } from '@ibiz-template/runtime';
+import { registerControlProvider, ControlType } from '@ibiz-template/runtime';
 import { withInstall } from '@ibiz-template/vue3-util';
 import { TabExpPanelControl } from './tab-exp-panel.mjs';
 import { TabExpPanelProvider } from './tab-exp-panel.provider.mjs';

package/es/control/tab-exp-panel/tab-exp-panel.mjs

@@ -1,4 +1,4 @@
-import { isVNode, watch, resolveComponent, createVNode, defineComponent } from 'vue';
+import { isVNode, defineComponent, watch, createVNode, resolveComponent } from 'vue';
 import { useControlController, useNamespace, getNestedRoutePath, route2routePath } from '@ibiz-template/vue3-util';
 import './tab-exp-panel.css';
 import { TabExpPanelController } from '@ibiz-template/runtime';

package/es/control/toolbar/export-excel/export-excel.mjs

@@ -1,4 +1,4 @@
-import { isVNode, ref, resolveComponent, createVNode, createTextVNode, defineComponent } from 'vue';
+import { isVNode, defineComponent, ref, createVNode, resolveComponent, createTextVNode } from 'vue';
 import { useNamespace } from '@ibiz-template/vue3-util';
 import './export-excel.css';
 import { showTitle } from '@ibiz-template/core';

package/es/control/toolbar/index.mjs

@@ -1,4 +1,4 @@
-import { ControlType, registerControlProvider } from '@ibiz-template/runtime';
+import { registerControlProvider, ControlType } from '@ibiz-template/runtime';
 import { withInstall } from '@ibiz-template/vue3-util';
 import { ToolbarControl } from './toolbar.mjs';
 import { ToolbarProvider } from './toolbar.provider.mjs';

package/es/control/toolbar/short-cut-button/short-cut-button.mjs

@@ -1,4 +1,4 @@
-import { computed, resolveComponent, createVNode, defineComponent } from 'vue';
+import { defineComponent, computed, createVNode, resolveComponent } from 'vue';
 import { useNamespace } from '@ibiz-template/vue3-util';
 import './short-cut-button.css';
 import { showTitle } from '@ibiz-template/core';

package/es/control/toolbar/toolbar.mjs

@@ -1,4 +1,4 @@
-import { isVNode, resolveComponent, createVNode, ref, h, createTextVNode, defineComponent } from 'vue';
+import { isVNode, createVNode, resolveComponent, defineComponent, ref, h, createTextVNode } from 'vue';
 import { useNamespace, useControlController } from '@ibiz-template/vue3-util';
 import { ToolbarController } from '@ibiz-template/runtime';
 import { showTitle } from '@ibiz-template/core';
@@ -111,7 +111,7 @@ const ToolbarControl = /* @__PURE__ */ defineComponent({
         "index": item.id,
         "disabled": pdisabled,
         "title": showTitle(item.tooltip),
-        "popper-class": [ns.b("submenu-popper"), ns.bm("submenu-popper", toolbarStyle), ns.em("submenu-popper", groupButtonStyle.toLowerCase()), ns.bm("submenu-popper", calcCssName(item))]
+        "popper-class": [ns.b("submenu-popper"), ns.bm("submenu-popper", toolbarStyle), ns.em("submenu-popper", groupButtonStyle.toLowerCase()), ns.bm("submenu-popper", calcCssName(item)), calcCssName(item)]
       }, {
         default: () => {
           return detoolbarItems.map((item2) => {
@@ -196,7 +196,7 @@ const ToolbarControl = /* @__PURE__ */ defineComponent({
       if (c.state.buttonsState[detail.id].visible) {
         let _slot4;
         return [createVNode(resolveComponent("el-button"), {
-          "title": showTitle(detail.caption),
+          "title": showTitle(detail.tooltip || detail.caption),
           "size": btnSize.value,
           "class": [calcCssName(detail)],
           "loading": c.state.buttonsState[detail.id].loading,
@@ -330,6 +330,9 @@ const ToolbarControl = /* @__PURE__ */ defineComponent({
         });
       }
       if (item.itemType === "SEPERATOR") {
+        if (c.state.hideSeparator.includes(itemId)) {
+          return null;
+        }
         return createVNode("div", {
           "key": itemId,
           "class": [ns.e("item"), ns.e("item-separator")]

package/es/control/tree/el-tree-util.d.ts

@@ -1,7 +1,28 @@
-import { ITreeController, ITreeNodeData } from '@ibiz-template/runtime';
+import { IControlProvider, ITreeController, ITreeNodeData, TreeController } from '@ibiz-template/runtime';
+import { IDETree } from '@ibiz/model-core';
 import { ElTree } from 'element-plus';
 import { NodeDropType } from 'element-plus/es/components/tree/src/tree.type';
 import { Ref } from 'vue';
+/**
+ * 树props接口
+ *
+ * @export
+ * @interface IGridProps
+ */
+export interface ITreeProps {
+    modelData: IDETree;
+    context: IContext;
+    params: IParams;
+    provider?: IControlProvider;
+    mdctrlActiveMode?: number;
+    singleSelect?: boolean;
+    navigational?: boolean;
+    defaultExpandedKeys?: string[];
+    checkStrictly?: boolean;
+    isSimple?: boolean;
+    data?: Array<ITreeNodeData>;
+    loadDefault: boolean;
+}
 /**
  * 根据id查找树节点数据对象
  * @author lxm
@@ -36,6 +57,7 @@ export declare function useElTreeUtil(treeRef: Ref<InstanceType<typeof ElTree> |
             readonly props: import("element-plus/es/components/tree/src/tree.type").TreeOptionProps;
             readonly data: unknown[];
             readonly draggable: boolean;
+            readonly lazy: boolean;
             readonly renderAfterExpand: boolean;
             readonly checkStrictly: boolean;
             readonly defaultExpandAll: boolean;
@@ -44,7 +66,6 @@ export declare function useElTreeUtil(treeRef: Ref<InstanceType<typeof ElTree> |
             readonly checkDescendants: boolean;
             readonly autoExpandParent: boolean;
             readonly showCheckbox: boolean;
-            readonly lazy: boolean;
             readonly highlightCurrent: boolean;
             readonly accordion: boolean;
             readonly indent: number;
@@ -151,7 +172,7 @@ export declare function useElTreeUtil(treeRef: Ref<InstanceType<typeof ElTree> |
             "onNode-drag-leave"?: ((...args: any[]) => any) | undefined;
             "onNode-drag-enter"?: ((...args: any[]) => any) | undefined;
             "onNode-drag-over"?: ((...args: any[]) => any) | undefined;
-        }, "props" | "data" | "draggable" | "renderAfterExpand" | "checkStrictly" | "defaultExpandAll" | "expandOnClickNode" | "checkOnClickNode" | "checkDescendants" | "autoExpandParent" | "showCheckbox" | "lazy" | "highlightCurrent" | "accordion" | "indent">;
+        }, "props" | "data" | "draggable" | "lazy" | "renderAfterExpand" | "checkStrictly" | "defaultExpandAll" | "expandOnClickNode" | "checkOnClickNode" | "checkDescendants" | "autoExpandParent" | "showCheckbox" | "highlightCurrent" | "accordion" | "indent">;
         $attrs: {
             [x: string]: unknown;
         };
@@ -918,3 +939,20 @@ export declare function useElTreeUtil(treeRef: Ref<InstanceType<typeof ElTree> |
  * @return {*}  {('inner' | 'prev' | 'next')}
  */
 export declare function formatNodeDropType(dropType: NodeDropType): 'inner' | 'prev' | 'next';
+/**
+ * 初始化树数据
+ *
+ * @export
+ * @param {TreeController} c
+ * @param {ITreeProps} props
+ */
+export declare function useAppTreeBase(c: TreeController, props: ITreeProps): void;
+/**
+ * 根据关系获取当前项的子节点
+ *
+ * @export
+ * @param {TreeController} c
+ * @param {IData} modelData
+ * @param {IData} curItem
+ */
+export declare function findChildItems(c: TreeController, modelData: IData, curItem: IData): IData[];