@ibiz-template/runtime 0.7.1 → 0.7.3

package/dist/index.esm.js

@@ -25,6 +25,10 @@ var GlobalConfig = class {
     this.form = {
       mdCtrlConfirmBeforeRemove: true
     };
+    // 全局下拉选择类编辑器配置
+    this.pickerEditor = {
+      overflowMode: "auto"
+    };
   }
 };
 
@@ -1032,6 +1036,14 @@ function findFieldById(entity, fieldId) {
   var _a;
   return (_a = entity.appDEFields) == null ? void 0 : _a.find((item) => item.id === fieldId);
 }
+function getDefaultDataImport(entity) {
+  var _a;
+  if (entity.defaultAppDEDataImportId) {
+    return (_a = entity.appDEDataImports) == null ? void 0 : _a.find(
+      (item) => item.id === entity.defaultAppDEDataImportId
+    );
+  }
+}
 
 // src/model/ui-action/ui-action.ts
 async function getUIActionById(id, appId2) {
@@ -5503,6 +5515,82 @@ async function getAppCounterProvider(model) {
   }
 }
 
+// src/register/custom-register.ts
+var CustomRegister = class {
+  /**
+   * 获取适配器注册key
+   *
+   * @author ljx
+   * @date 2024-04-16 23:08:08
+   * @param {string} registerType
+   * @param {IRegisterParams} opts
+   * @return {string}
+   */
+  static getRegisterKey(registerType, opts) {
+    switch (registerType) {
+      case PANELITEM_PROVIDER_PREFIX:
+        return this.calcKeyByView(opts);
+      case FORMDETAIL_PROVIDER_PREFIX:
+      case GRIDCOLUMN_PROVIDER_PREFIX:
+      case CONTROL_PROVIDER_PREFIX:
+        return this.calcKeyByCtrl(opts);
+      default:
+        return "";
+    }
+  }
+  /**
+   * 通过视图计算key
+   * 目前适用于计算面板项的key
+   * @author ljx
+   * @date 2024-04-16 23:08:08
+   * @param {IRegisterParams} opts
+   * @return {string}
+   */
+  static calcKeyByView(opts) {
+    const { controlItemModel, controlModel, viewModel } = opts;
+    let key = "";
+    if (viewModel == null ? void 0 : viewModel.codeName) {
+      key += "".concat(viewModel.codeName.toUpperCase());
+    }
+    if (controlModel == null ? void 0 : controlModel.codeName) {
+      key += "@".concat(controlModel.codeName.toUpperCase());
+    }
+    if (controlItemModel == null ? void 0 : controlItemModel.id) {
+      key += "@".concat(controlItemModel.id.toUpperCase());
+    }
+    return key;
+  }
+  /**
+   * 通过部件计算key
+   * 没有实体的部件默认为APP
+   * @date 2024-04-16 23:08:08
+   * @param {IRegisterParams} opts
+   * @return {string}
+   */
+  static calcKeyByCtrl(opts) {
+    const { controlModel, controlItemModel } = opts;
+    let key = "";
+    let prefix = "APP";
+    if (controlModel) {
+      const { appDataEntityId, controlType, codeName } = controlModel;
+      if (appDataEntityId) {
+        prefix = calcDeCodeNameById(appDataEntityId).toUpperCase();
+      }
+      if (controlType) {
+        key += "@".concat(controlType.toUpperCase());
+      }
+      if (codeName) {
+        key += "@".concat(codeName.toUpperCase());
+      }
+    }
+    if (controlItemModel == null ? void 0 : controlItemModel.codeName) {
+      key += "@".concat(controlItemModel.codeName.toUpperCase());
+    }
+    key = prefix + key;
+    return key;
+  }
+};
+
 // src/register/helper/control-register.ts
 var CONTROL_PROVIDER_PREFIX = "CONTROL";
 function registerControlProvider(key, callback) {
@@ -5516,6 +5604,15 @@ function getProvider2(key) {
 async function getControlProvider(model) {
   let provider;
   const { controlType, controlStyle, sysPFPluginId, appId: appId2 } = model;
+  const registerKey = CustomRegister.getRegisterKey(CONTROL_PROVIDER_PREFIX, {
+    controlModel: model
+  });
+  provider = getProvider2(registerKey);
+  if (!provider) {
+    ibiz.log.debug("\u627E\u4E0D\u5230\u81EA\u5B9A\u4E49\u6CE8\u518C\u6807\u8BC6\u4E3A[".concat(registerKey, "]\u5BF9\u5E94\u7684\u9002\u914D\u5668"));
+  } else {
+    return provider;
+  }
   if (sysPFPluginId) {
     const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId2);
     if (pluginKey) {
@@ -5621,9 +5718,22 @@ function getProvider4(key) {
     "".concat(FORMDETAIL_PROVIDER_PREFIX, "_").concat(key)
   );
 }
-async function getFormDetailProvider(model) {
+async function getFormDetailProvider(model, formModel) {
   let provider;
   const { detailType, sysPFPluginId, appId: appId2 } = model;
+  const registerKey = CustomRegister.getRegisterKey(
+    FORMDETAIL_PROVIDER_PREFIX,
+    {
+      controlItemModel: model,
+      controlModel: formModel
+    }
+  );
+  provider = getProvider4(registerKey);
+  if (!provider) {
+    ibiz.log.debug("\u627E\u4E0D\u5230\u81EA\u5B9A\u4E49\u6CE8\u518C\u6807\u8BC6\u4E3A[".concat(registerKey, "]\u5BF9\u5E94\u7684\u9002\u914D\u5668"));
+  } else {
+    return provider;
+  }
   if (sysPFPluginId) {
     const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId2);
     if (pluginKey) {
@@ -5653,9 +5763,22 @@ function getProvider5(key) {
     "".concat(GRIDCOLUMN_PROVIDER_PREFIX, "_").concat(key)
   );
 }
-async function getGridColumnProvider(model) {
+async function getGridColumnProvider(model, gridModel) {
   let provider;
   const { columnType, enableRowEdit, sysPFPluginId, appId: appId2 } = model;
+  const registerKey = CustomRegister.getRegisterKey(
+    GRIDCOLUMN_PROVIDER_PREFIX,
+    {
+      controlItemModel: model,
+      controlModel: gridModel
+    }
+  );
+  provider = getProvider5(registerKey);
+  if (!provider) {
+    ibiz.log.debug("\u627E\u4E0D\u5230\u81EA\u5B9A\u4E49\u6CE8\u518C\u6807\u8BC6\u4E3A[".concat(registerKey, "]\u5BF9\u5E94\u7684\u9002\u914D\u5668"));
+  } else {
+    return provider;
+  }
   if (sysPFPluginId) {
     const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId2);
     if (pluginKey) {
@@ -5689,10 +5812,21 @@ function getProvider6(key) {
     "".concat(PANELITEM_PROVIDER_PREFIX, "_").concat(key.toUpperCase())
   );
 }
-async function getPanelItemProvider(model) {
+async function getPanelItemProvider(model, panelModel, viewModel) {
   var _a;
   let provider;
   const { itemType, sysPFPluginId, appId: appId2, controlRenders } = model;
+  const registerKey = CustomRegister.getRegisterKey(PANELITEM_PROVIDER_PREFIX, {
+    controlItemModel: model,
+    controlModel: panelModel,
+    viewModel
+  });
+  provider = getProvider6(registerKey);
+  if (!provider) {
+    ibiz.log.debug("\u627E\u4E0D\u5230\u81EA\u5B9A\u4E49\u6CE8\u518C\u6807\u8BC6\u4E3A[".concat(registerKey, "]\u5BF9\u5E94\u7684\u9002\u914D\u5668"));
+  } else {
+    return provider;
+  }
   if (sysPFPluginId) {
     const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId2);
     if (pluginKey) {
@@ -6532,6 +6666,14 @@ var DynamicCodeListCache = class {
      * @protected
      */
     this.evt = new QXEvent3();
+    /**
+     * 常见关键字
+     *
+     * @author zzq
+     * @date 2024-04-15 17:08:06
+     * @type {Promise<void>}
+     */
+    this.commonKeys = ["query", "queryconds"];
     this.codeList = codeList;
     this.codelistChange = this.codelistChange.bind(this);
     const { appDataEntityId, appDEDataSetId } = this.codeList;
@@ -6646,15 +6788,15 @@ var DynamicCodeListCache = class {
   }
   presetconvertData(data) {
     const result = {};
-    const { color, bkcolor, disabled, id, text, label, value, cls } = data;
+    const { color, bkcolor, disabled, id, text, value, cls } = data;
     result.value = value;
     result.color = color;
     result.bkcolor = bkcolor;
     result.text = text;
     result.id = id;
-    result.id = label;
     result.disableSelect = disabled;
     result.cls = cls;
+    result.data = data;
     return result;
   }
   sortShoworder(arr) {
@@ -6676,7 +6818,11 @@ var DynamicCodeListCache = class {
    * @returns {*}  {Promise<CodeListItem[]>}
    */
   async load(context, params = {}) {
-    this.setParams(context, params);
+    const tempParams = { ...params };
+    this.commonKeys.forEach((key) => {
+      delete tempParams[key];
+    });
+    this.setParams(context, tempParams);
     const app = ibiz.hub.getApp(context.srfappid);
     const {
       appDataEntityId,
@@ -6686,7 +6832,6 @@ var DynamicCodeListCache = class {
       pvalueAppDEFieldId,
       customCond
     } = this.codeList;
-    const tempParams = { ...params };
     if (minorSortAppDEFieldId && minorSortDir) {
       Object.assign(tempParams, {
         sort: "".concat(minorSortAppDEFieldId.toLowerCase(), ",").concat(minorSortDir.toLowerCase())
@@ -12533,7 +12678,12 @@ var TreeDataSetNodeData = class _TreeDataSetNodeData extends TreeNodeData {
     const icon = super.calcIcon(model) || {};
     const { iconAppDEFieldId, detreeNodeDataItems } = model;
     if (iconAppDEFieldId && this._deData[iconAppDEFieldId]) {
-      icon.imagePath = this._deData[iconAppDEFieldId];
+      const value = this._deData[iconAppDEFieldId];
+      if (value.indexOf("fa-") !== -1) {
+        icon.cssClass = value;
+      } else {
+        icon.imagePath = value;
+      }
     }
     if (icon) {
       this._icon = icon;
@@ -13885,10 +14035,13 @@ var AppViewConfigService = class {
    */
   getCustomOption(model) {
     var _a;
-    const { appViewParams } = model;
-    const optionProperty = (_a = appViewParams == null ? void 0 : appViewParams.find(
+    const { appViewParams, userParam } = model;
+    let optionProperty = (_a = appViewParams == null ? void 0 : appViewParams.find(
       (item) => item.id === "modaloption"
     )) == null ? void 0 : _a.value;
+    if (!optionProperty && userParam) {
+      optionProperty = userParam.modalOption;
+    }
     let modalOption = {};
     if (optionProperty) {
       try {
@@ -14648,7 +14801,7 @@ function generateRules(itemVRs, name, valueItemName) {
     const sysRule = item.sysValueRule;
     const deRule = item.defvalueRule;
     if (valueRuleType === "SYSVALUERULE" && sysRule) {
-      if (sysRule.ruleType === "REG") {
+      if (sysRule.ruleType === "REG" || sysRule.ruleType === "REGEX") {
         rules.push({
           pattern: new RegExp(sysRule.regExCode),
           message: sysRule.ruleInfo,
@@ -14861,8 +15014,10 @@ function getDefaultValue(opts, origins) {
 
 // src/controller/utils/data-file-util/data-file-util.ts
 import {
-  RuntimeError as RuntimeError32
+  RuntimeError as RuntimeError32,
+  selectFile
 } from "@ibiz-template/core";
+import { mergeRight as mergeRight2 } from "ramda";
 var asyncImportUrl = "asyncimportdata2";
 var importUrl = "importdata2";
 function listenAsyncAction(id) {
@@ -14882,6 +15037,9 @@ function listenAsyncAction(id) {
   });
 }
 async function asyncImportData(file, appDataEntity, dataImport, context) {
+  ibiz.notification.info({
+    desc: ibiz.i18n.t("component.dataImport.startImport")
+  });
   const data = new FormData();
   data.append("file", file);
   let url = "/".concat(appDataEntity.deapicodeName2, "/").concat(asyncImportUrl);
@@ -14915,12 +15073,49 @@ async function importData(file, appDataEntity, dataImport, context) {
     const resPath = calcResPath(context, appDataEntity);
     url = resPath + url;
   }
-  const res = await ibiz.net.request(url, {
-    method: "post",
-    data,
-    headers: { "Content-Type": "multipart/form-data" }
-  });
-  return res.data;
+  const result = {
+    isAsync: false
+  };
+  try {
+    const res = await ibiz.net.request(url, {
+      method: "post",
+      data,
+      headers: { "Content-Type": "multipart/form-data" }
+    });
+    ibiz.mc.command.send(
+      { srfdecodename: appDataEntity.codeName },
+      "OBJECTCREATED",
+      "DATAIMPORT"
+    );
+    Object.assign(result, res.data);
+  } catch (error) {
+    if (error instanceof Error) {
+      result.errorMessage = error.message;
+    }
+  }
+  return result;
+}
+async function importData2(opts) {
+  const result = {
+    isAsync: ibiz.env.enableMqtt
+  };
+  if (ibiz.env.enableMqtt) {
+    asyncImportData(
+      opts.selectedFile,
+      opts.appDataEntity,
+      opts.dataImport,
+      opts.context
+    );
+  } else {
+    const temp = await importData(
+      opts.selectedFile,
+      opts.appDataEntity,
+      opts.dataImport,
+      opts.context
+    );
+    Object.assign(result, temp);
+  }
+  return result;
 }
 async function exportData(header, data, fileName) {
   if (!ibiz.util.getExcelUtil) {
@@ -14946,6 +15141,195 @@ async function exportData(header, data, fileName) {
     return { ok: false };
   }
 }
+async function getDataImportModels(opts) {
+  var _a;
+  const appDataEntity = await ibiz.hub.getAppDataEntity(
+    opts.appDataEntityId,
+    opts.appId
+  );
+  const deDataImport = (_a = appDataEntity.appDEDataImports) == null ? void 0 : _a.find(
+    (item) => item.id === opts.deDataImportId
+  );
+  if (!deDataImport) {
+    throw new RuntimeError32("\u6CA1\u6709\u627E\u5230\u5BF9\u5E94\u7684\u5BFC\u5165\u6570\u636E\u6A21\u578B");
+  }
+  return { deDataImport, appDataEntity };
+}
+async function openDataImport(opts) {
+  const { deDataImportId, appDataEntityId, context, params } = opts;
+  const viewId = opts.dataImportViewId || "AppDataUploadView";
+  let view = null;
+  try {
+    view = await ibiz.hub.config.view.get(viewId);
+  } catch (error) {
+    if (opts.dataImportViewId) {
+      throw error;
+    }
+  }
+  if (view) {
+    context.srfappdataentityid = appDataEntityId;
+    context.srfdedataimportid = deDataImportId;
+    return ibiz.commands.execute(
+      OpenAppViewCommand.TAG,
+      view.id,
+      context,
+      params,
+      { openMode: "POPUPMODAL" }
+    );
+  }
+  const { deDataImport, appDataEntity } = await getDataImportModels({
+    deDataImportId,
+    appDataEntityId,
+    appId: context.srfappid
+  });
+  const importComponentName = deDataImport.enableCustomized ? "DataImport2" : "DataImport";
+  const modal = ibiz.overlay.createModal(
+    importComponentName,
+    {
+      dismiss: () => modal.dismiss(),
+      dataImport: deDataImport,
+      appDataEntity,
+      context,
+      params
+    },
+    {
+      width: "auto",
+      placement: "center"
+    }
+  );
+  modal.present();
+  await modal.onWillDismiss();
+}
+async function downloadImportTemplate(appDataEntity, dataImport) {
+  var _a;
+  let templateUrl = "".concat(appDataEntity.codeName2.toLowerCase(), "/importtemplate");
+  if (dataImport == null ? void 0 : dataImport.codeName) {
+    templateUrl += "?srfimporttag=".concat(dataImport.codeName);
+  }
+  const res = await ibiz.net.request(templateUrl, {
+    responseType: "blob"
+  });
+  if (res.status === 200) {
+    let fileName = ((_a = res.headers["content-disposition"].split(";").find((str) => str.indexOf("filename=") !== -1)) == null ? void 0 : _a.slice(9)) || "";
+    fileName = decodeURIComponent(fileName);
+    const blob = new Blob([res.data], {
+      type: "application/vnd.ms-excel"
+    });
+    const elink = document.createElement("a");
+    elink.download = fileName;
+    elink.style.display = "none";
+    elink.href = URL.createObjectURL(blob);
+    document.body.appendChild(elink);
+    elink.click();
+    URL.revokeObjectURL(elink.href);
+    document.body.removeChild(elink);
+  }
+}
+async function selectAndImport(opts) {
+  return new Promise((resolve) => {
+    selectFile({
+      accept: ".xlsx, .xls",
+      multiple: false,
+      onSelected: async (files) => {
+        const result = await importData2({
+          selectedFile: files[0],
+          appDataEntity: opts.appDataEntity,
+          dataImport: opts.dataImport,
+          context: opts.context
+        });
+        resolve(result);
+      },
+      onCancel: () => {
+        resolve({ cancel: true });
+      }
+    });
+  });
+}
+async function asyncImportData2(opts) {
+  var _a;
+  let path2 = "/".concat(opts.appDataEntity.codeName2.toLowerCase());
+  if (opts.context) {
+    const resPath = calcResPath(opts.context, opts.appDataEntity);
+    path2 = resPath + path2;
+  }
+  const url = "".concat(path2, "/asyncimportdata2");
+  const queryData = {
+    srfossfileid: opts.fileId,
+    srfimportschemaid: opts.schemaId
+  };
+  const srfimporttag = ((_a = opts.dataImport) == null ? void 0 : _a.id) || opts.appDataEntity.defaultAppDEDataImportId;
+  if (srfimporttag) {
+    Object.assign(queryData, { srfimporttag });
+  }
+  await ibiz.net.request(url, {
+    method: "get",
+    params: queryData
+  });
+  ibiz.notification.info({
+    desc: ibiz.i18n.t("component.dataImport.startImport")
+  });
+}
+function calcImportSchemaData(opts) {
+  var _a, _b, _c, _d;
+  let data = {
+    system_tag: (_a = ibiz.appData) == null ? void 0 : _a.context.srfsystemid,
+    // 系统标记
+    data_entity_tag: (_b = opts.appDataEntity) == null ? void 0 : _b.codeName,
+    // 数据实体标记
+    import_tag: ((_c = opts.dataImport) == null ? void 0 : _c.id) || ((_d = opts.appDataEntity) == null ? void 0 : _d.defaultAppDEDataImportId),
+    // 导入标记 导入模型的代码名称
+    owner_type: "PERSONAL"
+    // 所有者类型
+  };
+  data = mergeRight2(data, opts.data);
+  return data;
+}
+async function createImportSchema(opts) {
+  const data = calcImportSchemaData(opts);
+  const url = "extension/import_schemas";
+  const res = await ibiz.net.request(url, {
+    method: "post",
+    data
+  });
+  return res;
+}
+async function updateImportSchema(opts) {
+  const data = calcImportSchemaData(opts);
+  const url = "extension/import_schemas/".concat(data.id);
+  const res = await ibiz.net.request(url, {
+    method: "put",
+    data
+  });
+  return res;
+}
+async function getImportSchema(id) {
+  const url = "extension/import_schemas/".concat(id);
+  const res = await ibiz.net.request(url, {
+    method: "get"
+  });
+  return res;
+}
+async function deleteImportSchema(id) {
+  const url = "extension/import_schemas/".concat(id);
+  const res = await ibiz.net.request(url, {
+    method: "delete"
+  });
+  return res;
+}
+async function fetchImportSchemas(opts) {
+  var _a;
+  const params = {
+    n_import_tag_eq: opts.appDataEntity.defaultAppDEDataImportId,
+    n_system_tag_eq: (_a = ibiz.appData) == null ? void 0 : _a.context.srfsystemid,
+    n_data_entity_tag_eq: opts.appDataEntity.codeName
+  };
+  const url = "extension/import_schemas/fetch_cur_user";
+  const res = await ibiz.net.request(url, {
+    method: "post",
+    data: params
+  });
+  return res;
+}
 
 // src/controller/utils/jsonschema/entity.ts
 async function getEntitySchema(entityId, context) {
@@ -14970,7 +15354,6 @@ var BaseController = class {
    */
   constructor(model, context, params, ctx) {
     this.model = model;
-    this.context = context;
     this.params = params;
     this.ctx = ctx;
     this.id = createUUID9();
@@ -15006,6 +15389,7 @@ var BaseController = class {
      */
     this.childNames = [];
     this.name = model.name || model.id;
+    this.state.context = context;
     this.preprocessModel(model);
     this.initState();
     this.convertMultipleLanguages();
@@ -15020,6 +15404,17 @@ var BaseController = class {
   get _evt() {
     return this.evt;
   }
+  /**
+   * 上下文对象
+   *
+   * @author tony001
+   * @date 2024-04-16 16:04:30
+   * @readonly
+   * @type {IContext}
+   */
+  get context() {
+    return this.state.context;
+  }
   /**
    * 根据需求对model进行预处理
    *
@@ -15188,7 +15583,7 @@ var BaseController = class {
 
 // src/controller/utils/view-msg/view-msg-controller.ts
 import { RuntimeError as RuntimeError33, RuntimeModelError as RuntimeModelError24 } from "@ibiz-template/core";
-import { isNil as isNil21, mergeRight as mergeRight2 } from "ramda";
+import { isNil as isNil21, mergeRight as mergeRight3 } from "ramda";
 var ViewMsgController = class _ViewMsgController {
   constructor(msgGroupId) {
     this.msgGroupId = msgGroupId;
@@ -15388,7 +15783,7 @@ var ViewMsgController = class _ViewMsgController {
       if (removeModeField && !isNil21(item[removeModeField])) {
         message.removeMode = item[removeModeField];
       }
-      return mergeRight2(basicMsg, message);
+      return mergeRight3(basicMsg, message);
     });
     return deViewMessages;
   }
@@ -15635,6 +16030,9 @@ var ViewController = class extends BaseController {
       context = convertNavData(navContexts, this.params, this.context);
     }
     Object.assign(this.context, context);
+    if (!Object.prototype.hasOwnProperty.call(this.context, "srfreadonly")) {
+      Object.assign(this.context, { srfreadonly: false });
+    }
     const navParams = this.model.appViewNavParams;
     let params = {};
     if (notNilEmpty7(navParams)) {
@@ -15739,6 +16137,11 @@ var ViewController = class extends BaseController {
     const modalParams = {
       title: message.title,
       desc: message.message
+      // todo 待模型修复
+      // options: {
+      //   showClose: message.removeMode !== 0,
+      //   showConfirmButton: message.removeMode !== 0,
+      // },
     };
     if (message.extraParams.userTag) {
       Object.assign(modalParams, {
@@ -15772,6 +16175,68 @@ var ViewController = class extends BaseController {
   }
 };
 
+// src/controller/common/view/app-data-upload-view.controller.ts
+var AppDataUploadViewController = class extends ViewController {
+  initState() {
+    super.initState();
+  }
+  async onCreated() {
+    await super.onCreated();
+    const { srfappdataentityid, srfdedataimportid, srfappid } = this.context;
+    const { appDataEntity, deDataImport } = await getDataImportModels({
+      appDataEntityId: srfappdataentityid,
+      deDataImportId: srfdedataimportid,
+      appId: srfappid
+    });
+    this.state.appDataEntity = appDataEntity;
+    this.state.deDataImport = deDataImport;
+  }
+  /**
+   * 下载模版文件
+   * @author lxm
+   * @date 2024-04-16 02:15:29
+   */
+  downloadTemplate() {
+    const { appDataEntity, deDataImport } = this.state;
+    downloadImportTemplate(appDataEntity, deDataImport);
+  }
+  /**
+   * 选中导入文件并导入
+   * @author lxm
+   * @date 2024-04-16 03:54:19
+   * @return {*}
+   */
+  async selectAndImport() {
+    const result = await selectAndImport({
+      appDataEntity: this.state.appDataEntity,
+      dataImport: this.state.deDataImport,
+      context: this.context
+    });
+    if (result.isAsync === true) {
+      this.closeView();
+    }
+    return result;
+  }
+  /**
+   * 自定义导入数据方法
+   * @author lxm
+   * @date 2024-04-18 05:17:22
+   * @param {{
+   *     fileId: string;
+   *     schemaId: string;
+   *   }} opts
+   * @return {*}  {Promise<void>}
+   */
+  async asyncImportData2(opts) {
+    return asyncImportData2({
+      appDataEntity: this.state.appDataEntity,
+      dataImport: this.state.deDataImport,
+      context: this.context,
+      ...opts
+    });
+  }
+};
+
 // src/controller/common/view/mob-view.controller.ts
 var MobViewController = class extends ViewController {
 };
@@ -16474,7 +16939,8 @@ var ControlController = class extends BaseController {
 // src/controller/common/control/md-control.controller.ts
 import {
   isElementSame,
-  RuntimeError as RuntimeError36
+  RuntimeError as RuntimeError36,
+  RuntimeModelError as RuntimeModelError26
 } from "@ibiz-template/core";
 import { isNil as isNil24 } from "ramda";
 var MDControlController = class extends ControlController {
@@ -16886,38 +17352,16 @@ var MDControlController = class extends ControlController {
    * @returns {*}  {Promise<void>}
    */
   async importData() {
-    var _a;
     const { appDataEntityId, dedataImportId } = this.model;
-    const appDataEntity = await ibiz.hub.getAppDataEntity(
-      appDataEntityId,
-      this.model.appId
-    );
-    const dataImport = (_a = appDataEntity.appDEDataImports) == null ? void 0 : _a.find(
-      (importItem) => importItem.id === dedataImportId
-    );
-    if (!dataImport) {
-      throw new RuntimeError36("\u65E0\u5BFC\u5165\u6A21\u578B\uFF01");
-    }
-    let importName = "DataImport";
-    if (dataImport.enableCustomized) {
-      importName = "DataImport2";
+    if (!appDataEntityId || !dedataImportId) {
+      throw new RuntimeModelError26(this.model, "\u6CA1\u6709\u914D\u7F6E\u5BFC\u5165\u6A21\u578B\uFF01");
     }
-    const modal = ibiz.overlay.createModal(
-      importName,
-      {
-        dismiss: () => modal.dismiss(),
-        dataImport,
-        appDataEntity,
-        context: this.context,
-        params: this.params
-      },
-      {
-        width: "auto",
-        placement: "center"
-      }
-    );
-    modal.present();
-    await modal.onWillDismiss();
+    await openDataImport({
+      appDataEntityId,
+      deDataImportId: dedataImportId,
+      context: this.context,
+      params: this.params
+    });
   }
   /**
    * 数据导出
@@ -16975,7 +17419,7 @@ var MDControlController = class extends ControlController {
 import {
   findRecursiveChild,
   RuntimeError as RuntimeError37,
-  RuntimeModelError as RuntimeModelError26
+  RuntimeModelError as RuntimeModelError27
 } from "@ibiz-template/core";
 var AppMenuController = class extends ControlController {
   constructor(model, context, params, ctx) {
@@ -17054,7 +17498,7 @@ var AppMenuController = class extends ControlController {
       return provider.onClick(menuItem, event, this);
     }
     if (!menuItem.appFuncId) {
-      throw new RuntimeModelError26(menuItem, "\u6CA1\u6709\u914D\u7F6E\u5E94\u7528\u529F\u80FD");
+      throw new RuntimeModelError27(menuItem, "\u6CA1\u6709\u914D\u7F6E\u5E94\u7528\u529F\u80FD");
     }
     const tempContext = this.context.clone();
     tempContext.srfappid = menuItem.appId || ibiz.env.appId;
@@ -17174,7 +17618,7 @@ var AppMenuController = class extends ControlController {
 import {
   findRecursiveChild as findRecursiveChild2,
   RuntimeError as RuntimeError38,
-  RuntimeModelError as RuntimeModelError27
+  RuntimeModelError as RuntimeModelError28
 } from "@ibiz-template/core";
 var AppMenuIconViewController = class extends AppMenuController {
   async onClickMenuItem(id, event) {
@@ -17190,7 +17634,7 @@ var AppMenuIconViewController = class extends AppMenuController {
       event
     });
     if (!menuItem.appFuncId) {
-      throw new RuntimeModelError27(menuItem, "\u6CA1\u6709\u914D\u7F6E\u5E94\u7528\u529F\u80FD");
+      throw new RuntimeModelError28(menuItem, "\u6CA1\u6709\u914D\u7F6E\u5E94\u7528\u529F\u80FD");
     }
     const tempContext = this.context.clone();
     if (this.routeDepth === 1) {
@@ -17209,7 +17653,7 @@ var AppMenuIconViewController = class extends AppMenuController {
 
 // src/controller/control/calendar/calendar.controller.ts
 import dayjs3 from "dayjs";
-import { RuntimeModelError as RuntimeModelError28 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError29 } from "@ibiz-template/core";
 
 // src/controller/control/calendar/calendar.service.ts
 import { RuntimeError as RuntimeError39 } from "@ibiz-template/core";
@@ -17389,7 +17833,7 @@ var CalendarController = class extends MDControlController {
       }
     ));
     if (result === -1) {
-      throw new RuntimeModelError28(
+      throw new RuntimeModelError29(
         this.model,
         "\u7F3A\u5C11".concat(item.itemType.toLowerCase(), "_opendata\u7684\u89C6\u56FE\u903B\u8F91")
       );
@@ -17560,10 +18004,10 @@ import { mergeDeepRight as mergeDeepRight3 } from "ramda";
 import { RuntimeError as RuntimeError40 } from "@ibiz-template/core";
 
 // src/controller/control/chart/generator/line-series-generator.ts
-import { RuntimeModelError as RuntimeModelError30 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError31 } from "@ibiz-template/core";
 
 // src/controller/control/chart/generator/base-series-generator.ts
-import { plus, RuntimeModelError as RuntimeModelError29, toNumberOrNil } from "@ibiz-template/core";
+import { plus, RuntimeModelError as RuntimeModelError30, toNumberOrNil } from "@ibiz-template/core";
 import dayjs4 from "dayjs";
 import minMax2 from "dayjs/plugin/minMax";
 import isSameOrBefore from "dayjs/plugin/isSameOrBefore";
@@ -17613,10 +18057,10 @@ var BaseSeriesGenerator = class {
     this.chartGenerator = chartGenerator;
     const { chartSeriesEncode, caption, id, userParam } = model;
     if (!model.catalogField) {
-      throw new RuntimeModelError29(model, "\u7F3A\u5C11\u5206\u7C7B\u5C5E\u6027\u914D\u7F6E");
+      throw new RuntimeModelError30(model, "\u7F3A\u5C11\u5206\u7C7B\u5C5E\u6027\u914D\u7F6E");
     }
     if (!model.valueField) {
-      throw new RuntimeModelError29(model, "\u7F3A\u5C11\u503C\u5C5E\u6027\u914D\u7F6E");
+      throw new RuntimeModelError30(model, "\u7F3A\u5C11\u503C\u5C5E\u6027\u914D\u7F6E");
     }
     this.catalogField = chartGenerator.getFieldKey(model.catalogField);
     this.valueField = chartGenerator.getFieldKey(model.valueField);
@@ -18040,10 +18484,10 @@ var BaseSeriesGenerator = class {
 var LineSeriesGenerator = class extends BaseSeriesGenerator {
   calcStaticOptions() {
     if (this.xAxisIndex === void 0) {
-      throw new RuntimeModelError30(this.model, "\u5E8F\u5217\u6CA1\u6709\u914D\u7F6EX\u5750\u6807\u8F74");
+      throw new RuntimeModelError31(this.model, "\u5E8F\u5217\u6CA1\u6709\u914D\u7F6EX\u5750\u6807\u8F74");
     }
     if (this.yAxisIndex === void 0) {
-      throw new RuntimeModelError30(this.model, "\u5E8F\u5217\u6CA1\u6709\u914D\u7F6EY\u5750\u6807\u8F74");
+      throw new RuntimeModelError31(this.model, "\u5E8F\u5217\u6CA1\u6709\u914D\u7F6EY\u5750\u6807\u8F74");
     }
     const options = super.calcStaticOptions();
     options.xAxisIndex = this.xAxisIndex;
@@ -18059,14 +18503,14 @@ var LineSeriesGenerator = class extends BaseSeriesGenerator {
 };
 
 // src/controller/control/chart/generator/bar-series-generator.ts
-import { RuntimeModelError as RuntimeModelError31 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError32 } from "@ibiz-template/core";
 var BarSeriesGenerator = class extends BaseSeriesGenerator {
   calcStaticOptions() {
     if (this.xAxisIndex === void 0) {
-      throw new RuntimeModelError31(this.model, "\u5E8F\u5217\u6CA1\u6709\u914D\u7F6EX\u5750\u6807\u8F74");
+      throw new RuntimeModelError32(this.model, "\u5E8F\u5217\u6CA1\u6709\u914D\u7F6EX\u5750\u6807\u8F74");
     }
     if (this.yAxisIndex === void 0) {
-      throw new RuntimeModelError31(this.model, "\u5E8F\u5217\u6CA1\u6709\u914D\u7F6EY\u5750\u6807\u8F74");
+      throw new RuntimeModelError32(this.model, "\u5E8F\u5217\u6CA1\u6709\u914D\u7F6EY\u5750\u6807\u8F74");
     }
     const options = super.calcStaticOptions();
     options.xAxisIndex = this.xAxisIndex;
@@ -18119,14 +18563,14 @@ var PieSeriesGenerator = class extends BaseSeriesGenerator {
 };
 
 // src/controller/control/chart/generator/scatter-series-generator.ts
-import { RuntimeModelError as RuntimeModelError32 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError33 } from "@ibiz-template/core";
 var ScatterSeriesGenerator = class extends BaseSeriesGenerator {
   calcStaticOptions() {
     if (this.xAxisIndex === void 0) {
-      throw new RuntimeModelError32(this.model, "\u5E8F\u5217\u6CA1\u6709\u914D\u7F6EX\u5750\u6807\u8F74");
+      throw new RuntimeModelError33(this.model, "\u5E8F\u5217\u6CA1\u6709\u914D\u7F6EX\u5750\u6807\u8F74");
     }
     if (this.yAxisIndex === void 0) {
-      throw new RuntimeModelError32(this.model, "\u5E8F\u5217\u6CA1\u6709\u914D\u7F6EY\u5750\u6807\u8F74");
+      throw new RuntimeModelError33(this.model, "\u5E8F\u5217\u6CA1\u6709\u914D\u7F6EY\u5750\u6807\u8F74");
     }
     const options = super.calcStaticOptions();
     options.xAxisIndex = this.xAxisIndex;
@@ -18903,17 +19347,17 @@ var CaptionBarController = class extends ControlController {
 import { recursiveIterate as recursiveIterate2, RuntimeError as RuntimeError50 } from "@ibiz-template/core";
 
 // src/ui-action/provider/backend-ui-action-provider.ts
-import { RuntimeModelError as RuntimeModelError51 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError52 } from "@ibiz-template/core";
 import { isArray as isArray8 } from "qx-util";
 
 // src/ui-action/provider/ui-action-provider-base.ts
-import { RuntimeModelError as RuntimeModelError50 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError51 } from "@ibiz-template/core";
 
 // src/ui-logic/index.ts
 import { RuntimeError as RuntimeError47 } from "@ibiz-template/core";
 
 // src/ui-logic/ui-logic.ts
-import { ModelError as ModelError25, RuntimeModelError as RuntimeModelError49 } from "@ibiz-template/core";
+import { ModelError as ModelError25, RuntimeModelError as RuntimeModelError50 } from "@ibiz-template/core";
 
 // src/ui-logic/ui-logic-context.ts
 var UILogicContext = class {
@@ -19066,20 +19510,20 @@ var UILogicContext = class {
 };
 
 // src/ui-logic/ui-logic-node/de-action-node/de-action-node.ts
-import { RuntimeModelError as RuntimeModelError35 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError36 } from "@ibiz-template/core";
 
 // src/ui-logic/ui-logic-link/ui-logic-link.ts
 import { ModelError as ModelError20 } from "@ibiz-template/core";
 
 // src/ui-logic/ui-logic-link/ui-logic-link-group-cond/ui-logic-link-group-cond.ts
-import { RuntimeModelError as RuntimeModelError34 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError35 } from "@ibiz-template/core";
 
 // src/ui-logic/ui-logic-link/ui-logic-link-cond/ui-logic-link-cond.ts
 var UILogicLinkCond = class {
 };
 
 // src/ui-logic/ui-logic-link/ui-logic-link-single-cond/ui-logic-link-single-cond.ts
-import { ModelError as ModelError19, RuntimeModelError as RuntimeModelError33 } from "@ibiz-template/core";
+import { ModelError as ModelError19, RuntimeModelError as RuntimeModelError34 } from "@ibiz-template/core";
 
 // src/ui-logic/utils/handle-src-val.ts
 import { ModelError as ModelError18 } from "@ibiz-template/core";
@@ -19177,7 +19621,7 @@ var UILogicLinkSingleCond = class extends UILogicLinkCond {
     switch (this.type) {
       case "ENTITYFIELD": {
         if (!this.value) {
-          throw new RuntimeModelError33(
+          throw new RuntimeModelError34(
             this.model,
             "\u5F53\u524D\u6761\u4EF6\u503C\u7C7B\u578B\u4E3A[\u6570\u636E\u5BF9\u8C61\u5C5E\u6027],\u7F3A\u5C11\u914D\u7F6E\u6761\u4EF6\u503C"
           );
@@ -19189,7 +19633,7 @@ var UILogicLinkSingleCond = class extends UILogicLinkCond {
       }
       case "SRCENTITYFIELD": {
         if (!this.value) {
-          throw new RuntimeModelError33(
+          throw new RuntimeModelError34(
             this.model,
             "\u5F53\u524D\u6761\u4EF6\u503C\u7C7B\u578B\u4E3A[\u6E90\u6570\u636E\u5BF9\u8C61\u5C5E\u6027],\u7F3A\u5C11\u914D\u7F6E\u6761\u4EF6\u503C"
           );
@@ -19268,7 +19712,7 @@ var UILogicLinkGroupCond = class _UILogicLinkGroupCond extends UILogicLinkCond {
   test(ctx, context, data) {
     let bol = true;
     if (this.conds.length === 0) {
-      throw new RuntimeModelError34(this.model, "\u754C\u9762\u8FDE\u63A5\u6761\u4EF6\u903B\u8F91\u7EC4\u672A\u914D\u7F6E\u903B\u8F91\u9879");
+      throw new RuntimeModelError35(this.model, "\u754C\u9762\u8FDE\u63A5\u6761\u4EF6\u903B\u8F91\u7EC4\u672A\u914D\u7F6E\u903B\u8F91\u9879");
     }
     for (let i = 0; i < this.conds.length; i++) {
       const cond = this.conds[i];
@@ -19399,10 +19843,10 @@ var DEActionNode2 = class extends UILogicNode {
       retDEUILogicParamId
     } = this.model;
     if (!dstAppDataEntityId) {
-      throw new RuntimeModelError35(this.model, "\u672A\u6307\u5B9A\u5E94\u7528\u5B9E\u4F53");
+      throw new RuntimeModelError36(this.model, "\u672A\u6307\u5B9A\u5E94\u7528\u5B9E\u4F53");
     }
     if (!dstAppDEActionId) {
-      throw new RuntimeModelError35(this.model, "\u672A\u6307\u5B9A\u5B9E\u4F53\u884C\u4E3A");
+      throw new RuntimeModelError36(this.model, "\u672A\u6307\u5B9A\u5B9E\u4F53\u884C\u4E3A");
     }
     const requestData = ctx.params[dstDEUILogicParamId];
     const app = ibiz.hub.getApp(ctx.context.srfappid);
@@ -19425,13 +19869,13 @@ var DEActionNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/de-ui-action-node/de-ui-action-node.ts
-import { RuntimeModelError as RuntimeModelError36 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError37 } from "@ibiz-template/core";
 var DEUIActionNode = class extends UILogicNode {
   async exec(ctx) {
     const { dstAppDEUIActionId, dstDEUILogicParamId, dstAppDataEntityId } = this.model;
     const { data, parameters } = ctx;
     if (!dstAppDEUIActionId) {
-      throw new RuntimeModelError36(this.model, "\u672A\u914D\u7F6E\u754C\u9762\u884C\u4E3A");
+      throw new RuntimeModelError37(this.model, "\u672A\u914D\u7F6E\u754C\u9762\u884C\u4E3A");
     }
     let actionData = [data];
     if (dstDEUILogicParamId) {
@@ -19680,20 +20124,20 @@ var PrepareJSParamNode = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/view-ctrl-invoke-node/view-ctrl-invoke-node.ts
-import { RuntimeError as RuntimeError43, RuntimeModelError as RuntimeModelError37 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError43, RuntimeModelError as RuntimeModelError38 } from "@ibiz-template/core";
 import { isFunction } from "lodash-es";
 var ViewCtrlInvokeNode = class extends UILogicNode {
   async exec(ctx) {
     ctx.isEndNode = true;
     const { invokeMethod, invokeCtrlId, invokeParamId } = this.model;
     if (!invokeCtrlId) {
-      throw new RuntimeModelError37(this.model, "\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u5BF9\u8C61");
+      throw new RuntimeModelError38(this.model, "\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u5BF9\u8C61");
     }
     if (!invokeParamId) {
-      throw new RuntimeModelError37(this.model, "\u6CA1\u6709\u914D\u7F6E\u64CD\u4F5C\u53C2\u6570");
+      throw new RuntimeModelError38(this.model, "\u6CA1\u6709\u914D\u7F6E\u64CD\u4F5C\u53C2\u6570");
     }
     if (!invokeMethod) {
-      throw new RuntimeModelError37(this.model, "\u6CA1\u6709\u914D\u7F6E\u8C03\u7528\u65B9\u6CD5");
+      throw new RuntimeModelError38(this.model, "\u6CA1\u6709\u914D\u7F6E\u8C03\u7528\u65B9\u6CD5");
     }
     const invokeParam = ctx.params[invokeParamId];
     if (!invokeParam) {
@@ -19715,12 +20159,12 @@ var ViewCtrlInvokeNode = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/bind-param-node/bind-param-node.ts
-import { RuntimeModelError as RuntimeModelError38 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError39 } from "@ibiz-template/core";
 var BindParamNode2 = class extends UILogicNode {
   async exec(ctx) {
     const { dstDEUILogicParamId, srcDEUILogicParamId } = this.model;
     if (!dstDEUILogicParamId || !srcDEUILogicParamId) {
-      throw new RuntimeModelError38(
+      throw new RuntimeModelError39(
         this.model,
         "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u6216\u8005\u6E90\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E"
       );
@@ -19736,7 +20180,7 @@ var BindParamNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/msg-box-node/msg-box-node.ts
-import { ModelError as ModelError23, RuntimeModelError as RuntimeModelError39 } from "@ibiz-template/core";
+import { ModelError as ModelError23, RuntimeModelError as RuntimeModelError40 } from "@ibiz-template/core";
 var MsgBoxNode = class extends UILogicNode {
   constructor() {
     super(...arguments);
@@ -19750,10 +20194,10 @@ var MsgBoxNode = class extends UILogicNode {
   async exec(ctx) {
     const { msgBoxType, buttonsType, msgBoxParamId } = this.model;
     if (!msgBoxType) {
-      throw new RuntimeModelError39(this.model, "\u7F3A\u5C11\u6D88\u606F\u7C7B\u578B\u7684\u914D\u7F6E");
+      throw new RuntimeModelError40(this.model, "\u7F3A\u5C11\u6D88\u606F\u7C7B\u578B\u7684\u914D\u7F6E");
     }
     if (!buttonsType) {
-      throw new RuntimeModelError39(this.model, "\u7F3A\u5C11\u6309\u94AE\u7C7B\u578B\u7684\u914D\u7F6E");
+      throw new RuntimeModelError40(this.model, "\u7F3A\u5C11\u6309\u94AE\u7C7B\u578B\u7684\u914D\u7F6E");
     }
     let { title, message } = this.model;
     if (msgBoxParamId) {
@@ -19818,12 +20262,12 @@ var PFPluginNode = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/debug-param-node/debug-param-node.ts
-import { RuntimeModelError as RuntimeModelError40 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError41 } from "@ibiz-template/core";
 var DebugParamNode = class extends UILogicNode {
   async exec(ctx) {
     const { dstDEUILogicParamId, name } = this.model;
     if (!dstDEUILogicParamId) {
-      throw new RuntimeModelError40(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E");
+      throw new RuntimeModelError41(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E");
     }
     const param = ctx.params[dstDEUILogicParamId];
     ibiz.log.info("\u903B\u8F91\u8282\u70B9".concat(name, "\u64CD\u4F5C\u53C2\u6570\u503C:"), param);
@@ -19831,12 +20275,12 @@ var DebugParamNode = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/reset-param-node/reset-param-node.ts
-import { RuntimeModelError as RuntimeModelError41 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError42 } from "@ibiz-template/core";
 var ResetParamNode2 = class extends UILogicNode {
   async exec(ctx) {
     const { dstDEUILogicParamId } = this.model;
     if (!dstDEUILogicParamId) {
-      throw new RuntimeModelError41(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E");
+      throw new RuntimeModelError42(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E");
     }
     ctx.resetParam(dstDEUILogicParamId);
     ctx.setLastReturn(ctx.params[dstDEUILogicParamId]);
@@ -19847,13 +20291,13 @@ var ResetParamNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/copy-param-node/copy-param-node.ts
-import { RuntimeModelError as RuntimeModelError42 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError43 } from "@ibiz-template/core";
 import { clone as clone24 } from "ramda";
 var CopyParamNode2 = class extends UILogicNode {
   async exec(ctx) {
     const { dstDEUILogicParamId, srcDEUILogicParamId } = this.model;
     if (!dstDEUILogicParamId || !srcDEUILogicParamId) {
-      throw new RuntimeModelError42(
+      throw new RuntimeModelError43(
         this.model,
         "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u6216\u8005\u6E90\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E"
       );
@@ -19869,7 +20313,7 @@ var CopyParamNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/append-param-node/append-param-node.ts
-import { RuntimeModelError as RuntimeModelError43 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError44 } from "@ibiz-template/core";
 var AppendParamNode2 = class extends UILogicNode {
   async exec(ctx) {
     const {
@@ -19880,7 +20324,7 @@ var AppendParamNode2 = class extends UILogicNode {
       srcSize
     } = this.model;
     if (!dstDEUILogicParamId || !srcDEUILogicParamId) {
-      throw new RuntimeModelError43(
+      throw new RuntimeModelError44(
         this.model,
         "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u6216\u8005\u6E90\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E"
       );
@@ -19905,12 +20349,12 @@ var AppendParamNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/sort-param-node/sort-param-node.ts
-import { RuntimeModelError as RuntimeModelError44 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError45 } from "@ibiz-template/core";
 var SortParamNode2 = class extends UILogicNode {
   async exec(ctx) {
     const { dstDEUILogicParamId, dstSortDir, dstFieldName } = this.model;
     if (!dstDEUILogicParamId || !dstFieldName) {
-      throw new RuntimeModelError44(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u6216\u76EE\u6807\u5C5E\u6027\u914D\u7F6E");
+      throw new RuntimeModelError45(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u6216\u76EE\u6807\u5C5E\u6027\u914D\u7F6E");
     }
     const key = dstFieldName;
     const arr = ctx.params[dstDEUILogicParamId];
@@ -19926,12 +20370,12 @@ var SortParamNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/renew-param-node/renew-param-node.ts
-import { RuntimeModelError as RuntimeModelError45 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError46 } from "@ibiz-template/core";
 var RenewParamNode2 = class extends UILogicNode {
   async exec(ctx) {
     const { dstDEUILogicParamId } = this.model;
     if (!dstDEUILogicParamId) {
-      throw new RuntimeModelError45(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E");
+      throw new RuntimeModelError46(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E");
     }
     ctx.renewParam(dstDEUILogicParamId);
     ctx.setLastReturn(ctx.params[dstDEUILogicParamId]);
@@ -19942,7 +20386,7 @@ var RenewParamNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/data-set-node/data-set-node.ts
-import { RuntimeModelError as RuntimeModelError46 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError47 } from "@ibiz-template/core";
 var DataSetNode2 = class extends UILogicNode {
   async exec(ctx) {
     const {
@@ -19952,7 +20396,7 @@ var DataSetNode2 = class extends UILogicNode {
       retDEUILogicParamId
     } = this.model;
     if (!dstDEUILogicParamId) {
-      throw new RuntimeModelError46(this.model, "\u7F3A\u5C11\u914D\u7F6E\u8FC7\u6EE4\u53C2\u6570");
+      throw new RuntimeModelError47(this.model, "\u7F3A\u5C11\u914D\u7F6E\u8FC7\u6EE4\u53C2\u6570");
     }
     const queryParams = ctx.params[dstDEUILogicParamId];
     const app = ibiz.hub.getApp(ctx.context.srfappid);
@@ -19986,19 +20430,19 @@ var ThrowExceptionNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/view-ctrl-fire-event-node/view-ctrl-fire-event-node.ts
-import { RuntimeError as RuntimeError45, RuntimeModelError as RuntimeModelError47 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError45, RuntimeModelError as RuntimeModelError48 } from "@ibiz-template/core";
 var ViewCtrlFireEventNode = class extends UILogicNode {
   async exec(ctx) {
     ctx.isEndNode = true;
     const { eventName, eventParamId, fireCtrlId } = this.model;
     if (!fireCtrlId) {
-      throw new RuntimeModelError47(this.model, "\u6CA1\u6709\u914D\u7F6E\u89E6\u53D1\u5BF9\u8C61");
+      throw new RuntimeModelError48(this.model, "\u6CA1\u6709\u914D\u7F6E\u89E6\u53D1\u5BF9\u8C61");
     }
     if (!eventName) {
-      throw new RuntimeModelError47(this.model, "\u6CA1\u6709\u914D\u7F6E\u4E8B\u4EF6\u540D\u79F0\u53C2\u6570");
+      throw new RuntimeModelError48(this.model, "\u6CA1\u6709\u914D\u7F6E\u4E8B\u4EF6\u540D\u79F0\u53C2\u6570");
     }
     if (!eventParamId) {
-      throw new RuntimeModelError47(this.model, "\u6CA1\u6709\u914D\u7F6E\u4E8B\u4EF6\u53C2\u6570");
+      throw new RuntimeModelError48(this.model, "\u6CA1\u6709\u914D\u7F6E\u4E8B\u4EF6\u53C2\u6570");
     }
     const invokeCtrl = ctx.params[fireCtrlId];
     if (!invokeCtrl) {
@@ -20017,7 +20461,7 @@ var ViewCtrlFireEventNode = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/execute-de-logic-node/execute-de-logic-node.ts
-import { RuntimeError as RuntimeError46, RuntimeModelError as RuntimeModelError48 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError46, RuntimeModelError as RuntimeModelError49 } from "@ibiz-template/core";
 var ExecuteDELogicNode = class extends UILogicNode {
   async exec(ctx) {
     const {
@@ -20027,13 +20471,13 @@ var ExecuteDELogicNode = class extends UILogicNode {
       retDEUILogicParamId
     } = this.model;
     if (!dstAppDataEntityId) {
-      throw new RuntimeModelError48(this.model, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53");
+      throw new RuntimeModelError49(this.model, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53");
     }
     if (!dstAppDELogicId) {
-      throw new RuntimeModelError48(this.model, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u903B\u8F91");
+      throw new RuntimeModelError49(this.model, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u903B\u8F91");
     }
     if (!dstDEUILogicParamId) {
-      throw new RuntimeModelError48(this.model, "\u6CA1\u6709\u914D\u7F6E\u4F20\u5165\u903B\u8F91\u53C2\u6570");
+      throw new RuntimeModelError49(this.model, "\u6CA1\u6709\u914D\u7F6E\u4F20\u5165\u903B\u8F91\u53C2\u6570");
     }
     const dstParam = ctx.params[dstDEUILogicParamId];
     if (!dstParam) {
@@ -20227,7 +20671,7 @@ var UILogic = class {
     this.params = /* @__PURE__ */ new Map();
     var _a;
     if (!((_a = model.deuilogicNodes) == null ? void 0 : _a.length)) {
-      throw new RuntimeModelError49(model, "\u754C\u9762\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u903B\u8F91\u8282\u70B9");
+      throw new RuntimeModelError50(model, "\u754C\u9762\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u903B\u8F91\u8282\u70B9");
     }
     model.deuilogicNodes.forEach((node) => {
       const { logicNodeType } = node;
@@ -20347,7 +20791,7 @@ var UILogic = class {
       const start = this.nodes.get(startDEUILogicNodeId);
       await this.deepExec(start, ctx);
     } else {
-      throw new RuntimeModelError49(this.model, "\u672A\u8BBE\u7F6E\u8D77\u59CB\u8282\u70B9");
+      throw new RuntimeModelError50(this.model, "\u672A\u8BBE\u7F6E\u8D77\u59CB\u8282\u70B9");
     }
     if (ctx.isEndNode) {
       return ctx.result;
@@ -20529,7 +20973,7 @@ var UIActionProviderBase = class {
     const { appDEUILogicId, appDataEntityId, uilogicAttachMode } = action;
     if (uilogicAttachMode === "REPLACE") {
       if (!appDEUILogicId) {
-        throw new RuntimeModelError50(action, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
+        throw new RuntimeModelError51(action, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
       }
       await execUILogic(appDEUILogicId, appDataEntityId, args);
       return result;
@@ -20544,7 +20988,7 @@ var UIActionProviderBase = class {
     }
     if (action.uilogicAttachMode === "AFTER") {
       if (!appDEUILogicId) {
-        throw new RuntimeModelError50(action, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
+        throw new RuntimeModelError51(action, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
       }
       await execUILogic(
         appDEUILogicId,
@@ -20791,7 +21235,7 @@ var BackendUIActionProvider = class extends UIActionProviderBase {
     const entityName = action.appDataEntityId;
     const methodName = action.appDEMethodId;
     if (!entityName || !methodName) {
-      throw new RuntimeModelError51(action, "\u672A\u914D\u7F6E\u5B9E\u4F53\u6216\u5B9E\u4F53\u884C\u4E3A");
+      throw new RuntimeModelError52(action, "\u672A\u914D\u7F6E\u5B9E\u4F53\u6216\u5B9E\u4F53\u884C\u4E3A");
     }
     const { resultContext, resultParams, resultData } = await this.handleParams(
       action,
@@ -20917,11 +21361,11 @@ var SysUIActionProvider = class extends UIActionProviderBase {
 // src/ui-action/provider/front-ui-action-provider.ts
 import {
   StringUtil,
-  RuntimeModelError as RuntimeModelError52,
+  RuntimeModelError as RuntimeModelError53,
   ModelError as ModelError26,
   RuntimeError as RuntimeError49
 } from "@ibiz-template/core";
-import { mergeRight as mergeRight3 } from "ramda";
+import { mergeRight as mergeRight4 } from "ramda";
 var FrontUIActionProvider = class extends UIActionProviderBase {
   async execAction(action, args) {
     const { context, params, data, event, noWaitRoute } = args;
@@ -20936,7 +21380,7 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
       case "WIZARD": {
         const frontPSAppView = action.frontAppViewId;
         if (!frontPSAppView) {
-          throw new RuntimeModelError52(action, "\u672A\u914D\u7F6E\u6253\u5F00\u89C6\u56FE");
+          throw new RuntimeModelError53(action, "\u672A\u914D\u7F6E\u6253\u5F00\u89C6\u56FE");
         }
         const { resultContext, resultParams } = await this.handleParams(
           action,
@@ -21004,7 +21448,7 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
       );
       return result || {};
     }
-    throw new RuntimeModelError52(action, "\u81EA\u5B9A\u4E49\u7C7B\u578B\u7F3A\u5C11\u914D\u7F6E\u811A\u672C\u4EE3\u7801");
+    throw new RuntimeModelError53(action, "\u81EA\u5B9A\u4E49\u7C7B\u578B\u7F3A\u5C11\u914D\u7F6E\u811A\u672C\u4EE3\u7801");
   }
   /**
    * 执行打印行为
@@ -21074,47 +21518,27 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
    * @return {*}
    */
   async executeDataImport(action, args) {
-    var _a;
     const { resultContext, resultParams } = await this.handleParams(
       action,
       args.context,
       args.data,
       args.params
     );
-    const appDataEntity = await ibiz.hub.getAppDataEntity(
-      action.appDataEntityId,
-      action.appId
-    );
-    const appDEDataImport = (_a = appDataEntity.appDEDataImports) == null ? void 0 : _a.find(
-      (dataImport) => dataImport.id === action.appDEDataImportId
-    );
-    let importName = "DataImport";
-    if (appDEDataImport && appDEDataImport.enableCustomized) {
-      importName = "DataImport2";
+    const { appDataEntityId, appDEDataImportId, frontAppViewId } = action;
+    if (!appDataEntityId || !appDEDataImportId) {
+      throw new RuntimeModelError53(action, "\u6CA1\u6709\u914D\u7F6E\u5BFC\u5165\u6A21\u578B\uFF01");
     }
-    if (appDEDataImport) {
-      const modal = ibiz.overlay.createModal(
-        importName,
-        {
-          dismiss: () => modal.dismiss(),
-          appDataEntity,
-          dataImport: appDEDataImport,
-          context: resultContext,
-          params: resultParams
-        },
-        {
-          width: "auto",
-          placement: "center"
-        }
-      );
-      modal.present();
-      await modal.onWillDismiss();
-      return {
-        refresh: true,
-        refreshMode: 1
-      };
-    }
-    throw new RuntimeError49("\u6CA1\u6709\u627E\u5230\u5B9E\u4F53\u5BFC\u5165\u9879");
+    await openDataImport({
+      appDataEntityId,
+      deDataImportId: appDEDataImportId,
+      dataImportViewId: frontAppViewId,
+      context: resultContext,
+      params: resultParams
+    });
+    return {
+      refresh: true,
+      refreshMode: 1
+    };
   }
   /**
    * 执行导出行为
@@ -21193,7 +21617,7 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
       params
     );
     const options = this.handleViewOptionParams(resultParams).modalOption || {};
-    const popoverOpts = mergeRight3(
+    const popoverOpts = mergeRight4(
       {
         autoClose: true
       },
@@ -21206,7 +21630,8 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
         context: resultContext,
         params: resultParams,
         modelData: action.deeditForm,
-        onSaveSuccess: () => {
+        onSaveSuccess: (eventArgs) => {
+          actionResult.data = [eventArgs.args];
           if (overlay) {
             overlay.dismiss();
           }
@@ -21919,7 +22344,7 @@ var RawItemPortletController = class extends PortletPartController {
 };
 
 // src/controller/control/data-view/data-view.controller.ts
-import { RuntimeModelError as RuntimeModelError53 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError54 } from "@ibiz-template/core";
 import { isNil as isNil26 } from "ramda";
 
 // src/controller/control/data-view/data-view.service.ts
@@ -22137,7 +22562,7 @@ var DataViewControlController = class extends MDControlController {
     const optItemModel = this.getOptItemModel();
     if (optItemModel) {
       if (!optItemModel.deuiactionGroup) {
-        throw new RuntimeModelError53(this.model, "\u64CD\u4F5C\u9879\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u884C\u4E3A\u7EC4");
+        throw new RuntimeModelError54(this.model, "\u64CD\u4F5C\u9879\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u884C\u4E3A\u7EC4");
       }
       if (!((_a = optItemModel.deuiactionGroup.uiactionGroupDetails) == null ? void 0 : _a.length)) {
         ibiz.log.debug("\u64CD\u4F5C\u9879\u754C\u9762\u884C\u4E3A\u7EC4\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u884C\u4E3A");
@@ -22190,7 +22615,7 @@ var DataViewControlController = class extends MDControlController {
     const { enableGroup, groupMode, groupAppDEFieldId } = this.model;
     if (enableGroup && groupMode) {
       if (!groupAppDEFieldId) {
-        throw new RuntimeModelError53(this.model, "\u5206\u7EC4\u5C5E\u6027\u6CA1\u6709\u914D\u7F6E");
+        throw new RuntimeModelError54(this.model, "\u5206\u7EC4\u5C5E\u6027\u6CA1\u6709\u914D\u7F6E");
       }
       if (groupMode === "AUTO") {
         this.handleAutoGroup();
@@ -22257,7 +22682,7 @@ var DataViewControlController = class extends MDControlController {
   async handleCodeListGroup() {
     const { groupAppDEFieldId, groupCodeListId } = this.model;
     if (!groupCodeListId) {
-      throw new RuntimeModelError53(this.model, "\u5206\u7EC4\u4EE3\u7801\u8868\u6CA1\u6709\u914D\u7F6E");
+      throw new RuntimeModelError54(this.model, "\u5206\u7EC4\u4EE3\u7801\u8868\u6CA1\u6709\u914D\u7F6E");
     }
     const { items } = this.state;
     const groupMap = /* @__PURE__ */ new Map();
@@ -22363,7 +22788,7 @@ var DataViewControlController = class extends MDControlController {
         caption = ibiz.i18n.t(item.capLanguageRes.lanResTag, item.caption);
       }
       if (!item.appDEFieldId) {
-        throw new RuntimeModelError53(item, "\u542F\u7528\u6392\u5E8F\u7684\u9879\u5FC5\u987B\u5173\u8054\u5B9E\u4F53\u5C5E\u6027");
+        throw new RuntimeModelError54(item, "\u542F\u7528\u6392\u5E8F\u7684\u9879\u5FC5\u987B\u5173\u8054\u5B9E\u4F53\u5C5E\u6027");
       }
       const tempItem = {
         caption,
@@ -22381,10 +22806,10 @@ var DataViewControlController = class extends MDControlController {
 };
 
 // src/controller/control/exp-bar/calendar-exp-bar.controller.ts
-import { RuntimeModelError as RuntimeModelError55 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError56 } from "@ibiz-template/core";
 
 // src/controller/control/exp-bar/exp-bar.controller.ts
-import { RuntimeError as RuntimeError51, RuntimeModelError as RuntimeModelError54 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError51, RuntimeModelError as RuntimeModelError55 } from "@ibiz-template/core";
 var ExpBarControlController = class extends ControlController {
   constructor() {
     super(...arguments);
@@ -22439,7 +22864,7 @@ var ExpBarControlController = class extends ControlController {
   get xDataController() {
     const controller = this.view.getController(this.model.xdataControlName);
     if (!controller) {
-      throw new RuntimeModelError54(
+      throw new RuntimeModelError55(
         this.model,
         "\u65E0\u6CD5\u83B7\u53D6\u591A\u6570\u636E\u90E8\u4EF6[".concat(this.model.xdataControlName, "]\u63A7\u5236\u5668")
       );
@@ -22803,7 +23228,7 @@ var CalendarExpBarController = class extends ExpBarControlController {
   get xDataController() {
     const controller = this.view.getController(this.model.xdataControlName);
     if (!controller) {
-      throw new RuntimeModelError55(
+      throw new RuntimeModelError56(
         this.model,
         "\u65E0\u6CD5\u83B7\u53D6\u591A\u6570\u636E\u90E8\u4EF6[".concat(this.model.xdataControlName, "]\u63A7\u5236\u5668")
       );
@@ -22858,7 +23283,7 @@ var CalendarExpBarController = class extends ExpBarControlController {
 };
 
 // src/controller/control/exp-bar/tree-exp-bar.controller.ts
-import { RuntimeError as RuntimeError52, RuntimeModelError as RuntimeModelError56 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError52, RuntimeModelError as RuntimeModelError57 } from "@ibiz-template/core";
 var TreeExpBarController = class extends ExpBarControlController {
   constructor() {
     super(...arguments);
@@ -22881,7 +23306,7 @@ var TreeExpBarController = class extends ExpBarControlController {
   get xDataController() {
     const controller = this.view.getController(this.model.xdataControlName);
     if (!controller) {
-      throw new RuntimeModelError56(
+      throw new RuntimeModelError57(
         this.model,
         "\u65E0\u6CD5\u83B7\u53D6\u591A\u6570\u636E\u90E8\u4EF6[".concat(this.model.xdataControlName, "]\u63A7\u5236\u5668")
       );
@@ -23142,7 +23567,7 @@ import { RuntimeError as RuntimeError53 } from "@ibiz-template/core";
 
 // src/controller/control/form/form/form.controller.ts
 import {
-  RuntimeModelError as RuntimeModelError57,
+  RuntimeModelError as RuntimeModelError58,
   debounceAndAsyncMerge,
   recursiveIterate as recursiveIterate3,
   EntityError
@@ -23274,12 +23699,12 @@ var FormController = class extends ControlController {
   async initDetailControllers(details = this.model.deformPages, form = this, parent = void 0) {
     await Promise.all(
       details.map(async (detail) => {
-        const detailProvider = await getFormDetailProvider(detail);
+        const detailProvider = await getFormDetailProvider(detail, this.model);
         if (!detailProvider) {
           return;
         }
         if (form.details[detail.id]) {
-          throw new RuntimeModelError57(
+          throw new RuntimeModelError58(
             detail,
             "\u521D\u59CB\u5316\u5F02\u5E38: \u8868\u5355\u6210\u5458[".concat(detail.id, "](").concat(detail.detailType, ")\u5DF2\u5B58\u5728\uFF0C\u8868\u5355\u9879\u6807\u8BC6\u91CD\u590D\u8BF7\u68C0\u67E5\u914D\u7F6E")
           );
@@ -23880,12 +24305,18 @@ var FormDetailState = class {
         return true;
       }
     });
-    let $readonly = false;
+    let $readonly;
     Object.defineProperty(this, "readonly", {
       enumerable: true,
       configurable: true,
       get() {
-        return $readonly;
+        if ($readonly !== void 0) {
+          return $readonly;
+        }
+        if (this.context) {
+          return !!(this.context.srfreadonly === true || this.context.srfreadonly === "true");
+        }
+        return false;
       },
       set(val) {
         $readonly = val;
@@ -23942,6 +24373,7 @@ var FormDetailController = class {
     this.form = form;
     this.parent = parent;
     this.state = this.createState();
+    this.state.context = this.context;
   }
   /**
    * 表单数据
@@ -24024,9 +24456,6 @@ var FormDetailController = class {
         this.model.caption
       );
     }
-    if (this.context.srfreadonly === true || this.context.srfreadonly === "true") {
-      this.state.readonly = true;
-    }
   }
   /**
    * 创建表单状态对象
@@ -24779,15 +25208,15 @@ var FormItemController = class extends FormDetailController {
    * @returns {*}  {Promise<void>}
    */
   async onInit() {
-    var _a;
+    var _a, _b;
     await super.onInit();
     this.state.required = !this.model.allowEmpty;
     const { enableCond } = this.model;
     if (!enableCond) {
       this.state.enableCondDisabled = true;
     }
-    if (this.context.srfreadonly !== true && this.context.srfreadonly !== "true") {
-      this.state.readonly = ((_a = this.model.editor) == null ? void 0 : _a.readOnly) || false;
+    if (this.context.srfreadonly !== true && this.context.srfreadonly !== "true" && ((_a = this.model.editor) == null ? void 0 : _a.readOnly)) {
+      this.state.readonly = ((_b = this.model.editor) == null ? void 0 : _b.readOnly) || false;
     }
     if (this.model.editor && this.model.editor.editorType !== "HIDDEN") {
       this.editorProvider = await getEditorProvider(this.model.editor);
@@ -25134,7 +25563,7 @@ var FormMDCtrlController = class extends FormDetailController {
 import {
   mergeInLeft,
   ModelError as ModelError27,
-  RuntimeModelError as RuntimeModelError58
+  RuntimeModelError as RuntimeModelError59
 } from "@ibiz-template/core";
 var FormMDCtrlMDController = class extends FormMDCtrlController {
   constructor() {
@@ -25160,7 +25589,7 @@ var FormMDCtrlMDController = class extends FormMDCtrlController {
     await super.onInit();
     const { contentControl } = this.model;
     if (!contentControl) {
-      throw new RuntimeModelError58(this.model, "\u591A\u6570\u636E\u90E8\u4EF6\u672A\u914D\u7F6E\u5185\u5BB9\u90E8\u4EF6");
+      throw new RuntimeModelError59(this.model, "\u591A\u6570\u636E\u90E8\u4EF6\u672A\u914D\u7F6E\u5185\u5BB9\u90E8\u4EF6");
     }
     if (contentControl.controlType === "GRID") {
       mergeInLeft(contentControl, {
@@ -25257,7 +25686,7 @@ var FormMDCtrlMDController = class extends FormMDCtrlController {
 };
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.controller.ts
-import { RuntimeError as RuntimeError54, RuntimeModelError as RuntimeModelError59 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError54, RuntimeModelError as RuntimeModelError60 } from "@ibiz-template/core";
 import { createUUID as createUUID11 } from "qx-util";
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.state.ts
@@ -25298,7 +25727,7 @@ var FormMDCtrlFormController = class extends FormMDCtrlController {
     super.onInit();
     const { contentControl } = this.model;
     if (!contentControl) {
-      throw new RuntimeModelError59(this.model, "\u591A\u6570\u636E\u90E8\u4EF6\u672A\u914D\u7F6E\u5185\u5BB9\u90E8\u4EF6");
+      throw new RuntimeModelError60(this.model, "\u591A\u6570\u636E\u90E8\u4EF6\u672A\u914D\u7F6E\u5185\u5BB9\u90E8\u4EF6");
     }
     contentControl.enableAutoSave = this.enableCreate || this.enableUpdate;
     const controlProvider = await getControlProvider(contentControl);
@@ -25700,7 +26129,7 @@ import { clone as clone26, isNil as isNil27 } from "ramda";
 // src/controller/control/form/edit-form/edit-form.service.ts
 import {
   recursiveIterate as recursiveIterate6,
-  RuntimeModelError as RuntimeModelError60
+  RuntimeModelError as RuntimeModelError61
 } from "@ibiz-template/core";
 var EditFormService = class extends FormService {
   /**
@@ -25824,7 +26253,7 @@ var EditFormService = class extends FormService {
     const wizardForm = this.model;
     const methodName = (_a = wizardForm.goBackControlAction) == null ? void 0 : _a.appDEMethodId;
     if (!methodName) {
-      throw new RuntimeModelError60(this.model, "\u7F3A\u5C11\u8FD4\u56DE\u64CD\u4F5C\u5B9E\u4F53\u884C\u4E3A");
+      throw new RuntimeModelError61(this.model, "\u7F3A\u5C11\u8FD4\u56DE\u64CD\u4F5C\u5B9E\u4F53\u884C\u4E3A");
     }
     let res = await this.exec(
       methodName,
@@ -26078,10 +26507,10 @@ var EditFormController = class extends FormController {
     let res;
     try {
       await this.startLoading();
-      await this.evt.emit("onBeforeLoad", void 0);
+      await this.evt.emit("onBeforeLoad", { args: queryParams });
       res = await this.service.get(context, queryParams);
     } catch (error) {
-      await this.evt.emit("onLoadError", void 0);
+      await this.evt.emit("onLoadError", { args: error });
       this.actionNotification("GETERROR", {
         error
       });
@@ -26094,7 +26523,7 @@ var EditFormController = class extends FormController {
     this.state.modified = false;
     this.state.data = res.data;
     this.formStateNotify("LOAD" /* LOAD */);
-    await this.evt.emit("onLoadSuccess", void 0);
+    await this.evt.emit("onLoadSuccess", { args: res.data });
     this.actionNotification("GETSUCCESS");
     this.state.isLoaded = true;
     return this.data;
@@ -26122,10 +26551,10 @@ var EditFormController = class extends FormController {
     let res;
     try {
       await this.startLoading();
-      await this.evt.emit("onBeforeLoad", void 0);
+      await this.evt.emit("onBeforeLoad", { args: queryParams });
       res = await this.service.get(context, queryParams);
     } catch (error) {
-      await this.evt.emit("onLoadError", void 0);
+      await this.evt.emit("onLoadError", { args: error });
       this.actionNotification("GETERROR", {
         error
       });
@@ -26137,7 +26566,7 @@ var EditFormController = class extends FormController {
     this.state.data = res.data;
     this.oldData = this.data.clone();
     this.formStateNotify("LOAD" /* LOAD */);
-    await this.evt.emit("onLoadSuccess", void 0);
+    await this.evt.emit("onLoadSuccess", { args: res.data });
     this.actionNotification("GETSUCCESS");
     this.state.isLoaded = true;
     return this.data;
@@ -26161,15 +26590,15 @@ var EditFormController = class extends FormController {
     if (!silent) {
       await this.startLoading();
     }
-    await this.evt.emit("onBeforeSave", void 0);
     const { context, data } = this.handlerAbilityParams(args);
     const saveData = data[0];
     const isCreate = saveData.srfuf === 0 /* CREATE */;
     let res;
     try {
+      await this.evt.emit("onBeforeSave", { args: saveData });
       res = isCreate ? await this.service.create(context, saveData) : await this.service.update(context, saveData);
     } catch (error) {
-      await this.evt.emit("onSaveError", void 0);
+      await this.evt.emit("onSaveError", { args: error });
       this.actionNotification("".concat(isCreate ? "CREATE" : "UPDATE", "ERROR"), {
         error
       });
@@ -26191,7 +26620,7 @@ var EditFormController = class extends FormController {
       this.data.tempsrfkey = this.data.srfkey;
     }
     this.state.modified = false;
-    await this.evt.emit("onSaveSuccess", void 0);
+    await this.evt.emit("onSaveSuccess", { args: res.data });
     if (!this.view.state.isClosing) {
       this.formStateNotify("SAVE" /* SAVE */);
     }
@@ -26214,7 +26643,7 @@ var EditFormController = class extends FormController {
     const { context, params } = this.handlerAbilityParams(args);
     let res;
     let ok = false;
-    await this.evt.emit("onBeforeRemove", void 0);
+    await this.evt.emit("onBeforeRemove", { args: this.data });
     if (this.data.srfuf === 1 /* UPDATE */) {
       ok = await ibiz.modal.confirm({
         title: "\u63D0\u793A",
@@ -26227,7 +26656,7 @@ var EditFormController = class extends FormController {
       try {
         res = await this.service.remove(context, params);
       } catch (error) {
-        await this.evt.emit("onRemoveError", void 0);
+        await this.evt.emit("onRemoveError", { args: error });
         this.actionNotification("REMOVEERROR", {
           error
         });
@@ -26240,7 +26669,7 @@ var EditFormController = class extends FormController {
     this.emitDEDataChange("remove", this.data);
     this.state.data = new ControlVO();
     this.state.modified = false;
-    await this.evt.emit("onRemoveSuccess", void 0);
+    await this.evt.emit("onRemoveSuccess", { args: this.data });
     this.actionNotification("REMOVESUCCESS");
     return ok;
   }
@@ -26706,6 +27135,28 @@ var GridRowState = class {
         editable: ibiz.config.grid.editShowMode === "all",
         required: false
       };
+      let $readonly;
+      Object.defineProperty(
+        this.editColStates[editColumn.fieldName],
+        "readonly",
+        {
+          enumerable: true,
+          configurable: true,
+          get() {
+            if ($readonly !== void 0) {
+              return $readonly;
+            }
+            if (grid.context) {
+              return !!(grid.context.srfreadonly === true || grid.context.srfreadonly === "true");
+            }
+            return false;
+          },
+          set(val) {
+            $readonly = val;
+            return true;
+          }
+        }
+      );
     });
   }
   getDiffData() {
@@ -26729,13 +27180,13 @@ import {
   mergeDefaultInLeft,
   recursiveIterate as recursiveIterate7,
   RuntimeError as RuntimeError56,
-  RuntimeModelError as RuntimeModelError62
+  RuntimeModelError as RuntimeModelError63
 } from "@ibiz-template/core";
 import { clone as clone27 } from "ramda";
 import dayjs5 from "dayjs";
 
 // src/controller/control/grid/grid/grid.service.ts
-import { RuntimeModelError as RuntimeModelError61 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError62 } from "@ibiz-template/core";
 var GridService = class extends MDControlService {
   /**
    * 初始化属性映射
@@ -26763,7 +27214,7 @@ var GridService = class extends MDControlService {
               dataType: dataItem.dataType
             });
           } else {
-            throw new RuntimeModelError61(
+            throw new RuntimeModelError62(
               column,
               "\u672A\u627E\u5230\u5BF9\u5E94\u7684\u8868\u683C\u6570\u636E\u9879[".concat(deField, "]")
             );
@@ -27158,11 +27609,11 @@ var GridController = class extends MDControlController {
       (item) => item.model.appDEFieldId === groupAppDEFieldId
     );
     if (!this.groupFieldColumn) {
-      throw new RuntimeModelError62(this.model, "\u6CA1\u6709\u914D\u7F6E\u5206\u7EC4\u5C5E\u6027\u7684\u5C5E\u6027\u5217");
+      throw new RuntimeModelError63(this.model, "\u6CA1\u6709\u914D\u7F6E\u5206\u7EC4\u5C5E\u6027\u7684\u5C5E\u6027\u5217");
     }
     const groupFieldName = this.groupFieldColumn.model.id;
     if (!this.groupFieldColumn.model.appCodeListId) {
-      throw new RuntimeModelError62(
+      throw new RuntimeModelError63(
         this.groupFieldColumn.model,
         "\u5206\u7EC4\u5C5E\u6027\u7684\u5C5E\u6027\u5217".concat(groupFieldName, "\u6CA1\u6709\u914D\u7F6E\u4EE3\u7801\u8868")
       );
@@ -27172,7 +27623,7 @@ var GridController = class extends MDControlController {
     );
     if (index !== -1 && index !== 0) {
       if (this.isMultistageHeader) {
-        throw new RuntimeModelError62(
+        throw new RuntimeModelError63(
           this.model,
           "\u8BF7\u5C06\u5206\u7EC4\u5C5E\u6027\u5217".concat(groupFieldName, "\u914D\u7F6E\u4E3A\u7B2C\u4E00\u5217")
         );
@@ -27182,10 +27633,10 @@ var GridController = class extends MDControlController {
     }
     if (groupMode === "CODELIST") {
       if (!groupCodeListId) {
-        throw new RuntimeModelError62(this.model, "\u4EE3\u7801\u8868\u5206\u7EC4\u6A21\u5F0F\u9700\u8981\u914D\u7F6E\u4EE3\u7801\u8868");
+        throw new RuntimeModelError63(this.model, "\u4EE3\u7801\u8868\u5206\u7EC4\u6A21\u5F0F\u9700\u8981\u914D\u7F6E\u4EE3\u7801\u8868");
       }
       if (this.groupFieldColumn.model.appCodeListId !== groupCodeListId) {
-        throw new RuntimeModelError62(
+        throw new RuntimeModelError63(
           this.model,
           "\u5206\u7EC4\u4EE3\u7801\u8868\u4E0E\u5C5E\u6027\u5217".concat(groupFieldName, "\u7684\u4EE3\u7801\u8868\u4E0D\u4E00\u81F4")
         );
@@ -27288,7 +27739,7 @@ var GridController = class extends MDControlController {
       return;
     }
     if (!aggAppDEDataSetId || !aggAppDataEntityId) {
-      throw new RuntimeModelError62(this.model, "\u7F3A\u5C11\u914D\u7F6E\u805A\u5408\u5B9E\u4F53\u6216\u805A\u5408\u6570\u636E\u96C6");
+      throw new RuntimeModelError63(this.model, "\u7F3A\u5C11\u914D\u7F6E\u805A\u5408\u5B9E\u4F53\u6216\u805A\u5408\u6570\u636E\u96C6");
     }
     const params = await this.getFetchParams();
     const app = ibiz.hub.getApp(this.context.srfappid);
@@ -27464,7 +27915,7 @@ var GridController = class extends MDControlController {
    */
   async initColumnsController(column) {
     var _a;
-    const provider = await getGridColumnProvider(column);
+    const provider = await getGridColumnProvider(column, this.model);
     if (!provider) {
       return;
     }
@@ -28387,7 +28838,7 @@ var GridFieldColumnController = class extends GridColumnController {
 };
 
 // src/controller/control/grid/grid-column/grid-ua-column/grid-ua-column.controller.ts
-import { RuntimeModelError as RuntimeModelError63 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError64 } from "@ibiz-template/core";
 var GridUAColumnController = class extends GridColumnController {
   /**
    * 给rowController初始化操作列的状态
@@ -28400,7 +28851,7 @@ var GridUAColumnController = class extends GridColumnController {
     var _a;
     const { deuiactionGroup } = this.model;
     if (!deuiactionGroup) {
-      throw new RuntimeModelError63(this.model, "\u64CD\u4F5C\u5217\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u884C\u4E3A\u7EC4");
+      throw new RuntimeModelError64(this.model, "\u64CD\u4F5C\u5217\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u884C\u4E3A\u7EC4");
     }
     if (!((_a = deuiactionGroup.uiactionGroupDetails) == null ? void 0 : _a.length)) {
       ibiz.log.debug("\u64CD\u4F5C\u5217\u754C\u9762\u884C\u4E3A\u7EC4\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u884C\u4E3A");
@@ -28653,7 +29104,9 @@ var GridFieldEditColumnController = class extends GridFieldColumnController {
   calcColumnReadonly(row) {
     var _a;
     const isReadOnly = !!((_a = this.editItem.editor) == null ? void 0 : _a.readOnly);
-    row.editColStates[this.fieldName].readonly = isReadOnly;
+    if (isReadOnly) {
+      row.editColStates[this.fieldName].readonly = isReadOnly;
+    }
   }
   /**
    * 计算启用项的禁用
@@ -28968,7 +29421,11 @@ var PanelController = class extends ControlController {
     await Promise.all(
       panelItems.map(async (panelItem) => {
         var _a, _b;
-        const panelItemProvider = await getPanelItemProvider(panelItem);
+        const panelItemProvider = await getPanelItemProvider(
+          panelItem,
+          panel.model,
+          panel.view.model
+        );
         if (!panelItemProvider) {
           return;
         }
@@ -29189,8 +29646,8 @@ var PanelItemState = class {
     /**
      * 是否只读
      *
-     * @author zhanghengfeng
-     * @date 2024-03-25 17:03:36
+     * @author tony001
+     * @date 2024-04-16 16:04:49
      * @type {boolean}
      */
     this.readonly = false;
@@ -29225,12 +29682,18 @@ var PanelItemState = class {
         return true;
       }
     });
-    let $readonly = false;
+    let $readonly;
     Object.defineProperty(this, "readonly", {
       enumerable: true,
       configurable: true,
       get() {
-        return $readonly;
+        if ($readonly !== void 0) {
+          return $readonly;
+        }
+        if (this.context) {
+          return !!(this.context.srfreadonly === true || this.context.srfreadonly === "true");
+        }
+        return false;
       },
       set(val) {
         $readonly = val;
@@ -29266,6 +29729,7 @@ var PanelItemController = class {
       required: void 0
     };
     this.state = this.createState();
+    this.state.context = this.panel.context;
   }
   /**
    * 数据父容器
@@ -29337,9 +29801,6 @@ var PanelItemController = class {
     if (labelSysCss == null ? void 0 : labelSysCss.cssName) {
       this.state.class.label.push(labelSysCss.cssName);
     }
-    if (this.panel.context.srfreadonly === true || this.panel.context.srfreadonly === "true") {
-      this.state.readonly = true;
-    }
   }
   destroy() {
   }
@@ -29637,7 +30098,7 @@ import { clone as clone30 } from "ramda";
 import { isString as isString2 } from "lodash-es";
 
 // src/controller/control/search-bar/search-bar-filter.controller.ts
-import { RuntimeModelError as RuntimeModelError64 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError65 } from "@ibiz-template/core";
 
 // src/controller/control/search-bar/util.ts
 var ItemsValueOPs = [
@@ -29718,7 +30179,7 @@ var SearchBarFilterController = class {
   async init() {
     if (!this.noEditor) {
       if (!this.model.editor) {
-        throw new RuntimeModelError64(this.model, "\u7F3A\u5C11\u7F16\u8F91\u5668\u6A21\u578B");
+        throw new RuntimeModelError65(this.model, "\u7F3A\u5C11\u7F16\u8F91\u5668\u6A21\u578B");
       }
       this.editorProvider = await getEditorProvider(this.model.editor);
       if (this.editorProvider) {
@@ -31289,7 +31750,7 @@ var TabExpPanelController = class extends ControlController {
 // src/controller/control/tree/tree.controller.ts
 import {
   RuntimeError as RuntimeError60,
-  RuntimeModelError as RuntimeModelError65,
+  RuntimeModelError as RuntimeModelError66,
   recursiveIterate as recursiveIterate11
 } from "@ibiz-template/core";
 import { isNil as isNil30 } from "ramda";
@@ -32242,7 +32703,7 @@ var TreeController = class extends MDControlController {
     const { sortAppDEFieldId, sortDir, allowOrder } = orderNodeModel;
     if (allowOrder === true) {
       if (!sortAppDEFieldId) {
-        throw new RuntimeModelError65(orderNodeModel, "\u7F3A\u5C11\u914D\u7F6E\u6392\u5E8F\u5C5E\u6027");
+        throw new RuntimeModelError66(orderNodeModel, "\u7F3A\u5C11\u914D\u7F6E\u6392\u5E8F\u5C5E\u6027");
       }
       const sortField = sortAppDEFieldId.toLowerCase();
       const isAsc = sortDir === "ASC";
@@ -32327,7 +32788,7 @@ var TreeController = class extends MDControlController {
   async modifyNodeText(nodeData, text) {
     const model = this.getNodeModel(nodeData._nodeId);
     if (!model.allowEditText) {
-      throw new RuntimeModelError65(model, "\u6811\u8282\u70B9\u6CA1\u6709\u914D\u7F6E\u7F16\u8F91\u6A21\u5F0F\uFF1A\u540D\u79F0");
+      throw new RuntimeModelError66(model, "\u6811\u8282\u70B9\u6CA1\u6709\u914D\u7F6E\u7F16\u8F91\u6A21\u5F0F\uFF1A\u540D\u79F0");
     }
     if (nodeData._nodeType !== "DE") {
       throw new RuntimeError60("\u4E0D\u662F\u5B9E\u4F53\u6811\u8282\u70B9\u6570\u636E");
@@ -32742,7 +33203,7 @@ var WizardPanelController = class extends ControlController {
 };
 
 // src/controller/control/md-ctrl/md-ctrl.controller.ts
-import { RuntimeModelError as RuntimeModelError66 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError67 } from "@ibiz-template/core";
 import { isNil as isNil31 } from "ramda";
 
 // src/controller/control/md-ctrl/md-ctrl.service.ts
@@ -32951,7 +33412,7 @@ var MDCtrlController = class extends MDControlController {
     const { enableGroup, groupMode, groupAppDEFieldId } = this.model;
     if (enableGroup && groupMode) {
       if (!groupAppDEFieldId) {
-        throw new RuntimeModelError66(this.model, "\u5206\u7EC4\u5C5E\u6027\u6CA1\u6709\u914D\u7F6E");
+        throw new RuntimeModelError67(this.model, "\u5206\u7EC4\u5C5E\u6027\u6CA1\u6709\u914D\u7F6E");
       }
       if (groupMode === "AUTO") {
         this.handleAutoGroup();
@@ -33018,7 +33479,7 @@ var MDCtrlController = class extends MDControlController {
   async handleCodeListGroup() {
     const { groupAppDEFieldId, groupCodeListId } = this.model;
     if (!groupCodeListId) {
-      throw new RuntimeModelError66(this.model, "\u5206\u7EC4\u4EE3\u7801\u8868\u6CA1\u6709\u914D\u7F6E");
+      throw new RuntimeModelError67(this.model, "\u5206\u7EC4\u4EE3\u7801\u8868\u6CA1\u6709\u914D\u7F6E");
     }
     const { items } = this.state;
     const groupMap = /* @__PURE__ */ new Map();
@@ -33048,7 +33509,7 @@ var MDCtrlController = class extends MDControlController {
 };
 
 // src/controller/control/kanban/kanban.controller.ts
-import { RuntimeError as RuntimeError62, RuntimeModelError as RuntimeModelError67 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError62, RuntimeModelError as RuntimeModelError68 } from "@ibiz-template/core";
 import { isNil as isNil32 } from "ramda";
 
 // src/controller/control/kanban/kanban.service.ts
@@ -33127,10 +33588,10 @@ var KanbanController = class extends DataViewControlController {
     const sortField = this.model.minorSortAppDEFieldId;
     const { minorSortDir } = this.model;
     if (!sortField) {
-      throw new RuntimeModelError67(this.model, "\u6392\u5E8F\u5C5E\u6027\u6CA1\u914D\u7F6E");
+      throw new RuntimeModelError68(this.model, "\u6392\u5E8F\u5C5E\u6027\u6CA1\u914D\u7F6E");
     }
     if (!minorSortDir) {
-      throw new RuntimeModelError67(this.model, "\u6392\u5E8F\u65B9\u5411\u6CA1\u914D\u7F6E");
+      throw new RuntimeModelError68(this.model, "\u6392\u5E8F\u65B9\u5411\u6CA1\u914D\u7F6E");
     }
     const isAsc = minorSortDir === "ASC";
     items.forEach((item) => {
@@ -33310,7 +33771,7 @@ var KanbanController = class extends DataViewControlController {
   async handleCodeListGroup() {
     const { groupAppDEFieldId, groupCodeListId } = this.model;
     if (!groupCodeListId) {
-      throw new RuntimeModelError67(this.model, "\u5206\u7EC4\u4EE3\u7801\u8868\u6CA1\u6709\u914D\u7F6E");
+      throw new RuntimeModelError68(this.model, "\u5206\u7EC4\u4EE3\u7801\u8868\u6CA1\u6709\u914D\u7F6E");
     }
     const { items } = this.state;
     const groupMap = /* @__PURE__ */ new Map();
@@ -33606,7 +34067,7 @@ var KanbanController = class extends DataViewControlController {
 // src/controller/control/tree-grid-ex/tree-grid-ex.controller.ts
 import {
   RuntimeError as RuntimeError63,
-  RuntimeModelError as RuntimeModelError68,
+  RuntimeModelError as RuntimeModelError69,
   awaitTimeout as awaitTimeout3,
   recursiveIterate as recursiveIterate12
 } from "@ibiz-template/core";
@@ -33886,7 +34347,7 @@ var TreeGridExController = class extends TreeController {
       throw new RuntimeError63("\u6682\u4E0D\u652F\u6301\u65B0\u5EFA");
     }
     if (!updateAppDEActionId) {
-      throw new RuntimeModelError68(nodeModel, "\u6811\u8282\u70B9\u6CA1\u6709\u914D\u7F6E\u66F4\u65B0\u5B9E\u4F53\u884C\u4E3A");
+      throw new RuntimeModelError69(nodeModel, "\u6811\u8282\u70B9\u6CA1\u6709\u914D\u7F6E\u66F4\u65B0\u5B9E\u4F53\u884C\u4E3A");
     }
     const deName = calcDeCodeNameById(appDataEntityId);
     const tempContext = this.context.clone();
@@ -34157,7 +34618,7 @@ var TreeGridExColumnController = class {
 import {
   DataTypes as DataTypes5,
   RuntimeError as RuntimeError64,
-  RuntimeModelError as RuntimeModelError69
+  RuntimeModelError as RuntimeModelError70
 } from "@ibiz-template/core";
 import { clone as clone32 } from "ramda";
 import dayjs7 from "dayjs";
@@ -34188,7 +34649,7 @@ var TreeGridExNodeColumnController = class {
       }
     );
     if (!nodeColumn || !nodeDataItem) {
-      throw new RuntimeModelError69(
+      throw new RuntimeModelError70(
         nodeModel,
         "\u8282\u70B9\u6CA1\u6709\u914D\u7F6E\u5BF9\u5E94\u8868\u683C\u5217".concat(this.fieldColumn.name, "\u7684\u6570\u636E\u9879")
       );
@@ -34202,7 +34663,7 @@ var TreeGridExNodeColumnController = class {
         }
       );
       if (!nodeEditItem) {
-        throw new RuntimeModelError69(
+        throw new RuntimeModelError70(
           nodeModel,
           "\u6CA1\u6709\u627E\u5230\u5BF9\u5E94\u8868\u683C\u5217".concat(this.fieldColumn.name, "\u7684\u7F16\u8F91\u9879\u6A21\u578B")
         );
@@ -34702,7 +35163,7 @@ var TreeGridExUAColumnController = class extends TreeGridExColumnController {
 };
 
 // src/controller/control/tree-grid/tree-grid.controller.ts
-import { RuntimeModelError as RuntimeModelError70 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError71 } from "@ibiz-template/core";
 var TreeGridController = class extends GridController {
   constructor() {
     super(...arguments);
@@ -34747,10 +35208,10 @@ var TreeGridController = class extends GridController {
       return item.treeColumnMode === 2 || item.treeColumnMode === 3;
     });
     if (!treeGridParent) {
-      throw new RuntimeModelError70(this.model, "\u6811\u8868\u683C\u65E0\u503C\u5217\u6A21\u5F0F");
+      throw new RuntimeModelError71(this.model, "\u6811\u8868\u683C\u65E0\u503C\u5217\u6A21\u5F0F");
     }
     if (!treeGridValue) {
-      throw new RuntimeModelError70(this.model, "\u6811\u8868\u683C\u65E0\u7236\u503C\u5217\u6A21\u5F0F");
+      throw new RuntimeModelError71(this.model, "\u6811\u8868\u683C\u65E0\u7236\u503C\u5217\u6A21\u5F0F");
     }
     this.treeGridValueField = treeGridValue.appDEFieldId.toLowerCase();
     this.treeGridParentField = treeGridParent.appDEFieldId.toLowerCase();
@@ -35497,7 +35958,7 @@ var ReportPanelController = class extends ControlController {
 import {
   awaitTimeout as awaitTimeout4,
   RuntimeError as RuntimeError66,
-  RuntimeModelError as RuntimeModelError71
+  RuntimeModelError as RuntimeModelError72
 } from "@ibiz-template/core";
 
 // src/controller/control/gantt/gantt.service.ts
@@ -35894,7 +36355,7 @@ var GanttController = class extends TreeGridExController {
       }
     ));
     if (result === -1) {
-      throw new RuntimeModelError71(
+      throw new RuntimeModelError72(
         nodeModel,
         "\u7F3A\u5C11".concat(nodeModel.id.toLowerCase(), "_opendata\u7684\u89C6\u56FE\u903B\u8F91")
       );
@@ -37248,7 +37709,7 @@ var ViewEngineBase = class {
 };
 
 // src/engine/md-view.engine.ts
-import { RuntimeModelError as RuntimeModelError72 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError73 } from "@ibiz-template/core";
 import { clone as clone34 } from "ramda";
 var MDViewEngine = class extends ViewEngineBase {
   /**
@@ -37505,7 +37966,7 @@ var MDViewEngine = class extends ViewEngineBase {
       view: this.view
     }));
     if (result === -1) {
-      throw new RuntimeModelError72(this.view.model, "\u7F3A\u5C11opendata\u7684\u89C6\u56FE\u903B\u8F91");
+      throw new RuntimeModelError73(this.view.model, "\u7F3A\u5C11opendata\u7684\u89C6\u56FE\u903B\u8F91");
     } else {
       return {
         cancel: !result.ok
@@ -37528,7 +37989,7 @@ var MDViewEngine = class extends ViewEngineBase {
       (item) => item.id === "newdata"
     );
     if (!openAppViewLogic) {
-      throw new RuntimeModelError72(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
+      throw new RuntimeModelError73(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
     }
     const params = clone34(this.view.params);
     if (copyMode) {
@@ -37542,7 +38003,7 @@ var MDViewEngine = class extends ViewEngineBase {
       view: this.view
     }));
     if (result === -1) {
-      throw new RuntimeModelError72(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
+      throw new RuntimeModelError73(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
     } else {
       return {
         cancel: !result.ok
@@ -37965,13 +38426,13 @@ var ScriptExecutor = class extends LogicExecutor {
 };
 
 // src/logic-scheduler/executor/app-de-ui-logic-executor.ts
-import { RuntimeModelError as RuntimeModelError73 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError74 } from "@ibiz-template/core";
 var AppDEUILogicExecutor = class extends LogicExecutor {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   execute(executeParams) {
     const { appDEUILogicId, appDataEntityId } = this.logic;
     if (!appDEUILogicId) {
-      throw new RuntimeModelError73(this.logic, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
+      throw new RuntimeModelError74(this.logic, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
     }
     return execUILogic(appDEUILogicId, appDataEntityId, executeParams);
   }
@@ -38430,7 +38891,7 @@ var ItemDynaLogicTrigger = class extends LogicTrigger {
 };
 
 // src/logic-scheduler/trigger/timer-trigger.ts
-import { RuntimeError as RuntimeError73, RuntimeModelError as RuntimeModelError74 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError73, RuntimeModelError as RuntimeModelError75 } from "@ibiz-template/core";
 var TimerTrigger = class extends LogicTrigger {
   constructor() {
     super(...arguments);
@@ -38438,7 +38899,7 @@ var TimerTrigger = class extends LogicTrigger {
   }
   start() {
     if (!this.logic.timer) {
-      throw new RuntimeModelError74(this.logic, "\u5B9A\u65F6\u5668\u7F3A\u5C11\u5B9A\u65F6\u95F4\u9694");
+      throw new RuntimeModelError75(this.logic, "\u5B9A\u65F6\u5668\u7F3A\u5C11\u5B9A\u65F6\u95F4\u9694");
     }
     this.timer = setInterval(() => {
       if (!this.scheduler.defaultParamsCb) {
@@ -38460,7 +38921,7 @@ var TimerTrigger = class extends LogicTrigger {
 import {
   ModelError as ModelError34,
   RuntimeError as RuntimeError74,
-  RuntimeModelError as RuntimeModelError75
+  RuntimeModelError as RuntimeModelError76
 } from "@ibiz-template/core";
 import { notNilEmpty as notNilEmpty10 } from "qx-util";
 var AppUILogicExecutor = class extends LogicExecutor {
@@ -38506,7 +38967,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     } else {
       openViewRef = appUILogic.openDataAppView;
       if (!openViewRef) {
-        throw new RuntimeModelError75(
+        throw new RuntimeModelError76(
           appUILogic,
           "opendata\u89C6\u56FE\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u9ED8\u8BA4\u6253\u5F00\u89C6\u56FE"
         );
@@ -38514,7 +38975,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     }
     const openView = openViewRef.refAppViewId;
     if (!openView) {
-      throw new RuntimeModelError75(
+      throw new RuntimeModelError76(
         appUILogic,
         "opendata\u89C6\u56FE\u903B\u8F91\u7684\u9ED8\u8BA4\u6253\u5F00\u89C6\u56FE\u6CA1\u6709\u5B9E\u9645\u5F15\u7528\u89C6\u56FE"
       );
@@ -38544,7 +39005,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     );
     const typeFileName = appDataEntity.formTypeAppDEFieldId || appDataEntity.dataTypeAppDEFieldId;
     if (!typeFileName) {
-      throw new RuntimeModelError75(
+      throw new RuntimeModelError76(
         appUILogic,
         "".concat(appDataEntity.codeName, "[\u591A\u8868\u5355\u5B9E\u4F53] or [\u7D22\u5F15\u5B9E\u4F53]\u7F3A\u5C11\u7C7B\u578B\u5C5E\u6027\u914D\u7F6E")
       );
@@ -38552,7 +39013,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const { data } = parameters;
     const formTypeValue = data[0][typeFileName];
     if (!formTypeValue) {
-      throw new RuntimeModelError75(appUILogic, "\u6570\u636E\u6E90\u65E0\u8868\u5355\u7C7B\u578B\u5E94\u7528\u5B9E\u4F53\u5C5E\u6027\u503C");
+      throw new RuntimeModelError76(appUILogic, "\u6570\u636E\u6E90\u65E0\u8868\u5355\u7C7B\u578B\u5E94\u7528\u5B9E\u4F53\u5C5E\u6027\u503C");
     }
     const openViewRefs = appUILogic.openDataAppViews;
     const findView = openViewRefs == null ? void 0 : openViewRefs.find((item) => item.refMode === formTypeValue);
@@ -38594,7 +39055,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
         return viewRef.refMode.toLowerCase() !== parentDeName;
       });
       if (!newViewRef) {
-        throw new RuntimeModelError75(
+        throw new RuntimeModelError76(
           appUILogic,
           "\u6CA1\u6709\u627E\u5230\u6279\u6DFB\u52A0\u9700\u8981\u6253\u5F00\u7684\u9009\u62E9\u89C6\u56FE"
         );
@@ -38604,7 +39065,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     } else {
       newViewRef = newDataAppView;
       if (!newViewRef || !newViewRef.refAppViewId) {
-        throw new RuntimeModelError75(
+        throw new RuntimeModelError76(
           appUILogic,
           "newdata\u89C6\u56FE\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u9ED8\u8BA4\u65B0\u5EFA\u6570\u636E\u89C6\u56FE"
         );
@@ -38668,7 +39129,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const { wizardAppView, newDataAppViews } = appUILogic;
     const { context, params, ...rest } = parameters;
     if (!wizardAppView || !wizardAppView.refAppViewId) {
-      throw new RuntimeModelError75(appUILogic, "\u7F3A\u5C11\u9ED8\u8BA4\u7D22\u5F15\u5B9E\u4F53\u9009\u62E9\u89C6\u56FE");
+      throw new RuntimeModelError76(appUILogic, "\u7F3A\u5C11\u9ED8\u8BA4\u7D22\u5F15\u5B9E\u4F53\u9009\u62E9\u89C6\u56FE");
     }
     const result = await ibiz.commands.execute(
       OpenAppViewCommand.TAG,
@@ -38719,7 +39180,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
       const minorDERs = selfDe.minorAppDERSs;
       const pickParentDeName = newViewRef.refMode.toLowerCase();
       if (!minorDERs) {
-        throw new RuntimeModelError75(selfDe, "\u5B9E\u4F53\u6CA1\u6709\u4ECE\u5173\u7CFB\u96C6\u5408\uFF01");
+        throw new RuntimeModelError76(selfDe, "\u5B9E\u4F53\u6CA1\u6709\u4ECE\u5173\u7CFB\u96C6\u5408\uFF01");
       }
       let pickParentFieldName = "";
       minorDERs == null ? void 0 : minorDERs.forEach((item) => {
@@ -38816,12 +39277,12 @@ var ControlEventTrigger = class extends LogicTrigger {
 };
 
 // src/logic-scheduler/executor/app-ui-action-executor.ts
-import { RuntimeModelError as RuntimeModelError76 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError77 } from "@ibiz-template/core";
 var AppDEUIActionExecutor = class extends LogicExecutor {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   execute(executeParams) {
     if (!this.logic.appDEUIActionId) {
-      throw new RuntimeModelError76(
+      throw new RuntimeModelError77(
         this.logic,
         "\u903B\u8F91\u4E2D\u7F3A\u5C11\u89E6\u53D1\u5E94\u7528\u5B9E\u4F53\u754C\u9762\u884C\u4E3Aid"
       );
@@ -39014,6 +39475,7 @@ export {
   AppDECounter,
   AppDECounterProvider,
   AppDataEntity,
+  AppDataUploadViewController,
   AppFuncCommand,
   AppMenuController,
   AppMenuIconViewController,
@@ -39237,12 +39699,14 @@ export {
   WizardPanelService,
   WorkFlowService,
   asyncImportData,
+  asyncImportData2,
   calcContentAlignStyle,
   calcDeCodeNameById,
   calcDynaClass,
   calcDynaSysParams,
   calcFilterModelBySchema,
   calcGridLayoutPos,
+  calcImportSchemaData,
   calcLayoutHeightWidth,
   calcMainStateOPPrivsStrs,
   calcNavParams,
@@ -39255,12 +39719,16 @@ export {
   convertNavData,
   convertNavDataByArray,
   convertObjectToNavParams,
+  createImportSchema,
+  deleteImportSchema,
+  downloadImportTemplate,
   execDELogic,
   execDELogicAction,
   execDELogicById,
   execFieldLogics,
   execUILogic,
   exportData,
+  fetchImportSchemas,
   fieldValueToBoolean,
   filterFieldLogics,
   filterNode2SearchCond,
@@ -39288,13 +39756,16 @@ export {
   getCtrlTeleportParams,
   getDEMethodProvider,
   getDERedirectToView,
+  getDataImportModels,
   getDeACMode,
+  getDefaultDataImport,
   getDefaultValue,
   getEditorProvider,
   getEntitySchema,
   getErrorViewProvider,
   getFormDetailProvider,
   getGridColumnProvider,
+  getImportSchema,
   getInternalMessageProvider,
   getMatchResPath,
   getOriginData,
@@ -39320,6 +39791,7 @@ export {
   hasDeCodeName,
   hasSubRoute,
   importData,
+  importData2,
   install2 as install,
   installCommand,
   isDataContainer,
@@ -39328,6 +39800,7 @@ export {
   isSimpleItems,
   isValueChange,
   matchMainState,
+  openDataImport,
   openRedirectView,
   parseSubFieldInfo,
   parseUserParams,
@@ -39352,9 +39825,11 @@ export {
   registerUIActionProvider,
   registerUILogicNodeProvider,
   registerViewProvider,
+  selectAndImport,
   strContain,
   testCond,
   toLocalOpenWFRedirectView,
+  updateImportSchema,
   validateFilterNodes,
   verifyDeRules,
   verifyFormGroupLogic,