@ibiz-template/vue3-components 0.1.2 → 0.1.3

package/lib/control/exp-bar/tree-exp-bar/tree-exp-bar.controller.cjs

@@ -12,6 +12,13 @@ var __publicField = (obj, key, value) => {
 class TreeExpBarController extends expBar_controller.ExpBarControlController {
   constructor() {
     super(...arguments);
+    /**
+     * 默认展开节点集合
+     * @author lxm
+     * @date 2023-08-08 05:35:12
+     * @type {string[]}
+     */
+    __publicField(this, "defaultExpandedKeys");
     /**
      * 导航栏key
      *
@@ -92,18 +99,24 @@ class TreeExpBarController extends expBar_controller.ExpBarControlController {
    * @memberof ExpBarControlController
    */
   setNavPosDefaultOpenView() {
-    const expandedNode = [];
-    this.state.srfnav.split(":").forEach((item, index) => {
-      if (index === 0) {
-        expandedNode.push(item);
-      } else {
-        expandedNode.push(`${expandedNode[index - 1]}:${item}`);
-      }
-    });
-    this.xDataController.setExpandedKeys(expandedNode);
     this.setDefaultXDataSelect({ [this.navKeyName]: this.state.srfnav });
     this.setDefaultOpenView([{ [this.navKeyName]: this.state.srfnav }]);
   }
+  async onCreated() {
+    await super.onCreated();
+    if (this.state.srfnav) {
+      const expandedKeys = [];
+      this.state.srfnav.split(":").forEach((item, index) => {
+        if (index === 0) {
+          expandedKeys.push(item);
+        } else {
+          expandedKeys.push(`${expandedKeys[index - 1]}:${item}`);
+        }
+      });
+      expandedKeys.pop();
+      this.defaultExpandedKeys = expandedKeys;
+    }
+  }
 }
 
 exports.TreeExpBarController = TreeExpBarController;

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

@@ -34,10 +34,11 @@ const FormMDCtrlForm = /* @__PURE__ */ vue.defineComponent({
     const renderContent = () => {
       if (c.controlModel && c.provider) {
         return c.state.data.map((item, index) => {
-          var _a;
           const tempContext = c.parent.form.context.clone();
-          const codeName = runtime.calcDeCodeNameById((_a = c.model.contentControl) == null ? void 0 : _a.appDataEntityId);
-          tempContext[codeName] = item.srfkey;
+          if (c.model.contentControl) {
+            const codeName = runtime.calcDeCodeNameById(c.model.contentControl.appDataEntityId);
+            tempContext[codeName] = item.srfkey;
+          }
           const controlProps = {
             modelData: c.controlModel,
             context: tempContext,

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

@@ -56,9 +56,9 @@ const FormPage = /* @__PURE__ */ vue.defineComponent({
         label: () => {
           return vue.createVNode("span", {
             "class": c.labelClass
-          }, [c.model.sysImage && vue.createVNode(vue.resolveComponent("iBizIcon"), {
+          }, [c.model.sysImage ? vue.createVNode(vue.resolveComponent("iBizIcon"), {
             "icon": c.model.sysImage
-          }, null), c.model.showCaption && c.model.caption]);
+          }, null) : null, c.model.caption]);
         }
       });
     })) ? _slot : {

package/lib/control/grid/grid/grid.cjs

@@ -89,11 +89,41 @@ const GridControl = /* @__PURE__ */ vue.defineComponent({
     });
     const tableData = vue.computed(() => {
       const state = c.state;
+      if (c.model.enableGroup) {
+        const result = [];
+        state.groups.forEach((item) => {
+          if (!item.children.length) {
+            return;
+          }
+          const children = [...item.children];
+          const first = children.shift();
+          result.push({
+            srfkey: (first == null ? void 0 : first.srfkey) || item.caption,
+            isGroupData: true,
+            caption: item.caption,
+            first,
+            children
+          });
+        });
+        return result;
+      }
       return state.rows.map((row) => row.data);
     });
     const renderColumns = vue.computed(() => {
-      var _a;
-      return ((_a = c.model.degridColumns) == null ? void 0 : _a.filter((item) => !item.hideDefault)) || [];
+      if (c.isMultistageHeader) {
+        return c.model.degridColumns || [];
+      }
+      const columns = [];
+      c.state.columnStates.forEach((item) => {
+        if (item.hidden) {
+          return;
+        }
+        const columnModel = c.fieldColumns[item.key].model;
+        if (columnModel) {
+          columns.push(columnModel);
+        }
+      });
+      return columns;
     });
     const renderNoData = () => {
       const {
@@ -101,6 +131,18 @@ const GridControl = /* @__PURE__ */ vue.defineComponent({
       } = c.state;
       return isLoaded && vue.createVNode(vue.resolveComponent("iBizNoData"), null, null);
     };
+    const summaryMethod = ({
+      columns,
+      data
+    }) => {
+      console.log(columns, data);
+      return columns.map((item, index) => {
+        if (index === 0) {
+          return c.aggTitle;
+        }
+        return c.state.aggResult[item.property];
+      });
+    };
     return {
       c,
       ns,
@@ -115,7 +157,8 @@ const GridControl = /* @__PURE__ */ vue.defineComponent({
       onPageSizeChange,
       onPageRefresh,
       handleRowClassName,
-      renderNoData
+      renderNoData,
+      summaryMethod
     };
   },
   render() {
@@ -128,6 +171,9 @@ const GridControl = /* @__PURE__ */ vue.defineComponent({
     } = this.c.model;
     const renderColumn = (model, index) => {
       var _a;
+      if (model.hideDefault) {
+        return null;
+      }
       const {
         codeName: columnName,
         width
@@ -146,16 +192,19 @@ const GridControl = /* @__PURE__ */ vue.defineComponent({
         "align": ((_a = model.align) == null ? void 0 : _a.toLowerCase()) || "center"
       }), {
         default: ({
-          row,
-          $index
+          row
         }) => {
-          const rowController = state.rows[$index];
-          if (rowController) {
+          let elRow = row;
+          if (row.isGroupData) {
+            elRow = row.first;
+          }
+          const rowState = state.rows.find((item) => item.data.srfkey === elRow.srfkey);
+          if (rowState) {
             const comp = vue.resolveComponent(this.c.providers[columnName].component);
             return vue.h(comp, {
               controller: columnC,
-              row: rowController,
-              key: row.srfkey + columnName
+              row: rowState,
+              key: elRow.srfkey + columnName
             });
           }
           return null;
@@ -185,7 +234,7 @@ const GridControl = /* @__PURE__ */ vue.defineComponent({
       return renderColumn(model, index);
     };
     return vue.createVNode(vue.resolveComponent("iBizControlBase"), {
-      "class": [this.ns.is("show-header", !hideHeader), this.ns.is("enable-page", enablePagingBar)],
+      "class": [this.ns.is("show-header", !hideHeader), this.ns.is("enable-page", enablePagingBar), this.ns.is("enable-group", this.c.model.enableGroup)],
       "controller": this.c
     }, {
       default: () => [vue.createVNode(vue.resolveComponent("el-table"), {
@@ -197,8 +246,11 @@ const GridControl = /* @__PURE__ */ vue.defineComponent({
         },
         "border": true,
         "show-header": !hideHeader,
+        "show-summary": this.c.enableAgg,
+        "summary-method": this.summaryMethod,
         "highlight-current-row": state.singleSelect,
         "row-class-name": this.handleRowClassName,
+        "row-key": "srfkey",
         "data": this.tableData,
         "onRowClick": this.onRowClick,
         "onRowDblclick": this.onDbRowClick,

package/lib/control/grid/grid/grid.controller.cjs

@@ -15,6 +15,20 @@ var __publicField = (obj, key, value) => {
 class GridController extends runtime.MDControlController {
   constructor() {
     super(...arguments);
+    /**
+     * 是否有配置宽度自适应列
+     *
+     * @type {boolean}
+     * @memberof GridController
+     */
+    __publicField(this, "hasAdaptiveColumn", false);
+    /**
+     * 是否有多级表头
+     * @author lxm
+     * @date 2023-08-07 02:26:16
+     * @type {boolean}
+     */
+    __publicField(this, "isMultistageHeader", false);
     /**
      * 所有表格列控制器集合
      *
@@ -56,12 +70,39 @@ class GridController extends runtime.MDControlController {
      */
     __publicField(this, "providers", {});
     /**
-     * 是否有配置宽度自适应列
-     *
-     * @type {boolean}
-     * @memberof GridController
+     * 分组属性列控制器
+     * @author lxm
+     * @date 2023-08-07 09:45:30
+     * @type {string}
      */
-    __publicField(this, "hasAdaptiveColumn", false);
+    __publicField(this, "groupFieldColumn");
+    /**
+     * 聚合行标题
+     * @author lxm
+     * @date 2023-08-07 04:11:00
+     * @type {string}
+     */
+    __publicField(this, "aggTitle", "\u5408\u8BA1");
+  }
+  /**
+   * 分组代码表项集合
+   * @author lxm
+   * @date 2023-08-07 09:09:42
+   * @type {readonly}
+   */
+  get groupCodeListItems() {
+    var _a;
+    return (_a = this.groupFieldColumn) == null ? void 0 : _a.codeListItems;
+  }
+  /**
+   * 是否启用表格聚合
+   * @author lxm
+   * @date 2023-08-07 04:10:55
+   * @readonly
+   * @type {boolean}
+   */
+  get enableAgg() {
+    return this.model.aggMode !== "NONE";
   }
   initState() {
     super.initState();
@@ -69,6 +110,8 @@ class GridController extends runtime.MDControlController {
     this.state.noSort = this.model.noSort === true;
     this.state.size = this.model.pagingSize || 20;
     this.state.singleSelect = this.model.singleSelect === true;
+    this.state.columnStates = [];
+    this.state.aggResult = {};
   }
   /**
    * 初始化方法
@@ -91,6 +134,57 @@ class GridController extends runtime.MDControlController {
       200
     );
     this.setSort();
+    await this.initGroup();
+  }
+  /**
+   * 初始化表格分组
+   * @author lxm
+   * @date 2023-08-07 09:10:17
+   * @protected
+   * @return {*}  {Promise<void>}
+   */
+  async initGroup() {
+    if (!this.model.enableGroup) {
+      return;
+    }
+    const { groupAppDEFieldId, groupCodeListId, groupMode } = this.model;
+    this.groupFieldColumn = Object.values(this.fieldColumns).find(
+      (item) => item.model.appDEFieldId === groupAppDEFieldId
+    );
+    if (!this.groupFieldColumn) {
+      throw new core.RuntimeModelError(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 core.RuntimeModelError(
+        this.groupFieldColumn.model,
+        `\u5206\u7EC4\u5C5E\u6027\u7684\u5C5E\u6027\u5217${groupFieldName}\u6CA1\u6709\u914D\u7F6E\u4EE3\u7801\u8868`
+      );
+    }
+    const index = this.state.columnStates.findIndex(
+      (item) => item.key === this.groupFieldColumn.model.codeName
+    );
+    if (index !== -1 && index !== 0) {
+      if (this.isMultistageHeader) {
+        throw new core.RuntimeModelError(
+          this.model,
+          `\u8BF7\u5C06\u5206\u7EC4\u5C5E\u6027\u5217${groupFieldName}\u914D\u7F6E\u4E3A\u7B2C\u4E00\u5217`
+        );
+      }
+      const removeEls = this.state.columnStates.splice(index, 1);
+      this.state.columnStates.unshift(...removeEls);
+    }
+    if (groupMode === "CODELIST") {
+      if (!groupCodeListId) {
+        throw new core.RuntimeModelError(this.model, "\u4EE3\u7801\u8868\u5206\u7EC4\u6A21\u5F0F\u9700\u8981\u914D\u7F6E\u4EE3\u7801\u8868");
+      }
+      if (this.groupFieldColumn.model.appCodeListId !== groupCodeListId) {
+        throw new core.RuntimeModelError(
+          this.model,
+          `\u5206\u7EC4\u4EE3\u7801\u8868\u4E0E\u5C5E\u6027\u5217${groupFieldName}\u7684\u4EE3\u7801\u8868\u4E0D\u4E00\u81F4`
+        );
+      }
+    }
   }
   async afterLoad(args, items) {
     await super.afterLoad(args, items);
@@ -109,8 +203,92 @@ class GridController extends runtime.MDControlController {
         uaState.update(row.data.getOrigin(), this.model.appDataEntityId);
       });
     });
+    this.calcGroupData(items);
+    this.calcAggResult(items);
     return items;
   }
+  /**
+   * 计算分组数据
+   * @author lxm
+   * @date 2023-08-07 02:16:39
+   * @protected
+   * @param {IData[]} items
+   */
+  calcGroupData(items) {
+    const { enableGroup, groupMode } = this.model;
+    if (enableGroup) {
+      const groupMap = /* @__PURE__ */ new Map();
+      const codeListGroup = groupMode === "CODELIST";
+      const groupFiledName = this.groupFieldColumn.model.id;
+      if (codeListGroup) {
+        this.groupCodeListItems.forEach((item) => {
+          groupMap.set(item.value, []);
+        });
+      }
+      items.forEach((item) => {
+        const groupFieldValue = item[groupFiledName];
+        if (!codeListGroup && !groupMap.has(groupFieldValue)) {
+          groupMap.set(groupFieldValue, []);
+        }
+        if (groupMap.has(groupFieldValue)) {
+          groupMap.get(groupFieldValue).push(item);
+        }
+      });
+      this.state.groups = [];
+      groupMap.forEach((value, key) => {
+        const codeListItem = this.groupCodeListItems.find(
+          (item) => item.value === key
+        );
+        this.state.groups.push({
+          caption: (codeListItem == null ? void 0 : codeListItem.text) || `${key}`,
+          children: value
+        });
+      });
+    }
+  }
+  /**
+   * 加载远程聚合数据
+   * @author lxm
+   * @date 2023-08-07 05:35:36
+   * @protected
+   * @return {*}  {Promise<void>}
+   */
+  async loadRemoteAgg() {
+    const { aggMode, aggAppDataEntityId, aggAppDEDataSetId } = this.model;
+    if (aggMode !== "ALL") {
+      return;
+    }
+    if (!aggAppDEDataSetId || !aggAppDataEntityId) {
+      throw new core.RuntimeModelError(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);
+    const res = await app.deService.exec(
+      aggAppDataEntityId,
+      aggAppDEDataSetId,
+      this.context,
+      void 0,
+      params
+    );
+    if (res.data.length) {
+      this.state.remoteAggResult = res.data[0];
+    }
+  }
+  /**
+   * 计算当前页的聚合数据
+   * @author lxm
+   * @date 2023-08-07 04:22:09
+   * @protected
+   * @param {IData[]} items
+   */
+  calcAggResult(items) {
+    Object.values(this.fieldColumns).forEach((column) => {
+      const result = column.calcFieldAgg(items);
+      if (result) {
+        this.state.aggResult[column.model.id] = result;
+      }
+    });
+  }
   /**
    * 后台删除结束后界面删除逻辑
    *
@@ -124,6 +302,16 @@ class GridController extends runtime.MDControlController {
       (item) => item.data.srfkey === data.srfkey
     );
     this.state.rows.splice(index, 1);
+    this.state.groups.forEach((item) => {
+      if (item.children.length) {
+        const findIndex = item.children.findIndex(
+          (item2) => item2.srfkey === data.srfkey
+        );
+        if (findIndex !== -1) {
+          item.children.splice(findIndex, 1);
+        }
+      }
+    });
   }
   /**
    * 新建行
@@ -162,6 +350,7 @@ class GridController extends runtime.MDControlController {
     }
     if (rowState.processing) {
       await core.awaitTimeout(500, this.save.bind(this), [data]);
+      return;
     }
     const isValid = await this.validate(rowState);
     if (!isValid) {
@@ -209,9 +398,15 @@ class GridController extends runtime.MDControlController {
       if (column.enableRowEdit) {
         this.editColumns[column.codeName] = controller;
       }
+      this.state.columnStates.push({
+        key: column.codeName,
+        caption: column.caption,
+        hidden: !!column.hideDefault
+      });
     } else if (column.columnType === "UAGRIDCOLUMN") {
       this.uaColumns[column.codeName] = controller;
     } else if (column.columnType === "GROUPGRIDCOLUMN") {
+      this.isMultistageHeader = true;
       await Promise.all(
         ((_a = column.degridColumns) == null ? void 0 : _a.map(async (childColumn) => {
           await this.initColumnsController(childColumn);

package/lib/control/grid/grid/grid.css

@@ -1 +1 @@
-.ibiz-control-grid{--ibiz-control-grid-text-color:var(--ibiz-color-text-0);--ibiz-control-grid-bg-color:transparent;--ibiz-control-grid-padding:0;--ibiz-control-grid-cell-padding:var(--ibiz-spacing-tight);--ibiz-control-grid-selection-padding:var(--ibiz-spacing-base-loose);--ibiz-control-grid-header-text-color:var(--ibiz-color-text-2);--ibiz-control-grid-header-cell-padding:var(--ibiz-control-grid-cell-padding);--ibiz-control-grid-header-height:auto;--ibiz-control-grid-content-text-color:var(--ibiz-control-grid-text-color);--ibiz-control-grid-content-item-hover-bg-color:var(--ibiz-color-fill-0);--ibiz-control-grid-content-row-height:48px;--ibiz-control-grid-page-text-color:var(--ibiz-control-grid-text-color);--ibiz-control-grid-page-height:50px;--ibiz-control-grid-page-padding:0 var(--ibiz-spacing-base-tight);width:100%;height:100%;padding:var(--ibiz-control-grid-padding);background-color:var(--ibiz-control-grid-bg-color)}.ibiz-control-grid.is-enable-page .ibiz-control-grid__table{height:calc(100% - var(--ibiz-control-grid-page-height))}.ibiz-control-grid__table{width:100%;height:100%}.ibiz-control-grid__table .caret-wrapper{gap:3px;justify-content:center}.ibiz-control-grid__table .sort-caret{position:initial}.ibiz-control-grid__table.el-table .el-table__cell{padding:0}.ibiz-control-grid__table .el-table__header-wrapper .cell{height:var(--ibiz-control-grid-header-height);padding:var(--ibiz-control-grid-header-cell-padding);color:var(--ibiz-control-grid-header-text-color);word-break:break-word;white-space:pre-wrap}.ibiz-control-grid__table .el-table__header-wrapper .el-table-column--selection .cell{padding:var(--ibiz-control-grid-selection-padding)}.ibiz-control-grid__table .el-table__header-wrapper .is-sortable.el-table__cell .cell{display:flex;align-items:center;justify-content:var(--ibiz-grid-column-justify-content)}.ibiz-control-grid__table .el-table__body-wrapper{color:var(--ibiz-control-grid-content-text-color);border-bottom:.1px solid var(--ibiz-color-border)}.ibiz-control-grid__table .el-table__body-wrapper .el-table__row{height:var(--ibiz-control-grid-content-row-height);cursor:pointer}.ibiz-control-grid__table .el-table__body-wrapper .el-table__row>td{height:0}@-moz-document url-prefix(){.ibiz-control-grid__table .el-table__body-wrapper .el-table__row>td{height:100%}}.ibiz-control-grid__table .el-table__body-wrapper .cell{height:100%;padding:0}.ibiz-control-grid__table .el-table__body-wrapper .el-table-column--selection .cell{padding:var(--ibiz-control-grid-selection-padding)}.ibiz-control-grid__table .el-table__cell.is-center{--ibiz-grid-column-text-align:center;--ibiz-grid-column-justify-content:center}.ibiz-control-grid__table .el-table__cell.is-left{--ibiz-grid-column-text-align:left;--ibiz-grid-column-justify-content:flex-start}.ibiz-control-grid__table .el-table__cell.is-right{--ibiz-grid-column-text-align:right;--ibiz-grid-column-justify-content:flex-end}.ibiz-control-grid .ibiz-grid-page{display:flex;justify-content:flex-end;height:var(--ibiz-control-grid-page-height);padding:var(--ibiz-control-grid-page-padding)}.ibiz-control-grid .ibiz-grid-page .el-pagination{overflow:auto}
+.ibiz-control-grid{--ibiz-control-grid-text-color:var(--ibiz-color-text-0);--ibiz-control-grid-bg-color:transparent;--ibiz-control-grid-padding:0;--ibiz-control-grid-cell-padding:var(--ibiz-spacing-tight);--ibiz-control-grid-selection-padding:var(--ibiz-spacing-base-loose);--ibiz-control-grid-header-text-color:var(--ibiz-color-text-2);--ibiz-control-grid-header-cell-padding:var(--ibiz-control-grid-cell-padding);--ibiz-control-grid-header-height:auto;--ibiz-control-grid-content-text-color:var(--ibiz-control-grid-text-color);--ibiz-control-grid-content-item-hover-bg-color:var(--ibiz-color-fill-0);--ibiz-control-grid-content-row-height:48px;--ibiz-control-grid-page-text-color:var(--ibiz-control-grid-text-color);--ibiz-control-grid-page-height:50px;--ibiz-control-grid-page-padding:0 var(--ibiz-spacing-base-tight);width:100%;height:100%;padding:var(--ibiz-control-grid-padding);background-color:var(--ibiz-control-grid-bg-color)}.ibiz-control-grid.is-enable-page .ibiz-control-grid__table{height:calc(100% - var(--ibiz-control-grid-page-height))}.ibiz-control-grid.is-enable-group .el-table__indent{display:none}.ibiz-control-grid__table{width:100%;height:100%}.ibiz-control-grid__table .caret-wrapper{gap:3px;justify-content:center}.ibiz-control-grid__table .sort-caret{position:initial}.ibiz-control-grid__table.el-table .el-table__cell{padding:0}.ibiz-control-grid__table .el-table__header-wrapper .cell{height:var(--ibiz-control-grid-header-height);padding:var(--ibiz-control-grid-header-cell-padding);color:var(--ibiz-control-grid-header-text-color);word-break:break-word;white-space:pre-wrap}.ibiz-control-grid__table .el-table__header-wrapper .el-table-column--selection .cell{padding:var(--ibiz-control-grid-selection-padding)}.ibiz-control-grid__table .el-table__header-wrapper .is-sortable.el-table__cell .cell{display:flex;align-items:center;justify-content:var(--ibiz-grid-column-justify-content)}.ibiz-control-grid__table .el-table__body-wrapper{color:var(--ibiz-control-grid-content-text-color);border-bottom:.1px solid var(--ibiz-color-border)}.ibiz-control-grid__table .el-table__body-wrapper .el-table__row{height:var(--ibiz-control-grid-content-row-height);cursor:pointer}.ibiz-control-grid__table .el-table__body-wrapper .el-table__row>td{height:0}@-moz-document url-prefix(){.ibiz-control-grid__table .el-table__body-wrapper .el-table__row>td{height:100%}}.ibiz-control-grid__table .el-table__body-wrapper .cell{display:flex;align-items:center;height:100%;padding:0}.ibiz-control-grid__table .el-table__body-wrapper .el-table-column--selection .cell{padding:var(--ibiz-control-grid-selection-padding)}.ibiz-control-grid__table .el-table__cell.is-center{--ibiz-grid-column-text-align:center;--ibiz-grid-column-justify-content:center}.ibiz-control-grid__table .el-table__cell.is-left{--ibiz-grid-column-text-align:left;--ibiz-grid-column-justify-content:flex-start}.ibiz-control-grid__table .el-table__cell.is-right{--ibiz-grid-column-text-align:right;--ibiz-grid-column-justify-content:flex-end}.ibiz-control-grid .ibiz-grid-page{display:flex;justify-content:flex-end;height:var(--ibiz-control-grid-page-height);padding:var(--ibiz-control-grid-page-padding)}.ibiz-control-grid .ibiz-grid-page .el-pagination{overflow:auto}

package/lib/control/grid/grid-column/grid-field-column/grid-field-column.controller.cjs

@@ -166,6 +166,59 @@ class GridFieldColumnController extends gridColumn_controller.GridColumnControll
     this.codeListItems = dataItems;
     return dataItems;
   }
+  /**
+   * 计算聚合属性列的值
+   * 无配置返回undefined
+   * @author lxm
+   * @date 2023-08-07 04:50:47
+   * @param {IData[]} items
+   * @return {*}  {(string | undefined)}
+   */
+  calcFieldAgg(items) {
+    const { aggField, aggMode, aggValueFormat } = this.model;
+    if (aggMode === "NONE") {
+      return;
+    }
+    const fieldName = aggField || this.model.id;
+    let aggValue;
+    if (this.grid.model.aggMode === "PAGE") {
+      switch (aggMode) {
+        case "SUM":
+          aggValue = items.map((item) => item[fieldName]).reduce((a, b) => a + b, 0);
+          break;
+        case "AVG":
+          aggValue = items.map((item) => item[fieldName]).reduce((a, b) => a + b, 0) / items.length;
+          break;
+        case "MAX":
+          aggValue = Math.max(...items.map((item) => item[fieldName]));
+          break;
+        case "MIN":
+          aggValue = Math.min(...items.map((item) => item[fieldName]));
+          break;
+        default:
+          throw new core.ModelError(this.model, `\u6682\u672A\u652F\u6301\u5C5E\u6027\u5217\u805A\u5408\u6A21\u5F0F${aggMode}`);
+      }
+    } else if (this.grid.model.aggMode === "ALL") {
+      throw new core.ModelError(this.model, `\u8FDC\u7A0B\u805A\u5408\u6682\u672A\u652F\u6301`);
+    } else {
+      throw new core.ModelError(
+        this.grid.model,
+        `\u6682\u672A\u652F\u6301\u805A\u5408\u6A21\u5F0F${this.grid.model.aggMode}`
+      );
+    }
+    if (!aggValueFormat) {
+      return `${aggValue}`;
+    }
+    const formatValue = "";
+    switch (aggValueFormat) {
+      default:
+        throw new core.ModelError(
+          this.model,
+          `\u6682\u672A\u652F\u6301${aggValueFormat}\u7684\u805A\u5408\u503C\u683C\u5F0F\u5316`
+        );
+    }
+    return formatValue;
+  }
 }
 
 exports.GridFieldColumnController = GridFieldColumnController;

package/lib/control/grid/grid-column/grid-field-column/grid-field-column.css

@@ -1 +1 @@
-.ibiz-grid-field-column{--ibiz-grid-field-column-cell-padding:var(--ibiz-spacing-tight);--ibiz-grid-field-column-text-color:var(--ibiz-color-primary);display:flex;align-items:center;justify-content:var(--ibiz-grid-column-justify-content);width:100%;height:100%;padding:var(--ibiz-grid-field-column-cell-padding)}.ibiz-grid-field-column__text{word-break:break-word;white-space:pre-wrap}.ibiz-grid-field-column--clickable{color:var(--ibiz-grid-field-column-text-color);cursor:pointer}
+.ibiz-grid-field-column{--ibiz-grid-field-column-cell-padding:var(--ibiz-spacing-tight);--ibiz-grid-field-column-text-color:var(--ibiz-color-primary);display:inline-flex;align-items:center;justify-content:var(--ibiz-grid-column-justify-content);width:auto;height:100%;padding:var(--ibiz-grid-field-column-cell-padding)}.ibiz-grid-field-column__text{word-break:break-word;white-space:pre-wrap}.ibiz-grid-field-column--clickable{color:var(--ibiz-grid-field-column-text-color);cursor:pointer}

package/lib/control/grid/grid-column/grid-field-edit-column/grid-edit-item/grid-edit-item.css

@@ -1 +1 @@
-.ibiz-grid-edit-item{--ibiz-grid-edit-item-cell-hover-bg-color:var(--ibiz-color-fill-0);width:100%;height:100%}.ibiz-grid-edit-item.is-error .ibiz-grid-edit-item__tooltip{border:1px solid red}.ibiz-grid-edit-item__tooltip{display:flex;align-items:center;justify-content:var(--ibiz-grid-column-justify-content);width:100%;height:100%;text-align:var(--ibiz-grid-column-text-align)}.ibiz-grid-edit-item .ibiz-checkbox--readonly,.ibiz-grid-edit-item .ibiz-date-picker--readonly,.ibiz-grid-edit-item .ibiz-dropdown--readonly,.ibiz-grid-edit-item .ibiz-input--readonly,.ibiz-grid-edit-item .ibiz-mpicker--readonly,.ibiz-grid-edit-item .ibiz-picker--readonly,.ibiz-grid-edit-item .ibiz-picker-dropdown--readonly,.ibiz-grid-edit-item .ibiz-radio--readonly{color:var(--ibiz-color-text-0)}.ibiz-grid-edit-item--show-mask:hover{cursor:pointer;background-color:var(--ibiz-grid-edit-item-cell-hover-bg-color)}
+.ibiz-grid-edit-item{--ibiz-grid-edit-item-cell-hover-bg-color:var(--ibiz-color-fill-0);width:100%;height:100%}.ibiz-grid-edit-item.is-error .ibiz-grid-edit-item__tooltip{border:1px solid red}.ibiz-grid-edit-item__tooltip{display:flex;align-items:center;justify-content:var(--ibiz-grid-column-justify-content);width:100%;height:100%;padding:var(--ibiz-spacing-tight);text-align:var(--ibiz-grid-column-text-align)}.ibiz-grid-edit-item .ibiz-checkbox--readonly,.ibiz-grid-edit-item .ibiz-date-picker--readonly,.ibiz-grid-edit-item .ibiz-dropdown--readonly,.ibiz-grid-edit-item .ibiz-input--readonly,.ibiz-grid-edit-item .ibiz-mpicker--readonly,.ibiz-grid-edit-item .ibiz-picker--readonly,.ibiz-grid-edit-item .ibiz-picker-dropdown--readonly,.ibiz-grid-edit-item .ibiz-radio--readonly{color:var(--ibiz-color-text-0)}.ibiz-grid-edit-item--show-mask:hover{cursor:pointer;background-color:var(--ibiz-grid-edit-item-cell-hover-bg-color)}

package/lib/control/tree/tree.cjs

@@ -2,6 +2,7 @@
 
 var vue = require('vue');
 var vue3Util = require('@ibiz-template/vue3-util');
+var runtime = require('@ibiz-template/runtime');
 var tree_controller = require('./tree.controller.cjs');
 require('./tree.css');
 
@@ -42,6 +43,9 @@ const TreeControl = /* @__PURE__ */ vue.defineComponent({
     singleSelect: {
       type: Boolean,
       default: true
+    },
+    defaultExpandedKeys: {
+      type: Array
     }
   },
   setup() {
@@ -58,16 +62,28 @@ const TreeControl = /* @__PURE__ */ vue.defineComponent({
     };
     const treeData = vue.computed(() => {
       if (!c.state.isLoaded) {
-        return void 0;
+        return [];
       }
-      return c.model.rootVisible ? c.state.rootNode : c.state.rootNode.children;
+      return c.model.rootVisible ? [c.state.rootNode] : c.state.rootNode.children;
     });
     const loadData = async (item, callback) => {
-      if (!c.state.isLoaded) {
+      let nodes;
+      if (item.level === 0) {
+        nodes = treeData.value;
+        ibiz.log.debug("\u521D\u59CB\u52A0\u8F7D");
+      } else if (item.data instanceof runtime.TreeNodeData) {
+        if (item.data.children) {
+          ibiz.log.debug("\u8282\u70B9\u5C55\u5F00\u52A0\u8F7D-\u672C\u5730", item.data);
+          nodes = item.data.children;
+        } else {
+          ibiz.log.debug("\u8282\u70B9\u5C55\u5F00\u52A0\u8F7D-\u8FDC\u7A0B", item.data);
+          nodes = await c.loadNodes(item.data);
+        }
+      } else {
+        ibiz.log.error("\u672A\u8003\u8651\u5230\u7684\u60C5\u51B5", item, item.data);
         return;
       }
-      const nodes = await c.loadNodes(item.data);
-      setCheckedNodes();
+      ibiz.log.debug("\u7ED9\u6811\u8FD4\u56DE\u503C", nodes);
       callback(nodes);
     };
     let selectionWait = false;
@@ -218,14 +234,13 @@ const TreeControl = /* @__PURE__ */ vue.defineComponent({
     return vue.createVNode(vue.resolveComponent("iBizControlBase"), {
       "controller": this.c
     }, {
-      default: () => [this.c.state.isCreated && vue.createVNode(vue.resolveComponent("el-tree"), {
+      default: () => [this.c.state.isLoaded && vue.createVNode(vue.resolveComponent("el-tree"), {
         "ref": "treeRef",
-        "data": this.treeData,
         "node-key": "id",
         "highlight-current": true,
         "expand-on-click-node": false,
         "show-checkbox": !this.c.state.singleSelect,
-        "default-expanded-keys": this.c.state.expandedKeys,
+        "default-expanded-keys": this.c.state.defaultExpandedKeys,
         "props": {
           label: "text",
           children: "children",

package/lib/control/tree/tree.controller.cjs

@@ -12,7 +12,7 @@ class TreeController extends runtime.MDControlController {
       void 0,
       { leaf: false }
     );
-    this.state.expandedKeys = [];
+    this.state.defaultExpandedKeys = [];
     this.state.size = 0;
     this.state.contextMenus = {};
   }
@@ -59,6 +59,7 @@ class TreeController extends runtime.MDControlController {
   async loadNodes(parentNode) {
     const params = await this.getFetchParams();
     const hasQuery = !!params.query;
+    const defaultExpandedKeys = !parentNode ? this.state.defaultExpandedKeys : void 0;
     if (!parentNode) {
       parentNode = this.state.rootNode;
     }
@@ -68,7 +69,8 @@ class TreeController extends runtime.MDControlController {
       nodes = await this.service.fetchChildNodes(parentNode, {
         context: this.context.clone(),
         params,
-        hasQuery
+        hasQuery,
+        defaultExpandedKeys
       }) || [];
     } finally {
       await this.endLoading();
@@ -114,22 +116,6 @@ class TreeController extends runtime.MDControlController {
   setSelection(selection) {
     super.setSelection(selection);
   }
-  /**
-   * 设置展开节点
-   *
-   * @author zk
-   * @date 2023-07-10 08:07:29
-   * @param {string[]} nodeKeys
-   * @param {boolean} [isReplace=false]
-   * @memberof TreeController
-   */
-  setExpandedKeys(nodeKeys, isReplace = false) {
-    if (isReplace) {
-      this.state.expandedKeys = nodeKeys;
-    } else {
-      this.state.expandedKeys.push(...nodeKeys);
-    }
-  }
   /**
    * 获取节点模型
    * @author lxm