@ibiz-template/runtime 0.1.26 → 0.1.27

package/dist/index.esm.js

@@ -71,10 +71,10 @@ var require_utils = __commonJS({
       };
     }
     exports.isFunction = isFunction2;
-    var isArray5 = Array.isArray || function(value) {
+    var isArray6 = Array.isArray || function(value) {
       return value && typeof value === "object" ? toString.call(value) === "[object Array]" : false;
     };
-    exports.isArray = isArray5;
+    exports.isArray = isArray6;
     function indexOf(array, value) {
       for (var i = 0, len = array.length; i < len; i++) {
         if (array[i] === value) {
@@ -102,7 +102,7 @@ var require_utils = __commonJS({
     function isEmpty9(value) {
       if (!value && value !== 0) {
         return true;
-      } else if (isArray5(value) && value.length === 0) {
+      } else if (isArray6(value) && value.length === 0) {
         return true;
       } else {
         return false;
@@ -6832,6 +6832,7 @@ function parseUserParams(userParams) {
 }
 
 // src/model/layout/layout.ts
+import { isArray as isArray2, isObject, isString } from "lodash-es";
 function calcLayoutHeightWidth(layoutPos) {
   const { width, height, widthMode, heightMode } = layoutPos;
   const result = { width: "", height: "" };
@@ -6926,10 +6927,23 @@ function calcGridLayoutPos(layoutPos) {
   };
 }
 function calcDynaClass(expression, data) {
-  return ScriptFactory.execScriptFn({ data }, expression, {
+  const classArr = [];
+  const result = ScriptFactory.execScriptFn({ data }, expression, {
     singleRowReturn: true,
     isAsync: false
   });
+  if (isString(result)) {
+    classArr.push(result);
+  } else if (isArray2(result)) {
+    classArr.push(...result);
+  } else if (isObject(result)) {
+    Object.keys(result).forEach((key) => {
+      if (result[key]) {
+        classArr.push(key);
+      }
+    });
+  }
+  return classArr;
 }
 
 // src/model/main-state/main-state.ts
@@ -12040,6 +12054,9 @@ var EndNode = class extends DELogicNode {
   async exec(ctx) {
     ctx.isEndNode = true;
     const { returnParamId, returnType, rawValue } = this.model;
+    if (!returnType) {
+      return;
+    }
     switch (returnType) {
       case "NONEVALUE":
         ctx.result = void 0;
@@ -13524,7 +13541,7 @@ var ControlService = class {
 
 // src/service/service/control/md-control.service.ts
 import { RuntimeError as RuntimeError15 } from "@ibiz-template/core";
-import { isArray as isArray2 } from "qx-util";
+import { isArray as isArray3 } from "qx-util";
 var MDControlService = class extends ControlService {
   /**
    * 执行查询多条数据的方法
@@ -13656,7 +13673,7 @@ var MDControlService = class extends ControlService {
       }
     }
     if (res.ok) {
-      if (isArray2(res.data)) {
+      if (isArray3(res.data)) {
         res.data = res.data.map((item) => this.toUIData(item));
       } else {
         res.data = this.toUIData(res.data);
@@ -14529,9 +14546,9 @@ var PanelNotifyState = /* @__PURE__ */ ((PanelNotifyState2) => {
 })(PanelNotifyState || {});
 
 // src/controller/common/view/view.controller.ts
-import { createUUID as createUUID2, notNilEmpty as notNilEmpty6 } from "qx-util";
-import { IBizContext as IBizContext2, RuntimeError as RuntimeError22 } from "@ibiz-template/core";
-import { isEmpty as isEmpty8, isNil as isNil12, isNotNil as isNotNil2 } from "ramda";
+import { createUUID as createUUID3, notNilEmpty as notNilEmpty6 } from "qx-util";
+import { IBizContext as IBizContext2, RuntimeError as RuntimeError23 } from "@ibiz-template/core";
+import { isEmpty as isEmpty8, isNil as isNil13, isNotNil as isNotNil3 } from "ramda";
 
 // src/controller/utils/loading/loading.state.ts
 import { NOOP } from "@ibiz-template/core";
@@ -15250,6 +15267,60 @@ var ValueExUtil = class {
   }
 };
 
+// src/controller/utils/value-default/value-default.ts
+import { RuntimeError as RuntimeError22, ModelError as ModelError16 } from "@ibiz-template/core";
+import dayjs from "dayjs";
+import { createUUID as createUUID2 } from "qx-util";
+import { isNil as isNil12, isNotNil as isNotNil2 } from "ramda";
+function getDefaultValue(opts, origins) {
+  var _a;
+  const { name, valueType, defaultValue, valueFormat } = opts;
+  const { data, context, params } = origins;
+  if (isNil12(valueType) && isNil12(defaultValue)) {
+    return;
+  }
+  if (valueType === "RESET") {
+    return null;
+  }
+  const value = data[name];
+  if (isNotNil2(value)) {
+    return;
+  }
+  if (!valueType && defaultValue) {
+    return defaultValue;
+  }
+  switch (valueType) {
+    case "APPDATA":
+      if (Object.prototype.hasOwnProperty.call(params, defaultValue)) {
+        return params[defaultValue];
+      }
+      if (Object.prototype.hasOwnProperty.call(context, defaultValue)) {
+        return context[defaultValue];
+      }
+      break;
+    case "OPERATORNAME":
+      return context.srfusername;
+    case "OPERATOR":
+      return context.srfuserid;
+    case "CURTIME":
+      return dayjs().format(valueFormat);
+    case "PARAM":
+      return data[defaultValue];
+    case "SESSION":
+    case "APPLICATION":
+      if (!((_a = ibiz.appData) == null ? void 0 : _a.context)) {
+        throw new RuntimeError22("appdata.context\u4E0D\u5B58\u5728");
+      }
+      return ibiz.appData.context[defaultValue];
+    case "CONTEXT":
+      return params[defaultValue];
+    case "UNIQUEID":
+      return createUUID2();
+    default:
+      throw new ModelError16({}, "\u9ED8\u8BA4\u503C\u7C7B\u578B[".concat(valueType, "]\u672A\u652F\u6301"));
+  }
+}
+
 // src/controller/common/base.controller.ts
 var SELF_KEY = "__self";
 var BaseController = class {
@@ -15595,7 +15666,7 @@ var ViewController = class extends BaseController {
   async onCreated() {
     await super.onCreated();
     this.modal.hooks.beforeDismiss.tapPromise(async (modalData) => {
-      if (isNotNil2(this.state.closeOK)) {
+      if (isNotNil3(this.state.closeOK)) {
         modalData.ok = this.state.closeOK;
       }
       await this._evt.emit("onCloseView", { ...modalData });
@@ -15665,8 +15736,8 @@ var ViewController = class extends BaseController {
    */
   handleContextParams() {
     this.context.srfappid = this.model.appId;
-    if (isNil12(this.context.srfsessionid) || isEmpty8(this.context.srfsessionid)) {
-      this.context.srfsessionid = createUUID2();
+    if (isNil13(this.context.srfsessionid) || isEmpty8(this.context.srfsessionid)) {
+      this.context.srfsessionid = createUUID3();
     }
     const navContexts = this.model.appViewNavContexts;
     let context = {};
@@ -15697,7 +15768,7 @@ var ViewController = class extends BaseController {
   async callUIAction(key, args) {
     const result = this.call(key, args);
     if (result === void 0) {
-      throw new RuntimeError22("\u6CA1\u6709\u5F15\u64CE\u652F\u6301\u9884\u7F6E\u754C\u9762\u884C\u4E3A".concat(key));
+      throw new RuntimeError23("\u6CA1\u6709\u5F15\u64CE\u652F\u6301\u9884\u7F6E\u754C\u9762\u884C\u4E3A".concat(key));
     }
     return result;
   }
@@ -15928,7 +15999,7 @@ var CodeListEditorController = class extends EditorController {
 
 // src/controller/common/control/control.controller.ts
 import { NoticeError } from "@ibiz-template/core";
-import { isNil as isNil13 } from "ramda";
+import { isNil as isNil14 } from "ramda";
 var ControlController = class extends BaseController {
   /**
    * Creates an instance of ControlController.
@@ -16105,7 +16176,7 @@ var ControlController = class extends BaseController {
     let message;
     let duration;
     if (msgItem && msgItem.content) {
-      duration = isNil13(msgItem.timeout) ? void 0 : msgItem.timeout / 1e3;
+      duration = isNil14(msgItem.timeout) ? void 0 : msgItem.timeout / 1e3;
       const scriptParams = { ...this.getEventArgs() };
       if (opts == null ? void 0 : opts.data) {
         scriptParams.data = opts.data;
@@ -16144,7 +16215,7 @@ var ControlController = class extends BaseController {
 };
 
 // src/controller/common/control/md-control.controller.ts
-import { isElementSame, RuntimeError as RuntimeError23 } from "@ibiz-template/core";
+import { isElementSame, RuntimeError as RuntimeError24 } from "@ibiz-template/core";
 var MDControlController = class extends ControlController {
   constructor() {
     super(...arguments);
@@ -16187,6 +16258,12 @@ var MDControlController = class extends ControlController {
     ibiz.mc.command.change.on(this.onDataChange);
     this.setSort();
   }
+  async onMounted() {
+    await super.onMounted();
+    if (this.state.loadDefault) {
+      this.load({ isInitialLoad: true });
+    }
+  }
   onDestroyed() {
     ibiz.mc.command.change.off(this.onDataChange);
     return super.onDestroyed();
@@ -16320,7 +16397,7 @@ var MDControlController = class extends ControlController {
   async remove(args) {
     const { context, params, data } = this.handlerAbilityParams(args);
     if (!(data == null ? void 0 : data.length)) {
-      throw new RuntimeError23("\u672A\u9009\u4E2D\u6570\u636E");
+      throw new RuntimeError24("\u672A\u9009\u4E2D\u6570\u636E");
     }
     if ((args == null ? void 0 : args.silent) !== true) {
       const del = await ibiz.confirm.error({
@@ -16464,7 +16541,7 @@ var MDControlController = class extends ControlController {
 // src/controller/control/app-menu/app-menu.controller.ts
 import {
   findRecursiveChild,
-  RuntimeError as RuntimeError24,
+  RuntimeError as RuntimeError25,
   RuntimeModelError as RuntimeModelError21
 } from "@ibiz-template/core";
 var AppMenuController = class extends ControlController {
@@ -16504,7 +16581,7 @@ var AppMenuController = class extends ControlController {
       childrenFields: ["appMenuItems"]
     });
     if (!menuItem) {
-      throw new RuntimeError24("\u627E\u4E0D\u5230\u540D\u4E3A".concat(id, "\u7684\u83DC\u5355\u9879"));
+      throw new RuntimeError25("\u627E\u4E0D\u5230\u540D\u4E3A".concat(id, "\u7684\u83DC\u5355\u9879"));
     }
     this.evt.emit("onClick", {
       eventArg: id,
@@ -16594,7 +16671,7 @@ var AppMenuController = class extends ControlController {
 // src/controller/control/app-menu-icon-view/app-menu-icon-view.controller.ts
 import {
   findRecursiveChild as findRecursiveChild2,
-  RuntimeError as RuntimeError25,
+  RuntimeError as RuntimeError26,
   RuntimeModelError as RuntimeModelError22
 } from "@ibiz-template/core";
 var AppMenuIconViewController = class extends AppMenuController {
@@ -16604,7 +16681,7 @@ var AppMenuIconViewController = class extends AppMenuController {
       childrenFields: ["appMenuItems"]
     });
     if (!menuItem) {
-      throw new RuntimeError25("\u627E\u4E0D\u5230\u540D\u4E3A".concat(id, "\u7684\u83DC\u5355\u9879"));
+      throw new RuntimeError26("\u627E\u4E0D\u5230\u540D\u4E3A".concat(id, "\u7684\u83DC\u5355\u9879"));
     }
     this.evt.emit("onClick", {
       eventArg: id,
@@ -16629,10 +16706,10 @@ var AppMenuIconViewController = class extends AppMenuController {
 };
 
 // src/controller/control/calendar/calendar.controller.ts
-import dayjs from "dayjs";
+import dayjs2 from "dayjs";
 
 // src/controller/control/calendar/calendar.service.ts
-import { RuntimeError as RuntimeError26 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError27 } from "@ibiz-template/core";
 var CalendarService = class extends MDControlService {
   /**
    * 执行查询多条数据的方法
@@ -16682,11 +16759,11 @@ var CalendarService = class extends MDControlService {
   setCalendarConfigData(items, index) {
     const { sysCalendarItems } = this.model;
     if (!sysCalendarItems) {
-      throw new RuntimeError26("\u672A\u627E\u5230\u65E5\u5386\u9879\u6A21\u578B");
+      throw new RuntimeError27("\u672A\u627E\u5230\u65E5\u5386\u9879\u6A21\u578B");
     }
     const calendarItem = sysCalendarItems[index];
     if (!calendarItem) {
-      throw new RuntimeError26("\u672A\u627E\u5230\u65E5\u5386\u9879\u6A21\u578B");
+      throw new RuntimeError27("\u672A\u627E\u5230\u65E5\u5386\u9879\u6A21\u578B");
     }
     return items.map((item) => {
       return new CalendarItemData(calendarItem, item);
@@ -16799,8 +16876,8 @@ var CalendarController = class extends MDControlController {
         1
       );
       return {
-        start: dayjs(firstDayOfMonth).format("YYYY-MM-DD HH:mm:ss"),
-        end: dayjs(lastDayOfMonth).format("YYYY-MM-DD HH:mm:ss")
+        start: dayjs2(firstDayOfMonth).format("YYYY-MM-DD HH:mm:ss"),
+        end: dayjs2(lastDayOfMonth).format("YYYY-MM-DD HH:mm:ss")
       };
     }
     return { start, end };
@@ -16876,29 +16953,29 @@ var CalendarController = class extends MDControlController {
 };
 
 // src/controller/control/chart/chart.controller.ts
-import { RuntimeError as RuntimeError28 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError29 } from "@ibiz-template/core";
 
 // src/controller/control/chart/generator/chart-options-generator.ts
 import { mergeDeepRight as mergeDeepRight3 } from "ramda";
-import { RuntimeError as RuntimeError27 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError28 } from "@ibiz-template/core";
 
 // src/controller/control/chart/generator/line-series-generator.ts
 import { RuntimeModelError as RuntimeModelError24 } from "@ibiz-template/core";
 
 // src/controller/control/chart/generator/base-series-generator.ts
 import { RuntimeModelError as RuntimeModelError23, toNumberOrNil } from "@ibiz-template/core";
-import dayjs2 from "dayjs";
+import dayjs3 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 clone11, isNil as isNil14, mergeDeepRight } from "ramda";
-dayjs2.extend(minMax);
-dayjs2.extend(isSameOrBefore);
-dayjs2.extend(quarterOfYear);
-dayjs2.extend(weekOfYear);
-dayjs2.extend(isoWeek);
+import { clone as clone11, isNil as isNil15, mergeDeepRight } from "ramda";
+dayjs3.extend(minMax);
+dayjs3.extend(isSameOrBefore);
+dayjs3.extend(quarterOfYear);
+dayjs3.extend(weekOfYear);
+dayjs3.extend(isoWeek);
 var DEFAULT_GROUP = "$default_group";
 var BaseSeriesGenerator = class {
   /**
@@ -16982,10 +17059,10 @@ var BaseSeriesGenerator = class {
    * @return {*}  {(string | undefined)}
    */
   translateVal(codeListKey, val, isExclude = false) {
-    if (isNil14(val)) {
+    if (isNil15(val)) {
       return void 0;
     }
-    if (isNil14(codeListKey)) {
+    if (isNil15(codeListKey)) {
       return val;
     }
     const codeListItems = this.chartGenerator.codeListMap.get(codeListKey);
@@ -17015,7 +17092,7 @@ var BaseSeriesGenerator = class {
           seriesCodeListId,
           item[this.groupField]
         );
-        if (isNil14(groupVal)) {
+        if (isNil15(groupVal)) {
           return;
         }
         group = groupVal;
@@ -17131,25 +17208,25 @@ var BaseSeriesGenerator = class {
             format = "YYYY-MM";
           }
           if (singleData[this.catalogField]) {
-            const formattedDate = dayjs2(singleData[this.catalogField]).format(
+            const formattedDate = dayjs3(singleData[this.catalogField]).format(
               format
             );
             singleData[this.catalogField] = formattedDate;
           }
         } else if (groupMode === "QUARTER") {
           if (singleData[this.catalogField]) {
-            const formattedDate = "".concat(dayjs2(
+            const formattedDate = "".concat(dayjs3(
               singleData[this.catalogField]
-            ).format("YYYY"), "-").concat(dayjs2(
+            ).format("YYYY"), "-").concat(dayjs3(
               singleData[this.catalogField]
             ).quarter());
             singleData[this.catalogField] = formattedDate;
           }
         } else if (groupMode === "YEARWEEK") {
           if (singleData[this.catalogField]) {
-            const formattedDate = "".concat(dayjs2(
+            const formattedDate = "".concat(dayjs3(
               singleData[this.catalogField]
-            ).format("YYYY"), "-").concat(dayjs2(singleData[this.catalogField]).week());
+            ).format("YYYY"), "-").concat(dayjs3(singleData[this.catalogField]).week());
             singleData[this.catalogField] = formattedDate;
           }
         }
@@ -17171,7 +17248,7 @@ var BaseSeriesGenerator = class {
       let sortedKeys = [];
       if (groupMode === "DAY" || groupMode === "YEAR" || groupMode === "MONTH") {
         sortedKeys = Array.from(dateMap.keys()).sort(
-          (a, b) => dayjs2(a).diff(dayjs2(b))
+          (a, b) => dayjs3(a).diff(dayjs3(b))
         );
       } else if (groupMode === "QUARTER" || groupMode === "YEARWEEK") {
         sortedKeys = Array.from(dateMap.keys()).sort((a, b) => {
@@ -17205,11 +17282,11 @@ var BaseSeriesGenerator = class {
     const dates = [];
     Object.keys(data).forEach((key) => {
       data[key].forEach((_val, date) => {
-        dates.push(dayjs2(date));
+        dates.push(dayjs3(date));
       });
     });
-    const maxDate = dayjs2.max(dates);
-    const minDate = dayjs2.min(dates);
+    const maxDate = dayjs3.max(dates);
+    const minDate = dayjs3.min(dates);
     if (groupMode === "DAY") {
       let currentDate = minDate;
       const endDate = maxDate;
@@ -17291,7 +17368,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 = dayjs2("".concat(year, "-12-31")).isoWeek();
+        const numWeeks = dayjs3("".concat(year, "-12-31")).isoWeek();
         for (let week = 1; week <= numWeeks; week++) {
           const yearWeek = "".concat(year, "-").concat(week);
           Object.keys(data).forEach((key) => {
@@ -17816,7 +17893,7 @@ var ChartOptionsGenerator2 = class {
   getSrfkeyByParams(params) {
     const generator = this.seriesGenerators[params.seriesIndex];
     if (!generator) {
-      throw new RuntimeError27("\u627E\u4E0D\u5230".concat(params.seriesIndex, "\u5E8F\u5217\u7684generator\uFF01"));
+      throw new RuntimeError28("\u627E\u4E0D\u5230".concat(params.seriesIndex, "\u5E8F\u5217\u7684generator\uFF01"));
     }
     return generator.getSrfkeyByParams(params);
   }
@@ -17928,10 +18005,10 @@ var ChartController = class extends MDControlController {
    */
   updateChart() {
     if (!this.chart) {
-      throw new RuntimeError28("chart\u5BF9\u8C61\u6CA1\u6709\u6B63\u786E\u521D\u59CB\u5316");
+      throw new RuntimeError29("chart\u5BF9\u8C61\u6CA1\u6709\u6B63\u786E\u521D\u59CB\u5316");
     }
     if (!this.options) {
-      throw new RuntimeError28("options\u8FD8\u6CA1\u8BA1\u7B97");
+      throw new RuntimeError29("options\u8FD8\u6CA1\u8BA1\u7B97");
     }
     this.chart.setOption(this.options);
     this.resizeChart();
@@ -17980,16 +18057,16 @@ import { recursiveIterate } from "@ibiz-template/core";
 
 // src/ui-action/provider/backend-ui-action-provider.ts
 import { RuntimeModelError as RuntimeModelError44 } from "@ibiz-template/core";
-import { isArray as isArray3 } from "qx-util";
+import { isArray as isArray4 } from "qx-util";
 
 // src/ui-action/provider/ui-action-provider-base.ts
 import { RuntimeModelError as RuntimeModelError43 } from "@ibiz-template/core";
 
 // src/ui-logic/index.ts
-import { RuntimeError as RuntimeError33 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError34 } from "@ibiz-template/core";
 
 // src/ui-logic/ui-logic.ts
-import { ModelError as ModelError23, RuntimeModelError as RuntimeModelError42 } from "@ibiz-template/core";
+import { ModelError as ModelError24, RuntimeModelError as RuntimeModelError42 } from "@ibiz-template/core";
 
 // src/ui-logic/ui-logic-context.ts
 var UILogicContext = class {
@@ -18115,7 +18192,7 @@ var UILogicContext = class {
 import { RuntimeModelError as RuntimeModelError29 } from "@ibiz-template/core";
 
 // src/ui-logic/ui-logic-link/ui-logic-link.ts
-import { ModelError as ModelError17 } from "@ibiz-template/core";
+import { ModelError as ModelError18 } from "@ibiz-template/core";
 
 // src/ui-logic/ui-logic-link/ui-logic-link-group-cond/ui-logic-link-group-cond.ts
 import { RuntimeModelError as RuntimeModelError28 } from "@ibiz-template/core";
@@ -18125,7 +18202,7 @@ var UILogicLinkCond = class {
 };
 
 // src/ui-logic/ui-logic-link/ui-logic-link-single-cond/ui-logic-link-single-cond.ts
-import { ModelError as ModelError16, RuntimeModelError as RuntimeModelError27 } from "@ibiz-template/core";
+import { ModelError as ModelError17, RuntimeModelError as RuntimeModelError27 } from "@ibiz-template/core";
 var UILogicLinkSingleCond = class extends UILogicLinkCond {
   constructor(model) {
     super();
@@ -18179,7 +18256,7 @@ var UILogicLinkSingleCond = class extends UILogicLinkCond {
         return testCond(dst[this.dstField], this.op, src[this.value]);
       }
       case "CURTIME":
-        throw new ModelError16(this.model, "\u6682\u672A\u652F\u6301\u6761\u4EF6\u503C\u7C7B\u578B\u4E3A[\u5F53\u524D\u65F6\u95F4]");
+        throw new ModelError17(this.model, "\u6682\u672A\u652F\u6301\u6761\u4EF6\u503C\u7C7B\u578B\u4E3A[\u5F53\u524D\u65F6\u95F4]");
       default:
         return testCond(dst[this.dstField], this.op, this.value);
     }
@@ -18321,13 +18398,13 @@ var UILogicLink = class {
       case 1:
         return true;
       case 2:
-        throw new ModelError17(this.model, "\u672A\u652F\u6301\u7684\u903B\u8F91\u8FDE\u63A5\u7C7B\u578B: \u5F02\u6B65\u7ED3\u675F");
+        throw new ModelError18(this.model, "\u672A\u652F\u6301\u7684\u903B\u8F91\u8FDE\u63A5\u7C7B\u578B: \u5F02\u6B65\u7ED3\u675F");
       case 3:
-        throw new ModelError17(this.model, "\u672A\u652F\u6301\u7684\u903B\u8F91\u8FDE\u63A5\u7C7B\u578B: \u5F02\u6B65\u62D2\u7EDD");
+        throw new ModelError18(this.model, "\u672A\u652F\u6301\u7684\u903B\u8F91\u8FDE\u63A5\u7C7B\u578B: \u5F02\u6B65\u62D2\u7EDD");
       case 9:
-        throw new ModelError17(this.model, "\u672A\u652F\u6301\u7684\u903B\u8F91\u8FDE\u63A5\u7C7B\u578B: \u5F02\u5E38\u5904\u7406");
+        throw new ModelError18(this.model, "\u672A\u652F\u6301\u7684\u903B\u8F91\u8FDE\u63A5\u7C7B\u578B: \u5F02\u5E38\u5904\u7406");
       default:
-        throw new ModelError17(this.model, "\u672A\u652F\u6301\u7684\u903B\u8F91\u8FDE\u63A5\u7C7B\u578B:".concat(linkMode));
+        throw new ModelError18(this.model, "\u672A\u652F\u6301\u7684\u903B\u8F91\u8FDE\u63A5\u7C7B\u578B:".concat(linkMode));
     }
   }
 };
@@ -18411,11 +18488,14 @@ var StartNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/end-node/end-node.ts
-import { ModelError as ModelError18 } from "@ibiz-template/core";
+import { ModelError as ModelError19 } from "@ibiz-template/core";
 var EndNode2 = class extends UILogicNode {
   async exec(ctx) {
     ctx.isEndNode = true;
     const { returnType, rawValue, returnParamId } = this.model;
+    if (!returnType) {
+      return;
+    }
     switch (returnType) {
       case "NONEVALUE":
         ctx.result = void 0;
@@ -18432,7 +18512,7 @@ var EndNode2 = class extends UILogicNode {
       case "LOGICPARAMFIELD":
       case "BREAK":
       default:
-        throw new ModelError18(
+        throw new ModelError19(
           this.model,
           "\u6682\u672A\u652F\u6301\u7684\u7ED3\u675F\u8282\u70B9\u8FD4\u56DE\u503C\u7C7B\u578B: ".concat(returnType)
         );
@@ -18441,11 +18521,11 @@ var EndNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/prepare-js-param-node/prepare-js-param-node.ts
-import { ModelError as ModelError20 } from "@ibiz-template/core";
+import { ModelError as ModelError21 } from "@ibiz-template/core";
 import { clone as clone13 } from "ramda";
 
 // src/ui-logic/utils/handle-src-val.ts
-import { ModelError as ModelError19 } from "@ibiz-template/core";
+import { ModelError as ModelError20 } from "@ibiz-template/core";
 import { clone as clone12 } from "ramda";
 function handleSrcVal2(ctx, srcValParams) {
   const { srcDEUILogicParamId, srcFieldName, srcValue } = srcValParams;
@@ -18475,7 +18555,7 @@ function handleSrcVal2(ctx, srcValParams) {
       value = clone12(ibiz.env);
       break;
     default:
-      throw new ModelError19(srcValParams, "\u6682\u672A\u652F\u6301\u6E90\u503C\u7C7B\u578B".concat(srcValueType));
+      throw new ModelError20(srcValParams, "\u6682\u672A\u652F\u6301\u6E90\u503C\u7C7B\u578B".concat(srcValueType));
   }
   const srcField = srcFieldName;
   if (value && srcField) {
@@ -18515,7 +18595,7 @@ var PrepareJSParamNode = class extends UILogicNode {
           await this.sortParam(nodeParam, ctx);
           break;
         default:
-          throw new ModelError20(
+          throw new ModelError21(
             nodeParam,
             "\u6682\u672A\u652F\u6301\u903B\u8F91\u5904\u7406\u53C2\u6570\u64CD\u4F5C".concat(nodeParam.paramAction)
           );
@@ -18629,7 +18709,7 @@ var PrepareJSParamNode = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/view-ctrl-invoke-node/view-ctrl-invoke-node.ts
-import { RuntimeError as RuntimeError29, RuntimeModelError as RuntimeModelError31 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError30, RuntimeModelError as RuntimeModelError31 } from "@ibiz-template/core";
 import { isFunction } from "lodash-es";
 var ViewCtrlInvokeNode = class extends UILogicNode {
   async exec(ctx) {
@@ -18646,14 +18726,14 @@ var ViewCtrlInvokeNode = class extends UILogicNode {
     }
     const invokeParam = ctx.params[invokeParamId];
     if (!invokeParam) {
-      throw new RuntimeError29("\u6CA1\u6709\u627E\u5230\u64CD\u4F5C\u53C2\u6570".concat(invokeParamId));
+      throw new RuntimeError30("\u6CA1\u6709\u627E\u5230\u64CD\u4F5C\u53C2\u6570".concat(invokeParamId));
     }
     const invokeCtrl = ctx.params[invokeCtrlId];
     if (!invokeCtrl) {
-      throw new RuntimeError29("\u6CA1\u6709\u627E\u5230\u754C\u9762\u5BF9\u8C61".concat(invokeCtrlId));
+      throw new RuntimeError30("\u6CA1\u6709\u627E\u5230\u754C\u9762\u5BF9\u8C61".concat(invokeCtrlId));
     }
     if (!invokeCtrl[invokeMethod] || !isFunction(invokeCtrl[invokeMethod])) {
-      throw new RuntimeError29("\u6CA1\u6709\u627E\u5230\u8C03\u7528\u65B9\u6CD5".concat(invokeMethod));
+      throw new RuntimeError30("\u6CA1\u6709\u627E\u5230\u8C03\u7528\u65B9\u6CD5".concat(invokeMethod));
     }
     await invokeCtrl[invokeMethod](invokeParam);
   }
@@ -18676,7 +18756,7 @@ var BindParamNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/msg-box-node/msg-box-node.ts
-import { ModelError as ModelError21, RuntimeModelError as RuntimeModelError33 } from "@ibiz-template/core";
+import { ModelError as ModelError22, RuntimeModelError as RuntimeModelError33 } from "@ibiz-template/core";
 var MsgBoxNode = class extends UILogicNode {
   constructor() {
     super(...arguments);
@@ -18735,7 +18815,7 @@ var MsgBoxNode = class extends UILogicNode {
         resultTags = ["ok", "cancel"];
         break;
       default:
-        throw new ModelError21(this.model, "".concat(buttonsType, "\u6682\u672A\u652F\u6301"));
+        throw new ModelError22(this.model, "".concat(buttonsType, "\u6682\u672A\u652F\u6301"));
     }
     const result = await ibiz.modal.confirm(modalParams);
     ctx.setLastReturn(resultTags[result ? 0 : 1]);
@@ -18866,16 +18946,16 @@ var DataSetNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/throw-exception-node/throw-exception-node.ts
-import { RuntimeError as RuntimeError30 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError31 } from "@ibiz-template/core";
 var ThrowExceptionNode2 = class extends UILogicNode {
   async exec(_ctx) {
     const { errorInfo } = this.model;
-    throw new RuntimeError30(errorInfo);
+    throw new RuntimeError31(errorInfo);
   }
 };
 
 // src/ui-logic/ui-logic-node/view-ctrl-fire-event-node/view-ctrl-fire-event-node.ts
-import { RuntimeError as RuntimeError31, RuntimeModelError as RuntimeModelError40 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError32, RuntimeModelError as RuntimeModelError40 } from "@ibiz-template/core";
 var ViewCtrlFireEventNode = class extends UILogicNode {
   async exec(ctx) {
     ctx.isEndNode = true;
@@ -18891,18 +18971,18 @@ var ViewCtrlFireEventNode = class extends UILogicNode {
     }
     const invokeCtrl = ctx.params[fireCtrlId];
     if (!invokeCtrl) {
-      throw new RuntimeError31("\u6CA1\u6709\u627E\u5230\u89E6\u53D1\u5BF9\u8C61".concat(fireCtrlId));
+      throw new RuntimeError32("\u6CA1\u6709\u627E\u5230\u89E6\u53D1\u5BF9\u8C61".concat(fireCtrlId));
     }
     const eventParam = ctx.params[eventParamId];
     if (!eventParam) {
-      throw new RuntimeError31("\u6CA1\u6709\u627E\u5230\u4E8B\u4EF6\u53C2\u6570\u5BF9\u8C61".concat(eventParamId));
+      throw new RuntimeError32("\u6CA1\u6709\u627E\u5230\u4E8B\u4EF6\u53C2\u6570\u5BF9\u8C61".concat(eventParamId));
     }
     await invokeCtrl.evt.emit(eventName, eventParam);
   }
 };
 
 // src/ui-logic/ui-logic-node/execute-de-logic-node/execute-de-logic-node.ts
-import { RuntimeError as RuntimeError32, RuntimeModelError as RuntimeModelError41 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError33, RuntimeModelError as RuntimeModelError41 } from "@ibiz-template/core";
 var ExecuteDELogicNode = class extends UILogicNode {
   async exec(ctx) {
     const {
@@ -18922,7 +19002,7 @@ var ExecuteDELogicNode = class extends UILogicNode {
     }
     const dstParam = ctx.params[dstDEUILogicParamId];
     if (!dstParam) {
-      throw new RuntimeError32("\u6CA1\u6709\u627E\u5230\u4F20\u5165\u53C2\u6570".concat(dstDEUILogicParamId));
+      throw new RuntimeError33("\u6CA1\u6709\u627E\u5230\u4F20\u5165\u53C2\u6570".concat(dstDEUILogicParamId));
     }
     const result = await execDELogicById(
       dstAppDELogicId,
@@ -18938,7 +19018,7 @@ var ExecuteDELogicNode = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-param/ui-logic-param.ts
-import { ModelError as ModelError22 } from "@ibiz-template/core";
+import { ModelError as ModelError23 } from "@ibiz-template/core";
 var UILogicParam = class {
   /**
    * Creates an instance of UILogicParam.
@@ -18984,7 +19064,7 @@ var UILogicParam = class {
     } else if (m.entityListParam) {
       ctx.params[tag] = [];
     } else if (m.entityPageParam) {
-      throw new ModelError22(m, "\u672A\u652F\u6301\u7684\u903B\u8F91\u53C2\u6570\u7C7B\u578B: \u5206\u9875\u67E5\u8BE2\u7ED3\u679C");
+      throw new ModelError23(m, "\u672A\u652F\u6301\u7684\u903B\u8F91\u53C2\u6570\u7C7B\u578B: \u5206\u9875\u67E5\u8BE2\u7ED3\u679C");
     } else if (m.entityParam) {
       ctx.params[tag] = {};
     } else if (m.lastReturnParam) {
@@ -18992,9 +19072,9 @@ var UILogicParam = class {
     } else if (m.navContextParam) {
       ctx.params[tag] = context;
     } else if (m.navViewParamParam) {
-      throw new ModelError22(m, "\u672A\u652F\u6301\u7684\u903B\u8F91\u53C2\u6570\u7C7B\u578B: \u89C6\u56FE\u8DEF\u7531\u53C2\u6570");
+      throw new ModelError23(m, "\u672A\u652F\u6301\u7684\u903B\u8F91\u53C2\u6570\u7C7B\u578B: \u89C6\u56FE\u8DEF\u7531\u53C2\u6570");
     } else if (m.routeViewSessionParam) {
-      throw new ModelError22(m, "\u672A\u652F\u6301\u7684\u903B\u8F91\u53C2\u6570\u7C7B\u578B: \u8DEF\u7531\u89C6\u56FE\u4F1A\u8BDD");
+      throw new ModelError23(m, "\u672A\u652F\u6301\u7684\u903B\u8F91\u53C2\u6570\u7C7B\u578B: \u8DEF\u7531\u89C6\u56FE\u4F1A\u8BDD");
     } else if (m.simpleListParam) {
       ctx.params[tag] = [];
     } else if (m.simpleParam) {
@@ -19002,7 +19082,7 @@ var UILogicParam = class {
     } else if (m.viewNavDataParam) {
       ctx.params[tag] = viewParams;
     } else if (m.viewSessionParam) {
-      throw new ModelError22(m, "\u672A\u652F\u6301\u7684\u903B\u8F91\u53C2\u6570\u7C7B\u578B: \u5F53\u524D\u89C6\u56FE\u4F1A\u8BDD");
+      throw new ModelError23(m, "\u672A\u652F\u6301\u7684\u903B\u8F91\u53C2\u6570\u7C7B\u578B: \u5F53\u524D\u89C6\u56FE\u4F1A\u8BDD");
     }
   }
   /**
@@ -19019,7 +19099,7 @@ var UILogicParam = class {
     } else if (m.simpleParam || m.entityParam) {
       ctx.params[tag] = {};
     } else {
-      throw new ModelError22(m, "\u672A\u652F\u6301\u7684\u903B\u8F91\u53C2\u6570\u7C7B\u578B\u91CD\u65B0\u5EFA\u7ACB\u53D8\u91CF");
+      throw new ModelError23(m, "\u672A\u652F\u6301\u7684\u903B\u8F91\u53C2\u6570\u7C7B\u578B\u91CD\u65B0\u5EFA\u7ACB\u53D8\u91CF");
     }
   }
 };
@@ -19116,7 +19196,7 @@ var UILogic = class {
           break;
         case "PFPLUGIN":
         default:
-          throw new ModelError23(node, "\u672A\u652F\u6301\u7684\u903B\u8F91\u8282\u70B9\u7C7B\u578B: ".concat(logicNodeType));
+          throw new ModelError24(node, "\u672A\u652F\u6301\u7684\u903B\u8F91\u8282\u70B9\u7C7B\u578B: ".concat(logicNodeType));
       }
       this.nodes.set(node.id, logicNode);
     });
@@ -19215,7 +19295,7 @@ async function execUILogic(deUILogicId, appDataEntityId, parameters) {
   const app = ibiz.hub.getApp(parameters.context.srfappid);
   const deUILogic = await app.getDEUILogic(deUILogicId, appDataEntityId);
   if (!deUILogic) {
-    throw new RuntimeError33(
+    throw new RuntimeError34(
       "\u627E\u4E0D\u5230\u5B9E\u4F53".concat(appDataEntityId, "\u7684\u754C\u9762\u903B\u8F91").concat(deUILogicId)
     );
   }
@@ -19228,7 +19308,7 @@ async function execUILogic(deUILogicId, appDataEntityId, parameters) {
 }
 
 // src/ui-action/uiaction-util.ts
-import { RuntimeError as RuntimeError34 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError35 } from "@ibiz-template/core";
 var UIActionUtil = class {
   /**
    * 执行界面行为
@@ -19243,7 +19323,7 @@ var UIActionUtil = class {
   static async exec(actionId, params) {
     const action = await getUIActionById(actionId);
     if (!action) {
-      throw new RuntimeError34("\u6CA1\u627E\u5230".concat(actionId, "\u7684\u754C\u9762\u884C\u4E3A\u6A21\u578B"));
+      throw new RuntimeError35("\u6CA1\u627E\u5230".concat(actionId, "\u7684\u754C\u9762\u884C\u4E3A\u6A21\u578B"));
     }
     const provider = await getUIActionProvider(action);
     return provider.exec(action, params);
@@ -19510,7 +19590,7 @@ var BackendUIActionProvider = class extends UIActionProviderBase {
       ibiz.message.success(action.successMsg);
     }
     Object.assign(actionResult, {
-      data: isArray3(res.data) ? res.data : [res.data],
+      data: isArray4(res.data) ? res.data : [res.data],
       nextContext: resultContext,
       nextParams: tempParams
     });
@@ -19572,7 +19652,7 @@ var SysUIActionProvider = class extends UIActionProviderBase {
 };
 
 // src/ui-action/provider/front-ui-action-provider.ts
-import { StringUtil, RuntimeModelError as RuntimeModelError45, ModelError as ModelError24 } from "@ibiz-template/core";
+import { StringUtil, RuntimeModelError as RuntimeModelError45, ModelError as ModelError25 } from "@ibiz-template/core";
 var FrontUIActionProvider = class extends UIActionProviderBase {
   async execAction(action, args) {
     const { context, params, data, event, noWaitRoute } = args;
@@ -19616,7 +19696,7 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
         actionResult = this.doOther(action, args);
         break;
       default:
-        throw new ModelError24(
+        throw new ModelError25(
           action,
           "\u672A\u652F\u6301\u7684\u524D\u53F0\u5904\u7406\u6A21\u5F0F[".concat(action.frontProcessType, "]")
         );
@@ -20127,7 +20207,7 @@ var ViewPortletController = class extends PortletPartController {
 
 // src/controller/control/data-view/data-view.controller.ts
 import { RuntimeModelError as RuntimeModelError46 } from "@ibiz-template/core";
-import { isNil as isNil15 } from "ramda";
+import { isNil as isNil16 } from "ramda";
 
 // src/controller/control/data-view/data-view.service.ts
 var DataViewControlService = class extends MDControlService {
@@ -20159,6 +20239,16 @@ var DataViewControlService = class extends MDControlService {
 
 // src/controller/control/data-view/data-view.controller.ts
 var DataViewControlController = class extends MDControlController {
+  /**
+   * 是否允许新建
+   * @author lxm
+   * @date 2023-09-11 04:05:25
+   * @readonly
+   * @type {boolean}
+   */
+  get enableNew() {
+    return this.model.enableCardNew === true;
+  }
   /**
    * 初始化State
    *
@@ -20169,6 +20259,7 @@ var DataViewControlController = class extends MDControlController {
     super.initState();
     this.state.noSort = this.model.noSort === true;
     this.state.size = this.model.pagingSize || 20;
+    this.state.singleSelect = this.model.singleSelect === true;
   }
   /**
    * 初始化
@@ -20192,6 +20283,92 @@ var DataViewControlController = class extends MDControlController {
     this.service = new DataViewControlService(this.model);
     await this.service.init(this.context);
   }
+  /**
+   * 初始化分组右侧界面行为按钮的状态
+   *
+   * @author chitanda
+   * @date 2023-08-02 17:08:04
+   * @return {*}  {Promise<void>}
+   */
+  async initGroupActionStates() {
+    var _a;
+    const { groupUIActionGroup } = this.model;
+    if (!((_a = groupUIActionGroup == null ? void 0 : groupUIActionGroup.uiactionGroupDetails) == null ? void 0 : _a.length)) {
+      return;
+    }
+    this.state.groups.forEach(async (group) => {
+      const containerState = new ButtonContainerState();
+      groupUIActionGroup.uiactionGroupDetails.forEach((detail) => {
+        const actionid = detail.uiactionId;
+        if (actionid) {
+          const buttonState = new UIActionButtonState(
+            detail.id,
+            this.context.srfappid,
+            actionid
+          );
+          containerState.addState(detail.id, buttonState);
+        }
+      });
+      await containerState.update();
+      group.groupActionGroupState = containerState;
+    });
+  }
+  /**
+   * 行单击事件
+   *
+   * @author lxm
+   * @date 2022-08-18 22:08:16
+   * @param {IData} data 选中的单条数据
+   */
+  async onRowClick(data) {
+    super.onRowClick(data);
+    const { groupAppDEFieldId } = this.model;
+    if (groupAppDEFieldId) {
+      this.state.groups.forEach((group) => {
+        group.selectedData = [];
+      });
+      this.state.selectedData.forEach((select) => {
+        const groupVal = select[groupAppDEFieldId];
+        const selectGroup = this.state.groups.find(
+          (group) => group.key === groupVal
+        );
+        if (selectGroup) {
+          selectGroup.selectedData.push(select);
+        }
+      });
+      if (this.state.singleSelect) {
+        this.state.groups.forEach((group) => {
+          let tempData = data;
+          if (group.selectedData.indexOf(tempData) !== -1) {
+            if (tempData && tempData instanceof ControlVO) {
+              tempData = tempData.getOrigin();
+            }
+            if (tempData) {
+              group.groupActionGroupState.update(
+                tempData,
+                this.model.appDataEntityId
+              );
+            }
+          } else {
+            group.groupActionGroupState.update(
+              void 0,
+              this.model.appDataEntityId
+            );
+          }
+        });
+      } else {
+        const actionGroup = this.state.groups.find((group) => {
+          return group.children.indexOf(data) !== -1;
+        });
+        if (actionGroup) {
+          actionGroup.groupActionGroupState.update(
+            actionGroup.selectedData[0],
+            this.model.appDataEntityId
+          );
+        }
+      }
+    }
+  }
   /**
    * 加载更多
    *
@@ -20205,6 +20382,7 @@ var DataViewControlController = class extends MDControlController {
   }
   async afterLoad(args, items) {
     await this.handleDataGroup();
+    await this.initGroupActionStates();
     return items;
   }
   /**
@@ -20308,7 +20486,7 @@ var DataViewControlController = class extends MDControlController {
       const groupMap = /* @__PURE__ */ new Map();
       items.forEach((item) => {
         const groupVal = item[groupAppDEFieldId];
-        if (isNil15(groupVal)) {
+        if (isNil16(groupVal)) {
           return;
         }
         if (!groupMap.has(groupVal)) {
@@ -20402,13 +20580,49 @@ var DataViewControlController = class extends MDControlController {
       }
     }
   }
+  /**
+   * 点击新建
+   * @author lxm
+   * @date 2023-09-11 07:22:33
+   * @param {MouseEvent} event
+   * @param {(string | number)} group 分组标识
+   */
+  onClickNew(event, group) {
+    const params = { ...this.params, srfgroup: group };
+    UIActionUtil.execAndResolved("new", {
+      context: this.context,
+      params,
+      data: [],
+      view: this.view,
+      event
+    });
+  }
+  /**
+   * 分组工具栏点击处理回调
+   * @author lxm
+   * @date 2023-09-11 04:48:06
+   * @param {IUIActionGroupDetail} detail
+   * @param {MouseEvent} event
+   * @return {*}  {Promise<void>}
+   */
+  async onGroupToolbarClick(detail, event, group) {
+    const actionId = detail.uiactionId;
+    const params = { ...this.params, srfgroup: group.key };
+    await UIActionUtil.execAndResolved(actionId, {
+      context: this.context,
+      params,
+      data: group.selectedData || [],
+      view: this.view,
+      event
+    });
+  }
 };
 
 // src/controller/control/exp-bar/calendar-exp-bar.controller.ts
 import { RuntimeModelError as RuntimeModelError48 } from "@ibiz-template/core";
 
 // src/controller/control/exp-bar/exp-bar.controller.ts
-import { RuntimeError as RuntimeError35, RuntimeModelError as RuntimeModelError47 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError36, RuntimeModelError as RuntimeModelError47 } from "@ibiz-template/core";
 var ExpBarControlController = class extends ControlController {
   constructor() {
     super(...arguments);
@@ -20570,6 +20784,9 @@ var ExpBarControlController = class extends ControlController {
         );
       });
     }
+    if (this.state.loadDefault) {
+      this.load();
+    }
   }
   /**
    * 多数据部件加载成功 设置默认选中
@@ -20599,7 +20816,6 @@ var ExpBarControlController = class extends ControlController {
       (item) => item[this.navKeyName] === this.state.srfnav
     );
     const routeAndHasSub = this.routeDepth && window.location.hash.split("/").length > this.routeDepth * 2 + 2;
-    console.log("routeAndHasSub", routeAndHasSub);
     if (routeAndHasSub) {
       if (selectItem) {
         this.xDataController.setSelection([selectItem]);
@@ -20694,7 +20910,7 @@ var ExpBarControlController = class extends ControlController {
     if (["GRID", "DATAVIEW", "LIST"].includes(((_a = this.XDataModel) == null ? void 0 : _a.controlType) || "")) {
       return this.XDataModel.navAppViewId;
     }
-    throw new RuntimeError35("\u591A\u8282\u70B9\u89C6\u56FE\u7531\u5B50\u7C7B\u5B9E\u73B0");
+    throw new RuntimeError36("\u591A\u8282\u70B9\u89C6\u56FE\u7531\u5B50\u7C7B\u5B9E\u73B0");
   }
   /**
    * 获取导航视图
@@ -20836,7 +21052,7 @@ var CalendarExpBarController = class extends ExpBarControlController {
 };
 
 // src/controller/control/exp-bar/tree-exp-bar.controller.ts
-import { RuntimeError as RuntimeError36, RuntimeModelError as RuntimeModelError49 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError37, RuntimeModelError as RuntimeModelError49 } from "@ibiz-template/core";
 var TreeExpBarController = class extends ExpBarControlController {
   constructor() {
     super(...arguments);
@@ -20911,7 +21127,7 @@ var TreeExpBarController = class extends ExpBarControlController {
     const deData = node.deData || node;
     const nodeModel = this.getNodeModel(node.nodeId);
     if (!nodeModel) {
-      throw new RuntimeError36("\u627E\u4E0D\u5230".concat(node.nodeId, "\u7684\u8282\u70B9\u6A21\u578B"));
+      throw new RuntimeError37("\u627E\u4E0D\u5230".concat(node.nodeId, "\u7684\u8282\u70B9\u6A21\u578B"));
     }
     const result = this.prepareParams(nodeModel, deData, context, params);
     result.context.currentSrfNav = nodeId;
@@ -21224,6 +21440,12 @@ var SearchFormController = class extends FormController {
     await this.service.init(this.context);
     await this.load();
   }
+  async onMounted() {
+    await super.onMounted();
+    if (this.state.loadDefault) {
+      this.load();
+    }
+  }
   /**
    * 加载草稿
    *
@@ -21650,7 +21872,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 createUUID3, notNilEmpty as notNilEmpty7 } from "qx-util";
+import { createUUID as createUUID4, notNilEmpty as notNilEmpty7 } from "qx-util";
 
 // src/controller/control/form/form-detail/form-druipart/form-druipart.state.ts
 var FormDruipartState = class extends FormDetailState {
@@ -21763,7 +21985,7 @@ var FormDRUIPartController = class extends FormDetailController {
       this.form.context
     );
     if (!this.state.viewComponentKey) {
-      this.state.viewComponentKey = createUUID3();
+      this.state.viewComponentKey = createUUID4();
       this.navContext = newContext;
       this.navParams = newParams;
     } else if (JSON.stringify(this.navContext) !== JSON.stringify(newContext) || JSON.stringify(this.navParams) !== JSON.stringify(newParams)) {
@@ -21914,9 +22136,7 @@ var FormGroupPanelController = class extends FormDetailController {
 
 // src/controller/control/form/form-detail/form-item/form-item.controller.ts
 import Schema from "async-validator";
-import { createUUID as createUUID4, isNilOrEmpty as isNilOrEmpty6 } from "qx-util";
-import { ModelError as ModelError25, RuntimeError as RuntimeError37 } from "@ibiz-template/core";
-import dayjs3 from "dayjs";
+import { isNilOrEmpty as isNilOrEmpty6 } from "qx-util";
 
 // src/controller/control/form/form-detail/form-item/form-item.state.ts
 var FormItemState = class extends FormDetailState {
@@ -22189,60 +22409,20 @@ var FormItemController = class extends FormDetailController {
    * @param {boolean} isCreate 新建默认值还是更新默认值
    */
   setDefaultValue(isCreate, data = this.data) {
-    var _a;
     const { createDVT, createDV, updateDVT, updateDV } = this.model;
     const valueType = isCreate ? createDVT : updateDVT;
     const defaultValue = isCreate ? createDV : updateDV;
-    if (valueType === "RESET") {
-      data[this.name] = null;
-      return;
-    }
-    if (this.value) {
-      return;
-    }
-    if (isNilOrEmpty6(valueType) && isNilOrEmpty6(defaultValue)) {
-      return;
-    }
-    if (!valueType && defaultValue) {
-      data[this.name] = defaultValue;
-      return;
-    }
-    switch (valueType) {
-      case "APPDATA":
-        if (Object.prototype.hasOwnProperty.call(this.params, defaultValue)) {
-          data[this.name] = this.params[defaultValue];
-        }
-        if (Object.prototype.hasOwnProperty.call(this.context, defaultValue)) {
-          data[this.name] = this.context[defaultValue];
-        }
-        break;
-      case "OPERATORNAME":
-        data[this.name] = this.context.srfusername;
-        break;
-      case "OPERATOR":
-        data[this.name] = this.context.srfuserid;
-        break;
-      case "CURTIME":
-        data[this.name] = dayjs3().format(this.model.valueFormat);
-        break;
-      case "PARAM":
-        data[this.name] = this.data[defaultValue];
-        break;
-      case "SESSION":
-      case "APPLICATION":
-        if (!((_a = ibiz.appData) == null ? void 0 : _a.context)) {
-          throw new RuntimeError37("appdata.context\u4E0D\u5B58\u5728");
-        }
-        data[this.name] = ibiz.appData.context[defaultValue];
-        break;
-      case "CONTEXT":
-        data[this.name] = this.params[defaultValue];
-        break;
-      case "UNIQUEID":
-        data[this.name] = createUUID4();
-        break;
-      default:
-        throw new ModelError25(this.model, "\u9ED8\u8BA4\u503C\u7C7B\u578B[".concat(valueType, "]\u672A\u652F\u6301"));
+    const defaultVal = getDefaultValue(
+      {
+        name: this.name,
+        valueType,
+        defaultValue,
+        valueFormat: this.model.valueFormat
+      },
+      { data, context: this.context, params: this.params }
+    );
+    if (defaultVal !== void 0) {
+      data[this.name] = defaultVal;
     }
   }
 };
@@ -22475,7 +22655,7 @@ var FormMDCtrlDataViewController = class extends FormMDCtrlControlController {
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form/form-mdctrl-form.controller.ts
 import { mergeInLeft as mergeInLeft2 } from "@ibiz-template/core";
-import { isArray as isArray4 } from "lodash-es";
+import { isArray as isArray5 } from "lodash-es";
 
 // src/controller/control/form/edit-form/edit-form.controller.ts
 import {
@@ -22782,6 +22962,12 @@ var EditFormController = class extends FormController {
       trailing: true
     });
   }
+  async onMounted() {
+    await super.onMounted();
+    if (this.state.loadDefault) {
+      this.load();
+    }
+  }
   /**
    * 加载草稿行为
    * @author lxm
@@ -23169,7 +23355,7 @@ var FormMDCtrlFormController = class extends FormMDCtrlControlController {
   handleResponse(response) {
     const res = response;
     if (res.ok) {
-      if (isArray4(res.data)) {
+      if (isArray5(res.data)) {
         res.data = res.data.map(
           (item) => this.service.toUIData(item)
         );
@@ -24096,6 +24282,7 @@ var GridRowState = class {
 import {
   awaitTimeout as awaitTimeout2,
   debounceAndAsyncMerge as debounceAndAsyncMerge2,
+  mergeDefaultInLeft as mergeDefaultInLeft3,
   recursiveIterate as recursiveIterate4,
   RuntimeError as RuntimeError41,
   RuntimeModelError as RuntimeModelError51
@@ -24472,21 +24659,26 @@ var GridController = class extends MDControlController {
     if (editingRow) {
       throw new RuntimeError41("\u8BF7\u5148\u5B8C\u6210\u5F53\u524D\u884C\u7F16\u8F91\u4E2D\u7684\u884C\u7684\u64CD\u4F5C");
     }
+    const queryParams = { ...this.params };
+    const defaultData = this.calcDefaultValue({}, true);
+    Object.assign(queryParams, defaultData);
     let res;
     try {
-      res = await this.service.getDraft(this.context, this.params);
+      res = await this.service.getDraft(this.context, queryParams);
     } catch (error) {
       this.actionNotification("GETDRAFTERROR", {
         error
       });
       throw error;
     }
-    this.state.items.unshift(res.data);
-    const newRow = new GridRowState(res.data, this);
+    const draftData = res.data;
+    mergeDefaultInLeft3(draftData, defaultData);
+    this.state.items.unshift(draftData);
+    const newRow = new GridRowState(draftData, this);
     this.state.rows.unshift(newRow);
     this.gridStateNotify(newRow, "DRAFT" /* DRAFT */);
     this.switchRowEdit(this.state.rows[0], true);
-    this.actionNotification("GETDRAFTSUCCESS", { data: res.data });
+    this.actionNotification("GETDRAFTSUCCESS", { data: draftData });
   }
   /**
    * 保存
@@ -24750,19 +24942,24 @@ var GridController = class extends MDControlController {
     if (toState === false) {
       if (isSave) {
         await this.save(row.data);
-      } else {
-        if (row.data.srfuf === 0 /* CREATE */) {
-          row.showRowEdit = false;
-          this.evt.emit("onRowEditChange", { row });
-          return this.remove({ data: [row.data], silent: true });
-        }
+      } else if (row.data.srfuf === 0 /* CREATE */) {
+        row.showRowEdit = false;
+        this.evt.emit("onRowEditChange", { row });
+        return this.remove({ data: [row.data], silent: true });
+      } else if (row.cacheData) {
+        row.data = row.cacheData;
+        delete row.cacheData;
       }
-    }
-    if (toState === true) {
+    } else {
       const editingRow = this.state.rows.find((item) => item.showRowEdit);
       if (editingRow) {
         throw new RuntimeError41("\u540C\u65F6\u53EA\u80FD\u6709\u4E00\u884C\u5F00\u542F\u884C\u7F16\u8F91");
       }
+      if (row.data.srfuf === 1 /* UPDATE */) {
+        row.cacheData = clone15(row.data);
+        const defaultVal = this.calcDefaultValue(row.data, false);
+        Object.assign(row.data, defaultVal);
+      }
     }
     row.showRowEdit = toState;
     Object.values(this.editColumns).forEach((column) => {
@@ -24951,6 +25148,36 @@ var GridController = class extends MDControlController {
       // 单元格是否自适应
     });
   }
+  /**
+   * 计算默认值并返回一个对象，对象里的属性就是要填充的默认值
+   * 没有的属性就是不需要填充默认值的属性
+   * @author lxm
+   * @date 2023-09-18 04:01:06
+   * @param {IData} data
+   * @param {boolean} isCreate
+   * @return {*}  {IData}
+   */
+  calcDefaultValue(data, isCreate) {
+    const result = {};
+    Object.values(this.editColumns).forEach((c) => {
+      const { createDV, createDVT, updateDV, updateDVT } = c.editItem;
+      const valueType = isCreate ? createDVT : updateDVT;
+      const defaultValue = isCreate ? createDV : updateDV;
+      const defaultVal = getDefaultValue(
+        {
+          name: c.fieldName,
+          valueType,
+          defaultValue,
+          valueFormat: c.valueFormat
+        },
+        { data, context: this.context, params: this.params }
+      );
+      if (defaultVal !== void 0) {
+        result[c.fieldName] = defaultVal;
+      }
+    });
+    return result;
+  }
 };
 
 // src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts
@@ -26364,6 +26591,23 @@ var SearchBarController = class extends ControlController {
 
 // src/controller/control/tab-exp-panel/tab-exp-panel.controller.ts
 var TabExpPanelController = class extends ControlController {
+  constructor() {
+    super(...arguments);
+    /**
+     * 是否显示文本
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2023-09-20 10:36:35
+     */
+    this.isShowCaption = true;
+    /**
+     * 是否显示图标
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2023-09-20 10:36:46
+     */
+    this.isShowIcon = false;
+  }
   /**
    * 初始化state的属性
    *
@@ -26386,6 +26630,7 @@ var TabExpPanelController = class extends ControlController {
     await super.onCreated();
     this.layoutPanel = this.view.layoutPanel;
     this.initTabPages();
+    this.initIconCaption();
   }
   /**
    * 初始化分页数据
@@ -26399,7 +26644,8 @@ var TabExpPanelController = class extends ControlController {
       tabPages.push({
         caption: panel.caption,
         tabTag: panel.id,
-        class: panel.sysCss ? [panel.sysCss.cssName] : []
+        class: panel.sysCss ? [panel.sysCss.cssName] : [],
+        sysImage: panel.sysImage
       });
     });
     this.state.tabPages = tabPages;
@@ -26407,6 +26653,31 @@ var TabExpPanelController = class extends ControlController {
       this.initDefaultPage();
     }
   }
+  /**
+   * 初始化图标和文本显示
+   *
+   * @memberof TabExpPanelController
+   */
+  initIconCaption() {
+    if (this.params.showmode) {
+      switch (this.params.showmode) {
+        case "ICONANDSHORTWORD":
+          this.isShowIcon = true;
+          this.isShowCaption = true;
+          break;
+        case "ICON":
+          this.isShowIcon = true;
+          this.isShowCaption = false;
+          break;
+        case "SHORTWORD":
+          this.isShowIcon = false;
+          this.isShowCaption = true;
+          break;
+        default:
+          break;
+      }
+    }
+  }
   /**
    * 初始化默认分页
    *
@@ -27565,7 +27836,7 @@ var MDCtrlController = class extends MDControlController {
 
 // src/controller/control/kanban/kanban.controller.ts
 import { RuntimeError as RuntimeError45, RuntimeModelError as RuntimeModelError53 } from "@ibiz-template/core";
-import { isNil as isNil16 } from "ramda";
+import { isNil as isNil17 } from "ramda";
 
 // src/controller/control/kanban/kanban.service.ts
 var KanbanService = class extends DataViewControlService {
@@ -27609,16 +27880,6 @@ var KanbanController = class extends DataViewControlController {
   get enableEditGroup() {
     return this.model.enableCardEditGroup === true;
   }
-  /**
-   * 是否允许新建
-   * @author lxm
-   * @date 2023-09-11 04:05:25
-   * @readonly
-   * @type {boolean}
-   */
-  get enableNew() {
-    return this.model.enableCardNew === true;
-  }
   async initControlService() {
     this.service = new KanbanService(this.model);
     await this.service.init(this.context);
@@ -27638,47 +27899,6 @@ var KanbanController = class extends DataViewControlController {
    */
   async onCreated() {
     await super.onCreated();
-    await this.initGroupActionStates();
-  }
-  /**
-   * 初始化分组右侧界面行为按钮的状态
-   *
-   * @author chitanda
-   * @date 2023-08-02 17:08:04
-   * @return {*}  {Promise<void>}
-   */
-  async initGroupActionStates() {
-    var _a;
-    const { groupUIActionGroup } = this.model;
-    if (!((_a = groupUIActionGroup == null ? void 0 : groupUIActionGroup.uiactionGroupDetails) == null ? void 0 : _a.length)) {
-      return;
-    }
-    const containerState = new ButtonContainerState();
-    groupUIActionGroup.uiactionGroupDetails.forEach((detail) => {
-      const actionid = detail.uiactionId;
-      if (actionid) {
-        const buttonState = new UIActionButtonState(
-          detail.id,
-          this.context.srfappid,
-          actionid
-        );
-        containerState.addState(detail.id, buttonState);
-      }
-    });
-    await containerState.update();
-    this.state.groupActionGroupState = containerState;
-    this.evt.on("onSelectionChange", (event) => {
-      let data = event.data[0];
-      if (data && data instanceof ControlVO) {
-        data = data.getOrigin();
-      }
-      if (data) {
-        this.state.groupActionGroupState.update(
-          data,
-          this.model.appDataEntityId
-        );
-      }
-    });
   }
   /**
    * 本地排序items
@@ -27698,7 +27918,7 @@ var KanbanController = class extends DataViewControlController {
     const isAsc = minorSortDir === "ASC";
     items.forEach((item) => {
       const sortValue = item[sortField];
-      if (isNil16(sortValue)) {
+      if (isNil17(sortValue)) {
         item[sortField] = 0;
       } else {
         const toNum = Number(sortValue);
@@ -27840,42 +28060,6 @@ var KanbanController = class extends DataViewControlController {
       await this.afterLoad({}, this.state.items);
     }
   }
-  /**
-   * 点击新建
-   * @author lxm
-   * @date 2023-09-11 07:22:33
-   * @param {MouseEvent} event
-   * @param {(string | number)} group 分组标识
-   */
-  onClickNew(event, group) {
-    const params = { ...this.params, srfgroup: group };
-    UIActionUtil.execAndResolved("new", {
-      context: this.context,
-      params,
-      data: [],
-      view: this.view,
-      event
-    });
-  }
-  /**
-   * 分组工具栏点击处理回调
-   * @author lxm
-   * @date 2023-09-11 04:48:06
-   * @param {IUIActionGroupDetail} detail
-   * @param {MouseEvent} event
-   * @return {*}  {Promise<void>}
-   */
-  async onGroupToolbarClick(detail, event, group) {
-    const actionId = detail.uiactionId;
-    const params = { ...this.params, srfgroup: group };
-    await UIActionUtil.execAndResolved(actionId, {
-      context: this.context,
-      params,
-      data: this.state.selectedData,
-      view: this.view,
-      event
-    });
-  }
 };
 
 // src/controller/hub.controller.ts
@@ -28491,6 +28675,12 @@ var MDViewEngine = class extends ViewEngineBase {
     await super.onCreated();
     const { childNames } = this.view;
     childNames.push(this.xdataControlName, "searchform", "searchbar");
+    if (this.xdataControlName) {
+      if (!this.view.slotProps[this.xdataControlName]) {
+        this.view.slotProps[this.xdataControlName] = {};
+      }
+      this.view.slotProps[this.xdataControlName].loadDefault = false;
+    }
   }
   async onMounted() {
     await super.onMounted();
@@ -30131,6 +30321,7 @@ export {
   getControlProvider,
   getControlsByView,
   getDeACMode,
+  getDefaultValue,
   getEditorProvider,
   getFormDetailProvider,
   getFormTypeFieldName,