@ibiz-template/vue3-components 0.5.7-alpha.5 → 0.5.7-alpha.9

package/es/util/app-popover/app-popover-component.mjs

@@ -1,8 +1,10 @@
-import { ref, onUnmounted, createVNode, defineComponent } from 'vue';
+import { ref, reactive, onUnmounted, createVNode, defineComponent } from 'vue';
 import { offset, flip, shift, arrow, computePosition, autoUpdate } from '@floating-ui/dom';
 import { ViewMode, Modal } from '@ibiz-template/runtime';
 import { useNamespace, useUIStore, OverlayPopoverContainer } from '@ibiz-template/vue3-util';
 import './app-popover-component.css';
+import { isNumber } from 'lodash-es';
+import { calcOpenModeStyle } from '@ibiz-template/core';
 
 "use strict";
 async function computePos(element, el, arrEl, opts) {
@@ -70,6 +72,25 @@ const AppPopoverComponent = /* @__PURE__ */ defineComponent({
       zIndex
     } = useUIStore();
     const popoverZIndex = zIndex.increment();
+    const customStyle = reactive({});
+    const {
+      width,
+      height
+    } = props.opts;
+    if (width) {
+      if (isNumber(width)) {
+        customStyle.width = calcOpenModeStyle(width, "popover");
+      } else {
+        customStyle.width = width;
+      }
+    }
+    if (height) {
+      if (isNumber(height)) {
+        customStyle.height = calcOpenModeStyle(height, "popover");
+      } else {
+        customStyle.height = height;
+      }
+    }
     const modal = new Modal({
       mode: ViewMode.POPOVER,
       viewUsage: 2,
@@ -107,7 +128,8 @@ const AppPopoverComponent = /* @__PURE__ */ defineComponent({
       popoverZIndex,
       onMaskClick,
       present,
-      dismiss
+      dismiss,
+      customStyle
     };
   },
   render() {
@@ -115,6 +137,7 @@ const AppPopoverComponent = /* @__PURE__ */ defineComponent({
     const content = createVNode("div", {
       "class": [this.ns.b(), this.ns.is("show", this.isShow)],
       "ref": "el",
+      "style": this.customStyle,
       "onClick": (e) => {
         e.stopPropagation();
       }

package/es/util/notification-util/notification-util.mjs

@@ -53,6 +53,7 @@ class NotificationUtil {
       title: params.title,
       message: params.desc,
       type: noticeType,
+      position: params.position || "top-right",
       duration
     });
   }

package/es/util/open-view-util/open-view-util.mjs

@@ -44,7 +44,8 @@ class OpenViewUtil {
     const opts = {
       width: appView.width || "80%",
       height: appView.height || "80%",
-      footerHide: true
+      footerHide: true,
+      ...appView.modalOption
     };
     return openViewModal(
       {
@@ -57,6 +58,14 @@ class OpenViewUtil {
   }
   async popover(appViewId, event, context, params, options = {}) {
     const appView = await ibiz.hub.config.view.get(appViewId);
+    const opts = {
+      width: appView.width,
+      height: appView.height,
+      autoClose: true,
+      placement: "bottom",
+      ...options,
+      ...appView.modalOption
+    };
     return openViewPopover(
       event,
       {
@@ -64,7 +73,7 @@ class OpenViewUtil {
         params,
         viewId: appView.id
       },
-      { autoClose: true, placement: "bottom", ...options }
+      opts
     );
   }
   /**
@@ -83,7 +92,8 @@ class OpenViewUtil {
     const opts = {
       width: appView.width,
       height: appView.height,
-      placement
+      placement,
+      ...appView.modalOption
     };
     return openViewDrawer(
       {

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

@@ -14,6 +14,13 @@ export declare class EditViewEngine extends ViewEngineBase {
      */
     protected view: ViewController<IAppDEEditView, IEditViewState, IEditViewEvent>;
     get form(): IEditFormController;
+    /**
+     * 实体名称
+     * @author lxm
+     * @date 2024-01-31 11:05:49
+     * @type {string}
+     */
+    deName: string;
     onCreated(): Promise<void>;
     onMounted(): Promise<void>;
     getData(): IData[];
@@ -55,4 +62,11 @@ export declare class EditViewEngine extends ViewEngineBase {
      * @memberof MobEditViewEngine
      */
     wfWithdraw(): Promise<void>;
+    /**
+     * 初始化标记打开数据相关逻辑
+     * @author lxm
+     * @date 2024-01-31 11:52:13
+     * @return {*}  {void}
+     */
+    initMarkOpenData(): void;
 }

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

@@ -1,8 +1,25 @@
 import { RuntimeError } from '@ibiz-template/core';
 import { ViewEngineBase, calcDeCodeNameById, SysUIActionTag, ViewCallTag, ControlVO, getAppViewRef, OpenAppViewCommand } from '@ibiz-template/runtime';
+import { isNil } from 'ramda';
 
 "use strict";
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 class EditViewEngine extends ViewEngineBase {
+  constructor() {
+    super(...arguments);
+    /**
+     * 实体名称
+     * @author lxm
+     * @date 2024-01-31 11:05:49
+     * @type {string}
+     */
+    __publicField(this, "deName");
+  }
   get form() {
     return this.view.getController("form");
   }
@@ -10,6 +27,7 @@ class EditViewEngine extends ViewEngineBase {
     await super.onCreated();
     const { childNames, modal } = this.view;
     childNames.push("form");
+    this.deName = calcDeCodeNameById(this.view.model.appDataEntityId);
     if (!this.view.slotProps.form) {
       this.view.slotProps.form = {};
     }
@@ -28,6 +46,7 @@ class EditViewEngine extends ViewEngineBase {
   }
   async onMounted() {
     await super.onMounted();
+    this.initMarkOpenData();
     const { model, evt } = this.view;
     const formDeId = this.form.model.appDataEntityId;
     const formDataStateChange = (event) => {
@@ -216,6 +235,77 @@ class EditViewEngine extends ViewEngineBase {
     );
     ibiz.mc.command.send({ srfdecodename: "SysTodo" }, "OBJECTUPDATED");
   }
+  /**
+   * 初始化标记打开数据相关逻辑
+   * @author lxm
+   * @date 2024-01-31 11:52:13
+   * @return {*}  {void}
+   */
+  initMarkOpenData() {
+    if (isNil(this.view.modal.routeDepth)) {
+      return;
+    }
+    let srfkey;
+    const callback = (data) => {
+      if (!this.view.state.activated) {
+        return;
+      }
+      const dataInfo = this.form.getData()[0].srfmajortext;
+      let actionMsg = "";
+      switch (data.action) {
+        case "VIEW":
+          actionMsg = "\u6D4F\u89C8\u4E86";
+          break;
+        case "EDIT":
+          actionMsg = "\u7F16\u8F91\u4E86";
+          break;
+        case "UPDATE":
+          actionMsg = "\u66F4\u65B0\u4E86";
+          break;
+        default:
+          break;
+      }
+      ibiz.notification.info({
+        position: "bottom-right",
+        title: data.username,
+        desc: "".concat(actionMsg, " ").concat(this.view.state.caption, "-").concat(dataInfo)
+      });
+    };
+    this.form.evt.on("onLoadSuccess", (event) => {
+      const formData = event.data[0];
+      srfkey = formData.srfkey;
+      ibiz.markOpenData.action(this.deName, srfkey, "VIEW");
+      ibiz.markOpenData.subscribe(this.deName, srfkey, callback);
+      this.view.evt.on("onDestroyed", () => {
+        ibiz.markOpenData.unsubscribe(this.deName, srfkey, callback);
+      });
+    });
+    let isWait = false;
+    const actionEdit = () => {
+      if (!srfkey || isWait) {
+        return;
+      }
+      isWait = true;
+      ibiz.markOpenData.action(this.deName, srfkey, "EDIT");
+      setTimeout(
+        () => {
+          isWait = false;
+        },
+        1e3 * 60 * 5
+      );
+    };
+    this.form.evt.on("onFormDataChange", actionEdit);
+    this.form.evt.on("onSaveSuccess", () => {
+      if (srfkey) {
+        ibiz.markOpenData.action(this.deName, srfkey, "UPDATE");
+      }
+    });
+    this.view.evt.on("onCloseView", () => {
+      if (srfkey) {
+        ibiz.markOpenData.action(this.deName, srfkey, "CLOSE");
+      }
+    });
+  }
 }
 
 export { EditViewEngine };

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

@@ -87,6 +87,25 @@ export declare class ReportViewEngine extends ViewEngineBase {
      * @memberof ReportViewEngine
      */
     protected calcViewHeaderVisible(): boolean;
+    /**
+     * 计算搜索栏显示
+     *
+     * @author zk
+     * @date 2024-01-29 05:01:36
+     * @protected
+     * @return {*}  {boolean}
+     * @memberof MDViewEngine
+     */
+    protected calcViewSearchBarVisible(): boolean;
+    /**
+     * 计算移除的模型名称
+     *
+     * @author zk
+     * @date 2024-01-29 03:01:42
+     * @return {*}  {string[]}
+     * @memberof MDViewEngine
+     */
+    calcRemoveLayoutModel(): string[];
     /**
      * 切换搜索表单的显示与否
      *

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

@@ -1,4 +1,4 @@
-import { ViewEngineBase, SysUIActionTag } from '@ibiz-template/runtime';
+import { ViewEngineBase, SysUIActionTag, getControl } from '@ibiz-template/runtime';
 
 "use strict";
 class ReportViewEngine extends ViewEngineBase {
@@ -149,16 +149,43 @@ class ReportViewEngine extends ViewEngineBase {
    * @memberof ReportViewEngine
    */
   calcViewHeaderVisible() {
-    let showHeader = super.calcViewHeaderVisible();
-    if (!this.searchBar || !this.searchBar.state.visible) {
-      const controller = this.viewLayoutPanel.panelItems.view_searchbar;
-      if (controller) {
-        controller.state.visible = false;
-      }
-    } else {
-      showHeader = true;
+    const showHeader = super.calcViewHeaderVisible();
+    const visible = this.calcViewSearchBarVisible();
+    return visible || showHeader;
+  }
+  /**
+   * 计算搜索栏显示
+   *
+   * @author zk
+   * @date 2024-01-29 05:01:36
+   * @protected
+   * @return {*}  {boolean}
+   * @memberof MDViewEngine
+   */
+  calcViewSearchBarVisible() {
+    const { model } = this.view;
+    const has = this.isExistAndInLayout("searchbar");
+    if (!has) {
+      return has;
+    }
+    const searchBar = getControl(model, "searchbar");
+    const visible = !!(searchBar.enableQuickSearch || searchBar.enableGroup || searchBar.enableFilter === true);
+    return visible;
+  }
+  /**
+   * 计算移除的模型名称
+   *
+   * @author zk
+   * @date 2024-01-29 03:01:42
+   * @return {*}  {string[]}
+   * @memberof MDViewEngine
+   */
+  calcRemoveLayoutModel() {
+    const names = super.calcRemoveLayoutModel();
+    if (!this.calcViewSearchBarVisible()) {
+      names.push("view_searchbar");
     }
-    return showHeader;
+    return names;
   }
   /**
    * 切换搜索表单的显示与否

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

@@ -1,5 +1,5 @@
 import { ModelError } from '@ibiz-template/core';
-import { ViewEngineBase, calcDeCodeNameById } from '@ibiz-template/runtime';
+import { ViewEngineBase, calcDeCodeNameById, getControl } from '@ibiz-template/runtime';
 
 "use strict";
 class TabExpViewEngine extends ViewEngineBase {
@@ -20,6 +20,7 @@ class TabExpViewEngine extends ViewEngineBase {
    */
   async onCreated() {
     var _a;
+    this.preprocessTabExpModelLayout();
     await super.onCreated();
     const { childNames, model } = this.view;
     childNames.push("tabexppanel");
@@ -31,7 +32,6 @@ class TabExpViewEngine extends ViewEngineBase {
       (item) => item.id === "srfdefaultnav"
     )) == null ? void 0 : _a.value;
     this.view.slotProps.tabexppanel.defaultTabName = this.view.state.srfnav || srfdefaultnav;
-    this.preprocessTabExpModelLayout();
   }
   async onMounted() {
     await super.onMounted();
@@ -142,7 +142,7 @@ class TabExpViewEngine extends ViewEngineBase {
   calcViewHeaderVisible() {
     let showHeader = super.calcViewHeaderVisible();
     const { tabLayout } = this.view.model;
-    if ((tabLayout === void 0 || tabLayout === "TOP") && this.tabExpPanel) {
+    if (tabLayout === void 0 || tabLayout === "TOP" && getControl(this.view.model, "tabexppanel")) {
       showHeader = true;
     }
     return showHeader;

package/lib/common/grid-setting/grid-setting.cjs

@@ -62,7 +62,8 @@ const IBizGridSetting = /* @__PURE__ */ vue.defineComponent({
   render() {
     return vue.createVNode(vue.resolveComponent("el-popover"), {
       "placement": "right-start",
-      "trigger": "click"
+      "trigger": "click",
+      "width": "auto"
     }, {
       reference: () => {
         return vue.createVNode("ion-icon", {
@@ -91,9 +92,27 @@ const IBizGridSetting = /* @__PURE__ */ vue.defineComponent({
             return vue.createVNode("div", {
               "class": [this.ns.b("column-state"), this.ns.is("disabled", state.hidden), this.ns.is("fixed", !!state.fixed), !!state.fixed && "unmover"],
               "onClick": () => this.handleClick(state)
-            }, [this.isDraggable && !state.fixed && vue.createVNode("img", {
-              "src": "./assets/iconfont/svg/drag.svg"
-            }, null), state.caption]);
+            }, [this.isDraggable && !state.fixed && vue.createVNode(vue.resolveComponent("iBizIcon"), {
+              "class": this.ns.b("drag-icon"),
+              "icon": {
+                imagePath: "svg/drag.svg"
+              },
+              "baseDir": "iconfont"
+            }, null), vue.createVNode(vue.resolveComponent("iBizIcon"), {
+              "class": this.ns.b("disable-icon"),
+              "icon": {
+                imagePath: "svg/disable.svg"
+              },
+              "baseDir": "iconfont"
+            }, null), vue.createVNode(vue.resolveComponent("iBizIcon"), {
+              "class": this.ns.b("enable-icon"),
+              "icon": {
+                imagePath: "svg/enable.svg"
+              },
+              "baseDir": "iconfont"
+            }, null), vue.createVNode("div", {
+              "class": this.ns.b("state-caption")
+            }, [state.caption])]);
           }
         });
       }

package/lib/common/grid-setting/grid-setting.css

@@ -1 +1 @@
-.ibiz-grid-setting-column-states{max-height:500px;overflow-y:auto}.ibiz-grid-setting-column-states .ibiz-grid-setting-column-state{display:flex;align-items:center;justify-content:flex-start;padding:var(--ibiz-spacing-extra-tight) 0;font-size:var(--ibiz-font-size-regular);cursor:pointer}.ibiz-grid-setting-column-states .ibiz-grid-setting-column-state.is-disabled{opacity:.5}.ibiz-grid-setting-column-states .ibiz-grid-setting-column-state img{display:inline-block;width:var(--ibiz-font-size-small);margin-right:var(--ibiz-spacing-extra-tight);font-size:var(--ibiz-font-size-regular);color:var(--ibiz-color-text-3)}.ibiz-grid-setting-column-states .ibiz-grid-setting-column-state-ghost{background-color:var(--ibiz-color-primary-light-default);opacity:.5}.ibiz-grid-setting-set-icon{color:var(--ibiz-color-primary);cursor:pointer}
+.ibiz-grid-setting-column-states{width:100%;max-height:500px;overflow-y:auto}.ibiz-grid-setting-column-states .ibiz-grid-setting-column-state{display:flex;align-items:center;justify-content:flex-start;width:100%;padding:var(--ibiz-spacing-extra-tight) 0;font-size:var(--ibiz-font-size-regular);cursor:pointer}.ibiz-grid-setting-column-states .ibiz-grid-setting-column-state ion-icon{display:inline-block;width:var(--ibiz-font-size-small);margin-right:var(--ibiz-spacing-extra-tight);font-size:var(--ibiz-font-size-regular)}.ibiz-grid-setting-column-states .ibiz-grid-setting-column-state .ibiz-grid-setting-drag-icon{color:var(--ibiz-color-text)}.ibiz-grid-setting-column-states .ibiz-grid-setting-column-state .ibiz-grid-setting-enable-icon{color:var(--ibiz-color-success)}.ibiz-grid-setting-column-states .ibiz-grid-setting-column-state .ibiz-grid-setting-disable-icon{display:none;color:var(--ibiz-color-danger)}.ibiz-grid-setting-column-states .ibiz-grid-setting-column-state .ibiz-grid-setting-state-caption{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-grid-setting-column-states .ibiz-grid-setting-column-state.is-disabled .ibiz-grid-setting-enable-icon{display:none}.ibiz-grid-setting-column-states .ibiz-grid-setting-column-state.is-disabled .ibiz-grid-setting-disable-icon{display:block}.ibiz-grid-setting-column-states .ibiz-grid-setting-column-state.is-disabled .ibiz-grid-setting-state-caption{color:var(--ibiz-color-disabled-text)}.ibiz-grid-setting-column-states .ibiz-grid-setting-column-state-ghost{background-color:var(--ibiz-color-primary-light-default);opacity:.5}.ibiz-grid-setting-set-icon{color:var(--ibiz-color-primary);cursor:pointer}

package/lib/control/calendar/calendar.cjs

@@ -109,7 +109,7 @@ const CalendarControl = /* @__PURE__ */ vue.defineComponent({
         "style": style,
         "onClick": () => this.c.onRowClick(item),
         "onDblclick": () => this.c.onDbRowClick(item)
-      }, ["".concat(item.text)]);
+      }, [item.text]);
     };
     const renderCalendarList = (items) => {
       return items.map((item) => {

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

@@ -143,10 +143,11 @@ const DataViewControl = /* @__PURE__ */ vue.defineComponent({
         cardColXS,
         cardColSM,
         cardColMD,
-        cardColLG
+        cardColLG,
+        groupSysCss
       } = c.model;
       return vue.createVNode("div", {
-        "class": ns.be("group-content", "item")
+        "class": [ns.be("group-content", "item"), groupSysCss == null ? void 0 : groupSysCss.cssName]
       }, [vue.createVNode("div", {
         "class": ns.be("group-content", "item-header")
       }, [vue.createVNode("span", {

package/lib/control/drtab/drtab.css

@@ -1 +1 @@
-.ibiz-control-drtab__counter{margin-left:8px}
+.ibiz-control-drtab__counter{margin-left:8px}.ibiz-control-drtab .el-tabs .el-tabs__header{margin:0}.ibiz-control-drtab .el-tabs .el-tabs__header .el-tabs__nav-wrap{margin:0}.ibiz-control-drtab .el-tabs .el-tabs__header .el-tabs__nav-wrap .el-tabs__nav .el-tabs__active-bar{background-color:var(--ibiz-color-primary)}.ibiz-control-drtab .el-tabs .el-tabs__header .el-tabs__nav-wrap .el-tabs__nav .el-tabs__item{font-size:var(--ibiz-font-size-regular);color:var(--ibiz-color-text-2)}.ibiz-control-drtab .el-tabs .el-tabs__header .el-tabs__nav-wrap .el-tabs__nav .el-tabs__item:hover{color:var(--ibiz-color-text-0)}.ibiz-control-drtab .el-tabs .el-tabs__header .el-tabs__nav-wrap .el-tabs__nav .el-tabs__item.is-active{color:var(--ibiz-color-primary)}.ibiz-control-drtab .el-tabs .el-tabs__header .el-tabs__nav-wrap .el-tabs__nav .el-tabs__item.is-top:last-child{padding-right:0}.ibiz-control-drtab .el-tabs.el-tabs--bottom,.ibiz-control-drtab .el-tabs.el-tabs--top{padding-left:var(--ibiz-spacing-base)}

package/lib/control/form/form-detail/form-mdctrl/form-mdctrl-md/form-mdctrl-md.css

@@ -1 +1 @@
-.ibiz-form-mdctrl-md{display:flex}.ibiz-form-mdctrl-md-content{flex-grow:1}.ibiz-form-mdctrl-md-actions{flex-shrink:0;width:80px;text-align:center}.ibiz-form-mdctrl-md-actions .el-button+.el-button{margin-left:0}.ibiz-form-mdctrl-md-actions__btn{margin-bottom:var(--ibiz-spacing-tight)}
+.ibiz-form-mdctrl-md{--ibiz-form-mdctrl-md-empty-image-width:64px;--ibiz-form-mdctrl-md-empty-padding:0;--ibiz-form-mdctrl-md-empty-margin-top:var(--ibiz-spacing-tight);display:flex}.ibiz-form-mdctrl-md-content{flex-grow:1}.ibiz-form-mdctrl-md-content>.ibiz-no-data{--el-empty-image-width:var(--ibiz-form-mdctrl-md-empty-image-width);--el-empty-description-margin-top:var(--ibiz-form-mdctrl-md-empty-margin-top);--el-empty-padding:var(--ibiz-form-mdctrl-md-empty-padding)}.ibiz-form-mdctrl-md-actions{flex-shrink:0;width:80px;text-align:center}.ibiz-form-mdctrl-md-actions .el-button+.el-button{margin-left:0}.ibiz-form-mdctrl-md-actions__btn{margin-bottom:var(--ibiz-spacing-tight)}

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

@@ -12,9 +12,6 @@ var usePagination = require('../../../util/pagination/use-pagination.cjs');
 "use strict";
 function renderColumn(c, model, renderColumns, index) {
   var _a;
-  if (model.hideDefault) {
-    return null;
-  }
   const {
     codeName: columnName,
     width
@@ -56,7 +53,7 @@ function renderColumn(c, model, renderColumns, index) {
 function renderChildColumn(c, model, renderColumns, index) {
   var _a, _b;
   if (model.columnType === "GROUPGRIDCOLUMN") {
-    const childColumns = ((_a = model.degridColumns) == null ? void 0 : _a.filter((item) => !item.hideDefault)) || [];
+    const childColumns = ((_a = model.degridColumns) == null ? void 0 : _a.filter((item) => !item.hideDefault && !item.hiddenDataItem)) || [];
     const {
       width
     } = model;

package/lib/control/grid/grid/grid.css

@@ -1 +1 @@
-.ibiz-control-grid{--ibiz-control-grid-text-color:var(--ibiz-color-text-0);--ibiz-control-grid-bg-color:transparent;--ibiz-control-grid-padding:0;--ibiz-control-grid-cell-padding:var(--ibiz-spacing-tight);--ibiz-control-grid-selection-padding:var(--ibiz-spacing-base-loose);--ibiz-control-grid-row-edit-bg-color:var(--ibiz-color-fill-2);--ibiz-control-grid-row-bg-color:var(--ibiz-color-bg-1);--ibiz-control-grid-row-bg-color-2:var(--ibiz-color-bg-0);--ibiz-control-grid-now-header-height:auto;--ibiz-control-grid-header-text-color:var(--ibiz-color-text-2);--ibiz-control-grid-header-cell-padding:var(--ibiz-control-grid-cell-padding);--ibiz-control-grid-header-height:auto;--ibiz-control-grid-header-bg-color:var(--ibiz-color-tertiary-light-hover);--ibiz-control-grid-header-font-size:var(--ibiz-font-size-regular);--ibiz-control-grid-header-font-weight:var(--ibiz-font-weight-regular);--ibiz-control-grid-content-text-color:var(--ibiz-control-grid-text-color);--ibiz-control-grid-content-row-height:48px;--ibiz-control-grid-page-text-color:var(--ibiz-color-text-2);--ibiz-control-grid-page-height:50px;--ibiz-control-grid-page-padding:0 var(--ibiz-spacing-base-tight);--ibiz-control-grid-footer-text-color:var(--ibiz-color-text-2);--ibiz-control-grid-footer-bg-color:var(--ibiz-color-tertiary-light-hover);--ibiz-control-grid-footer-font-size:var(--ibiz-font-size-regular);--ibiz-control-grid-footer-font-weight:var(--ibiz-font-weight-bold);position:relative;width:100%;height:100%;padding:var(--ibiz-control-grid-padding);background-color:var(--ibiz-control-grid-bg-color)}.ibiz-control-grid .el-table{--el-table-header-bg-color:var(--ibiz-control-grid-header-bg-color);--el-table-border-color:transparent}.ibiz-control-grid .el-table--border .el-table__cell{border-right:none}.ibiz-control-grid .el-table-fixed-column--left,.ibiz-control-grid .el-table-fixed-column--right{--el-bg-color:transparent}.ibiz-control-grid .el-table thead.is-group th.el-table__cell{background:var(--ibiz-control-grid-header-bg-color)}.ibiz-control-grid.is-enable-page .ibiz-control-grid__table{height:calc(100% - var(--ibiz-control-grid-page-height))}.ibiz-control-grid.is-enable-group .el-table__indent{display:none}.ibiz-control-grid__table{width:100%;height:100%}.ibiz-control-grid__table .caret-wrapper{justify-content:center}.ibiz-control-grid__table .caret-wrapper>*+*{margin-top:3px}.ibiz-control-grid__table .sort-caret{position:initial}.ibiz-control-grid__table.el-table .el-table__cell{padding:0}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr td{background:var(--ibiz-control-grid-row-bg-color)}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr:nth-child(2n) td{background-color:var(--ibiz-control-grid-row-bg-color-2)}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr:hover td{background-color:var(--el-table-row-hover-bg-color)}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr.current-row td{background-color:var(--el-table-current-row-bg-color)}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr.editing-row td{background-color:var(--ibiz-control-grid-row-edit-bg-color)}.ibiz-control-grid__table .el-table__header-wrapper .cell{height:var(--ibiz-control-grid-header-height);padding:var(--ibiz-control-grid-header-cell-padding);font-size:var(--ibiz-control-grid-header-font-size);font-weight:var(--ibiz-control-grid-header-font-weight);color:var(--ibiz-control-grid-header-text-color);word-break:break-word;white-space:pre-wrap}.ibiz-control-grid__table .el-table__header-wrapper .el-table-column--selection .cell{padding:var(--ibiz-control-grid-selection-padding)}.ibiz-control-grid__table .el-table__header-wrapper .is-sortable.el-table__cell .cell{display:flex;align-items:center;justify-content:var(--ibiz-grid-column-justify-content)}.ibiz-control-grid__table .el-table__body-wrapper{color:var(--ibiz-control-grid-content-text-color);border-bottom:.1px solid var(--ibiz-color-border)}.ibiz-control-grid__table .el-table__body-wrapper .el-table__row{height:var(--ibiz-control-grid-content-row-height);cursor:pointer}.ibiz-control-grid__table .el-table__body-wrapper .el-table__row>td{height:0;padding:0}@-moz-document url-prefix(){.ibiz-control-grid__table .el-table__body-wrapper .el-table__row>td{height:100%}}.ibiz-control-grid__table .el-table__body-wrapper .cell{display:flex;align-items:center;height:100%;padding:0}.ibiz-control-grid__table .el-table__body-wrapper .el-table-column--selection .cell{padding:var(--ibiz-control-grid-selection-padding)}.ibiz-control-grid__table .el-table__cell.is-center{--ibiz-grid-column-text-align:center;--ibiz-grid-column-justify-content:center}.ibiz-control-grid__table .el-table__cell.is-left{--ibiz-grid-column-text-align:left;--ibiz-grid-column-justify-content:flex-start}.ibiz-control-grid__table .el-table__cell.is-right{--ibiz-grid-column-text-align:right;--ibiz-grid-column-justify-content:flex-end}.ibiz-control-grid__table .el-scrollbar__wrap{position:relative}.ibiz-control-grid__table .el-table__footer-wrapper tfoot td.el-table__cell{font-size:var(--ibiz-control-grid-footer-font-size);font-weight:var(--ibiz-control-grid-footer-font-weight);color:var(--ibiz-control-grid-footer-text-color);background-color:var(--ibiz-control-grid-footer-bg-color)}.ibiz-control-grid__table .el-table__footer-wrapper tfoot td.el-table__cell:first-child>div{display:inline;vertical-align:4px}.ibiz-control-grid .el-table td.el-table__cell,.ibiz-control-grid .el-table th.el-table__cell.is-leaf{border-bottom:none}.ibiz-control-grid .ibiz-pagination{--ibiz-pagination-height:var(--ibiz-control-grid-page-height);--ibiz-pagination-text-color:var(--ibiz-control-grid-text-color);--ibiz-pagination-padding:var(--ibiz-control-grid-page-padding)}.ibiz-control-grid.is-single-select .el-table__header-wrapper .el-table__header thead>tr th:nth-child(1){padding-left:var(--ibiz-spacing-tight)}.ibiz-control-grid.is-single-select .el-table__body-wrapper .el-table__body tbody>tr td:nth-child(1){padding-left:var(--ibiz-spacing-tight)}.ibiz-control-grid.is-enable-customized .el-table__header-wrapper .el-table__header thead>tr th:last-child{padding-right:var(--ibiz-spacing-base-loose)}.ibiz-control-grid.is-enable-customized .ibiz-control-grid-setting-box{display:flex;align-items:center;justify-content:flex-start;position:absolute;top:0;right:0;z-index:99;height:var(--ibiz-control-grid-now-header-height);padding-right:var(--ibiz-spacing-extra-tight);background-color:var(--ibiz-control-grid-header-bg-color)}.ibiz-control-grid.is-enable-customized .ibiz-grid-setting{cursor:pointer}.ibiz-control-grid-quick-toolbar{justify-content:center}.ibiz-control-grid-batch-toolbar{position:absolute;top:0;left:54px;z-index:99;display:none;width:calc(100% - 54px);height:var(--ibiz-control-grid-now-header-height);font-size:var(--ibiz-font-size-regular);font-weight:var(--ibiz-font-weight-regular);background-color:var(--ibiz-control-grid-header-bg-color)}.ibiz-control-grid-batch-toolbar.is-show{display:flex;align-items:center;justify-content:flex-start}.ibiz-control-grid-batch-toolbar .ibiz-control-grid-batch-toolbar-separator{padding:0 var(--ibiz-spacing-base-tight)}.ibiz-control-grid-batch-toolbar .ibiz-control-grid-batch-toolbar-content{height:100%;display:flex;align-items:center;justify-content:flex-start}
+.ibiz-control-grid{--ibiz-control-grid-text-color:var(--ibiz-color-text-0);--ibiz-control-grid-bg-color:transparent;--ibiz-control-grid-padding:0;--ibiz-control-grid-cell-padding:var(--ibiz-spacing-tight);--ibiz-control-grid-selection-padding:var(--ibiz-spacing-base-loose);--ibiz-control-grid-row-edit-bg-color:var(--ibiz-color-fill-2);--ibiz-control-grid-row-bg-color:var(--ibiz-color-bg-1);--ibiz-control-grid-row-bg-color-2:var(--ibiz-color-bg-0);--ibiz-control-grid-now-header-height:auto;--ibiz-control-grid-header-text-color:var(--ibiz-color-text-2);--ibiz-control-grid-header-cell-padding:var(--ibiz-control-grid-cell-padding);--ibiz-control-grid-header-height:auto;--ibiz-control-grid-header-bg-color:var(--ibiz-color-tertiary-light-hover);--ibiz-control-grid-header-font-size:var(--ibiz-font-size-regular);--ibiz-control-grid-header-font-weight:var(--ibiz-font-weight-regular);--ibiz-control-grid-content-text-color:var(--ibiz-control-grid-text-color);--ibiz-control-grid-content-row-height:48px;--ibiz-control-grid-page-text-color:var(--ibiz-color-text-2);--ibiz-control-grid-page-height:50px;--ibiz-control-grid-page-padding:0 var(--ibiz-spacing-base-tight);--ibiz-control-grid-footer-text-color:var(--ibiz-color-text-2);--ibiz-control-grid-footer-bg-color:var(--ibiz-color-tertiary-light-hover);--ibiz-control-grid-footer-font-size:var(--ibiz-font-size-regular);--ibiz-control-grid-footer-font-weight:var(--ibiz-font-weight-bold);position:relative;width:100%;height:100%;padding:var(--ibiz-control-grid-padding);background-color:var(--ibiz-control-grid-bg-color)}.ibiz-control-grid .el-table{--el-table-header-bg-color:var(--ibiz-control-grid-header-bg-color);--el-table-border-color:transparent}.ibiz-control-grid .el-table--border .el-table__cell{border-right:none}.ibiz-control-grid .el-table-fixed-column--left,.ibiz-control-grid .el-table-fixed-column--right{--el-bg-color:transparent}.ibiz-control-grid .el-table thead.is-group th.el-table__cell{background:var(--ibiz-control-grid-header-bg-color)}.ibiz-control-grid.is-enable-page .ibiz-control-grid__table{height:calc(100% - var(--ibiz-control-grid-page-height))}.ibiz-control-grid.is-enable-group .el-table__indent{display:none}.ibiz-control-grid__table{width:100%;height:100%}.ibiz-control-grid__table .caret-wrapper{justify-content:center}.ibiz-control-grid__table .caret-wrapper>*+*{margin-top:3px}.ibiz-control-grid__table .sort-caret{position:initial}.ibiz-control-grid__table.el-table .el-table__cell{padding:0}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr td{background:var(--ibiz-control-grid-row-bg-color)}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr:nth-child(2n) td{background-color:var(--ibiz-control-grid-row-bg-color-2)}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr:hover td{background-color:var(--el-table-row-hover-bg-color)}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr.current-row td{background-color:var(--el-table-current-row-bg-color)}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr.editing-row td{background-color:var(--ibiz-control-grid-row-edit-bg-color)}.ibiz-control-grid__table .el-table__header-wrapper .cell{height:var(--ibiz-control-grid-header-height);padding:var(--ibiz-control-grid-header-cell-padding);font-size:var(--ibiz-control-grid-header-font-size);font-weight:var(--ibiz-control-grid-header-font-weight);color:var(--ibiz-control-grid-header-text-color);word-break:break-word;white-space:pre-wrap}.ibiz-control-grid__table .el-table__header-wrapper .el-table-column--selection .cell{padding:var(--ibiz-control-grid-selection-padding)}.ibiz-control-grid__table .el-table__header-wrapper .is-sortable.el-table__cell .cell{display:flex;align-items:center;justify-content:var(--ibiz-grid-column-justify-content)}.ibiz-control-grid__table .el-table__body-wrapper{color:var(--ibiz-control-grid-content-text-color);border-bottom:.1px solid var(--ibiz-color-border)}.ibiz-control-grid__table .el-table__body-wrapper .el-table__row{height:var(--ibiz-control-grid-content-row-height);cursor:pointer}.ibiz-control-grid__table .el-table__body-wrapper .el-table__row>td{height:0;padding:0}@-moz-document url-prefix(){.ibiz-control-grid__table .el-table__body-wrapper .el-table__row>td{height:100%}}.ibiz-control-grid__table .el-table__body-wrapper .cell{display:flex;align-items:center;height:100%;padding:0}.ibiz-control-grid__table .el-table__body-wrapper .el-table-column--selection .cell{padding:var(--ibiz-control-grid-selection-padding)}.ibiz-control-grid__table .el-table__cell.is-center{--ibiz-grid-column-text-align:center;--ibiz-grid-column-justify-content:center}.ibiz-control-grid__table .el-table__cell.is-left{--ibiz-grid-column-text-align:left;--ibiz-grid-column-justify-content:flex-start}.ibiz-control-grid__table .el-table__cell.is-right{--ibiz-grid-column-text-align:right;--ibiz-grid-column-justify-content:flex-end}.ibiz-control-grid__table .el-scrollbar__wrap{position:relative}.ibiz-control-grid__table .el-table__footer-wrapper tfoot td.el-table__cell{font-size:var(--ibiz-control-grid-footer-font-size);font-weight:var(--ibiz-control-grid-footer-font-weight);color:var(--ibiz-control-grid-footer-text-color);background-color:var(--ibiz-control-grid-footer-bg-color)}.ibiz-control-grid__table .el-table__footer-wrapper tfoot td.el-table__cell:first-child>div{display:inline;vertical-align:4px}.ibiz-control-grid .el-table td.el-table__cell,.ibiz-control-grid .el-table th.el-table__cell.is-leaf{border-bottom:none}.ibiz-control-grid .ibiz-pagination{--ibiz-pagination-height:var(--ibiz-control-grid-page-height);--ibiz-pagination-text-color:var(--ibiz-control-grid-text-color);--ibiz-pagination-padding:var(--ibiz-control-grid-page-padding)}.ibiz-control-grid.is-single-select .el-table__header-wrapper .el-table__header thead>tr th:nth-child(1){padding-left:var(--ibiz-spacing-tight)}.ibiz-control-grid.is-single-select .el-table__body-wrapper .el-table__body tbody>tr td:nth-child(1){padding-left:var(--ibiz-spacing-tight)}.ibiz-control-grid.is-enable-customized .el-table__header-wrapper .el-table__header thead>tr th:last-child{padding-right:var(--ibiz-spacing-base-loose)}.ibiz-control-grid.is-enable-customized .ibiz-control-grid-setting-box{display:flex;align-items:center;justify-content:flex-start;position:absolute;top:0;right:0;z-index:1;height:var(--ibiz-control-grid-now-header-height);padding-right:var(--ibiz-spacing-extra-tight);background-color:var(--ibiz-control-grid-header-bg-color)}.ibiz-control-grid.is-enable-customized .ibiz-grid-setting{cursor:pointer}.ibiz-control-grid-quick-toolbar{justify-content:center}.ibiz-control-grid-batch-toolbar{position:absolute;top:0;left:54px;z-index:99;display:none;width:calc(100% - 54px);height:var(--ibiz-control-grid-now-header-height);font-size:var(--ibiz-font-size-regular);font-weight:var(--ibiz-font-weight-regular);background-color:var(--ibiz-control-grid-header-bg-color)}.ibiz-control-grid-batch-toolbar.is-show{display:flex;align-items:center;justify-content:flex-start}.ibiz-control-grid-batch-toolbar .ibiz-control-grid-batch-toolbar-separator{padding:0 var(--ibiz-spacing-base-tight)}.ibiz-control-grid-batch-toolbar .ibiz-control-grid-batch-toolbar-content{height:100%;display:flex;align-items:center;justify-content:flex-start}

package/lib/control/search-bar/filter-mode-select/filter-mode-select.cjs

@@ -51,7 +51,8 @@ const FilterModeSelect = /* @__PURE__ */ vue.defineComponent({
   name: "IBizFilterModeSelect",
   props: {
     value: String,
-    modes: Array
+    modes: Array,
+    disabled: Boolean
   },
   emits: {
     change: (_mode) => true
@@ -78,6 +79,7 @@ const FilterModeSelect = /* @__PURE__ */ vue.defineComponent({
     let _slot;
     return vue.createVNode(vue.resolveComponent("el-select"), {
       "model-value": this.value,
+      "disabled": this.disabled,
       "teleported": false,
       "onChange": (value) => {
         this.onChange(value);

package/lib/control/search-bar/filter-tree/filter-tree.cjs

@@ -9,6 +9,7 @@ require('./filter-tree.css');
 function _isSlot(s) {
   return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !vue.isVNode(s);
 }
+const ScriptValueRegex = /\$\{[^}]*\}/;
 const FilterModes = [{
   valueOP: runtime.ValueOP.EQ,
   label: "\u7B49\u4E8E(=)"
@@ -121,10 +122,12 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
       }
     });
     const onFieldSelect = (node, field) => {
+      node.value = null;
       node.field = field;
     };
     const onValueOPSelect = (node, valueOP) => {
       node.valueOP = valueOP;
+      node.value = null;
     };
     const onGroupLogicTypeChange = (node, logicType) => {
       node.logicType = logicType;
@@ -154,11 +157,18 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
         return null;
       }
       let editor = null;
+      let editorValue = node.value;
+      if (node.disabled && ScriptValueRegex.test(editorValue)) {
+        editorValue = editorValue.replace("${context.srfpersonid}", "\u5F53\u524D\u7528\u6237");
+        editorValue = editorValue.replace("${context.srforgid}", "\u5F53\u524D\u7EC4\u7EC7");
+      }
       if (filterC.editorProvider) {
         const component = vue.resolveComponent(filterC.editorProvider.formEditor);
         editor = vue.h(component, {
-          value: node.value,
+          key: filterC.editor.model.id,
+          value: editorValue,
           controller: filterC.editor,
+          disabled: node.disabled,
           data: {},
           onChange: (val) => {
             node.value = val;
@@ -180,6 +190,7 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
       return vue.createVNode("div", {
         "class": ns.b("item")
       }, [vue.createVNode(vue.resolveComponent("el-select"), {
+        "disabled": node.disabled,
         "model-value": node.field,
         "teleported": false,
         "class": ns.e("field-select"),
@@ -195,6 +206,7 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
       })) ? _slot : {
         default: () => [_slot]
       }), availableModes && availableModes.length > 0 && vue.createVNode(vue.resolveComponent("iBizFilterModeSelect"), {
+        "disabled": node.disabled,
         "class": ns.e("mode-select"),
         "value": node.valueOP,
         "modes": availableModes,

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

@@ -120,7 +120,7 @@ const SearchBarControl = /* @__PURE__ */ vue.defineComponent({
           }, [groupItem.caption]);
         })])), this.c.model.enableGroup && this.c.isBackendSearchGroup && vue.createVNode(vue.resolveComponent("el-button"), {
           "class": this.ns.b("save"),
-          "title": "\u4FDD\u5B58",
+          "title": "\u4FDD\u5B58\u5206\u7EC4",
           "onClick": this.handleSave
         }, {
           default: () => [vue.createVNode("ion-icon", {

package/lib/control/search-bar/search-groups/search-groups.cjs

@@ -3,7 +3,7 @@
 var vue = require('vue');
 var vue3Util = require('@ibiz-template/vue3-util');
 require('./search-groups.css');
-var ElementPlus = require('element-plus');
+var elementPlus = require('element-plus');
 var draggable = require('vuedraggable');
 var core = require('@ibiz-template/core');
 var newGroupUtil = require('./new-group-util.cjs');
@@ -80,7 +80,7 @@ const SearchGroups = /* @__PURE__ */ vue.defineComponent({
       editForm.caption = groupItem.caption || groupItem.name;
     };
     const removeGroup = (groupItem) => {
-      ElementPlus.ElMessageBox({
+      elementPlus.ElMessageBox({
         title: "\u786E\u8BA4\u5220\u9664",
         message: () => {
           return vue.createVNode("div", {

package/lib/control/tab-exp-panel/tab-exp-panel.cjs

@@ -4,6 +4,7 @@ var vue = require('vue');
 var vue3Util = require('@ibiz-template/vue3-util');
 require('./tab-exp-panel.css');
 var runtime = require('@ibiz-template/runtime');
+var vueRouter = require('vue-router');
 
 "use strict";
 function _isSlot(s) {
@@ -40,6 +41,36 @@ const TabExpPanelControl = /* @__PURE__ */ vue.defineComponent({
       c.handleTabChange();
     };
     const tabPosition = ((_a = c.view.model.tabLayout) == null ? void 0 : _a.toLowerCase()) || "top";
+    const route = vueRouter.useRoute();
+    vue.watch(() => route.fullPath, (newVal, oldVal) => {
+      if (newVal !== oldVal) {
+        const viewCodeName = c.view.model.codeName.toLowerCase();
+        const viewRouteKey = Object.keys(route.params).find((key) => {
+          return route.params[key] === viewCodeName;
+        });
+        if (!viewRouteKey) {
+          return;
+        }
+        const nextKeyNumber = (parseInt(viewRouteKey[viewRouteKey.length - 1], 10) + 2) * 2;
+        const tempFullPath = route.fullPath.split("/").slice(0, nextKeyNumber).join("/");
+        c.state.tabPages.forEach((page) => {
+          if (page.fullPath === tempFullPath) {
+            c.state.activeName = page.tabTag;
+            c.handleTabChange();
+          }
+        });
+        if (c.state.activeName) {
+          const currentPage = c.state.tabPages.find((page) => {
+            return page.tabTag === c.state.activeName;
+          });
+          if (currentPage) {
+            currentPage.fullPath = tempFullPath;
+          }
+        }
+      }
+    }, {
+      immediate: true
+    });
     return {
       c,
       ns,