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

package/es/control/dashboard/custom-dashboard-container/custom-dashboard-container.mjs

@@ -69,7 +69,15 @@ const CustomDashboardContainer = /* @__PURE__ */ defineComponent({
       return tempModelDatas;
     };
     const handleCustomModelChange = async (args) => {
-      await props.dashboard.initPortlets(args.model);
+      var _a;
+      const filterModels = (_a = props.dashboard.model.controls) == null ? void 0 : _a.filter((element) => {
+        return element.portletType === "FILTER";
+      });
+      if (args.model && args.model.length > 0) {
+        await props.dashboard.initPortlets(args.model);
+      } else if (filterModels && filterModels.length > 0) {
+        await props.dashboard.initPortlets(filterModels);
+      }
       await props.dashboard.initPortletsConfig(args.config);
     };
     const onSaved = async (args) => {
@@ -123,8 +131,7 @@ const CustomDashboardContainer = /* @__PURE__ */ defineComponent({
         });
         props.dashboard.refresh();
         emit("changed", {
-          model: modelDatas,
-          filter: true
+          model: modelDatas
         });
       });
     });

package/es/control/dashboard/dashboard-design/dashboard-design.d.ts

@@ -41,6 +41,7 @@ export declare const DashboardDesign: import("vue").DefineComponent<{
     filterVal: Ref<string>;
     defaultOpens: import("vue").ComputedRef<string[]>;
     layoutModel: Ref<IData[]>;
+    isLoading: Ref<boolean>;
     onReset: () => Promise<void>;
     onSave: () => Promise<void>;
     removeItem: (child: IData) => Promise<void>;

package/es/control/dashboard/dashboard-design/dashboard-design.mjs

@@ -1,9 +1,10 @@
-import { isVNode, defineComponent, ref, computed, watch, onUnmounted, createVNode, resolveComponent, h, createTextVNode } from 'vue';
+import { isVNode, defineComponent, ref, computed, watch, onUnmounted, createVNode, resolveComponent, h, createTextVNode, withDirectives, resolveDirective } from 'vue';
 import { getPortletProvider } from '@ibiz-template/runtime';
 import { useNamespace } from '@ibiz-template/vue3-util';
+import { showTitle } from '@ibiz-template/core';
 import { clone } from 'ramda';
+import { loadDefaultLayoutModel } from './dashboard-design.util.mjs';
 import './dashboard-design.css';
-import { showTitle } from '@ibiz-template/core';
 
 "use strict";
 function _isSlot(s) {
@@ -41,6 +42,7 @@ const DashboardDesign = /* @__PURE__ */ defineComponent({
     const providers = ref({});
     const portletControllers = ref({});
     const designPanel = ref(null);
+    const isLoading = ref(false);
     const filterData = (list1) => {
       const items = [];
       list1.forEach((data) => {
@@ -129,6 +131,7 @@ const DashboardDesign = /* @__PURE__ */ defineComponent({
       } else if (app.model.appPortletCats && app.model.appPortlets) {
         const isDEView = customC.model.appDataEntityId;
         const categoryTag = props.dashboard.controlParams.categorytag;
+        const portletNameTag = props.dashboard.controlParams.portletnametag;
         app.model.appPortlets.forEach((portlet) => {
           var _a;
           if (!isDEView && !portlet.enableAppDashboard) {
@@ -142,7 +145,14 @@ const DashboardDesign = /* @__PURE__ */ defineComponent({
             return cat.codeName === ((_a2 = portlet.appPortletCat) == null ? void 0 : _a2.codeName);
           });
           if (categoryTag) {
-            if (!portletCat || portletCat.codeName !== categoryTag) {
+            const categoryRegex = new RegExp(categoryTag);
+            if (!portletCat || portletCat && portletCat.codeName && !categoryRegex.test(portletCat.codeName)) {
+              return;
+            }
+          }
+          if (portletNameTag) {
+            const portletNameRegex = new RegExp(portletNameTag);
+            if (portlet.codeName && !portletNameRegex.test(portlet.codeName)) {
               return;
             }
           }
@@ -241,17 +251,27 @@ const DashboardDesign = /* @__PURE__ */ defineComponent({
     };
     watch(() => props.isShowDesign, async (newVal) => {
       if (newVal) {
-        await prepareData();
-        const res = await customC.loadCustomModelData();
-        const model = clone(res.model);
-        const tempModelDatas = await preparePortlet(model);
-        layoutModel.value = model;
-        layoutModel.value.forEach((item, index) => {
-          if (item.dynamodelFlag) {
-            item.portletModel = tempModelDatas[index];
+        try {
+          isLoading.value = true;
+          await prepareData();
+          const res = await customC.loadCustomModelData();
+          let model = clone(res.model);
+          if (!model.length) {
+            model = loadDefaultLayoutModel(c, customC);
           }
-        });
-        layoutConfig.value = clone(res.config);
+          const tempModelDatas = await preparePortlet(model);
+          layoutModel.value = model;
+          layoutModel.value.forEach((item, index) => {
+            if (item.dynamodelFlag) {
+              item.portletModel = tempModelDatas[index];
+            }
+          });
+          layoutConfig.value = clone(res.config);
+        } catch (error) {
+          ibiz.log.error(error);
+        } finally {
+          isLoading.value = false;
+        }
       }
     }, {
       immediate: true
@@ -353,6 +373,7 @@ const DashboardDesign = /* @__PURE__ */ defineComponent({
       filterVal,
       defaultOpens,
       layoutModel,
+      isLoading,
       onReset,
       onSave,
       removeItem,
@@ -502,9 +523,9 @@ const DashboardDesign = /* @__PURE__ */ defineComponent({
       default: () => [_slot5]
     }), createVNode("div", {
       "class": this.ns.b("tree-content")
-    }, [renderTree()])]), createVNode("div", {
-      "class": this.ns.b("scroll-box"),
-      "ref": "designPanel"
+    }, [renderTree()])]), withDirectives(createVNode("div", {
+      "ref": "designPanel",
+      "class": this.ns.b("scroll-box")
     }, [createVNode("div", {
       "class": this.ns.b("panel")
     }, [createVNode("div", {
@@ -550,7 +571,7 @@ const DashboardDesign = /* @__PURE__ */ defineComponent({
       });
     })) ? _slot6 : {
       default: () => [_slot6]
-    })])])])]);
+    })])]), [[resolveDirective("loading"), this.isLoading]])])]);
   }
 });
 

package/es/control/dashboard/dashboard-design/dashboard-design.util.d.ts

@@ -0,0 +1,10 @@
+import { CustomDashboardController, DashboardController } from '@ibiz-template/runtime';
+/**
+ * 加载默认模型布局
+ *
+ * @export
+ * @param {DashboardController} dashboard
+ * @param {CustomDashboardController} customDashboard
+ * @return {*}  {IData[]}
+ */
+export declare function loadDefaultLayoutModel(dashboard: DashboardController, customDashboard: CustomDashboardController): IData[];

package/es/control/dashboard/dashboard-design/dashboard-design.util.mjs

@@ -0,0 +1,246 @@
+"use strict";
+function calcGridSpanOffset(layoutPos) {
+  const {
+    layout,
+    colXS,
+    colSM,
+    colMD,
+    colLG,
+    colXSOffset,
+    colSMOffset,
+    colMDOffset,
+    colLGOffset
+  } = layoutPos;
+  const _span = colXS || colSM || colMD || colLG;
+  const _offset = colXSOffset || colSMOffset || colMDOffset || colLGOffset;
+  const spanDefault = layout === "TABLE_24COL" ? 24 : 12;
+  const span = !_span || _span === -1 ? 1 : _span / spanDefault;
+  const offset = !_offset || _offset === -1 ? 0 : _offset / spanDefault;
+  return { span, offset };
+}
+function calculateXYPositions(items, parentPos) {
+  let currentRowWidth = 0;
+  let currentY = 0;
+  let currentRowHeight = 0;
+  items.forEach((item) => {
+    if (currentRowWidth + item.x + item.w > parentPos.w) {
+      currentY += currentRowHeight;
+      currentRowWidth = 0;
+      currentRowHeight = 0;
+    }
+    item.x = currentRowWidth + item.x;
+    item.y = currentY;
+    currentRowWidth += item.x + item.w - currentRowWidth;
+    currentRowHeight = Math.max(currentRowHeight, item.h);
+  });
+  items.forEach((item) => {
+    item.x += parentPos.x;
+  });
+}
+function calculatePositions(items, parentPos) {
+  const { dir, align, valign } = parentPos.layout;
+  const flexLayoutPos = [];
+  const models = (dir == null ? void 0 : dir.includes("reverse")) ? items.toReversed() : items;
+  if (dir == null ? void 0 : dir.includes("row")) {
+    const W = parseFloat((parentPos.w / models.length).toFixed(1));
+    let widthSum = 0;
+    let growCount = 0;
+    let shrinkCont = 0;
+    models.forEach((model) => {
+      const { grow, width } = model.layoutPos;
+      if (grow || !width) {
+        growCount++;
+      } else {
+        shrinkCont++;
+        widthSum += parseFloat((width / 100).toFixed(1));
+      }
+    });
+    const fixedWidthSum = widthSum > W * shrinkCont ? W * shrinkCont : widthSum;
+    const remainingWidth = parentPos.w - fixedWidthSum;
+    const growWidth = growCount > 0 ? remainingWidth / growCount : 0;
+    models.forEach((model) => {
+      const { grow, width } = model.layoutPos;
+      flexLayoutPos.push({
+        x: 0,
+        model,
+        w: grow || !width ? growWidth : parseFloat((width / 100).toFixed(1))
+      });
+    });
+    const flexW = flexLayoutPos.reduce((sum, element) => sum + element.w, 0);
+    const poorW = parentPos.w - flexW;
+    switch (align) {
+      case "flex-start":
+        if (dir === "row-reverse") {
+          flexLayoutPos[0].x = poorW;
+        }
+        break;
+      case "flex-end":
+        if (dir === "row") {
+          flexLayoutPos[0].x = poorW;
+        }
+        break;
+      case "center":
+        if (poorW) {
+          flexLayoutPos[0].x = poorW / 2;
+        }
+        break;
+      case "space-between":
+        if (poorW && flexLayoutPos.length > 1) {
+          const x = poorW / (flexLayoutPos.length - 1);
+          flexLayoutPos.forEach((f, index) => {
+            if (index !== 0) {
+              f.x = x;
+            }
+          });
+        }
+        break;
+      case "space-around":
+        if (poorW) {
+          const x = poorW / (flexLayoutPos.length * 2);
+          flexLayoutPos.forEach((f, index) => {
+            if (index === 0) {
+              f.x = x;
+            } else {
+              f.x = x * 2;
+            }
+          });
+        }
+        break;
+      default:
+        break;
+    }
+  }
+  if (dir == null ? void 0 : dir.includes("column")) {
+    models.forEach((model) => {
+      const { width } = model.layoutPos;
+      let x = 0;
+      let w = parentPos.w;
+      if (width) {
+        w = width / 100 > 1 && width / 100 < parentPos.w ? width / 100 : parentPos.w;
+      }
+      const poorW = parentPos.w - w;
+      switch (valign) {
+        case "flex-end":
+          x = poorW;
+          break;
+        case "center":
+          if (poorW) {
+            x = (parentPos.w - w) / 2;
+          }
+          break;
+        default:
+          break;
+      }
+      flexLayoutPos.push({
+        x,
+        w,
+        model
+      });
+    });
+  }
+  return flexLayoutPos;
+}
+function loadDefaultLayoutModel(dashboard, customDashboard) {
+  var _a;
+  const { layoutRowH, layoutColNum } = customDashboard;
+  const app = ibiz.hub.getApp(ibiz.env.appId);
+  const recursivePortlePart = (container, parentPos) => {
+    const { controls, layout } = container;
+    const children = (controls == null ? void 0 : controls.filter((child) => !!child.layoutPos)) || [];
+    const portletLayoutPos = [];
+    const childrenLayoutPos = [];
+    if ((layout == null ? void 0 : layout.layout) === "TABLE_24COL" || (layout == null ? void 0 : layout.layout) === "TABLE_12COL") {
+      children.forEach((model) => {
+        var _a2;
+        const { height } = model.layoutPos;
+        const { span, offset } = calcGridSpanOffset(model.layoutPos);
+        const w = span * parentPos.w;
+        const x = offset * parentPos.w;
+        let h = height ? height / layoutRowH : 3;
+        if (model.portletType === "CONTAINER" && ((_a2 = model.controls) == null ? void 0 : _a2.length)) {
+          const _childrenLayoutPos = recursivePortlePart(model, { w, x });
+          h = _childrenLayoutPos.reduce((max, current) => {
+            return Math.max(max, current.y + current.h);
+          }, -Infinity);
+          childrenLayoutPos.push(..._childrenLayoutPos);
+        }
+        portletLayoutPos.push({
+          w,
+          x,
+          h,
+          y: 0,
+          model,
+          parentId: container.codeName
+        });
+      });
+    } else if ((layout == null ? void 0 : layout.layout) === "FLEX") {
+      const flexLayoutPos = calculatePositions(children, {
+        ...parentPos,
+        layout
+      });
+      flexLayoutPos.forEach((pos) => {
+        var _a2;
+        const { x, w, model } = pos;
+        const { height } = model.layoutPos;
+        let h = height ? height / layoutRowH : 3;
+        if (model.portletType === "CONTAINER" && ((_a2 = model.controls) == null ? void 0 : _a2.length)) {
+          const _childrenLayoutPos = recursivePortlePart(model, { w, x });
+          h = _childrenLayoutPos.reduce((max, current) => {
+            return Math.max(max, current.y + current.h);
+          }, -Infinity);
+          childrenLayoutPos.push(..._childrenLayoutPos);
+        }
+        portletLayoutPos.push({
+          w,
+          x,
+          h,
+          y: 0,
+          model,
+          parentId: container.codeName
+        });
+      });
+    }
+    calculateXYPositions(portletLayoutPos, parentPos);
+    portletLayoutPos.forEach((layoutPos) => {
+      if (layoutPos.model.portletType === "CONTAINER") {
+        const _children = childrenLayoutPos.filter(
+          (child) => child.parentId === layoutPos.model.codeName
+        );
+        _children.forEach((child) => {
+          child.x += layoutPos.x;
+          child.y += layoutPos.y;
+        });
+      }
+    });
+    const modelLayoutPos = portletLayoutPos.filter(
+      (layoutPos) => !["CONTAINER", "RAWITEM"].includes(layoutPos.model.portletType)
+    );
+    modelLayoutPos.push(...childrenLayoutPos);
+    return modelLayoutPos;
+  };
+  const layoutModel = [];
+  if ((_a = dashboard.model.controls) == null ? void 0 : _a.length) {
+    const modelLayoutPos = recursivePortlePart(dashboard.model, {
+      x: 0,
+      w: layoutColNum
+    });
+    modelLayoutPos.forEach((layout) => {
+      const { x, y, w, h, model } = layout;
+      layoutModel.push({
+        x,
+        y,
+        w,
+        h,
+        i: model.codeName,
+        appName: app.model.name,
+        portletName: model.title,
+        portletImage: model.sysImage,
+        portletCodeName: model.codeName,
+        appCodeName: model.appDataEntityId || app.model.pkgcodeName
+      });
+    });
+  }
+  return layoutModel;
+}
+
+export { loadDefaultLayoutModel };

package/es/control/dashboard/dashboard.mjs

@@ -75,6 +75,9 @@ const DashboardControl = /* @__PURE__ */ defineComponent({
       anchorList.value = c.enableAnchorCtrls;
     });
     c.evt.on("onItemModelReset", async (args) => {
+      if (c.model.customizeMode !== 2) {
+        return;
+      }
       const {
         name
       } = args;
@@ -95,7 +98,8 @@ const DashboardControl = /* @__PURE__ */ defineComponent({
     });
     const handleCustomModelChange = (args) => {
       const model = args.model;
-      if (args.filter && model && model.length > 0) {
+      const controls = c.model.controls;
+      if (model && model.length > 0) {
         model.forEach((element) => {
           if (element.portletType === "FILTER") {
             refreshTagObj[element.id] = {
@@ -103,6 +107,14 @@ const DashboardControl = /* @__PURE__ */ defineComponent({
             };
           }
         });
+      } else if (controls && controls.length > 0) {
+        controls.forEach((element) => {
+          if (element.portletType === "FILTER") {
+            refreshTagObj[element.id] = {
+              refreshtag: uniqueId()
+            };
+          }
+        });
       }
       customModelDatas.value = model;
       vue.$forceUpdate();

package/es/control/dashboard/portlet/filter-portlet/filter-portlet-design/filter-portlet-design.css

@@ -1 +1 @@
-.ibiz-filter-portlet-design{--ibiz-filter-portlet-design-layout-left-width:260px;display:flex;width:100%;height:100%}.ibiz-filter-portlet-design__layout-left{width:var(--ibiz-filter-portlet-design-layout-left-width);background-color:var(--ibiz-color-bg-0);border-right:1px solid var(--ibiz-color-border)}.ibiz-filter-portlet-design__layout-right{display:flex;flex:1;flex-direction:column}.ibiz-filter-portlet-design-left-content__title{height:var(--ibiz-height-control-default);padding:0 var(--ibiz-spacing-extra-loose);margin:var(--ibiz-spacing-extra-tight) 0;font-size:var(--ibiz-font-size-header-6);line-height:var(--ibiz-height-control-default)}.ibiz-filter-portlet-design-left-list{padding:0;padding:0 var(--ibiz-spacing-base-tight);margin:0;margin-top:var(--ibiz-spacing-base-tight);font-size:var(--ibiz-font-size-regular);list-style:none outside none;color-scheme:light;cursor:pointer;visibility:visible;unicode-bidi:isolate}.ibiz-filter-portlet-design-left-list__item{height:var(--ibiz-height-control-default);padding:0 var(--ibiz-spacing-base-loose);margin-bottom:var(--ibiz-spacing-base-tight);overflow:hidden;line-height:var(--ibiz-height-control-default);text-overflow:ellipsis;white-space:nowrap;border-radius:var(--ibiz-border-radius-small);transition:background-color .3s,transform .3s}.ibiz-filter-portlet-design-left-list__item:last-child{margin-bottom:0}.ibiz-filter-portlet-design-left-list__item:hover{background-color:var(--ibiz-color-fill-0)}.ibiz-filter-portlet-design-left-list__item.is-actvie{color:var(--ibiz-color-primary);background-color:var(--ibiz-color-primary-light-default)}.ibiz-filter-portlet-design-left-list__item.is-disabled{cursor:no-drop;background-color:transparent}.ibiz-filter-portlet-design-right-content{flex:auto}.ibiz-filter-portlet-design-right-content__title{height:var(--ibiz-height-control-default);padding:0 var(--ibiz-spacing-extra-loose);margin:var(--ibiz-spacing-tight) 0;line-height:var(--ibiz-height-control-default)}.ibiz-filter-portlet-design-right-form{padding:0 var(--ibiz-spacing-extra-loose)}.ibiz-filter-portlet-design-right-form__checks{position:relative}.ibiz-filter-portlet-design-right-form__checks .el-form-item__content{position:static}.ibiz-filter-portlet-design-right-form__checks .el-switch{position:absolute;top:0;right:0}.ibiz-filter-portlet-design-right-form .el-form-item{display:flex;flex-flow:column nowrap;margin-bottom:var(--ibiz-spacing-base)}.ibiz-filter-portlet-design-right-form .el-form-item .el-form-item__label-wrap{margin-left:0!important}.ibiz-filter-portlet-design-right-form .el-form-item.is-required:not(.is-no-asterisk).asterisk-left>.el-form-item__label-wrap>.el-form-item__label::before,.ibiz-filter-portlet-design-right-form .el-form-item.is-required:not(.is-no-asterisk).asterisk-left>.el-form-item__label::before{display:none}.ibiz-filter-portlet-design-right-form .el-form-item.is-required:not(.is-no-asterisk).asterisk-left>.el-form-item__label-wrap>.el-form-item__label::after,.ibiz-filter-portlet-design-right-form .el-form-item.is-required:not(.is-no-asterisk).asterisk-left>.el-form-item__label::after{margin-right:var(--ibiz-spacing-extra-tight);margin-left:var(--ibiz-spacing-extra-tight);color:var(--el-color-danger);content:"*"}.ibiz-filter-portlet-design-right-form .el-select{width:100%}.ibiz-filter-portlet-design-checkbox__label{padding-left:var(--ibiz-spacing-tight)}.ibiz-filter-portlet-design-checkbox.is-only-add .el-checkbox.is-checked{cursor:not-allowed}.ibiz-filter-portlet-design-checkbox.is-only-add .el-checkbox.is-checked .el-checkbox__inner{background-color:var(--el-checkbox-disabled-checked-input-fill);border-color:var(--el-checkbox-disabled-checked-input-border-color)}.ibiz-filter-portlet-design-checkbox.is-only-add .el-checkbox.is-checked .el-checkbox__inner::after{border-color:var(--el-checkbox-disabled-checked-icon-color)}.ibiz-filter-portlet-design-checkbox.is-only-add .el-checkbox.is-checked .el-checkbox__label{color:var(--el-disabled-text-color);cursor:not-allowed}.ibiz-filter-portlet-design-checkbox .ibiz-icon{padding-left:var(--ibiz-spacing-tight)}.ibiz-filter-portlet-design-checkbox .el-checkbox__label{display:flex;align-items:center;padding-left:0}.ibiz-filter-portlet-design-checkbox .el-checkbox{--el-checkbox-input-border:var(--el-border-width) var(--el-border-style) var(--ibiz-color-border);--el-checkbox-disabled-checked-input-fill:var(--ibiz-color-border);--el-checkbox-text-color:var(--ibiz-color-disabled-text)}.ibiz-filter-portlet-design-condition{padding:0 var(--ibiz-spacing-extra-loose);overflow:auto}.ibiz-filter-portlet-design-footer{display:flex;justify-content:flex-end;padding:var(--ibiz-spacing-base) var(--ibiz-spacing-extra-loose)}
+.ibiz-filter-portlet-design{--ibiz-filter-portlet-design-layout-left-width:260px;display:flex;width:100%;height:100%}.ibiz-filter-portlet-design__layout-left{width:var(--ibiz-filter-portlet-design-layout-left-width);background-color:var(--ibiz-color-bg-0);border-right:1px solid var(--ibiz-color-border)}.ibiz-filter-portlet-design__layout-right{display:flex;flex:1;flex-direction:column}.ibiz-filter-portlet-design-left-content__title{height:var(--ibiz-height-control-default);padding:0 var(--ibiz-spacing-extra-loose);margin:var(--ibiz-spacing-extra-tight) 0;font-size:var(--ibiz-font-size-header-6);line-height:var(--ibiz-height-control-default)}.ibiz-filter-portlet-design-left-list{padding:0;padding:0 var(--ibiz-spacing-base-tight);margin:0;margin-top:var(--ibiz-spacing-base-tight);font-size:var(--ibiz-font-size-regular);list-style:none outside none;color-scheme:light;cursor:pointer;visibility:visible;unicode-bidi:isolate}.ibiz-filter-portlet-design-left-list__item{height:var(--ibiz-height-control-default);padding:0 var(--ibiz-spacing-base-loose);margin-bottom:var(--ibiz-spacing-base-tight);overflow:hidden;line-height:var(--ibiz-height-control-default);text-overflow:ellipsis;white-space:nowrap;border-radius:var(--ibiz-border-radius-small);transition:background-color .3s,transform .3s}.ibiz-filter-portlet-design-left-list__item:last-child{margin-bottom:0}.ibiz-filter-portlet-design-left-list__item:hover{background-color:var(--ibiz-color-fill-0)}.ibiz-filter-portlet-design-left-list__item.is-actvie{color:var(--ibiz-color-primary);background-color:var(--ibiz-color-primary-light-default)}.ibiz-filter-portlet-design-left-list__item.is-disabled{cursor:no-drop;background-color:transparent}.ibiz-filter-portlet-design-right-content{flex:auto}.ibiz-filter-portlet-design-right-content__title{height:var(--ibiz-height-control-default);padding:0 var(--ibiz-spacing-extra-loose);margin:var(--ibiz-spacing-tight) 0;line-height:var(--ibiz-height-control-default)}.ibiz-filter-portlet-design-right-form{padding:0 var(--ibiz-spacing-extra-loose)}.ibiz-filter-portlet-design-right-form__checks{position:relative}.ibiz-filter-portlet-design-right-form__checks .el-form-item__content{position:static}.ibiz-filter-portlet-design-right-form__checks .el-switch{position:absolute;top:0;right:0}.ibiz-filter-portlet-design-right-form .el-form-item{display:flex;flex-flow:column nowrap;margin-bottom:var(--ibiz-spacing-base)}.ibiz-filter-portlet-design-right-form .el-form-item .el-form-item__label-wrap{margin-left:0!important}.ibiz-filter-portlet-design-right-form .el-form-item.is-required:not(.is-no-asterisk).asterisk-left>.el-form-item__label-wrap>.el-form-item__label::before,.ibiz-filter-portlet-design-right-form .el-form-item.is-required:not(.is-no-asterisk).asterisk-left>.el-form-item__label::before{display:none}.ibiz-filter-portlet-design-right-form .el-form-item.is-required:not(.is-no-asterisk).asterisk-left>.el-form-item__label-wrap>.el-form-item__label::after,.ibiz-filter-portlet-design-right-form .el-form-item.is-required:not(.is-no-asterisk).asterisk-left>.el-form-item__label::after{margin-right:var(--ibiz-spacing-extra-tight);margin-left:var(--ibiz-spacing-extra-tight);color:var(--el-color-danger);content:"*"}.ibiz-filter-portlet-design-right-form .el-select{width:100%}.ibiz-filter-portlet-design-checkbox__label{padding-left:var(--ibiz-spacing-tight)}.ibiz-filter-portlet-design-checkbox.is-only-add .el-checkbox.is-checked{cursor:not-allowed}.ibiz-filter-portlet-design-checkbox.is-only-add .el-checkbox.is-checked .el-checkbox__inner{background-color:var(--el-checkbox-disabled-checked-input-fill);border-color:var(--el-checkbox-disabled-checked-input-border-color)}.ibiz-filter-portlet-design-checkbox.is-only-add .el-checkbox.is-checked .el-checkbox__inner::after{border-color:var(--el-checkbox-disabled-checked-icon-color)}.ibiz-filter-portlet-design-checkbox.is-only-add .el-checkbox.is-checked .el-checkbox__label{color:var(--el-disabled-text-color);cursor:not-allowed}.ibiz-filter-portlet-design-checkbox .ibiz-icon{padding-left:var(--ibiz-spacing-tight)}.ibiz-filter-portlet-design-checkbox .el-checkbox__label{display:flex;align-items:center;padding-left:0}.ibiz-filter-portlet-design-checkbox .el-checkbox{--el-checkbox-input-border:var(--el-border-width) var(--el-border-style) var(--ibiz-color-border);--el-checkbox-disabled-checked-input-fill:var(--ibiz-color-border);--el-checkbox-text-color:var(--ibiz-color-disabled-text)}.ibiz-filter-portlet-design-checkbox .el-checkbox__input{margin-right:var(--ibiz-spacing-tight)}.ibiz-filter-portlet-design-condition{padding:0 var(--ibiz-spacing-extra-loose);overflow:auto}.ibiz-filter-portlet-design-footer{display:flex;justify-content:flex-end;padding:var(--ibiz-spacing-base) var(--ibiz-spacing-extra-loose)}

package/es/control/dashboard/portlet/filter-portlet/filter-portlet-design/filter-portlet-design.mjs

@@ -230,7 +230,8 @@ const IBizFilterPortletDesign = /* @__PURE__ */ defineComponent({
         "disabled": formData.selectAll
       }, _isSlot(_slot = checkBoxList.value.map((item) => {
         return createVNode(resolveComponent("el-checkbox"), {
-          "label": item.id
+          "label": item.id,
+          "disabled": onlyAdd && formData.items.includes(item.id)
         }, {
           default: () => [item.title]
         });
@@ -269,6 +270,7 @@ const IBizFilterPortletDesign = /* @__PURE__ */ defineComponent({
           "props": "items"
         }, {
           default: () => [createVNode(resolveComponent("el-switch"), {
+            "title": ibiz.i18n.t("control.dashboard.filterPortletDesign.selectAll"),
             "modelValue": formData.selectAll,
             "onUpdate:modelValue": ($event) => formData.selectAll = $event,
             "onChange": onSwitchChange
@@ -306,11 +308,13 @@ const IBizFilterPortletDesign = /* @__PURE__ */ defineComponent({
       return createVNode("div", {
         "class": ns.b("footer")
       }, [createVNode(resolveComponent("el-button"), {
-        "onClick": handleCancel
+        "onClick": handleCancel,
+        "title": ibiz.i18n.t("app.cancel")
       }, _isSlot(_slot2 = ibiz.i18n.t("app.cancel")) ? _slot2 : {
         default: () => [_slot2]
       }), createVNode(resolveComponent("el-button"), {
-        "onClick": handleConfirm
+        "onClick": handleConfirm,
+        "title": ibiz.i18n.t("app.confirm")
       }, _isSlot(_slot3 = ibiz.i18n.t("app.confirm")) ? _slot3 : {
         default: () => [_slot3]
       })]);

package/es/control/dashboard/portlet/portlet-layout/portlet-layout.mjs

@@ -85,7 +85,7 @@ const PortletLayout = /* @__PURE__ */ defineComponent({
       "title": showTitle(state.title)
     }, [state.title])])]), createVNode("div", {
       "class": this.ns.be("header", "right")
-    }, [model.uiactionGroup && createVNode(resolveComponent("iBizActionToolbar"), {
+    }, [model.portletType !== "ACTIONBAR" && model.uiactionGroup && createVNode(resolveComponent("iBizActionToolbar"), {
       "class": this.ns.e("toolbar"),
       "action-details": model.uiactionGroup.uiactionGroupDetails,
       "actions-state": state.actionGroupState,

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

@@ -1 +1 @@
-.ibiz-control-dataview{--ibiz-control-dataview-text-color:var(--ibiz-color-text-0);--ibiz-control-dataview-hover-bg-color:var(--ibiz-color-fill-1);--ibiz-control-dataview-active-bg-color:var(--ibiz-color-fill-2);--ibiz-control-dataview-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base) 0;--ibiz-control-dataview-page-height:50px;display:flex;flex-flow:column nowrap;align-items:stretch;justify-content:flex-start;position:relative;height:100%}.ibiz-control-dataview__nav-icon{right:10px;top:20px;cursor:pointer;position:absolute;color:var(--ibiz-color-primary)}.ibiz-control-dataview__content{flex-grow:1;height:100%}.ibiz-control-dataview__pagination{flex-shrink:0}.ibiz-control-dataview__load-more{width:calc(100% - var(--ibiz-spacing-base-tight));text-align:center}.ibiz-control-dataview__load-more i{font-size:var(--ibiz-font-size-header-3);color:var(--ibiz-color-text-2);cursor:pointer}.ibiz-control-dataview__load-more i:hover{color:var(--ibiz-color-primary-light-hover)}.ibiz-control-dataview__collapse-expand-icon{width:calc(100% - var(--ibiz-spacing-base-tight));text-align:center}.ibiz-control-dataview__collapse-expand-icon i{font-size:var(--ibiz-font-size-header-3);color:var(--ibiz-color-text-2);cursor:pointer}.ibiz-control-dataview__collapse-expand-icon i:hover{color:var(--ibiz-color-primary-light-hover)}.ibiz-control-dataview-scroll{display:flex;flex-wrap:wrap;align-content:flex-start;padding:var(--ibiz-control-dataview-padding);overflow:auto}.ibiz-control-dataview-scroll>*{margin:calc(var(--ibiz-spacing-base-tight)/ 2)}.ibiz-control-dataview-item-col{padding:0 var(--ibiz-spacing-base-tight) var(--ibiz-spacing-base-tight) 0}.ibiz-control-dataview-item{--ibiz-control-dataview-text-color:var(--ibiz-color-text-0);--ibiz-control-dataview-hover-bg-color:var(--ibiz-color-fill-1);--ibiz-control-dataview-active-bg-color:var(--ibiz-color-fill-2);--ibiz-control-dataview-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base) 0;--ibiz-control-dataview-page-height:50px;color:var(--ibiz-control-dataview-text-color);cursor:pointer}.ibiz-control-dataview-item:hover{background-color:var(--ibiz-control-dataview-hover-bg-color)}.ibiz-control-dataview-item.is-active{background-color:var(--ibiz-control-dataview-active-bg-color)}.ibiz-control-dataview-item-content{--ibiz-control-dataview-text-color:var(--ibiz-color-text-0);--ibiz-control-dataview-hover-bg-color:var(--ibiz-color-fill-1);--ibiz-control-dataview-active-bg-color:var(--ibiz-color-fill-2);--ibiz-control-dataview-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base) 0;--ibiz-control-dataview-page-height:50px}.ibiz-control-dataview-item-content__top--title{text-align:center}.ibiz-control-dataview-item-content__top--description{min-width:150px;text-align:justify;text-justify:newspaper;word-break:break-all}.ibiz-control-dataview-item-content__bottom--actions{display:flex;justify-content:center}.ibiz-control-dataview-group-content{--ibiz-control-dataview-group-item-header-bg-color:transparent;--ibiz-control-dataview-group-item-header-padding:var(--ibiz-spacing-base-tight);--ibiz-control-dataview-group-item-header-border-color:var(--ibiz-color-border);--ibiz-control-dataview-group-item-caption-text-color:var(--ibiz-color-text-0);--ibiz-control-dataview-group-item-caption-font-size:var(--ibiz-font-size-header-5);--ibiz-control-dataview-group-item-caption-font-weight:var(--ibiz-font-weight-bold);--ibiz-control-dataview-group-item-content-bg-color:transparent;--ibiz-control-dataview-group-item-content-padding:var(--ibiz-spacing-tight);width:100%}.ibiz-control-dataview-group-content__item .el-collapse-item__content{display:flex;flex-wrap:wrap}.ibiz-control-dataview-group-content__item--empty{width:100%;text-align:center}.ibiz-control-dataview-group-content__item.is-collapse .ibiz-control-dataview-group-content__item-content{height:0;overflow:hidden}.ibiz-control-dataview-group-content__item-header{display:flex;align-items:center;justify-content:space-between;width:100%;padding:var(--ibiz-control-dataview-group-item-header-padding);border-bottom:1px solid var(--ibiz-control-dataview-group-item-header-border-color)}.ibiz-control-dataview-group-content__item-title{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size:var(--ibiz-control-dataview-group-item-caption-font-size);font-weight:var(--ibiz-control-dataview-group-item-caption-font-weight);color:var(--ibiz-control-dataview-group-item-caption-text-color)}.ibiz-control-dataview-group-content__item-content{display:flex;flex-wrap:wrap;padding:var(--ibiz-control-dataview-group-item-content-padding);background-color:var(--ibiz-control-dataview-group-item-content-bg-color);will-change:height}.ibiz-control-dataview-group-content__item-content>*{margin:calc(var(--ibiz-spacing-base-tight)/ 2)}.ibiz-control-dataview-group-content__item-row{padding:var(--ibiz-control-dataview-group-item-content-padding)}.ibiz-control-dataview-group-content__item-col{padding:0 var(--ibiz-spacing-base-tight) var(--ibiz-spacing-base-tight) 0}
+.ibiz-control-dataview{--ibiz-control-dataview-text-color:var(--ibiz-color-text-0);--ibiz-control-dataview-hover-bg-color:var(--ibiz-color-fill-1);--ibiz-control-dataview-active-bg-color:var(--ibiz-color-fill-2);--ibiz-control-dataview-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base) 0;--ibiz-control-dataview-page-height:50px;--ibiz-control-dataview-item-bg-color:transparent;display:flex;flex-flow:column nowrap;align-items:stretch;justify-content:flex-start;position:relative;height:100%}.ibiz-control-dataview__nav-icon{position:absolute;top:20px;right:10px;color:var(--ibiz-color-primary);cursor:pointer}.ibiz-control-dataview__content{flex-grow:1;height:100%}.ibiz-control-dataview__pagination{flex-shrink:0}.ibiz-control-dataview__load-more{width:calc(100% - var(--ibiz-spacing-base-tight));text-align:center}.ibiz-control-dataview__load-more i{font-size:var(--ibiz-font-size-header-3);color:var(--ibiz-color-text-2);cursor:pointer}.ibiz-control-dataview__load-more i:hover{color:var(--ibiz-color-primary-light-hover)}.ibiz-control-dataview__collapse-expand-icon{width:calc(100% - var(--ibiz-spacing-base-tight));text-align:center}.ibiz-control-dataview__collapse-expand-icon i{font-size:var(--ibiz-font-size-header-3);color:var(--ibiz-color-text-2);cursor:pointer}.ibiz-control-dataview__collapse-expand-icon i:hover{color:var(--ibiz-color-primary-light-hover)}.ibiz-control-dataview-scroll{display:flex;flex-wrap:wrap;align-content:flex-start;padding:var(--ibiz-control-dataview-padding);overflow:auto}.ibiz-control-dataview-scroll>*{margin:calc(var(--ibiz-spacing-base-tight)/ 2)}.ibiz-control-dataview-item-col{padding:0 var(--ibiz-spacing-base-tight) var(--ibiz-spacing-base-tight) 0}.ibiz-control-dataview-item{--ibiz-control-dataview-text-color:var(--ibiz-color-text-0);--ibiz-control-dataview-hover-bg-color:var(--ibiz-color-fill-1);--ibiz-control-dataview-active-bg-color:var(--ibiz-color-fill-2);--ibiz-control-dataview-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base) 0;--ibiz-control-dataview-page-height:50px;--ibiz-control-dataview-item-bg-color:transparent;color:var(--ibiz-control-dataview-text-color);cursor:pointer;background-color:var(--ibiz-control-dataview-item-bg-color)}.ibiz-control-dataview-item:hover{background-color:var(--ibiz-control-dataview-hover-bg-color)}.ibiz-control-dataview-item.is-active{background-color:var(--ibiz-control-dataview-active-bg-color)}.ibiz-control-dataview-item-content{--ibiz-control-dataview-text-color:var(--ibiz-color-text-0);--ibiz-control-dataview-hover-bg-color:var(--ibiz-color-fill-1);--ibiz-control-dataview-active-bg-color:var(--ibiz-color-fill-2);--ibiz-control-dataview-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base) 0;--ibiz-control-dataview-page-height:50px;--ibiz-control-dataview-item-bg-color:transparent}.ibiz-control-dataview-item-content__top--title{text-align:center}.ibiz-control-dataview-item-content__top--description{min-width:150px;text-align:justify;text-justify:newspaper;word-break:break-all}.ibiz-control-dataview-item-content__bottom--actions{display:flex;justify-content:center}.ibiz-control-dataview-group-content{--ibiz-control-dataview-group-item-header-bg-color:transparent;--ibiz-control-dataview-group-item-header-padding:var(--ibiz-spacing-base-tight);--ibiz-control-dataview-group-item-header-border-color:var(--ibiz-color-border);--ibiz-control-dataview-group-item-caption-text-color:var(--ibiz-color-text-0);--ibiz-control-dataview-group-item-caption-font-size:var(--ibiz-font-size-header-5);--ibiz-control-dataview-group-item-caption-font-weight:var(--ibiz-font-weight-bold);--ibiz-control-dataview-group-item-content-bg-color:transparent;--ibiz-control-dataview-group-item-content-padding:var(--ibiz-spacing-tight);width:100%}.ibiz-control-dataview-group-content__item .el-collapse-item__content{display:flex;flex-wrap:wrap}.ibiz-control-dataview-group-content__item--empty{width:100%;text-align:center}.ibiz-control-dataview-group-content__item.is-collapse .ibiz-control-dataview-group-content__item-content{height:0;overflow:hidden}.ibiz-control-dataview-group-content__item-header{display:flex;align-items:center;justify-content:space-between;width:100%;padding:var(--ibiz-control-dataview-group-item-header-padding);border-bottom:1px solid var(--ibiz-control-dataview-group-item-header-border-color)}.ibiz-control-dataview-group-content__item-title{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size:var(--ibiz-control-dataview-group-item-caption-font-size);font-weight:var(--ibiz-control-dataview-group-item-caption-font-weight);color:var(--ibiz-control-dataview-group-item-caption-text-color)}.ibiz-control-dataview-group-content__item-content{display:flex;flex-wrap:wrap;padding:var(--ibiz-control-dataview-group-item-content-padding);background-color:var(--ibiz-control-dataview-group-item-content-bg-color);will-change:height}.ibiz-control-dataview-group-content__item-content>*{margin:calc(var(--ibiz-spacing-base-tight)/ 2)}.ibiz-control-dataview-group-content__item-row{padding:var(--ibiz-control-dataview-group-item-content-padding)}.ibiz-control-dataview-group-content__item-col{padding:0 var(--ibiz-spacing-base-tight) var(--ibiz-spacing-base-tight) 0}

package/es/control/data-view/data-view.mjs

@@ -179,10 +179,17 @@ const DataViewControl = /* @__PURE__ */ defineComponent({
           height: "".concat(c.model.cardHeight, "px")
         });
       }
+      const itemStyle = 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 || "")
+      });
       const panel = props.modelData.itemLayoutPanel;
       return createVNode(resolveComponent("el-card"), {
         "shadow": "hover",
         "class": cardClass,
+        "style": itemStyle,
         "body-style": cardStyle,
         "onClick": (event) => onRowClick(item, event),
         "onDblclick": (event) => onDbRowClick(item, event)
@@ -353,7 +360,7 @@ const DataViewControl = /* @__PURE__ */ defineComponent({
         "class": ns.e("content"),
         "text": c.model.emptyText,
         "emptyTextLanguageRes": c.model.emptyTextLanguageRes,
-        "enableShowImage": c.state.hideNoDataImage
+        "hideNoDataImage": c.state.hideNoDataImage
       }, null);
     };
     const renderCollapseExpandIcon = () => {

package/es/control/drbar/drbar.controller.mjs

@@ -265,7 +265,7 @@ class DRBarController extends ControlController {
     } else {
       await this.calcDrBarItemsState();
     }
-    if (this.form.state.isLoaded) {
+    if (this.form && this.form.state.isLoaded) {
       this.doDefaultSelect();
     }
   }

package/es/control/drtab/drtab-control.util.mjs

@@ -1,5 +1,5 @@
 import { ref, watch, watchEffect, onUnmounted } from 'vue';
-import { defaultNamespace } from '../../node_modules/.pnpm/@ibiz-template_core@0.7.38-alpha.16_axios@1.7.7_lodash-es@4.17.21_qs@6.13.0_qx-util@0.4.8_ramda@0.29.1/node_modules/@ibiz-template/core/out/utils/namespace/namespace.mjs';
+import { defaultNamespace } from '../../node_modules/.pnpm/@ibiz-template_core@0.7.38-alpha.43_axios@1.7.7_lodash-es@4.17.21_qs@6.13.0_qx-util@0.4.8_ramda@0.29.1/node_modules/@ibiz-template/core/out/utils/namespace/namespace.mjs';
 
 "use strict";
 function useAppDRTab(c, controlRef, counterData) {

package/es/control/drtab/drtab.controller.d.ts

@@ -17,6 +17,18 @@ export declare class DRTabController extends ControlController<IDEDRTab, IDRTabS
      * @type {AppCounter}
      */
     counter?: AppCounter;
+    /**
+     * @description 启用缓存
+     * @type {boolean}
+     * @memberof DRTabController
+     */
+    srfCachePos: boolean;
+    /**
+     * @description 缓存标记
+     * @type {string}
+     * @memberof DRTabController
+     */
+    srfCacheKeyTempl: string;
     /**
      * 导航占位控制器
      *
@@ -39,6 +51,13 @@ export declare class DRTabController extends ControlController<IDEDRTab, IDRTabS
      * @memberof DRTabController
      */
     get routeDepth(): number | undefined;
+    /**
+     * @description 选中缓存标识
+     * @readonly
+     * @type {string}
+     * @memberof DRTabController
+     */
+    get storageTag(): string;
     /**
      * Router 对象
      *
@@ -74,13 +93,6 @@ export declare class DRTabController extends ControlController<IDEDRTab, IDRTabS
      * @memberof DRTabController
      */
     onCreated(): Promise<void>;
-    /**
-     * 部件参数解析
-     *
-     * @protected
-     * @memberof ControlController
-     */
-    protected handleControlParams(): void;
     /**
      * 通过计数器数据，计算项状态
      *