@ibiz-template/runtime 0.6.11 → 0.6.12

package/dist/index.esm.js

@@ -13098,8 +13098,8 @@ var _OpenAppViewCommand = class _OpenAppViewCommand {
    */
   async exec(appViewId, _context, params = {}, opts = {}) {
     const context = clone17(_context);
-    if (context.srfsimple !== null) {
-      context.srfsimple = void 0;
+    if (context.srfsimple) {
+      delete context.srfsimple;
     }
     const appView = await ibiz.hub.config.view.get(appViewId);
     if (!appView) {
@@ -20365,6 +20365,7 @@ import {
   ModelError as ModelError26,
   RuntimeError as RuntimeError48
 } from "@ibiz-template/core";
+import { mergeRight as mergeRight3 } from "ramda";
 var FrontUIActionProvider = class extends UIActionProviderBase {
   async execAction(action, args) {
     const { context, params, data, event, noWaitRoute } = args;
@@ -20417,6 +20418,9 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
       case "OTHER":
         actionResult = this.doOther(action, args);
         break;
+      case "EDITFORM":
+        actionResult = await this.openEditForm(action, args);
+        break;
       default:
         throw new ModelError26(
           action,
@@ -20434,7 +20438,6 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
    * @param {IUILogicParams} args
    * @return {*}
    */
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   doOther(action, args) {
     const { scriptCode } = action;
     const { context, params, data, event, view } = args;
@@ -20612,6 +20615,55 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
       throw new RuntimeError48("\u6CA1\u6709\u627E\u5230\u5B9E\u4F53\u5BFC\u51FA\u9879");
     }
   }
+  /**
+   * 打开编辑表单
+   * @author lxm
+   * @date 2024-03-21 03:54:01
+   * @protected
+   * @param {IAppDEUIAction} action
+   * @param {IUILogicParams} args
+   * @return {*}  {IUIActionResult}
+   */
+  async openEditForm(action, args) {
+    console.log(action.deeditForm, args);
+    const actionResult = {};
+    const { context, params, data, event } = args;
+    if (!event) {
+      throw new RuntimeError48("\u7F3A\u5C11\u539F\u751FJS\u4E8B\u4EF6\u5BF9\u8C61");
+    }
+    const { resultContext, resultParams } = await this.handleParams(
+      action,
+      context,
+      data,
+      params
+    );
+    const options = this.handleViewOptionParams(resultParams).modalOption || {};
+    const popoverOpts = mergeRight3(
+      {
+        autoClose: true
+      },
+      options
+    );
+    let hasSave = false;
+    await ibiz.overlay.popover(
+      event.target,
+      "IBizControlShell",
+      {
+        context: resultContext,
+        params: resultParams,
+        modelData: action.deeditForm,
+        onSaveSuccess: () => {
+          console.log("\u4FDD\u5B58\u6210\u529F");
+          hasSave = true;
+        }
+      },
+      popoverOpts
+    );
+    if (!hasSave) {
+      actionResult.cancel = true;
+    }
+    return actionResult;
+  }
 };
 
 // src/ui-action/provider/wf-withdraw-ui-action-provider.ts
@@ -20638,7 +20690,7 @@ var WFWithdrawUIActionProvider = class extends UIActionProviderBase {
 var LoginOutUIActionProvider = class extends UIActionProviderBase {
   async execAction(_action, _params) {
     const confirm = await ibiz.confirm.info({
-      title: "\u786E\u8BA4\u9000\u51FA\u767B\u5F55",
+      title: "\u9000\u51FA\u767B\u5F55",
       desc: "\u60A8\u786E\u5B9A\u8981\u9000\u51FA\u767B\u5F55\u5417\uFF1F"
     });
     if (confirm) {
@@ -25006,6 +25058,8 @@ var FormTabPanelController = class extends FormDetailController {
 // src/controller/control/form/edit-form/edit-form.controller.ts
 import {
   awaitTimeout,
+  IBizContext as IBizContext4,
+  isElementSame as isElementSame2,
   mergeInLeft as mergeInLeft2,
   RuntimeError as RuntimeError54
 } from "@ibiz-template/core";
@@ -25722,6 +25776,7 @@ var EditFormController = class extends FormController {
     switch (autoSaveMode) {
       case 3:
         saveParam.data = this.getDiffData();
+        saveParam.context = IBizContext4.create({ srfsimple: true });
         break;
       default:
     }
@@ -25744,7 +25799,11 @@ var EditFormController = class extends FormController {
     const { data } = this.state;
     const diffData = {};
     Object.keys(data).forEach((key) => {
-      if (data[key] !== this.oldData[key] || key === data.srfkeyfield) {
+      if (Array.isArray(data[key])) {
+        if (!isElementSame2(data[key], this.oldData[key])) {
+          diffData[key] = data[key];
+        }
+      } else if (data[key] !== this.oldData[key] || key === data.srfkeyfield) {
         diffData[key] = data[key];
       }
     });
@@ -25976,6 +26035,7 @@ var GridRowState = class {
      */
     this.processing = false;
     this.data = data;
+    this.oldData = data.clone();
     Object.keys(this.data).forEach((key) => {
       if (this.errors[key] === void 0) {
         this.errors[key] = null;
@@ -25996,6 +26056,17 @@ var GridRowState = class {
       };
     });
   }
+  getDiffData() {
+    const diffData = {};
+    Object.keys(this.data).forEach((key) => {
+      if (this.data[key] !== this.oldData[key] || key === this.data.srfkeyfield) {
+        diffData[key] = this.data[key];
+      }
+    });
+    diffData.srfuf = this.data.srfuf;
+    diffData.srfkey = this.data.srfkey;
+    return new ControlVO(diffData, this.oldData.$dataUIMap);
+  }
 };
 
 // src/controller/control/grid/grid/grid.controller.ts
@@ -26008,6 +26079,7 @@ import {
   RuntimeModelError as RuntimeModelError62
 } 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";
@@ -26219,6 +26291,44 @@ var GridController = class extends MDControlController {
      * @type {string}
      */
     this.aggTitle = "\u5408\u8BA1";
+    /**
+     * 数据导出参数
+     * @author zzq
+     * @date 2024-03-20 16:11:00
+     * @type {IData}
+     */
+    this.dataExportParam = {};
+    /**
+     * 数据导出列
+     * @author lxm
+     * @date 2023-08-07 04:11:00
+     * @type {IDEDataExport}
+     */
+    this.allExportColumns = [];
+    /**
+     * 数据导出代码表
+     * @author zzq
+     * @date 2024-03-20 16:11:00
+     * @type {Map<string, readonly CodeListItem[]>}
+     */
+    this.allExportCodelistMap = /* @__PURE__ */ new Map();
+    /**
+     * 值格式化
+     * @return {string}
+     * @author: zzq
+     * @Date: 2024-03-20 17:54:16
+     */
+    this.formatValue = (valueFormat, value = "") => {
+      const strVal = "".concat(value);
+      if (!valueFormat) {
+        return strVal;
+      }
+      if (dayjs5(strVal, valueFormat, true).isValid()) {
+        const formatVal = dayjs5(strVal).format(valueFormat);
+        return formatVal;
+      }
+      return ibiz.util.text.format(strVal, valueFormat);
+    };
   }
   get _evt() {
     return this.evt;
@@ -26296,6 +26406,7 @@ var GridController = class extends MDControlController {
       200
     );
     await this.initGroup();
+    await this.initExportData();
   }
   /**
    * 根据jsonschema初始化自定义表格列
@@ -26332,6 +26443,52 @@ var GridController = class extends MDControlController {
       ];
     }
   }
+  /**
+   * 初始化数据导出对象
+   * @author zzq
+   * @date 2024-03-20 16:10:17
+   * @protected
+   * @return {*}  {Promise<void>}
+   */
+  async initExportData() {
+    var _a;
+    if (this.model.dedataExportId) {
+      this.dataExport = (_a = this.dataEntity.appDEDataExports) == null ? void 0 : _a.find((dataExport) => {
+        return dataExport.id === this.model.dedataExportId;
+      });
+      if (this.dataExport) {
+        this.allExportColumns = await this.findAllExportColumns(
+          this.dataExport
+        );
+      }
+    }
+    if (this.allExportColumns.length > 0) {
+      this.allExportColumns.forEach((exportColumn) => {
+        if (exportColumn.codeListItems) {
+          this.allExportCodelistMap.set(
+            exportColumn.appDEFieldId,
+            exportColumn.codeListItems
+          );
+        }
+      });
+      this.dataExportParam.fields = this.allExportColumns.map(
+        (x) => x.appDEFieldId
+      );
+      this.dataExportParam.header = this.allExportColumns.map((x) => x.caption);
+    } else {
+      Object.keys(this.fieldColumns).forEach((key) => {
+        if (this.fieldColumns[key].codeList) {
+          this.allExportCodelistMap.set(
+            key,
+            this.fieldColumns[key].codeListItems
+          );
+        }
+      });
+      const { degridColumns = [] } = this.model;
+      this.dataExportParam.fields = degridColumns.map((item) => item.id);
+      this.dataExportParam.header = degridColumns.map((item) => item.caption);
+    }
+  }
   /**
    * 初始化表格分组
    * @author lxm
@@ -26600,6 +26757,9 @@ var GridController = class extends MDControlController {
     if (!isValid) {
       throw new RuntimeError55("\u884C\u6570\u636E\u6821\u9A8C\u4E0D\u901A\u8FC7\uFF0C\u4FDD\u5B58\u53D6\u6D88");
     }
+    if (this.model.enableRowEditChangedOnly) {
+      data = rowState.getDiffData();
+    }
     let res;
     const deName = calcDeCodeNameById(this.model.appDataEntityId);
     const tempContext = this.context.clone();
@@ -26617,6 +26777,7 @@ var GridController = class extends MDControlController {
     const index = this.findRowStateIndex(data);
     this.state.items.splice(index, 1, res.data);
     rowState.data = res.data;
+    rowState.oldData = res.data.clone();
     rowState.modified = false;
     this.gridStateNotify(rowState, "SAVE" /* SAVE */);
     await this._evt.emit("onSaveSuccess", void 0);
@@ -26981,7 +27142,72 @@ var GridController = class extends MDControlController {
     if (exportColumnsPromises) {
       return Promise.all(exportColumnsPromises);
     }
-    return void 0;
+    return [];
+  }
+  /**
+   * 格式化导出数据
+   * @return {string}
+   * @author: zzq
+   * @Date: 2024-03-20 17:54:16
+   */
+  formatExcelData(data) {
+    const { fields = [] } = this.dataExportParam;
+    const cloneData = clone27(
+      data.map((item) => {
+        return fields.reduce((obj, key) => {
+          obj[key] = item[key];
+          return obj;
+        }, {});
+      })
+    );
+    cloneData.forEach((item) => {
+      Object.keys(item).forEach((key) => {
+        var _a;
+        let value = item[key];
+        const exportColumn = this.allExportColumns.find(
+          (c) => c.appDEFieldId === key
+        );
+        const fieldColumnC = this.fieldColumns[key];
+        const format = (exportColumn == null ? void 0 : exportColumn.format) || (fieldColumnC == null ? void 0 : fieldColumnC.valueFormat);
+        const unitName = (fieldColumnC == null ? void 0 : fieldColumnC.model.unitName) || "";
+        if (this.allExportCodelistMap.get(key)) {
+          value = ((_a = this.allExportCodelistMap.get(key).find((x) => x.value === item[key])) == null ? void 0 : _a.text) || value;
+        } else {
+          value = this.formatValue(format, value) + unitName;
+        }
+        item[key] = value;
+      });
+    });
+    return cloneData;
+  }
+  /**
+   * 获取导出数据
+   * @return {Promise<IData[]>}
+   * @author: zzq
+   * @Date: 2024-03-20 17:54:16
+   */
+  async getExportData(params) {
+    var _a;
+    const { type } = params;
+    let data = [];
+    if (!type || type === "activatedPage") {
+      data = this.state.rows.map((row) => row.data);
+    } else if (type === "maxRowCount" || type === "customPage") {
+      const { size } = this.state;
+      const { startPage, endPage } = params;
+      const viewParam = type === "customPage" ? {
+        page: 0,
+        offset: (startPage - 1) * size,
+        size: (endPage - startPage + 1) * size
+      } : { size: ((_a = this.dataExport) == null ? void 0 : _a.maxRowCount) || 1e3, page: 0 };
+      data = await this.loadData({ viewParam });
+    } else if (type === "selectedRows") {
+      data = this.getData();
+    }
+    if (data.length === 0) {
+      throw new RuntimeError55("\u65E0\u5BFC\u51FA\u6570\u636E");
+    }
+    return data;
   }
   /**
    * 数据导出
@@ -26990,109 +27216,15 @@ var GridController = class extends MDControlController {
    * @returns {*}  {Promise<void>}
    * @memberof MDControlController
    */
-  async exportData(_args) {
-    var _a;
-    if (this.model.dedataExportId && !this.dataExport) {
-      this.dataExport = (_a = this.dataEntity.appDEDataExports) == null ? void 0 : _a.find((dataExport) => {
-        return dataExport.id === this.model.dedataExportId;
-      });
-      if (this.dataExport) {
-        this.allExportColumns = await this.findAllExportColumns(
-          this.dataExport
-        );
-      }
-    }
-    const formatExcelData = (data2) => {
-      var _a2;
-      const codeListMap = /* @__PURE__ */ new Map();
-      if (this.allExportColumns && this.allExportColumns.length > 0) {
-        (_a2 = this.allExportColumns) == null ? void 0 : _a2.forEach((exportColumn) => {
-          if (exportColumn.codeListItems) {
-            codeListMap.set(
-              exportColumn.appDEFieldId,
-              exportColumn.codeListItems
-            );
-          }
-        });
-      } else {
-        Object.keys(this.fieldColumns).forEach((key) => {
-          if (this.fieldColumns[key].codeList) {
-            codeListMap.set(key, this.fieldColumns[key].codeListItems);
-          }
-        });
-      }
-      const cloneData = clone27(
-        data2.map((item) => {
-          return item.getOrigin();
-        })
-      );
-      cloneData.forEach((item) => {
-        const fields = Object.keys(item);
-        fields.forEach((key) => {
-          var _a3;
-          let value = item[key];
-          const fieldColumnC = this.fieldColumns[key];
-          if (codeListMap.get(key)) {
-            value = ((_a3 = codeListMap.get(key).find((_item) => {
-              return _item.value === item[key];
-            })) == null ? void 0 : _a3.text) || value;
-          } else if (fieldColumnC) {
-            value = fieldColumnC.formatValue(value) + (fieldColumnC.model.unitName || "");
-          }
-          item[key] = value;
-        });
-      });
-      return cloneData;
-    };
-    const getExportData = async () => {
-      var _a2;
-      const type = (_a2 = _args.params) == null ? void 0 : _a2.type;
-      let data2 = [];
-      if (!type || type === "activatedPage") {
-        data2 = this.state.rows.map((row) => row.data);
-      } else if (type === "maxRowCount" || type === "customPage") {
-        const { size } = this.state;
-        const { startPage, endPage } = _args.params;
-        const params = type === "customPage" ? {
-          page: 0,
-          offset: (startPage - 1) * size,
-          size: (endPage - startPage + 1) * size
-        } : { size: 1e3, page: 0 };
-        data2 = await this.loadData({ viewParam: params });
-      } else if (type === "selectedRows") {
-        data2 = this.getData();
-      }
-      if (data2.length === 0) {
-        throw new RuntimeError55("\u65E0\u5BFC\u51FA\u6570\u636E");
-      }
-      return formatExcelData(data2);
-    };
-    const formatArrayData = (filterVal2, tableData) => {
-      return tableData.map((v) => {
-        return filterVal2.map((j) => {
-          return v[j];
-        });
-      });
-    };
-    let filterVal = [];
-    let header = [];
-    if (this.allExportColumns && this.allExportColumns.length > 0) {
-      filterVal = this.allExportColumns.map(
-        (column) => column.appDEFieldId
-      );
-      header = this.allExportColumns.map(
-        (column) => column.caption
-      );
-    } else {
-      const { degridColumns } = this.model;
-      if (!degridColumns) {
-        throw new RuntimeError55("\u65E0\u8868\u683C\u5217");
-      }
-      filterVal = degridColumns.map((item) => item.id);
-      header = degridColumns.map((item) => item.caption);
+  async exportData(args) {
+    const { header } = this.dataExportParam;
+    if (!header) {
+      throw new RuntimeError55("\u65E0\u8868\u683C\u5217");
     }
-    const data = formatArrayData(filterVal, await getExportData());
-    await exportData(header, data, this.model.logicName);
+    const data = await this.getExportData(args.params);
+    const formatData = this.formatExcelData(data);
+    const table = formatData.map((v) => Object.values(v));
+    await exportData(header, table, this.model.logicName);
   }
   /**
    * 计算默认值并返回一个对象，对象里的属性就是要填充的默认值
@@ -27264,7 +27396,7 @@ var GridController = class extends MDControlController {
 
 // src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts
 import { DataTypes as DataTypes4, ModelError as ModelError29, plus as plus2 } from "@ibiz-template/core";
-import dayjs5 from "dayjs";
+import dayjs6 from "dayjs";
 import { debounce as debounce3 } from "lodash-es";
 import { clone as clone28, isNil as isNil26 } from "ramda";
 var GridFieldColumnController = class extends GridColumnController {
@@ -27539,7 +27671,7 @@ var GridFieldColumnController = class extends GridColumnController {
     }
     const isDate = DataTypes4.isDate(this.dataType);
     if (isDate) {
-      const formatVal = dayjs5(strVal).format(this.valueFormat);
+      const formatVal = dayjs6(strVal).format(this.valueFormat);
       if (formatVal !== "Invalid Date") {
         return formatVal;
       }
@@ -29243,6 +29375,7 @@ async function calcFilterModelBySchema(json, appDataEntityId, modelAppId) {
 // src/controller/control/search-bar/use-searchcond.ts
 import { RuntimeError as RuntimeError58, recursiveIterate as recursiveIterate9 } from "@ibiz-template/core";
 import { isNil as isNil27 } from "ramda";
+var ExcludeOPs2 = ["ISNULL" /* IS_NULL */, "ISNOTNULL" /* IS_NOT_NULL */];
 function getOriginFilterNodes() {
   return [
     {
@@ -29318,7 +29451,7 @@ function calcSearchConds(filterNodes) {
   let hasError = false;
   recursiveIterate9(filterNodes[0], (node) => {
     if (node.leaf) {
-      if (node.field && node.valueOP && !isNil27(node.value)) {
+      if (node.field && node.valueOP && !isNil27(node.value) || node.field && node.valueOP && ExcludeOPs2.includes(node.valueOP)) {
         hasFilter = true;
       } else {
         hasError = true;
@@ -29334,7 +29467,7 @@ function calcSearchConds(filterNodes) {
 // src/controller/control/search-bar/search-bar-filter-items.controller.ts
 import { RuntimeError as RuntimeError59 } from "@ibiz-template/core";
 import { clone as clone29 } from "ramda";
-var ExcludeOPs2 = [
+var ExcludeOPs3 = [
   "ISNULL" /* IS_NULL */,
   "ISNOTNULL" /* IS_NOT_NULL */
 ];
@@ -32014,6 +32147,7 @@ var KanbanController = class extends DataViewControlController {
     this.state.batching = false;
     this.state.selectGroupKey = "";
     this.state.draggable = this.enableEditOrder || this.enableEditGroup;
+    this.state.uaState = {};
   }
   /**
    * 初始化
@@ -32060,8 +32194,44 @@ var KanbanController = class extends DataViewControlController {
     );
   }
   async afterLoad(args, items) {
+    var _a;
     this.sortItems(this.state.items);
-    return super.afterLoad(args, items);
+    super.afterLoad(args, items);
+    const actions = [];
+    (_a = this.model.dedataViewItems) == null ? void 0 : _a.forEach((item) => {
+      if (item.itemType === "ACTIONITEM") {
+        if (item.deuiactionGroup && item.deuiactionGroup.uiactionGroupDetails) {
+          actions.push(...item.deuiactionGroup.uiactionGroupDetails);
+        }
+      }
+    });
+    if (actions && actions.length > 0) {
+      items.forEach((item) => {
+        const containerState = new ButtonContainerState();
+        actions.forEach((action) => {
+          const actionid = action.uiactionId;
+          if (actionid) {
+            const buttonState = new UIActionButtonState(
+              action.id,
+              this.context.srfappid,
+              actionid
+            );
+            containerState.addState(action.id, buttonState);
+          }
+        });
+        this.state.uaState[item.srfkey] = containerState;
+      });
+    }
+    items.forEach((item) => {
+      if (this.state.uaState[item.srfkey] && Object.keys(this.state.uaState[item.srfkey]).length > 0) {
+        this.state.uaState[item.srfkey].update(
+          this.context,
+          item.getOrigin(),
+          this.model.appDataEntityId
+        );
+      }
+    });
+    return items;
   }
   /**
    * 当展开批操作工具栏时需进行行点击拦截
@@ -33033,7 +33203,7 @@ import {
   RuntimeModelError as RuntimeModelError69
 } from "@ibiz-template/core";
 import { clone as clone32 } from "ramda";
-import dayjs6 from "dayjs";
+import dayjs7 from "dayjs";
 var TreeGridExNodeColumnController = class {
   /**
    * @author lxm
@@ -33331,7 +33501,7 @@ var TreeGridExNodeColumnController = class {
     }
     const isDate = DataTypes5.isDate(this.dataType);
     if (isDate || this.fieldColumn.name === "createdate") {
-      const formatVal = dayjs6(strVal).format(this.valueFormat);
+      const formatVal = dayjs7(strVal).format(this.valueFormat);
       if (formatVal !== "Invalid Date") {
         return formatVal;
       }
@@ -35092,7 +35262,7 @@ import { QXEvent as QXEvent9 } from "qx-util";
 import { QXEvent as QXEvent7 } from "qx-util";
 import { clone as clone33 } from "ramda";
 import { isNil as isNil31, isNumber as isNumber2 } from "lodash-es";
-import dayjs7 from "dayjs";
+import dayjs8 from "dayjs";
 var AsyncActionController = class {
   constructor() {
     this.evt = new QXEvent7();
@@ -35163,7 +35333,7 @@ var AsyncActionController = class {
     ];
     dateFields.forEach((key) => {
       if (isNumber2(data[key])) {
-        data[key] = dayjs7(data[key]).format("YYYY-MM-DD HH:mm:ss");
+        data[key] = dayjs8(data[key]).format("YYYY-MM-DD HH:mm:ss");
       }
     });
     if (!isNil31(data.actionresult)) {
@@ -36212,7 +36382,7 @@ var MDViewEngine = class extends ViewEngineBase {
    */
   handleContextParams() {
     super.handleContextParams();
-    if (this.view.context.srfsimple == null) {
+    if (!this.view.context.srfsimple) {
       this.view.context.srfsimple = true;
     }
   }