@ibiz-template/vue3-components 0.6.16 → 0.6.17

package/es/control/caption-bar/caption-bar.css

@@ -1 +1 @@
-.ibiz-control-captionbar{--ibiz-control-captionbar-color:var(--ibiz-color-text-0);--ibiz-control-captionbar-font-size:var(--ibiz-font-size-header-5);--ibiz-control-captionbar-font-weight:var(--ibiz-font-weight-regular);--ibiz-control-captionbar-padding:0 var(--ibiz-spacing-base);--ibiz-control-captionbar-margin:var(--ibiz-spacing-none);position:relative;height:100%;padding:var(--ibiz-control-captionbar-padding)}.ibiz-control-captionbar .ibiz-control-captionbar-caption{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;position:relative;height:100%;padding-left:var(--ibiz-spacing-base);font-size:var(--ibiz-control-captionbar-font-size);font-weight:var(--ibiz-control-captionbar-font-weight);color:var(--ibiz-control-captionbar-color);display:flex;align-items:center;justify-content:flex-start}.ibiz-control-captionbar .ibiz-control-captionbar-caption::before{position:absolute;top:50%;left:0;width:4px;height:20px;content:"";background-color:var(--ibiz-color-primary);border-radius:2px;transform:translateY(-50%)}.ibiz-control-captionbar .ibiz-control-captionbar-caption.is-show-icon{padding-left:0}.ibiz-control-captionbar .ibiz-control-captionbar-caption.is-show-icon::before{display:none}.ibiz-control-captionbar-caption__icon{margin-right:var(--ibiz-spacing-tight)}.ibiz-view:not(.ibiz-view-appindexview) .ibiz-view .ibiz-view .ibiz-control-captionbar-caption{--ibiz-control-captionbar-font-size:var(--ibiz-font-size-header-5);--ibiz-control-captionbar-font-weight:var(--ibiz-font-weight-regular);padding-left:0}.ibiz-view:not(.ibiz-view-appindexview) .ibiz-view .ibiz-view .ibiz-control-captionbar-caption::before{content:none}.ibiz-drawer .ibiz-view .ibiz-view .ibiz-control-captionbar-caption,.ibiz-modal .ibiz-view .ibiz-view .ibiz-control-captionbar-caption,.ibiz-popover .ibiz-view .ibiz-view .ibiz-control-captionbar-caption{--ibiz-control-captionbar-font-size:var(--ibiz-font-size-header-5);--ibiz-control-captionbar-font-weight:var(--ibiz-font-weight-regular);padding-left:0}.ibiz-drawer .ibiz-view .ibiz-view .ibiz-control-captionbar-caption::before,.ibiz-modal .ibiz-view .ibiz-view .ibiz-control-captionbar-caption::before,.ibiz-popover .ibiz-view .ibiz-view .ibiz-control-captionbar-caption::before{content:none}
+.ibiz-control-captionbar{--ibiz-control-captionbar-color:var(--ibiz-color-text-0);--ibiz-control-captionbar-font-size:var(--ibiz-font-size-header-5);--ibiz-control-captionbar-font-weight:var(--ibiz-font-weight-regular);--ibiz-control-captionbar-padding:0 var(--ibiz-spacing-base);--ibiz-control-captionbar-margin:var(--ibiz-spacing-none);position:relative;height:100%;padding:var(--ibiz-control-captionbar-padding)}.ibiz-control-captionbar .ibiz-control-captionbar-caption{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;position:relative;height:100%;padding-left:var(--ibiz-spacing-base);font-size:var(--ibiz-control-captionbar-font-size);font-weight:var(--ibiz-control-captionbar-font-weight);color:var(--ibiz-control-captionbar-color);display:flex;align-items:center;justify-content:flex-start}.ibiz-control-captionbar .ibiz-control-captionbar-caption::before{position:absolute;top:50%;left:0;width:4px;height:20px;content:"";background-color:var(--ibiz-color-primary);border-radius:2px;transform:translateY(-50%)}.ibiz-control-captionbar .ibiz-control-captionbar-caption.is-show-icon{padding-left:0}.ibiz-control-captionbar .ibiz-control-captionbar-caption.is-show-icon::before{display:none}.ibiz-control-captionbar-caption__icon{margin-right:var(--ibiz-spacing-tight)}.ibiz-control-captionbar-caption__content{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-view:not(.ibiz-view-appindexview) .ibiz-view .ibiz-view .ibiz-control-captionbar-caption{--ibiz-control-captionbar-font-size:var(--ibiz-font-size-header-5);--ibiz-control-captionbar-font-weight:var(--ibiz-font-weight-regular);padding-left:0}.ibiz-view:not(.ibiz-view-appindexview) .ibiz-view .ibiz-view .ibiz-control-captionbar-caption::before{content:none}.ibiz-drawer .ibiz-view .ibiz-view .ibiz-control-captionbar-caption,.ibiz-modal .ibiz-view .ibiz-view .ibiz-control-captionbar-caption,.ibiz-popover .ibiz-view .ibiz-view .ibiz-control-captionbar-caption{--ibiz-control-captionbar-font-size:var(--ibiz-font-size-header-5);--ibiz-control-captionbar-font-weight:var(--ibiz-font-weight-regular);padding-left:0}.ibiz-drawer .ibiz-view .ibiz-view .ibiz-control-captionbar-caption::before,.ibiz-modal .ibiz-view .ibiz-view .ibiz-control-captionbar-caption::before,.ibiz-popover .ibiz-view .ibiz-view .ibiz-control-captionbar-caption::before{content:none}

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

@@ -45,7 +45,9 @@ const CaptionBarControl = /* @__PURE__ */ defineComponent({
       }, [this.c.model.sysImage && createVNode(resolveComponent("iBizIcon"), {
         "class": [this.ns.be("caption", "icon")],
         "icon": this.c.model.sysImage
-      }, null), this.c.state.caption])]
+      }, null), createVNode("div", {
+        "class": [this.ns.be("caption", "content")]
+      }, [this.c.state.caption])])]
     });
   }
 });

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

@@ -143,22 +143,21 @@ class DRBarController extends ControlController {
    * @memberof DRBarController
    */
   async calcDrBarItemsState() {
-    const arr = [];
-    this.state.drBarItems.forEach((group) => {
-      var _a, _b;
-      if ((_a = group.children) == null ? void 0 : _a.length) {
-        (_b = group.children) == null ? void 0 : _b.forEach((item) => {
-          arr.push(this.calcPermitted(item));
-        });
-      }
-    });
-    await Promise.all(arr);
-    this.state.drBarItems.forEach((group) => {
-      var _a;
-      if ((_a = group.children) == null ? void 0 : _a.length) {
-        group.visible = !group.children.every((item) => item.visible === false);
-      }
-    });
+    await Promise.all(
+      this.state.drBarItems.map(async (item) => {
+        var _a;
+        if ((_a = item.children) == null ? void 0 : _a.length) {
+          await Promise.all(
+            item.children.map(async (childItem) => {
+              await this.calcPermitted(childItem);
+            })
+          );
+          item.visible = item.children.some((childItem) => childItem.visible);
+        } else {
+          await this.calcPermitted(item);
+        }
+      })
+    );
   }
   /**
    * 加载完成

package/es/control/grid/grid-column/grid-field-edit-column/cell-edit.mjs

@@ -27,7 +27,9 @@ function useCellEdit(props, componentRef) {
     return !editorShowEdit.value;
   });
   const editorDisabled = false;
-  const isAutoFocus = true;
+  const isAutoFocus = computed(() => {
+    return !hasError.value;
+  });
   const showEditMask = computed(() => {
     return cellEditable.value && !editable.value;
   });

package/es/control/toolbar/index.d.ts

@@ -22,6 +22,7 @@ export declare const IBizToolbarControl: import("@ibiz-template/vue3-util").Type
     c: import("@ibiz-template/runtime").ToolbarController<import("@ibiz/model-core").IControl, import("@ibiz-template/runtime").IToolbarState, import("@ibiz-template/runtime").IToolbarEvent>;
     btnSize: import("vue").Ref<string>;
     ns: import("@ibiz-template/core").Namespace;
+    toolbarStyle: string | undefined;
     handleClick: (item: import("@ibiz/model-core").IDEToolbarItem, event: MouseEvent, params?: IData | undefined) => Promise<void>;
     renderExtraButtons: (extraButtons: import("@ibiz-template/runtime").IExtraButton[]) => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;

package/es/control/toolbar/toolbar.d.ts

@@ -26,6 +26,7 @@ export declare const ToolbarControl: import("vue").DefineComponent<{
     c: ToolbarController<import("@ibiz/model-core").IControl, import("@ibiz-template/runtime").IToolbarState, import("@ibiz-template/runtime").IToolbarEvent>;
     btnSize: import("vue").Ref<string>;
     ns: import("@ibiz-template/core").Namespace;
+    toolbarStyle: string | undefined;
     handleClick: (item: IDEToolbarItem, event: MouseEvent, params?: IData) => Promise<void>;
     renderExtraButtons: (extraButtons: IExtraButton[]) => VNode[];
     renderToolbarItem: (item: IDEToolbarItem) => VNode | null;

package/es/control/toolbar/toolbar.mjs

@@ -50,9 +50,11 @@ const ToolbarControl = /* @__PURE__ */ defineComponent({
     }
   },
   setup() {
+    var _a;
     const c = useControlController((...args) => new ToolbarController(...args));
     const ns = useNamespace("control-".concat(c.model.controlType.toLowerCase()));
     const btnSize = 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);
     };
@@ -78,13 +80,13 @@ const ToolbarControl = /* @__PURE__ */ defineComponent({
         "class": ns.b("submenu"),
         "index": item.id,
         "title": item.tooltip,
-        "popper-class": ns.b("submenu-popper")
+        "popper-class": [ns.b("submenu-popper"), ns.bm("submenu-popper", toolbarStyle)]
       }, {
         default: () => {
           return detoolbarItems.map((item2) => {
-            var _a;
+            var _a2;
             const actionId = item2.uiactionId;
-            const visible = (_a = c.state.buttonsState[item2.id]) == null ? void 0 : _a.visible;
+            const visible = (_a2 = c.state.buttonsState[item2.id]) == null ? void 0 : _a2.visible;
             if (!visible) {
               return null;
             }
@@ -148,9 +150,9 @@ const ToolbarControl = /* @__PURE__ */ defineComponent({
       });
     };
     const renderToolbarItem = (item) => {
-      var _a, _b;
+      var _a2, _b;
       const itemId = item.id;
-      const visible = (_a = c.state.buttonsState[itemId]) == null ? void 0 : _a.visible;
+      const visible = (_a2 = c.state.buttonsState[itemId]) == null ? void 0 : _a2.visible;
       if (!visible) {
         return null;
       }
@@ -190,7 +192,7 @@ const ToolbarControl = /* @__PURE__ */ defineComponent({
         }, [createVNode(resolveComponent("el-button"), {
           "title": item.tooltip,
           "size": btnSize.value,
-          "text": Object.is(buttonType, "INVERSE"),
+          "text": Object.is(buttonType, "inverse"),
           "type": buttonType,
           "loading": c.state.buttonsState[itemId].loading,
           "disabled": c.state.buttonsState[itemId].disabled,
@@ -216,24 +218,23 @@ const ToolbarControl = /* @__PURE__ */ defineComponent({
       c,
       btnSize,
       ns,
+      toolbarStyle,
       handleClick,
       renderExtraButtons,
       renderToolbarItem
     };
   },
   render() {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     const {
-      state,
-      model
+      state
     } = this.c;
-    const toolbarStyle = (_a = model.toolbarStyle) == null ? void 0 : _a.toLowerCase();
     let content = null;
     if (state.isCreated) {
       content = [
         // 绘制最前方的额外按钮
-        ((_b = state.extraButtons.before) == null ? void 0 : _b.length) > 0 && this.renderExtraButtons(state.extraButtons.before),
-        (_c = this.modelData.detoolbarItems) == null ? void 0 : _c.map((item, index) => {
+        ((_a = state.extraButtons.before) == null ? void 0 : _a.length) > 0 && this.renderExtraButtons(state.extraButtons.before),
+        (_b = this.modelData.detoolbarItems) == null ? void 0 : _b.map((item, index) => {
           var _a2;
           const toolbarItemNode = this.renderToolbarItem(item);
           if ((_a2 = state.extraButtons[index]) == null ? void 0 : _a2.length) {
@@ -242,12 +243,12 @@ const ToolbarControl = /* @__PURE__ */ defineComponent({
           return toolbarItemNode;
         }),
         // 绘制最后方的额外按钮
-        ((_d = state.extraButtons.after) == null ? void 0 : _d.length) > 0 && this.renderExtraButtons(state.extraButtons.after)
+        ((_c = state.extraButtons.after) == null ? void 0 : _c.length) > 0 && this.renderExtraButtons(state.extraButtons.after)
       ];
     }
     return createVNode(resolveComponent("iBizControlBase"), {
       "controller": this.c,
-      "class": [this.ns.m(state.viewMode.toLowerCase()), this.ns.m(toolbarStyle)]
+      "class": [this.ns.m(state.viewMode.toLowerCase()), this.ns.m(this.toolbarStyle)]
     }, _isSlot(content) ? content : {
       default: () => [content]
     });

package/es/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-edit-column/cell-edit.mjs

@@ -25,7 +25,9 @@ function useCellEdit(props, componentRef) {
     return !editorShowEdit.value;
   });
   const editorDisabled = false;
-  const isAutoFocus = true;
+  const isAutoFocus = computed(() => {
+    return !hasError.value;
+  });
   const showEditMask = computed(() => {
     return cellEditable.value && !editable.value;
   });

package/es/editor/data-picker/ibiz-picker/ibiz-picker.mjs

@@ -128,13 +128,11 @@ const IBizPicker = /* @__PURE__ */ defineComponent({
       emit("change", null);
     };
     const closeCircle = (c.linkView ? 1 : 0) + (c.pickupView ? 1 : 0);
-    if (props.autoFocus) {
-      watch(editorRef, (newVal) => {
-        if (newVal) {
-          newVal.focus();
-        }
-      });
-    }
+    watch(editorRef, (newVal) => {
+      if (props.autoFocus && newVal && newVal.focus) {
+        newVal.focus();
+      }
+    });
     const onFocus = (e) => {
       emit("focus", e);
       setEditable(true);

package/es/editor/date-picker/ibiz-date-picker/ibiz-date-picker.mjs

@@ -75,13 +75,11 @@ const IBizDatePicker = /* @__PURE__ */ defineComponent({
       emit("change", date);
       setEditable(false);
     };
-    if (props.autoFocus) {
-      watch(editorRef, (newVal) => {
-        if (newVal && newVal.focus) {
-          newVal.focus();
-        }
-      });
-    }
+    watch(editorRef, (newVal) => {
+      if (props.autoFocus && newVal && newVal.focus) {
+        newVal.focus();
+      }
+    });
     const onFocus = (e) => {
       emit("focus", e);
       setEditable(true);

package/es/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.mjs

@@ -79,7 +79,7 @@ const IBizDropdown = /* @__PURE__ */ defineComponent({
       isLoading.value = false;
     };
     watch(() => props.value, async (newVal, oldVal) => {
-      if (newVal || newVal === null) {
+      if (newVal || newVal === null || newVal === 0) {
         if (!isLoadedCodeList.value && oldVal === void 0) {
           await loadCodeList();
         }
@@ -149,13 +149,11 @@ const IBizDropdown = /* @__PURE__ */ defineComponent({
     }, {
       immediate: true
     });
-    if (props.autoFocus) {
-      watch(editorRef, (newVal) => {
-        if (newVal) {
-          newVal.focus();
-        }
-      });
-    }
+    watch(editorRef, (newVal) => {
+      if (props.autoFocus && newVal && newVal.focus) {
+        newVal.focus();
+      }
+    });
     const onFocus = (e) => {
       editorState = "focus";
       emit("focus", e);

package/es/editor/text-box/ibiz-input-number/ibiz-input-number.mjs

@@ -54,14 +54,12 @@ const IBizInputNumber = /* @__PURE__ */ defineComponent({
     const handleChange = (e) => {
       emit("change", e);
     };
-    if (props.autoFocus) {
-      watch(editorRef, (newVal) => {
-        if (newVal) {
-          const input = newVal.$el.getElementsByTagName("input")[0];
-          input.focus();
-        }
-      });
-    }
+    watch(editorRef, (newVal) => {
+      if (props.autoFocus && newVal) {
+        const input = newVal.$el.getElementsByTagName("input")[0];
+        input.focus();
+      }
+    });
     const onFocus = (e) => {
       emit("focus", e);
       setEditable(true);

package/es/editor/text-box/input/input.mjs

@@ -94,15 +94,13 @@ const IBizInput = /* @__PURE__ */ defineComponent({
       emit("blur", event);
       setEditable(false);
     };
-    if (props.autoFocus) {
-      watch(editorRef, (newVal) => {
-        if (newVal) {
-          const inputTag = type.value === "textarea" ? "textarea" : "input";
-          const input = newVal.$el.getElementsByTagName(inputTag)[0];
-          input.focus();
-        }
-      });
-    }
+    watch(editorRef, (newVal) => {
+      if (props.autoFocus && newVal) {
+        const inputTag = type.value === "textarea" ? "textarea" : "input";
+        const input = newVal.$el.getElementsByTagName(inputTag)[0];
+        input.focus();
+      }
+    });
     const onFocus = (e) => {
       emit("focus", e);
       setEditable(true);

package/es/editor/user/ibiz-searchcond-edit/ibiz-searchcond-edit.mjs

@@ -62,14 +62,12 @@ const IBizSearchCondEdit = /* @__PURE__ */ defineComponent({
     const handleChange = (e) => {
       emit("change", e);
     };
-    if (props.autoFocus) {
-      watch(editorRef, (newVal) => {
-        if (newVal) {
-          const input = newVal.$el.getElementsByTagName("input")[0];
-          input.focus();
-        }
-      });
-    }
+    watch(editorRef, (newVal) => {
+      if (props.autoFocus && newVal) {
+        const input = newVal.$el.getElementsByTagName("input")[0];
+        input.focus();
+      }
+    });
     const onFocus = (e) => {
       emit("focus", e);
       setEditable(true);

package/es/panel-component/nav-tabs/nav-tabs.css

@@ -1 +1 @@
-.ibiz-nav-tabs{--ibiz-nav-tabs-padding:var(--ibiz-spacing-base-loose);--ibiz-nav-tabs-left-width:calc(100% - 60px);--ibiz-nav-tabs-right-width:60px;--ibiz-nav-tabs-right-height:30px;--ibiz-nav-tabs-item-height:40px;--ibiz-nav-tabs-item-padding:0 var(--ibiz-spacing-base-loose);--ibiz-nav-tabs-item-margin:0 var(--ibiz-spacing-base) 0 0;--ibiz-nav-tabs-item-font-size:var(--ibiz-font-size-regular);--ibiz-nav-tabs-item-font-weight:var(--ibiz-font-weight-regular);--ibiz-nav-tabs-item-border-radius:var(--ibiz-border-radius-medium);--ibiz-nav-tabs-item-bg-color:transparent;--ibiz-nav-tabs-item-color:var(--ibiz-color-text-0);--ibiz-nav-tabs-item-hover-color:var(--ibiz-color-primary-hover);--ibiz-nav-tabs-item-active-color:var(--ibiz-color-primary);display:flex;align-items:center;justify-content:flex-start;position:relative;padding:var(--ibiz-nav-tabs-padding)}.ibiz-nav-tabs__left{display:flex;align-items:center;width:var(--ibiz-nav-tabs-left-width)}.ibiz-nav-tabs__left .el-tabs{width:100%;--el-tabs-header-height:40px}.ibiz-nav-tabs__left .el-tabs .el-tabs__nav{border:none}.ibiz-nav-tabs__left .el-tabs .el-tabs__nav .el-tabs__item{display:flex;align-items:center;height:var(--ibiz-nav-tabs-item-height);padding:var(--ibiz-nav-tabs-item-padding);margin:var(--ibiz-nav-tabs-item-margin);overflow:hidden;font-size:var(--ibiz-nav-tabs-item-font-size);font-weight:var(--ibiz-nav-tabs-item-font-weight);color:var(--ibiz-nav-tabs-item-color);vertical-align:middle;background-color:var(--ibiz-nav-tabs-item-bg-color);border:1px solid var(--ibiz-color-border);border-radius:var(--ibiz-nav-tabs-item-border-radius);box-shadow:0 1px 2px 0 var(--ibiz-color-border);opacity:1}.ibiz-nav-tabs__left .el-tabs .el-tabs__nav .el-tabs__item:hover{padding:var(--ibiz-nav-tabs-item-padding);color:var(--ibiz-nav-tabs-item-hover-color);box-shadow:0 1px 4px 0 rgba(0,0,0,.25)}.ibiz-nav-tabs__left .el-tabs .el-tabs__nav .el-tabs__item:hover .is-icon-close{color:var(--ibiz-nav-tabs-item-hover-color)}.ibiz-nav-tabs__left .el-tabs .el-tabs__nav .el-tabs__item.is-active{padding:var(--ibiz-nav-tabs-item-padding);color:var(--ibiz-color-white);background-color:var(--ibiz-nav-tabs-item-active-color);box-shadow:none}.ibiz-nav-tabs__left .el-tabs .el-tabs__nav .el-tabs__item.is-active .is-icon-close{color:var(--ibiz-color-white)}.ibiz-nav-tabs__left .el-tabs .el-tabs__nav .el-tabs__item.is-closable{padding:var(--ibiz-nav-tabs-item-padding)}.ibiz-nav-tabs__left .el-tabs .el-tabs__nav .el-tabs__item.is-closable.hover{padding:var(--ibiz-nav-tabs-item-padding)}.ibiz-nav-tabs__left .el-tabs .el-tabs__nav .el-tabs__item .is-icon-close{position:relative;top:1px}.ibiz-nav-tabs__left .el-tabs .el-tabs__header{margin-bottom:0;border-bottom:none}.ibiz-nav-tabs__right{width:var(--ibiz-nav-tabs-right-width)}.ibiz-nav-tabs__right .el-dropdown button{height:var(--ibiz-nav-tabs-right-height)}
+.ibiz-nav-tabs{--ibiz-nav-tabs-padding:var(--ibiz-spacing-base-loose);--ibiz-nav-tabs-left-width:calc(100% - 60px);--ibiz-nav-tabs-right-width:60px;--ibiz-nav-tabs-right-height:30px;--ibiz-nav-tabs-item-height:40px;--ibiz-nav-tabs-item-padding:0 var(--ibiz-spacing-base-loose);--ibiz-nav-tabs-item-margin:0 var(--ibiz-spacing-base) 0 0;--ibiz-nav-tabs-item-font-size:var(--ibiz-font-size-regular);--ibiz-nav-tabs-item-font-weight:var(--ibiz-font-weight-regular);--ibiz-nav-tabs-item-border-radius:var(--ibiz-border-radius-medium);--ibiz-nav-tabs-item-bg-color:transparent;--ibiz-nav-tabs-item-color:var(--ibiz-color-text-0);--ibiz-nav-tabs-item-hover-color:var(--ibiz-color-primary-hover);--ibiz-nav-tabs-item-active-color:var(--ibiz-color-primary);display:flex;align-items:center;justify-content:flex-start;position:relative;padding:var(--ibiz-nav-tabs-padding)}.ibiz-nav-tabs__left{display:flex;align-items:center;width:var(--ibiz-nav-tabs-left-width)}.ibiz-nav-tabs__left--caption{max-width:300px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-nav-tabs__left .el-tabs{width:100%;--el-tabs-header-height:40px}.ibiz-nav-tabs__left .el-tabs .el-tabs__nav{border:none}.ibiz-nav-tabs__left .el-tabs .el-tabs__nav .el-tabs__item{display:flex;align-items:center;height:var(--ibiz-nav-tabs-item-height);padding:var(--ibiz-nav-tabs-item-padding);margin:var(--ibiz-nav-tabs-item-margin);overflow:hidden;font-size:var(--ibiz-nav-tabs-item-font-size);font-weight:var(--ibiz-nav-tabs-item-font-weight);color:var(--ibiz-nav-tabs-item-color);vertical-align:middle;background-color:var(--ibiz-nav-tabs-item-bg-color);border:1px solid var(--ibiz-color-border);border-radius:var(--ibiz-nav-tabs-item-border-radius);box-shadow:0 1px 2px 0 var(--ibiz-color-border);opacity:1}.ibiz-nav-tabs__left .el-tabs .el-tabs__nav .el-tabs__item:hover{padding:var(--ibiz-nav-tabs-item-padding);color:var(--ibiz-nav-tabs-item-hover-color);box-shadow:0 1px 4px 0 rgba(0,0,0,.25)}.ibiz-nav-tabs__left .el-tabs .el-tabs__nav .el-tabs__item:hover .is-icon-close{color:var(--ibiz-nav-tabs-item-hover-color)}.ibiz-nav-tabs__left .el-tabs .el-tabs__nav .el-tabs__item.is-active{padding:var(--ibiz-nav-tabs-item-padding);color:var(--ibiz-color-white);background-color:var(--ibiz-nav-tabs-item-active-color);box-shadow:none}.ibiz-nav-tabs__left .el-tabs .el-tabs__nav .el-tabs__item.is-active .is-icon-close{color:var(--ibiz-color-white)}.ibiz-nav-tabs__left .el-tabs .el-tabs__nav .el-tabs__item.is-closable{padding:var(--ibiz-nav-tabs-item-padding)}.ibiz-nav-tabs__left .el-tabs .el-tabs__nav .el-tabs__item.is-closable.hover{padding:var(--ibiz-nav-tabs-item-padding)}.ibiz-nav-tabs__left .el-tabs .el-tabs__nav .el-tabs__item .is-icon-close{position:relative;top:1px}.ibiz-nav-tabs__left .el-tabs .el-tabs__header{margin-bottom:0;border-bottom:none}.ibiz-nav-tabs__right{width:var(--ibiz-nav-tabs-right-width)}.ibiz-nav-tabs__right .el-dropdown button{height:var(--ibiz-nav-tabs-right-height)}

package/es/panel-component/nav-tabs/nav-tabs.mjs

@@ -88,7 +88,13 @@ const NavTabs = /* @__PURE__ */ defineComponent({
         "name": msg.key,
         "key": msg.key,
         "label": label
-      }, null);
+      }, {
+        label: () => {
+          return createVNode("div", {
+            "class": this.ns.em("left", "caption")
+          }, [label]);
+        }
+      });
     })) ? _slot : {
       default: () => [_slot]
     })]), createVNode("div", {

package/es/web-app/main.mjs

@@ -1,6 +1,6 @@
 import { install } from '@ibiz-template/core';
 import { install as install$1 } from '@ibiz-template/runtime';
-import { AppHooks, PluginFactory, OverlayContainer } from '@ibiz-template/vue3-util';
+import { AppHooks, useAppStore, route2routePath, PluginFactory, OverlayContainer } from '@ibiz-template/vue3-util';
 import { createVueApp } from './create-vue-app.mjs';
 import { attachEnvironmentConfig } from './attach-environment-config.mjs';
 import App from './App.mjs';
@@ -30,6 +30,13 @@ async function runApp(plugins, opts) {
   });
   install();
   install$1();
+  ibiz.util.getGlobalParam = () => {
+    return useAppStore().appStore;
+  };
+  ibiz.util.getRouterParams = () => {
+    const routePath = route2routePath(AppRouter.getRouter().currentRoute.value);
+    return routePath.pathNodes;
+  };
   ibiz.plugin = new PluginFactory();
   ibiz.util.error.register(new UnauthorizedHandler());
   const app = createVueApp(App);

package/lib/control/caption-bar/caption-bar.cjs

@@ -47,7 +47,9 @@ const CaptionBarControl = /* @__PURE__ */ vue.defineComponent({
       }, [this.c.model.sysImage && vue.createVNode(vue.resolveComponent("iBizIcon"), {
         "class": [this.ns.be("caption", "icon")],
         "icon": this.c.model.sysImage
-      }, null), this.c.state.caption])]
+      }, null), vue.createVNode("div", {
+        "class": [this.ns.be("caption", "content")]
+      }, [this.c.state.caption])])]
     });
   }
 });

package/lib/control/caption-bar/caption-bar.css

@@ -1 +1 @@
-.ibiz-control-captionbar{--ibiz-control-captionbar-color:var(--ibiz-color-text-0);--ibiz-control-captionbar-font-size:var(--ibiz-font-size-header-5);--ibiz-control-captionbar-font-weight:var(--ibiz-font-weight-regular);--ibiz-control-captionbar-padding:0 var(--ibiz-spacing-base);--ibiz-control-captionbar-margin:var(--ibiz-spacing-none);position:relative;height:100%;padding:var(--ibiz-control-captionbar-padding)}.ibiz-control-captionbar .ibiz-control-captionbar-caption{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;position:relative;height:100%;padding-left:var(--ibiz-spacing-base);font-size:var(--ibiz-control-captionbar-font-size);font-weight:var(--ibiz-control-captionbar-font-weight);color:var(--ibiz-control-captionbar-color);display:flex;align-items:center;justify-content:flex-start}.ibiz-control-captionbar .ibiz-control-captionbar-caption::before{position:absolute;top:50%;left:0;width:4px;height:20px;content:"";background-color:var(--ibiz-color-primary);border-radius:2px;transform:translateY(-50%)}.ibiz-control-captionbar .ibiz-control-captionbar-caption.is-show-icon{padding-left:0}.ibiz-control-captionbar .ibiz-control-captionbar-caption.is-show-icon::before{display:none}.ibiz-control-captionbar-caption__icon{margin-right:var(--ibiz-spacing-tight)}.ibiz-view:not(.ibiz-view-appindexview) .ibiz-view .ibiz-view .ibiz-control-captionbar-caption{--ibiz-control-captionbar-font-size:var(--ibiz-font-size-header-5);--ibiz-control-captionbar-font-weight:var(--ibiz-font-weight-regular);padding-left:0}.ibiz-view:not(.ibiz-view-appindexview) .ibiz-view .ibiz-view .ibiz-control-captionbar-caption::before{content:none}.ibiz-drawer .ibiz-view .ibiz-view .ibiz-control-captionbar-caption,.ibiz-modal .ibiz-view .ibiz-view .ibiz-control-captionbar-caption,.ibiz-popover .ibiz-view .ibiz-view .ibiz-control-captionbar-caption{--ibiz-control-captionbar-font-size:var(--ibiz-font-size-header-5);--ibiz-control-captionbar-font-weight:var(--ibiz-font-weight-regular);padding-left:0}.ibiz-drawer .ibiz-view .ibiz-view .ibiz-control-captionbar-caption::before,.ibiz-modal .ibiz-view .ibiz-view .ibiz-control-captionbar-caption::before,.ibiz-popover .ibiz-view .ibiz-view .ibiz-control-captionbar-caption::before{content:none}
+.ibiz-control-captionbar{--ibiz-control-captionbar-color:var(--ibiz-color-text-0);--ibiz-control-captionbar-font-size:var(--ibiz-font-size-header-5);--ibiz-control-captionbar-font-weight:var(--ibiz-font-weight-regular);--ibiz-control-captionbar-padding:0 var(--ibiz-spacing-base);--ibiz-control-captionbar-margin:var(--ibiz-spacing-none);position:relative;height:100%;padding:var(--ibiz-control-captionbar-padding)}.ibiz-control-captionbar .ibiz-control-captionbar-caption{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;position:relative;height:100%;padding-left:var(--ibiz-spacing-base);font-size:var(--ibiz-control-captionbar-font-size);font-weight:var(--ibiz-control-captionbar-font-weight);color:var(--ibiz-control-captionbar-color);display:flex;align-items:center;justify-content:flex-start}.ibiz-control-captionbar .ibiz-control-captionbar-caption::before{position:absolute;top:50%;left:0;width:4px;height:20px;content:"";background-color:var(--ibiz-color-primary);border-radius:2px;transform:translateY(-50%)}.ibiz-control-captionbar .ibiz-control-captionbar-caption.is-show-icon{padding-left:0}.ibiz-control-captionbar .ibiz-control-captionbar-caption.is-show-icon::before{display:none}.ibiz-control-captionbar-caption__icon{margin-right:var(--ibiz-spacing-tight)}.ibiz-control-captionbar-caption__content{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-view:not(.ibiz-view-appindexview) .ibiz-view .ibiz-view .ibiz-control-captionbar-caption{--ibiz-control-captionbar-font-size:var(--ibiz-font-size-header-5);--ibiz-control-captionbar-font-weight:var(--ibiz-font-weight-regular);padding-left:0}.ibiz-view:not(.ibiz-view-appindexview) .ibiz-view .ibiz-view .ibiz-control-captionbar-caption::before{content:none}.ibiz-drawer .ibiz-view .ibiz-view .ibiz-control-captionbar-caption,.ibiz-modal .ibiz-view .ibiz-view .ibiz-control-captionbar-caption,.ibiz-popover .ibiz-view .ibiz-view .ibiz-control-captionbar-caption{--ibiz-control-captionbar-font-size:var(--ibiz-font-size-header-5);--ibiz-control-captionbar-font-weight:var(--ibiz-font-weight-regular);padding-left:0}.ibiz-drawer .ibiz-view .ibiz-view .ibiz-control-captionbar-caption::before,.ibiz-modal .ibiz-view .ibiz-view .ibiz-control-captionbar-caption::before,.ibiz-popover .ibiz-view .ibiz-view .ibiz-control-captionbar-caption::before{content:none}

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

@@ -145,22 +145,21 @@ class DRBarController extends runtime.ControlController {
    * @memberof DRBarController
    */
   async calcDrBarItemsState() {
-    const arr = [];
-    this.state.drBarItems.forEach((group) => {
-      var _a, _b;
-      if ((_a = group.children) == null ? void 0 : _a.length) {
-        (_b = group.children) == null ? void 0 : _b.forEach((item) => {
-          arr.push(this.calcPermitted(item));
-        });
-      }
-    });
-    await Promise.all(arr);
-    this.state.drBarItems.forEach((group) => {
-      var _a;
-      if ((_a = group.children) == null ? void 0 : _a.length) {
-        group.visible = !group.children.every((item) => item.visible === false);
-      }
-    });
+    await Promise.all(
+      this.state.drBarItems.map(async (item) => {
+        var _a;
+        if ((_a = item.children) == null ? void 0 : _a.length) {
+          await Promise.all(
+            item.children.map(async (childItem) => {
+              await this.calcPermitted(childItem);
+            })
+          );
+          item.visible = item.children.some((childItem) => childItem.visible);
+        } else {
+          await this.calcPermitted(item);
+        }
+      })
+    );
   }
   /**
    * 加载完成

package/lib/control/grid/grid-column/grid-field-edit-column/cell-edit.cjs

@@ -29,7 +29,9 @@ function useCellEdit(props, componentRef) {
     return !editorShowEdit.value;
   });
   const editorDisabled = false;
-  const isAutoFocus = true;
+  const isAutoFocus = vue.computed(() => {
+    return !hasError.value;
+  });
   const showEditMask = vue.computed(() => {
     return cellEditable.value && !editable.value;
   });

package/lib/control/toolbar/toolbar.cjs

@@ -52,9 +52,11 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
     }
   },
   setup() {
+    var _a;
     const c = vue3Util.useControlController((...args) => new runtime.ToolbarController(...args));
     const ns = vue3Util.useNamespace("control-".concat(c.model.controlType.toLowerCase()));
     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);
     };
@@ -80,13 +82,13 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
         "class": ns.b("submenu"),
         "index": item.id,
         "title": item.tooltip,
-        "popper-class": ns.b("submenu-popper")
+        "popper-class": [ns.b("submenu-popper"), ns.bm("submenu-popper", toolbarStyle)]
       }, {
         default: () => {
           return detoolbarItems.map((item2) => {
-            var _a;
+            var _a2;
             const actionId = item2.uiactionId;
-            const visible = (_a = c.state.buttonsState[item2.id]) == null ? void 0 : _a.visible;
+            const visible = (_a2 = c.state.buttonsState[item2.id]) == null ? void 0 : _a2.visible;
             if (!visible) {
               return null;
             }
@@ -150,9 +152,9 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
       });
     };
     const renderToolbarItem = (item) => {
-      var _a, _b;
+      var _a2, _b;
       const itemId = item.id;
-      const visible = (_a = c.state.buttonsState[itemId]) == null ? void 0 : _a.visible;
+      const visible = (_a2 = c.state.buttonsState[itemId]) == null ? void 0 : _a2.visible;
       if (!visible) {
         return null;
       }
@@ -192,7 +194,7 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
         }, [vue.createVNode(vue.resolveComponent("el-button"), {
           "title": item.tooltip,
           "size": btnSize.value,
-          "text": Object.is(buttonType, "INVERSE"),
+          "text": Object.is(buttonType, "inverse"),
           "type": buttonType,
           "loading": c.state.buttonsState[itemId].loading,
           "disabled": c.state.buttonsState[itemId].disabled,
@@ -218,24 +220,23 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
       c,
       btnSize,
       ns,
+      toolbarStyle,
       handleClick,
       renderExtraButtons,
       renderToolbarItem
     };
   },
   render() {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     const {
-      state,
-      model
+      state
     } = this.c;
-    const toolbarStyle = (_a = model.toolbarStyle) == null ? void 0 : _a.toLowerCase();
     let content = null;
     if (state.isCreated) {
       content = [
         // 绘制最前方的额外按钮
-        ((_b = state.extraButtons.before) == null ? void 0 : _b.length) > 0 && this.renderExtraButtons(state.extraButtons.before),
-        (_c = this.modelData.detoolbarItems) == null ? void 0 : _c.map((item, index) => {
+        ((_a = state.extraButtons.before) == null ? void 0 : _a.length) > 0 && this.renderExtraButtons(state.extraButtons.before),
+        (_b = this.modelData.detoolbarItems) == null ? void 0 : _b.map((item, index) => {
           var _a2;
           const toolbarItemNode = this.renderToolbarItem(item);
           if ((_a2 = state.extraButtons[index]) == null ? void 0 : _a2.length) {
@@ -244,12 +245,12 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
           return toolbarItemNode;
         }),
         // 绘制最后方的额外按钮
-        ((_d = state.extraButtons.after) == null ? void 0 : _d.length) > 0 && this.renderExtraButtons(state.extraButtons.after)
+        ((_c = state.extraButtons.after) == null ? void 0 : _c.length) > 0 && this.renderExtraButtons(state.extraButtons.after)
       ];
     }
     return vue.createVNode(vue.resolveComponent("iBizControlBase"), {
       "controller": this.c,
-      "class": [this.ns.m(state.viewMode.toLowerCase()), this.ns.m(toolbarStyle)]
+      "class": [this.ns.m(state.viewMode.toLowerCase()), this.ns.m(this.toolbarStyle)]
     }, _isSlot(content) ? content : {
       default: () => [content]
     });

package/lib/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-edit-column/cell-edit.cjs

@@ -27,7 +27,9 @@ function useCellEdit(props, componentRef) {
     return !editorShowEdit.value;
   });
   const editorDisabled = false;
-  const isAutoFocus = true;
+  const isAutoFocus = vue.computed(() => {
+    return !hasError.value;
+  });
   const showEditMask = vue.computed(() => {
     return cellEditable.value && !editable.value;
   });

package/lib/editor/data-picker/ibiz-picker/ibiz-picker.cjs

@@ -130,13 +130,11 @@ const IBizPicker = /* @__PURE__ */ vue.defineComponent({
       emit("change", null);
     };
     const closeCircle = (c.linkView ? 1 : 0) + (c.pickupView ? 1 : 0);
-    if (props.autoFocus) {
-      vue.watch(editorRef, (newVal) => {
-        if (newVal) {
-          newVal.focus();
-        }
-      });
-    }
+    vue.watch(editorRef, (newVal) => {
+      if (props.autoFocus && newVal && newVal.focus) {
+        newVal.focus();
+      }
+    });
     const onFocus = (e) => {
       emit("focus", e);
       setEditable(true);

package/lib/editor/date-picker/ibiz-date-picker/ibiz-date-picker.cjs

@@ -77,13 +77,11 @@ const IBizDatePicker = /* @__PURE__ */ vue.defineComponent({
       emit("change", date);
       setEditable(false);
     };
-    if (props.autoFocus) {
-      vue.watch(editorRef, (newVal) => {
-        if (newVal && newVal.focus) {
-          newVal.focus();
-        }
-      });
-    }
+    vue.watch(editorRef, (newVal) => {
+      if (props.autoFocus && newVal && newVal.focus) {
+        newVal.focus();
+      }
+    });
     const onFocus = (e) => {
       emit("focus", e);
       setEditable(true);