@ibiz-template/mob-vue3-components 0.7.41-alpha.19-lts.1 → 0.7.41-alpha.20

package/lib/control/dashboard/portlet/index.cjs

@@ -1,18 +1,24 @@
 'use strict';
 
-require('./portlet-part/index.cjs');
 var index = require('./container-portlet/index.cjs');
 var portletLayout = require('./portlet-layout/portlet-layout.cjs');
 var index$1 = require('./menu-portlet/index.cjs');
 var index$2 = require('./view-portlet/index.cjs');
 var index$3 = require('./list-portlet/index.cjs');
-var portletPart_state = require('./portlet-part/portlet-part.state.cjs');
+var index$4 = require('./rawitem-portlet/index.cjs');
+var index$5 = require('./chart-portlet/index.cjs');
+var index$6 = require('./html-portlet/index.cjs');
+var index$7 = require('./actionbar-portlet/index.cjs');
 var containerPortlet_provider = require('./container-portlet/container-portlet.provider.cjs');
 var containerPortlet = require('./container-portlet/container-portlet.cjs');
 var menuPortlet_provider = require('./menu-portlet/menu-portlet.provider.cjs');
 var menuPortlet = require('./menu-portlet/menu-portlet.cjs');
 var viewPortlet = require('./view-portlet/view-portlet.cjs');
 var listPortlet = require('./list-portlet/list-portlet.cjs');
+var rawitemPortlet = require('./rawitem-portlet/rawitem-portlet.cjs');
+var chartPortlet = require('./chart-portlet/chart-portlet.cjs');
+var htmlPortlet = require('./html-portlet/html-portlet.cjs');
+var actionbarPortlet = require('./actionbar-portlet/actionbar-portlet.cjs');
 
 "use strict";
 
@@ -21,10 +27,17 @@ exports.PortletLayout = portletLayout.PortletLayout;
 exports.IBizMenuPortlet = index$1.IBizMenuPortlet;
 exports.IBizViewPortlet = index$2.IBizViewPortlet;
 exports.IBizListPortlet = index$3.IBizListPortlet;
-exports.PortletPartState = portletPart_state.PortletPartState;
+exports.IBizRawItemPortlet = index$4.IBizRawItemPortlet;
+exports.IBizChartPortlet = index$5.IBizChartPortlet;
+exports.IBizHtmlPortlet = index$6.IBizHtmlPortlet;
+exports.IBizActionBarPortlet = index$7.IBizActionBarPortlet;
 exports.ContainerPortletProvider = containerPortlet_provider.ContainerPortletProvider;
 exports.ContainerPortlet = containerPortlet.ContainerPortlet;
 exports.MenuPortletProvider = menuPortlet_provider.MenuPortletProvider;
 exports.MenuPortlet = menuPortlet.MenuPortlet;
 exports.ViewPortlet = viewPortlet.ViewPortlet;
 exports.ListPortlet = listPortlet.ListPortlet;
+exports.RawItemPortlet = rawitemPortlet.RawItemPortlet;
+exports.ChartPortlet = chartPortlet.ChartPortlet;
+exports.HtmlPortlet = htmlPortlet.HtmlPortlet;
+exports.ActionBarPortlet = actionbarPortlet.ActionBarPortlet;

package/lib/control/dashboard/portlet/menu-portlet/menu-portlet.cjs

@@ -31,8 +31,7 @@ const MenuPortlet = /* @__PURE__ */ vue.defineComponent({
   render() {
     const classArr = [this.ns.b(), this.ns.m(this.modelData.codeName)];
     const {
-      context,
-      params
+      context
     } = this.controller;
     return vue.createVNode(vue.resolveComponent("iBizPortletLayout"), {
       "controller": this.controller,
@@ -41,7 +40,7 @@ const MenuPortlet = /* @__PURE__ */ vue.defineComponent({
       default: () => [this.menu && vue.createVNode(vue.resolveComponent("iBizControlShell"), {
         "modelData": this.menu,
         "context": context,
-        "params": params
+        "params": {}
       }, null)]
     });
   }

package/lib/control/dashboard/portlet/portlet-layout/portlet-layout.cjs

@@ -6,6 +6,9 @@ require('./portlet-layout.css');
 var runtime = require('@ibiz-template/runtime');
 
 "use strict";
+function _isSlot(s) {
+  return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !vue.isVNode(s);
+}
 const PortletLayout = /* @__PURE__ */ vue.defineComponent({
   name: "IBizPortletLayout",
   props: {
@@ -93,14 +96,24 @@ const PortletLayout = /* @__PURE__ */ vue.defineComponent({
           "title": model.title
         }, [model.title])]))]), vue.createVNode("div", {
           "class": this.ns.be("header", "right")
-        }, [model.uiactionGroup && (this.headerAction ? this.renderContent(this.headerAction) : vue.createVNode(vue.resolveComponent("iBizActionToolbar"), {
+        }, [this.headerAction ? this.renderContent(this.headerAction) : model.uiactionGroup && vue.createVNode(vue.resolveComponent("iBizActionToolbar"), {
           "class": this.ns.e("toolbar"),
           "action-details": model.uiactionGroup.uiactionGroupDetails,
           "actions-state": state.actionGroupState,
           "onActionClick": this.onActionClick
-        }, null))])]);
+        }, null)])]);
       }
     }
+    if (model.enableAnchor && this.controller.dashboard.model.showDashboardNavBar) {
+      const _headerRender = /* @__PURE__ */ function() {
+        return headerRender;
+      }();
+      headerRender = vue.createVNode(vue.resolveComponent("van-index-anchor"), {
+        "index": model.title || model.id
+      }, _isSlot(headerRender) ? headerRender : {
+        default: () => [_headerRender]
+      });
+    }
     return vue.createVNode("div", {
       "class": [this.ns.b(), this.ns.is("no-header", !this.isShowHeader)]
     }, [headerRender, vue.createVNode("div", {

package/lib/control/dashboard/portlet/portlet-layout/portlet-layout.css

@@ -1 +1 @@
-.ibiz-portlet-layout{--ibiz-portlet-layout-header-height:2.5rem;--ibiz-portlet-layout-header-padding:0 var(--ibiz-spacing-base);--ibiz-portlet-layout-header-margin:0;--ibiz-portlet-layout-bg-color:var(--ibiz-color-bg-1);--ibiz-portlet-layout-header-bg-color:transparent;--ibiz-portlet-layout-header-border-bottom:0.0625rem solid var(--ibiz-color-border);--ibiz-portlet-layout-caption-max-width:18.75rem;--ibiz-portlet-layout-caption-font-weight:600;--ibiz-portlet-layout-caption-font-size:var(--ibiz-font-size-header-5);--ibiz-portlet-layout-caption-color:var(--ibiz-color-text-1);--ibiz-portlet-layout-content-bg-color:transparent;--ibiz-portlet-layout-content-padding:0 0 var(--ibiz-border-radius-medium);--ibiz-portlet-layout-content-margin:0;--ibiz-portlet-layout-border-radius:var(--ibiz-border-radius-medium);width:100%;height:100%;background-color:var(--ibiz-portlet-layout-bg-color);border-radius:var(--ibiz-portlet-layout-border-radius)}.ibiz-portlet-layout__caption{max-width:var(--ibiz-portlet-layout-caption-max-width)}.ibiz-portlet-layout__caption-text{font-size:var(--ibiz-portlet-layout-caption-font-size);font-weight:var(--ibiz-portlet-layout-caption-font-weight);color:var(--ibiz-portlet-layout-caption-color)}.ibiz-portlet-layout__toolbar{height:100%;display:flex;align-items:center}.ibiz-portlet-layout.is-no-header>.ibiz-portlet-layout-content{height:100%}.ibiz-portlet-layout-header{display:flex;justify-content:space-between}.ibiz-portlet-layout-header.is-custom{position:relative}.ibiz-portlet-layout-header.is-custom .ibiz-portlet-layout-header__left{z-index:1}.ibiz-portlet-layout-header.is-custom .ibiz-portlet-layout-header__right{z-index:1}.ibiz-portlet-layout-header.is-custom .ibiz-portlet-layout-header__bg{position:absolute;top:0;left:0;width:100%;height:100%}.ibiz-portlet-layout-header{height:var(--ibiz-portlet-layout-header-height);padding:var(--ibiz-portlet-layout-header-padding);margin:var(--ibiz-portlet-layout-header-margin);line-height:var(--ibiz-portlet-layout-header-height);background-color:var(--ibiz-portlet-layout-header-bg-color)}.ibiz-portlet-layout-content{height:calc(100% - var(--ibiz-portlet-layout-header-height));padding:var(--ibiz-portlet-layout-content-padding);margin:var(--ibiz-portlet-layout-content-margin);background-color:var(--ibiz-portlet-layout-content-bg-color)}
+.ibiz-portlet-layout{--ibiz-portlet-layout-header-height:3.125rem;--ibiz-portlet-layout-header-padding:var(--ibiz-spacing-base);--ibiz-portlet-layout-header-margin:0;--ibiz-portlet-layout-bg-color:var(--ibiz-color-bg-1);--ibiz-portlet-layout-header-bg-color:var(--ibiz-color-bg-0);--ibiz-portlet-layout-header-border-bottom:0.0625rem solid var(--ibiz-color-border);--ibiz-portlet-layout-caption-max-width:18.75rem;--ibiz-portlet-layout-caption-font-weight:var(--ibiz-font-weight-regular);--ibiz-portlet-layout-caption-font-size:var(--ibiz-font-size-header-6);--ibiz-portlet-layout-caption-color:var(--ibiz-color-text-1);--ibiz-portlet-layout-content-bg-color:transparent;--ibiz-portlet-layout-content-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base);--ibiz-portlet-layout-content-margin:0;--ibiz-portlet-layout-border-radius:var(--ibiz-border-radius-medium);--ibiz-portlet-layout-header-line-height:var(--van-cell-group-title-line-height);width:100%;height:100%;background-color:var(--ibiz-portlet-layout-bg-color);border-radius:var(--ibiz-portlet-layout-border-radius)}.ibiz-portlet-layout__caption{max-width:var(--ibiz-portlet-layout-caption-max-width)}.ibiz-portlet-layout__caption-text{overflow:hidden;font-size:var(--ibiz-portlet-layout-caption-font-size);font-weight:var(--ibiz-portlet-layout-caption-font-weight);color:var(--ibiz-portlet-layout-caption-color);text-overflow:ellipsis;white-space:nowrap}.ibiz-portlet-layout__toolbar{display:flex;align-items:center;height:100%}.ibiz-portlet-layout.is-no-header>.ibiz-portlet-layout-content{height:100%;padding:0}.ibiz-portlet-layout .van-index-anchor{padding:0;font-size:inherit;font-weight:inherit;line-height:inherit;color:inherit;background:inherit}.ibiz-portlet-layout-header{display:flex;justify-content:space-between}.ibiz-portlet-layout-header.is-custom{position:relative}.ibiz-portlet-layout-header.is-custom .ibiz-portlet-layout-header__left{z-index:1}.ibiz-portlet-layout-header.is-custom .ibiz-portlet-layout-header__right{z-index:1}.ibiz-portlet-layout-header.is-custom .ibiz-portlet-layout-header__bg{position:absolute;top:0;left:0;width:100%;height:100%}.ibiz-portlet-layout-header{height:var(--ibiz-portlet-layout-header-height);padding:var(--ibiz-portlet-layout-header-padding);margin:var(--ibiz-portlet-layout-header-margin);line-height:var(--ibiz-portlet-layout-header-line-height);background-color:var(--ibiz-portlet-layout-header-bg-color)}.ibiz-portlet-layout-content{height:calc(100% - var(--ibiz-portlet-layout-header-height));padding:var(--ibiz-portlet-layout-content-padding);margin:var(--ibiz-portlet-layout-content-margin);background-color:var(--ibiz-portlet-layout-content-bg-color)}

package/lib/control/dashboard/portlet/rawitem-portlet/index.cjs

@@ -0,0 +1,21 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var runtime = require('@ibiz-template/runtime');
+var vue3Util = require('@ibiz-template/vue3-util');
+var rawitemPortlet = require('./rawitem-portlet.cjs');
+var rawitemPortlet_provider = require('./rawitem-portlet.provider.cjs');
+
+"use strict";
+const IBizRawItemPortlet = vue3Util.withInstall(
+  rawitemPortlet.RawItemPortlet,
+  function(v) {
+    v.component(rawitemPortlet.RawItemPortlet.name, rawitemPortlet.RawItemPortlet);
+    runtime.registerPortletProvider("RAWITEM", () => new rawitemPortlet_provider.RawItemPortletProvider());
+  }
+);
+
+exports.RawItemPortlet = rawitemPortlet.RawItemPortlet;
+exports.IBizRawItemPortlet = IBizRawItemPortlet;
+exports.default = IBizRawItemPortlet;

package/lib/control/dashboard/portlet/rawitem-portlet/rawitem-portlet.cjs

@@ -0,0 +1,46 @@
+'use strict';
+
+var vue = require('vue');
+var vue3Util = require('@ibiz-template/vue3-util');
+var runtime = require('@ibiz-template/runtime');
+
+"use strict";
+function _isSlot(s) {
+  return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !vue.isVNode(s);
+}
+const RawItemPortlet = /* @__PURE__ */ vue.defineComponent({
+  name: "IBizRawItemPortlet",
+  props: {
+    modelData: {
+      type: Object,
+      required: true
+    },
+    controller: {
+      type: runtime.RawItemPortletController,
+      required: true
+    }
+  },
+  setup(props) {
+    var _a;
+    const ns = vue3Util.useNamespace(`portlet-${(_a = props.modelData.portletType) == null ? void 0 : _a.toLowerCase()}`);
+    const rawItem = props.modelData;
+    return {
+      ns,
+      rawItem
+    };
+  },
+  render() {
+    let _slot;
+    const classArr = [this.ns.b(), this.ns.m(this.modelData.codeName), ...this.controller.containerClass];
+    return vue.createVNode(vue.resolveComponent("iBizPortletLayout"), {
+      "controller": this.controller,
+      "class": classArr
+    }, _isSlot(_slot = vue.h(vue.resolveComponent("iBizRawItem"), {
+      rawItem: this.rawItem
+    })) ? _slot : {
+      default: () => [_slot]
+    });
+  }
+});
+
+exports.RawItemPortlet = RawItemPortlet;

package/lib/control/dashboard/portlet/rawitem-portlet/rawitem-portlet.provider.cjs

@@ -0,0 +1,23 @@
+'use strict';
+
+var runtime = require('@ibiz-template/runtime');
+
+"use strict";
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
+class RawItemPortletProvider {
+  constructor() {
+    __publicField(this, "component", "IBizRawItemPortlet");
+  }
+  async createController(portletModel, dashboard, parent) {
+    const c = new runtime.RawItemPortletController(portletModel, dashboard, parent);
+    await c.init();
+    return c;
+  }
+}
+
+exports.RawItemPortletProvider = RawItemPortletProvider;

package/lib/control/data-view/data-view.cjs

@@ -5,6 +5,7 @@ var vue3Util = require('@ibiz-template/vue3-util');
 var runtime = require('@ibiz-template/runtime');
 require('../../util/index.cjs');
 require('./data-view.css');
+var listRenderUtil = require('../../util/list-util/list-render-util.cjs');
 var usePagination = require('../../util/pagination/use-pagination.cjs');
 
 "use strict";
@@ -57,27 +58,35 @@ const DataViewControl = /* @__PURE__ */ vue.defineComponent({
     loadDefault: {
       type: Boolean,
       default: true
+    },
+    /**
+     * @description 是否是简单模式，即直接传入数据，不加载数据
+     */
+    isSimple: {
+      type: Boolean,
+      required: false
+    },
+    /**
+     * @description 简单模式下传入的数据
+     */
+    data: {
+      type: Array,
+      required: false
     }
   },
   setup(props) {
     const c = vue3Util.useControlController((...args) => new runtime.DataViewControlController(...args));
     const ns = vue3Util.useNamespace(`control-${c.model.controlType.toLowerCase()}`);
-    const active = vue.ref([]);
-    const isLodeMoreDisabled = vue.computed(() => {
-      if (c.model.enablePagingBar === true) {
-        return true;
-      }
-      if (c.model.pagingMode !== 2) {
-        return true;
-      }
-      return c.state.items.length >= c.state.total || c.state.isLoading || c.state.total <= c.state.size;
-    });
+    const {
+      enableLoadMore,
+      renderNoData,
+      renderAddItem,
+      renderScrollList,
+      renderGroup
+    } = listRenderUtil.useListRender(props, c, ns);
     const {
       onPageChange
     } = usePagination.usePagination(c);
-    const showCollapseOrExpandIcon = vue.computed(() => {
-      return !c.model.enableGroup && c.model.pagingMode === 3;
-    });
     const renderPanelItem = (item, modelData) => {
       const {
         context,
@@ -105,34 +114,23 @@ const DataViewControl = /* @__PURE__ */ vue.defineComponent({
         "class": ns.be("item-content", "bottom")
       }, [renderItemAction(item)]) : null]);
     };
-    const renderNoData = () => {
-      const {
-        isLoaded
-      } = c.state;
-      if (!isLoaded) {
-        return;
-      }
-      return isLoaded && vue.createVNode(vue.resolveComponent("iBizNoData"), {
-        "text": c.model.emptyText,
-        "emptyTextLanguageRes": c.model.emptyTextLanguageRes
-      }, null);
-    };
     const renderDefaultItem = (item) => {
       return vue.createVNode(vue.resolveComponent("van-card"), {
         "title": item.srfmajortext,
-        "desc": item.content,
-        "onClick": () => c.onRowClick(item)
+        "desc": item.content
       }, {
         footer: () => renderFooter(item)
       });
     };
     const renderCard = (item) => {
+      var _a;
       const model = c.model;
       const findIndex = c.state.selectedData.findIndex((data) => {
         return data.srfkey === item.srfkey;
       });
       const panel = props.modelData.itemLayoutPanel;
-      const cardClass = [ns.b("item"), ns.is("active", findIndex !== -1)];
+      const itemSysCss = ((_a = model.itemSysCss) == null ? void 0 : _a.cssName) || "";
+      const cardClass = [ns.b("item"), ns.is("active", findIndex !== -1), itemSysCss];
       const cardStyle = {};
       if (model.cardWidth) {
         Object.assign(cardStyle, {
@@ -145,10 +143,9 @@ const DataViewControl = /* @__PURE__ */ vue.defineComponent({
         });
       }
       Object.assign(cardStyle, ns.cssVarBlock({
-        "item-bg-color": `${item.bgcolor || ""}`,
-        "item-font-color": `${item.fontcolor || ""}`,
-        "item-hover-color": `${item.hovercolor || ""}`,
-        "item-active-color": `${item.activecolor || ""}`
+        "color-bg": `${item.bgcolor || ""}`,
+        "color-text": `${item.fontcolor || ""}`,
+        "color-item-active": `${item.activecolor || ""}`
       }));
       return vue.createVNode("div", {
         "class": cardClass,
@@ -156,15 +153,15 @@ const DataViewControl = /* @__PURE__ */ vue.defineComponent({
         "onClick": () => c.onRowClick(item)
       }, [panel ? renderPanelItem(item, panel) : renderDefaultItem(item)]);
     };
-    const renderDefault = () => {
+    const renderContent = (items) => {
       const {
         cardColMD
       } = c.model;
       if (cardColMD) {
         let _slot2;
         return vue.createVNode(vue.resolveComponent("van-row"), {
-          "class": [ns.e("item-row")]
-        }, _isSlot(_slot2 = c.state.items.map((item) => {
+          "class": [ns.e("row")]
+        }, _isSlot(_slot2 = items.map((item) => {
           let _slot;
           return vue.createVNode(vue.resolveComponent("van-col"), {
             "span": cardColMD,
@@ -176,71 +173,42 @@ const DataViewControl = /* @__PURE__ */ vue.defineComponent({
           default: () => [_slot2]
         });
       }
-      return c.state.items.map((item) => {
+      return [...items.map((item) => {
         return renderCard(item);
-      });
+      })];
     };
-    const renderGroup = () => {
-      let _slot4;
-      return vue.createVNode(vue.resolveComponent("van-collapse"), {
-        "modelValue": active.value,
-        "onUpdate:modelValue": ($event) => active.value = $event
-      }, _isSlot(_slot4 = c.state.groups.map((group, index) => {
-        let _slot3;
-        return vue.createVNode(vue.resolveComponent("van-collapse-item"), {
-          "title": group.caption,
-          "name": index
-        }, _isSlot(_slot3 = group.children.map((item) => {
-          return renderCard(item);
-        })) ? _slot3 : {
-          default: () => [_slot3]
-        });
-      })) ? _slot4 : {
-        default: () => [_slot4]
-      });
+    const renderDefault = () => {
+      const result = [];
+      result.push(renderContent(c.state.items));
+      if (c.enableNew) {
+        result.push(renderAddItem());
+      }
+      return result;
     };
     const renderMDContent = () => {
-      const model = c.model;
-      return vue.createVNode(vue.resolveComponent("van-list"), {
-        "class": [ns.b("scroll"), ns.e("content")],
-        "finished": isLodeMoreDisabled.value,
-        "immediate-check": false,
-        "onLoad": () => c.loadMore()
-      }, {
-        default: () => [model.groupMode !== "NONE" ? renderGroup() : renderDefault()]
-      });
-    };
-    const loadMoreIcon = () => {
-      return vue.createVNode("div", {
-        "class": ns.e("load-more"),
-        "onClick": () => c.loadMore()
-      }, [ibiz.i18n.t("control.common.loadMore")]);
-    };
-    const renderLoadMore = () => {
-      let icon = null;
-      const loadMore = c.state.items.length < c.state.total && c.state.total > c.state.size;
-      if (showCollapseOrExpandIcon.value && loadMore) {
-        icon = loadMoreIcon();
-      }
-      return icon;
+      const slots = c.enableGroup ? renderGroup({
+        children: renderContent
+      }) : renderDefault();
+      return renderScrollList(slots);
     };
     return {
       c,
       ns,
-      showCollapseOrExpandIcon,
+      enableLoadMore,
       onPageChange,
       renderNoData,
-      renderMDContent,
-      renderLoadMore
+      renderMDContent
     };
   },
   render() {
     const enablePagingBar = this.c.state.enablePagingBar && this.c.model.pagingMode === 1;
     return vue.createVNode(vue.resolveComponent("iBizControlBase"), {
-      "class": [this.ns.is("enable-page", enablePagingBar || this.showCollapseOrExpandIcon)],
+      "class": [this.ns.is("enable-pagination", enablePagingBar), this.ns.is("enable-group", this.c.enableGroup), this.ns.is("hidden-finished", enablePagingBar || this.c.enableGroup || this.enableLoadMore)],
       "controller": this.c
     }, {
-      default: () => [this.c.state.isCreated && (this.c.state.items.length > 0 ? this.renderMDContent() : this.renderNoData()), enablePagingBar ? vue.createVNode(vue.resolveComponent("van-pagination"), {
+      default: () => [vue.createVNode("div", {
+        "class": this.ns.e("content-container")
+      }, [this.c.state.isCreated && (this.c.state.items.length > 0 ? this.renderMDContent() : this.renderNoData())]), enablePagingBar ? vue.createVNode(vue.resolveComponent("van-pagination"), {
         "class": this.ns.e("pagination"),
         "total-items": this.c.state.total,
         "model-value": this.c.state.curPage,
@@ -248,7 +216,7 @@ const DataViewControl = /* @__PURE__ */ vue.defineComponent({
         "page-count": this.c.state.totalPages,
         "force-ellipses": true,
         "onChange": this.onPageChange
-      }, null) : null, this.renderLoadMore()]
+      }, null) : null]
     });
   }
 });

package/lib/control/data-view/data-view.css

@@ -1 +1 @@
-.ibiz-control-dataview-item{padding:var(--ibiz-control-dataview-item-padding);box-shadow:0 0 12px rgba(0,0,0,.12);background-color:var(--ibiz-control-dataview-item-bg-color);color:var(--ibiz-control-dataview-item-font-color)}.ibiz-control-dataview-item:hover{background-color:var(--ibiz-control-dataview-item-hover-color)}.ibiz-control-dataview-item.is-active{background-color:var(--ibiz-control-dataview-item-active-color)}.ibiz-control-dataview{--ibiz-control-dataview-text-color:var(--ibiz-color-text-0);--ibiz-control-dataview-item-padding:0.625rem;--ibiz-control-dataview-padding:var(--ibiz-spacing-base-tight) var(--ibiz-spacing-base);--ibiz-control-dataview-card-margin:var(--ibiz-spacing-base-tight);--ibiz-control-dataview-item-margin:calc(var(--ibiz-spacing-base-tight) / 2);--ibiz-control-dataview-pagination-height:var(--van-pagination-height);height:100%;--van-card-thumb-size:auto;overflow:var(--ibiz-control-overflow)}.ibiz-control-dataview__content{display:flex;flex-wrap:wrap;height:100%;width:100%;padding:var(--ibiz-control-dataview-padding)}.ibiz-control-dataview__content>*{margin:var(--ibiz-control-dataview-item-margin);flex:none}.ibiz-control-dataview .van-card:not(:first-child){margin-top:var(--ibiz-control-dataview-card-margin)}.ibiz-control-dataview__item-row{width:100%}.ibiz-control-dataview__item-col{margin:var(--ibiz-control-dataview-item-margin) 0}.ibiz-control-dataview.is-enable-page .ibiz-control-dataview__content{height:calc(100% - var(--ibiz-control-dataview-pagination-height))}.ibiz-control-dataview__load-more{display:flex;align-items:center;justify-content:center;height:var(--ibiz-control-dataview-pagination-height);cursor:pointer;color:var(--ibiz-color-link)}
+.ibiz-control-dataview{--ibiz-control-dataview-color-text:var(--ibiz-color-text-0);--ibiz-control-dataview-color-bg:var(--ibiz-color-bg-0);--ibiz-control-dataview-color-item-active:var(--ibiz-color-primary-light-default);--ibiz-control-dataview-color-group-bg:var(--ibiz-color-bg-0);--ibiz-control-dataview-color-group-text:var(--ibiz-color-text-1);--ibiz-control-dataview-spacing-item-padding:var(--ibiz-spacing-base-tight) var(--ibiz-spacing-base);--ibiz-control-dataview-spacing-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base);--ibiz-control-dataview-spacing-item-gap:var(--ibiz-spacing-base-tight);--ibiz-control-dataview-spacing-group-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base);--ibiz-control-dataview-font-group-fontSize:var(--ibiz-font-size-header-6);--ibiz-control-dataview-font-group-lineHeight:var(--ibiz-height-control-default);--ibiz-control-dataview-shadow:var(--ibiz-shadow-elevated);height:100%;--van-card-thumb-size:auto}.ibiz-control-dataview__content-container{height:100%;width:100%}.ibiz-control-dataview__content{display:flex;flex-wrap:wrap;max-height:100%;gap:var(--ibiz-control-dataview-spacing-item-gap);overflow-y:auto;padding:var(--ibiz-control-dataview-spacing-padding)}.ibiz-control-dataview__content .van-list__error-text,.ibiz-control-dataview__content .van-list__finished-text,.ibiz-control-dataview__content .van-list__loading{width:100%}.ibiz-control-dataview__row{gap:0;margin:calc(-1 * var(--ibiz-control-dataview-spacing-item-gap)/ 2)}.ibiz-control-dataview__row .ibiz-control-dataview__item-col{padding:calc(var(--ibiz-control-dataview-spacing-item-gap)/ 2)}.ibiz-control-dataview.is-enable-pagination{display:flex;flex-direction:column}.ibiz-control-dataview.is-enable-pagination .ibiz-control-dataview__content-container{flex:auto;height:0}.ibiz-control-dataview.is-enable-pagination .ibiz-control-dataview__pagination{flex:none}.ibiz-control-dataview.is-hidden-finished .van-list__finished-text{display:none}.ibiz-control-dataview.is-enable-group .ibiz-control-dataview__content{padding:0}.ibiz-control-dataview.is-enable-group .ibiz-control-dataview-group__item{padding:var(--ibiz-control-dataview-spacing-padding)}.ibiz-control-dataview__anchor{width:100%}.ibiz-control-dataview__anchor .van-index-anchor{padding:0}.ibiz-control-dataview-item{flex:none;padding:var(--ibiz-control-dataview-spacing-item-padding);box-shadow:var(--ibiz-control-dataview-shadow);color:var(--ibiz-control-dataview-color-text);background-color:var(--ibiz-control-dataview-color-bg);width:100%}.ibiz-control-dataview-item.is-active{background-color:var(--ibiz-control-dataview-color-item-active)}.ibiz-control-dataview-item>.van-card{padding:0;background-color:transparent;color:inherit}.ibiz-control-dataview-group{height:100%;width:100%}.ibiz-control-dataview-group__container{width:100%;height:100%}.ibiz-control-dataview-group__item{display:flex;flex-direction:column;gap:var(--ibiz-control-dataview-spacing-item-gap)}.ibiz-control-dataview-group__caption{padding:var(--ibiz-control-dataview-spacing-group-padding);font-size:var(--ibiz-control-dataview-font-group-fontSize);line-height:var(--ibiz-control-dataview-font-group-lineHeight);color:var(--ibiz-control-dataview-color-group-text);background-color:var(--ibiz-control-dataview-color-group-bg)}.ibiz-control-dataview-quicktoolbar{width:100%;display:flex;align-items:center;justify-content:center}

package/lib/control/drbar/drbar.controller.cjs

@@ -288,7 +288,6 @@ class DRBarController extends runtime.ControlController {
     }
     if (this.isCreate) {
       this.state.defaultItem = this.model.uniqueTag;
-      return;
     }
   }
   /**
@@ -500,7 +499,10 @@ class DRBarController extends runtime.ControlController {
       context,
       params,
       viewId: drBarItem.appViewId,
-      isRoutePushed
+      isRoutePushed,
+      modalOptions: {
+        replace: true
+      }
     });
   }
   /**

package/lib/control/drtab/drtab.cjs

@@ -7,9 +7,6 @@ var drtab_controller = require('./drtab.controller.cjs');
 require('./drtab.css');
 
 "use strict";
-function _isSlot(s) {
-  return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !vue.isVNode(s);
-}
 const DRTabControl = /* @__PURE__ */ vue.defineComponent({
   name: "IBizDrTabControl",
   props: {
@@ -40,6 +37,13 @@ const DRTabControl = /* @__PURE__ */ vue.defineComponent({
      */
     provider: {
       type: Object
+    },
+    /**
+     * @description 隐藏编辑项
+     */
+    hideEditItem: {
+      type: Boolean,
+      default: void 0
     }
   },
   setup() {
@@ -48,14 +52,11 @@ const DRTabControl = /* @__PURE__ */ vue.defineComponent({
     const ns = vue3Util.useNamespace(`control-${c.model.controlType.toLowerCase()}`);
     const router = vueRouter.useRouter();
     c.setRouter(router);
-    const counterData = vue.reactive({});
+    const counterData = vue.ref({});
     const showPopover = vue.ref(false);
-    const tabPosition = ((_a = c.view.model.tabLayout) == null ? void 0 : _a.toLowerCase()) || "top";
-    const activeTab = vue.computed(() => {
-      return c.state.drTabPages.find((tab) => tab.tag === c.state.activeName);
-    });
+    const layoutMode = ((_a = c.view.model.tabLayout) == null ? void 0 : _a.toLowerCase()) || "top";
     const fn = (counter) => {
-      Object.assign(counterData, counter);
+      counterData.value = counter;
     };
     c.evt.on("onCreated", () => {
       if (c.counter) {
@@ -67,114 +68,39 @@ const DRTabControl = /* @__PURE__ */ vue.defineComponent({
       showPopover.value = false;
       c.handleTabChange();
     };
-    const onChangePopover = (e) => {
-      e.stopPropagation();
-      showPopover.value = !showPopover.value;
-    };
-    vue.onUnmounted(() => {
-      var _a2;
-      (_a2 = c.counter) == null ? void 0 : _a2.offChange(fn);
+    const tabPages = vue.computed(() => {
+      return c.state.drTabPages.map((_tab) => ({
+        id: _tab.tag,
+        text: _tab.caption,
+        icon: _tab.sysImage,
+        counter: _tab.counterId ? counterData.value[_tab.counterId] : null,
+        isHidden: _tab.hidden
+      }));
     });
-    const renderDropdownList = () => {
-      return vue.createVNode(vue.resolveComponent("van-popover"), {
-        "class": ns.e("dropdown-list"),
-        "placement": "bottom-start",
-        "show": showPopover.value,
-        "onUpdate:show": ($event) => showPopover.value = $event
-      }, {
-        default: () => {
-          return vue.createVNode("div", {
-            "class": ns.e("popover")
-          }, [c.state.drTabPages.map((tab) => {
-            if (!tab.hidden) {
-              return vue.createVNode("div", {
-                "class": [ns.em("popover", "item"), ns.is("disabled", tab.disabled)],
-                "onClick": () => onTabChange(tab.tag)
-              }, [tab.sysImage && vue.createVNode(vue.resolveComponent("iBizIcon"), {
-                "icon": tab.sysImage
-              }, null), vue.createVNode("div", {
-                "class": "caption"
-              }, [vue.createVNode("span", {
-                "class": "text"
-              }, [tab.caption]), tab.counterId && vue.createVNode(vue.resolveComponent("iBizBadge"), {
-                "value": counterData[tab.counterId],
-                "counterMode": tab.counterMode
-              }, null)]), tab.tag === c.state.activeName && vue.createVNode("ion-icon", {
-                "name": "checkmark-outline"
-              }, null)]);
-            }
-            return null;
-          })]);
-        },
-        reference: () => {
-          return vue.createVNode(vue.resolveComponent("van-button"), {
-            "onClick": onChangePopover
-          }, {
-            default: () => {
-              var _a2, _b, _c;
-              return [((_a2 = activeTab.value) == null ? void 0 : _a2.sysImage) && vue.createVNode(vue.resolveComponent("iBizIcon"), {
-                "class": ns.em("dropdown-list", "icon"),
-                "icon": activeTab.value.sysImage
-              }, null), vue.createVNode("span", {
-                "class": ns.em("dropdown-list", "caption")
-              }, [(_b = activeTab.value) == null ? void 0 : _b.caption, ((_c = activeTab.value) == null ? void 0 : _c.counterId) && vue.createVNode(vue.resolveComponent("iBizBadge"), {
-                "value": counterData[activeTab.value.counterId],
-                "counterMode": activeTab.value.counterMode
-              }, null)]), vue.createVNode("ion-icon", {
-                "name": "chevron-down-outline"
-              }, null)];
-            }
-          });
-        }
-      });
-    };
-    const renderDefault = () => {
-      let _slot;
-      return vue.createVNode(vue.resolveComponent("van-tabs"), {
-        "class": ns.e("tabs"),
-        "active": c.state.activeName,
-        "onChange": onTabChange
-      }, _isSlot(_slot = c.state.drTabPages.map((tab) => {
-        if (!tab.hidden) {
-          return vue.createVNode(vue.resolveComponent("van-tab"), {
-            "name": tab.tag,
-            "class": ns.e("tab-item"),
-            "disabled": tab.disabled,
-            "badge": tab.counterId ? counterData[tab.counterId] : void 0
-          }, {
-            title: () => vue.createVNode("div", {
-              "class": ns.em("tab-item", "title")
-            }, [tab.sysImage && vue.createVNode(vue.resolveComponent("iBizIcon"), {
-              "class": ns.em("tab-item", "title-icon"),
-              "icon": tab.sysImage
-            }, null), vue.createVNode("span", {
-              "class": ns.em("tab-item", "title-caption")
-            }, [tab.caption])])
-          });
-        }
-        return null;
-      })) ? _slot : {
-        default: () => [_slot]
-      });
-    };
     return {
       c,
       ns,
-      tabPosition,
-      renderDefault,
-      renderDropdownList
+      tabPages,
+      layoutMode,
+      onTabChange
     };
   },
   render() {
     const {
       isCreated,
+      activeName,
       isCalculatedPermission
     } = this.c.state;
     return vue.createVNode(vue.resolveComponent("iBizControlBase"), {
       "controller": this.c,
-      "class": this.ns.b()
+      "class": [this.ns.b(), this.ns.m(this.layoutMode)]
     }, {
-      default: () => [isCreated && isCalculatedPermission && this.tabPosition === "top_dropdownlist" ? this.renderDropdownList() : this.renderDefault()]
+      default: () => [isCreated && isCalculatedPermission && vue.createVNode(vue.resolveComponent("iBizTabLayout"), {
+        "tabPages": this.tabPages,
+        "layoutMode": this.layoutMode,
+        "activeName": activeName,
+        "onTabChange": this.onTabChange
+      }, null)]
     });
   }
 });