@ibiz-template/vue3-components 0.6.9 → 0.6.11

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/App.css

@@ -1 +1 @@
-#app{width:100vw;height:100vh;background-color:var(--ibiz-color-bg-0)}body,html{padding:0;margin:0;border:0}
+#app{width:100vw;height:100vh;background-color:var(--ibiz-color-bg-0)}body,html{padding:0;margin:0;border:0}.ibiz-message--alert.el-message{--el-message-padding:8px 16px}.ibiz-message--alert.el-message .el-message__content,.ibiz-message--alert.el-message .el-message__icon{color:inherit}.ibiz-message--alert.el-message .el-message__closeBtn{color:#a8abb2}.ibiz-message--alert .el-message__content{line-height:24px}.ibiz-message--alert.el-message--info{color:#909399;background-color:#f4f4f5}.ibiz-message--alert.el-message--success{color:#67c23a;background-color:#f0f9eb}.ibiz-message--alert.el-message--warning{color:#e6a23c;background-color:#fdf6ec}.ibiz-message--alert.el-message--error{color:#f56c6c;background-color:#fef0f0}

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

@@ -58,7 +58,6 @@ const DRBarControl = /* @__PURE__ */ vue.defineComponent({
       c.handleSelectChange(key);
     };
     const route = vueRouter.useRoute();
-    const defaultActive = vue.ref("");
     let expViewRoutePath = "";
     const opens = [];
     vue.watch(() => c.state.isCreated, (_newVal, _oldVal) => {
@@ -84,13 +83,7 @@ const DRBarControl = /* @__PURE__ */ vue.defineComponent({
             const {
               srfnav
             } = routePath.pathNodes[depth - 1];
-            if (srfnav && c.state.selectedItem && c.state.selectedItem !== srfnav) {
-              c.handleSelectChange(srfnav);
-              defaultActive.value = srfnav;
-            } else if (srfnav === void 0 && c.state.defaultItem && c.state.selectedItem !== c.state.defaultItem) {
-              c.handleSelectChange(c.state.defaultItem);
-              defaultActive.value = "";
-            }
+            c.handleSelectChange(srfnav);
           }
         }
       }
@@ -98,6 +91,9 @@ const DRBarControl = /* @__PURE__ */ vue.defineComponent({
       immediate: true
     });
     const renderMenuItems = (item) => {
+      if (!item.visible) {
+        return;
+      }
       if (item.children) {
         let subtitle = "";
         if (props.showMode === "horizontal") {
@@ -141,7 +137,6 @@ const DRBarControl = /* @__PURE__ */ vue.defineComponent({
       ns,
       handleSelect,
       renderMenuItems,
-      defaultActive,
       opens
     };
   },
@@ -150,16 +145,16 @@ const DRBarControl = /* @__PURE__ */ vue.defineComponent({
     const {
       isCreated,
       drBarItems,
-      defaultItem
+      selectedItem
     } = this.c.state;
     return vue.createVNode(vue.resolveComponent("iBizControlBase"), {
       "controller": this.c,
       "class": this.ns.b()
     }, {
-      default: () => [isCreated && !!defaultItem && vue.createVNode(vue.resolveComponent("el-menu"), {
+      default: () => [isCreated && vue.createVNode(vue.resolveComponent("el-menu"), {
         "class": this.ns.e("menu"),
         "mode": this.showMode,
-        "default-active": this.defaultActive || defaultItem,
+        "default-active": selectedItem,
         "onSelect": this.handleSelect,
         "default-openeds": this.opens
       }, _isSlot(_slot = drBarItems.map((item) => {

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) {
@@ -219,10 +266,11 @@ class DRBarController extends runtime.ControlController {
         });
       } else {
         dedrbarGroups.forEach((group) => {
+          var _a;
           const groupItems = dedrctrlItems.filter(
             (item) => item.dedrbarGroupId === group.id
           );
-          if (groupItems.length > 1) {
+          if (groupItems.length > 1 || ((_a = this.controlParams) == null ? void 0 : _a.singleitemgroup) === "true" && groupItems.length === 1) {
             let itemCaption = group.caption;
             if (group.capLanguageRes) {
               itemCaption = ibiz.i18n.t(
@@ -234,6 +282,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) {
@@ -250,7 +299,7 @@ class DRBarController extends runtime.ControlController {
    * @param {string} key
    * @memberof DRBarController
    */
-  handleSelectChange(key, isRoutePushed = false) {
+  handleSelectChange(key = this.state.defaultItem, isRoutePushed = false) {
     var _a;
     if (this.state.selectedItem === key) {
       return;

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) {

package/lib/control/form/form/form.cjs

@@ -25,6 +25,19 @@ const FormControl = /* @__PURE__ */ vue.defineComponent({
     const slotProps = {
       form: c
     };
+    const renderAttrs = (model) => {
+      var _a;
+      const attrs = {};
+      (_a = model.controlAttributes) == null ? void 0 : _a.forEach((item) => {
+        if (item.attrName && item.attrValue) {
+          attrs[item.attrName] = runtime.ScriptFactory.execSingleLine(item.attrValue, {
+            ...props.controller.getEventArgs(),
+            data: props.controller.data
+          });
+        }
+      });
+      return attrs;
+    };
     const renderByDetailType = (detail) => {
       if (detail.hidden) {
         return;
@@ -33,7 +46,8 @@ const FormControl = /* @__PURE__ */ vue.defineComponent({
       const detailProps = {
         modelData: detail,
         controller: c.details[detailId],
-        key: detail.id
+        key: detail.id,
+        ...renderAttrs(detail)
       };
       if (slots[detailId]) {
         return vue.renderSlot(slots, detailId, {

package/lib/control/form/form-detail/form-item/form-item.cjs

@@ -51,7 +51,8 @@ const FormItem = /* @__PURE__ */ vue.defineComponent({
       controlParams: this.controller.form.controlParams,
       onFocus: (event) => this.c.onFocus(event),
       onBlur: (event) => this.c.onBlur(event),
-      onEnter: (event) => this.controller.onEnter(event)
+      onEnter: (event) => this.controller.onEnter(event),
+      ...this.$attrs
     };
     if (this.c.form.state.isLoaded) {
       if (this.$slots.default) {

package/lib/control/grid/grid/grid.cjs

@@ -10,6 +10,18 @@ require('../../../util/index.cjs');
 var usePagination = require('../../../util/pagination/use-pagination.cjs');
 
 "use strict";
+function renderAttrs(model, params) {
+  var _a;
+  const attrs = {};
+  (_a = model.controlAttributes) == null ? void 0 : _a.forEach((item) => {
+    if (item.attrName && item.attrValue) {
+      attrs[item.attrName] = runtime.ScriptFactory.execSingleLine(item.attrValue, {
+        ...params
+      });
+    }
+  });
+  return attrs;
+}
 function renderColumn(c, model, renderColumns, index) {
   var _a;
   const {
@@ -43,7 +55,11 @@ function renderColumn(c, model, renderColumns, index) {
         return vue.h(comp, {
           controller: columnC,
           row: rowState,
-          key: elRow.tempsrfkey + columnName
+          key: elRow.tempsrfkey + columnName,
+          ...renderAttrs(model, {
+            ...c.getEventArgs(),
+            data: rowState.data
+          })
         });
       }
       return null;

package/lib/control/grid/grid-column/grid-field-column/grid-field-column.css

@@ -1 +1 @@
-.ibiz-grid-field-column{--ibiz-grid-field-column-cell-padding:var(--ibiz-spacing-tight);--ibiz-grid-field-column-clickable-text-color:var(--ibiz-color-primary);--ibiz-grid-field-column-clickable-hover-text-color:var(--ibiz-color-primary-hover);--ibiz-grid-field-column-color:var(--ibiz-color-text-2);display:inline-flex;align-items:center;justify-content:var(--ibiz-grid-column-justify-content);width:100%;height:100%;padding:var(--ibiz-grid-field-column-cell-padding)}.ibiz-grid-field-column__text{font-size:var(--ibiz-font-size-regular);font-weight:var(--ibiz-font-weight-regular);color:var(--ibiz-grid-field-column-color)}.ibiz-grid-field-column--clickable{cursor:pointer}.ibiz-grid-field-column--clickable .ibiz-grid-field-column__text{color:var(--ibiz-grid-field-column-clickable-text-color)}.ibiz-grid-field-column--clickable .ibiz-grid-field-column__text:hover{color:var(--ibiz-grid-field-column-clickable-hover-text-color)}.ibiz-grid-field-column--ellipsis .ibiz-grid-field-column-text-container{min-width:0}.ibiz-grid-field-column--ellipsis .ibiz-grid-field-column-toolbar-container{flex-shrink:0}.ibiz-grid-field-column--ellipsis span{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-grid-field-column--wrap{word-break:break-word;white-space:pre-wrap}.ibiz-grid-field-column.is-has-action{justify-content:space-between}.ibiz-grid-field-column-text-container{display:inline-flex;flex-grow:1;align-items:center;justify-content:var(--ibiz-grid-column-justify-content);height:100%}.ibiz-grid-field-column-toolbar-container .ibiz-action-toolbar__item:not(.ibiz-action-toolbar__item--level-250){opacity:0}.ibiz-grid-field-column-toolbar-container .ibiz-action-toolbar__separator{opacity:0}.el-table .el-table__body-wrapper tr:hover .ibiz-action-toolbar__item{opacity:1}.el-table .el-table__body-wrapper tr:hover .ibiz-action-toolbar__separator{opacity:1}.el-table .el-table__body-wrapper tr .ibiz-action-toolbar__item.is-expand{opacity:1}
+.ibiz-grid-field-column{--ibiz-grid-field-column-cell-padding:var(--ibiz-spacing-tight);--ibiz-grid-field-column-clickable-text-color:var(--ibiz-color-primary);--ibiz-grid-field-column-clickable-hover-text-color:var(--ibiz-color-primary-hover);--ibiz-grid-field-column-color:var(--ibiz-color-text-2);display:inline-flex;align-items:center;justify-content:var(--ibiz-grid-column-justify-content);width:100%;height:100%;padding:var(--ibiz-grid-field-column-cell-padding)}.ibiz-grid-field-column__text{font-size:var(--ibiz-font-size-regular);font-weight:var(--ibiz-font-weight-regular);color:var(--ibiz-grid-field-column-color)}.ibiz-grid-field-column--clickable{cursor:pointer}.ibiz-grid-field-column--clickable .ibiz-grid-field-column__text{color:var(--ibiz-grid-field-column-clickable-text-color)}.ibiz-grid-field-column--clickable .ibiz-grid-field-column__text:hover{color:var(--ibiz-grid-field-column-clickable-hover-text-color)}.ibiz-grid-field-column--ellipsis .ibiz-grid-field-column-text-container{min-width:0}.ibiz-grid-field-column--ellipsis .ibiz-grid-field-column-toolbar-container{flex-shrink:0}.ibiz-grid-field-column--ellipsis .ibiz-grid-field-column__script{max-height:calc(var(--ibiz-control-grid-content-row-height) - 2 * var(--ibiz-grid-field-column-cell-padding));line-height:calc(var(--ibiz-control-grid-content-row-height) - 2 * var(--ibiz-grid-field-column-cell-padding))}.ibiz-grid-field-column--ellipsis .ibiz-grid-field-column__script *{margin:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-grid-field-column--ellipsis span{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-grid-field-column--wrap{word-break:break-word;white-space:pre-wrap}.ibiz-grid-field-column.is-has-action{justify-content:space-between}.ibiz-grid-field-column-text-container{display:inline-flex;flex-grow:1;align-items:center;justify-content:var(--ibiz-grid-column-justify-content);height:100%}.ibiz-grid-field-column-toolbar-container .ibiz-action-toolbar__item:not(.ibiz-action-toolbar__item--level-250){opacity:0}.ibiz-grid-field-column-toolbar-container .ibiz-action-toolbar__separator{opacity:0}.el-table .el-table__body-wrapper tr:hover .ibiz-action-toolbar__item{opacity:1}.el-table .el-table__body-wrapper tr:hover .ibiz-action-toolbar__separator{opacity:1}.el-table .el-table__body-wrapper tr .ibiz-action-toolbar__item.is-expand{opacity:1}

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

@@ -94,7 +94,8 @@ const GridFieldEditColumn = /* @__PURE__ */ vue.defineComponent({
         onChange: this.rowDataChange,
         onInfoTextChange: this.onInfoTextChange,
         title: this.tooltip,
-        ...this.editorProps
+        ...this.editorProps,
+        ...this.$attrs
       })]
     });
   }

package/lib/control/toolbar/toolbar.cjs

@@ -83,7 +83,12 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
         default: () => {
           var _a;
           return (_a = item.detoolbarItems) == null ? void 0 : _a.map((item2) => {
+            var _a2;
             const actionId = item2.uiactionId;
+            const visible = (_a2 = c.state.buttonsState[item2.id]) == null ? void 0 : _a2.visible;
+            if (!visible) {
+              return null;
+            }
             if (item2.itemType === "SEPERATOR") {
               return;
             }
@@ -98,7 +103,7 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
                 }, null)]
               });
             }
-            if (item2.itemType === "DEUIACTION" && c.state.buttonsState[item2.id].visible) {
+            if (item2.itemType === "DEUIACTION") {
               let _slot2;
               if (actionId === "exportexcel") {
                 return vue.createVNode(exportExcel.IBizExportExcel, {
@@ -134,7 +139,12 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
       });
     };
     const renderToolbarItem = (item) => {
+      var _a;
       const itemId = item.id;
+      const visible = (_a = c.state.buttonsState[itemId]) == null ? void 0 : _a.visible;
+      if (!visible) {
+        return null;
+      }
       if (item.itemType === "SEPERATOR") {
         return vue.createVNode("div", {
           "key": itemId,
@@ -149,7 +159,7 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
           "rawItem": item
         }, null)]);
       }
-      if (item.itemType === "DEUIACTION" && c.state.buttonsState[itemId].visible) {
+      if (item.itemType === "DEUIACTION") {
         let _slot3;
         const actionId = item.uiactionId;
         if (actionId === "exportexcel") {