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

package/lib/control/list/list.cjs

@@ -59,6 +59,10 @@ const ListControl = /* @__PURE__ */ vue.defineComponent({
       type: Boolean,
       required: false
     },
+    data: {
+      type: Array,
+      required: false
+    },
     loadDefault: {
       type: Boolean,
       default: true
@@ -81,17 +85,12 @@ const ListControl = /* @__PURE__ */ vue.defineComponent({
       }
       return c.state.items.length >= c.state.total || c.state.isLoading || c.state.total <= c.state.size;
     });
+    const isCollapse = vue.ref(false);
+    const showCollapseOrExpandIcon = vue.computed(() => {
+      return !c.model.enableGroup && (c.model.pagingMode === 2 || c.model.pagingMode === 3);
+    });
     const infiniteScroll = vue.ref();
     const infiniteScrollKey = vue.ref(qxUtil.createUUID());
-    const defaultOpens = vue.ref();
-    if (c.controlParams.defaultexpandall === "true") {
-      vue.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);
-    }
     vue.watch(() => c.state.curPage, () => {
       var _a, _b;
       if (c.state.curPage === 1 && (c.model.pagingMode === 2 || c.model.pagingMode === 3)) {
@@ -103,6 +102,27 @@ const ListControl = /* @__PURE__ */ vue.defineComponent({
         }
       }
     });
+    const initSimpleData = () => {
+      if (!props.data) {
+        return;
+      }
+      c.state.items = props.data.map((item) => new runtime.ControlVO(item));
+      c.afterLoad({}, c.state.items);
+    };
+    c.evt.on("onCreated", async () => {
+      if (props.isSimple) {
+        initSimpleData();
+        c.state.isSimple = true;
+        c.state.isLoaded = true;
+      }
+    });
+    vue.watch(() => props.data, () => {
+      if (props.isSimple) {
+        initSimpleData();
+      }
+    }, {
+      deep: true
+    });
     const renderPanelItem = (item, modelData) => {
       const {
         context,
@@ -134,27 +154,66 @@ const ListControl = /* @__PURE__ */ vue.defineComponent({
         "onDblclick": () => c.onDbRowClick(item)
       }, ["".concat(lodashEs.isNil(item.srfmajortext) ? "" : item.srfmajortext)]);
     };
+    const renderGroupAction = (group) => {
+      if (c.model.groupUIActionGroup && group.groupActionGroupState) {
+        return vue.createVNode(vue.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 vue.createVNode(vue.resolveComponent("el-collapse-item"), {
-        "title": core.showTitle(group.caption),
         "class": ns.be("group-content", "item"),
         "name": group.key
       }, {
-        default: () => [group.children.length > 0 ? group.children.map((item) => {
+        title: () => {
+          return vue.createVNode("div", {
+            "class": ns.be("group-content", "item-header")
+          }, [vue.createVNode("span", {
+            "class": ns.be("group-content", "item-title")
+          }, [core.showTitle(group.caption)]), vue.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);
         }) : vue.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 vue.createVNode(vue.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;
@@ -167,24 +226,51 @@ const ListControl = /* @__PURE__ */ vue.defineComponent({
         });
       }
       const panel = props.modelData.itemLayoutPanel;
+      let tempItems = c.state.items;
+      if (isCollapse.value) {
+        tempItems = c.state.items.slice(0, c.state.size);
+      }
       return vue.withDirectives(vue.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 vue.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) && vue.createVNode("div", {
-        "class": ns.e("load-more-button")
-      }, [vue.createVNode(vue.resolveComponent("el-button"), {
-        "text": true,
-        "onClick": () => c.loadMore()
-      }, _isSlot(_slot = ibiz.i18n.t("control.common.loadMore")) ? _slot : {
-        default: () => [_slot]
-      })])]), [[vue.resolveDirective("infinite-scroll"), () => c.loadMore()]]);
+      })]), [[vue.resolveDirective("infinite-scroll"), () => c.loadMore()]]);
+    };
+    const upIcon = () => {
+      return vue.createVNode("div", {
+        "class": ns.e("collapse-expand-icon")
+      }, [vue.createVNode("i", {
+        "class": "fa fa-angle-double-up",
+        "title": ibiz.i18n.t("control.common.collapseData"),
+        "onClick": onCollapseData,
+        "aria-hidden": "true"
+      }, null)]);
+    };
+    const downIcon = () => {
+      return vue.createVNode("div", {
+        "class": ns.e("collapse-expand-icon")
+      }, [vue.createVNode("i", {
+        "class": "fa fa-angle-double-down",
+        "title": ibiz.i18n.t("control.common.expandData"),
+        "onClick": onExpandData,
+        "aria-hidden": "true"
+      }, null)]);
+    };
+    const loadMoreIcon = () => {
+      return vue.createVNode("div", {
+        "class": ns.e("load-more")
+      }, [vue.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;
@@ -217,7 +303,7 @@ const ListControl = /* @__PURE__ */ vue.defineComponent({
       }, null)]);
     };
     const renderNoData = () => {
-      let _slot2;
+      let _slot;
       const {
         isLoaded
       } = c.state;
@@ -229,20 +315,45 @@ const ListControl = /* @__PURE__ */ vue.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() {
@@ -259,11 +370,25 @@ const ListControl = /* @__PURE__ */ vue.defineComponent({
         "onPageRefresh": this.onPageRefresh
       }, null) : null];
     }
-    return vue.createVNode(vue.resolveComponent("iBizControlBase"), {
-      "class": [this.ns.is("enable-page", !!this.c.state.enablePagingBar)],
+    return vue.createVNode(vue.resolveComponent("iBizControlNavigation"), {
       "controller": this.c
-    }, _isSlot(content) ? content : {
-      default: () => [content]
+    }, {
+      default: () => [vue.createVNode(vue.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 ? vue.createVNode("ion-icon", {
+          "class": this.ns.e("nav-icon"),
+          "title": ibiz.i18n.t("component.controlNavigation.showNav"),
+          "name": "eye-outline",
+          "onClick": this.onShowNavView
+        }, null) : vue.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/lib/control/list/list.css

@@ -1 +1 @@
-.ibiz-control-list-item{--ibiz-control-list-text-color:var(--ibiz-color-text-0);--ibiz-control-list-load-more-color:var(--ibiz-color-text-2);--ibiz-control-list-hover-bg-color:var(--ibiz-color-fill-1);--ibiz-control-list-active-bg-color:var(--ibiz-color-fill-2);--ibiz-control-list-font-weight:var(--ibiz-font-weight-regular);--ibiz-control-list-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base-tight);min-height:var(--ibiz-control-list-item-height);padding:var(--ibiz-control-list-padding);font-weight:var(--ibiz-control-list-font-weight);color:var(--ibiz-control-list-text-color);cursor:pointer}.ibiz-control-list-item:hover{background-color:var(--ibiz-control-list-hover-bg-color)}.ibiz-control-list-item.is-active{background-color:var(--ibiz-control-list-active-bg-color)}.ibiz-control-list{--ibiz-control-list-text-color:var(--ibiz-color-text-0);--ibiz-control-list-load-more-color:var(--ibiz-color-text-2);--ibiz-control-list-hover-bg-color:var(--ibiz-color-fill-1);--ibiz-control-list-active-bg-color:var(--ibiz-color-fill-2);--ibiz-control-list-font-weight:var(--ibiz-font-weight-regular);--ibiz-control-list-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base-tight);display:flex;flex-flow:column nowrap;align-items:stretch;justify-content:flex-start;height:100%}.ibiz-control-list__load-more{color:var(--ibiz-control-list-load-more-color);text-align:center;cursor:pointer}.ibiz-control-list__load-more-button{padding:var(--ibiz-control-list-padding);text-align:center}.ibiz-control-list .ibiz-control-list-content{flex-grow:1}.ibiz-control-list-scroll{height:100%;overflow:auto}
+.ibiz-control-list-item{--ibiz-control-list-text-color:var(--ibiz-color-text-0);--ibiz-control-list-load-more-color:var(--ibiz-color-text-2);--ibiz-control-list-hover-bg-color:var(--ibiz-color-fill-1);--ibiz-control-list-active-bg-color:var(--ibiz-color-fill-2);--ibiz-control-list-font-weight:var(--ibiz-font-weight-regular);--ibiz-control-list-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base-tight);min-height:var(--ibiz-control-list-item-height);padding:var(--ibiz-control-list-padding);font-weight:var(--ibiz-control-list-font-weight);color:var(--ibiz-control-list-text-color);cursor:pointer}.ibiz-control-list-item:hover{background-color:var(--ibiz-control-list-hover-bg-color)}.ibiz-control-list-item.is-active{background-color:var(--ibiz-control-list-active-bg-color)}.ibiz-control-list{--ibiz-control-list-text-color:var(--ibiz-color-text-0);--ibiz-control-list-load-more-color:var(--ibiz-color-text-2);--ibiz-control-list-hover-bg-color:var(--ibiz-color-fill-1);--ibiz-control-list-active-bg-color:var(--ibiz-color-fill-2);--ibiz-control-list-font-weight:var(--ibiz-font-weight-regular);--ibiz-control-list-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base-tight);display:flex;flex-flow:column nowrap;align-items:stretch;justify-content:flex-start;position:relative;height:100%}.ibiz-control-list__nav-icon{right:10px;top:18px;cursor:pointer;position:absolute;color:var(--ibiz-color-primary)}.ibiz-control-list__load-more{text-align:center}.ibiz-control-list__load-more i{font-size:var(--ibiz-font-size-header-3);color:var(--ibiz-control-list-load-more-color);cursor:pointer}.ibiz-control-list__load-more i:hover{color:var(--ibiz-color-primary-light-hover)}.ibiz-control-list__collapse-expand-icon{width:calc(100% - var(--ibiz-spacing-base-tight));text-align:center}.ibiz-control-list__collapse-expand-icon i{font-size:var(--ibiz-font-size-header-3);color:var(--ibiz-color-text-2);cursor:pointer}.ibiz-control-list__collapse-expand-icon i:hover{color:var(--ibiz-color-primary-light-hover)}.ibiz-control-list__load-more-button{padding:var(--ibiz-control-list-padding);text-align:center}.ibiz-control-list .ibiz-control-list-content{flex-grow:1}.ibiz-control-list-content.is-show-underLine .ibiz-control-list-scroll-item{border-bottom:1px solid var(--ibiz-color-border)}.ibiz-control-list-content .ibiz-control-list-scroll-item:last-of-type{border-bottom:none}.ibiz-control-list-scroll{height:100%;overflow:auto}.ibiz-control-list-group-content__item-header{display:flex;align-items:center;justify-content:space-between;width:100%}

package/lib/control/map/map.cjs

@@ -30,6 +30,10 @@ const MapControl = /* @__PURE__ */ vue.defineComponent({
       type: Number,
       default: void 0
     },
+    isSimple: {
+      type: Boolean,
+      required: false
+    },
     loadDefault: {
       type: Boolean,
       default: true

package/lib/control/search-bar/quick-search-select/quick-search-select.cjs

@@ -28,6 +28,8 @@ const QuickSearchSelect = /* @__PURE__ */ vue.defineComponent({
       if (index === -1) {
         quickSearchFieldNames.push(key);
       } else {
+        if (quickSearchFieldNames.length <= 1)
+          return;
         quickSearchFieldNames.splice(index, 1);
       }
       props.controller.calcQuickSearchPlaceHolder();

package/lib/control/search-bar/search-groups/search-groups.cjs

@@ -394,8 +394,8 @@ const SearchGroups = /* @__PURE__ */ vue.defineComponent({
             default: () => [_slot5]
           }), vue.createVNode(vue.resolveComponent("el-link"), {
             "type": "danger",
-            "disabled": !groupItem.saved,
-            "title": core.showTitle(!groupItem.saved ? ibiz.i18n.t("control.searchBar.searchGroups.savePrompt") : ""),
+            "disabled": !groupItem.saved || groupItem.ownerType === "SYSTEM",
+            "title": core.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/lib/control/toolbar/toolbar.cjs

@@ -113,7 +113,7 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
         "index": item.id,
         "disabled": pdisabled,
         "title": core.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) => {
@@ -198,7 +198,7 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
       if (c.state.buttonsState[detail.id].visible) {
         let _slot4;
         return [vue.createVNode(vue.resolveComponent("el-button"), {
-          "title": core.showTitle(detail.caption),
+          "title": core.showTitle(detail.tooltip || detail.caption),
           "size": btnSize.value,
           "class": [calcCssName(detail)],
           "loading": c.state.buttonsState[detail.id].loading,
@@ -332,6 +332,9 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
         });
       }
       if (item.itemType === "SEPERATOR") {
+        if (c.state.hideSeparator.includes(itemId)) {
+          return null;
+        }
         return vue.createVNode("div", {
           "key": itemId,
           "class": [ns.e("item"), ns.e("item-separator")]

package/lib/control/tree/el-tree-util.cjs

@@ -1,7 +1,9 @@
 'use strict';
 
 var core = require('@ibiz-template/core');
+var qxUtil = require('qx-util');
 var lodashEs = require('lodash-es');
+var vue = require('vue');
 
 "use strict";
 function findNodeData(key, c) {
@@ -73,7 +75,75 @@ function formatNodeDropType(dropType) {
       );
   }
 }
+function useAppTreeBase(c, props) {
+  if (props.defaultExpandedKeys) {
+    c.state.defaultExpandedKeys = props.defaultExpandedKeys;
+  }
+  const initSimpleData = () => {
+    if (!props.data) {
+      return;
+    }
+    const root = props.data.find((item) => {
+      return item.isRoot === true;
+    });
+    if (root) {
+      c.state.rootNodes = props.data;
+      c.state.items = props.data;
+    }
+  };
+  c.evt.on("onCreated", async () => {
+    if (props.isSimple) {
+      initSimpleData();
+      c.state.isLoaded = true;
+    }
+  });
+  vue.watch(
+    () => props.data,
+    () => {
+      if (props.isSimple) {
+        initSimpleData();
+      }
+    },
+    {
+      deep: true
+    }
+  );
+}
+function findChildItems(c, modelData, curItem) {
+  const { detreeNodeRSs } = modelData;
+  const children = [];
+  if (!detreeNodeRSs || detreeNodeRSs.length === 0) {
+    return children;
+  }
+  const rss = detreeNodeRSs.filter((_rss) => {
+    var _a;
+    const temp = c.state.items.find((_item) => {
+      return _item._uuid === curItem.data._uuid;
+    });
+    if (temp) {
+      return _rss.parentDETreeNodeId === ((_a = temp._nodeId) == null ? void 0 : _a.toLowerCase());
+    }
+    return false;
+  });
+  rss.sort((a, b) => {
+    return a.ordervalue - b.ordervalue;
+  });
+  rss.forEach((_rss) => {
+    const child = c.state.items.find((_item) => {
+      var _a;
+      return ((_a = _item._nodeId) == null ? void 0 : _a.toLowerCase()) === _rss.childDETreeNodeId;
+    });
+    if (child) {
+      const temp = lodashEs.cloneDeep(child);
+      temp._id = qxUtil.createUUID();
+      children.push(temp);
+    }
+  });
+  return children;
+}
 
+exports.findChildItems = findChildItems;
 exports.findNodeData = findNodeData;
 exports.formatNodeDropType = formatNodeDropType;
+exports.useAppTreeBase = useAppTreeBase;
 exports.useElTreeUtil = useElTreeUtil;

package/lib/control/tree/tree.cjs

@@ -69,10 +69,22 @@ const TreeControl = /* @__PURE__ */ vue.defineComponent({
     checkStrictly: {
       type: Boolean,
       default: true
+    },
+    isSimple: {
+      type: Boolean,
+      default: false
+    },
+    data: {
+      type: Array,
+      required: false
     }
   },
-  setup() {
+  emits: ["nodeClick"],
+  setup(props, {
+    emit
+  }) {
     const c = vue3Util.useControlController((...args) => new runtime.TreeController(...args));
+    elTreeUtil.useAppTreeBase(c, props);
     const cascadeSelect = vue.ref(false);
     const counterData = vue.reactive({});
     const fn = (counter) => {
@@ -171,7 +183,29 @@ const TreeControl = /* @__PURE__ */ vue.defineComponent({
         treeRefreshKey.value = qxUtil.createUUID();
       }
     });
+    vue.watch(() => c.state.expandedKeys, () => {
+      updateUI();
+    }, {
+      deep: true
+    });
     const loadData = async (item, callback) => {
+      if (props.isSimple) {
+        let children = [];
+        if (item.level === 0) {
+          const tempNodes = c.state.items.find((_item) => {
+            return _item.isRoot;
+          });
+          if (tempNodes) {
+            children = [tempNodes];
+          }
+        } else {
+          children = elTreeUtil.findChildItems(c, props.modelData, item);
+        }
+        item._children = children;
+        callback(toElNodes(children));
+        updateUI();
+        return;
+      }
       let nodes;
       if (item.level === 0) {
         nodes = treeData.value;
@@ -218,9 +252,18 @@ const TreeControl = /* @__PURE__ */ vue.defineComponent({
     const readonly = vue.computed(() => {
       return !!(c.context.srfreadonly === true || c.context.srfreadonly === "true");
     });
-    const onNodeClick = (nodeData, evt) => {
+    const onShowNavView = () => {
+      c.state.showNavView = !c.state.showNavView;
+    };
+    const onNodeClick = (nodeData, data, evt) => {
       var _a, _b;
       evt.stopPropagation();
+      if (c.runMode === "DESIGN") {
+        emit("nodeClick", {
+          nodeData,
+          evt
+        });
+      }
       if (nodeData._disableSelect)
         return;
       if (forbidClick) {
@@ -239,7 +282,11 @@ const TreeControl = /* @__PURE__ */ vue.defineComponent({
           c.onExpandChange(nodeData, expanded);
         }
       }
-      c.onTreeNodeClick(nodeData, evt);
+      if (props.isSimple) {
+        treeRef.value.setCurrentKey((data == null ? void 0 : data._id) || void 0);
+      } else {
+        c.onTreeNodeClick(nodeData, evt);
+      }
       forbidClick = true;
       setTimeout(() => {
         forbidClick = false;
@@ -268,7 +315,7 @@ const TreeControl = /* @__PURE__ */ vue.defineComponent({
     const calcContextMenuItems = (toolbarItems, nodeData, evt, menuState) => {
       const result = [];
       toolbarItems.forEach((item) => {
-        var _a;
+        var _a, _b;
         if (item.itemType === "SEPERATOR") {
           result.push({
             divided: "self"
@@ -279,7 +326,7 @@ const TreeControl = /* @__PURE__ */ vue.defineComponent({
         if (buttonState && !buttonState.visible) {
           return;
         }
-        const menuItem = {};
+        let menuItem = {};
         if (item.showCaption && item.caption) {
           menuItem.label = item.caption;
         }
@@ -309,11 +356,55 @@ const TreeControl = /* @__PURE__ */ vue.defineComponent({
             }, null);
           }
         } else if (item.itemType === "ITEMS") {
-          if ((_a = item.detoolbarItems) == null ? void 0 : _a.length) {
-            menuItem.children = calcContextMenuItems(item.detoolbarItems, nodeData, evt, menuState);
+          const group = item;
+          if ((_a = group.detoolbarItems) == null ? void 0 : _a.length) {
+            menuItem.children = calcContextMenuItems(group.detoolbarItems, nodeData, evt, menuState);
           }
+          if (group.uiactionGroup && group.groupExtractMode) {
+            const menuItems = (_b = group.uiactionGroup.uiactionGroupDetails) == null ? void 0 : _b.filter((detail) => {
+              const detailState = menuState[detail.id];
+              return detailState.visible;
+            }).map((detail) => {
+              const detailState = menuState[detail.id];
+              const {
+                sysImage
+              } = detail;
+              return {
+                label: detail.showCaption ? detail.caption : void 0,
+                icon: detail.showIcon ? vue.createVNode(iBizIcon, {
+                  "icon": sysImage
+                }, null) : void 0,
+                disabled: detailState.disabled,
+                clickableWhenHasChildren: true,
+                onClick: () => {
+                  ContextMenu.closeContextMenu();
+                  c.doUIAction(detail.uiactionId, nodeData, evt, detail.appId);
+                }
+              };
+            });
+            switch (group.groupExtractMode) {
+              case "ITEMS":
+                menuItem.children = menuItems;
+                break;
+              case "ITEMX":
+                if (menuItems) {
+                  menuItem = menuItems[0];
+                  menuItem.children = menuItems.slice(1);
+                }
+                break;
+              case "ITEM":
+              default:
+                menuItem = void 0;
+                if (menuItems) {
+                  result.push(...menuItems);
+                }
+                break;
+            }
+          }
+        }
+        if (menuItem) {
+          result.push(menuItem);
         }
-        result.push(menuItem);
       });
       return result;
     };
@@ -366,7 +457,13 @@ const TreeControl = /* @__PURE__ */ vue.defineComponent({
           id: data._uuid
         }));
       }
-      c.onExpandChange(nodeData, expanded);
+      if (props.isSimple) {
+        const tempData = lodashEs.cloneDeep(nodeData);
+        tempData._id = data._id;
+        c.onExpandChange(tempData, expanded);
+      } else {
+        c.onExpandChange(nodeData, expanded);
+      }
     };
     const debounceSearch = lodashEs.debounce(() => {
       c.load();
@@ -443,6 +540,7 @@ const TreeControl = /* @__PURE__ */ vue.defineComponent({
       allowDrop,
       allowDrag,
       handleDrop,
+      onShowNavView,
       onNodeTextEditBlur
     };
   },
@@ -470,7 +568,7 @@ const TreeControl = /* @__PURE__ */ vue.defineComponent({
     const key = this.c.controlPanel ? "tree" : "default";
     slots[key] = () => {
       if (this.c.state.isLoaded && this.treeRefreshKey) {
-        return vue.createVNode(vue.resolveComponent("el-tree"), {
+        return [vue.createVNode(vue.resolveComponent("el-tree"), {
           "ref": "treeRef",
           "class": this.ns.b("tree"),
           "key": this.treeRefreshKey,
@@ -551,20 +649,34 @@ const TreeControl = /* @__PURE__ */ vue.defineComponent({
             }
             return vue.createVNode("div", {
               "onDblclick": (evt) => this.onNodeDbClick(nodeData, evt),
-              "onClick": (evt) => this.onNodeClick(nodeData, evt),
+              "onClick": (evt) => this.onNodeClick(nodeData, data, evt),
               "onContextmenu": (evt) => this.onNodeContextmenu(nodeData, evt),
               "class": [this.ns.b("node"), nodeData._disableSelect ? this.ns.bm("node", "disabled") : "", (_b = nodeModel.sysCss) == null ? void 0 : _b.cssName]
             }, [content, this.renderCounter(nodeModel), this.renderContextMenu(nodeModel, nodeData)]);
           }
-        });
+        }), this.c.state.enableNavView ? !this.c.state.showNavView ? vue.createVNode("ion-icon", {
+          "class": this.ns.e("nav-icon"),
+          "title": ibiz.i18n.t("component.controlNavigation.showNav"),
+          "name": "eye-outline",
+          "onClick": this.onShowNavView
+        }, null) : vue.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];
       }
     };
-    return vue.withDirectives(vue.createVNode(vue.resolveComponent("iBizControlBase"), {
-      "ref": "treeviewRef",
+    return vue.createVNode(vue.resolveComponent("iBizControlNavigation"), {
       "controller": this.c
-    }, _isSlot(slots) ? slots : {
-      default: () => [slots]
-    }), [[vue.resolveDirective("loading"), this.c.state.isLoading]]);
+    }, {
+      default: () => [vue.withDirectives(vue.createVNode(vue.resolveComponent("iBizControlBase"), {
+        "ref": "treeviewRef",
+        "controller": this.c
+      }, _isSlot(slots) ? slots : {
+        default: () => [slots]
+      }), [[vue.resolveDirective("loading"), this.c.state.isLoading]])]
+    });
   }
 });