@ibiz-template/vue3-components 0.6.9 → 0.6.10

package/es/editor/upload/ibiz-file-upload/ibiz-file-upload.mjs

@@ -1,4 +1,4 @@
-import { computed, resolveComponent, createTextVNode, createVNode, defineComponent } from 'vue';
+import { computed, resolveComponent, mergeProps, createTextVNode, createVNode, defineComponent } from 'vue';
 import { getUploadProps, getEditorEmits, useNamespace, useFocusAndBlur } from '@ibiz-template/vue3-util';
 import './ibiz-file-upload.css';
 import { useIViewUpload } from '../use/use-iview-upload.mjs';
@@ -64,7 +64,7 @@ const IBizFileUpload = /* @__PURE__ */ defineComponent({
     return createVNode("div", {
       "class": [this.ns.b(), this.disabled ? this.ns.m("disabled") : "", this.readonly ? this.ns.m("readonly") : "", this.ns.is("show-default", this.showFormDefaultContent)],
       "ref": "componentRef"
-    }, [createVNode(resolveComponent("el-upload"), {
+    }, [createVNode(resolveComponent("el-upload"), mergeProps({
       "class": [this.ns.b("icon"), this.ns.is("not-show", this.noUploadIcon)],
       "file-list": this.files,
       "action": this.uploadUrl,
@@ -79,7 +79,7 @@ const IBizFileUpload = /* @__PURE__ */ defineComponent({
       "onError": this.onError,
       "onRemove": this.onRemove,
       "onPreview": this.onDownload
-    }, {
+    }, this.$attrs), {
       default: () => [this.noUploadIcon ? null : createVNode(resolveComponent("el-button"), {
         "class": [this.ns.b("button")],
         "size": this.isGridEditor ? "small" : "default"

package/es/editor/upload/ibiz-image-preview/ibiz-image-preview.mjs

@@ -1,4 +1,4 @@
-import { computed, resolveComponent, createVNode, defineComponent } from 'vue';
+import { computed, resolveComponent, mergeProps, createVNode, defineComponent } from 'vue';
 import { getUploadProps, getEditorEmits, useNamespace } from '@ibiz-template/vue3-util';
 import './ibiz-image-preview.css';
 
@@ -28,11 +28,11 @@ const IBizImagePreview = /* @__PURE__ */ defineComponent({
       "onClick": (e) => {
         e.stopPropagation();
       }
-    }, [createVNode(resolveComponent("el-image"), {
+    }, [createVNode(resolveComponent("el-image"), mergeProps({
       "fit": "contain",
       "src": this.value,
       "preview-src-list": [this.value]
-    }, null)]);
+    }, this.$attrs), null)]);
   }
 });
 

package/es/editor/upload/ibiz-image-upload/ibiz-image-upload.mjs

@@ -1,4 +1,4 @@
-import { ref, computed, createVNode, resolveComponent, defineComponent } from 'vue';
+import { ref, computed, createVNode, resolveComponent, mergeProps, defineComponent } from 'vue';
 import { getUploadProps, getEditorEmits, useNamespace, useFocusAndBlur } from '@ibiz-template/vue3-util';
 import './ibiz-image-upload.css';
 import { useIViewUpload } from '../use/use-iview-upload.mjs';
@@ -93,7 +93,7 @@ const IBizImageUpload = /* @__PURE__ */ defineComponent({
       "class": this.ns.e("remove-icon"),
       "onClick": () => this.onRemove(item),
       "name": "remove"
-    }, null)])]))]), createVNode(resolveComponent("el-upload"), {
+    }, null)])]))]), createVNode(resolveComponent("el-upload"), mergeProps({
       "ref": "imageUpload",
       "class": [this.ns.b("icon"), this.ns.is("not-show", this.noUploadIcon)],
       "file-list": this.files,
@@ -110,19 +110,19 @@ const IBizImageUpload = /* @__PURE__ */ defineComponent({
       "onError": this.onError,
       "onRemove": this.onRemove,
       "onPreview": this.onDownload
-    }, {
+    }, this.$attrs), {
       default: () => [createVNode("ion-icon", {
         "name": "add-outline",
         "class": this.ns.e("image-upload-add")
       }, null)]
-    }), this.dialogVisible ? createVNode(resolveComponent("el-image-viewer"), {
+    }), this.dialogVisible ? createVNode(resolveComponent("el-image-viewer"), mergeProps({
       "onClose": () => this.onDialogVisibleChange(false),
       "url-list": [this.dialogImageUrl],
       "hide-on-click-modal": true,
       "close-on-press-escape": true,
       "teleported": true,
       "z-index": 9999
-    }, null) : null]);
+    }, this.$attrs), null) : null]);
   }
 });
 

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

@@ -1,4 +1,4 @@
-import { ref, computed, watch, resolveComponent, createVNode, defineComponent } from 'vue';
+import { ref, computed, watch, resolveComponent, createVNode, mergeProps, defineComponent } from 'vue';
 import { getInputProps, getEditorEmits, useNamespace } from '@ibiz-template/vue3-util';
 import './ibiz-searchcond-edit.css';
 import { isNilOrEmpty } from 'qx-util';
@@ -152,7 +152,7 @@ const IBizSearchCondEdit = /* @__PURE__ */ defineComponent({
     if (this.readonly) {
       content = isNilOrEmpty(this.currentVal) ? "" : "".concat(this.currentVal);
     } else {
-      content = [createVNode(resolveComponent("el-input"), {
+      content = [createVNode(resolveComponent("el-input"), mergeProps({
         "ref": "editorRef",
         "class": [this.ns.b("input")],
         "model-value": this.currentVal,
@@ -164,7 +164,7 @@ const IBizSearchCondEdit = /* @__PURE__ */ defineComponent({
         "onFocus": this.onFocus,
         "onBlur": this.onBlur,
         "onKeyup": this.handleKeyUp
-      }, null), createVNode(resolveComponent("el-button"), {
+      }, this.$attrs), null), createVNode(resolveComponent("el-button"), {
         "ref": "filterButtonRef",
         "type": "primary",
         "title": "\u7F16\u8F91",

package/es/view-engine/exp-view.engine.d.ts

@@ -1,4 +1,4 @@
-import { ViewController, IExpBarControlController, IExpViewState, IExpViewEvent, MDViewEngine, IMDControlController, EventBase, MDCtrlLoadParams } from '@ibiz-template/runtime';
+import { ViewController, IExpBarControlController, IExpViewState, IExpViewEvent, MDViewEngine, IMDControlController, EventBase, MDCtrlLoadParams, IViewController } from '@ibiz-template/runtime';
 import { IAppDEExplorerView, IAppDEMultiDataView } from '@ibiz/model-core';
 type IAppDEMultiDataExpView = IAppDEExplorerView & IAppDEMultiDataView;
 /**
@@ -39,6 +39,7 @@ export declare class ExpViewEngine extends MDViewEngine {
      * @type {IMDControlController}
      */
     protected get xdataControl(): IMDControlController;
+    constructor(view: IViewController);
     /**
      * 组件创建
      *

package/es/view-engine/exp-view.engine.mjs

@@ -36,6 +36,16 @@ class ExpViewEngine extends MDViewEngine {
   get xdataControl() {
     return this.expBar.xDataController;
   }
+  constructor(view) {
+    var _a, _b;
+    const modelData = (_b = (_a = view.model.viewLayoutPanel) == null ? void 0 : _a.controls) == null ? void 0 : _b.find(
+      (item) => item.id === "searchbar"
+    );
+    if (modelData && !modelData.name) {
+      modelData.name = "searchbar";
+    }
+    super(view);
+  }
   /**
    * 组件创建
    *

package/es/view-engine/index.mjs

@@ -42,6 +42,7 @@ import { ReportViewEngine } from './report-view.engine.mjs';
 import { GanttViewEngine } from './gantt-view.engine.mjs';
 import { DEIndexViewEngine } from './de-index-view-engine.mjs';
 import { SubAppRefViewEngine } from './sub-app-ref-view.engine.mjs';
+import { TabSearchViewEngine } from './tab-search-view.engine.mjs';
 
 "use strict";
 const IBizViewEngine = {
@@ -274,6 +275,10 @@ const IBizViewEngine = {
       "VIEW_DEINDEXVIEW",
       (c) => new DEIndexViewEngine(c)
     );
+    ibiz.engine.register(
+      "VIEW_DETABSEARCHVIEW",
+      (c) => new TabSearchViewEngine(c)
+    );
   }
 };
 

package/es/view-engine/tab-search-view.engine.d.ts

@@ -0,0 +1,61 @@
+import { ISearchBarController, ISearchFormController, ITabExpPanelController, ITabSearchViewEvent, ITabSearchViewState, ViewController } from '@ibiz-template/runtime';
+import { IAppDEEditView } from '@ibiz/model-core';
+import { TabExpViewEngine } from './tab-exp-view.engine';
+/**
+ * 编辑视图3（分页关系）
+ *
+ * @export
+ * @class TabSearchViewEngine
+ * @extends {EditViewEngine}
+ */
+export declare class TabSearchViewEngine extends TabExpViewEngine {
+    /**
+     * 视图控制器
+     *
+     * @protected
+     * @type {ViewController<
+     *     IAppDEEditView,
+     *     ITabSearchViewState,
+     *     ITabSearchViewEvent
+     *   >}
+     * @memberof TabSearchViewEngine
+     */
+    protected view: ViewController<IAppDEEditView, ITabSearchViewState, ITabSearchViewEvent>;
+    /**
+     * 搜索表单控制器
+     * @author lxm
+     * @date 2023-05-22 01:56:25
+     * @readonly
+     */
+    protected get searchForm(): ISearchFormController;
+    /**
+     * 搜索栏控制器
+     * @author lxm
+     * @date 2023-05-22 01:56:25
+     * @readonly
+     */
+    protected get searchBar(): ISearchBarController;
+    /**
+     * 分页导航面板控制器
+     * @author lxm
+     * @date 2023-05-22 01:56:25
+     * @readonly
+     */
+    get tabExpPanel(): ITabExpPanelController;
+    onCreated(): Promise<void>;
+    onMounted(): Promise<void>;
+    call(key: string, args: any): Promise<IData | null | undefined>;
+    /**
+     * 获取搜索相关的查询参数
+     * @author lxm
+     * @date 2023-05-22 03:26:04
+     * @return {*}  {IParams}
+     */
+    protected getSearchParams(): IParams;
+    /**
+     * 重新计算视图参数
+     * @author lxm
+     * @date 2024-03-18 05:00:02
+     */
+    calcViewParams(): void;
+}

package/es/view-engine/tab-search-view.engine.mjs

@@ -0,0 +1,105 @@
+import { SysUIActionTag } from '@ibiz-template/runtime';
+import { TabExpViewEngine } from './tab-exp-view.engine.mjs';
+
+"use strict";
+class TabSearchViewEngine extends TabExpViewEngine {
+  /**
+   * 搜索表单控制器
+   * @author lxm
+   * @date 2023-05-22 01:56:25
+   * @readonly
+   */
+  get searchForm() {
+    return this.view.getController("searchform");
+  }
+  /**
+   * 搜索栏控制器
+   * @author lxm
+   * @date 2023-05-22 01:56:25
+   * @readonly
+   */
+  get searchBar() {
+    return this.view.getController("searchbar");
+  }
+  /**
+   * 分页导航面板控制器
+   * @author lxm
+   * @date 2023-05-22 01:56:25
+   * @readonly
+   */
+  get tabExpPanel() {
+    return this.view.getController("tabexppanel");
+  }
+  async onCreated() {
+    await super.onCreated();
+    const { childNames } = this.view;
+    childNames.push("searchform", "searchbar");
+  }
+  async onMounted() {
+    await super.onMounted();
+    const controller = this.viewLayoutPanel.panelItems.view_searchform;
+    if (controller) {
+      const formExists = !!this.searchForm;
+      controller.state.keepAlive = formExists;
+      controller.state.visible = formExists;
+    }
+    const searchbarC = this.viewLayoutPanel.panelItems.view_searchbar;
+    if (searchbarC) {
+      const visible = this.searchBar && !!(this.searchBar.model.enableQuickSearch || this.searchBar.model.enableGroup || this.searchBar.model.enableFilter === true);
+      searchbarC.state.visible = visible;
+    }
+    if (this.searchForm) {
+      this.searchForm.evt.on("onSearch", () => {
+        this.calcViewParams();
+      });
+    }
+    if (this.searchBar) {
+      this.searchBar.evt.on("onSearch", () => {
+        this.calcViewParams();
+      });
+    }
+  }
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
+  async call(key, args) {
+    if (key === SysUIActionTag.SEARCH) {
+      await this.searchForm.search();
+      return null;
+    }
+    if (key === SysUIActionTag.RESET) {
+      await this.searchForm.reset();
+      return null;
+    }
+    if (key === SysUIActionTag.REFRESH) {
+      await this.calcViewParams();
+      return null;
+    }
+    return super.call(key, args);
+  }
+  /**
+   * 获取搜索相关的查询参数
+   * @author lxm
+   * @date 2023-05-22 03:26:04
+   * @return {*}  {IParams}
+   */
+  getSearchParams() {
+    const params = {};
+    if (this.searchForm) {
+      Object.assign(params, this.searchForm.getFilterParams());
+    }
+    if (this.searchBar) {
+      Object.assign(params, this.searchBar.getFilterParams());
+    }
+    return params;
+  }
+  /**
+   * 重新计算视图参数
+   * @author lxm
+   * @date 2024-03-18 05:00:02
+   */
+  calcViewParams() {
+    this.tabExpPanel.state.expViewParams = this.getSearchParams();
+    this.tabExpPanel.refresh();
+  }
+}
+
+export { TabSearchViewEngine };

package/es/web-app/guard/auth-guard/auth-guard.mjs

@@ -113,11 +113,15 @@ class AuthGuard {
       const remember = getCookie(CoreConst.TOKEN_REMEMBER);
       const refreshToken = getCookie(CoreConst.REFRESH_TOKEN);
       if (responseStatus === 401 && remember && refreshToken != null && refreshToken !== "") {
-        await ibiz.auth.refreshToken();
-        if (ibiz.env.isSaaSMode === true) {
-          await this.loadOrgData();
+        try {
+          await ibiz.auth.refreshToken();
+          if (ibiz.env.isSaaSMode === true) {
+            await this.loadOrgData();
+          }
+          await this.loadAppData();
+        } catch (refreshTokenError) {
+          throw error;
         }
-        await this.loadAppData();
       } else {
         throw error;
       }

package/lib/control/calendar/calendar.css

@@ -1 +1 @@
-.ibiz-control-calendar{--ibiz-control-calendar-text-color:var(--ibiz-color-text-0);--ibiz-control-calendar-hover-bg-color:var(--ibiz-color-fill-0);--ibiz-control-calendar-active-bg-color:var(--ibiz-color-fill-0);--ibiz-control-calendar-border-color:var(--ibiz-color-primary-active);--ibiz-control-calendar-font-size:var(--ibiz-font-size-small);--ibiz-control-calendar-item-padding:var(--ibiz-spacing-tight);--ibiz-control-calendar-border-radius:var(--ibiz-border-radius-small);--ibiz-control-calendar-margin:var(--ibiz-spacing-extra-tight);width:100%;height:100%}.ibiz-control-calendar__calendar-item{display:flex;align-items:center;padding:var(--ibiz-control-calendar-item-padding)}.ibiz-control-calendar__icon{width:10px;height:10px;margin-right:var(--ibiz-spacing-base-tight);border-radius:50%}.ibiz-control-calendar-content{display:flex;flex-direction:column;width:100%;height:100%}.ibiz-control-calendar-content .el-calendar{display:flex;flex-direction:column;height:100%}.ibiz-control-calendar-content .el-calendar__header{flex-wrap:wrap}.ibiz-control-calendar-content .el-calendar-table,.ibiz-control-calendar-content .el-calendar-table .el-calendar-day{width:100%;height:100%;cursor:pointer}.ibiz-control-calendar-content .el-calendar-table{flex:1;width:-moz-fit-content;width:fit-content}.ibiz-control-calendar-content .el-calendar-table .el-calendar-day:hover{cursor:pointer;background-color:var(--el-calendar-selected-bg-color)}.ibiz-control-calendar-content .el-calendar__body{display:flex;flex:1;padding:0;overflow:auto}.ibiz-control-calendar-more{width:100%;font-size:var(--ibiz-font-size-small);border-radius:var(--ibiz-spacing-extra-tight)}.ibiz-control-calendar-more:hover{background-color:var(--ibiz-control-calendar-hover-bg-color)}.ibiz-control-calendar-item{--ibiz-control-calendar-text-color:var(--ibiz-color-text-0);--ibiz-control-calendar-hover-bg-color:var(--ibiz-color-fill-0);--ibiz-control-calendar-active-bg-color:var(--ibiz-color-fill-0);--ibiz-control-calendar-border-color:var(--ibiz-color-primary-active);--ibiz-control-calendar-font-size:var(--ibiz-font-size-small);--ibiz-control-calendar-item-padding:var(--ibiz-spacing-tight);--ibiz-control-calendar-border-radius:var(--ibiz-border-radius-small);--ibiz-control-calendar-margin:var(--ibiz-spacing-extra-tight);height:100%;padding:var(--ibiz-control-calendar-item-padding);margin-bottom:var(--ibiz-control-calendar-margin);overflow:hidden;font-size:var(--ibiz-control-calendar-font-size);color:var(--ibiz-control-calendar-text-color);text-overflow:ellipsis;white-space:nowrap;cursor:pointer;border:solid .5px transparent;border-radius:var(--ibiz-control-calendar-border-radius)}.ibiz-control-calendar-item:hover{background-color:var(--ibiz-control-calendar-hover-bg-color)}.ibiz-control-calendar-item.is-active{background-color:var(--ibiz-control-calendar-active-bg-color);border:solid .5px var(--ibiz-control-calendar-border-color)}.ibiz-control-calendar-date-text{--ibiz-control-calendar-text-color:var(--ibiz-color-text-0);--ibiz-control-calendar-hover-bg-color:var(--ibiz-color-fill-0);--ibiz-control-calendar-active-bg-color:var(--ibiz-color-fill-0);--ibiz-control-calendar-border-color:var(--ibiz-color-primary-active);--ibiz-control-calendar-font-size:var(--ibiz-font-size-small);--ibiz-control-calendar-item-padding:var(--ibiz-spacing-tight);--ibiz-control-calendar-border-radius:var(--ibiz-border-radius-small);--ibiz-control-calendar-margin:var(--ibiz-spacing-extra-tight);padding:var(--ibiz-control-calendar-item-padding);margin:0;text-align:center}.ibiz-control-calendar-day{height:-moz-fit-content;height:fit-content}.ibiz-control-calendar-content-title{line-height:var(--ibiz-editor-default-line-height)}.ibiz-control-calendar-content-header{--ibiz-control-calendar-text-color:var(--ibiz-color-text-0);--ibiz-control-calendar-hover-bg-color:var(--ibiz-color-fill-0);--ibiz-control-calendar-active-bg-color:var(--ibiz-color-fill-0);--ibiz-control-calendar-border-color:var(--ibiz-color-primary-active);--ibiz-control-calendar-font-size:var(--ibiz-font-size-small);--ibiz-control-calendar-item-padding:var(--ibiz-spacing-tight);--ibiz-control-calendar-border-radius:var(--ibiz-border-radius-small);--ibiz-control-calendar-margin:var(--ibiz-spacing-extra-tight);display:flex;align-items:center}.ibiz-control-calendar-content-header>*+*{margin-left:var(--ibiz-control-calendar-item-padding)}.ibiz-control-calendar-legend{display:flex;justify-content:flex-end;width:100%}.ibiz-control-calendar-legend>*+*{margin-left:var(--ibiz-spacing-base-loose)}.ibiz-control-calendar-timeline-content .el-timeline{padding-left:0}
+.ibiz-control-calendar{--ibiz-control-calendar-text-color:var(--ibiz-color-text-0);--ibiz-control-calendar-hover-bg-color:var(--ibiz-color-fill-0);--ibiz-control-calendar-active-bg-color:var(--ibiz-color-fill-0);--ibiz-control-calendar-border-color:var(--ibiz-color-primary-active);--ibiz-control-calendar-font-size:var(--ibiz-font-size-small);--ibiz-control-calendar-item-padding:var(--ibiz-spacing-tight);--ibiz-control-calendar-border-radius:var(--ibiz-border-radius-small);--ibiz-control-calendar-margin:var(--ibiz-spacing-extra-tight);width:100%;height:100%}.ibiz-control-calendar__calendar-item{display:flex;align-items:center;padding:var(--ibiz-control-calendar-item-padding)}.ibiz-control-calendar__icon{width:10px;height:10px;margin-right:var(--ibiz-spacing-base-tight);border-radius:50%}.ibiz-control-calendar .ibiz-control-calendar-item{margin:0}.ibiz-control-calendar-content{display:flex;flex-direction:column;width:100%;height:100%}.ibiz-control-calendar-content .el-calendar{display:flex;flex-direction:column;height:100%}.ibiz-control-calendar-content .el-calendar__header{flex-wrap:wrap}.ibiz-control-calendar-content .el-calendar-table,.ibiz-control-calendar-content .el-calendar-table .el-calendar-day{width:100%;height:100%;min-height:90px;cursor:pointer}.ibiz-control-calendar-content .el-calendar-table{flex:1;width:-moz-fit-content;width:fit-content}.ibiz-control-calendar-content .el-calendar-table .el-calendar-day:hover{cursor:pointer;background-color:var(--el-calendar-selected-bg-color)}.ibiz-control-calendar-content .el-calendar__body{display:flex;flex:1;padding:0;overflow:auto}.ibiz-control-calendar-more{width:100%;font-size:var(--ibiz-font-size-small);border-radius:var(--ibiz-spacing-extra-tight)}.ibiz-control-calendar-more:hover{background-color:var(--ibiz-control-calendar-hover-bg-color)}.ibiz-control-calendar-item{--ibiz-control-calendar-text-color:var(--ibiz-color-text-0);--ibiz-control-calendar-hover-bg-color:var(--ibiz-color-fill-0);--ibiz-control-calendar-active-bg-color:var(--ibiz-color-fill-0);--ibiz-control-calendar-border-color:var(--ibiz-color-primary-active);--ibiz-control-calendar-font-size:var(--ibiz-font-size-small);--ibiz-control-calendar-item-padding:var(--ibiz-spacing-tight);--ibiz-control-calendar-border-radius:var(--ibiz-border-radius-small);--ibiz-control-calendar-margin:var(--ibiz-spacing-extra-tight);height:100%;padding:var(--ibiz-control-calendar-item-padding);margin-bottom:var(--ibiz-control-calendar-margin);overflow:hidden;font-size:var(--ibiz-control-calendar-font-size);color:var(--ibiz-control-calendar-text-color);text-overflow:ellipsis;white-space:nowrap;cursor:pointer;border:solid .5px transparent;border-radius:var(--ibiz-control-calendar-border-radius)}.ibiz-control-calendar-item:hover{background-color:var(--ibiz-control-calendar-hover-bg-color)}.ibiz-control-calendar-item.is-active{background-color:var(--ibiz-control-calendar-active-bg-color);border:solid .5px var(--ibiz-control-calendar-border-color)}.ibiz-control-calendar-date-text{--ibiz-control-calendar-text-color:var(--ibiz-color-text-0);--ibiz-control-calendar-hover-bg-color:var(--ibiz-color-fill-0);--ibiz-control-calendar-active-bg-color:var(--ibiz-color-fill-0);--ibiz-control-calendar-border-color:var(--ibiz-color-primary-active);--ibiz-control-calendar-font-size:var(--ibiz-font-size-small);--ibiz-control-calendar-item-padding:var(--ibiz-spacing-tight);--ibiz-control-calendar-border-radius:var(--ibiz-border-radius-small);--ibiz-control-calendar-margin:var(--ibiz-spacing-extra-tight);padding-bottom:var(--ibiz-control-calendar-item-padding);margin:0;text-align:center}.ibiz-control-calendar-day{height:-moz-fit-content;height:fit-content}.ibiz-control-calendar-content-title{line-height:var(--ibiz-editor-default-line-height)}.ibiz-control-calendar-content-header{--ibiz-control-calendar-text-color:var(--ibiz-color-text-0);--ibiz-control-calendar-hover-bg-color:var(--ibiz-color-fill-0);--ibiz-control-calendar-active-bg-color:var(--ibiz-color-fill-0);--ibiz-control-calendar-border-color:var(--ibiz-color-primary-active);--ibiz-control-calendar-font-size:var(--ibiz-font-size-small);--ibiz-control-calendar-item-padding:var(--ibiz-spacing-tight);--ibiz-control-calendar-border-radius:var(--ibiz-border-radius-small);--ibiz-control-calendar-margin:var(--ibiz-spacing-extra-tight);display:flex;align-items:center}.ibiz-control-calendar-content-header>*+*{margin-left:var(--ibiz-control-calendar-item-padding)}.ibiz-control-calendar-legend{display:flex;justify-content:flex-end;width:100%}.ibiz-control-calendar-legend>*+*{margin-left:var(--ibiz-spacing-base-loose)}.ibiz-control-calendar-timeline-content .el-timeline{padding-left:0}

package/lib/control/drbar/drbar.cjs

@@ -98,6 +98,9 @@ const DRBarControl = /* @__PURE__ */ vue.defineComponent({
       immediate: true
     });
     const renderMenuItems = (item) => {
+      if (!item.visible) {
+        return;
+      }
       if (item.children) {
         let subtitle = "";
         if (props.showMode === "horizontal") {

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

@@ -118,6 +118,50 @@ class DRBarController extends runtime.ControlController {
     this.initDRBarItems();
     await this.initCounter();
   }
+  /**
+   * 计算关系界面组权限
+   *
+   * @param {IData} item 关系组成员
+   * @memberof DRBarController
+   */
+  async calcPermitted(item) {
+    let permitted = true;
+    if (item.dataAccessAction) {
+      const app = await ibiz.hub.getApp(this.context.srfappid);
+      const data = this.getData().length > 0 ? this.getData()[0] : void 0;
+      permitted = await app.authority.calcByDataAccessAction(
+        item.dataAccessAction,
+        this.context,
+        data,
+        this.model.appDataEntityId
+      );
+    }
+    item.visible = permitted;
+  }
+  /**
+   * 计算是否展示
+   *
+   * @param {IData} item 关系组成员
+   * @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);
+      }
+    });
+  }
   /**
    * 加载完成
    *
@@ -127,7 +171,8 @@ class DRBarController extends runtime.ControlController {
   async onMounted() {
     await super.onMounted();
     if (this.form) {
-      this.form.evt.on("onLoadSuccess", () => {
+      this.form.evt.on("onLoadSuccess", async () => {
+        await this.calcDrBarItemsState();
         this.handleFormChange();
         this.doDefaultSelect();
       });
@@ -209,7 +254,9 @@ class DRBarController extends runtime.ControlController {
         caption: itemCaption,
         sysImage: item.sysImage,
         disabled: false,
-        counterId: item.counterId
+        counterId: item.counterId,
+        visible: true,
+        dataAccessAction: item.dataAccessAction || void 0
       };
     };
     if (dedrbarGroups && dedrctrlItems) {
@@ -234,6 +281,7 @@ class DRBarController extends runtime.ControlController {
               tag: group.id,
               caption: itemCaption,
               sysImage: group.sysImage,
+              visible: true,
               children: groupItems.map((item) => getItemState(item))
             });
           } else if (groupItems.length === 1) {

package/lib/control/drbar/drbar.css

@@ -1 +1 @@
-.ibiz-control-drbar .el-menu--horizontal.el-menu{border-bottom:none}.ibiz-control-drbar .el-menu-item{justify-content:space-between;line-height:unset}
+.ibiz-control-drbar{height:100%}.ibiz-control-drbar .el-menu--horizontal.el-menu{border-bottom:none}.ibiz-control-drbar .el-menu-item{justify-content:space-between;line-height:unset}.ibiz-control-drbar__menu{height:100%}

package/lib/control/exp-bar/calendar-exp-bar/calendar-exp-bar.cjs

@@ -42,14 +42,14 @@ const CalendarExpBarControl = /* @__PURE__ */ vue.defineComponent({
     const ns = vue3Util.useNamespace("control-".concat(c.model.controlType.toLowerCase()));
     const {
       renderTitle,
-      renderQuickSearch
+      renderSearchBar
     } = renderUtil.useExpBarRender(c, ns);
     renderUtil.useWatchRouteChange(c);
     return {
       c,
       ns,
       renderTitle,
-      renderQuickSearch
+      renderSearchBar
     };
   },
   render() {
@@ -62,7 +62,7 @@ const CalendarExpBarControl = /* @__PURE__ */ vue.defineComponent({
     } = state;
     const slots = {
       captionbar: this.renderTitle,
-      searchbar: this.renderQuickSearch
+      searchbar: this.renderSearchBar
     };
     if (isCreated) {
       if (XDataModel) {

package/lib/control/exp-bar/chart-exp-bar/chart-exp-bar.cjs

@@ -42,14 +42,14 @@ const ChartExpBarControl = /* @__PURE__ */ vue.defineComponent({
     const ns = vue3Util.useNamespace("control-".concat(c.model.controlType.toLowerCase()));
     const {
       renderTitle,
-      renderQuickSearch
+      renderSearchBar
     } = renderUtil.useExpBarRender(c, ns);
     renderUtil.useWatchRouteChange(c);
     return {
       c,
       ns,
       renderTitle,
-      renderQuickSearch
+      renderSearchBar
     };
   },
   render() {
@@ -61,7 +61,7 @@ const ChartExpBarControl = /* @__PURE__ */ vue.defineComponent({
     } = this.c;
     const slots = {
       captionbar: this.renderTitle,
-      searchbar: this.renderQuickSearch
+      searchbar: this.renderSearchBar
     };
     if (isCreated) {
       if (XDataModel) {

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

@@ -42,14 +42,14 @@ const DataViewExpBarControl = /* @__PURE__ */ vue.defineComponent({
     const ns = vue3Util.useNamespace("control-".concat(c.model.controlType.toLowerCase()));
     const {
       renderTitle,
-      renderQuickSearch
+      renderSearchBar
     } = renderUtil.useExpBarRender(c, ns);
     renderUtil.useWatchRouteChange(c);
     return {
       c,
       ns,
       renderTitle,
-      renderQuickSearch
+      renderSearchBar
     };
   },
   render() {
@@ -61,7 +61,7 @@ const DataViewExpBarControl = /* @__PURE__ */ vue.defineComponent({
     } = this.c;
     const slots = {
       captionbar: this.renderTitle,
-      searchbar: this.renderQuickSearch
+      searchbar: this.renderSearchBar
     };
     if (isCreated) {
       if (XDataModel) {

package/lib/control/exp-bar/grid-exp-bar/grid-exp-bar.cjs

@@ -42,14 +42,14 @@ const GridExpBarControl = /* @__PURE__ */ vue.defineComponent({
     const ns = vue3Util.useNamespace("control-".concat(c.model.controlType.toLowerCase()));
     const {
       renderTitle,
-      renderQuickSearch
+      renderSearchBar
     } = renderUtil.useExpBarRender(c, ns);
     renderUtil.useWatchRouteChange(c);
     return {
       c,
       ns,
       renderTitle,
-      renderQuickSearch
+      renderSearchBar
     };
   },
   render() {
@@ -61,7 +61,7 @@ const GridExpBarControl = /* @__PURE__ */ vue.defineComponent({
     } = this.c;
     const slots = {
       captionbar: this.renderTitle,
-      searchbar: this.renderQuickSearch
+      searchbar: this.renderSearchBar
     };
     if (isCreated) {
       if (XDataModel) {

package/lib/control/exp-bar/list-exp-bar/list-exp-bar.cjs

@@ -42,14 +42,14 @@ const ListExpBarControl = /* @__PURE__ */ vue.defineComponent({
     const ns = vue3Util.useNamespace("control-".concat(c.model.controlType.toLowerCase()));
     const {
       renderTitle,
-      renderQuickSearch
+      renderSearchBar
     } = renderUtil.useExpBarRender(c, ns);
     renderUtil.useWatchRouteChange(c);
     return {
       c,
       ns,
       renderTitle,
-      renderQuickSearch
+      renderSearchBar
     };
   },
   render() {
@@ -61,7 +61,7 @@ const ListExpBarControl = /* @__PURE__ */ vue.defineComponent({
     } = this.c;
     const slots = {
       captionbar: this.renderTitle,
-      searchbar: this.renderQuickSearch
+      searchbar: this.renderSearchBar
     };
     if (isCreated) {
       if (XDataModel) {

package/lib/control/exp-bar/render-util.cjs

@@ -36,13 +36,26 @@ function useExpBarRender(c, ns) {
       "class": [ns.be("caption", "text")]
     }, [title])]);
   };
-  const renderQuickSearch = () => {
+  const renderSearchBar = () => {
+    var _a, _b;
     const {
       model
     } = c;
     if (!model.enableSearch) {
       return null;
     }
+    const modelData = (_b = (_a = c.view.model.viewLayoutPanel) == null ? void 0 : _a.controls) == null ? void 0 : _b.find((item) => item.id === "searchbar");
+    if (modelData) {
+      const ctrlProps = {
+        context: c.context,
+        params: c.params
+      };
+      const comp = vue.resolveComponent("IBizControlShell");
+      return vue.h(comp, {
+        modelData,
+        ...ctrlProps
+      });
+    }
     return vue.createVNode(vue.resolveComponent("el-input"), {
       "model-value": c.state.query,
       "class": [ns.b("quick-search"), expBarNs.b("quick-search")],
@@ -59,7 +72,7 @@ function useExpBarRender(c, ns) {
   };
   return {
     renderTitle,
-    renderQuickSearch
+    renderSearchBar
   };
 }
 function useWatchRouteChange(c) {

package/lib/control/exp-bar/tree-exp-bar/tree-exp-bar.cjs

@@ -46,7 +46,7 @@ const TreeExpBarControl = /* @__PURE__ */ vue.defineComponent({
     const ns = vue3Util.useNamespace("control-".concat(c.model.controlType.toLowerCase()));
     const {
       renderTitle,
-      renderQuickSearch
+      renderSearchBar
     } = renderUtil.useExpBarRender(c, ns);
     renderUtil.useWatchRouteChange(c);
     const navigational = vue.computed(() => {
@@ -57,7 +57,7 @@ const TreeExpBarControl = /* @__PURE__ */ vue.defineComponent({
       ns,
       navigational,
       renderTitle,
-      renderQuickSearch
+      renderSearchBar
     };
   },
   render() {
@@ -70,7 +70,7 @@ const TreeExpBarControl = /* @__PURE__ */ vue.defineComponent({
     } = state;
     const slots = {
       captionbar: this.renderTitle,
-      searchbar: this.renderQuickSearch
+      searchbar: this.renderSearchBar
     };
     if (isCreated) {
       if (XDataModel) {