@ibiz-template/runtime 0.1.12-dev.0 → 0.1.12

package/dist/index.esm.js

@@ -1357,6 +1357,9 @@ var ScriptFunction = class {
           openView: ibiz.openView
         };
         break;
+      case "viewParam":
+        param.viewParam = param.params;
+        break;
       case "env":
         param.env = ibiz.env;
         break;
@@ -3818,7 +3821,7 @@ var DynamicCodeListCache = class {
     const app = ibiz.hub.getApp(context.srfappid);
     if (this.isPredefined) {
       if (!params.size) {
-        params.size = 1e4;
+        params = { ...params, size: 1e4 };
       }
       const res2 = await app.net.get(
         "/dictionaries/codelist/".concat(this.codeList.codeName),
@@ -4508,10 +4511,7 @@ var CodeListService = class {
       var _a;
       let text = codeItem.text;
       if (codeItem.textLanguageRes) {
-        text = ibiz.i18n.t(
-          codeItem.textLanguageRes.lanResTag,
-          codeItem.textLanguageRes.defaultContent
-        );
+        text = ibiz.i18n.t(codeItem.textLanguageRes.lanResTag, codeItem.text);
       }
       const _codeItem = {
         text,
@@ -9751,6 +9751,9 @@ var MDControlController = class extends ControlController {
       await this._evt.emit("onLoadSuccess", {
         isInitialLoad
       });
+    } catch (error) {
+      await this._evt.emit("onLoadError", void 0);
+      throw error;
     } finally {
       await this.endLoading();
     }
@@ -9797,6 +9800,7 @@ var MDControlController = class extends ControlController {
         return;
       }
     }
+    await this._evt.emit("onBeforeRemove", void 0);
     await this.startLoading();
     let needRefresh = false;
     try {
@@ -9820,6 +9824,9 @@ var MDControlController = class extends ControlController {
       if (needRefresh) {
         this.refresh();
       }
+    } catch (error) {
+      await this._evt.emit("onRemoveError", void 0);
+      throw error;
     } finally {
       await this.endLoading();
     }
@@ -9953,7 +9960,7 @@ var AppMenuController = class extends ControlController {
    * @param {string} id
    * @return {*}  {Promise<void>}
    */
-  async onClickMenuItem(id, event) {
+  async onClickMenuItem(id, event, useDepth = true) {
     const menuItem = findRecursiveChild(this.model, id, {
       compareField: "id",
       childrenFields: ["appMenuItems"]
@@ -9969,7 +9976,7 @@ var AppMenuController = class extends ControlController {
       throw new RuntimeModelError21(menuItem, "\u6CA1\u6709\u914D\u7F6E\u5E94\u7528\u529F\u80FD");
     }
     const tempContext = this.context.clone();
-    if (this.routeDepth) {
+    if (this.routeDepth && useDepth) {
       Object.assign(tempContext, {
         toRouteDepth: this.routeDepth + 1
       });
@@ -11117,9 +11124,13 @@ var ChartOptionsGenerator2 = class {
     return titleOption;
   }
   calcLegendOption(chartLegend) {
+    var _a;
     const { showLegend, legendPos } = chartLegend;
     const legendOption = {};
     legendOption.show = showLegend;
+    if (((_a = this.model.dechartSerieses) == null ? void 0 : _a.length) === 1) {
+      legendOption.show = false;
+    }
     const position = legendPos == null ? void 0 : legendPos.toLowerCase();
     if (position === "left" || position === "right") {
       legendOption.left = position;
@@ -11390,7 +11401,7 @@ var CaptionBarController = class extends ControlController {
     if (this.view.model.capLanguageRes) {
       this.state.caption = ibiz.i18n.t(
         this.view.model.capLanguageRes.lanResTag,
-        this.view.model.capLanguageRes.defaultContent || this.view.model.caption
+        this.view.model.caption
       );
     } else {
       this.state.caption = this.view.model.caption;
@@ -12277,7 +12288,7 @@ var UIActionUtil = class {
     var _a, _b;
     const result = await this.exec(actionId, params);
     if (result.closeView) {
-      params.view.closeView();
+      params.view.closeView({ ok: true });
     } else if (result.refresh) {
       switch (result.refreshMode) {
         case 1:
@@ -13490,8 +13501,34 @@ var ExpBarControlController = class extends ControlController {
    * @memberof ExpBarControlController
    */
   async onCreated() {
+    var _a;
     await super.onCreated();
     this.childNames.push(this.model.xdataControlName);
+    const appDataEntity = await ibiz.hub.getAppDataEntity(
+      this.model.appDataEntityId,
+      this.context.srfappid
+    );
+    if (appDataEntity) {
+      const searchFields = (_a = appDataEntity.appDEFields) == null ? void 0 : _a.filter((field) => {
+        return field.enableQuickSearch;
+      });
+      const placeHolders = [];
+      searchFields == null ? void 0 : searchFields.forEach((searchField) => {
+        if ((searchField == null ? void 0 : searchField.lnlanguageRes) && searchField.lnlanguageRes.lanResTag) {
+          placeHolders.push(
+            ibiz.i18n.t(
+              searchField.lnlanguageRes.lanResTag,
+              searchField.logicName
+            )
+          );
+        } else if (searchField == null ? void 0 : searchField.logicName) {
+          placeHolders.push(searchField.logicName);
+        }
+      });
+      if (placeHolders.length > 0) {
+        this.state.placeHolder = placeHolders.join("\u3001");
+      }
+    }
   }
   /**
    * 组件挂载
@@ -14103,8 +14140,8 @@ var SearchFormService = class extends ControlService {
    * @param {IParams} [params={}] 视图参数
    * @returns {*}  {Promise<IHttpResponse>}
    */
-  async getDraft(_context, _params = {}) {
-    let res = { ok: true, status: 200, data: {} };
+  async getDraft(_context, params = {}) {
+    let res = { ok: true, status: 200, data: { ...params } };
     res = this.handleResponse(res);
     return res;
   }
@@ -14164,6 +14201,7 @@ var SearchFormController = class extends FormController {
     const queryParams = { ...this.params };
     const params = await this.getDraftParams();
     Object.assign(queryParams, params);
+    await this.evt.emit("onBeforeLoadDraft", { params: queryParams });
     const res = await this.service.getDraft(this.context, queryParams);
     this.state.data = res.data;
     mergeDefaultInLeft(this.data, params);
@@ -15681,6 +15719,34 @@ var EditFormController = class extends FormController {
       trailing: true
     });
   }
+  /**
+   * 加载草稿行为
+   * @author lxm
+   * @date 2023-08-25 02:45:11
+   * @return {*}  {Promise<IData>}
+   */
+  async loadDraft() {
+    const queryParams = { ...this.params };
+    const params = await this.getDraftParams();
+    Object.assign(queryParams, params);
+    let res;
+    try {
+      await this.startLoading();
+      await this.evt.emit("onBeforeLoadDraft", { params: queryParams });
+      res = await this.service.getDraft(this.context, queryParams);
+    } catch (error) {
+      await this.evt.emit("onLoadDraftError", void 0);
+      throw error;
+    } finally {
+      await this.endLoading();
+    }
+    mergeInLeft(this.data, res.data);
+    mergeDefaultInLeft2(this.data, params);
+    this.formStateNotify("DRAFT" /* DRAFT */);
+    await this.evt.emit("onLoadDraftSuccess", void 0);
+    this.state.isLoaded = true;
+    return this.data;
+  }
   /**
    * 部件加载数据行为
    *
@@ -15692,34 +15758,25 @@ var EditFormController = class extends FormController {
       this.context,
       this.model.appDataEntityId
     );
-    const queryParams = { ...this.params };
-    let params = {};
     if (isLoadDraft) {
-      params = await this.getDraftParams();
-      Object.assign(queryParams, params);
+      return this.loadDraft();
     }
-    await this.startLoading();
+    const queryParams = { ...this.params };
     let res;
     try {
-      res = isLoadDraft ? await this.service.getDraft(this.context, queryParams) : await this.service.get(this.context, queryParams);
+      await this.startLoading();
+      await this.evt.emit("onBeforeLoad", void 0);
+      res = await this.service.get(this.context, queryParams);
+    } catch (error) {
+      await this.evt.emit("onLoadError", void 0);
+      throw error;
     } finally {
       await this.endLoading();
     }
-    if (isLoadDraft) {
-      mergeInLeft(this.data, res.data);
-    } else {
-      this.state.data = res.data;
-    }
     this.state.modified = false;
     this.state.data = res.data;
-    mergeDefaultInLeft2(this.data, params);
-    this.formStateNotify(
-      isLoadDraft ? "DRAFT" /* DRAFT */ : "LOAD" /* LOAD */
-    );
-    await this.evt.emit(
-      isLoadDraft ? "onLoadDraftSuccess" : "onLoadSuccess",
-      void 0
-    );
+    this.formStateNotify("LOAD" /* LOAD */);
+    await this.evt.emit("onLoadSuccess", void 0);
     this.state.isLoaded = true;
     return this.data;
   }
@@ -15739,9 +15796,13 @@ var EditFormController = class extends FormController {
       throw new RuntimeError37("\u8BF7\u68C0\u67E5\u8868\u5355\u586B\u5199\uFF01");
     }
     await this.startLoading();
+    await this.evt.emit("onBeforeSave", void 0);
     let res;
     try {
       res = this.data.srfuf === 0 /* CREATE */ ? await this.service.create(this.context, this.data) : await this.service.update(this.context, this.data);
+    } catch (error) {
+      await this.evt.emit("onSaveError", void 0);
+      throw error;
     } finally {
       await this.endLoading();
     }
@@ -15764,6 +15825,7 @@ var EditFormController = class extends FormController {
   async remove() {
     let res;
     let ok = false;
+    await this.evt.emit("onBeforeRemove", void 0);
     if (this.data.srfuf === 1 /* UPDATE */) {
       ok = await ibiz.modal.confirm({
         title: "\u63D0\u793A",
@@ -15775,6 +15837,9 @@ var EditFormController = class extends FormController {
       await this.startLoading();
       try {
         res = await this.service.remove(this.context, this.params);
+      } catch (error) {
+        await this.evt.emit("onRemoveError", void 0);
+        throw error;
       } finally {
         await this.endLoading();
       }
@@ -16324,233 +16389,11 @@ var FormMDCtrlListController = class extends FormMDCtrlControlController {
   }
 };
 
-// src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/form-mdctrl-repeater-form/form-mdctrl-repeater-form-item.controller.ts
-var FormMDCtrlItemController = class extends EditFormController {
-  constructor(model, context, params, ctx, data) {
-    super(model, context, params, ctx);
-    this.state.data = data;
-    this.state.isSimple = true;
-  }
-  async onInit() {
-    await this.initDetailControllers(
-      this.model.deformDetails
-    );
-  }
-};
-
-// src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/form-mdctrl-repeater-form-one/form-mdctrl-repeater-form-one.controller.ts
-var FormMDCtrlRepeaterFormOneController = class extends FormMDCtrlContentTypeController {
-  constructor() {
-    super(...arguments);
-    /**
-     * 表单项控制器的集合（二维数组）
-     *
-     * @author zk
-     * @date 2023-07-25 05:07:56
-     * @type {Array<Array<FormItemController>>}
-     * @memberof FormMDCtrlController
-     */
-    this.formDetail = [];
-    this.state = { isInit: false };
-  }
-  /**
-   * 数据
-   *
-   * @author zk
-   * @date 2023-07-31 09:07:25
-   * @readonly
-   * @type {IData[]}
-   * @memberof FormMDCtrlRepeaterFormOneController
-   */
-  get data() {
-    return this.parent.state.contentCtrlData;
-  }
-  /**
-   * 初始化表单成员控制器
-   *
-   * @author lxm
-   * @date 2022-08-24 21:08:48
-   * @protected
-   */
-  async initFormMDCtrlItemControllers(details, form = this.parent.form, data = {}, parent = void 0) {
-    const formData = data;
-    const formController = new FormMDCtrlItemController(
-      this.model,
-      this.parent.form.context,
-      this.parent.form.params,
-      this.formCtx,
-      formData
-    );
-    await formController.onInit();
-    formController.evt.on("onFormDataChange", (arg) => {
-      if (arg.data.length > 0) {
-        this.onDataItemChange(arg.data[0]);
-      }
-    });
-    formController.state.isLoaded = true;
-    await Promise.all(
-      details.map(async (detail) => {
-        const detailProvider = await getFormDetailProvider(detail);
-        if (!detailProvider) {
-          return;
-        }
-        form.providers[detail.id] = detailProvider;
-        const detailController = await detailProvider.createController(
-          detail,
-          formController,
-          parent
-        );
-        if (!this.formDetail) {
-          this.formDetail = [];
-        }
-        this.formDetail.push({
-          name: detail.id,
-          detailType: detail.detailType,
-          c: detailController
-        });
-        const childDetails = findChildFormDetails(detail);
-        if (childDetails.length) {
-          await this.initFormMDCtrlItemControllers(
-            childDetails,
-            formController,
-            data,
-            detailController
-          );
-        }
-      })
-    );
-    return data;
-  }
-  /**
-   * 初始化formCtx
-   *
-   * @author zk
-   * @date 2023-07-29 05:07:21
-   * @memberof FormMDCtrlRepeaterFormController
-   */
-  useFormMdCtrlCtx() {
-  }
-  async initData() {
-    super.initData();
-    await this.initFormMDCtrlItemControllers(
-      this.model.deformDetails,
-      this.parent.form,
-      this.data
-    );
-    this.state.isInit = true;
-  }
-  /**
-   * 内部表单项数据发生改变，同步contentCtrlData并设置外部表单值
-   *
-   * @author zk
-   * @date 2023-07-30 05:07:11
-   * @param {IData} data
-   * @param {number} index
-   * @memberof FormMDCtrlController
-   */
-  onDataItemChange(data) {
-    this.parent.state.contentCtrlData = data;
-    this.parent.setFormDataValue();
-  }
-  /**
-   * 表单值校验
-   *
-   * @author zzq
-   * @date 2023-08-23 19:07:11
-   * @memberof FormMDCtrlController
-   */
-  async validate() {
-    const values = [];
-    this.formDetail.forEach((detail) => {
-      if (detail.detailType === "FORMITEM") {
-        const c = detail.c;
-        values.push(c.validate());
-      }
-    });
-    const results = await Promise.all(values);
-    return results.findIndex((value) => !value) === -1;
-  }
-};
-
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/form-mdctrl-repeater-form/form-mdctrl-repeater-form.controller.ts
 var FormMDCtrlRepeaterFormController = class extends FormMDCtrlContentTypeController {
   constructor() {
     super(...arguments);
-    /**
-     * 表单项控制器的集合（二维数组）
-     *
-     * @author zk
-     * @date 2023-07-25 05:07:56
-     * @type {Array<Array<FormItemController>>}
-     * @memberof FormMDCtrlController
-     */
-    this.formDetails = [];
-    /**
-     * uiState
-     *
-     * @author zk
-     * @date 2023-07-31 12:07:07
-     * @type {{ isInit: boolean }}
-     * @memberof FormMDCtrlRepeaterFormController
-     */
-    this.state = { isInit: false };
-  }
-  /**
-   * 初始化表单成员控制器
-   *
-   * @author lxm
-   * @date 2022-08-24 21:08:48
-   * @protected
-   */
-  async initFormMDCtrlItemControllers(details, index, form = this.parent.form, data = {}, parent = void 0) {
-    const formData = data;
-    const formController = new FormMDCtrlItemController(
-      this.model,
-      this.parent.form.context,
-      this.parent.form.params,
-      this.formCtx,
-      formData
-    );
-    await formController.onInit();
-    formController.evt.on("onFormDataChange", (arg) => {
-      if (arg.data.length > 0) {
-        this.onDataItemChange(arg.data[0], index);
-      }
-    });
-    formController.state.isLoaded = true;
-    await Promise.all(
-      details.map(async (detail) => {
-        const detailProvider = await getFormDetailProvider(detail);
-        if (!detailProvider) {
-          return;
-        }
-        form.providers[detail.id] = detailProvider;
-        const detailController = await detailProvider.createController(
-          detail,
-          formController,
-          parent
-        );
-        if (!this.formDetails[index]) {
-          this.formDetails[index] = [];
-        }
-        this.formDetails[index].push({
-          name: detail.id,
-          detailType: detail.detailType,
-          c: detailController
-        });
-        const childDetails = findChildFormDetails(detail);
-        if (childDetails.length) {
-          await this.initFormMDCtrlItemControllers(
-            childDetails,
-            index,
-            formController,
-            data,
-            detailController
-          );
-        }
-      })
-    );
-    return data;
+    this.formControllerArray = [];
   }
   /**
    * 数据插入
@@ -16560,10 +16403,7 @@ var FormMDCtrlRepeaterFormController = class extends FormMDCtrlContentTypeContro
    * @memberof FormMDCtrlRepeaterFormController
    */
   async onDataInsert() {
-    const data = await this.initFormMDCtrlItemControllers(
-      this.model.deformDetails,
-      this.data.length
-    );
+    const data = {};
     super.onDataInsert(data);
   }
   /**
@@ -16579,57 +16419,54 @@ var FormMDCtrlRepeaterFormController = class extends FormMDCtrlContentTypeContro
       return;
     }
     super.onDataRemove(index);
-    this.formDetails.splice(index, 1);
   }
   /**
-   * 初始化formCtx
+   * 表单项值规则校验
    *
-   * @author zk
-   * @date 2023-07-29 05:07:21
+   * @author zzq
+   * @date 2023-08-23 17:21:37
    * @memberof FormMDCtrlRepeaterFormController
    */
-  useFormMdCtrlCtx() {
+  async validate() {
+    const values = this.formControllerArray.map(
+      (c) => {
+        return c.validate();
+      }
+    );
+    const results = await Promise.all(values);
+    return results.findIndex((value) => !value) === -1;
   }
+  setFromController(c) {
+    this.formControllerArray.push(c);
+  }
+};
+
+// src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/form-mdctrl-repeater-form-one/form-mdctrl-repeater-form-one.controller.ts
+var FormMDCtrlRepeaterFormOneController = class extends FormMDCtrlRepeaterFormController {
   /**
-   * 初始化数据
+   * 数据
    *
    * @author zk
-   * @date 2023-07-31 12:07:37
-   * @memberof FormMDCtrlRepeaterFormController
+   * @date 2023-07-31 09:07:25
+   * @readonly
+   * @type {IData[]}
+   * @memberof FormMDCtrlRepeaterFormOneController
    */
-  async initData() {
-    super.initData();
-    await Promise.all(
-      this.data.map(async (item, index) => {
-        await this.initFormMDCtrlItemControllers(
-          this.model.deformDetails,
-          index,
-          this.parent.form,
-          item
-        );
-      })
-    );
-    this.state.isInit = true;
+  get data() {
+    return this.parent.state.contentCtrlData;
   }
   /**
-   * 表单项值规则校验
+   * 内部表单项数据发生改变，同步contentCtrlData并设置外部表单值
    *
-   * @author zzq
-   * @date 2023-08-23 17:21:37
-   * @memberof FormMDCtrlRepeaterFormController
+   * @author zk
+   * @date 2023-07-30 05:07:11
+   * @param {IData} data
+   * @param {number} index
+   * @memberof FormMDCtrlController
    */
-  async validate() {
-    const values = [];
-    this.formDetails.forEach((details) => {
-      details.forEach((detail) => {
-        if (detail.detailType === "FORMITEM") {
-          const c = detail.c;
-          values.push(c.validate());
-        }
-      });
-    });
-    const results = await Promise.all(values);
-    return results.findIndex((value) => !value) === -1;
+  onDataItemChange(data) {
+    this.parent.state.contentCtrlData = data;
+    this.parent.setFormDataValue();
   }
 };
 
@@ -16845,6 +16682,43 @@ var FormMDCtrlController = class extends FormDetailController {
   }
 };
 
+// src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/form-mdctrl-repeater-form/form-mdctrl-repeater-form-item.controller.ts
+var FormMDCtrlItemController = class extends EditFormController {
+  constructor(model, context, params, ctx, data) {
+    super(model, context, params, ctx);
+    this.state.data = data;
+    this.state.isSimple = true;
+  }
+  async initDetailControllers(details = this.model.deformDetails, form = this, parent = void 0) {
+    await Promise.all(
+      details.map(async (detail) => {
+        const detailProvider = await getFormDetailProvider(detail);
+        if (!detailProvider) {
+          return;
+        }
+        form.providers[detail.id] = detailProvider;
+        const detailController = await detailProvider.createController(
+          detail,
+          form,
+          parent
+        );
+        form.details[detail.id] = detailController;
+        if (detail.detailType === "FORMITEM" || detail.detailType === "MDCTRL") {
+          form.formItems.push(detailController);
+        }
+        const childDetails = findChildFormDetails(detail);
+        if (childDetails.length) {
+          await this.initDetailControllers(
+            childDetails,
+            form,
+            detailController
+          );
+        }
+      })
+    );
+  }
+};
+
 // src/controller/control/form/form-detail/form-page/form-page.state.ts
 var FormPageState = class extends FormGroupPanelState {
 };
@@ -16971,6 +16845,28 @@ var GridColumnController = class {
       return item.id === this.model.id;
     });
   }
+  /**
+   * 值格式化
+   * @author lxm
+   * @date 2023-08-25 05:03:07
+   * @readonly
+   * @type {(string | undefined)}
+   */
+  get valueFormat() {
+    var _a;
+    return (_a = this.deGridDataItem) == null ? void 0 : _a.format;
+  }
+  /**
+   * 数据类型（数值）
+   * @author lxm
+   * @date 2023-08-25 05:03:07
+   * @readonly
+   * @type {(string | undefined)}
+   */
+  get dataType() {
+    var _a;
+    return (_a = this.deGridDataItem) == null ? void 0 : _a.dataType;
+  }
   /**
    * 子类不可覆盖或重写此方法，在 init 时需要重写的使用 onInit 方法。
    *
@@ -17861,7 +17757,8 @@ var GridController = class extends MDControlController {
 };
 
 // src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts
-import { ModelError as ModelError25 } from "@ibiz-template/core";
+import { DataTypes, ModelError as ModelError25 } from "@ibiz-template/core";
+import dayjs4 from "dayjs";
 import { clone as clone14 } from "ramda";
 var GridFieldColumnController = class extends GridColumnController {
   constructor() {
@@ -18063,6 +17960,24 @@ var GridFieldColumnController = class extends GridColumnController {
     }
     return formatValue;
   }
+  /**
+   * 值格式化
+   * @author lxm
+   * @date 2023-08-25 05:18:11
+   * @param {unknown} value
+   * @return {*}  {string}
+   */
+  formatValue(value = "") {
+    const strVal = "".concat(value);
+    if (!this.valueFormat) {
+      return strVal;
+    }
+    const isDate = DataTypes.isDate(this.dataType);
+    if (isDate) {
+      return dayjs4(strVal).format(this.valueFormat);
+    }
+    return ibiz.util.text.format(strVal, this.valueFormat);
+  }
 };
 
 // src/controller/control/grid/grid-column/grid-ua-column/grid-ua-column.controller.ts
@@ -18677,7 +18592,7 @@ var PanelController = class extends ControlController {
           parent
         );
         panel.panelItems[panelItem.id] = panelItemController;
-        if ((_a = panelItem.panelItems) == null ? void 0 : _a.length) {
+        if (((_a = panelItem.panelItems) == null ? void 0 : _a.length) && !panelItemController.isDataContainer) {
           await this.initPanelItemControllers(
             panelItem.panelItems,
             panel,
@@ -19019,7 +18934,7 @@ var PanelItemController = class {
       const relatedNames = logic.relatedItemNames || [];
       if (mustCalc || isOverlap3(relatedNames, names)) {
         try {
-          const ok = verifyPanelGroupLogic(this.panel.data, logic);
+          const ok = verifyPanelGroupLogic(this.data, logic);
           switch (logic.logicCat) {
             case "ITEMBLANK":
               this.state.required = !ok;
@@ -19180,6 +19095,7 @@ var SearchBarController = class extends ControlController {
   initState() {
     super.initState();
     this.state.query = "";
+    this.state.visible = !!(this.model.enableQuickSearch || this.model.enableGroup || this.model.enableFilter);
   }
   async onCreated() {
     var _a;
@@ -19189,16 +19105,24 @@ var SearchBarController = class extends ControlController {
       this.context.srfappid
     );
     if (appDataEntity) {
-      const searchField = (_a = appDataEntity.appDEFields) == null ? void 0 : _a.find((field) => {
+      const searchFields = (_a = appDataEntity.appDEFields) == null ? void 0 : _a.filter((field) => {
         return field.enableQuickSearch;
       });
-      if ((searchField == null ? void 0 : searchField.lnlanguageRes) && searchField.lnlanguageRes.lanResTag) {
-        this.placeHolder = ibiz.i18n.t(
-          searchField.lnlanguageRes.lanResTag,
-          searchField.lnlanguageRes.defaultContent
-        );
-      } else if (searchField == null ? void 0 : searchField.logicName) {
-        this.placeHolder = searchField.logicName;
+      const placeHolders = [];
+      searchFields == null ? void 0 : searchFields.forEach((searchField) => {
+        if ((searchField == null ? void 0 : searchField.lnlanguageRes) && searchField.lnlanguageRes.lanResTag) {
+          placeHolders.push(
+            ibiz.i18n.t(
+              searchField.lnlanguageRes.lanResTag,
+              searchField.logicName
+            )
+          );
+        } else if (searchField == null ? void 0 : searchField.logicName) {
+          placeHolders.push(searchField.logicName);
+        }
+      });
+      if (placeHolders.length > 0) {
+        this.placeHolder = placeHolders.join("\u3001");
       }
     }
   }
@@ -20209,6 +20133,216 @@ var WizardPanelController = class extends ControlController {
   }
 };
 
+// src/controller/control/md-ctrl/md-ctrl.service.ts
+var MDCtrlService = class extends MDControlService {
+  /**
+   * 初始化属性映射
+   *
+   * @author lxm
+   * @date 2022-08-31 18:08:37
+   */
+  initUIDataMap() {
+    var _a;
+    super.initUIDataMap();
+    (_a = this.model.delistDataItems) == null ? void 0 : _a.forEach((item) => {
+      const uiKey = item.id.toLowerCase();
+      const deField = item.appDEFieldId;
+      let mapField;
+      if (deField) {
+        const deFieldKey = deField.toLowerCase();
+        mapField = new UIMapField(uiKey, deFieldKey, {
+          isOriginField: true
+        });
+      } else {
+        mapField = new UIMapField(uiKey, uiKey);
+      }
+      this.dataUIMap.set(uiKey, mapField);
+    });
+  }
+};
+
+// src/controller/control/md-ctrl/md-ctrl-row.state.ts
+var MobMDCtrlRowState = class {
+  /**
+   * Creates an instance of MDCtrlRowState.
+   *
+   * @author chitanda
+   * @date 2023-06-19 18:06:12
+   * @param {ControlVO} data 行数据
+   * @param {IMobMDCtrlController} controller 多数据部件控制器
+   */
+  constructor(data, controller) {
+    this.data = data;
+    this.controller = controller;
+    /**
+     * 行为状态
+     *
+     * @author chitanda
+     * @date 2023-06-19 18:06:27
+     * @type {{ [p: string]: IButtonContainerState }}
+     */
+    this.uaColStates = {};
+    this.data = data;
+  }
+};
+
+// src/controller/control/md-ctrl/md-ctrl.controller.ts
+var MDCtrlController = class extends MDControlController {
+  initState() {
+    super.initState();
+    this.state.rows = [];
+    this.state.noSort = this.model.noSort === true;
+    this.state.mdctrlActiveMode = 1;
+  }
+  async onCreated() {
+    await super.onCreated();
+    this.service = new MDCtrlService(this.model);
+    await this.service.init(this.context);
+    this.setSort();
+  }
+  /**
+   * 设置排序
+   *
+   * @author lxm
+   * @date 2022-09-28 13:09:44
+   * @param {string} key 排序字段
+   * @param {string} order 排序顺序
+   */
+  setSort(key, order) {
+    if (key && order) {
+      super.setSort(key, order);
+    } else {
+      const { minorSortAppDEFieldId, minorSortDir } = this.model;
+      if (minorSortAppDEFieldId && minorSortDir) {
+        this.state.sortQuery = "".concat(minorSortAppDEFieldId.toLowerCase(), ",").concat(minorSortDir.toLowerCase());
+      } else {
+        this.state.sortQuery = "";
+      }
+    }
+  }
+  /**
+   * 加载更多
+   * @author lxm
+   * @date 2023-05-22 07:33:59
+   * @return {*}  {Promise<void>}
+   */
+  async loadMore() {
+    if (this.state.total > this.state.items.length && !this.state.isLoading) {
+      await this.load({ isLoadMore: true });
+    }
+  }
+  /**
+   * 列表多数据刷新 需重置分页
+   *
+   * @author zk
+   * @date 2023-08-11 05:08:20
+   * @return {*}  {Promise<void>}
+   * @memberof MDCtrlController
+   */
+  async refresh() {
+    await this.load({ isInitialLoad: true });
+  }
+  afterLoad(args, items) {
+    if (args.isInitialLoad) {
+      this.state.rows = [];
+    }
+    if (items && items.length > 0) {
+      this.state.rows.push(
+        ...items.map((item) => {
+          const row = new MobMDCtrlRowState(item, this);
+          this.initActionStates(row);
+          return row;
+        })
+      );
+    }
+    return super.afterLoad(args, items);
+  }
+  /**
+   * 设置列表数据
+   *
+   * @author zk
+   * @date 2023-05-26 02:05:46
+   * @param {IData[]} items
+   * @memberof ListController
+   */
+  setData(items) {
+    const rows = items.map((item) => {
+      const row = new MobMDCtrlRowState(item, this);
+      return row;
+    });
+    this.state.rows = rows;
+  }
+  /**
+   * 获取列表数据
+   *
+   * @author zk
+   * @date 2023-05-26 02:05:35
+   * @return {*}  {IData[]}
+   * @memberof ListController
+   */
+  getAllData() {
+    return this.state.rows.map((row) => row.data);
+  }
+  /**
+   * 界面行为组项点击
+   *
+   * @author chitanda
+   * @date 2023-06-19 18:06:18
+   * @param {IUIActionGroupDetail} detail
+   * @param {MDCtrlRowState} row
+   * @param {MouseEvent} event
+   * @return {*}  {Promise<void>}
+   */
+  async onActionClick(detail, row, event) {
+    const actionId = detail.uiactionId;
+    await UIActionUtil.execAndResolved(actionId, {
+      context: this.context,
+      params: this.params,
+      data: [row.data],
+      view: this.view,
+      event
+    });
+  }
+  /**
+   * 初始化按钮状态
+   *
+   * @author chitanda
+   * @date 2023-06-21 16:06:55
+   * @protected
+   * @param {MobMDCtrlRowState} row
+   */
+  initActionStates(row) {
+    const { deuiactionGroup, deuiactionGroup2 } = this.model;
+    if (deuiactionGroup) {
+      this.initUIActionGroup(row, deuiactionGroup);
+    }
+    if (deuiactionGroup2) {
+      this.initUIActionGroup(row, deuiactionGroup2);
+    }
+  }
+  initUIActionGroup(row, group) {
+    var _a;
+    if (!((_a = group.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");
+    }
+    const containerState = new ButtonContainerState();
+    const details = group.uiactionGroupDetails || [];
+    details.forEach((detail) => {
+      const actionid = detail.uiactionId;
+      if (actionid) {
+        const buttonState = new UIActionButtonState(
+          detail.id,
+          this.context.srfappid,
+          actionid
+        );
+        containerState.addState(detail.id, buttonState);
+      }
+    });
+    containerState.update(row.data.getOrigin());
+    row.uaColStates[group.id] = containerState;
+  }
+};
+
 // src/controller/hub.controller.ts
 var HubController = class {
   constructor() {
@@ -20920,7 +21054,9 @@ var MDViewEngine = class extends ViewEngineBase {
       event,
       view: this.view
     }));
-    if (result === -1) {
+    if (result instanceof Object && result.ok) {
+      this.refresh();
+    } else if (result === -1) {
       ibiz.log.warn("\u89C6\u56FE[".concat(this.view.model.codeName, "]\uFF0C\u672A\u914D\u7F6E\u7F16\u8F91\u6253\u5F00\u89C6\u56FE"));
     }
   }
@@ -20953,7 +21089,9 @@ var MDViewEngine = class extends ViewEngineBase {
       event,
       view: this.view
     }));
-    if (result === -1) {
+    if (result instanceof Object && result.ok) {
+      this.refresh();
+    } else if (result === -1) {
       throw new RuntimeModelError45(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
     }
   }
@@ -21045,7 +21183,7 @@ var MDViewEngine = class extends ViewEngineBase {
   }
   calcViewHeaderVisible() {
     let showHeader = super.calcViewHeaderVisible();
-    if (!this.searchBar) {
+    if (!this.searchBar || !this.searchBar.state.visible) {
       const controller = this.viewLayoutPanel.panelItems.view_searchbar;
       if (controller) {
         controller.state.visible = false;
@@ -21752,7 +21890,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     if (notNilEmpty7(navParams)) {
       tempParams = convertNavData(navParams, params, context, data[0]);
     }
-    await ibiz.commands.execute(
+    return ibiz.commands.execute(
       OpenAppViewCommand.TAG,
       openView,
       tempContext,
@@ -21780,7 +21918,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     if (enableWizardAdd) {
       newViewRef = await this.getWizardNewViewRef(appUILogic, parameters);
       if (!newViewRef) {
-        return;
+        return { ok: false };
       }
     } else if (enableBatchAdd) {
       throw new ModelError29(appUILogic, "enableBatchAdd\u6682\u672A\u652F\u6301");
@@ -21811,7 +21949,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
       _data.srfkey = void 0;
       tempParams = Object.assign(tempParams, _data.$origin);
     }
-    await ibiz.commands.execute(
+    return ibiz.commands.execute(
       OpenAppViewCommand.TAG,
       newViewRef.refAppViewId,
       tempContext,
@@ -22163,8 +22301,11 @@ export {
   LoadingState,
   MDControlController,
   MDControlService,
+  MDCtrlController,
+  MDCtrlService,
   MDViewEngine,
   MethodDto,
+  MobMDCtrlRowState,
   MobViewController,
   Modal,
   OpenAppViewCommand,