@ibiz-template/runtime 0.7.41-alpha.3 → 0.7.41-alpha.5

package/dist/index.esm.js

@@ -16623,25 +16623,25 @@ var require_html2canvas = __commonJS({
             if (isStyleElement(node)) {
               return this.createStyleClone(node);
             }
-            var clone52 = node.cloneNode(false);
-            if (isImageElement(clone52)) {
+            var clone54 = node.cloneNode(false);
+            if (isImageElement(clone54)) {
               if (isImageElement(node) && node.currentSrc && node.currentSrc !== node.src) {
-                clone52.src = node.currentSrc;
-                clone52.srcset = "";
+                clone54.src = node.currentSrc;
+                clone54.srcset = "";
               }
-              if (clone52.loading === "lazy") {
-                clone52.loading = "eager";
+              if (clone54.loading === "lazy") {
+                clone54.loading = "eager";
               }
             }
-            if (isCustomElement(clone52)) {
-              return this.createCustomElementClone(clone52);
+            if (isCustomElement(clone54)) {
+              return this.createCustomElementClone(clone54);
             }
-            return clone52;
+            return clone54;
           };
           DocumentCloner2.prototype.createCustomElementClone = function(node) {
-            var clone52 = document.createElement("html2canvascustomelement");
-            copyCSSStyles(node.style, clone52);
-            return clone52;
+            var clone54 = document.createElement("html2canvascustomelement");
+            copyCSSStyles(node.style, clone54);
+            return clone54;
           };
           DocumentCloner2.prototype.createStyleClone = function(node) {
             try {
@@ -16723,25 +16723,25 @@ var require_html2canvas = __commonJS({
             blankCanvas.height = video.offsetHeight;
             return blankCanvas;
           };
-          DocumentCloner2.prototype.appendChildNode = function(clone52, child, copyStyles) {
+          DocumentCloner2.prototype.appendChildNode = function(clone54, child, copyStyles) {
             if (!isElementNode(child) || !isScriptElement(child) && !child.hasAttribute(IGNORE_ATTRIBUTE) && (typeof this.options.ignoreElements !== "function" || !this.options.ignoreElements(child))) {
               if (!this.options.copyStyles || !isElementNode(child) || !isStyleElement(child)) {
-                clone52.appendChild(this.cloneNode(child, copyStyles));
+                clone54.appendChild(this.cloneNode(child, copyStyles));
               }
             }
           };
-          DocumentCloner2.prototype.cloneChildNodes = function(node, clone52, copyStyles) {
+          DocumentCloner2.prototype.cloneChildNodes = function(node, clone54, copyStyles) {
             var _this = this;
             for (var child = node.shadowRoot ? node.shadowRoot.firstChild : node.firstChild; child; child = child.nextSibling) {
               if (isElementNode(child) && isSlotElement(child) && typeof child.assignedNodes === "function") {
                 var assignedNodes = child.assignedNodes();
                 if (assignedNodes.length) {
                   assignedNodes.forEach(function(assignedNode) {
-                    return _this.appendChildNode(clone52, assignedNode, copyStyles);
+                    return _this.appendChildNode(clone54, assignedNode, copyStyles);
                   });
                 }
               } else {
-                this.appendChildNode(clone52, child, copyStyles);
+                this.appendChildNode(clone54, child, copyStyles);
               }
             }
           };
@@ -16754,53 +16754,53 @@ var require_html2canvas = __commonJS({
             }
             var window2 = node.ownerDocument.defaultView;
             if (window2 && isElementNode(node) && (isHTMLElementNode(node) || isSVGElementNode(node))) {
-              var clone52 = this.createElementClone(node);
-              clone52.style.transitionProperty = "none";
+              var clone54 = this.createElementClone(node);
+              clone54.style.transitionProperty = "none";
               var style = window2.getComputedStyle(node);
               var styleBefore = window2.getComputedStyle(node, ":before");
               var styleAfter = window2.getComputedStyle(node, ":after");
-              if (this.referenceElement === node && isHTMLElementNode(clone52)) {
-                this.clonedReferenceElement = clone52;
+              if (this.referenceElement === node && isHTMLElementNode(clone54)) {
+                this.clonedReferenceElement = clone54;
               }
-              if (isBodyElement(clone52)) {
-                createPseudoHideStyles(clone52);
+              if (isBodyElement(clone54)) {
+                createPseudoHideStyles(clone54);
               }
               var counters = this.counters.parse(new CSSParsedCounterDeclaration(this.context, style));
-              var before = this.resolvePseudoContent(node, clone52, styleBefore, PseudoElementType.BEFORE);
+              var before = this.resolvePseudoContent(node, clone54, styleBefore, PseudoElementType.BEFORE);
               if (isCustomElement(node)) {
                 copyStyles = true;
               }
               if (!isVideoElement(node)) {
-                this.cloneChildNodes(node, clone52, copyStyles);
+                this.cloneChildNodes(node, clone54, copyStyles);
               }
               if (before) {
-                clone52.insertBefore(before, clone52.firstChild);
+                clone54.insertBefore(before, clone54.firstChild);
               }
-              var after = this.resolvePseudoContent(node, clone52, styleAfter, PseudoElementType.AFTER);
+              var after = this.resolvePseudoContent(node, clone54, styleAfter, PseudoElementType.AFTER);
               if (after) {
-                clone52.appendChild(after);
+                clone54.appendChild(after);
               }
               this.counters.pop(counters);
               if (style && (this.options.copyStyles || isSVGElementNode(node)) && !isIFrameElement(node) || copyStyles) {
-                copyCSSStyles(style, clone52);
+                copyCSSStyles(style, clone54);
               }
               if (node.scrollTop !== 0 || node.scrollLeft !== 0) {
-                this.scrolledElements.push([clone52, node.scrollLeft, node.scrollTop]);
+                this.scrolledElements.push([clone54, node.scrollLeft, node.scrollTop]);
               }
-              if ((isTextareaElement(node) || isSelectElement(node)) && (isTextareaElement(clone52) || isSelectElement(clone52))) {
-                clone52.value = node.value;
+              if ((isTextareaElement(node) || isSelectElement(node)) && (isTextareaElement(clone54) || isSelectElement(clone54))) {
+                clone54.value = node.value;
               }
-              return clone52;
+              return clone54;
             }
             return node.cloneNode(false);
           };
-          DocumentCloner2.prototype.resolvePseudoContent = function(node, clone52, style, pseudoElt) {
+          DocumentCloner2.prototype.resolvePseudoContent = function(node, clone54, style, pseudoElt) {
             var _this = this;
             if (!style) {
               return;
             }
             var value = style.content;
-            var document2 = clone52.ownerDocument;
+            var document2 = clone54.ownerDocument;
             if (!document2 || !value || value === "none" || value === "-moz-alt-content" || style.display === "none") {
               return;
             }
@@ -16857,10 +16857,10 @@ var require_html2canvas = __commonJS({
             });
             anonymousReplacedElement.className = PSEUDO_HIDE_ELEMENT_CLASS_BEFORE + " " + PSEUDO_HIDE_ELEMENT_CLASS_AFTER;
             var newClassName = pseudoElt === PseudoElementType.BEFORE ? " " + PSEUDO_HIDE_ELEMENT_CLASS_BEFORE : " " + PSEUDO_HIDE_ELEMENT_CLASS_AFTER;
-            if (isSVGElementNode(clone52)) {
-              clone52.className.baseValue += newClassName;
+            if (isSVGElementNode(clone54)) {
+              clone54.className.baseValue += newClassName;
             } else {
-              clone52.className += newClassName;
+              clone54.className += newClassName;
             }
             return anonymousReplacedElement;
           };
@@ -19179,7 +19179,8 @@ var GlobalConfig = class {
     // 全局菜单配置
     this.appMenu = {
       enableEcho: true,
-      echoMode: "VIEW"
+      echoMode: "VIEW",
+      defaultCollapse: false
     };
     // 全局代码表配置
     this.codeList = {
@@ -22428,7 +22429,7 @@ var TextUtil = class {
 };
 
 // src/utils/theme-util/theme-util.ts
-import { clone as clone46 } from "ramda";
+import { clone as clone48 } from "ramda";
 
 // src/utils/theme-util/custom-theme-util.ts
 import { notNilEmpty as notNilEmpty7 } from "qx-util";
@@ -24313,7 +24314,8 @@ var BuildInKeys = [
   "tempsrfkey",
   "srfuf",
   "srfdeid",
-  "srfdecodename"
+  "srfdecodename",
+  "srfexdata"
 ];
 var ControlVO = class _ControlVO {
   /**
@@ -24417,6 +24419,12 @@ var ControlVO = class _ControlVO {
         });
       }
     );
+    Object.defineProperty(this, "srfexdata", {
+      enumerable: false,
+      configurable: true,
+      writable: true,
+      value: {}
+    });
     this.$dataUIMap.forEach((mapField, key) => {
       const value = mapField.dataKey;
       this.linkProperty(key, value, mapField);
@@ -28050,6 +28058,12 @@ var MethodDto = class {
                   _context,
                   _params
                 );
+              } else if (deRs.nestedAppDEDataSetId) {
+                res = await service.exec(
+                  deRs.nestedAppDEDataSetId,
+                  _context,
+                  _params
+                );
               } else {
                 res = await service.exec("FetchDefault", _context, _params);
               }
@@ -34452,6 +34466,7 @@ function hasSubRoute(routeDepth) {
 
 // src/controller/utils/util/util.ts
 import { isNil as isNil18 } from "ramda";
+import dayjs from "dayjs";
 function isValueChange(value, value2) {
   if ((isNil18(value) || value === "") && (isNil18(value2) || value2 === "")) {
     return false;
@@ -34567,6 +34582,35 @@ function formatSeparator(type, items, state, opts) {
   calcChildrenFormat(items);
   return hideSeparator;
 }
+function formatDate(val, format) {
+  let value = val;
+  const date = new Date(val);
+  if (!val || isNaN(date.getTime()))
+    return value;
+  const year = dayjs(date).year();
+  const month = dayjs(date).month() + 1;
+  switch (format) {
+    case "year":
+      value = "".concat(year);
+      break;
+    case "quarter":
+      value = "".concat(year, " ").concat(Math.ceil(month / 3)).concat(ibiz.i18n.t("runtime.controller.utils.util.quarter"));
+      break;
+    case "month":
+      value = "".concat(year, " ").concat(month).concat(ibiz.i18n.t("runtime.controller.utils.util.month"));
+      break;
+    case "week":
+      const week = dayjs(date).week();
+      value = "".concat(year, " ").concat(week).concat(ibiz.i18n.t("runtime.controller.utils.util.week"));
+      break;
+    case "day":
+      value = dayjs(date).format("YYYY-MM-DD");
+      break;
+    default:
+      break;
+  }
+  return value;
+}
 
 // src/controller/utils/value-rule/value-rule.ts
 import { RuntimeError as RuntimeError25 } from "@ibiz-template/core";
@@ -34758,7 +34802,7 @@ var ValueExUtil = class {
 
 // src/controller/utils/value-default/value-default.ts
 import { RuntimeError as RuntimeError27, ModelError as ModelError15 } from "@ibiz-template/core";
-import dayjs from "dayjs";
+import dayjs2 from "dayjs";
 import { createUUID as createUUID9 } from "qx-util";
 import { isNil as isNil21, isNotNil } from "ramda";
 function getDefaultValue(opts, origins) {
@@ -34792,7 +34836,7 @@ function getDefaultValue(opts, origins) {
     case "OPERATOR":
       return context.srfuserid;
     case "CURTIME":
-      return dayjs().format(valueFormat);
+      return dayjs2().format(valueFormat);
     case "PARAM":
       return data[defaultValue];
     case "SESSION":
@@ -36487,7 +36531,7 @@ var WFStepTraceViewController = class extends ViewController {
 
 // src/controller/common/editor/editor.controller.ts
 import { DataTypes as DataTypes3 } from "@ibiz-template/core";
-import dayjs2 from "dayjs";
+import dayjs3 from "dayjs";
 var EditorController = class {
   /**
    * Creates an instance of EditorController.
@@ -36719,7 +36763,7 @@ var EditorController = class {
     }
     const isDate = DataTypes3.isDate(this.dataType);
     if (isDate) {
-      const formatVal = dayjs2(strVal).format(this.valueFormat);
+      const formatVal = dayjs3(strVal).format(this.valueFormat);
       if (formatVal !== "Invalid Date") {
         return formatVal;
       }
@@ -36981,6 +37025,8 @@ var ControlController = class extends BaseController {
     super.initState();
     this.state.activated = true;
     this.state.isLoading = false;
+    this.state.disabled = false;
+    this.state.maskOption = { mode: "BLANK" };
   }
   async onCreated() {
     var _a3;
@@ -37353,6 +37399,23 @@ var ControlController = class extends BaseController {
       cb();
     }
   }
+  /**
+   * @description 取消部件禁用
+   * @memberof ControlController
+   */
+  enable() {
+    this.state.disabled = false;
+    this.state.maskOption = { mode: "BLANK" };
+  }
+  /**
+   * @description 设置部件禁用
+   * @param {IApiMaskOption} [options={ mode: 'BLANK' }]
+   * @memberof ControlController
+   */
+  disabled(options = { mode: "BLANK" }) {
+    this.state.disabled = true;
+    this.state.maskOption = options;
+  }
 };
 
 // src/controller/common/control/md-control.controller.ts
@@ -37380,6 +37443,13 @@ var MDControlController = class extends ControlController {
      * @type {boolean}
      */
     this.enableLoad = true;
+    /**
+     * @description 分组日期格式化
+     * @protected
+     * @type {(('year' | 'quarter' | 'month' | 'week' | 'day')[])}
+     * @memberof MDControlController
+     */
+    this.groupDateFormat = [];
     /**
      * 实体属性映射，key是id，value是name
      * @author lxm
@@ -37443,6 +37513,7 @@ var MDControlController = class extends ControlController {
     this.state.mdctrlActiveMode = 0;
     this.state.groups = [];
     this.state.hideNoDataImage = false;
+    this.state.enableGroup = !!this.model.enableGroup;
   }
   /**
    * 批操作工具栏
@@ -37496,6 +37567,16 @@ var MDControlController = class extends ControlController {
       this.load({ isInitialLoad: true });
     }
   }
+  /**
+   * @description 执行多数据分组
+   * - 子类实现
+   * @param {IApiMDGroupParams[]} [_arg] 分组参数集合（多层分组暂未支持）
+   * @param {IParams} [_params] 额外参数
+   * @returns {*}  {Promise<void>}
+   * @memberof MDControlController
+   */
+  async execGroup(_arg, _params) {
+  }
   /**
    * 获取部件默认排序模型
    * @return {*}
@@ -38622,7 +38703,7 @@ var AppMenuIconViewController = class extends AppMenuController {
 };
 
 // src/controller/control/calendar/calendar.controller.ts
-import dayjs3 from "dayjs";
+import dayjs4 from "dayjs";
 import { RuntimeError as RuntimeError45, RuntimeModelError as RuntimeModelError48 } from "@ibiz-template/core";
 
 // src/controller/control/calendar/calendar.service.ts
@@ -40857,12 +40938,9 @@ var UIActionProviderBase = class {
    */
   async handleParams(action, context, data, params) {
     let resultData = [];
-    const deName = calcDeCodeNameById(action.appDataEntityId);
-    const entity = await ibiz.hub.getAppDataEntity(
-      action.appDataEntityId,
-      action.appId
-    );
-    const keyField = entity.keyAppDEFieldId;
+    const deName = action.appDataEntityId ? calcDeCodeNameById(action.appDataEntityId) : void 0;
+    const entity = action.appDataEntityId ? await ibiz.hub.getAppDataEntity(action.appDataEntityId, action.appId) : void 0;
+    const keyField = entity == null ? void 0 : entity.keyAppDEFieldId;
     switch (action.actionTarget) {
       case "NONE":
         resultData = [];
@@ -40874,12 +40952,12 @@ var UIActionProviderBase = class {
         resultData = data;
         break;
       case "MULTIKEY":
-        resultData = deName && data.length > 0 ? data.map((item) => ({ [keyField]: item.srfkey || item[keyField] })) : [{}];
+        resultData = deName && keyField && data.length > 0 ? data.map((item) => ({ [keyField]: item.srfkey || item[keyField] })) : [{}];
         break;
       case "SINGLEKEY":
         {
           const originData = data[0] || {};
-          resultData = deName ? [{ [keyField]: originData.srfkey || originData[keyField] }] : [{}];
+          resultData = deName && keyField ? [{ [keyField]: originData.srfkey || originData[keyField] }] : [{}];
         }
         break;
       default:
@@ -42332,9 +42410,9 @@ var CalendarController = class extends MDControlController {
       let result = 0;
       const x = a[sortField];
       const y = b[sortField];
-      if (dayjs3(x).isAfter(y)) {
+      if (dayjs4(x).isAfter(y)) {
         result = -1;
-      } else if (dayjs3(x).isBefore(y)) {
+      } else if (dayjs4(x).isBefore(y)) {
         result = 1;
       }
       return result;
@@ -42406,8 +42484,8 @@ var CalendarController = class extends MDControlController {
           break;
       }
       return {
-        srfstartdate: dayjs3(srfstartdate).format("YYYY-MM-DD HH:mm:ss"),
-        srfenddate: dayjs3(srfenddate).format("YYYY-MM-DD HH:mm:ss")
+        srfstartdate: dayjs4(srfstartdate).format("YYYY-MM-DD HH:mm:ss"),
+        srfenddate: dayjs4(srfenddate).format("YYYY-MM-DD HH:mm:ss")
       };
     }
     return { srfstartdate, srfenddate };
@@ -42514,18 +42592,18 @@ import { RuntimeModelError as RuntimeModelError50 } from "@ibiz-template/core";
 
 // src/controller/control/chart/generator/base-series-generator.ts
 import { plus, RuntimeModelError as RuntimeModelError49, toNumberOrNil } from "@ibiz-template/core";
-import dayjs4 from "dayjs";
+import dayjs5 from "dayjs";
 import minMax from "dayjs/plugin/minMax";
 import isSameOrBefore from "dayjs/plugin/isSameOrBefore";
 import quarterOfYear from "dayjs/plugin/quarterOfYear";
 import weekOfYear from "dayjs/plugin/weekOfYear";
 import isoWeek from "dayjs/plugin/isoWeek";
 import { clone as clone26, isNil as isNil26, mergeDeepRight } from "ramda";
-dayjs4.extend(minMax);
-dayjs4.extend(isSameOrBefore);
-dayjs4.extend(quarterOfYear);
-dayjs4.extend(weekOfYear);
-dayjs4.extend(isoWeek);
+dayjs5.extend(minMax);
+dayjs5.extend(isSameOrBefore);
+dayjs5.extend(quarterOfYear);
+dayjs5.extend(weekOfYear);
+dayjs5.extend(isoWeek);
 var DEFAULT_GROUP = "$default_group";
 var BaseSeriesGenerator = class {
   /**
@@ -43148,25 +43226,25 @@ var BaseSeriesGenerator = class {
             format = "YYYY-MM";
           }
           if (singleData[this.catalogField]) {
-            const formattedDate = dayjs4(singleData[this.catalogField]).format(
+            const formattedDate = dayjs5(singleData[this.catalogField]).format(
               format
             );
             singleData[this.catalogField] = formattedDate;
           }
         } else if (groupMode === "QUARTER") {
           if (singleData[this.catalogField]) {
-            const formattedDate = "".concat(dayjs4(
+            const formattedDate = "".concat(dayjs5(
               singleData[this.catalogField]
-            ).format("YYYY"), "-").concat(dayjs4(
+            ).format("YYYY"), "-").concat(dayjs5(
               singleData[this.catalogField]
             ).quarter());
             singleData[this.catalogField] = formattedDate;
           }
         } else if (groupMode === "YEARWEEK") {
           if (singleData[this.catalogField]) {
-            const formattedDate = "".concat(dayjs4(
+            const formattedDate = "".concat(dayjs5(
               singleData[this.catalogField]
-            ).format("YYYY"), "-").concat(dayjs4(singleData[this.catalogField]).week());
+            ).format("YYYY"), "-").concat(dayjs5(singleData[this.catalogField]).week());
             singleData[this.catalogField] = formattedDate;
           }
         }
@@ -43188,7 +43266,7 @@ var BaseSeriesGenerator = class {
       let sortedKeys = [];
       if (groupMode === "DAY" || groupMode === "YEAR" || groupMode === "MONTH") {
         sortedKeys = Array.from(dateMap.keys()).sort(
-          (a, b) => dayjs4(a).diff(dayjs4(b))
+          (a, b) => dayjs5(a).diff(dayjs5(b))
         );
       } else if (groupMode === "QUARTER" || groupMode === "YEARWEEK") {
         sortedKeys = Array.from(dateMap.keys()).sort((a, b) => {
@@ -43222,11 +43300,11 @@ var BaseSeriesGenerator = class {
     const dates = [];
     Object.keys(data).forEach((key) => {
       data[key].forEach((_val, date) => {
-        dates.push(dayjs4(date));
+        dates.push(dayjs5(date));
       });
     });
-    const maxDate = dayjs4.max(dates);
-    const minDate = dayjs4.min(dates);
+    const maxDate = dayjs5.max(dates);
+    const minDate = dayjs5.min(dates);
     if (groupMode === "DAY") {
       let currentDate = minDate;
       const endDate = maxDate;
@@ -43308,7 +43386,7 @@ var BaseSeriesGenerator = class {
       const [minYear] = minYearWeek.split("-");
       const [maxYear] = maxYearWeek.split("-");
       for (let year = parseInt(minYear, 10); year <= parseInt(maxYear, 10); year++) {
-        const numWeeks = dayjs4("".concat(year, "-12-31")).isoWeek();
+        const numWeeks = dayjs5("".concat(year, "-12-31")).isoWeek();
         for (let week = 1; week <= numWeeks; week++) {
           const yearWeek = "".concat(year, "-").concat(week);
           Object.keys(data).forEach((key) => {
@@ -48593,9 +48671,9 @@ var FilterPortletController = class extends PortletPartController {
 };
 
 // src/controller/control/data-view/data-view.controller.ts
-import { RuntimeModelError as RuntimeModelError56 } from "@ibiz-template/core";
-import { isNil as isNil29 } from "ramda";
-import { isBoolean } from "qx-util";
+import { RuntimeModelError as RuntimeModelError56, isElementSame as isElementSame2 } from "@ibiz-template/core";
+import { clone as clone34, isNil as isNil29 } from "ramda";
+import { createUUID as createUUID11, isBoolean } from "qx-util";
 
 // src/controller/control/data-view/data-view.service.ts
 var DataViewControlService = class extends MDControlService {
@@ -48917,13 +48995,40 @@ var DataViewControlController = class extends MDControlController {
       detail.appId
     );
   }
+  /**
+   * @description 执行多数据分组
+   * @param {IApiMDGroupParams[]} [arg] 分组参数集合（多层分组暂未支持）
+   * @param {IParams} [_params] 额外参数
+   * @returns {*}  {Promise<void>}
+   * @memberof DataViewControlController
+   */
+  async execGroup(arg, _params) {
+    const group = arg[0];
+    this.model = clone34(this.model);
+    this.model.groupMode = "AUTO";
+    if (!group || !group.groupFieldId) {
+      this.state.groups = [];
+      this.model.groupMode = "NONE";
+      this.state.enableGroup = false;
+      this.model.groupCodeListId = void 0;
+      this.model.groupAppDEFieldId = void 0;
+      this.groupDateFormat = [];
+    } else if (group.groupFieldId !== this.model.groupAppDEFieldId || group.dateFormat && !isElementSame2(group.dateFormat, this.groupDateFormat)) {
+      this.state.enableGroup = true;
+      this.model.groupAppDEFieldId = group.groupFieldId;
+      this.model.groupCodeListId = group.groupCodeListId;
+      this.groupDateFormat = group.dateFormat || [];
+      await this.handleDataGroup();
+    }
+  }
   /**
    * 处理数据分组
    *
    * @memberof DataViewControlController
    */
   async handleDataGroup() {
-    const { enableGroup, groupMode, groupAppDEFieldId } = this.model;
+    const { groupMode, groupAppDEFieldId } = this.model;
+    const { enableGroup } = this.state;
     if (enableGroup && groupMode) {
       if (!groupAppDEFieldId) {
         throw new RuntimeModelError56(
@@ -48946,6 +49051,7 @@ var DataViewControlController = class extends MDControlController {
    * @memberof DataViewControlController
    */
   async handleAutoGroup() {
+    var _a3;
     const { groupAppDEFieldId, groupCodeListId } = this.model;
     let codeList = [];
     if (groupCodeListId) {
@@ -48958,16 +49064,28 @@ var DataViewControlController = class extends MDControlController {
     }
     if (groupAppDEFieldId) {
       const { items } = this.state;
+      const deRss = (_a3 = this.dataEntity.minorAppDERSs) == null ? void 0 : _a3.find(
+        (rss) => rss.parentAppDEFieldId === groupAppDEFieldId
+      );
+      const textDEFieldId = deRss == null ? void 0 : deRss.parentTextAppDEFieldId;
+      const dateFormat = this.groupDateFormat[0];
       const groupMap = /* @__PURE__ */ new Map();
+      const unclassified = {
+        key: createUUID11(),
+        caption: ibiz.i18n.t("runtime.controller.common.md.unclassified"),
+        children: []
+      };
       items.forEach((item) => {
-        const groupVal = item[groupAppDEFieldId];
+        let groupVal = item[textDEFieldId || groupAppDEFieldId];
+        if (dateFormat)
+          groupVal = formatDate(groupVal, dateFormat);
         if (isNil29(groupVal)) {
+          unclassified.children.push(item);
           return;
         }
-        if (!groupMap.has(groupVal)) {
-          groupMap.set(groupVal, []);
-        }
-        groupMap.get(groupVal).push(item);
+        const children = groupMap.get(groupVal) || [];
+        children.push(item);
+        groupMap.set(groupVal, children);
       });
       const groups = [];
       groupMap.forEach((value, key) => {
@@ -48978,6 +49096,8 @@ var DataViewControlController = class extends MDControlController {
           children: [...value]
         });
       });
+      if (unclassified.children.length)
+        groups.push(unclassified);
       this.state.groups = groups;
     }
   }
@@ -50027,7 +50147,7 @@ import {
   RuntimeError as RuntimeError51
 } from "@ibiz-template/core";
 import { isBoolean as isBoolean2 } from "qx-util";
-import { clone as clone34 } from "ramda";
+import { clone as clone35 } from "ramda";
 var FormController = class extends ControlController {
   constructor() {
     super(...arguments);
@@ -50301,7 +50421,7 @@ var FormController = class extends ControlController {
    * @return {*}  {Promise<void>}
    */
   async checkIgnoreInput(data) {
-    const formData = clone34(data);
+    const formData = clone35(data);
     const formDataUIMap = formData.$dataUIMap;
     const isCreate = formData.srfuf === 0 /* CREATE */;
     this.formItems.forEach((formItem) => {
@@ -50501,7 +50621,7 @@ import { recursiveIterate as recursiveIterate7 } from "@ibiz-template/core";
 
 // src/controller/control/form/form/form.service.ts
 import { recursiveIterate as recursiveIterate6 } from "@ibiz-template/core";
-import { clone as clone35, isNil as isNil30, isNotNil as isNotNil3 } from "ramda";
+import { clone as clone36, isNil as isNil30, isNotNil as isNotNil3 } from "ramda";
 var FormService = class extends ControlService {
   constructor() {
     super(...arguments);
@@ -50563,7 +50683,7 @@ var FormService = class extends ControlService {
    * @return {*}  {IParams}
    */
   getLoadParams(params) {
-    const copyArgs = clone35(params);
+    const copyArgs = clone36(params);
     const defaultData = {};
     if (copyArgs.srfdefdata) {
       Object.assign(defaultData, copyArgs.srfdefdata);
@@ -50613,6 +50733,9 @@ var FormService = class extends ControlService {
   getFilteredData(data) {
     const _data = data instanceof ControlVO ? data.getOrigin() : data;
     const tempData = {};
+    if (data.srfexdata && Object.keys(data.srfexdata).length > 0) {
+      Object.assign(tempData, { ...data.srfexdata });
+    }
     let tempDataUIMap = this.dataUIMap;
     if (data.$dataUIMap && data.$dataUIMap.size > 0) {
       tempDataUIMap = data.$dataUIMap;
@@ -51628,7 +51751,7 @@ var FormButtonController = class extends FormDetailController {
 
 // src/controller/control/form/form-detail/form-druipart/form-druipart.controller.ts
 import { isOverlap as isOverlap2 } from "@ibiz-template/core";
-import { createUUID as createUUID11, notNilEmpty as notNilEmpty10 } from "qx-util";
+import { createUUID as createUUID12, notNilEmpty as notNilEmpty10 } from "qx-util";
 
 // src/controller/control/form/form-detail/form-druipart/form-druipart.state.ts
 var FormDruipartState = class extends FormDetailState {
@@ -51666,6 +51789,12 @@ var FormDRUIPartController = class extends FormDetailController {
      * @memberof FormDRUIPartController
      */
     this.isNewData = false;
+    /**
+     * @description 是否同步子界面数据服务（处理子应用同实体表单合并关系界面）
+     * @type {boolean}
+     * @memberof FormDRUIPartController
+     */
+    this.isNeedSyncEmbed = false;
   }
   createState() {
     var _a3;
@@ -51690,6 +51819,17 @@ var FormDRUIPartController = class extends FormDetailController {
     if (this.model.paramItem) {
       this.paramItem = this.model.paramItem;
     }
+    this.isNeedSyncEmbed = this.model.appId !== ibiz.env.appId && !!this.model.needSave;
+    const embedView = await ibiz.hub.getAppView(this.model.appViewId);
+    const app = ibiz.hub.getApp(embedView.appId);
+    const tempContext = this.context.clone();
+    tempContext.srfappid = embedView.appId;
+    if (embedView.appDataEntityId) {
+      this.embedDataService = await app.deService.getService(
+        tempContext,
+        embedView.appDataEntityId
+      );
+    }
   }
   /**
    * @description 表单数据变更通知(由表单控制器调用)
@@ -51700,6 +51840,7 @@ var FormDRUIPartController = class extends FormDetailController {
   async dataChangeNotify(names) {
     await super.dataChangeNotify(names);
     if (isOverlap2(this.refreshItems, names)) {
+      await this.SyncDataToEmbedService();
       this.calcViewParams();
     }
   }
@@ -51716,9 +51857,25 @@ var FormDRUIPartController = class extends FormDetailController {
       this.state.showMask = this.isNewData;
     }
     if (state === "LOAD" /* LOAD */ || state === "DRAFT" /* DRAFT */ || state === "SAVE" /* SAVE */) {
+      await this.SyncDataToEmbedService();
       this.calcViewParams();
     }
   }
+  /**
+   * @description 同步当前表单数据至子界面数据服务
+   * @returns {*}  {Promise<void>}
+   * @memberof FormDRUIPartController
+   */
+  async SyncDataToEmbedService() {
+    if (this.isNeedSyncEmbed && this.embedDataService) {
+      const tempContext = this.context.clone();
+      tempContext.srfappid = this.model.appId;
+      const originData = this.form.state.data.$origin;
+      const res = await this.embedDataService.getTemp(tempContext);
+      const syncAction = res.data ? "updateTemp" : "createTemp";
+      await this.embedDataService[syncAction](tempContext, originData);
+    }
+  }
   /**
    * @description 计算视图上下文和视图参数, 调用该方法一定会刷新视图。
    * @returns {*}  {void}
@@ -51726,6 +51883,7 @@ var FormDRUIPartController = class extends FormDetailController {
    */
   calcViewParams() {
     let newContext = this.form.context.clone();
+    newContext.srfignorechange = this.isNeedSyncEmbed;
     const navContexts = this.model.navigateContexts;
     if (notNilEmpty10(navContexts)) {
       newContext = Object.assign(
@@ -51745,7 +51903,7 @@ var FormDRUIPartController = class extends FormDetailController {
       this.form.context
     );
     if (!this.state.viewComponentKey) {
-      this.state.viewComponentKey = createUUID11();
+      this.state.viewComponentKey = createUUID12();
       this.navContext = newContext;
       this.navParams = newParams;
     } else if (JSON.stringify(this.navContext) !== JSON.stringify(newContext) || JSON.stringify(this.navParams) !== JSON.stringify(newParams)) {
@@ -51771,7 +51929,7 @@ var FormDRUIPartController = class extends FormDetailController {
         this.embedView.call("Load" /* LOAD */);
       }
     });
-    this.embedView.evt.on("onDataChange", (event) => {
+    this.embedView.evt.on("onDataChange", async (event) => {
       if (["LOAD", "LOADDRAFT"].includes(event.actionType)) {
         return;
       }
@@ -51784,6 +51942,14 @@ var FormDRUIPartController = class extends FormDetailController {
           this.model.deformItemUpdateId
         );
       }
+      if (this.isNeedSyncEmbed && this.embedDataService) {
+        const tempContext = this.context.clone();
+        tempContext.srfappid = this.model.appId;
+        const res = await this.embedDataService.getTemp(tempContext);
+        const childData = res.data || {};
+        const exData = this.form.state.data.srfexdata || {};
+        this.form.state.data.srfexdata = Object.assign(exData, childData);
+      }
     });
   }
   /**
@@ -51827,7 +51993,7 @@ var FormDRUIPartController = class extends FormDetailController {
 };
 
 // src/controller/control/form/form-detail/form-group-panel/form-group-panel.controller.ts
-import { clone as clone36 } from "ramda";
+import { clone as clone37 } from "ramda";
 
 // src/controller/control/form/form-detail/form-group-panel/form-group-panel.state.ts
 var FormGroupPanelState = class extends FormDetailState {
@@ -51935,7 +52101,7 @@ var FormGroupPanelController = class extends FormDetailController {
    */
   async onActionClick(detail, event, args) {
     const actionId = detail.uiactionId;
-    const tempParams = clone36(this.form.params);
+    const tempParams = clone37(this.form.params);
     if (args) {
       Object.assign(tempParams, args);
     }
@@ -52064,7 +52230,8 @@ var FormItemController = class extends FormDetailController {
    * @type {unknown}
    */
   get value() {
-    return this.data[this.name];
+    var _a3;
+    return (_a3 = this.data) == null ? void 0 : _a3[this.name];
   }
   /**
    * 值项
@@ -52787,7 +52954,7 @@ var FormMDCtrlMDController = class extends FormMDCtrlController {
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.controller.ts
 import { RuntimeError as RuntimeError53, RuntimeModelError as RuntimeModelError62 } from "@ibiz-template/core";
-import { createUUID as createUUID12 } from "qx-util";
+import { createUUID as createUUID13 } from "qx-util";
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.state.ts
 var FormMDCtrlFormState = class extends FormMDCtrlState {
@@ -52991,7 +53158,7 @@ var FormMDCtrlFormController = class extends FormMDCtrlController {
       this.state.items = [];
     }
     const item = {
-      id: createUUID12(),
+      id: createUUID13(),
       context,
       params
     };
@@ -53050,7 +53217,7 @@ var FormMDCtrlFormController = class extends FormMDCtrlController {
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater.controller.ts
 import { ModelError as ModelError26 } from "@ibiz-template/core";
-import { clone as clone37 } from "ramda";
+import { clone as clone38 } from "ramda";
 var FormMDCtrlRepeaterController = class extends FormMDCtrlController {
   constructor() {
     super(...arguments);
@@ -53155,7 +53322,7 @@ var FormMDCtrlRepeaterController = class extends FormMDCtrlController {
     copyFields.forEach((key) => {
       tempForm[key] = this.form.model[key];
     });
-    this.repeatedForm = clone37(tempForm);
+    this.repeatedForm = clone38(tempForm);
   }
   /**
    * @description 设置重复器控制器
@@ -53633,13 +53800,13 @@ var FormButtonListController = class extends FormDetailController {
 import {
   awaitTimeout,
   IBizContext as IBizContext7,
-  isElementSame as isElementSame2,
+  isElementSame as isElementSame3,
   mergeInLeft as mergeInLeft3,
   RuntimeError as RuntimeError54
 } from "@ibiz-template/core";
 import { debounce } from "lodash-es";
-import { createUUID as createUUID13 } from "qx-util";
-import { clone as clone38, isNil as isNil31 } from "ramda";
+import { createUUID as createUUID14 } from "qx-util";
+import { clone as clone39, isNil as isNil31 } from "ramda";
 
 // src/controller/control/form/edit-form/edit-form.service.ts
 import {
@@ -54061,8 +54228,8 @@ var EditFormController = class extends FormController {
    * @return {*}  {Promise<IData>}
    */
   async copy() {
-    const context = clone38(this.context);
-    const queryParams = clone38(this.params);
+    const context = clone39(this.context);
+    const queryParams = clone39(this.params);
     const appDataEntity = await ibiz.hub.getAppDataEntity(
       this.model.appDataEntityId,
       this.model.appId
@@ -54091,7 +54258,7 @@ var EditFormController = class extends FormController {
       await this.endLoading();
     }
     res.data.srfkey = void 0;
-    res.data.tempsrfkey = createUUID13();
+    res.data.tempsrfkey = createUUID14();
     this.state.modified = false;
     this.state.data = res.data;
     this.formStateNotify("LOAD" /* LOAD */);
@@ -54119,7 +54286,7 @@ var EditFormController = class extends FormController {
       return this.loadDraft();
     }
     const { context, params } = this.handlerAbilityParams(args);
-    const queryParams = clone38(params);
+    const queryParams = clone39(params);
     const silent = this.getSilent(args) === true;
     let res;
     try {
@@ -54224,7 +54391,9 @@ var EditFormController = class extends FormController {
         )
       });
     }
-    this.emitDEDataChange(isCreate ? "create" : "update", res.data);
+    if (!this.context.srfignorechange) {
+      this.emitDEDataChange(isCreate ? "create" : "update", res.data);
+    }
     return this.data;
   }
   /**
@@ -54275,7 +54444,9 @@ var EditFormController = class extends FormController {
       }
       ok = res.ok;
     }
-    this.emitDEDataChange("remove", this.data);
+    if (!this.context.srfignorechange) {
+      this.emitDEDataChange("remove", this.data);
+    }
     this.state.data = new ControlVO();
     this.state.modified = false;
     await this.evt.emit("onRemoveSuccess", { args: this.data });
@@ -54388,8 +54559,10 @@ var EditFormController = class extends FormController {
     const { context, params } = this.handlerAbilityParams(args);
     try {
       await this.service.wfStart(context, params, this.data);
-      this.emitDEDataChange("update", this.data);
-      this.emitDEDataChange("update", { srfdecodename: "SysTodo" });
+      if (!this.context.srfignorechange) {
+        this.emitDEDataChange("update", this.data);
+        this.emitDEDataChange("update", { srfdecodename: "SysTodo" });
+      }
     } catch (error) {
       this.actionNotification("WFSTARTERROR", {
         error
@@ -54426,8 +54599,10 @@ var EditFormController = class extends FormController {
     const { context, params } = this.handlerAbilityParams(args);
     try {
       await this.service.wfSubmit(context, params, this.data);
-      this.emitDEDataChange("update", this.data);
-      this.emitDEDataChange("update", { srfdecodename: "SysTodo" });
+      if (!this.context.srfignorechange) {
+        this.emitDEDataChange("update", this.data);
+        this.emitDEDataChange("update", { srfdecodename: "SysTodo" });
+      }
     } catch (error) {
       this.actionNotification("WFSUBMITERROR", {
         error
@@ -54519,7 +54694,7 @@ var EditFormController = class extends FormController {
     const diffData = {};
     Object.keys(data).forEach((key) => {
       if (Array.isArray(data[key])) {
-        if (!isElementSame2(data[key], this.oldData[key])) {
+        if (!isElementSame3(data[key], this.oldData[key])) {
           diffData[key] = data[key];
         }
       } else if (data[key] !== this.oldData[key] || key === data.srfkeyfield) {
@@ -54970,8 +55145,8 @@ import {
   mergeDefaultInLeft as mergeDefaultInLeft2,
   debounceAndAsyncMerge as debounceAndAsyncMerge2
 } from "@ibiz-template/core";
-import { clone as clone40, isNil as isNil32 } from "ramda";
-import dayjs5 from "dayjs";
+import { clone as clone41, isNil as isNil32 } from "ramda";
+import dayjs6 from "dayjs";
 
 // src/controller/control/grid/grid/grid.service.ts
 import { RuntimeModelError as RuntimeModelError64 } from "@ibiz-template/core";
@@ -55141,7 +55316,7 @@ async function calcColumnModelBySchema(json, c) {
 }
 
 // src/controller/control/grid/grid/auto-grid.util.ts
-import { clone as clone39 } from "ramda";
+import { clone as clone40 } from "ramda";
 import { mergeDefaultInLeft } from "@ibiz-template/core";
 var TypeToDataType2 = {
   string: 25,
@@ -55194,7 +55369,7 @@ function getEditorModel(item, appId2, enableCond, isSingleSelect = false) {
     type = "dropdown";
   if (enableCond === 0)
     type = "span";
-  const model = Object.assign(clone39(TypeToEditor[type]), {
+  const model = Object.assign(clone40(TypeToEditor[type]), {
     appId: appId2
   });
   if (type === "dropdown" && isSingleSelect)
@@ -55345,7 +55520,7 @@ async function initModelByEntitySchema(c) {
   if (!json)
     return;
   const { degridColumns, degridDataItems, degridEditItems, degridEditItemVRs } = await calcColumnModelBySchema2(json, c);
-  c.model = clone39(c.model);
+  c.model = clone40(c.model);
   const uaColumns = ((_a3 = c.model.degridColumns) == null ? void 0 : _a3.filter(
     (column) => column.columnType === "UAGRIDCOLUMN"
   )) || [];
@@ -55392,7 +55567,7 @@ async function switchRowEditDynamic(c, row, editable, _isSave = true) {
       await switchRowEditDynamic(c, editingRow);
     }
     if (row.data.srfuf === 1 /* UPDATE */) {
-      row.cacheData = clone39(row.data);
+      row.cacheData = clone40(row.data);
       const defaultVal = c.calcDefaultValue(row.data, false);
       Object.assign(row.data, defaultVal);
     }
@@ -55553,8 +55728,8 @@ var GridController = class extends MDControlController {
       if (!valueFormat) {
         return strVal;
       }
-      if (isDate && dayjs5(strVal, valueFormat, true).isValid()) {
-        const formatVal = dayjs5(strVal).format(valueFormat);
+      if (isDate && dayjs6(strVal, valueFormat, true).isValid()) {
+        const formatVal = dayjs6(strVal).format(valueFormat);
         return formatVal;
       }
       return ibiz.util.text.format(strVal, valueFormat);
@@ -55764,7 +55939,7 @@ var GridController = class extends MDControlController {
     if (!this.addSchemaColumn) {
       return;
     }
-    const tempParams = clone40(this.jsonSchemaParams);
+    const tempParams = clone41(this.jsonSchemaParams);
     Object.assign(tempParams, this.params);
     const json = await getEntitySchema(
       this.model.appDataEntityId,
@@ -55778,7 +55953,7 @@ var GridController = class extends MDControlController {
     if (result && result.degridColumns.length > 0) {
       const { degridColumns, degridDataItems } = result;
       this.allCustomColumns = degridColumns;
-      this.model = clone40(this.model);
+      this.model = clone41(this.model);
       this.model.degridColumns = [
         ...this.model.degridColumns || [],
         ...degridColumns
@@ -55865,9 +56040,8 @@ var GridController = class extends MDControlController {
    * @return {*}  {Promise<void>}
    */
   async initGroup() {
-    if (!this.model.enableGroup) {
+    if (!this.state.enableGroup)
       return;
-    }
     const { groupAppDEFieldId, groupCodeListId, groupMode } = this.model;
     this.groupFieldColumn = Object.values(this.fieldColumns).find(
       (item) => item.model.appDEFieldId === groupAppDEFieldId
@@ -55991,6 +56165,39 @@ var GridController = class extends MDControlController {
       ]);
     }
   }
+  /**
+   * @description 执行多数据分组
+   * @param {IApiMDGroupParams[]} [arg] 分组参数集合（多层分组暂未支持）
+   * @param {IParams} [_params] 额外参数
+   * @returns {*}  {Promise<void>}
+   * @memberof MDControlController
+   */
+  async execGroup(arg, _params) {
+    var _a3;
+    const group = arg[0];
+    this.model = clone41(this.model);
+    this.model.groupMode = "AUTO";
+    const { columnStates } = this.state;
+    const column = (_a3 = this.model.degridColumns) == null ? void 0 : _a3.find(
+      (c) => {
+        var _a4, _b2;
+        return (group == null ? void 0 : group.groupFieldId) && c.columnType === "DEFGRIDCOLUMN" && ((_a4 = c.appDEFieldId) == null ? void 0 : _a4.toLowerCase()) === ((_b2 = group == null ? void 0 : group.groupFieldId) == null ? void 0 : _b2.toLowerCase());
+      }
+    );
+    const columnState = columnStates.find(
+      (c) => !c.hidden && (column == null ? void 0 : column.codeName) === c.key
+    );
+    const groupAppDEFieldId = column == null ? void 0 : column.appDEFieldId;
+    if (!groupAppDEFieldId || !columnState) {
+      this.state.groups = [];
+      this.state.enableGroup = false;
+    } else if (groupAppDEFieldId !== this.model.groupAppDEFieldId) {
+      this.state.enableGroup = true;
+      this.model.groupAppDEFieldId = groupAppDEFieldId;
+      await this.initGroup();
+      this.calcGroupData(this.state.items);
+    }
+  }
   /**
    * 计算分组数据
    * @author lxm
@@ -55999,7 +56206,8 @@ var GridController = class extends MDControlController {
    * @param {IData[]} items
    */
   calcGroupData(items) {
-    const { enableGroup, groupMode } = this.model;
+    const { enableGroup } = this.state;
+    const { groupMode } = this.model;
     if (enableGroup) {
       const groupMap = /* @__PURE__ */ new Map();
       const codeListGroup = groupMode === "CODELIST";
@@ -56505,7 +56713,7 @@ var GridController = class extends MDControlController {
         await this.switchRowEdit(editingRow, false, false);
       }
       if (row.data.srfuf === 1 /* UPDATE */) {
-        row.cacheData = clone40(row.data);
+        row.cacheData = clone41(row.data);
         const defaultVal = this.calcDefaultValue(row.data, false);
         Object.assign(row.data, defaultVal);
       }
@@ -56679,7 +56887,7 @@ var GridController = class extends MDControlController {
    * @Date: 2024-03-20 17:54:16
    */
   formatExcelData(data, fields) {
-    const cloneData = clone40(
+    const cloneData = clone41(
       data.map((item) => {
         return fields.reduce((obj, key) => {
           obj[key] = item[key];
@@ -57160,9 +57368,9 @@ import {
   ModelError as ModelError27,
   base64ToStr
 } from "@ibiz-template/core";
-import dayjs6 from "dayjs";
+import dayjs7 from "dayjs";
 import { debounce as debounce2 } from "lodash-es";
-import { clone as clone41, isNil as isNil33 } from "ramda";
+import { clone as clone42, isNil as isNil33 } from "ramda";
 import { isNilOrEmpty as isNilOrEmpty8 } from "qx-util";
 var GridFieldColumnController = class extends GridColumnController {
   constructor() {
@@ -57354,7 +57562,7 @@ var GridFieldColumnController = class extends GridColumnController {
       srfkey: value,
       ...wfContext
     });
-    const tempParams = clone41(this.params);
+    const tempParams = clone42(this.params);
     const { context: newContext, params: newParams } = this.handlePublicParams(
       row.data,
       tempContext,
@@ -57534,7 +57742,7 @@ var GridFieldColumnController = class extends GridColumnController {
     }
     const isDate = DataTypes5.isDate(this.dataType);
     if (isDate) {
-      const formatVal = dayjs6(strVal).format(this.valueFormat);
+      const formatVal = dayjs7(strVal).format(this.valueFormat);
       if (formatVal !== "Invalid Date") {
         return formatVal;
       }
@@ -57912,7 +58120,9 @@ var GridGroupColumnController = class extends GridColumnController {
 };
 
 // src/controller/control/list/list.controller.ts
-import { isBoolean as isBoolean3 } from "qx-util";
+import { createUUID as createUUID15, isBoolean as isBoolean3 } from "qx-util";
+import { clone as clone43, isNil as isNil34 } from "ramda";
+import { isElementSame as isElementSame4 } from "@ibiz-template/core";
 
 // src/controller/control/list/list.service.ts
 var ListService = class extends MDControlService {
@@ -58106,13 +58316,40 @@ var ListController = class extends MDControlController {
   getAllData() {
     return this.state.items;
   }
+  /**
+   * @description 执行多数据分组
+   * @param {IApiMDGroupParams[]} [arg] 分组参数集合（多层分组暂未支持）
+   * @param {IParams} [_params]
+   * @returns {*}  {Promise<void>}
+   * @memberof ListController
+   */
+  async execGroup(arg, _params) {
+    const group = arg[0];
+    this.model = clone43(this.model);
+    this.model.groupMode = "AUTO";
+    if (!group || !group.groupFieldId) {
+      this.state.groups = [];
+      this.model.groupMode = "NONE";
+      this.state.enableGroup = false;
+      this.model.groupCodeListId = void 0;
+      this.model.groupAppDEFieldId = void 0;
+      this.groupDateFormat = [];
+    } else if (group.groupFieldId !== this.model.groupAppDEFieldId || group.dateFormat && !isElementSame4(group.dateFormat, this.groupDateFormat)) {
+      this.state.enableGroup = true;
+      this.model.groupAppDEFieldId = group.groupFieldId;
+      this.model.groupCodeListId = group.groupCodeListId;
+      this.groupDateFormat = group.dateFormat || [];
+      await this.handleDataGroup();
+    }
+  }
   /**
    * 处理数据分组
    *
    * @memberof DataViewControlController
    */
   async handleDataGroup() {
-    const { enableGroup, groupMode } = this.model;
+    const { groupMode } = this.model;
+    const { enableGroup } = this.state;
     if (enableGroup && groupMode) {
       if (groupMode === "AUTO") {
         await this.handleAutoGroup();
@@ -58130,6 +58367,7 @@ var ListController = class extends MDControlController {
    * @memberof DataViewControlController
    */
   async handleAutoGroup() {
+    var _a3;
     const { groupAppDEFieldId, groupCodeListId } = this.model;
     let codeList = [];
     if (groupCodeListId) {
@@ -58142,14 +58380,31 @@ var ListController = class extends MDControlController {
     }
     if (groupAppDEFieldId) {
       const { items } = this.state;
-      const childrenMap = /* @__PURE__ */ new Map();
+      const deRss = (_a3 = this.dataEntity.minorAppDERSs) == null ? void 0 : _a3.find(
+        (rss) => rss.parentAppDEFieldId === groupAppDEFieldId
+      );
+      const textDEFieldId = deRss == null ? void 0 : deRss.parentTextAppDEFieldId;
+      const dateFormat = this.groupDateFormat[0];
+      const groupMap = /* @__PURE__ */ new Map();
+      const unclassified = {
+        key: createUUID15(),
+        caption: ibiz.i18n.t("runtime.controller.common.md.unclassified"),
+        children: []
+      };
       items.forEach((item) => {
-        const children = childrenMap.get(item[groupAppDEFieldId]) || [];
+        let groupVal = item[textDEFieldId || groupAppDEFieldId];
+        if (dateFormat)
+          groupVal = formatDate(groupVal, dateFormat);
+        if (isNil34(groupVal)) {
+          unclassified.children.push(item);
+          return;
+        }
+        const children = groupMap.get(groupVal) || [];
         children.push(item);
-        childrenMap.set(item[groupAppDEFieldId], children);
+        groupMap.set(groupVal, children);
       });
       const groups = [];
-      childrenMap.forEach((value, key) => {
+      groupMap.forEach((value, key) => {
         const codeListItem = codeList.find((x) => x.value === key);
         groups.push({
           caption: (codeListItem == null ? void 0 : codeListItem.text) || key,
@@ -58157,6 +58412,8 @@ var ListController = class extends MDControlController {
           children: [...value]
         });
       });
+      if (unclassified.children.length)
+        groups.push(unclassified);
       this.state.groups = groups;
     }
   }
@@ -58193,8 +58450,8 @@ var ListController = class extends MDControlController {
       );
       if (otherGroup.length > 0) {
         groups.push({
-          caption: "\u5176\u4ED6",
-          key: "\u5176\u4ED6",
+          caption: ibiz.i18n.t("runtime.controller.common.md.unclassified"),
+          key: ibiz.i18n.t("runtime.controller.common.md.unclassified"),
           children: [...otherGroup]
         });
       }
@@ -59050,7 +59307,7 @@ var PickupViewPanelController = class extends ControlController {
 };
 
 // src/controller/control/tab-exp-panel/tab-exp-panel.controller.ts
-import { createUUID as createUUID14 } from "qx-util";
+import { createUUID as createUUID16 } from "qx-util";
 var TabExpPanelController = class extends ControlController {
   constructor() {
     super(...arguments);
@@ -59289,7 +59546,7 @@ var TabExpPanelController = class extends ControlController {
   }
   refresh() {
     const navViewMsg = this.getNavViewMsg(this.activeTabViewPanelModel);
-    navViewMsg.key += createUUID14();
+    navViewMsg.key += createUUID16();
     this.evt.emit("onNavViewChange", { navViewMsg });
   }
 };
@@ -59300,7 +59557,7 @@ import {
   RuntimeModelError as RuntimeModelError67,
   recursiveIterate as recursiveIterate11
 } from "@ibiz-template/core";
-import { isNil as isNil34 } from "ramda";
+import { isNil as isNil35 } from "ramda";
 import { isBoolean as isBoolean4 } from "qx-util";
 
 // src/controller/control/tree/tree.service.ts
@@ -60718,7 +60975,7 @@ var TreeController = class extends MDControlController {
    * @return {*}  {void}
    */
   onDEDataChange(msg) {
-    if (!isNil34(msg.triggerKey) && msg.triggerKey === this.triggerKey) {
+    if (!isNil35(msg.triggerKey) && msg.triggerKey === this.triggerKey) {
       return;
     }
     if (msg.subtype === "OBJECTCREATED") {
@@ -61300,7 +61557,7 @@ var WizardPanelController = class extends ControlController {
 
 // src/controller/control/md-ctrl/md-ctrl.controller.ts
 import { RuntimeModelError as RuntimeModelError68 } from "@ibiz-template/core";
-import { isNil as isNil35 } from "ramda";
+import { isNil as isNil36 } from "ramda";
 
 // src/controller/control/md-ctrl/md-ctrl.service.ts
 var MDCtrlService = class extends MDControlService {
@@ -61563,7 +61820,7 @@ var MDCtrlController = class extends MDControlController {
       const groupMap = /* @__PURE__ */ new Map();
       items.forEach((item) => {
         const groupVal = item[groupAppDEFieldId];
-        if (isNil35(groupVal)) {
+        if (isNil36(groupVal)) {
           return;
         }
         if (!groupMap.has(groupVal)) {
@@ -61668,10 +61925,10 @@ var MDCtrlController = class extends MDControlController {
 
 // src/controller/control/kanban/kanban.controller.ts
 import { RuntimeError as RuntimeError60, RuntimeModelError as RuntimeModelError69 } from "@ibiz-template/core";
-import { clone as clone43, isNil as isNil36 } from "ramda";
+import { clone as clone45, isNil as isNil37 } from "ramda";
 
 // src/controller/control/kanban/kanban.service.ts
-import { clone as clone42 } from "ramda";
+import { clone as clone44 } from "ramda";
 var KanbanService = class extends DataViewControlService {
   /**
    * 更新分组数据
@@ -61700,7 +61957,7 @@ var KanbanService = class extends DataViewControlService {
    */
   async moveOrderItem(context, data, args) {
     const moveAction = this.model.moveControlAction.appDEMethodId;
-    const params = clone42(data.getOrigin());
+    const params = clone44(data.getOrigin());
     Object.assign(params, args);
     let res = await this.exec(moveAction, context, params, {
       srfupdateitem: true
@@ -61781,7 +62038,7 @@ var KanbanController = class extends DataViewControlController {
     const isAsc = minorSortDir === "ASC";
     items.forEach((item) => {
       const sortValue = item[sortField];
-      if (isNil36(sortValue)) {
+      if (isNil37(sortValue)) {
         item[sortField] = 0;
       } else {
         const toNum = Number(sortValue);
@@ -62037,7 +62294,7 @@ var KanbanController = class extends DataViewControlController {
       }
       return moveData;
     };
-    const draggedItem = clone43(fromGroup.children[fromIndex]);
+    const draggedItem = clone45(fromGroup.children[fromIndex]);
     const removeItems = fromGroup.children.splice(fromIndex, 1);
     toGroup.children.splice(toIndex, 0, ...removeItems);
     if (info.from !== info.to) {
@@ -62312,7 +62569,7 @@ import {
   awaitTimeout as awaitTimeout3,
   recursiveIterate as recursiveIterate12
 } from "@ibiz-template/core";
-import { clone as clone44 } from "ramda";
+import { clone as clone46 } from "ramda";
 
 // src/controller/control/tree-grid-ex/tree-grid-ex.service.ts
 var TreeGridExService = class extends TreeService {
@@ -62864,7 +63121,7 @@ var TreeGridExController = class extends TreeController {
         );
       }
       if (row.data._deData.srfuf === 1 /* UPDATE */) {
-        row.cacheData = clone44(row.data);
+        row.cacheData = clone46(row.data);
         const defaultVal = this.calcDefaultValue(row.data, false);
         Object.assign(row.data, defaultVal);
       }
@@ -63051,8 +63308,8 @@ import {
   RuntimeError as RuntimeError62,
   RuntimeModelError as RuntimeModelError71
 } from "@ibiz-template/core";
-import { clone as clone45 } from "ramda";
-import dayjs7 from "dayjs";
+import { clone as clone47 } from "ramda";
+import dayjs8 from "dayjs";
 var TreeGridExNodeColumnController = class {
   /**
    * @author lxm
@@ -63259,7 +63516,7 @@ var TreeGridExNodeColumnController = class {
       srfkey: value,
       ...wfContext
     });
-    const tempParams = clone45(this.params);
+    const tempParams = clone47(this.params);
     const { userParam } = this.nodeColumn;
     if (userParam) {
       const { navigateContexts, navigateParams } = parseUserParams(userParam);
@@ -63350,7 +63607,7 @@ var TreeGridExNodeColumnController = class {
     }
     const isDate = DataTypes6.isDate(this.dataType);
     if (isDate || this.fieldColumn.name === "createdate") {
-      const formatVal = dayjs7(strVal).format(this.valueFormat);
+      const formatVal = dayjs8(strVal).format(this.valueFormat);
       if (formatVal !== "Invalid Date") {
         return formatVal;
       }
@@ -63741,7 +63998,7 @@ var TreeGridService = class extends GridService {
 
 // src/controller/control/medit-view-panel/medit-view-panel.controller.ts
 import { RuntimeError as RuntimeError63 } from "@ibiz-template/core";
-import { createUUID as createUUID15 } from "qx-util";
+import { createUUID as createUUID17 } from "qx-util";
 
 // src/controller/control/medit-view-panel/medit-view-panel.service.ts
 var MEditViewPanelService = class extends MDControlService {
@@ -63828,7 +64085,7 @@ var MEditViewPanelController = class extends MDControlController {
    */
   handlePanelItemParams(arg) {
     const [{ parameterName }] = this.parameters;
-    const id = arg[parameterName] ? arg[parameterName] : "mockId:".concat(createUUID15());
+    const id = arg[parameterName] ? arg[parameterName] : "mockId:".concat(createUUID17());
     const item = {
       id,
       context: this.context.clone(),
@@ -65728,7 +65985,7 @@ var ThemeUtil = class {
    * @memberof ThemeUtil
    */
   async loadTheme(theme, type = "COLOR") {
-    const data = clone46(theme.themeParams || {});
+    const data = clone48(theme.themeParams || {});
     const path2 = data["theme-package-path"] || theme.themeUrl;
     delete data.appId;
     delete data["theme-package-path"];
@@ -65914,7 +66171,7 @@ var ThemeUtil = class {
 };
 
 // src/utils/ui-domain/ui-domain.ts
-import { QXEvent as QXEvent9, createUUID as createUUID16 } from "qx-util";
+import { QXEvent as QXEvent9, createUUID as createUUID18 } from "qx-util";
 
 // src/utils/ui-domain/transaction.ts
 var Transaction = class {
@@ -66066,7 +66323,7 @@ var UIDomain = class {
     if (id) {
       this.id = id;
     } else {
-      this.id = createUUID16();
+      this.id = createUUID18();
     }
   }
   /**
@@ -66376,8 +66633,8 @@ var baseStyle = {
   position: "fixed",
   zIndex: "10000"
 };
-function cloneElement(clone52, teleport = document.body, isRemoveChild = true) {
-  const element = getAnimationElement(clone52);
+function cloneElement(clone54, teleport = document.body, isRemoveChild = true) {
+  const element = getAnimationElement(clone54);
   if (element == null) {
     throw new Error(ibiz.i18n.t("runtime.utils.anime.noClone"));
   }
@@ -66796,11 +67053,11 @@ function arrayContains(arr, val) {
   });
 }
 function cloneObject(o) {
-  var clone52 = {};
+  var clone54 = {};
   for (var p in o) {
-    clone52[p] = o[p];
+    clone54[p] = o[p];
   }
-  return clone52;
+  return clone54;
 }
 function replaceObjectProps(o1, o2) {
   var o = cloneObject(o1);
@@ -68349,7 +68606,7 @@ var ShortCutUtil = class {
 };
 
 // src/utils/bi-report-util/bi-report-util.ts
-import { clone as clone47 } from "ramda";
+import { clone as clone49 } from "ramda";
 import { RuntimeError as RuntimeError66 } from "@ibiz-template/core";
 var BIReportUtil = class {
   /**
@@ -68365,7 +68622,7 @@ var BIReportUtil = class {
   async openDesignPage(context, params, data) {
     if (!data.mode)
       data.mode = "DATA";
-    const tempContext = clone47(context);
+    const tempContext = clone49(context);
     let config = {};
     if (data.mode === "DATA") {
       const app = ibiz.hub.getApp(ibiz.env.appId);
@@ -68783,7 +69040,7 @@ var BIReportUtil = class {
 
 // src/utils/record-nav-util/record-nav-util.ts
 import { RuntimeError as RuntimeError67 } from "@ibiz-template/core";
-import { createUUID as createUUID17 } from "qx-util";
+import { createUUID as createUUID19 } from "qx-util";
 var RecordNavUtil = class {
   constructor() {
     /**
@@ -68826,7 +69083,7 @@ var RecordNavUtil = class {
    * @param {IData} tempContext
    */
   addTriggerLogic(viewId, data, tempContext) {
-    const triggerLogicId = "".concat(viewId, ":").concat(createUUID17());
+    const triggerLogicId = "".concat(viewId, ":").concat(createUUID19());
     this.triggerLogicMap.set(triggerLogicId, data);
     tempContext.srfnavlogicid = triggerLogicId;
   }
@@ -69032,7 +69289,7 @@ var RecordNavUtil = class {
 
 // src/utils/jsonschema-util/jsonschema-util.ts
 import qs5 from "qs";
-import { clone as clone48 } from "ramda";
+import { clone as clone50 } from "ramda";
 var JsonSchemaUtil = class {
   constructor() {
     /**
@@ -69285,7 +69542,7 @@ var JsonSchemaUtil = class {
   getMockEditor(context, item, valueOP) {
     if (valueOP && this.excludeOPs.includes(valueOP))
       return;
-    const baseMockEditor = clone48(this.DataTypeToEditor[item.type]);
+    const baseMockEditor = clone50(this.DataTypeToEditor[item.type]);
     if (!baseMockEditor)
       return;
     baseMockEditor.appId = context.srfappid;
@@ -73461,7 +73718,7 @@ async function getDeDataMajorField(data, context, appDataEntityId) {
 
 // src/command/app/open-app-view/open-app-view.ts
 import { ModelError as ModelError30, RuntimeError as RuntimeError69 } from "@ibiz-template/core";
-import { clone as clone49 } from "ramda";
+import { clone as clone51 } from "ramda";
 var _OpenAppViewCommand = class _OpenAppViewCommand {
   constructor() {
     ibiz.commands.register(_OpenAppViewCommand.TAG, this.exec.bind(this));
@@ -73478,7 +73735,7 @@ var _OpenAppViewCommand = class _OpenAppViewCommand {
    * @return {*}  {(Promise<IModalData | void>)}
    */
   async exec(appViewId, _context, params = {}, opts = {}) {
-    const context = clone49(_context);
+    const context = clone51(_context);
     if (context.srfsimple) {
       delete context.srfsimple;
     }
@@ -74230,9 +74487,9 @@ import { QXEvent as QXEvent14 } from "qx-util";
 
 // src/controller/notification/async-action.controller.ts
 import { QXEvent as QXEvent12 } from "qx-util";
-import { clone as clone50 } from "ramda";
-import { isNil as isNil37, isNumber as isNumber4 } from "lodash-es";
-import dayjs8 from "dayjs";
+import { clone as clone52 } from "ramda";
+import { isNil as isNil38, isNumber as isNumber4 } from "lodash-es";
+import dayjs9 from "dayjs";
 var AsyncActionController = class {
   constructor() {
     this.evt = new QXEvent12();
@@ -74306,17 +74563,17 @@ var AsyncActionController = class {
     ];
     dateFields.forEach((key) => {
       if (isNumber4(data[key])) {
-        data[key] = dayjs8(data[key]).format("YYYY-MM-DD HH:mm:ss");
+        data[key] = dayjs9(data[key]).format("YYYY-MM-DD HH:mm:ss");
       }
     });
-    if (!isNil37(data.actionresult)) {
+    if (!isNil38(data.actionresult)) {
       try {
         const json = JSON.parse(data.actionresult);
         data.actionresult = json;
       } catch (error) {
       }
     }
-    if (!isNil37(data.completionrate)) {
+    if (!isNil38(data.completionrate)) {
       const num = Number(data.completionrate);
       if (Number.isNaN(num)) {
         data.completionrate = void 0;
@@ -74341,7 +74598,7 @@ var AsyncActionController = class {
     } else {
       this.noticeResult(action);
     }
-    this.evt.emit("add", clone50(action));
+    this.evt.emit("add", clone52(action));
     this.evt.emit("dataChange");
   }
   /**
@@ -74363,7 +74620,7 @@ var AsyncActionController = class {
       }
       this.noticeResult(action);
     }
-    this.evt.emit("change", clone50(action));
+    this.evt.emit("change", clone52(action));
     this.evt.emit("dataChange");
   }
   noticeResult(action) {
@@ -76016,7 +76273,7 @@ var ViewEngineBase = class {
 
 // src/engine/md-view.engine.ts
 import { RuntimeModelError as RuntimeModelError74 } from "@ibiz-template/core";
-import { clone as clone51 } from "ramda";
+import { clone as clone53 } from "ramda";
 var MDViewEngine = class extends ViewEngineBase {
   /**
    * 多数据部件名称
@@ -76289,7 +76546,7 @@ var MDViewEngine = class extends ViewEngineBase {
         ibiz.i18n.t("runtime.engine.logicNewdata")
       );
     }
-    const params = clone51(this.view.params);
+    const params = clone53(this.view.params);
     if (copyMode) {
       params.srfcopymode = copyMode;
     }
@@ -78316,7 +78573,8 @@ var en = {
           noMoveDataCconfig: "No move data behavior config",
           exportRequestFailed: "Export request failed",
           changeGroupError: "Failed to switch the group",
-          computeMoveMetaError: "Error in calculating target position and movement type"
+          computeMoveMetaError: "Error in calculating target position and movement type",
+          unclassified: "Unclassified"
         },
         editor: {
           editorNoConfigured: "Editor type [{editorType}], code table not configured",
@@ -78523,6 +78781,11 @@ var en = {
           saveError: "Failed to save custom theme",
           resetSuccess: "Reset custom theme successfully",
           resetError: "Reset custom theme failed"
+        },
+        util: {
+          quarter: "Quarter",
+          month: "Month",
+          week: "Week"
         }
       }
     },
@@ -78957,7 +79220,8 @@ var zhCn = {
           noMoveDataCconfig: "\u65E0\u79FB\u52A8\u6570\u636E\u884C\u4E3A\u914D\u7F6E",
           exportRequestFailed: "\u5BFC\u51FA\u8BF7\u6C42\u5931\u8D25",
           changeGroupError: "\u5207\u6362\u5206\u7EC4\u5931\u8D25",
-          computeMoveMetaError: "\u8BA1\u7B97\u76EE\u6807\u4F4D\u7F6E\u548C\u79FB\u52A8\u7C7B\u578B\u53D1\u751F\u9519\u8BEF"
+          computeMoveMetaError: "\u8BA1\u7B97\u76EE\u6807\u4F4D\u7F6E\u548C\u79FB\u52A8\u7C7B\u578B\u53D1\u751F\u9519\u8BEF",
+          unclassified: "\u672A\u5206\u7C7B"
         },
         editor: {
           editorNoConfigured: "\u7F16\u8F91\u5668\u7C7B\u578B[{editorType}]\uFF0C\u672A\u914D\u7F6E\u4EE3\u7801\u8868",
@@ -79164,6 +79428,11 @@ var zhCn = {
           saveError: "\u4FDD\u5B58\u81EA\u5B9A\u4E49\u4E3B\u9898\u5931\u8D25",
           resetSuccess: "\u91CD\u7F6E\u81EA\u5B9A\u4E49\u4E3B\u9898\u6210\u529F",
           resetError: "\u91CD\u7F6E\u81EA\u5B9A\u4E49\u4E3B\u9898\u5931\u8D25"
+        },
+        util: {
+          quarter: "\u5B63\u5EA6",
+          month: "\u6708",
+          week: "\u5468"
         }
       }
     },
@@ -79868,6 +80137,7 @@ export {
   findEditItem,
   findFieldById,
   findModelChild,
+  formatDate,
   formatMultiData,
   formatSeparator,
   generateCacheKy,