@ibiz-template/vue3-components 0.6.10 → 0.6.11

package/es/control/drbar/drbar.controller.d.ts

@@ -136,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

@@ -264,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(
@@ -296,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.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);
           }
         }
       }
@@ -142,7 +135,6 @@ const DRBarControl = /* @__PURE__ */ defineComponent({
       ns,
       handleSelect,
       renderMenuItems,
-      defaultActive,
       opens
     };
   },
@@ -151,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/form/form-detail/form-mdctrl/form-mdctrl-repeater/repeater-grid/repeater-grid.d.ts

@@ -228,6 +228,7 @@ export declare const RepeaterGrid: import("vue").DefineComponent<{
                     context?: IContext | undefined;
                     params?: IParams | undefined;
                 }) => void;
+                getEventArgs: () => Omit<EventBase, "eventName">;
                 readonly id: string;
                 state: {
                     data: IData;
@@ -11320,6 +11321,7 @@ export declare const RepeaterGrid: import("vue").DefineComponent<{
                 context?: IContext | undefined;
                 params?: IParams | undefined;
             }) => void;
+            getEventArgs: () => Omit<EventBase, "eventName">;
             readonly id: string;
             state: {
                 data: IData;
@@ -14258,6 +14260,7 @@ export declare const RepeaterGrid: import("vue").DefineComponent<{
             context?: IContext | undefined;
             params?: IParams | undefined;
         }) => void;
+        getEventArgs: () => Omit<EventBase, "eventName">;
         readonly id: string;
         state: {
             isLoaded: boolean;

package/es/control/grid/grid/grid.mjs

@@ -1,6 +1,6 @@
 import { resolveComponent, mergeProps, h, createVNode, createTextVNode, onUnmounted, defineComponent } from 'vue';
 import { useControlController, useNamespace, useUIStore } from '@ibiz-template/vue3-util';
-import { GridController } from '@ibiz-template/runtime';
+import { ScriptFactory, GridController } from '@ibiz-template/runtime';
 import { useITableEvent, useGridHeaderStyle, useAppGridBase } from './grid-control.util.mjs';
 import './grid.css';
 import { useRowEditPopover } from '../row-edit-popover/use-row-edit-popover.mjs';
@@ -8,6 +8,18 @@ import '../../../util/index.mjs';
 import { usePagination } from '../../../util/pagination/use-pagination.mjs';
 
 "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] = ScriptFactory.execSingleLine(item.attrValue, {
+        ...params
+      });
+    }
+  });
+  return attrs;
+}
 function renderColumn(c, model, renderColumns, index) {
   var _a;
   const {
@@ -41,7 +53,11 @@ function renderColumn(c, model, renderColumns, index) {
         return h(comp, {
           controller: columnC,
           row: rowState,
-          key: elRow.tempsrfkey + columnName
+          key: elRow.tempsrfkey + columnName,
+          ...renderAttrs(model, {
+            ...c.getEventArgs(),
+            data: rowState.data
+          })
         });
       }
       return null;

package/es/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/es/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.mjs

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

package/es/control/tree-grid/tree-grid.mjs

@@ -95,8 +95,20 @@ const TreeGridControl = /* @__PURE__ */ defineComponent({
     };
     const treeGirdData = computed(() => {
       const treeGirdItems = c.state.rows.map((row) => getTreeGridDataItem(row.data));
-      const noParentData = treeGirdItems.filter((item) => !item[c.treeGridParentField]);
-      return noParentData;
+      const rootNodes = [];
+      const ids = [];
+      treeGirdItems.forEach((item) => {
+        const id = item[c.treeGridValueField];
+        if (id) {
+          ids.push(id);
+        }
+      });
+      treeGirdItems.forEach((item) => {
+        if (!ids.includes(item[c.treeGridParentField])) {
+          rootNodes.push(item);
+        }
+      });
+      return rootNodes;
     });
     const renderNoData = () => {
       var _a;

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

@@ -1 +1 @@
-.ibiz-input{width:100%;height:100%;font-size:var(--ibiz-form-item-font-size);font-weight:var(--ibiz-form-item-regular);--ibiz-input-min-height:var(--ibiz-editor-default-line-height)}.ibiz-input__ai-chat{position:absolute;right:10px;bottom:10px;width:36px;height:36px;padding:8px;font-size:18px;color:var(--ibiz-color-primary-text);cursor:pointer;background-color:var(--ibiz-color-primary);border-radius:15px}.ibiz-input__ai-chat:hover{color:var(--ibiz-color-primary-hover-text);background-color:var(--ibiz-color-primary-hover)}.ibiz-input .el-input .el-input__inner{height:100%}.ibiz-input .el-input .el-input__inner::-moz-placeholder{color:var(--ibiz-form-item-placeholder-color)}.ibiz-input .el-input .el-input__inner::placeholder{color:var(--ibiz-form-item-placeholder-color)}.ibiz-input .el-textarea .el-textarea__inner{height:100%}.ibiz-input .el-textarea .el-textarea__inner::-moz-placeholder{color:var(--ibiz-form-item-placeholder-color);word-break:break-word;white-space:pre-wrap}.ibiz-input .el-textarea .el-textarea__inner::placeholder{color:var(--ibiz-form-item-placeholder-color);word-break:break-word;white-space:pre-wrap}.ibiz-input .ibiz-input-input{height:100%}.ibiz-input .ibiz-input-input .el-input__wrapper{width:100%;min-height:var(--ibiz-input-min-height)}.ibiz-input--readonly{height:auto;line-height:var(--ibiz-input-min-height);color:var(--ibiz-form-item-readonly-color)}.ibiz-input .el-input__suffix .ibiz-input__unit{font-style:normal}.ibiz-input-form-default-content{display:none}.ibiz-form-item .ibiz-input.is-show-default.is-textarea{padding:var(--ibiz-form-item-hover-edit-padding)}.ibiz-form-item .ibiz-input.is-show-default.is-textarea .ibiz-input-form-default-content{display:block}.ibiz-form-item .ibiz-input.is-show-default.is-textarea .ibiz-input-input{display:none}.ibiz-form-item .ibiz-input.is-show-default:hover .ibiz-input-form-default-content{display:none}.ibiz-form-item .ibiz-input.is-show-default:hover .ibiz-input-input{display:inline-flex}.ibiz-form-item .ibiz-input.is-show-default .ibiz-input-form-default-content{display:flex;align-items:center;width:100%;padding:var(--ibiz-form-item-hover-edit-padding);font-family:Arial,sans-serif;font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-editor-default-line-height);color:var(--ibiz-form-item-text-color);word-wrap:break-word;white-space:pre-wrap}.ibiz-form-item .ibiz-input.is-show-default .ibiz-input-input{display:none;font-family:Arial,sans-serif}.ibiz-form-item .ibiz-input.is-show-default .ibiz-input-input.el-textarea .el-textarea__inner{word-wrap:break-word;white-space:pre-wrap}.ibiz-form-item .ibiz-input.is-show-default.is-editable .ibiz-input-form-default-content{display:none}.ibiz-form-item .ibiz-input.is-show-default.is-editable .ibiz-input-input{display:inline-flex}
+.ibiz-input{width:100%;height:100%;font-size:var(--ibiz-form-item-font-size);font-weight:var(--ibiz-form-item-regular);--ibiz-input-min-height:var(--ibiz-editor-default-line-height)}.ibiz-input__ai-chat{position:absolute;right:10px;bottom:10px;width:36px;height:36px;padding:8px;font-size:18px;color:var(--ibiz-color-primary-text);cursor:pointer;background-color:var(--ibiz-color-primary);border-radius:15px}.ibiz-input__ai-chat:hover{color:var(--ibiz-color-primary-hover-text);background-color:var(--ibiz-color-primary-hover)}.ibiz-input .el-input .el-input__inner{height:100%}.ibiz-input .el-input .el-input__inner::-moz-placeholder{color:var(--ibiz-form-item-placeholder-color)}.ibiz-input .el-input .el-input__inner::placeholder{color:var(--ibiz-form-item-placeholder-color)}.ibiz-input .el-textarea .el-textarea__inner{height:100%}.ibiz-input .el-textarea .el-textarea__inner::-moz-placeholder{color:var(--ibiz-form-item-placeholder-color);word-break:break-word;white-space:pre-wrap}.ibiz-input .el-textarea .el-textarea__inner::placeholder{color:var(--ibiz-form-item-placeholder-color);word-break:break-word;white-space:pre-wrap}.ibiz-input .ibiz-input-input{height:100%}.ibiz-input .ibiz-input-input .el-input__wrapper{width:100%;min-height:var(--ibiz-input-min-height)}.ibiz-input--readonly{height:auto;line-height:var(--ibiz-input-min-height);color:var(--ibiz-form-item-readonly-color)}.ibiz-input .el-input__suffix .ibiz-input__unit{font-style:normal}.ibiz-input-form-default-content{display:none}.ibiz-form-item .ibiz-input.is-show-default.is-textarea{padding:var(--ibiz-form-item-hover-edit-padding);overflow:hidden}.ibiz-form-item .ibiz-input.is-show-default.is-textarea .ibiz-input-form-default-content{display:block}.ibiz-form-item .ibiz-input.is-show-default.is-textarea .ibiz-input-input{display:none}.ibiz-form-item .ibiz-input.is-show-default:hover .ibiz-input-form-default-content{display:none}.ibiz-form-item .ibiz-input.is-show-default:hover .ibiz-input-input{display:inline-flex}.ibiz-form-item .ibiz-input.is-show-default .ibiz-input-form-default-content{display:flex;align-items:center;width:100%;padding:var(--ibiz-form-item-hover-edit-padding);font-family:Arial,sans-serif;font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-editor-default-line-height);color:var(--ibiz-form-item-text-color);word-wrap:break-word;white-space:pre-wrap}.ibiz-form-item .ibiz-input.is-show-default .ibiz-input-input{display:none;font-family:Arial,sans-serif}.ibiz-form-item .ibiz-input.is-show-default .ibiz-input-input.el-textarea .el-textarea__inner{word-wrap:break-word;white-space:pre-wrap}.ibiz-form-item .ibiz-input.is-show-default.is-editable .ibiz-input-form-default-content{display:none}.ibiz-form-item .ibiz-input.is-show-default.is-editable .ibiz-input-input{display:inline-flex}

package/es/util/message-util/message-util.d.ts

@@ -1,4 +1,5 @@
-import { IMessageUtil } from '@ibiz-template/runtime';
+import { IMessageUtil, IMessageParams } from '@ibiz-template/runtime';
+import { MessageOptions } from 'element-plus';
 /**
  * 消息通知
  *
@@ -9,8 +10,19 @@ import { IMessageUtil } from '@ibiz-template/runtime';
  * @implements {IMessageUtil}
  */
 export declare class MessageUtil implements IMessageUtil {
+    protected ns: import("@ibiz-template/core").Namespace;
     info(msg: string, duration?: number | undefined, closable?: boolean | undefined): void;
     success(msg: string, duration?: number | undefined, closable?: boolean | undefined): void;
     warning(msg: string, duration?: number | undefined, closable?: boolean | undefined): void;
     error(msg: string, duration?: number | undefined, closable?: boolean | undefined): void;
+    /**
+     * 格式化参数
+     * @author lxm
+     * @date 2024-03-21 02:22:27
+     * @protected
+     * @param {IMessageParams} params
+     * @return {*}  {MessageOptions}
+     */
+    protected formatParams(params: IMessageParams): MessageOptions;
+    notice(params: IMessageParams): void;
 }

package/es/util/message-util/message-util.mjs

@@ -1,7 +1,18 @@
+import { useNamespace } from '@ibiz-template/vue3-util';
 import { ElMessage } from 'element-plus';
+import { mergeRight, 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 MessageUtil {
+  constructor() {
+    __publicField(this, "ns", useNamespace("message"));
+  }
   info(msg, duration, closable) {
     ElMessage.info({
       message: msg,
@@ -30,6 +41,45 @@ class MessageUtil {
       showClose: closable
     });
   }
+  /**
+   * 格式化参数
+   * @author lxm
+   * @date 2024-03-21 02:22:27
+   * @protected
+   * @param {IMessageParams} params
+   * @return {*}  {MessageOptions}
+   */
+  formatParams(params) {
+    const paramsWithDefault = mergeRight(
+      {
+        type: "info"
+      },
+      params
+    );
+    const messageOpts = {};
+    Object.keys(paramsWithDefault).forEach((key) => {
+      const value = paramsWithDefault[key];
+      switch (key) {
+        case "duration":
+          if (!isNil(value)) {
+            messageOpts.duration = value * 1e3;
+          }
+          break;
+        case "styleType":
+          if (!isNil(value)) {
+            messageOpts.customClass = this.ns.m(value);
+          }
+          break;
+        default:
+          messageOpts[key] = value;
+          break;
+      }
+    });
+    return messageOpts;
+  }
+  notice(params) {
+    ElMessage(this.formatParams(params));
+  }
 }
 
 export { MessageUtil };

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

@@ -1,6 +1,5 @@
 import { RuntimeError } from '@ibiz-template/core';
-import { ViewEngineBase, getControl, getControlsByView, calcDeCodeNameById, SysUIActionTag, ViewCallTag, ControlVO, getAppViewRef, OpenAppViewCommand } from '@ibiz-template/runtime';
-import { isNil } from 'ramda';
+import { ViewEngineBase, getControl, getControlsByView, calcDeCodeNameById, SysUIActionTag, ViewCallTag, ControlVO, getAppViewRef, OpenAppViewCommand, ViewMode } from '@ibiz-template/runtime';
 
 "use strict";
 var __defProp = Object.defineProperty;
@@ -271,7 +270,7 @@ class EditViewEngine extends ViewEngineBase {
    * @return {*}  {void}
    */
   initMarkOpenData() {
-    if (isNil(this.view.modal.routeDepth) || !this.view.model.markOpenDataMode) {
+    if (![ViewMode.ROUTE, ViewMode.ROUTE_MODAL].includes(this.view.modal.mode) || !this.view.model.markOpenDataMode) {
       return;
     }
     const modes = this.view.model.markOpenDataMode.split(";");
@@ -295,10 +294,11 @@ class EditViewEngine extends ViewEngineBase {
         default:
           break;
       }
-      ibiz.notification.info({
-        position: "bottom-right",
-        title: "\u901A\u77E5",
-        desc: "".concat(modes.includes("DISPLAYOPPERSON") ? data.username : "\u6709\u4EBA", " ").concat(actionMsg, " ").concat(this.view.state.caption, "-").concat(dataInfo)
+      ibiz.message.notice({
+        message: "".concat(modes.includes("DISPLAYOPPERSON") ? data.username : "\u6709\u4EBA", " ").concat(actionMsg, " ").concat(this.view.state.caption, "-").concat(dataInfo),
+        showClose: true,
+        duration: 3,
+        styleType: "alert"
       });
       if (hasOpenConfirm === false && data.action === "UPDATE" && modes.includes("NOTICERELOAD")) {
         hasOpenConfirm = true;

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/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);
           }
         }
       }
@@ -144,7 +137,6 @@ const DRBarControl = /* @__PURE__ */ vue.defineComponent({
       ns,
       handleSelect,
       renderMenuItems,
-      defaultActive,
       opens
     };
   },
@@ -153,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

@@ -266,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(
@@ -298,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/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/tree-grid/tree-grid.cjs

@@ -97,8 +97,20 @@ const TreeGridControl = /* @__PURE__ */ vue.defineComponent({
     };
     const treeGirdData = vue.computed(() => {
       const treeGirdItems = c.state.rows.map((row) => getTreeGridDataItem(row.data));
-      const noParentData = treeGirdItems.filter((item) => !item[c.treeGridParentField]);
-      return noParentData;
+      const rootNodes = [];
+      const ids = [];
+      treeGirdItems.forEach((item) => {
+        const id = item[c.treeGridValueField];
+        if (id) {
+          ids.push(id);
+        }
+      });
+      treeGirdItems.forEach((item) => {
+        if (!ids.includes(item[c.treeGridParentField])) {
+          rootNodes.push(item);
+        }
+      });
+      return rootNodes;
     });
     const renderNoData = () => {
       var _a;

package/lib/editor/text-box/input/input.css

@@ -1 +1 @@
-.ibiz-input{width:100%;height:100%;font-size:var(--ibiz-form-item-font-size);font-weight:var(--ibiz-form-item-regular);--ibiz-input-min-height:var(--ibiz-editor-default-line-height)}.ibiz-input__ai-chat{position:absolute;right:10px;bottom:10px;width:36px;height:36px;padding:8px;font-size:18px;color:var(--ibiz-color-primary-text);cursor:pointer;background-color:var(--ibiz-color-primary);border-radius:15px}.ibiz-input__ai-chat:hover{color:var(--ibiz-color-primary-hover-text);background-color:var(--ibiz-color-primary-hover)}.ibiz-input .el-input .el-input__inner{height:100%}.ibiz-input .el-input .el-input__inner::-moz-placeholder{color:var(--ibiz-form-item-placeholder-color)}.ibiz-input .el-input .el-input__inner::placeholder{color:var(--ibiz-form-item-placeholder-color)}.ibiz-input .el-textarea .el-textarea__inner{height:100%}.ibiz-input .el-textarea .el-textarea__inner::-moz-placeholder{color:var(--ibiz-form-item-placeholder-color);word-break:break-word;white-space:pre-wrap}.ibiz-input .el-textarea .el-textarea__inner::placeholder{color:var(--ibiz-form-item-placeholder-color);word-break:break-word;white-space:pre-wrap}.ibiz-input .ibiz-input-input{height:100%}.ibiz-input .ibiz-input-input .el-input__wrapper{width:100%;min-height:var(--ibiz-input-min-height)}.ibiz-input--readonly{height:auto;line-height:var(--ibiz-input-min-height);color:var(--ibiz-form-item-readonly-color)}.ibiz-input .el-input__suffix .ibiz-input__unit{font-style:normal}.ibiz-input-form-default-content{display:none}.ibiz-form-item .ibiz-input.is-show-default.is-textarea{padding:var(--ibiz-form-item-hover-edit-padding)}.ibiz-form-item .ibiz-input.is-show-default.is-textarea .ibiz-input-form-default-content{display:block}.ibiz-form-item .ibiz-input.is-show-default.is-textarea .ibiz-input-input{display:none}.ibiz-form-item .ibiz-input.is-show-default:hover .ibiz-input-form-default-content{display:none}.ibiz-form-item .ibiz-input.is-show-default:hover .ibiz-input-input{display:inline-flex}.ibiz-form-item .ibiz-input.is-show-default .ibiz-input-form-default-content{display:flex;align-items:center;width:100%;padding:var(--ibiz-form-item-hover-edit-padding);font-family:Arial,sans-serif;font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-editor-default-line-height);color:var(--ibiz-form-item-text-color);word-wrap:break-word;white-space:pre-wrap}.ibiz-form-item .ibiz-input.is-show-default .ibiz-input-input{display:none;font-family:Arial,sans-serif}.ibiz-form-item .ibiz-input.is-show-default .ibiz-input-input.el-textarea .el-textarea__inner{word-wrap:break-word;white-space:pre-wrap}.ibiz-form-item .ibiz-input.is-show-default.is-editable .ibiz-input-form-default-content{display:none}.ibiz-form-item .ibiz-input.is-show-default.is-editable .ibiz-input-input{display:inline-flex}
+.ibiz-input{width:100%;height:100%;font-size:var(--ibiz-form-item-font-size);font-weight:var(--ibiz-form-item-regular);--ibiz-input-min-height:var(--ibiz-editor-default-line-height)}.ibiz-input__ai-chat{position:absolute;right:10px;bottom:10px;width:36px;height:36px;padding:8px;font-size:18px;color:var(--ibiz-color-primary-text);cursor:pointer;background-color:var(--ibiz-color-primary);border-radius:15px}.ibiz-input__ai-chat:hover{color:var(--ibiz-color-primary-hover-text);background-color:var(--ibiz-color-primary-hover)}.ibiz-input .el-input .el-input__inner{height:100%}.ibiz-input .el-input .el-input__inner::-moz-placeholder{color:var(--ibiz-form-item-placeholder-color)}.ibiz-input .el-input .el-input__inner::placeholder{color:var(--ibiz-form-item-placeholder-color)}.ibiz-input .el-textarea .el-textarea__inner{height:100%}.ibiz-input .el-textarea .el-textarea__inner::-moz-placeholder{color:var(--ibiz-form-item-placeholder-color);word-break:break-word;white-space:pre-wrap}.ibiz-input .el-textarea .el-textarea__inner::placeholder{color:var(--ibiz-form-item-placeholder-color);word-break:break-word;white-space:pre-wrap}.ibiz-input .ibiz-input-input{height:100%}.ibiz-input .ibiz-input-input .el-input__wrapper{width:100%;min-height:var(--ibiz-input-min-height)}.ibiz-input--readonly{height:auto;line-height:var(--ibiz-input-min-height);color:var(--ibiz-form-item-readonly-color)}.ibiz-input .el-input__suffix .ibiz-input__unit{font-style:normal}.ibiz-input-form-default-content{display:none}.ibiz-form-item .ibiz-input.is-show-default.is-textarea{padding:var(--ibiz-form-item-hover-edit-padding);overflow:hidden}.ibiz-form-item .ibiz-input.is-show-default.is-textarea .ibiz-input-form-default-content{display:block}.ibiz-form-item .ibiz-input.is-show-default.is-textarea .ibiz-input-input{display:none}.ibiz-form-item .ibiz-input.is-show-default:hover .ibiz-input-form-default-content{display:none}.ibiz-form-item .ibiz-input.is-show-default:hover .ibiz-input-input{display:inline-flex}.ibiz-form-item .ibiz-input.is-show-default .ibiz-input-form-default-content{display:flex;align-items:center;width:100%;padding:var(--ibiz-form-item-hover-edit-padding);font-family:Arial,sans-serif;font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-editor-default-line-height);color:var(--ibiz-form-item-text-color);word-wrap:break-word;white-space:pre-wrap}.ibiz-form-item .ibiz-input.is-show-default .ibiz-input-input{display:none;font-family:Arial,sans-serif}.ibiz-form-item .ibiz-input.is-show-default .ibiz-input-input.el-textarea .el-textarea__inner{word-wrap:break-word;white-space:pre-wrap}.ibiz-form-item .ibiz-input.is-show-default.is-editable .ibiz-input-form-default-content{display:none}.ibiz-form-item .ibiz-input.is-show-default.is-editable .ibiz-input-input{display:inline-flex}

package/lib/util/message-util/message-util.cjs

@@ -1,9 +1,20 @@
 'use strict';
 
+var vue3Util = require('@ibiz-template/vue3-util');
 var ElementPlus = require('element-plus');
+var ramda = require('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 MessageUtil {
+  constructor() {
+    __publicField(this, "ns", vue3Util.useNamespace("message"));
+  }
   info(msg, duration, closable) {
     ElementPlus.ElMessage.info({
       message: msg,
@@ -32,6 +43,45 @@ class MessageUtil {
       showClose: closable
     });
   }
+  /**
+   * 格式化参数
+   * @author lxm
+   * @date 2024-03-21 02:22:27
+   * @protected
+   * @param {IMessageParams} params
+   * @return {*}  {MessageOptions}
+   */
+  formatParams(params) {
+    const paramsWithDefault = ramda.mergeRight(
+      {
+        type: "info"
+      },
+      params
+    );
+    const messageOpts = {};
+    Object.keys(paramsWithDefault).forEach((key) => {
+      const value = paramsWithDefault[key];
+      switch (key) {
+        case "duration":
+          if (!ramda.isNil(value)) {
+            messageOpts.duration = value * 1e3;
+          }
+          break;
+        case "styleType":
+          if (!ramda.isNil(value)) {
+            messageOpts.customClass = this.ns.m(value);
+          }
+          break;
+        default:
+          messageOpts[key] = value;
+          break;
+      }
+    });
+    return messageOpts;
+  }
+  notice(params) {
+    ElementPlus.ElMessage(this.formatParams(params));
+  }
 }
 
 exports.MessageUtil = MessageUtil;

package/lib/view-engine/edit-view.engine.cjs

@@ -2,7 +2,6 @@
 
 var core = require('@ibiz-template/core');
 var runtime = require('@ibiz-template/runtime');
-var ramda = require('ramda');
 
 "use strict";
 var __defProp = Object.defineProperty;
@@ -273,7 +272,7 @@ class EditViewEngine extends runtime.ViewEngineBase {
    * @return {*}  {void}
    */
   initMarkOpenData() {
-    if (ramda.isNil(this.view.modal.routeDepth) || !this.view.model.markOpenDataMode) {
+    if (![runtime.ViewMode.ROUTE, runtime.ViewMode.ROUTE_MODAL].includes(this.view.modal.mode) || !this.view.model.markOpenDataMode) {
       return;
     }
     const modes = this.view.model.markOpenDataMode.split(";");
@@ -297,10 +296,11 @@ class EditViewEngine extends runtime.ViewEngineBase {
         default:
           break;
       }
-      ibiz.notification.info({
-        position: "bottom-right",
-        title: "\u901A\u77E5",
-        desc: "".concat(modes.includes("DISPLAYOPPERSON") ? data.username : "\u6709\u4EBA", " ").concat(actionMsg, " ").concat(this.view.state.caption, "-").concat(dataInfo)
+      ibiz.message.notice({
+        message: "".concat(modes.includes("DISPLAYOPPERSON") ? data.username : "\u6709\u4EBA", " ").concat(actionMsg, " ").concat(this.view.state.caption, "-").concat(dataInfo),
+        showClose: true,
+        duration: 3,
+        styleType: "alert"
       });
       if (hasOpenConfirm === false && data.action === "UPDATE" && modes.includes("NOTICERELOAD")) {
         hasOpenConfirm = true;

package/lib/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}