@ibiz-template/vue3-components 0.6.13 → 0.6.15

package/es/common/data-import/data-import.mjs

@@ -65,7 +65,7 @@ const DataImport = /* @__PURE__ */ defineComponent({
         result = await importData(selectedFile, props.appDataEntity, props.dataImport, props.context);
         ibiz.mc.command.send({
           srfdecodename: props.appDataEntity.codeName
-        }, "OBJECTCREATED");
+        }, "OBJECTCREATED", "DATAIMPORT");
         const {
           success,
           total,

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

@@ -92,10 +92,10 @@ export declare class DRBarController extends ControlController<IDEDRBar, IDRBarS
     /**
      * 计算关系界面组权限
      *
-     * @param {IData} item 关系组成员
+     * @param {IDRBarItemsState} item 关系组成员
      * @memberof DRBarController
      */
-    calcPermitted(item: IData): Promise<void>;
+    calcPermitted(item: IDRBarItemsState): Promise<void>;
     /**
      * 计算是否展示
      *

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

@@ -119,7 +119,7 @@ class DRBarController extends ControlController {
   /**
    * 计算关系界面组权限
    *
-   * @param {IData} item 关系组成员
+   * @param {IDRBarItemsState} item 关系组成员
    * @memberof DRBarController
    */
   async calcPermitted(item) {
@@ -169,7 +169,8 @@ class DRBarController extends ControlController {
   async onMounted() {
     await super.onMounted();
     if (this.form) {
-      this.form.evt.on("onLoadSuccess", async () => {
+      this.form.evt.on("onLoadSuccess", async (event) => {
+        this.view.state.srfactiveviewdata = event.data[0];
         await this.calcDrBarItemsState();
         this.handleFormChange();
         this.doDefaultSelect();
@@ -180,6 +181,8 @@ class DRBarController extends ControlController {
       this.form.evt.on("onSaveSuccess", () => {
         this.handleFormChange();
       });
+    } else {
+      await this.calcDrBarItemsState();
     }
     if (this.form.state.isLoaded) {
       this.doDefaultSelect();
@@ -253,7 +256,8 @@ class DRBarController extends ControlController {
         sysImage: item.sysImage,
         disabled: false,
         counterId: item.counterId,
-        visible: true,
+        visible: false,
+        // 默认不显示
         dataAccessAction: item.dataAccessAction || void 0
       };
     };
@@ -280,7 +284,8 @@ class DRBarController extends ControlController {
               tag: group.id,
               caption: itemCaption,
               sysImage: group.sysImage,
-              visible: true,
+              visible: false,
+              // 默认不显示
               children: groupItems.map((item) => getItemState(item))
             });
           } else if (groupItems.length === 1) {

package/es/control/drtab/drtab.controller.mjs

@@ -103,7 +103,8 @@ class DRTabController extends ControlController {
   async onMounted() {
     await super.onMounted();
     if (this.form) {
-      this.form.evt.on("onLoadSuccess", () => {
+      this.form.evt.on("onLoadSuccess", (event) => {
+        this.view.state.srfactiveviewdata = event.data[0];
         this.handleFormChange();
       });
       this.form.evt.on("onLoadDraftSuccess", () => {

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

@@ -1,5 +1,5 @@
 import { isVNode, renderSlot, createVNode, resolveComponent, h, defineComponent } from 'vue';
-import { ScriptFactory, findChildFormDetails } from '@ibiz-template/runtime';
+import { ScriptFactory, findChildFormDetails, ControlType } from '@ibiz-template/runtime';
 import { useNamespace } from '@ibiz-template/vue3-util';
 import './form.css';
 
@@ -45,7 +45,7 @@ const FormControl = /* @__PURE__ */ defineComponent({
         modelData: detail,
         controller: c.details[detailId],
         key: detail.id,
-        ...renderAttrs(detail)
+        attrs: renderAttrs(detail)
       };
       if (slots[detailId]) {
         return renderSlot(slots, detailId, {
@@ -113,7 +113,8 @@ const FormControl = /* @__PURE__ */ defineComponent({
           });
         };
       } else {
-        const key = controlPanel ? model.name : "default";
+        const formSlotKey = model.controlType === ControlType.SEARCHFORM ? "searchform" : "form";
+        const key = controlPanel ? formSlotKey : "default";
         slots[key] = () => {
           return createVNode(resolveComponent("iBizFormPage"), {
             "modelData": this.c.model,

package/es/control/form/form-detail/form-item/form-item.d.ts

@@ -11,6 +11,10 @@ export declare const FormItem: import("vue").DefineComponent<{
         type: typeof FormItemController;
         required: true;
     };
+    attrs: {
+        type: PropType<IData>;
+        required: false;
+    };
 }, {
     ns: import("@ibiz-template/core").Namespace;
     c: FormItemController;
@@ -24,5 +28,9 @@ export declare const FormItem: import("vue").DefineComponent<{
         type: typeof FormItemController;
         required: true;
     };
+    attrs: {
+        type: PropType<IData>;
+        required: false;
+    };
 }>>, {}, {}>;
 export default FormItem;

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

@@ -17,6 +17,10 @@ const FormItem = /* @__PURE__ */ defineComponent({
     controller: {
       type: FormItemController,
       required: true
+    },
+    attrs: {
+      type: Object,
+      required: false
     }
   },
   setup(props) {
@@ -48,7 +52,7 @@ const FormItem = /* @__PURE__ */ defineComponent({
       onFocus: (event) => this.c.onFocus(event),
       onBlur: (event) => this.c.onBlur(event),
       onEnter: (event) => this.controller.onEnter(event),
-      ...this.$attrs
+      ...this.attrs
     };
     if (this.c.form.state.isLoaded) {
       if (this.$slots.default) {

package/es/control/form/form-detail/form-item/index.d.ts

@@ -8,6 +8,10 @@ export declare const IBizFormItem: import("@ibiz-template/vue3-util").TypeWithIn
         type: typeof import("@ibiz-template/runtime").FormItemController;
         required: true;
     };
+    attrs: {
+        type: import("vue").PropType<IData>;
+        required: false;
+    };
 }, {
     ns: import("@ibiz-template/core").Namespace;
     c: import("@ibiz-template/runtime").FormItemController;
@@ -21,5 +25,9 @@ export declare const IBizFormItem: import("@ibiz-template/vue3-util").TypeWithIn
         type: typeof import("@ibiz-template/runtime").FormItemController;
         required: true;
     };
+    attrs: {
+        type: import("vue").PropType<IData>;
+        required: false;
+    };
 }>>, {}, {}>>;
 export default IBizFormItem;

package/es/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/repeater-grid/repeater-grid.d.ts

@@ -229,6 +229,10 @@ export declare const RepeaterGrid: import("vue").DefineComponent<{
                     params?: IParams | undefined;
                 }) => void;
                 getEventArgs: () => Omit<EventBase, "eventName">;
+                doNextActive: (cb: () => void, opts: {
+                    key: string;
+                    delay?: number | undefined;
+                }) => void;
                 readonly id: string;
                 state: {
                     data: IData;
@@ -11322,6 +11326,10 @@ export declare const RepeaterGrid: import("vue").DefineComponent<{
                 params?: IParams | undefined;
             }) => void;
             getEventArgs: () => Omit<EventBase, "eventName">;
+            doNextActive: (cb: () => void, opts: {
+                key: string;
+                delay?: number | undefined;
+            }) => void;
             readonly id: string;
             state: {
                 data: IData;
@@ -14261,6 +14269,10 @@ export declare const RepeaterGrid: import("vue").DefineComponent<{
             params?: IParams | undefined;
         }) => void;
         getEventArgs: () => Omit<EventBase, "eventName">;
+        doNextActive: (cb: () => void, opts: {
+            key: string;
+            delay?: number | undefined;
+        }) => void;
         readonly id: string;
         state: {
             isLoaded: boolean;

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

@@ -1,4 +1,4 @@
-import { ControlVO, GridRowState } from '@ibiz-template/runtime';
+import { Srfuf, ControlVO, GridRowState } from '@ibiz-template/runtime';
 import { ref, watch, nextTick, computed, watchEffect, onUnmounted } from 'vue';
 
 "use strict";
@@ -7,6 +7,9 @@ function useITableEvent(c) {
   let forbidChange = false;
   let isGridUISort = false;
   async function onRowClick(data, _column, _event) {
+    if (data.srfuf === Srfuf.CREATE) {
+      return;
+    }
     if (ibiz.config.grid.editShowMode === "row" && c.model.enableRowEdit) {
       const row = c.findRowState(data);
       if (row && row.showRowEdit !== true) {
@@ -17,6 +20,9 @@ function useITableEvent(c) {
     }
   }
   function onDbRowClick(data) {
+    if (data.srfuf === Srfuf.CREATE) {
+      return;
+    }
     c.onDbRowClick(data);
   }
   function onSelectionChange(selection) {

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

@@ -54,7 +54,7 @@ function renderColumn(c, model, renderColumns, index) {
           controller: columnC,
           row: rowState,
           key: elRow.tempsrfkey + columnName,
-          ...renderAttrs(model, {
+          attrs: renderAttrs(model, {
             ...c.getEventArgs(),
             data: rowState.data
           })

package/es/control/grid/grid-column/grid-field-edit-column/cell-edit.mjs

@@ -32,7 +32,7 @@ function useCellEdit(props, componentRef) {
     return cellEditable.value && !editable.value;
   });
   const stopPropagation = computed(() => {
-    return cellEditable.value;
+    return cellEditable.value || editorShowEdit.value;
   });
   let funcs;
   const onMaskClick = () => {

package/es/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.d.ts

@@ -1,3 +1,4 @@
+import { PropType } from 'vue';
 import { GridFieldEditColumnController, GridRowState } from '@ibiz-template/runtime';
 import './grid-field-edit-column.scss';
 export declare const GridFieldEditColumn: import("vue").DefineComponent<{
@@ -9,6 +10,10 @@ export declare const GridFieldEditColumn: import("vue").DefineComponent<{
         type: typeof GridRowState;
         required: true;
     };
+    attrs: {
+        type: PropType<IData>;
+        required: false;
+    };
 }, {
     ns: import("@ibiz-template/core").Namespace;
     c: GridFieldEditColumnController;
@@ -27,5 +32,9 @@ export declare const GridFieldEditColumn: import("vue").DefineComponent<{
         type: typeof GridRowState;
         required: true;
     };
+    attrs: {
+        type: PropType<IData>;
+        required: false;
+    };
 }>>, {}, {}>;
 export default GridFieldEditColumn;

package/es/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.mjs

@@ -19,6 +19,10 @@ const GridFieldEditColumn = /* @__PURE__ */ defineComponent({
     row: {
       type: GridRowState,
       required: true
+    },
+    attrs: {
+      type: Object,
+      required: false
     }
   },
   setup(props) {
@@ -91,7 +95,7 @@ const GridFieldEditColumn = /* @__PURE__ */ defineComponent({
         onInfoTextChange: this.onInfoTextChange,
         title: this.tooltip,
         ...this.editorProps,
-        ...this.$attrs
+        ...this.attrs
       })]
     });
   }

package/es/control/grid/grid-column/grid-field-edit-column/index.d.ts

@@ -7,6 +7,10 @@ export declare const IBizGridFieldEditColumn: import("@ibiz-template/vue3-util")
         type: typeof import("@ibiz-template/runtime").GridRowState;
         required: true;
     };
+    attrs: {
+        type: import("vue").PropType<IData>;
+        required: false;
+    };
 }, {
     ns: import("@ibiz-template/core").Namespace;
     c: import("@ibiz-template/runtime").GridFieldEditColumnController;
@@ -25,5 +29,9 @@ export declare const IBizGridFieldEditColumn: import("@ibiz-template/vue3-util")
         type: typeof import("@ibiz-template/runtime").GridRowState;
         required: true;
     };
+    attrs: {
+        type: import("vue").PropType<IData>;
+        required: false;
+    };
 }>>, {}, {}>>;
 export default IBizGridFieldEditColumn;

package/es/editor/date-picker/ibiz-date-picker/ibiz-date-picker.mjs

@@ -77,9 +77,8 @@ const IBizDatePicker = /* @__PURE__ */ defineComponent({
     };
     if (props.autoFocus) {
       watch(editorRef, (newVal) => {
-        if (newVal) {
-          const input = newVal.$el.getElementsByTagName("input")[0];
-          input.click();
+        if (newVal && newVal.focus) {
+          newVal.focus();
         }
       });
     }

package/es/editor/date-range/date-range-editor.controller.d.ts

@@ -8,6 +8,15 @@ import { IDateRange } from '@ibiz/model-core';
  * @extends {EditorController}
  */
 export declare class DateRangeEditorController extends EditorController<IDateRange> {
+    /**
+     * 日期选择弹框内选中的时间值
+     *
+     * @author ljx
+     * @date 2024-03-28 16:11:21
+     * @public
+     * @returns {*}  {string}
+     */
+    dateRange: IData;
     /**
      * 根据编辑器类型获取格式化
      *

package/es/editor/date-range/date-range-editor.controller.mjs

@@ -1,7 +1,25 @@
 import { EditorController } from '@ibiz-template/runtime';
 
 "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 DateRangeEditorController extends EditorController {
+  constructor() {
+    super(...arguments);
+    /**
+     * 日期选择弹框内选中的时间值
+     *
+     * @author ljx
+     * @date 2024-03-28 16:11:21
+     * @public
+     * @returns {*}  {string}
+     */
+    __publicField(this, "dateRange", []);
+  }
   /**
    * 根据编辑器类型获取格式化
    *

package/es/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.d.ts

@@ -43,6 +43,7 @@ export declare const IBizDateRangePicker: import("vue").DefineComponent<{
     setEditable: (flag: boolean) => void;
     showFormDefaultContent: import("vue").ComputedRef<boolean>;
     handleKeyUp: (e: KeyboardEvent) => void;
+    onCalendarChange: (val: IData) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     change: (_value: unknown, _name?: string | undefined) => boolean;
     blur: (_event?: IData | undefined) => boolean;

package/es/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.mjs

@@ -1,5 +1,6 @@
 import { ref, computed, resolveComponent, mergeProps, createVNode, defineComponent } from 'vue';
 import { getDateRangeProps, getEditorEmits, useNamespace } from '@ibiz-template/vue3-util';
+import { clone } from 'ramda';
 import './ibiz-date-range-picker.css';
 
 "use strict";
@@ -109,6 +110,9 @@ const IBizDateRangePicker = /* @__PURE__ */ defineComponent({
       emit("blur", e);
       setEditable(false);
     };
+    const onCalendarChange = (val) => {
+      c.dateRange = clone(val);
+    };
     const valueText = computed(() => {
       if (curValue.value.length > 0) {
         return "".concat(curValue.value[0], " ").concat(rangeSeparator, " ").concat(curValue.value[1]);
@@ -139,7 +143,8 @@ const IBizDateRangePicker = /* @__PURE__ */ defineComponent({
       isEditable,
       setEditable,
       showFormDefaultContent,
-      handleKeyUp
+      handleKeyUp,
+      onCalendarChange
     };
   },
   render() {
@@ -159,7 +164,8 @@ const IBizDateRangePicker = /* @__PURE__ */ defineComponent({
       "end-placeholder": this.endPlaceHolder,
       "unlink-panels": this.unlinkPanels,
       "onFocus": this.onFocus,
-      "onBlur": this.onBlur
+      "onBlur": this.onBlur,
+      "onCalendarChange": this.onCalendarChange
     }, this.$attrs), null);
     const readonlyContent = createVNode("div", {
       "class": (this.ns.b(), this.ns.m("readonly"))

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

@@ -1 +1 @@
-.ibiz-input-number{display:flex;align-items:center;height:100%}.ibiz-input-number .el-input .el-input__inner{font-size:var(--ibiz-form-item-font-size);color:var(--ibiz-form-item-text-color);border-color:var(--ibiz-form-item-border-color)}.ibiz-input-number .el-input .el-input__inner::-moz-placeholder{color:var(--ibiz-form-item-placeholder-color)}.ibiz-input-number .el-input .el-input__inner::placeholder{color:var(--ibiz-form-item-placeholder-color)}.ibiz-input-number .el-input.is-disabled .el-input__inner{color:var(--ibiz-form-item-disabled-color);border-color:var(--ibiz-form-item-disabled-border-color)}.ibiz-input-number .el-input.is-disabled .el-input__wrapper{background-color:var(--ibiz-form-item-disabled-bg-color)}.ibiz-input-number .ibiz-input-number-input{flex-grow:1;width:auto;height:var(--ibiz-editor-default-line-height)}.ibiz-input-number--readonly{font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-editor-default-line-height);color:var(--ibiz-form-item-readonly-color);word-break:break-word;white-space:pre-wrap}.ibiz-input-number .ibiz-input-number__unit{flex:0 0 auto;margin-left:10px;font-size:var(--ibiz-form-item-font-size);font-style:normal}.ibiz-input-number-form-default-content{display:none}.ibiz-form-item .ibiz-input-number.is-show-default:hover .ibiz-input-number-form-default-content{display:none}.ibiz-form-item .ibiz-input-number.is-show-default:hover .ibiz-input-number-input{display:block}.ibiz-form-item .ibiz-input-number.is-show-default:hover .ibiz-input-number-input .el-input-number__decrease,.ibiz-form-item .ibiz-input-number.is-show-default:hover .ibiz-input-number-input .el-input-number__increase{top:2px}.ibiz-form-item .ibiz-input-number.is-show-default .ibiz-input-number-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)}.ibiz-form-item .ibiz-input-number.is-show-default .ibiz-input-number-input{display:none}.ibiz-form-item .ibiz-input-number.is-show-default.is-editable .ibiz-input-number-form-default-content{display:none}.ibiz-form-item .ibiz-input-number.is-show-default.is-editable .ibiz-input-number-input{display:block}
+.ibiz-input-number{display:flex;align-items:center;height:100%}.ibiz-input-number .el-input .el-input__inner{font-size:var(--ibiz-form-item-font-size);color:var(--ibiz-form-item-text-color);text-align:left;border-color:var(--ibiz-form-item-border-color)}.ibiz-input-number .el-input-number.is-without-controls .el-input__wrapper{padding-right:11px;padding-left:11px}.ibiz-input-number .el-input .el-input__inner::-moz-placeholder{color:var(--ibiz-form-item-placeholder-color)}.ibiz-input-number .el-input .el-input__inner::placeholder{color:var(--ibiz-form-item-placeholder-color)}.ibiz-input-number .el-input.is-disabled .el-input__inner{color:var(--ibiz-form-item-disabled-color);border-color:var(--ibiz-form-item-disabled-border-color)}.ibiz-input-number .el-input.is-disabled .el-input__wrapper{background-color:var(--ibiz-form-item-disabled-bg-color)}.ibiz-input-number .ibiz-input-number-input{flex-grow:1;width:auto;height:var(--ibiz-editor-default-line-height)}.ibiz-input-number--readonly{font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-editor-default-line-height);color:var(--ibiz-form-item-readonly-color);word-break:break-word;white-space:pre-wrap}.ibiz-input-number .ibiz-input-number__unit{flex:0 0 auto;margin-left:10px;font-size:var(--ibiz-form-item-font-size);font-style:normal}.ibiz-input-number-form-default-content{display:none}.ibiz-form-item .ibiz-input-number.is-show-default:hover .ibiz-input-number-form-default-content{display:none}.ibiz-form-item .ibiz-input-number.is-show-default:hover .ibiz-input-number-input{display:block}.ibiz-form-item .ibiz-input-number.is-show-default:hover .ibiz-input-number-input .el-input-number__decrease,.ibiz-form-item .ibiz-input-number.is-show-default:hover .ibiz-input-number-input .el-input-number__increase{top:2px}.ibiz-form-item .ibiz-input-number.is-show-default .ibiz-input-number-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)}.ibiz-form-item .ibiz-input-number.is-show-default .ibiz-input-number-input{display:none}.ibiz-form-item .ibiz-input-number.is-show-default.is-editable .ibiz-input-number-form-default-content{display:none}.ibiz-form-item .ibiz-input-number.is-show-default.is-editable .ibiz-input-number-input{display:block}

package/es/panel-component/index.mjs

@@ -1,4 +1,4 @@
-import { IBizPanelContainer, IBizPanelCtrlPos, IBizScrollContainer, IBizNavPos, IBizSingleDataContainer, IBizMultiDataContainer, IBizPanelField, IBizPanelRawItem, IBizGridContainer, IBizPanelTabPage, IBizPanelContainerGroup, IBizPanelContainerImage, IBizPanelItemRender } from '@ibiz-template/vue3-util';
+import { IBizPanelContainer, IBizPanelCtrlPos, IBizScrollContainer, IBizNavPos, IBizSingleDataContainer, IBizMultiDataContainer, IBizPanelField, IBizPanelRawItem, IBizGridContainer, IBizPanelTabPage, IBizPanelContainerGroup, IBizPanelContainerImage, IBizPanelItemRender, IBizTeleportPlaceholder, IBizPanelContainerTabs } from '@ibiz-template/vue3-util';
 import { IBizAuthUserinfo } from './auth-userinfo/index.mjs';
 import { IBizNavPosIndex } from './nav-pos-index/index.mjs';
 import { IBizNavTabs } from './nav-tabs/index.mjs';
@@ -59,6 +59,8 @@ const IBizPanelComponents = {
     v.use(IBizPanelItemRender);
     v.use(IBizViewMessage);
     v.use(IBizPanelStaticCarousel);
+    v.use(IBizTeleportPlaceholder);
+    v.use(IBizPanelContainerTabs);
   }
 };
 

package/es/panel-component/user-message/async-action/async-action-preview/async-action-preview.mjs

@@ -12,10 +12,13 @@ function fileDownload(file) {
     baseURL: ""
     // 已经有baseURL了，这里无需再写
   }).then((response) => {
-    const filename = qs.parse(response.headers["content-disposition"], {
+    let filename = qs.parse(response.headers["content-disposition"], {
       delimiter: ";"
     }).filename;
     if (filename) {
+      if (filename.startsWith('"') && filename.endsWith('"')) {
+        filename = filename.substring(1, filename.length - 1);
+      }
       file.name += ".".concat(filename.split(".")[1]);
     }
     if (response.status !== 200) {
@@ -85,7 +88,7 @@ const AsyncActionPreview = /* @__PURE__ */ defineComponent({
         info.errorDetails = [];
       }
       if (actionResult.errorfile) {
-        info.errorFileUrl = "".concat(ibiz.env.baseUrl, "/").concat(ibiz.env.appId).concat(ibiz.env.downloadFileUrl, "/").concat(actionResult.errorfile.folder, "/").concat(actionResult.errorfile.fileid);
+        info.errorFileUrl = "".concat(ibiz.env.baseUrl, "/").concat(ibiz.env.appId).concat(ibiz.env.downloadFileUrl, "/").concat(actionResult.errorfile.folder, "/").concat(actionResult.errorfile.fileid).replace("/{cat}", "");
       }
     }
     const onDownLoad = () => {

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

@@ -91,6 +91,7 @@ class EditViewEngine extends ViewEngineBase {
     };
     this.form.evt.on("onLoadSuccess", (event) => {
       formDataStateChange(event);
+      this.view.state.srfactiveviewdata = event.data[0];
       evt.emit("onDataChange", { ...event, actionType: "LOAD" });
     });
     this.form.evt.on("onLoadDraftSuccess", (event) => {
@@ -125,7 +126,7 @@ class EditViewEngine extends ViewEngineBase {
     return this.form.save();
   }
   async refresh() {
-    await this.load();
+    this.form.doNextActive(() => this.load(), { key: "load" });
   }
   // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
   async call(key, args) {
@@ -263,7 +264,11 @@ class EditViewEngine extends ViewEngineBase {
       },
       data instanceof ControlVO ? data.getOrigin() : data
     );
-    ibiz.mc.command.send({ srfdecodename: "SysTodo" }, "OBJECTUPDATED");
+    ibiz.mc.command.send(
+      { srfdecodename: "SysTodo" },
+      "OBJECTUPDATED",
+      "WITHDRAW"
+    );
   }
   /**
    * 初始化标记打开数据相关逻辑

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

@@ -64,6 +64,7 @@ class OptViewEngine extends ViewEngineBase {
       }
     };
     this.form.evt.on("onLoadSuccess", (event) => {
+      this.view.state.srfactiveviewdata = event.data[0];
       formDataStateChange(event);
     });
     this.form.evt.on("onLoadDraftSuccess", (event) => {

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

@@ -124,7 +124,7 @@ class ReportViewEngine extends ViewEngineBase {
    * @memberof ReportViewEngine
    */
   async refresh() {
-    await this.load();
+    this.reportpanel.doNextActive(() => this.load(), { key: "load" });
   }
   /**
    * 获取搜索相关的查询参数

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

@@ -42,6 +42,7 @@ export declare class TabSearchViewEngine extends TabExpViewEngine {
      * @readonly
      */
     get tabExpPanel(): ITabExpPanelController;
+    protected preprocessTabExpModelLayout(): void;
     onCreated(): Promise<void>;
     onMounted(): Promise<void>;
     call(key: string, args: any): Promise<IData | null | undefined>;

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

@@ -30,6 +30,8 @@ class TabSearchViewEngine extends TabExpViewEngine {
   get tabExpPanel() {
     return this.view.getController("tabexppanel");
   }
+  preprocessTabExpModelLayout() {
+  }
   async onCreated() {
     await super.onCreated();
     const { childNames } = this.view;

package/lib/common/data-import/data-import.cjs

@@ -67,7 +67,7 @@ const DataImport = /* @__PURE__ */ vue.defineComponent({
         result = await runtime.importData(selectedFile, props.appDataEntity, props.dataImport, props.context);
         ibiz.mc.command.send({
           srfdecodename: props.appDataEntity.codeName
-        }, "OBJECTCREATED");
+        }, "OBJECTCREATED", "DATAIMPORT");
         const {
           success,
           total,

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

@@ -121,7 +121,7 @@ class DRBarController extends runtime.ControlController {
   /**
    * 计算关系界面组权限
    *
-   * @param {IData} item 关系组成员
+   * @param {IDRBarItemsState} item 关系组成员
    * @memberof DRBarController
    */
   async calcPermitted(item) {
@@ -171,7 +171,8 @@ class DRBarController extends runtime.ControlController {
   async onMounted() {
     await super.onMounted();
     if (this.form) {
-      this.form.evt.on("onLoadSuccess", async () => {
+      this.form.evt.on("onLoadSuccess", async (event) => {
+        this.view.state.srfactiveviewdata = event.data[0];
         await this.calcDrBarItemsState();
         this.handleFormChange();
         this.doDefaultSelect();
@@ -182,6 +183,8 @@ class DRBarController extends runtime.ControlController {
       this.form.evt.on("onSaveSuccess", () => {
         this.handleFormChange();
       });
+    } else {
+      await this.calcDrBarItemsState();
     }
     if (this.form.state.isLoaded) {
       this.doDefaultSelect();
@@ -255,7 +258,8 @@ class DRBarController extends runtime.ControlController {
         sysImage: item.sysImage,
         disabled: false,
         counterId: item.counterId,
-        visible: true,
+        visible: false,
+        // 默认不显示
         dataAccessAction: item.dataAccessAction || void 0
       };
     };
@@ -282,7 +286,8 @@ class DRBarController extends runtime.ControlController {
               tag: group.id,
               caption: itemCaption,
               sysImage: group.sysImage,
-              visible: true,
+              visible: false,
+              // 默认不显示
               children: groupItems.map((item) => getItemState(item))
             });
           } else if (groupItems.length === 1) {

package/lib/control/drtab/drtab.controller.cjs

@@ -105,7 +105,8 @@ class DRTabController extends runtime.ControlController {
   async onMounted() {
     await super.onMounted();
     if (this.form) {
-      this.form.evt.on("onLoadSuccess", () => {
+      this.form.evt.on("onLoadSuccess", (event) => {
+        this.view.state.srfactiveviewdata = event.data[0];
         this.handleFormChange();
       });
       this.form.evt.on("onLoadDraftSuccess", () => {

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

@@ -47,7 +47,7 @@ const FormControl = /* @__PURE__ */ vue.defineComponent({
         modelData: detail,
         controller: c.details[detailId],
         key: detail.id,
-        ...renderAttrs(detail)
+        attrs: renderAttrs(detail)
       };
       if (slots[detailId]) {
         return vue.renderSlot(slots, detailId, {
@@ -115,7 +115,8 @@ const FormControl = /* @__PURE__ */ vue.defineComponent({
           });
         };
       } else {
-        const key = controlPanel ? model.name : "default";
+        const formSlotKey = model.controlType === runtime.ControlType.SEARCHFORM ? "searchform" : "form";
+        const key = controlPanel ? formSlotKey : "default";
         slots[key] = () => {
           return vue.createVNode(vue.resolveComponent("iBizFormPage"), {
             "modelData": this.c.model,

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

@@ -21,6 +21,10 @@ const FormItem = /* @__PURE__ */ vue.defineComponent({
     controller: {
       type: runtime.FormItemController,
       required: true
+    },
+    attrs: {
+      type: Object,
+      required: false
     }
   },
   setup(props) {
@@ -52,7 +56,7 @@ const FormItem = /* @__PURE__ */ vue.defineComponent({
       onFocus: (event) => this.c.onFocus(event),
       onBlur: (event) => this.c.onBlur(event),
       onEnter: (event) => this.controller.onEnter(event),
-      ...this.$attrs
+      ...this.attrs
     };
     if (this.c.form.state.isLoaded) {
       if (this.$slots.default) {