@ibiz-template/vue3-components 0.7.38-alpha.43 → 0.7.39

package/lib/control/list/list.cjs

@@ -116,6 +116,39 @@ const ListControl = /* @__PURE__ */ vue.defineComponent({
         c.state.isLoaded = true;
       }
     });
+    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 onExpandData = () => {
+      isCollapse.value = false;
+    };
+    const isSelected = (item) => {
+      let selected = !!c.state.selectedData.find((data) => data.srfkey === item.srfkey);
+      if (c.view.model.viewType === "DELISTVIEW" && c.state.mdctrlActiveMode === 1 && c.state.singleSelect === true)
+        selected = false;
+      return selected;
+    };
+    const toggleSelection = (item) => {
+      const selected = c.state.selectedData;
+      const index = selected.findIndex((data) => data.srfkey === item.srfkey);
+      if (index === -1) {
+        selected.push(item);
+      } else {
+        selected.splice(index, 1);
+      }
+      c.setSelection(selected);
+    };
     vue.watch(() => props.data, () => {
       if (props.isSimple) {
         initSimpleData();
@@ -128,28 +161,20 @@ const ListControl = /* @__PURE__ */ vue.defineComponent({
         context,
         params
       } = c;
-      const findIndex = c.state.selectedData.findIndex((data) => {
-        return data.srfkey === item.srfkey;
-      });
-      const itemClass = [ns.b("item"), ns.is("active", findIndex !== -1)];
       return vue.createVNode(vue.resolveComponent("iBizControlShell"), {
-        "class": itemClass,
         "data": item,
-        "modelData": modelData,
-        "context": context,
         "params": params,
+        "context": context,
+        "class": ns.b("item"),
+        "modelData": modelData,
         "onClick": () => c.onRowClick(item),
         "onDblclick": () => c.onDbRowClick(item)
       }, null);
     };
     const renderDefaultItem = (item) => {
-      const findIndex = c.state.selectedData.findIndex((data) => {
-        return data.srfkey === item.srfkey;
-      });
-      const itemClass = [ns.b("item"), ns.is("active", findIndex !== -1)];
       return vue.createVNode("div", {
-        "class": itemClass,
         "key": item.srfkey,
+        "class": ns.b("item"),
         "onClick": () => c.onRowClick(item),
         "onDblclick": () => c.onDbRowClick(item)
       }, ["".concat(lodashEs.isNil(item.srfmajortext) ? "" : item.srfmajortext)]);
@@ -166,8 +191,27 @@ const ListControl = /* @__PURE__ */ vue.defineComponent({
         }, null);
       }
     };
-    const renderGroup = (group) => {
+    const renderListItems = (items) => {
       const panel = props.modelData.itemLayoutPanel;
+      return items.map((item) => {
+        const cardStyle = ns.cssVarBlock({
+          "item-bg-color": "".concat(item.bgcolor || ""),
+          "text-color": "".concat(item.fontcolor || ""),
+          "hover-bg-color": "".concat(item.hovercolor || ""),
+          "active-bg-color": "".concat(item.activecolor || "")
+        });
+        return vue.createVNode("div", {
+          "style": cardStyle,
+          "class": [ns.b("scroll-item"), ns.is("active", isSelected(item))]
+        }, [c.model.controlStyle === "EXTVIEW2" && !c.state.singleSelect && vue.createVNode(vue.resolveComponent("el-checkbox"), {
+          "size": "large",
+          "class": ns.be("scroll-item", "checkbox"),
+          "modelValue": isSelected(item),
+          "onChange": () => toggleSelection(item)
+        }, null), panel ? renderPanelItem(item, panel) : renderDefaultItem(item)]);
+      });
+    };
+    const renderGroup = (group) => {
       return vue.createVNode(vue.resolveComponent("el-collapse-item"), {
         "class": ns.be("group-content", "item"),
         "name": group.key
@@ -181,73 +225,35 @@ const ListControl = /* @__PURE__ */ vue.defineComponent({
             "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", {
+        default: () => group.children.length > 0 ? renderListItems(group.children) : vue.createVNode("div", {
           "class": ns.bem("group-content", "item", "empty")
         }, [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 = () => {
       if (c.model.enableGroup && !c.state.isSimple) {
         return vue.createVNode(vue.resolveComponent("el-collapse"), {
           "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")]
+          "class": [ns.b("content"), ns.b("group-content"), ns.is("show-underLine", c.model.controlStyle !== "EXTVIEW1")]
         }, {
           default: () => {
             var _a;
             return [(_a = c.state.groups) == null ? void 0 : _a.map((group) => {
               return vue.createVNode("div", {
-                "class": [ns.b("scroll-item")]
+                "class": [ns.b("group")]
               }, [renderGroup(group)]);
             })];
           }
         });
       }
-      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"), ns.is("show-underLine", c.model.controlStyle !== "EXTVIEW1")],
         "infinite-scroll-distance": 10,
         "infinite-scroll-disabled": isLodeMoreDisabled.value,
         "ref": "infiniteScroll",
         "key": infiniteScrollKey.value
-      }, [tempItems.map((item) => {
-        const cardStyle = ns.cssVarBlock({
-          "item-bg-color": "".concat(item.bgcolor || ""),
-          "text-color": "".concat(item.fontcolor || ""),
-          "hover-bg-color": "".concat(item.hovercolor || ""),
-          "active-bg-color": "".concat(item.activecolor || "")
-        });
-        return vue.createVNode("div", {
-          "class": [ns.b("scroll-item")],
-          "style": cardStyle
-        }, [panel ? renderPanelItem(item, panel) : renderDefaultItem(item)]);
-      })]), [[vue.resolveDirective("infinite-scroll"), () => c.loadMore()]]);
+      }, [renderListItems(isCollapse.value ? c.state.items.slice(0, c.state.size) : c.state.items)]), [[vue.resolveDirective("infinite-scroll"), () => c.loadMore()]]);
     };
     const upIcon = () => {
       return vue.createVNode("div", {
@@ -284,9 +290,8 @@ const ListControl = /* @__PURE__ */ vue.defineComponent({
       const ctrlModel = (_a = c.model.controls) == null ? void 0 : _a.find((item) => {
         return item.name === "".concat(c.model.name, "_quicktoolbar");
       });
-      if (!ctrlModel) {
+      if (!ctrlModel)
         return;
-      }
       return vue.createVNode(vue.resolveComponent("iBizToolbarControl"), {
         "modelData": ctrlModel,
         "context": c.context,
@@ -298,9 +303,8 @@ const ListControl = /* @__PURE__ */ vue.defineComponent({
       const ctrlModel = (_a = c.model.controls) == null ? void 0 : _a.find((item) => {
         return item.name === "".concat(c.model.name, "_batchtoolbar");
       });
-      if (!ctrlModel) {
+      if (!ctrlModel)
         return;
-      }
       return vue.createVNode("div", {
         "class": ns.b("batchtoolbar")
       }, [vue.createVNode(vue.resolveComponent("iBizToolbarControl"), {
@@ -310,20 +314,28 @@ const ListControl = /* @__PURE__ */ vue.defineComponent({
       }, null)]);
     };
     const renderNoData = () => {
-      let _slot;
       const {
         isLoaded
       } = c.state;
-      if (!isLoaded) {
+      if (!isLoaded)
         return;
+      const noDataSlots = {
+        default: () => renderQuickToolBar()
+      };
+      if (vue3Util.hasEmptyPanelRenderer(c)) {
+        Object.assign(noDataSlots, {
+          customRender: () => vue.createVNode(vue3Util.IBizCustomRender, {
+            "controller": c
+          }, null)
+        });
       }
       return isLoaded && vue.createVNode(vue.resolveComponent("iBizNoData"), {
         "class": ns.b("content"),
         "text": c.model.emptyText,
         "emptyTextLanguageRes": c.model.emptyTextLanguageRes,
         "hideNoDataImage": c.state.hideNoDataImage
-      }, _isSlot(_slot = renderQuickToolBar()) ? _slot : {
-        default: () => [_slot]
+      }, _isSlot(noDataSlots) ? noDataSlots : {
+        default: () => [noDataSlots]
       });
     };
     const renderCollapseExpandIcon = () => {
@@ -353,7 +365,6 @@ const ListControl = /* @__PURE__ */ vue.defineComponent({
       c,
       ns,
       infiniteScroll,
-      onShowNavView,
       renderListContent,
       renderNoData,
       renderBatchToolBar,
@@ -384,16 +395,16 @@ const ListControl = /* @__PURE__ */ vue.defineComponent({
         "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", {
+        default: () => [content, this.c.state.enableNavView && this.c.state.showNavIcon ? !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
+          "onClick": () => this.c.onShowNavViewChange()
         }, 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
+          "onClick": () => this.c.onShowNavViewChange()
         }, null) : null, this.renderCollapseExpandIcon()]
       })]
     });

package/lib/control/list/list.css

@@ -1 +1 @@
-.ibiz-control-list-item{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;background-color:var(--ibiz-control-list-item-bg-color)}.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);--ibiz-control-list-item-bg-color:unset;display:flex;flex-flow:column nowrap;align-items:stretch;justify-content:flex-start;position:relative;height:100%}.ibiz-control-list__nav-icon{position:absolute;top:18px;right:10px;color:var(--ibiz-color-primary);cursor:pointer}.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%}
+.ibiz-control-list-item{flex-grow:1;cursor:pointer;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);background-color:var(--ibiz-control-list-item-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);--ibiz-control-list-item-bg-color:unset;display:flex;flex-flow:column nowrap;align-items:stretch;justify-content:flex-start;position:relative;height:100%}.ibiz-control-list__nav-icon{position:absolute;top:18px;right:10px;color:var(--ibiz-color-primary);cursor:pointer}.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%}.ibiz-control-list-scroll-item{display:flex;align-items:center}.ibiz-control-list-scroll-item__checkbox{flex-shrink:0;margin-left:var(--ibiz-spacing-tight)}.ibiz-control-list-scroll-item:hover{background-color:var(--ibiz-control-list-hover-bg-color)}.ibiz-control-list-scroll-item.is-active{background-color:var(--ibiz-control-list-active-bg-color)}

package/lib/control/map/map.cjs

@@ -43,6 +43,7 @@ const MapControl = /* @__PURE__ */ vue.defineComponent({
     const c = vue3Util.useControlController((...args) => new runtime.MapController(...args));
     const ns = vue3Util.useNamespace("control-".concat(c.model.controlType.toLowerCase()));
     const mapRef = vue.ref();
+    const mapStyle = c.model.mapStyle;
     const mapOpts = vue.computed(() => {
       return {
         strAreaCode: c.state.strAreaCode,
@@ -54,17 +55,27 @@ const MapControl = /* @__PURE__ */ vue.defineComponent({
       c,
       ns,
       mapRef,
-      mapOpts
+      mapOpts,
+      mapStyle
     };
   },
   render() {
     const {
       state
     } = this.c;
+    if (!state.isLoaded) {
+      return;
+    }
     return vue.createVNode(vue.resolveComponent("iBizControlBase"), {
       "controller": this.c
     }, {
-      default: () => [state.isLoaded && vue.createVNode(vue.resolveComponent("iBizMapChart"), {
+      default: () => [this.mapStyle === "USER" ? vue.createVNode(vue.resolveComponent("iBizMapChartUser"), {
+        "areaData": state.areaData,
+        "pointData": state.pointData,
+        "options": this.mapOpts,
+        "class": this.ns.e("map"),
+        "controller": this.c
+      }, null) : vue.createVNode(vue.resolveComponent("iBizMapChart"), {
         "areaData": state.areaData,
         "pointData": state.pointData,
         "options": this.mapOpts,

package/lib/control/search-bar/filter-tree/filter-tree.cjs

@@ -430,6 +430,8 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
     renderFilterItems = (node) => {
       let _slot2;
       const itemsC = findFilterController(node);
+      if (!itemsC)
+        return;
       if (node.simple) {
         let _slot;
         const child = node.children[0];
@@ -437,6 +439,7 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
           return;
         }
         return [vue.createVNode(vue.resolveComponent("el-select"), {
+          "disabled": child.disabled,
           "model-value": itemsC.key,
           "teleported": false,
           "class": ns.e("field-select"),

package/lib/control/toolbar/export-excel/export-excel.cjs

@@ -2,8 +2,10 @@
 
 var vue = require('vue');
 var vue3Util = require('@ibiz-template/vue3-util');
-require('./export-excel.css');
 var core = require('@ibiz-template/core');
+require('../../../util/index.cjs');
+require('./export-excel.css');
+var buttonUtil = require('../../../util/button-util/button-util.cjs');
 
 "use strict";
 function _isSlot(s) {
@@ -67,6 +69,7 @@ const IBizExportExcel = /* @__PURE__ */ vue.defineComponent({
         return vue.createVNode(vue.resolveComponent("el-button"), {
           "title": core.showTitle(this.item.tooltip),
           "size": this.$props.size,
+          "type": buttonUtil.convertBtnType(this.item.buttonStyle),
           "class": this.ns.b("submenu-button")
         }, _isSlot(_slot = this.btnContent(this.item)) ? _slot : {
           default: () => [_slot]
@@ -132,17 +135,18 @@ const IBizExportExcel = /* @__PURE__ */ vue.defineComponent({
         })];
       }
     }) : vue.createVNode(vue.resolveComponent("el-dropdown"), {
+      "trigger": "click",
       "size": this.$props.size,
       "onCommand": this.onCommand,
-      "popper-class": this.ns.b(),
-      "trigger": "click"
+      "popper-class": this.ns.b()
     }, {
       default: () => {
         let _slot6;
         return vue.createVNode(vue.resolveComponent("el-button"), {
-          "title": core.showTitle(this.item.tooltip),
           "size": this.$props.size,
-          "class": this.ns.e("button")
+          "class": this.ns.e("button"),
+          "title": core.showTitle(this.item.tooltip),
+          "type": buttonUtil.convertBtnType(this.item.buttonStyle)
         }, _isSlot(_slot6 = this.btnContent(this.item)) ? _slot6 : {
           default: () => [_slot6]
         });

package/lib/control/toolbar/short-cut-button/short-cut-button.cjs

@@ -2,8 +2,10 @@
 
 var vue = require('vue');
 var vue3Util = require('@ibiz-template/vue3-util');
-require('./short-cut-button.css');
 var core = require('@ibiz-template/core');
+require('../../../util/index.cjs');
+require('./short-cut-button.css');
+var buttonUtil = require('../../../util/button-util/button-util.cjs');
 
 "use strict";
 const IBizShortCutButton = /* @__PURE__ */ vue.defineComponent({
@@ -54,8 +56,7 @@ const IBizShortCutButton = /* @__PURE__ */ vue.defineComponent({
     }, [vue.createVNode(vue.resolveComponent("el-button"), {
       "title": core.showTitle(this.isShortCut ? "".concat(ibiz.i18n.t("app.cancel")).concat(this.item.tooltip) : this.item.tooltip),
       "size": this.size,
-      "text": Object.is(this.buttonType, "inverse"),
-      "type": this.buttonType,
+      "type": buttonUtil.convertBtnType(this.item.buttonStyle),
       "loading": this.buttonState.loading,
       "disabled": this.buttonState.disabled,
       "onClick": this.onClick

package/lib/control/toolbar/toolbar.cjs

@@ -6,7 +6,9 @@ var runtime = require('@ibiz-template/runtime');
 var core = require('@ibiz-template/core');
 var exportExcel = require('./export-excel/export-excel.cjs');
 var shortCutButton = require('./short-cut-button/short-cut-button.cjs');
+require('../../util/index.cjs');
 require('./toolbar.css');
+var buttonUtil = require('../../util/button-util/button-util.cjs');
 
 "use strict";
 function _isSlot(s) {
@@ -49,6 +51,10 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
       type: Object,
       required: true
     },
+    runMode: {
+      type: String,
+      default: "RUNTIME"
+    },
     context: {
       type: Object,
       required: true
@@ -65,7 +71,10 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
       default: false
     }
   },
-  setup() {
+  emits: ["click"],
+  setup(props, {
+    emit
+  }) {
     var _a;
     const c = vue3Util.useControlController((...args) => new runtime.ToolbarController(...args));
     const ns = vue3Util.useNamespace("control-".concat(c.model.controlType.toLowerCase()));
@@ -73,15 +82,23 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
     const btnSize = vue.ref("default");
     const toolbarStyle = (_a = c.model.toolbarStyle) == null ? void 0 : _a.toLowerCase();
     const handleClick = async (item, event, params) => {
-      await c.onItemClick(item, event, params);
+      if (props.runMode === "RUNTIME") {
+        await c.onItemClick(item, event, params);
+      } else {
+        emit("click", item);
+      }
     };
     const handleActionClick = async (item, event, params) => {
-      const tempItem = {};
-      Object.assign(tempItem, {
-        ...item,
-        itemType: item.detailType
-      });
-      await handleClick(tempItem, event, params);
+      if (props.runMode === "RUNTIME") {
+        const tempItem = {};
+        Object.assign(tempItem, {
+          ...item,
+          itemType: item.detailType
+        });
+        await handleClick(tempItem, event, params);
+      } else {
+        emit("click", item);
+      }
     };
     const renderExtraButtons = (extraButtons) => {
       return extraButtons.map((button) => {
@@ -156,14 +173,16 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
               }, {
                 default: () => [vue.createVNode(vue.resolveComponent("iBizRawItem"), {
                   "rawItem": item2,
-                  "class": ns.b("submenu-rawitem")
+                  "content": item2.rawItem.content,
+                  "class": ns.b("submenu-rawitem"),
+                  "onClick": (e) => handleClick(item2, e)
                 }, null)]
               });
             }
             if (item2.itemType === "DEUIACTION") {
               let _slot2;
               const buttonType = (_b = item2.buttonStyle) == null ? void 0 : _b.toLowerCase();
-              if (actionId === "exportexcel") {
+              if (actionId === "exportexcel" || actionId === "gridview_exportaction") {
                 return vue.createVNode(exportExcel.IBizExportExcel, {
                   "class": [ns.e("menu-exportexcel"), ns.em("item", buttonType), calcCssName(item2)],
                   "mode": "menu",
@@ -200,26 +219,28 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
           let _slot3;
           return vue.createVNode(vue.resolveComponent("el-button"), {
             "loading": ploading,
-            "disabled": pdisabled
+            "disabled": pdisabled,
+            "type": buttonUtil.convertBtnType(groupButtonStyle)
           }, _isSlot(_slot3 = btnContent(item, c.state)) ? _slot3 : {
             default: () => [_slot3]
           });
         }
       });
     };
-    const renderActionButton = (detail) => {
+    const renderActionButton = (detail, type) => {
       if (c.state.buttonsState[detail.id].visible) {
         let _slot4;
-        return [vue.createVNode(vue.resolveComponent("el-button"), {
-          "title": core.showTitle(detail.tooltip || detail.caption),
+        return vue.createVNode(vue.resolveComponent("el-button"), {
           "size": btnSize.value,
-          "class": [calcCssName(detail)],
+          "class": calcCssName(detail),
+          "type": type || buttonUtil.convertBtnType(detail.buttonStyle),
+          "title": core.showTitle(detail.tooltip || detail.caption),
           "loading": c.state.buttonsState[detail.id].loading,
           "disabled": c.state.buttonsState[detail.id].disabled,
           "onClick": (e) => handleActionClick(detail, e)
         }, _isSlot(_slot4 = btnContent(detail, c.state)) ? _slot4 : {
           default: () => [_slot4]
-        })];
+        });
       }
       return null;
     };
@@ -228,7 +249,7 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
         let _slot5;
         const disabled = c.state.buttonsState[detail.id].disabled;
         return vue.createVNode(vue.resolveComponent("el-dropdown-item"), {
-          "class": [ns2.be("dropdown-popper", "dropdown-item"), ns2.is("disabled", disabled)]
+          "class": [ns2.be("dropdown-popper", "dropdown-item"), ns2.is("disabled", disabled), ns.em("item", buttonUtil.convertBtnType(detail.buttonStyle))]
         }, _isSlot(_slot5 = renderActionButton(detail)) ? _slot5 : {
           default: () => [_slot5]
         });
@@ -281,13 +302,14 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
         if (firstIndex !== -1) {
           const firstItem = uiactionGroupDetails.slice(firstIndex, 1);
           const remainders = uiactionGroupDetails.slice(firstIndex + 1);
-          const enableDropdown = remainders.length > 0;
+          const enableDropdown = remainders.length > 1;
           const groupButtonStyle = item.buttonStyle || "";
           return vue.createVNode(vue.resolveComponent("el-dropdown"), {
             "split-button": enableDropdown,
+            "type": buttonUtil.convertBtnType(groupButtonStyle),
             "popper-class": [ns2.b("dropdown-popper"), ns2.bm("dropdown-popper", toolbarStyle), ns2.em("dropdown-popper", groupButtonStyle.toLowerCase()), ns2.bm("dropdown-popper", calcCssName(item))]
           }, {
-            default: () => renderActionButton(firstItem[0]),
+            default: () => renderActionButton(firstItem[0], buttonUtil.convertBtnType(groupButtonStyle)),
             dropdown: () => {
               let _slot7;
               return enableDropdown && vue.createVNode(vue.resolveComponent("el-dropdown-menu"), null, _isSlot(_slot7 = remainders.map((detail) => renderDropdownItem(detail))) ? _slot7 : {
@@ -308,7 +330,7 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
           uiactionGroupDetails
         } = uiactionGroup;
         return uiactionGroupDetails.map((detail) => vue.createVNode("div", {
-          "class": ns2.e("item-deuiaction")
+          "class": [ns2.e("item-deuiaction"), ns.em("item", buttonUtil.convertBtnType(detail.buttonStyle))]
         }, [renderActionButton(detail)]));
       }
       return null;
@@ -328,7 +350,7 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
       }
     };
     const renderToolbarItem = (item) => {
-      var _a2, _b, _c;
+      var _a2, _b;
       const itemId = item.id;
       const visible = (_a2 = c.state.buttonsState[itemId]) == null ? void 0 : _a2.visible;
       const provider = c.itemProviders[itemId];
@@ -358,16 +380,18 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
           "key": itemId,
           "class": [ns.e("item"), ns.e("item-rawitem")]
         }, [vue.createVNode(vue.resolveComponent("iBizRawItem"), {
-          "rawItem": item
+          "rawItem": item,
+          "content": item.rawItem.content,
+          "onClick": (e) => handleClick(item, e)
         }, null)]);
       }
       if (item.itemType === "DEUIACTION") {
         let _slot8;
         const actionId = item.uiactionId;
-        const buttonType = (_b = item.buttonStyle) == null ? void 0 : _b.toLowerCase();
-        if (actionId === "exportexcel") {
+        const buttonStyle = item.buttonStyle;
+        if (actionId === "exportexcel" || actionId === "gridview_exportaction") {
           return vue.createVNode(exportExcel.IBizExportExcel, {
-            "class": [ns.e("item"), ns.e("item-deuiaction"), ns.em("item", buttonType), calcCssName(item)],
+            "class": [ns.e("item"), ns.e("item-deuiaction"), ns.em("item", buttonStyle == null ? void 0 : buttonStyle.toLowerCase()), calcCssName(item)],
             "item": item,
             "btnContent": (barItem) => btnContent(barItem, c.state),
             "size": btnSize.value,
@@ -380,7 +404,7 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
         if (actionId === "shortcut") {
           return vue.createVNode(shortCutButton.IBizShortCutButton, {
             "key": itemId,
-            "class": [ns.e("item"), ns.e("item-deuiaction"), ns.em("item", buttonType), calcCssName(item)],
+            "class": [ns.e("item"), ns.e("item-deuiaction"), ns.em("item", buttonStyle == null ? void 0 : buttonStyle.toLowerCase()), calcCssName(item)],
             "item": item,
             "controller": c,
             "size": btnSize.value,
@@ -389,12 +413,11 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
         }
         return vue.createVNode("div", {
           "key": itemId,
-          "class": [ns.e("item"), ns.e("item-deuiaction"), ns.em("item", buttonType), calcCssName(item), ns.is("loading", c.state.buttonsState[itemId].loading)]
+          "class": [ns.e("item"), ns.e("item-deuiaction"), ns.em("item", buttonStyle == null ? void 0 : buttonStyle.toLowerCase()), calcCssName(item), ns.is("loading", c.state.buttonsState[itemId].loading)]
         }, [vue.createVNode(vue.resolveComponent("el-button"), {
-          "title": core.showTitle(item.tooltip),
           "size": btnSize.value,
-          "text": Object.is(buttonType, "inverse"),
-          "type": buttonType,
+          "title": core.showTitle(item.tooltip),
+          "type": buttonUtil.convertBtnType(buttonStyle),
           "loading": c.state.buttonsState[itemId].loading,
           "disabled": c.state.buttonsState[itemId].disabled,
           "onClick": (e) => handleClick(item, e)
@@ -407,7 +430,7 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
         const groupItem = item;
         const groupButtonStyle = groupItem.buttonStyle || "";
         if (groupItem.groupExtractMode && groupItem.uiactionGroup) {
-          const extractName = "extract-mode-".concat(((_c = groupItem.groupExtractMode) == null ? void 0 : _c.toLowerCase()) || "item");
+          const extractName = "extract-mode-".concat(((_b = groupItem.groupExtractMode) == null ? void 0 : _b.toLowerCase()) || "item");
           return vue.createVNode("div", {
             "class": [ns2.b(), ns2.e(extractName), ns2.em("item", groupButtonStyle.toLowerCase()), calcCssName(item)]
           }, [renderActionGroup(item)]);