@ibiz-template/runtime 0.5.1 → 0.5.3-beta.0

package/dist/index.esm.js

@@ -1239,46 +1239,73 @@ async function getDERedirectToView(appView, context, params = {}, opts = {}) {
   }
   const entity = await ibiz.hub.getAppDataEntity(entityId, appView.appId);
   const rdTag = await calcDERdTag(entity, appView, params, curData);
-  const rdTagItems = rdTag.split(":");
-  const wfRdTag = rdTagItems.length === 2 ? rdTag : rdTagItems.slice(0, 2).join(":");
-  const deRdTag = "".concat(entity.name.toUpperCase(), ":").concat(rdTag);
-  const allRefViews = [];
-  if (appView.redirectAppViewRefs) {
-    allRefViews.push(...appView.redirectAppViewRefs);
-  }
-  if (appView.appViewRefs) {
-    allRefViews.push(...appView.appViewRefs);
-  }
-  const refView = allRefViews.find((view) => {
-    const matchKey = view.name || view.id;
-    return matchKey === deRdTag || matchKey === rdTag || matchKey === wfRdTag;
-  });
-  if (refView) {
-    const viewId = refView.refAppViewId;
-    if (viewId) {
-      return {
-        type: "view",
-        viewId,
-        context,
-        params,
-        opts: { ...opts, data: [curData] }
-      };
+  let viewId = "";
+  if (rdTag.startsWith("view://")) {
+    const url = new URL(rdTag);
+    if (url.searchParams.size > 0) {
+      url.searchParams.forEach((value, _key) => {
+        params[_key] = value;
+      });
+    }
+    const rdTagItems = url.pathname.replace("//", "").split("/");
+    const [appOrViewTag, viewTag] = rdTagItems;
+    if (viewTag) {
+      viewId = viewTag;
+    } else {
+      viewId = appOrViewTag;
     }
-    throw new RuntimeModelError3(refView, "\u672A\u914D\u7F6E\u5B9E\u9645\u5F15\u7528\u89C6\u56FE");
   } else {
-    ibiz.log.error(
-      "\u91CD\u5B9A\u5411\u89C6\u56FE\u5F15\u7528\u6709\uFF1A",
-      allRefViews == null ? void 0 : allRefViews.map(({ refAppViewId, name, realTitle }) => ({
-        viewId: refAppViewId,
-        tag: name,
-        title: realTitle
-      }))
-    );
-    throw new RuntimeModelError3(
-      appView,
-      "\u672A\u627E\u5230\u91CD\u5B9A\u5411\u6807\u8BC6[".concat(rdTag, "]\u6216[").concat(deRdTag, "]\u6216\u5DE5\u4F5C\u6D41[").concat(wfRdTag, "]\u5BF9\u5E94\u89C6\u56FE")
-    );
+    const rdTagItems = rdTag.split(":");
+    const wfRdTag = rdTagItems.length === 2 ? rdTag : rdTagItems.slice(0, 2).join(":");
+    const deRdTag = "".concat(entity.name.toUpperCase(), ":").concat(rdTag);
+    const allRefViews = [];
+    if (appView.redirectAppViewRefs) {
+      allRefViews.push(...appView.redirectAppViewRefs);
+    }
+    if (appView.appViewRefs) {
+      allRefViews.push(...appView.appViewRefs);
+    }
+    const refView = allRefViews.find((view) => {
+      const matchKey = view.name || view.id;
+      return matchKey === deRdTag || matchKey === rdTag || matchKey === wfRdTag;
+    });
+    if (refView) {
+      viewId = refView.refAppViewId;
+      if (viewId) {
+        return {
+          type: "view",
+          viewId,
+          context,
+          params,
+          opts: { ...opts, data: [curData] }
+        };
+      }
+      throw new RuntimeModelError3(refView, "\u672A\u914D\u7F6E\u5B9E\u9645\u5F15\u7528\u89C6\u56FE");
+    } else {
+      ibiz.log.error(
+        "\u91CD\u5B9A\u5411\u89C6\u56FE\u5F15\u7528\u6709\uFF1A",
+        allRefViews == null ? void 0 : allRefViews.map(({ refAppViewId, name, realTitle }) => ({
+          viewId: refAppViewId,
+          tag: name,
+          title: realTitle
+        }))
+      );
+      throw new RuntimeModelError3(
+        appView,
+        "\u672A\u627E\u5230\u91CD\u5B9A\u5411\u6807\u8BC6[".concat(rdTag, "]\u6216[").concat(deRdTag, "]\u6216\u5DE5\u4F5C\u6D41[").concat(wfRdTag, "]\u5BF9\u5E94\u89C6\u56FE")
+      );
+    }
   }
+  if (viewId) {
+    return {
+      type: "view",
+      viewId,
+      context,
+      params,
+      opts: { ...opts, data: [curData] }
+    };
+  }
+  throw new RuntimeModelError3(appView, "\u6807\u8BC6[".concat(rdTag, "]\u672A\u5339\u914D\u5230\u5B9E\u9645\u5F15\u7528\u89C6\u56FE"));
 }
 async function openDERedirectView(appView, context, params = {}, opts = {}) {
   let toView;
@@ -1315,6 +1342,9 @@ async function calcDERdTag(entity, rdView, params, data) {
     const { codeName } = findFieldById(entity, typeFieldId);
     const value = data[codeName.toLowerCase()];
     if (notNilEmpty3(value)) {
+      if (value.startsWith("view://")) {
+        return value;
+      }
       return "".concat(value.toUpperCase());
     }
     ibiz.log.warn(
@@ -7215,9 +7245,11 @@ var MethodDto = class _MethodDto {
             const items = datum[key];
             if (items) {
               const pKey = datum[this.entity.keyAppDEFieldId];
-              items.forEach((item) => {
-                item[field.refPickupAppDEFieldId] = pKey;
-              });
+              if (field.refPickupAppDEFieldId) {
+                items.forEach((item) => {
+                  item[field.refPickupAppDEFieldId] = pKey;
+                });
+              }
               await dto.sets(context, items);
             } else {
               await dto.sets(context, []);
@@ -8969,12 +9001,14 @@ var DEActionMethod = class extends Method {
     const configs = uiDomain.getDERConfig(this.entity.id);
     if (configs.length > 0) {
       configs.forEach((config) => {
-        const { majorDECodeName, pickupDEFName } = config;
-        const majorLowerCodeName = majorDECodeName.toLowerCase();
-        const pickupLowerDEFName = pickupDEFName.toLowerCase();
-        const majorkey = context[majorLowerCodeName];
-        if (majorkey && majorkey !== data.srfkey) {
-          data[pickupLowerDEFName] = majorkey;
+        if (config.pickupDEFName) {
+          const { majorDECodeName, pickupDEFName } = config;
+          const majorLowerCodeName = majorDECodeName.toLowerCase();
+          const pickupLowerDEFName = pickupDEFName.toLowerCase();
+          const majorkey = context[majorLowerCodeName];
+          if (majorkey && majorkey !== data.srfkey) {
+            data[pickupLowerDEFName] = majorkey;
+          }
         }
       });
     }
@@ -9215,9 +9249,10 @@ var TreeCodeListNodeData = class extends TreeNodeData {
 
 // src/service/vo/tree-node-data/tree-data-set-node-data.ts
 import { updateKeyDefine } from "@ibiz-template/core";
+import { isNil as isNil12 } from "ramda";
 var TreeDataSetNodeData = class extends TreeNodeData {
   constructor(model, parentNodeData, opts) {
-    var _a;
+    var _a, _b;
     super(model, parentNodeData, opts);
     const { data } = opts;
     this._deData = data;
@@ -9245,21 +9280,32 @@ var TreeDataSetNodeData = class extends TreeNodeData {
     const dataItemKeyMap = /* @__PURE__ */ new Map();
     dataItemKeyMap.set("srfkey", "srfkey");
     dataItemKeyMap.set("srfmajortext", "srfmajortext");
-    const dataItemDefaults = {};
     (_a = model.detreeNodeDataItems) == null ? void 0 : _a.forEach((dataItem) => {
       const uiKey = dataItem.id.toLowerCase();
       const deFieldKey = dataItem.appDEFieldId.toLowerCase();
       dataItemKeyMap.set(uiKey, deFieldKey);
-      if (dataItem.defaultValue) {
-        dataItemDefaults[uiKey] = dataItem.defaultValue;
+      if (dataItem.defaultValue && isNil12(data[deFieldKey])) {
+        data[deFieldKey] = dataItem.defaultValue;
+      }
+    });
+    const nodeColumnKeyMap = /* @__PURE__ */ new Map();
+    (_b = model.detreeNodeColumns) == null ? void 0 : _b.forEach((column) => {
+      const columnKey = column.detreeColumnId;
+      const dataItemKey = column.dataItemName;
+      if (!columnKey || !dataItemKey) {
+        ibiz.log.error("\u6A21\u578B\u5F02\u5E38\u7F3A\u5C11detreeColumnId\u6216\u8005dataItemName", column);
+      } else {
+        nodeColumnKeyMap.set(columnKey, dataItemKeyMap.get(dataItemKey));
       }
     });
     return new Proxy(this, {
       set(target, p, value) {
-        if (Object.prototype.hasOwnProperty.call(target._deData, p)) {
-          target._deData[p] = value;
+        if (nodeColumnKeyMap.has(p)) {
+          target._deData[nodeColumnKeyMap.get(p)] = value;
         } else if (dataItemKeyMap.has(p)) {
           target._deData[dataItemKeyMap.get(p)] = value;
+        } else if (Object.prototype.hasOwnProperty.call(target._deData, p)) {
+          target._deData[p] = value;
         } else {
           target[p] = value;
         }
@@ -9269,8 +9315,11 @@ var TreeDataSetNodeData = class extends TreeNodeData {
         if (target[p] !== void 0) {
           return target[p];
         }
+        if (nodeColumnKeyMap.has(p)) {
+          return target._deData[nodeColumnKeyMap.get(p)];
+        }
         if (dataItemKeyMap.has(p)) {
-          return target._deData[dataItemKeyMap.get(p)] || dataItemDefaults[p];
+          return target._deData[dataItemKeyMap.get(p)];
         }
         if (target._deData[p] !== void 0) {
           return target._deData[p];
@@ -9376,7 +9425,7 @@ var TreeStaticNodeData = class extends TreeNodeData {
 
 // src/service/vo/ui-map-field.ts
 import { DataTypes as DataTypes2 } from "@ibiz-template/core";
-import { isNil as isNil12 } from "ramda";
+import { isNil as isNil13 } from "ramda";
 var UIMapField = class {
   constructor(uiKey, dataKey, opts = {}) {
     /**
@@ -9397,10 +9446,10 @@ var UIMapField = class {
     this.isRequestNeed = true;
     this.uiKey = uiKey;
     this.dataKey = dataKey;
-    if (!isNil12(opts.isOriginField)) {
+    if (!isNil13(opts.isOriginField)) {
       this.isOriginField = opts.isOriginField;
     }
-    if (!isNil12(opts.dataType)) {
+    if (!isNil13(opts.dataType)) {
       this.dataType = opts.dataType;
     }
   }
@@ -9415,7 +9464,7 @@ var UIMapField = class {
       return value;
     }
     if (DataTypes2.isNumber(this.dataType)) {
-      const numVal = !isNil12(value) && value !== "" ? Number(value) : value;
+      const numVal = !isNil13(value) && value !== "" ? Number(value) : value;
       if (Number.isNaN(numVal)) {
         ibiz.log.debug("".concat(value, "\u4E0D\u80FD\u8F6C\u6362\u6210\u6570\u5B57"));
         return value;
@@ -10619,7 +10668,7 @@ var PanelNotifyState = /* @__PURE__ */ ((PanelNotifyState2) => {
 // src/controller/common/view/view.controller.ts
 import { notNilEmpty as notNilEmpty6 } from "qx-util";
 import { IBizContext as IBizContext2, RuntimeError as RuntimeError32 } from "@ibiz-template/core";
-import { isEmpty as isEmpty8, isNil as isNil18, isNotNil as isNotNil2 } from "ramda";
+import { isEmpty as isEmpty8, isNil as isNil19, isNotNil as isNotNil2 } from "ramda";
 
 // src/controller/utils/loading/loading.state.ts
 import { NOOP } from "@ibiz-template/core";
@@ -11251,9 +11300,9 @@ function hasSubRoute(routeDepth) {
 }
 
 // src/controller/utils/util/util.ts
-import { isNil as isNil13 } from "ramda";
+import { isNil as isNil14 } from "ramda";
 function isValueChange(value, value2) {
-  if ((isNil13(value) || value === "") && (isNil13(value2) || value2 === "")) {
+  if ((isNil14(value) || value === "") && (isNil14(value2) || value2 === "")) {
     return false;
   }
   return value !== value2;
@@ -11269,7 +11318,7 @@ function getOriginData(data) {
 // src/controller/utils/value-rule/value-rule.ts
 import { RuntimeError as RuntimeError27 } from "@ibiz-template/core";
 import { isNilOrEmpty as isNilOrEmpty7, isNumber } from "qx-util";
-import { isNil as isNil14 } from "ramda";
+import { isNil as isNil15 } from "ramda";
 function generateRules(itemVRs, name, valueItemName) {
   const rules = [];
   itemVRs.forEach((item) => {
@@ -11334,7 +11383,7 @@ function generateEditorRules(editor) {
   if (maxLength) {
     rules.push({
       validator: (rule, value, callback) => {
-        if (!isNil14(value) && value.length > maxLength) {
+        if (!isNil15(value) && value.length > maxLength) {
           callback(
             new Error(
               "\u5185\u5BB9\u957F\u5EA6\u5FC5\u987B\u5C0F\u4E8E\u7B49\u4E8E".concat(maxLength, ",\u5F53\u524D\u957F\u5EA6\u4E3A").concat(value.length)
@@ -11349,7 +11398,7 @@ function generateEditorRules(editor) {
   if (minLength) {
     rules.push({
       validator: (rule, value, callback) => {
-        if (!isNil14(value) && value.length < minLength) {
+        if (!isNil15(value) && value.length < minLength) {
           callback(
             new Error(
               "\u5185\u5BB9\u957F\u5EA6\u5FC5\u987B\u5927\u4E8E\u7B49\u4E8E".concat(minLength, ",\u5F53\u524D\u957F\u5EA6\u4E3A").concat(value.length)
@@ -11361,10 +11410,10 @@ function generateEditorRules(editor) {
       }
     });
   }
-  if (!isNil14(maxValue)) {
+  if (!isNil15(maxValue)) {
     rules.push({
       validator: (rule, value, callback) => {
-        if (!isNil14(value) && isNumber(value) && value > maxValue) {
+        if (!isNil15(value) && isNumber(value) && value > maxValue) {
           callback(new Error("\u503C\u5FC5\u987B\u5C0F\u4E8E\u7B49\u4E8E".concat(maxValue)));
         } else {
           return true;
@@ -11372,10 +11421,10 @@ function generateEditorRules(editor) {
       }
     });
   }
-  if (!isNil14(minValue)) {
+  if (!isNil15(minValue)) {
     rules.push({
       validator: (rule, value, callback) => {
-        if (!isNil14(value) && isNumber(value) && value < minValue) {
+        if (!isNil15(value) && isNumber(value) && value < minValue) {
           callback(new Error("\u503C\u5FC5\u987B\u5927\u4E8E\u7B49\u4E8E".concat(minValue)));
         } else {
           return true;
@@ -11388,7 +11437,7 @@ function generateEditorRules(editor) {
 
 // src/controller/utils/value-ex/value-ex.ts
 import { RuntimeError as RuntimeError28 } from "@ibiz-template/core";
-import { isNil as isNil15, mergeLeft } from "ramda";
+import { isNil as isNil16, mergeLeft } from "ramda";
 var ValueExUtil = class {
   /**
    * 合并默认值
@@ -11413,7 +11462,7 @@ var ValueExUtil = class {
    * @return {*}  {string}
    */
   static toText(options, value) {
-    if (isNil15(value) || value === "") {
+    if (isNil16(value) || value === "") {
       return "";
     }
     const { valueType, objectNameField, textSeparator } = this.mergeDefault(options);
@@ -11438,12 +11487,12 @@ var ValueExUtil = class {
 import { RuntimeError as RuntimeError29, ModelError as ModelError17 } from "@ibiz-template/core";
 import dayjs from "dayjs";
 import { createUUID as createUUID8 } from "qx-util";
-import { isNil as isNil16, isNotNil } from "ramda";
+import { isNil as isNil17, isNotNil } from "ramda";
 function getDefaultValue(opts, origins) {
   var _a;
   const { name, valueType, defaultValue, valueFormat } = opts;
   const { data, context, params } = origins;
-  if (isNil16(valueType) && isNil16(defaultValue)) {
+  if (isNil17(valueType) && isNil17(defaultValue)) {
     return;
   }
   if (valueType === "RESET") {
@@ -11794,7 +11843,7 @@ var BaseController = class {
 
 // src/controller/utils/view-msg/view-msg-controller.ts
 import { RuntimeError as RuntimeError31, RuntimeModelError as RuntimeModelError22 } from "@ibiz-template/core";
-import { isNil as isNil17, mergeRight as mergeRight2 } from "ramda";
+import { isNil as isNil18, mergeRight as mergeRight2 } from "ramda";
 var ViewMsgController = class _ViewMsgController {
   constructor(msgGroupId) {
     this.msgGroupId = msgGroupId;
@@ -11979,19 +12028,19 @@ var ViewMsgController = class _ViewMsgController {
     const removeModeField = this.getDeFieldName(entity, removeFlagAppDEFieldId);
     const deViewMessages = dataSet.map((item) => {
       const message = {};
-      if (positionField && !isNil17(item[positionField])) {
+      if (positionField && !isNil18(item[positionField])) {
         message.position = item[positionField];
       }
-      if (titleField && !isNil17(item[titleField])) {
+      if (titleField && !isNil18(item[titleField])) {
         message.title = item[titleField];
       }
-      if (messageField && !isNil17(item[messageField])) {
+      if (messageField && !isNil18(item[messageField])) {
         message.message = item[messageField];
       }
-      if (typeField && !isNil17(item[typeField])) {
+      if (typeField && !isNil18(item[typeField])) {
         message.messageType = item[typeField];
       }
-      if (removeModeField && !isNil17(item[removeModeField])) {
+      if (removeModeField && !isNil18(item[removeModeField])) {
         message.removeMode = item[removeModeField];
       }
       return mergeRight2(basicMsg, message);
@@ -12228,7 +12277,7 @@ var ViewController = class extends BaseController {
    */
   handleContextParams() {
     this.context.srfappid = this.model.appId;
-    if (isNil18(this.context.srfsessionid) || isEmpty8(this.context.srfsessionid)) {
+    if (isNil19(this.context.srfsessionid) || isEmpty8(this.context.srfsessionid)) {
       const domain = ibiz.uiDomainManager.create(this.id);
       this.context.srfsessionid = domain.id;
     }
@@ -12565,7 +12614,7 @@ var CodeListEditorController = class extends EditorController {
 
 // src/controller/common/control/control.controller.ts
 import { IBizContext as IBizContext3, IBizParams, NoticeError as NoticeError2 } from "@ibiz-template/core";
-import { clone as clone15, isNil as isNil19 } from "ramda";
+import { clone as clone15, isNil as isNil20 } from "ramda";
 import { notNilEmpty as notNilEmpty7 } from "qx-util";
 var ControlController = class extends BaseController {
   /**
@@ -12853,7 +12902,7 @@ var ControlController = class extends BaseController {
     let message;
     let duration;
     if (msgItem && msgItem.content) {
-      duration = isNil19(msgItem.timeout) ? void 0 : msgItem.timeout / 1e3;
+      duration = isNil20(msgItem.timeout) ? void 0 : msgItem.timeout / 1e3;
       const scriptParams = { ...this.getEventArgs() };
       if (opts == null ? void 0 : opts.data) {
         scriptParams.data = opts.data;
@@ -13879,7 +13928,7 @@ 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 clone16, isNil as isNil20, mergeDeepRight } from "ramda";
+import { clone as clone16, isNil as isNil21, mergeDeepRight } from "ramda";
 dayjs3.extend(minMax);
 dayjs3.extend(isSameOrBefore);
 dayjs3.extend(quarterOfYear);
@@ -13975,10 +14024,10 @@ var BaseSeriesGenerator = class {
    * @return {*}  {(string | undefined)}
    */
   translateVal(codeListKey, val, isExclude = false) {
-    if (isNil20(val)) {
+    if (isNil21(val)) {
       return void 0;
     }
-    if (isNil20(codeListKey)) {
+    if (isNil21(codeListKey)) {
       return val;
     }
     const codeListItems = this.chartGenerator.codeListMap.get(codeListKey);
@@ -14027,7 +14076,7 @@ var BaseSeriesGenerator = class {
           seriesCodeListId,
           item[this.groupField]
         );
-        if (isNil20(groupVal)) {
+        if (isNil21(groupVal)) {
           return;
         }
         group = groupVal;
@@ -17766,7 +17815,7 @@ var RawItemPortletController = class extends PortletPartController {
 
 // src/controller/control/data-view/data-view.controller.ts
 import { RuntimeModelError as RuntimeModelError50 } from "@ibiz-template/core";
-import { isNil as isNil21 } from "ramda";
+import { isNil as isNil22 } from "ramda";
 
 // src/controller/control/data-view/data-view.service.ts
 var DataViewControlService = class extends MDControlService {
@@ -18054,7 +18103,7 @@ var DataViewControlController = class extends MDControlController {
       const groupMap = /* @__PURE__ */ new Map();
       items.forEach((item) => {
         const groupVal = item[groupAppDEFieldId];
-        if (isNil21(groupVal)) {
+        if (isNil22(groupVal)) {
           return;
         }
         if (!groupMap.has(groupVal)) {
@@ -21863,7 +21912,6 @@ var EditFormController = class extends FormController {
           )
         );
       }
-      await awaitTimeout(2e3);
     } finally {
       if (showBusyIndicator) {
         this.endLoading();
@@ -23461,7 +23509,7 @@ var GridController = class extends MDControlController {
 import { DataTypes as DataTypes3, ModelError as ModelError29, plus as plus2 } from "@ibiz-template/core";
 import dayjs4 from "dayjs";
 import { debounce as debounce3 } from "lodash-es";
-import { clone as clone23, isNil as isNil22 } from "ramda";
+import { clone as clone23, isNil as isNil23 } from "ramda";
 var GridFieldColumnController = class extends GridColumnController {
   constructor() {
     super(...arguments);
@@ -23664,11 +23712,11 @@ var GridFieldColumnController = class extends GridColumnController {
    */
   calcFieldAgg(items) {
     const { aggField, aggMode, aggValueFormat, unitName } = this.model;
-    if (isNil22(aggMode) || aggMode === "NONE") {
+    if (isNil23(aggMode) || aggMode === "NONE") {
       return;
     }
     const fieldName = aggField || this.model.id;
-    items = items.filter((item) => !isNil22(item[fieldName]));
+    items = items.filter((item) => !isNil23(item[fieldName]));
     let aggValue;
     if (this.grid.model.aggMode === "PAGE") {
       switch (aggMode) {
@@ -24990,7 +25038,7 @@ import {
   mergeInLeft as mergeInLeft3,
   recursiveIterate as recursiveIterate9
 } from "@ibiz-template/core";
-import { clone as clone24, isNil as isNil23 } from "ramda";
+import { clone as clone24, isNil as isNil24 } from "ramda";
 
 // src/controller/control/search-bar/search-bar-filter.controller.ts
 import { RuntimeModelError as RuntimeModelError60 } from "@ibiz-template/core";
@@ -25618,7 +25666,7 @@ var SearchBarController = class extends ControlController {
     let hasError = false;
     recursiveIterate9(this.state.filterNodes[0], (node) => {
       if (node.leaf) {
-        if (node.field && node.valueOP && !isNil23(node.value)) {
+        if (node.field && node.valueOP && !isNil24(node.value)) {
           hasFilter = true;
         } else {
           hasError = true;
@@ -27395,7 +27443,7 @@ var WizardPanelController = class extends ControlController {
 
 // src/controller/control/md-ctrl/md-ctrl.controller.ts
 import { RuntimeModelError as RuntimeModelError62 } from "@ibiz-template/core";
-import { isNil as isNil24 } from "ramda";
+import { isNil as isNil25 } from "ramda";
 
 // src/controller/control/md-ctrl/md-ctrl.service.ts
 var MDCtrlService = class extends MDControlService {
@@ -27622,7 +27670,7 @@ var MDCtrlController = class extends MDControlController {
       const groupMap = /* @__PURE__ */ new Map();
       items.forEach((item) => {
         const groupVal = item[groupAppDEFieldId];
-        if (isNil24(groupVal)) {
+        if (isNil25(groupVal)) {
           return;
         }
         if (!groupMap.has(groupVal)) {
@@ -27699,7 +27747,7 @@ var MDCtrlController = class extends MDControlController {
 
 // src/controller/control/kanban/kanban.controller.ts
 import { RuntimeError as RuntimeError59, RuntimeModelError as RuntimeModelError63 } from "@ibiz-template/core";
-import { isNil as isNil25 } from "ramda";
+import { isNil as isNil26 } from "ramda";
 
 // src/controller/control/kanban/kanban.service.ts
 var KanbanService = class extends DataViewControlService {
@@ -27784,7 +27832,7 @@ var KanbanController = class extends DataViewControlController {
     const isAsc = minorSortDir === "ASC";
     items.forEach((item) => {
       const sortValue = item[sortField];
-      if (isNil25(sortValue)) {
+      if (isNil26(sortValue)) {
         item[sortField] = 0;
       } else {
         const toNum = Number(sortValue);
@@ -27891,7 +27939,7 @@ var KanbanController = class extends DataViewControlController {
       const groupMap = /* @__PURE__ */ new Map();
       items.forEach((item) => {
         const groupVal = item[groupAppDEFieldId];
-        if (isNil25(groupVal)) {
+        if (isNil26(groupVal)) {
           return;
         }
         if (!groupMap.has(groupVal)) {
@@ -28235,9 +28283,6 @@ var TreeGridExRowState = class {
      */
     this.uaColStates = {};
     this.data = data;
-    Object.values(treeGrid.fieldColumns).forEach((column) => {
-      column.initColumnStates(this);
-    });
     Object.values(treeGrid.uaColumns).forEach((column) => {
       column.initActionStates(this);
     });
@@ -28532,30 +28577,6 @@ var TreeGridExColumnController = class {
 
 // src/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-field-column/tree-grid-ex-field-column.controller.ts
 var TreeGridExFieldColumnController = class extends TreeGridExColumnController {
-  /**
-   * 给rowController初始化属性列的状态
-   *
-   * @author zpc
-   * @date 2024-01-07 21:09:43
-   * @param {ITreeGridExRowState} row
-   */
-  initColumnStates(row) {
-    const { data } = row;
-    if (!this.model.id || !data._deData) {
-      return;
-    }
-    const { detreeNodeDataItems } = this.treeGrid.getNodeModel(
-      data._nodeId
-    );
-    const targetTreeNodeDataItem = detreeNodeDataItems == null ? void 0 : detreeNodeDataItems.find(
-      (treeNodeDataItem) => {
-        return treeNodeDataItem.detreeColumnId === this.model.id;
-      }
-    );
-    if (targetTreeNodeDataItem && targetTreeNodeDataItem.appDEFieldId) {
-      data[this.model.id.toLowerCase()] = data._deData[targetTreeNodeDataItem.appDEFieldId.toLowerCase()];
-    }
-  }
 };
 
 // src/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-ua-column/tree-grid-ex-ua-column.controller.ts
@@ -29966,6 +29987,27 @@ var AppHub = class {
     }
     throw new RuntimeError61("\u89C6\u56FE[".concat(id, "]\u4E0D\u5B58\u5728"));
   }
+  /**
+   * 根据视图模型路径，加参数重新计算视图模型
+   *
+   * @author chitanda
+   * @date 2024-01-08 11:01:54
+   * @param {string} appId
+   * @param {string} modelPath
+   * @param {IParams} params
+   * @return {*}  {Promise<IAppView>}
+   */
+  async loadAppView(appId2, modelPath, params) {
+    if (this.modelLoaderProvider) {
+      const model = await this.modelLoaderProvider.loadAppView(
+        appId2,
+        modelPath,
+        params
+      );
+      return model;
+    }
+    throw new RuntimeError61("\u89C6\u56FE[".concat(modelPath, "]\u4E0D\u5B58\u5728"));
+  }
   /**
    * 根据应用实体代码名称查找应用视图
    *
@@ -31544,7 +31586,13 @@ var AppUILogicExecutor = class extends LogicExecutor {
       rest
     );
     if (enableBatchAdd && result.data) {
-      await this.doBatchAdd(appUILogic, result.data, context, newViewRef);
+      await this.doBatchAdd(
+        appUILogic,
+        result.data,
+        context,
+        newViewRef,
+        parameters.view
+      );
     }
     return result;
   }
@@ -31605,7 +31653,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
    * @param {IAppUILogicRefViewBase} newViewRef
    * @return {*}  {Promise<void>}
    */
-  async doBatchAdd(appUILogic, selections, context, newViewRef) {
+  async doBatchAdd(appUILogic, selections, context, newViewRef, view) {
     var _a;
     if (selections == null ? void 0 : selections.length) {
       const selfDe = await ibiz.hub.getAppDataEntity(
@@ -31617,45 +31665,43 @@ var AppUILogicExecutor = class extends LogicExecutor {
       if (!minorDERs) {
         throw new RuntimeModelError69(selfDe, "\u5B9E\u4F53\u6CA1\u6709\u4ECE\u5173\u7CFB\u96C6\u5408\uFF01");
       }
-      let pickParentFieldName;
+      let pickParentFieldName = "";
       minorDERs == null ? void 0 : minorDERs.forEach((item) => {
         const majorDeName = calcDeCodeNameById(item.majorAppDataEntityId);
         if (pickParentDeName === majorDeName) {
           pickParentFieldName = item.parentAppDEFieldId;
         }
       });
-      const openViewKeyParam = (_a = newViewRef.navigateParams) == null ? void 0 : _a.find((navParam) => {
-        return navParam.key === "keymapping";
-      });
-      let addData = [];
-      if (openViewKeyParam) {
-        const keyValuePairs = openViewKeyParam.value.split(";");
-        const keyMapping = {};
+      if (pickParentFieldName === void 0) {
+        throw new RuntimeError67(
+          "\u6CA1\u6709\u627E\u5230".concat(pickParentDeName, "\u5728\u5F53\u524D\u5B9E\u4F53\u7684\u5916\u952E\u5C5E\u6027")
+        );
+      }
+      const keyMapping = {
+        srfkey: pickParentFieldName
+      };
+      const propertyMap = (_a = view.model.appViewParams) == null ? void 0 : _a.find(
+        (item) => item.key.toLowerCase() === "PROPERTYMAP".toLowerCase()
+      );
+      if (propertyMap) {
+        const keyValuePairs = propertyMap.value.split(",");
         for (const pair of keyValuePairs) {
           const [sourceKey, targetKey] = pair.split(":");
           if (sourceKey && targetKey) {
             keyMapping[sourceKey] = targetKey;
           }
         }
-        addData = selections.map((item) => {
-          const tempData = {
-            [pickParentFieldName]: item.srfkey
-          };
-          for (const key in keyMapping) {
-            if (Object.prototype.hasOwnProperty.call(keyMapping, key)) {
-              const targetKey = keyMapping[key];
-              if (Object.prototype.hasOwnProperty.call(item, key)) {
-                tempData[targetKey] = item[key];
-              }
-            }
-          }
-          return tempData;
-        });
-      } else {
-        addData = selections.map((item) => ({
-          [pickParentFieldName]: item.srfkey
-        }));
       }
+      ibiz.log.debug("\u6279\u91CF\u65B0\u5EFA\u8F6C\u6362\u6620\u5C04\u5C5E\u6027", keyMapping);
+      const addData = selections.map((item) => {
+        const tempData = {};
+        Object.keys(keyMapping).forEach((key) => {
+          const targetKey = keyMapping[key];
+          tempData[targetKey] = item[key];
+        });
+        return tempData;
+      });
+      ibiz.log.debug("\u6279\u91CF\u65B0\u5EFA\u521B\u5EFA\u6570\u636E", addData);
       const service = ibiz.hub.getApp(context.srfappid).deService;
       await service.exec(selfDe.id, "Create", context, addData);
     }