@ibiz-template/vue3-components 0.6.9 → 0.6.11

package/es/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/es/control/drbar/drbar.controller.d.ts

@@ -89,6 +89,20 @@ export declare class DRBarController extends ControlController<IDEDRBar, IDRBarS
      * @memberof DRBarController
      */
     onCreated(): Promise<void>;
+    /**
+     * 计算关系界面组权限
+     *
+     * @param {IData} item 关系组成员
+     * @memberof DRBarController
+     */
+    calcPermitted(item: IData): Promise<void>;
+    /**
+     * 计算是否展示
+     *
+     * @param {IData} item 关系组成员
+     * @memberof DRBarController
+     */
+    calcDrBarItemsState(): Promise<void>;
     /**
      * 加载完成
      *
@@ -122,7 +136,7 @@ export declare class DRBarController extends ControlController<IDEDRBar, IDRBarS
      * @param {string} key
      * @memberof DRBarController
      */
-    handleSelectChange(key: string, isRoutePushed?: boolean): void;
+    handleSelectChange(key?: string, isRoutePushed?: boolean): void;
     /**
      * 设置显示状态
      *

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

@@ -116,6 +116,50 @@ class DRBarController extends 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);
+      }
+    });
+  }
   /**
    * 加载完成
    *
@@ -125,7 +169,8 @@ class DRBarController extends 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();
       });
@@ -207,7 +252,9 @@ class DRBarController extends ControlController {
         caption: itemCaption,
         sysImage: item.sysImage,
         disabled: false,
-        counterId: item.counterId
+        counterId: item.counterId,
+        visible: true,
+        dataAccessAction: item.dataAccessAction || void 0
       };
     };
     if (dedrbarGroups && dedrctrlItems) {
@@ -217,10 +264,11 @@ class DRBarController extends 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(
@@ -232,6 +280,7 @@ class DRBarController extends ControlController {
               tag: group.id,
               caption: itemCaption,
               sysImage: group.sysImage,
+              visible: true,
               children: groupItems.map((item) => getItemState(item))
             });
           } else if (groupItems.length === 1) {
@@ -248,7 +297,7 @@ class DRBarController extends 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/es/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/es/control/drbar/drbar.d.ts

@@ -36,7 +36,6 @@ export declare const DRBarControl: import("vue").DefineComponent<{
     ns: import("@ibiz-template/core").Namespace;
     handleSelect: (key: string) => void;
     renderMenuItems: (item: IDRBarItemsState) => VNode | undefined;
-    defaultActive: import("vue").Ref<string>;
     opens: string[];
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     modelData: {

package/es/control/drbar/drbar.mjs

@@ -1,4 +1,4 @@
-import { isVNode, reactive, ref, watch, resolveComponent, createVNode, defineComponent } from 'vue';
+import { isVNode, reactive, watch, resolveComponent, createVNode, defineComponent } from 'vue';
 import { useControlController, useNamespace, getNestedRoutePath, route2routePath } from '@ibiz-template/vue3-util';
 import { useRouter, useRoute } from 'vue-router';
 import { DRBarController } from './drbar.controller.mjs';
@@ -56,7 +56,6 @@ const DRBarControl = /* @__PURE__ */ defineComponent({
       c.handleSelectChange(key);
     };
     const route = useRoute();
-    const defaultActive = ref("");
     let expViewRoutePath = "";
     const opens = [];
     watch(() => c.state.isCreated, (_newVal, _oldVal) => {
@@ -82,13 +81,7 @@ const DRBarControl = /* @__PURE__ */ 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);
           }
         }
       }
@@ -96,6 +89,9 @@ const DRBarControl = /* @__PURE__ */ defineComponent({
       immediate: true
     });
     const renderMenuItems = (item) => {
+      if (!item.visible) {
+        return;
+      }
       if (item.children) {
         let subtitle = "";
         if (props.showMode === "horizontal") {
@@ -139,7 +135,6 @@ const DRBarControl = /* @__PURE__ */ defineComponent({
       ns,
       handleSelect,
       renderMenuItems,
-      defaultActive,
       opens
     };
   },
@@ -148,16 +143,16 @@ const DRBarControl = /* @__PURE__ */ defineComponent({
     const {
       isCreated,
       drBarItems,
-      defaultItem
+      selectedItem
     } = this.c.state;
     return createVNode(resolveComponent("iBizControlBase"), {
       "controller": this.c,
       "class": this.ns.b()
     }, {
-      default: () => [isCreated && !!defaultItem && createVNode(resolveComponent("el-menu"), {
+      default: () => [isCreated && createVNode(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/es/control/drbar/index.d.ts

@@ -34,7 +34,6 @@ export declare const IBizDRBarControl: import("@ibiz-template/vue3-util").TypeWi
     renderMenuItems: (item: import("@ibiz-template/runtime").IDRBarItemsState) => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
     }> | undefined;
-    defaultActive: import("vue").Ref<string>;
     opens: string[];
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     modelData: {

package/es/control/exp-bar/calendar-exp-bar/calendar-exp-bar.d.ts

@@ -31,7 +31,7 @@ export declare const CalendarExpBarControl: import("vue").DefineComponent<{
     renderTitle: () => VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
     }> | null;
-    renderQuickSearch: () => VNode<import("vue").RendererNode, import("vue").RendererElement, {
+    renderSearchBar: () => VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
     }> | null;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{

package/es/control/exp-bar/calendar-exp-bar/calendar-exp-bar.mjs

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

package/es/control/exp-bar/calendar-exp-bar/index.d.ts

@@ -28,7 +28,7 @@ export declare const IBizCalendarExpBarControl: import("@ibiz-template/vue3-util
     renderTitle: () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
     }> | null;
-    renderQuickSearch: () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+    renderSearchBar: () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
     }> | null;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{

package/es/control/exp-bar/chart-exp-bar/chart-exp-bar.d.ts

@@ -31,7 +31,7 @@ export declare const ChartExpBarControl: import("vue").DefineComponent<{
     renderTitle: () => VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
     }> | null;
-    renderQuickSearch: () => VNode<import("vue").RendererNode, import("vue").RendererElement, {
+    renderSearchBar: () => VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
     }> | null;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{

package/es/control/exp-bar/chart-exp-bar/chart-exp-bar.mjs

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

package/es/control/exp-bar/chart-exp-bar/index.d.ts

@@ -28,7 +28,7 @@ export declare const IBizChartExpBarControl: import("@ibiz-template/vue3-util").
     renderTitle: () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
     }> | null;
-    renderQuickSearch: () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+    renderSearchBar: () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
     }> | null;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{

package/es/control/exp-bar/data-view-exp-bar/data-view-view-exp-bar.d.ts

@@ -31,7 +31,7 @@ export declare const DataViewExpBarControl: import("vue").DefineComponent<{
     renderTitle: () => VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
     }> | null;
-    renderQuickSearch: () => VNode<import("vue").RendererNode, import("vue").RendererElement, {
+    renderSearchBar: () => VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
     }> | null;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{

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

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

package/es/control/exp-bar/data-view-exp-bar/index.d.ts

@@ -28,7 +28,7 @@ export declare const IBizDataViewExpBarControl: import("@ibiz-template/vue3-util
     renderTitle: () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
     }> | null;
-    renderQuickSearch: () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+    renderSearchBar: () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
     }> | null;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{

package/es/control/exp-bar/grid-exp-bar/grid-exp-bar.d.ts

@@ -31,7 +31,7 @@ export declare const GridExpBarControl: import("vue").DefineComponent<{
     renderTitle: () => VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
     }> | null;
-    renderQuickSearch: () => VNode<import("vue").RendererNode, import("vue").RendererElement, {
+    renderSearchBar: () => VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
     }> | null;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{

package/es/control/exp-bar/grid-exp-bar/grid-exp-bar.mjs

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

package/es/control/exp-bar/grid-exp-bar/index.d.ts

@@ -28,7 +28,7 @@ export declare const IBizGridExpBarControl: import("@ibiz-template/vue3-util").T
     renderTitle: () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
     }> | null;
-    renderQuickSearch: () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+    renderSearchBar: () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
     }> | null;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{

package/es/control/exp-bar/list-exp-bar/index.d.ts

@@ -28,7 +28,7 @@ export declare const IBizListExpBarControl: import("@ibiz-template/vue3-util").T
     renderTitle: () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
     }> | null;
-    renderQuickSearch: () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+    renderSearchBar: () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
     }> | null;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{

package/es/control/exp-bar/list-exp-bar/list-exp-bar.d.ts

@@ -31,7 +31,7 @@ export declare const ListExpBarControl: import("vue").DefineComponent<{
     renderTitle: () => VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
     }> | null;
-    renderQuickSearch: () => VNode<import("vue").RendererNode, import("vue").RendererElement, {
+    renderSearchBar: () => VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
     }> | null;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{

package/es/control/exp-bar/list-exp-bar/list-exp-bar.mjs

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

package/es/control/exp-bar/render-util.d.ts

@@ -9,11 +9,11 @@ import './render-util.scss';
  * @export
  * @param {ExpBarControlController} c
  * @param {Namespace} ns
- * @return {*}  {({ renderTitle: () => VNode | null; renderQuickSearch: () => VNode | null })}
+ * @return {*}  {({ renderTitle: () => VNode | null; renderSearchBar: () => VNode | null })}
  */
 export declare function useExpBarRender(c: IExpBarControlController, ns: Namespace): {
     renderTitle: () => VNode | null;
-    renderQuickSearch: () => VNode | null;
+    renderSearchBar: () => VNode | null;
 };
 /**
  * 监听路由变更，当自身所处的路由变更时触发导航栏控制器onRouterChange

package/es/control/exp-bar/render-util.mjs

@@ -1,4 +1,4 @@
-import { resolveComponent, createVNode } from 'vue';
+import { resolveComponent, createVNode, h } from 'vue';
 import { debounce } from 'lodash-es';
 import { useRoute } from 'vue-router';
 import { useNamespace, route2routePath, onRouteChange } from '@ibiz-template/vue3-util';
@@ -34,13 +34,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 = resolveComponent("IBizControlShell");
+      return h(comp, {
+        modelData,
+        ...ctrlProps
+      });
+    }
     return createVNode(resolveComponent("el-input"), {
       "model-value": c.state.query,
       "class": [ns.b("quick-search"), expBarNs.b("quick-search")],
@@ -57,7 +70,7 @@ function useExpBarRender(c, ns) {
   };
   return {
     renderTitle,
-    renderQuickSearch
+    renderSearchBar
   };
 }
 function useWatchRouteChange(c) {

package/es/control/exp-bar/tree-exp-bar/index.d.ts

@@ -33,7 +33,7 @@ export declare const IBizTreeExpBarControl: import("@ibiz-template/vue3-util").T
     renderTitle: () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
     }> | null;
-    renderQuickSearch: () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+    renderSearchBar: () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
     }> | null;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{

package/es/control/exp-bar/tree-exp-bar/tree-exp-bar.d.ts

@@ -36,7 +36,7 @@ export declare const TreeExpBarControl: import("vue").DefineComponent<{
     renderTitle: () => VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
     }> | null;
-    renderQuickSearch: () => VNode<import("vue").RendererNode, import("vue").RendererElement, {
+    renderSearchBar: () => VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
     }> | null;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{

package/es/control/exp-bar/tree-exp-bar/tree-exp-bar.mjs

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

package/es/control/form/form/form.mjs

@@ -1,5 +1,5 @@
 import { isVNode, renderSlot, createVNode, resolveComponent, h, defineComponent } from 'vue';
-import { findChildFormDetails } from '@ibiz-template/runtime';
+import { ScriptFactory, findChildFormDetails } from '@ibiz-template/runtime';
 import { useNamespace } from '@ibiz-template/vue3-util';
 import './form.css';
 
@@ -23,6 +23,19 @@ const FormControl = /* @__PURE__ */ 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] = ScriptFactory.execSingleLine(item.attrValue, {
+            ...props.controller.getEventArgs(),
+            data: props.controller.data
+          });
+        }
+      });
+      return attrs;
+    };
     const renderByDetailType = (detail) => {
       if (detail.hidden) {
         return;
@@ -31,7 +44,8 @@ const FormControl = /* @__PURE__ */ defineComponent({
       const detailProps = {
         modelData: detail,
         controller: c.details[detailId],
-        key: detail.id
+        key: detail.id,
+        ...renderAttrs(detail)
       };
       if (slots[detailId]) {
         return renderSlot(slots, detailId, {

package/es/control/form/form-detail/form-item/form-item.mjs

@@ -47,7 +47,8 @@ const FormItem = /* @__PURE__ */ 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) {