@ibiz-template/runtime 0.6.0 → 0.6.1-alpha.2

package/dist/index.esm.js

@@ -233,8 +233,8 @@ var HelperBase = class {
    * @date 2021-12-29 14:12:47
    * @param {string} tag 助手标识
    */
-  constructor(Handlebars2, tag) {
-    Handlebars2.registerHelper(tag, this.onExecute);
+  constructor(Handlebars, tag) {
+    Handlebars.registerHelper(tag, this.onExecute);
   }
 };
 
@@ -408,12 +408,13 @@ var HelperNeq = class extends HelperBase {
 };
 
 // src/utils/handlebars/helpers/not/not.ts
+import { isEmpty, isNil } from "ramda";
 var HelperNot = class extends HelperBase {
   constructor(hbs) {
     super(hbs, "not");
   }
   onExecute(param, options) {
-    const bol = Handlebars.Utils.isEmpty(param);
+    const bol = isEmpty(param) || isNil(param);
     return HelperUtil.handleJudgmentExecute(this, bol, options);
   }
 };
@@ -595,7 +596,7 @@ var HandlebarsUtil = class {
 };
 
 // src/utils/nav-params/nav-params.ts
-import { isEmpty, isNil } from "lodash-es";
+import { isEmpty as isEmpty2, isNil as isNil2 } from "lodash-es";
 import { isNilOrEmpty, notNilEmpty } from "qx-util";
 function convertObjectToNavParams(navParams) {
   const result = [];
@@ -616,7 +617,7 @@ function convertObjectToNavParams(navParams) {
   return result;
 }
 function convertNavData(navParams, ...origins) {
-  if (!navParams || isEmpty(navParams)) {
+  if (!navParams || isEmpty2(navParams)) {
     return {};
   }
   const navParamsArr = Array.isArray(navParams) ? navParams : convertObjectToNavParams(navParams);
@@ -650,7 +651,7 @@ function convertNavDataByArray(naviDatas, ...origins) {
             key.slice(2, -1).toLowerCase()
           );
           if (find) {
-            valueStr = valueStr.replace(key, "".concat(isNil(value) ? "" : value));
+            valueStr = valueStr.replace(key, "".concat(isNil2(value) ? "" : value));
           }
         });
         result[naviData.key.toLowerCase()] = valueStr;
@@ -1294,6 +1295,9 @@ async function getDERedirectToView(appView, context, params = {}, opts = {}) {
     });
     if (refView) {
       viewId = refView.refAppViewId;
+      if (refView.openMode) {
+        opts.openMode = refView.openMode;
+      }
       if (viewId) {
         return {
           type: "view",
@@ -1405,7 +1409,7 @@ async function calcDERdTag(entity, rdView, params, data) {
 // src/utils/verify/verify.ts
 import { RuntimeError as RuntimeError3 } from "@ibiz-template/core";
 import { isNilOrEmpty as isNilOrEmpty3, notNilEmpty as notNilEmpty4 } from "qx-util";
-import { isNil as isNil2 } from "ramda";
+import { isNil as isNil3 } from "ramda";
 function testCond(value, op, value2) {
   if (Object.is(op, "IN")) {
     return contains(value, value2);
@@ -1431,7 +1435,7 @@ function testCond(value, op, value2) {
     case "ISNOTNULL":
       return notNilEmpty4(value);
     case "TESTNULL":
-      return isNil2(value);
+      return isNil3(value);
     case "IN":
       return contains(value, value2);
     case "NOTIN":
@@ -1504,7 +1508,7 @@ function strContain(value, value2, mode) {
 // src/utils/verify/de-rule-verify.ts
 import { RuntimeError as RuntimeError4 } from "@ibiz-template/core";
 import { isNilOrEmpty as isNilOrEmpty4 } from "qx-util";
-import { isEmpty as isEmpty2, isNil as isNil3 } from "ramda";
+import { isEmpty as isEmpty3, isNil as isNil4 } from "ramda";
 
 // src/utils/script/script-function.ts
 import { mergeRight } from "ramda";
@@ -1576,7 +1580,8 @@ var ScriptFunction = class {
       "parentView",
       "view",
       "parent",
-      "util"
+      "util",
+      "ctrl"
     ];
     keys.push(...presetArgsKeys);
     this.argKeys = Array.from(new Set(keys));
@@ -1858,7 +1863,7 @@ function checkFieldSimpleRule(value, op, value2, errorInfo, paramType, form, pri
     const _value2Field = form[value2] ? form[value2] : value2;
     value2 = _value2Field;
   }
-  if (isNil3(errorInfo) || isEmpty2(errorInfo)) {
+  if (isNil4(errorInfo) || isEmpty3(errorInfo)) {
     errorInfo = "\u5185\u5BB9\u5FC5\u987B\u7B26\u5408\u503C\u89C4\u5219";
   }
   const result = testCond(value, op, value2);
@@ -4988,7 +4993,7 @@ import { ModelError as ModelError15, RuntimeError as RuntimeError25 } from "@ibi
 import { clone as clone17 } from "ramda";
 
 // src/service/utils/de-dq-cond/ps-de-dq-cond-engine.ts
-import { isEmpty as isEmpty3 } from "ramda";
+import { isEmpty as isEmpty4 } from "ramda";
 
 // src/service/utils/de-dq-cond/ps-model-cond-engine-base.ts
 var PSModelCondEngineBase = class {
@@ -5295,7 +5300,7 @@ var _PSDEDQCondEngine = class _PSDEDQCondEngine extends PSModelCondEngineBase {
   testCond(cond, data, filter) {
     if (cond instanceof PSModelGroupCondBase) {
       const list = cond.getChildPSModelCondBases();
-      if (list == null || isEmpty3(list)) {
+      if (list == null || isEmpty4(list)) {
         return !cond.isNotMode();
       }
       const bAnd = "AND" /* CONDOP_AND */ === cond.getCondOp();
@@ -5318,15 +5323,15 @@ var _PSDEDQCondEngine = class _PSDEDQCondEngine extends PSModelCondEngineBase {
       return bRet;
     }
     if (cond instanceof PSModelSingleCondBase) {
-      if (isEmpty3(cond.getParam())) {
+      if (isEmpty4(cond.getParam())) {
         ibiz.log.warn("\u6CA1\u6709\u6307\u5B9A\u5C5E\u6027\u540D\u79F0", cond);
       }
       const objValue = data[cond.getParam().toLowerCase()];
       let objCondValue = null;
       const valType = cond.getValueType();
       const val = cond.getValue();
-      if (valType != null && !isEmpty3(valType)) {
-        if (isEmpty3(val)) {
+      if (valType != null && !isEmpty4(valType)) {
+        if (isEmpty4(val)) {
           ibiz.log.warn("\u6CA1\u6709\u6307\u5B9A\u4E0A\u4E0B\u6587\u53C2\u6570\u540D\u79F0");
         }
         if (_PSDEDQCondEngine.PARAMTYPE_WEBCONTEXT === valType) {
@@ -6361,7 +6366,7 @@ DEDQCondUtil.map = /* @__PURE__ */ new WeakMap();
 
 // src/service/utils/dynamic-code-list/dynamic-code-list.ts
 import { ModelError as ModelError5, RuntimeModelError as RuntimeModelError7 } from "@ibiz-template/core";
-import { isNil as isNil4 } from "ramda";
+import { isNil as isNil5 } from "ramda";
 var DynamicCodeListCache = class {
   constructor(codeList) {
     /**
@@ -6594,7 +6599,7 @@ var DynamicCodeListCache = class {
     }
     const promise = this.load(context, params);
     const { cacheTimeout } = this.codeList;
-    const waitTime = cacheTimeout === -1 || isNil4(cacheTimeout) ? ibiz.config.codeList.timeout : this.codeList.cacheTimeout;
+    const waitTime = cacheTimeout === -1 || isNil5(cacheTimeout) ? ibiz.config.codeList.timeout : this.codeList.cacheTimeout;
     const cacheData = {
       expirationTime: (/* @__PURE__ */ new Date()).getTime() + waitTime,
       promise
@@ -6608,17 +6613,17 @@ var DynamicCodeListCache = class {
 };
 
 // src/service/utils/de-cache/de-cache.ts
-import { where, equals, clone as clone4, isNil as isNil6, isEmpty as isEmpty5 } from "ramda";
+import { where, equals, clone as clone4, isNil as isNil7, isEmpty as isEmpty6 } from "ramda";
 import { createUUID as createUUID2 } from "qx-util";
 import { RuntimeError as RuntimeError16 } from "@ibiz-template/core";
 
 // src/service/utils/service-exist-util/service-exist-util.ts
 import { RuntimeError as RuntimeError15 } from "@ibiz-template/core";
-import { isEmpty as isEmpty4, isNil as isNil5 } from "ramda";
+import { isEmpty as isEmpty5, isNil as isNil6 } from "ramda";
 function isExistSrfKey(funcName, entity) {
   if (entity != null) {
     const { srfkey } = entity;
-    if (!isNil5(srfkey) && !isEmpty4(srfkey)) {
+    if (!isNil6(srfkey) && !isEmpty5(srfkey)) {
       return true;
     }
   }
@@ -6626,7 +6631,7 @@ function isExistSrfKey(funcName, entity) {
 }
 function isExistSessionId(funcName, context) {
   const { srfsessionid } = context;
-  if (!isNil5(srfsessionid) && !isEmpty4(srfsessionid)) {
+  if (!isNil6(srfsessionid) && !isEmpty5(srfsessionid)) {
     return true;
   }
   throw new RuntimeError15("\u6267\u884C\u300C".concat(funcName, "\u300D\u4E0D\u5B58\u5728\u300Csrfsessionid\u300D\u65E0\u6CD5\u5904\u7406"));
@@ -6722,7 +6727,7 @@ var DECache = class {
     }
     try {
       isExistSessionId("add", context);
-      if (isNil6(entity.srfkey) || isEmpty5(entity.srfkey)) {
+      if (isNil7(entity.srfkey) || isEmpty6(entity.srfkey)) {
         entity.srfkey = createUUID2();
       }
       entity.srftempdate = (/* @__PURE__ */ new Date()).getTime();
@@ -6866,7 +6871,7 @@ var DECache = class {
       const t = this.getTransaction(context);
       for (let i = 0; i < entities.length; i++) {
         const entity = entities[i];
-        if (isNil6(entity.srfkey) || isEmpty5(entity.srfkey)) {
+        if (isNil7(entity.srfkey) || isEmpty6(entity.srfkey)) {
           entity.srfkey = createUUID2();
         }
         entity.srftempdate = (/* @__PURE__ */ new Date()).getTime();
@@ -7057,7 +7062,7 @@ var DECache = class {
       }
     );
     const unionValues = unionKeys.map((key) => {
-      if (isNil6(data[key])) {
+      if (isNil7(data[key])) {
         return "__empty__";
       }
       return data[key];
@@ -7131,7 +7136,7 @@ function calcResPath(context, entity) {
 }
 
 // src/service/utils/search-filter/search-filter.ts
-import { isEmpty as isEmpty6, isNil as isNil7 } from "ramda";
+import { isEmpty as isEmpty7, isNil as isNil8 } from "ramda";
 var SearchFilter = class {
   /**
    * Creates an instance of SearchFilter.
@@ -7179,16 +7184,16 @@ var SearchFilter = class {
     this.sortMode = "ASC";
     this.context = context;
     if (data) {
-      if (!isNil7(data.page) && !isEmpty6(data.page)) {
+      if (!isNil8(data.page) && !isEmpty7(data.page)) {
         this.page = data.page;
       }
-      if (!isNil7(data.size) && !isEmpty6(data.size)) {
+      if (!isNil8(data.size) && !isEmpty7(data.size)) {
         this.size = data.size;
       }
-      if (!isNil7(data.query) && !isEmpty6(data.query)) {
+      if (!isNil8(data.query) && !isEmpty7(data.query)) {
         this.query = data.query;
       }
-      if (!isNil7(data.sort) && !isEmpty6(data.sort)) {
+      if (!isNil8(data.sort) && !isEmpty7(data.sort)) {
         const arr = data.sort.split(",");
         if (arr.length >= 1) {
           [this.sortField] = arr;
@@ -7375,7 +7380,8 @@ var CodeListService = class {
         tooltip,
         // 代码项数据
         data: codeItem.data ? ScriptFactory.execSingleLine(codeItem.data) : void 0,
-        sysImage: codeItem.sysImage
+        sysImage: codeItem.sysImage,
+        userData: codeItem.userData
       };
       if ((_a = codeItem.codeItems) == null ? void 0 : _a.length) {
         _codeItem.children = this.formatStaticItems(
@@ -7909,7 +7915,7 @@ var FileService = class {
 };
 
 // src/service/app-data-entity/app-data-entity.ts
-import { clone as clone5, isNil as isNil8 } from "ramda";
+import { clone as clone5, isNil as isNil9 } from "ramda";
 import { DataTypes } from "@ibiz-template/core";
 import { createUUID as createUUID3 } from "qx-util";
 
@@ -8002,7 +8008,7 @@ var AppDataEntity = class _AppDataEntity {
       enumerable: false,
       configurable: true,
       writable: true,
-      value: isNil8(this.srfkey) ? createUUID3() : this.srfkey
+      value: isNil9(this.srfkey) ? createUUID3() : this.srfkey
     });
     this.defineProperties();
   }
@@ -8092,11 +8098,11 @@ var AppDataEntity = class _AppDataEntity {
     if (value == null) {
       return value;
     }
-    if (isNil8(dataType)) {
+    if (isNil9(dataType)) {
       return value;
     }
     if (DataTypes.isNumber(dataType)) {
-      const numVal = !isNil8(value) && value !== "" ? Number(value) : value;
+      const numVal = !isNil9(value) && value !== "" ? Number(value) : value;
       if (Number.isNaN(numVal)) {
         ibiz.log.debug("".concat(value, "\u4E0D\u80FD\u8F6C\u6362\u6210\u6570\u5B57"));
         return value;
@@ -8615,7 +8621,7 @@ import { clone as clone8 } from "@ibiz-template/core";
 
 // src/service/vo/control.vo.ts
 import { createUUID as createUUID4 } from "qx-util";
-import { clone as clone7, isNil as isNil9 } from "ramda";
+import { clone as clone7, isNil as isNil10 } from "ramda";
 var BuildInKeys = [
   "srfkey",
   "srfmajortext",
@@ -8704,7 +8710,7 @@ var ControlVO = class _ControlVO {
         enumerable: false,
         configurable: true,
         writable: true,
-        value: isNil9(this.srfkey) ? createUUID4() : this.srfkey
+        value: isNil10(this.srfkey) ? createUUID4() : this.srfkey
       });
     }
     Object.defineProperty(this, "srfuf", {
@@ -9428,7 +9434,7 @@ var V7AuthService = class {
 };
 
 // src/service/service/async-action/async-action.service.ts
-import { isNil as isNil10 } from "ramda";
+import { isNil as isNil11 } from "ramda";
 var AsyncActionService = class {
   /**
    * 获取异步操作的集合
@@ -9439,7 +9445,7 @@ var AsyncActionService = class {
    */
   async fetch(params = {}) {
     const res = await ibiz.net.post("/portal/asyncaction/all", params);
-    if (isNil10(res.data)) {
+    if (isNil11(res.data)) {
       res.data = [];
     }
     return res;
@@ -9464,7 +9470,7 @@ import {
   RuntimeError as RuntimeError23,
   RuntimeModelError as RuntimeModelError22
 } from "@ibiz-template/core";
-import { isArray as isArray6, isNil as isNil11 } from "lodash-es";
+import { isArray as isArray6, isNil as isNil12 } from "lodash-es";
 import { ascSort } from "qx-util";
 import { clone as clone14 } from "ramda";
 
@@ -10869,7 +10875,7 @@ var DEActionMethod = class extends Method {
           let path2 = this.calcPath(context);
           if (this.method.needResourceKey) {
             let srfkey = context[this.entity.codeName.toLowerCase()];
-            if (isNil11(srfkey)) {
+            if (isNil12(srfkey)) {
               srfkey = isArray6(data) ? null : data == null ? void 0 : data[this.entity.keyAppDEFieldId];
             }
             path2 = "".concat(path2, "/").concat(srfkey);
@@ -11294,7 +11300,7 @@ import {
   RuntimeModelError as RuntimeModelError23
 } from "@ibiz-template/core";
 import { isArray as isArray7 } from "lodash-es";
-import { clone as clone15, isEmpty as isEmpty7, isNil as isNil12 } from "ramda";
+import { clone as clone15, isEmpty as isEmpty8, isNil as isNil13 } from "ramda";
 import { ascSort as ascSort2, descSort } from "qx-util";
 var FetchMethod = class extends Method {
   async exec(context, params, params2, header) {
@@ -11371,7 +11377,7 @@ var FetchMethod = class extends Method {
         }
       }
     }
-    if (!isNil12(filter.sortField) && !isEmpty7(filter.sortField)) {
+    if (!isNil13(filter.sortField) && !isEmpty8(filter.sortField)) {
       if (filter.sortMode === "DESC") {
         list = descSort(list, filter.sortField);
       } else {
@@ -11438,7 +11444,7 @@ function presetDEMethodProvider() {
 }
 
 // src/service/service/internal-message/internal-message.service.ts
-import { isNil as isNil13 } from "ramda";
+import { isNil as isNil14 } from "ramda";
 var InternalMessageService = class {
   constructor() {
     /**
@@ -11477,7 +11483,7 @@ var InternalMessageService = class {
         res.total = Number(res.headers["x-total"]);
       }
     }
-    if (isNil13(res.data)) {
+    if (isNil14(res.data)) {
       res.data = [];
     }
     return res;
@@ -11503,6 +11509,16 @@ var InternalMessageService = class {
   async markRead(messageId) {
     await ibiz.net.post("".concat(this.baseUrl, "/").concat(messageId, "/mark_read"), {});
   }
+  /**
+   * 批量设置已读
+   * @author lxm
+   * @date 2024-02-04 03:59:52
+   * @param {string} messageId
+   * @return {*}  {Promise<void>}
+   */
+  async batchMarkRead() {
+    await ibiz.net.post("".concat(this.baseUrl, "/mark_all_read"), {});
+  }
   /**
    * 获取未读数据的总条数
    * @author lxm
@@ -11683,7 +11699,7 @@ var TreeCodeListNodeData = class extends TreeNodeData {
 
 // src/service/vo/tree-node-data/tree-data-set-node-data.ts
 import { updateKeyDefine } from "@ibiz-template/core";
-import { clone as clone16, isNil as isNil14 } from "ramda";
+import { clone as clone16, isNil as isNil15 } from "ramda";
 var CloneExcludeKeys = [
   "_id",
   "srfnodeid",
@@ -11807,7 +11823,7 @@ var TreeDataSetNodeData = class _TreeDataSetNodeData extends TreeNodeData {
       });
       Object.keys(this).forEach((key) => {
         const deKey = getDeKey(key);
-        if (isNil14(deKey) && !CloneExcludeKeys.includes(key)) {
+        if (isNil15(deKey) && !CloneExcludeKeys.includes(key)) {
           cloneNodeData[key] = this[key];
         }
       });
@@ -11816,7 +11832,7 @@ var TreeDataSetNodeData = class _TreeDataSetNodeData extends TreeNodeData {
     return new Proxy(this, {
       set(target, p, value) {
         const deKey = getDeKey(p);
-        if (!isNil14(deKey)) {
+        if (!isNil15(deKey)) {
           target._deData[deKey] = value;
         } else {
           target[p] = value;
@@ -11825,8 +11841,8 @@ var TreeDataSetNodeData = class _TreeDataSetNodeData extends TreeNodeData {
       },
       get(target, p, _receiver) {
         const deKey = getDeKey(p);
-        if (!isNil14(deKey)) {
-          return isNil14(target._deData[deKey]) ? getKeyDefault(p) : target._deData[deKey];
+        if (!isNil15(deKey)) {
+          return isNil15(target._deData[deKey]) ? getKeyDefault(p) : target._deData[deKey];
         }
         return target[p];
       },
@@ -11930,7 +11946,7 @@ var TreeStaticNodeData = class extends TreeNodeData {
 
 // src/service/vo/ui-map-field.ts
 import { DataTypes as DataTypes2 } from "@ibiz-template/core";
-import { isNil as isNil15 } from "ramda";
+import { isNil as isNil16 } from "ramda";
 var UIMapField = class {
   constructor(uiKey, dataKey, opts = {}) {
     /**
@@ -11951,10 +11967,10 @@ var UIMapField = class {
     this.isRequestNeed = true;
     this.uiKey = uiKey;
     this.dataKey = dataKey;
-    if (!isNil15(opts.isOriginField)) {
+    if (!isNil16(opts.isOriginField)) {
       this.isOriginField = opts.isOriginField;
     }
-    if (!isNil15(opts.dataType)) {
+    if (!isNil16(opts.dataType)) {
       this.dataType = opts.dataType;
     }
   }
@@ -11969,7 +11985,7 @@ var UIMapField = class {
       return value;
     }
     if (DataTypes2.isNumber(this.dataType)) {
-      const numVal = !isNil15(value) && value !== "" ? Number(value) : value;
+      const numVal = !isNil16(value) && value !== "" ? Number(value) : value;
       if (Number.isNaN(numVal)) {
         ibiz.log.debug("".concat(value, "\u4E0D\u80FD\u8F6C\u6362\u6210\u6570\u5B57"));
         return value;
@@ -12267,7 +12283,7 @@ var calcDataItemValue = (fieldCodeName, nodeModel, data = {}) => {
     return nodeDataItem.detreeColumnId === fieldCodeName;
   });
   if (targetTreeNodeDataItem && targetTreeNodeDataItem.appDEFieldId) {
-    result = data[targetTreeNodeDataItem.appDEFieldId];
+    result = data[targetTreeNodeDataItem.appDEFieldId.toLowerCase()];
   }
   return result;
 };
@@ -12689,7 +12705,7 @@ var _OpenAppViewCommand = class _OpenAppViewCommand {
           this.openIndexViewTab(appView, context, params);
           return { ok: true };
         }
-        return this.openIndexViewTab(appView, context, params);
+        return this.openIndexViewTab(appView, context, params, opts);
       case "INDEXVIEWTAB_POPUPMODAL":
         return this.openIndexViewTabByModal(appView, context, params);
       case "POPUP":
@@ -12721,8 +12737,8 @@ var _OpenAppViewCommand = class _OpenAppViewCommand {
    * @param {IContext} [context]
    * @param {IParams} [params={}]
    */
-  openIndexViewTab(appView, context, params = {}) {
-    return ibiz.openView.root(appView.id, context, params);
+  openIndexViewTab(appView, context, params = {}, modalOptions = {}) {
+    return ibiz.openView.root(appView.id, context, params, modalOptions);
   }
   /**
    * 模态路由打开视图，路由拼接于当前视图路由后。再由特殊解析呈现
@@ -12941,7 +12957,7 @@ function installCommand() {
 }
 
 // src/app-hub.ts
-import { RuntimeError as RuntimeError65 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError66 } from "@ibiz-template/core";
 
 // src/application.ts
 import { Net, getToken } from "@ibiz-template/core";
@@ -13273,13 +13289,14 @@ var PanelNotifyState = /* @__PURE__ */ ((PanelNotifyState2) => {
 var TreeGridExNotifyState = /* @__PURE__ */ ((TreeGridExNotifyState2) => {
   TreeGridExNotifyState2["LOAD"] = "LOAD";
   TreeGridExNotifyState2["SAVE"] = "SAVE";
+  TreeGridExNotifyState2["DRAFT"] = "DRAFT";
   return TreeGridExNotifyState2;
 })(TreeGridExNotifyState || {});
 
 // src/controller/common/view/view.controller.ts
 import { notNilEmpty as notNilEmpty6 } from "qx-util";
 import { IBizContext as IBizContext2, RuntimeError as RuntimeError34 } from "@ibiz-template/core";
-import { isEmpty as isEmpty8, isNil as isNil21, isNotNil as isNotNil2 } from "ramda";
+import { isEmpty as isEmpty9, isNil as isNil22, isNotNil as isNotNil2 } from "ramda";
 
 // src/controller/utils/loading/loading.state.ts
 import { NOOP } from "@ibiz-template/core";
@@ -13921,9 +13938,9 @@ function hasSubRoute(routeDepth) {
 }
 
 // src/controller/utils/util/util.ts
-import { isNil as isNil16 } from "ramda";
+import { isNil as isNil17 } from "ramda";
 function isValueChange(value, value2) {
-  if ((isNil16(value) || value === "") && (isNil16(value2) || value2 === "")) {
+  if ((isNil17(value) || value === "") && (isNil17(value2) || value2 === "")) {
     return false;
   }
   return value !== value2;
@@ -13939,7 +13956,7 @@ function getOriginData(data) {
 // src/controller/utils/value-rule/value-rule.ts
 import { RuntimeError as RuntimeError29 } from "@ibiz-template/core";
 import { isNilOrEmpty as isNilOrEmpty6, isNumber } from "qx-util";
-import { isNil as isNil17 } from "ramda";
+import { isNil as isNil18 } from "ramda";
 function generateRules(itemVRs, name, valueItemName) {
   const rules = [];
   itemVRs.forEach((item) => {
@@ -14004,7 +14021,7 @@ function generateEditorRules(editor) {
   if (maxLength) {
     rules.push({
       validator: (rule, value, callback) => {
-        if (!isNil17(value) && value.length > maxLength) {
+        if (!isNil18(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)
@@ -14019,7 +14036,7 @@ function generateEditorRules(editor) {
   if (minLength) {
     rules.push({
       validator: (rule, value, callback) => {
-        if (!isNil17(value) && value.length < minLength) {
+        if (!isNil18(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)
@@ -14031,10 +14048,10 @@ function generateEditorRules(editor) {
       }
     });
   }
-  if (!isNil17(maxValue)) {
+  if (!isNil18(maxValue)) {
     rules.push({
       validator: (rule, value, callback) => {
-        if (!isNil17(value) && isNumber(value) && value > maxValue) {
+        if (!isNil18(value) && isNumber(value) && value > maxValue) {
           callback(new Error("\u503C\u5FC5\u987B\u5C0F\u4E8E\u7B49\u4E8E".concat(maxValue)));
         } else {
           return true;
@@ -14042,10 +14059,10 @@ function generateEditorRules(editor) {
       }
     });
   }
-  if (!isNil17(minValue)) {
+  if (!isNil18(minValue)) {
     rules.push({
       validator: (rule, value, callback) => {
-        if (!isNil17(value) && isNumber(value) && value < minValue) {
+        if (!isNil18(value) && isNumber(value) && value < minValue) {
           callback(new Error("\u503C\u5FC5\u987B\u5927\u4E8E\u7B49\u4E8E".concat(minValue)));
         } else {
           return true;
@@ -14058,7 +14075,7 @@ function generateEditorRules(editor) {
 
 // src/controller/utils/value-ex/value-ex.ts
 import { RuntimeError as RuntimeError30 } from "@ibiz-template/core";
-import { isNil as isNil18, mergeLeft } from "ramda";
+import { isNil as isNil19, mergeLeft } from "ramda";
 var ValueExUtil = class {
   /**
    * 合并默认值
@@ -14083,7 +14100,7 @@ var ValueExUtil = class {
    * @return {*}  {string}
    */
   static toText(options, value) {
-    if (isNil18(value) || value === "") {
+    if (isNil19(value) || value === "") {
       return "";
     }
     const { valueType, objectNameField, textSeparator } = this.mergeDefault(options);
@@ -14108,12 +14125,12 @@ var ValueExUtil = class {
 import { RuntimeError as RuntimeError31, ModelError as ModelError17 } from "@ibiz-template/core";
 import dayjs from "dayjs";
 import { createUUID as createUUID8 } from "qx-util";
-import { isNil as isNil19, isNotNil } from "ramda";
+import { isNil as isNil20, isNotNil } from "ramda";
 function getDefaultValue(opts, origins) {
   var _a;
   const { name, valueType, defaultValue, valueFormat } = opts;
   const { data, context, params } = origins;
-  if (isNil19(valueType) && isNil19(defaultValue)) {
+  if (isNil20(valueType) && isNil20(defaultValue)) {
     return;
   }
   if (valueType === "RESET") {
@@ -14467,7 +14484,7 @@ var BaseController = class {
 
 // src/controller/utils/view-msg/view-msg-controller.ts
 import { RuntimeError as RuntimeError33, RuntimeModelError as RuntimeModelError24 } from "@ibiz-template/core";
-import { isNil as isNil20, mergeRight as mergeRight2 } from "ramda";
+import { isNil as isNil21, mergeRight as mergeRight2 } from "ramda";
 var ViewMsgController = class _ViewMsgController {
   constructor(msgGroupId) {
     this.msgGroupId = msgGroupId;
@@ -14652,19 +14669,19 @@ var ViewMsgController = class _ViewMsgController {
     const removeModeField = this.getDeFieldName(entity, removeFlagAppDEFieldId);
     const deViewMessages = dataSet.map((item) => {
       const message = {};
-      if (positionField && !isNil20(item[positionField])) {
+      if (positionField && !isNil21(item[positionField])) {
         message.position = item[positionField];
       }
-      if (titleField && !isNil20(item[titleField])) {
+      if (titleField && !isNil21(item[titleField])) {
         message.title = item[titleField];
       }
-      if (messageField && !isNil20(item[messageField])) {
+      if (messageField && !isNil21(item[messageField])) {
         message.message = item[messageField];
       }
-      if (typeField && !isNil20(item[typeField])) {
+      if (typeField && !isNil21(item[typeField])) {
         message.messageType = item[typeField];
       }
-      if (removeModeField && !isNil20(item[removeModeField])) {
+      if (removeModeField && !isNil21(item[removeModeField])) {
         message.removeMode = item[removeModeField];
       }
       return mergeRight2(basicMsg, message);
@@ -14823,6 +14840,7 @@ var ViewController = class extends BaseController {
     this.state.caption = this.model.caption;
     this.state.srfactiveviewdata = null;
     this.state.viewMessages = {};
+    this.state.isClosing = false;
   }
   async onCreated() {
     await super.onCreated();
@@ -14903,7 +14921,7 @@ var ViewController = class extends BaseController {
    */
   handleContextParams() {
     this.context.srfappid = this.model.appId;
-    if (isNil21(this.context.srfsessionid) || isEmpty8(this.context.srfsessionid)) {
+    if (isNil22(this.context.srfsessionid) || isEmpty9(this.context.srfsessionid)) {
       const domain = ibiz.uiDomainManager.create(this.id);
       this.context.srfsessionid = domain.id;
     }
@@ -15303,7 +15321,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 clone18, isNil as isNil22 } from "ramda";
+import { clone as clone18, isNil as isNil23 } from "ramda";
 import { notNilEmpty as notNilEmpty7 } from "qx-util";
 var ControlController = class extends BaseController {
   /**
@@ -15591,7 +15609,7 @@ var ControlController = class extends BaseController {
     let message;
     let duration;
     if (msgItem && msgItem.content) {
-      duration = isNil22(msgItem.timeout) ? void 0 : msgItem.timeout / 1e3;
+      duration = isNil23(msgItem.timeout) ? void 0 : msgItem.timeout / 1e3;
       const scriptParams = { ...this.getEventArgs() };
       if (opts == null ? void 0 : opts.data) {
         scriptParams.data = opts.data;
@@ -15643,6 +15661,13 @@ var MDControlController = class extends ControlController {
      * @protected
      */
     this.commandDataChange = false;
+    /**
+     * 是否设置过排序条件，比如searchBars默认点击分组时设置了
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2024-02-22 16:10:23
+     */
+    this.isSetSort = false;
     /**
      * 实体属性映射，key是id，value是name
      * @author lxm
@@ -15714,7 +15739,9 @@ var MDControlController = class extends ControlController {
       fn(msg);
     }, 300);
     ibiz.mc.command.change.on(this.onDataChange);
-    this.setSort();
+    if (!this.isSetSort) {
+      this.setSort();
+    }
   }
   async onMounted() {
     await super.onMounted();
@@ -15928,9 +15955,9 @@ var MDControlController = class extends ControlController {
     await this.startLoading();
     let needRefresh = false;
     try {
-      const deName = calcDeCodeNameById(this.model.appDataEntityId);
       await handleAllSettled(
         data.map(async (item) => {
+          const deName = this.getRemoveDeName(item);
           if (item.srfuf !== 0 /* CREATE */) {
             const tempContext = context.clone();
             tempContext[deName] = item.srfkey;
@@ -15962,6 +15989,16 @@ var MDControlController = class extends ControlController {
     this.state.selectedData = [];
     await this._evt.emit("onRemoveSuccess", void 0);
   }
+  /**
+   * 获取删除实体codeName
+   * @param {IData} _item
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2024-02-22 16:47:44
+   */
+  getRemoveDeName(_item) {
+    return calcDeCodeNameById(this.model.appDataEntityId);
+  }
   /**
    * 后台删除结束后界面删除逻辑
    *
@@ -16159,7 +16196,7 @@ var AppMenuController = class extends ControlController {
    * @param {string} id
    * @return {*}  {Promise<void>}
    */
-  async onClickMenuItem(id, event, useDepth = true) {
+  async onClickMenuItem(id, event, useDepth = true, opts = {}) {
     const menuItem = findRecursiveChild(this.model, id, {
       compareField: "id",
       childrenFields: ["appMenuItems"]
@@ -16189,7 +16226,8 @@ var AppMenuController = class extends ControlController {
       AppFuncCommand.TAG,
       menuItem.appFuncId,
       tempContext,
-      this.params
+      this.params,
+      opts
     );
   }
   /**
@@ -16623,7 +16661,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 clone20, isNil as isNil23, mergeDeepRight } from "ramda";
+import { clone as clone20, isNil as isNil24, mergeDeepRight } from "ramda";
 dayjs4.extend(minMax2);
 dayjs4.extend(isSameOrBefore);
 dayjs4.extend(quarterOfYear);
@@ -16719,10 +16757,10 @@ var BaseSeriesGenerator = class {
    * @return {*}  {(string | undefined)}
    */
   translateVal(codeListKey, val, isExclude = false) {
-    if (isNil23(val)) {
+    if (isNil24(val)) {
       return void 0;
     }
-    if (isNil23(codeListKey)) {
+    if (isNil24(codeListKey)) {
       return val;
     }
     const codeListItems = this.chartGenerator.codeListMap.get(codeListKey);
@@ -16771,7 +16809,7 @@ var BaseSeriesGenerator = class {
           seriesCodeListId,
           item[this.groupField]
         );
-        if (isNil23(groupVal)) {
+        if (isNil24(groupVal)) {
           return;
         }
         group = groupVal;
@@ -19255,6 +19293,10 @@ var UIActionProviderBase = class {
       refreshMode: action.refreshMode,
       closeView: action.closeEditView
     };
+    const { view } = args;
+    if (action.closeEditView) {
+      view.state.isClosing = true;
+    }
     const { appDEUILogicId, appDataEntityId, uilogicAttachMode } = action;
     if (uilogicAttachMode === "REPLACE") {
       if (!appDEUILogicId) {
@@ -19264,12 +19306,12 @@ var UIActionProviderBase = class {
       return result;
     }
     if (!await this.isConfirm(action, args)) {
-      return this.returnError(result);
+      return this.returnError(result, view);
     }
     const _result = await this.execAction(action, args);
     Object.assign(result, _result);
     if (result.cancel === true) {
-      return this.returnError(result);
+      return this.returnError(result, view);
     }
     if (action.uilogicAttachMode === "AFTER") {
       if (!appDEUILogicId) {
@@ -19293,7 +19335,7 @@ var UIActionProviderBase = class {
       if (nextResult) {
         Object.assign(result, nextResult);
         if (nextResult.cancel === true) {
-          return this.returnError(result);
+          return this.returnError(result, view);
         }
       }
     }
@@ -19325,7 +19367,8 @@ var UIActionProviderBase = class {
    * @returns {*}  {IUIActionResult}
    * @memberof UIActionHandler
    */
-  returnError(result) {
+  returnError(result, view) {
+    view.state.isClosing = false;
     return Object.assign(result, {
       refresh: false,
       closeView: false
@@ -20583,7 +20626,7 @@ var RawItemPortletController = class extends PortletPartController {
 
 // src/controller/control/data-view/data-view.controller.ts
 import { RuntimeModelError as RuntimeModelError52 } from "@ibiz-template/core";
-import { isNil as isNil24 } from "ramda";
+import { isNil as isNil25 } from "ramda";
 
 // src/controller/control/data-view/data-view.service.ts
 var DataViewControlService = class extends MDControlService {
@@ -20871,7 +20914,7 @@ var DataViewControlController = 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)) {
@@ -24594,7 +24637,9 @@ var EditFormController = class extends FormController {
     }
     this.state.modified = false;
     await this.evt.emit("onSaveSuccess", void 0);
-    this.formStateNotify("SAVE" /* SAVE */);
+    if (!this.view.state.isClosing) {
+      this.formStateNotify("SAVE" /* SAVE */);
+    }
     if (!silent) {
       this.actionNotification("".concat(isCreate ? "CREATE" : "UPDATE", "SUCCESS"), {
         default: "".concat(this.data.srfmajortext || "", "\u4FDD\u5B58\u6210\u529F")
@@ -26276,6 +26321,7 @@ var GridController = class extends MDControlController {
   setGroupParams(data) {
     if (data.sort) {
       this.state.sortQuery = data.sort;
+      this.isSetSort = true;
     } else {
       this.state.sortQuery = "";
     }
@@ -26333,7 +26379,7 @@ var GridController = class extends MDControlController {
 import { DataTypes as DataTypes4, ModelError as ModelError29, plus as plus2 } from "@ibiz-template/core";
 import dayjs5 from "dayjs";
 import { debounce as debounce3 } from "lodash-es";
-import { clone as clone27, isNil as isNil25 } from "ramda";
+import { clone as clone27, isNil as isNil26 } from "ramda";
 var GridFieldColumnController = class extends GridColumnController {
   constructor() {
     super(...arguments);
@@ -26545,11 +26591,11 @@ var GridFieldColumnController = class extends GridColumnController {
    */
   calcFieldAgg(items) {
     const { aggField, aggMode, aggValueFormat, unitName } = this.model;
-    if (isNil25(aggMode) || aggMode === "NONE") {
+    if (isNil26(aggMode) || aggMode === "NONE") {
       return;
     }
     const fieldName = aggField || this.model.id;
-    items = items.filter((item) => !isNil25(item[fieldName]));
+    items = items.filter((item) => !isNil26(item[fieldName]));
     let aggValue;
     if (this.grid.model.aggMode === "PAGE") {
       switch (aggMode) {
@@ -27865,7 +27911,7 @@ var PickupViewPanelController = class extends ControlController {
 
 // src/controller/control/search-bar/search-bar.controller.ts
 import { mergeInLeft as mergeInLeft3, recursiveIterate as recursiveIterate10 } from "@ibiz-template/core";
-import { clone as clone28, isNil as isNil27 } from "ramda";
+import { clone as clone28, isNil as isNil28 } from "ramda";
 import { isString as isString2 } from "lodash-es";
 
 // src/controller/control/search-bar/search-bar-filter.controller.ts
@@ -28307,7 +28353,7 @@ async function calcFilterModelBySchema(json, appDataEntityId, modelAppId) {
 
 // src/controller/control/search-bar/use-searchcond.ts
 import { RuntimeError as RuntimeError58, recursiveIterate as recursiveIterate9 } from "@ibiz-template/core";
-import { isNil as isNil26 } from "ramda";
+import { isNil as isNil27 } from "ramda";
 function getOriginFilterNodes() {
   return [
     {
@@ -28364,7 +28410,7 @@ function calcSearchConds(filterNodes) {
   let hasError = false;
   recursiveIterate9(filterNodes[0], (node) => {
     if (node.leaf) {
-      if (node.field && node.valueOP && !isNil26(node.value)) {
+      if (node.field && node.valueOP && !isNil27(node.value)) {
         hasFilter = true;
       } else {
         hasError = true;
@@ -28663,7 +28709,7 @@ var SearchBarController = class extends ControlController {
       recursiveIterate10(
         searchconds[0],
         (node) => {
-          if (node.condtype === "DEFIELD" && !isNil27(node.value)) {
+          if (node.condtype === "DEFIELD" && !isNil28(node.value)) {
             const controller = this.findFilterController(
               node.fieldname,
               node.condop
@@ -29097,7 +29143,8 @@ var TabExpPanelController = class extends ControlController {
       context,
       params,
       viewId: tabViewPanel.embeddedAppDEViewId,
-      isCache: this.isCache
+      isCache: this.isCache,
+      modalOptions: { replace: true }
     };
   }
 };
@@ -30103,6 +30150,20 @@ var TreeController = class extends MDControlController {
     nodeData._text = text;
     await this.updateDeNodeData([nodeData]);
   }
+  /**
+   * 获取删除实体codeName
+   * @param {IData} item
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2024-02-22 16:47:44
+   */
+  getRemoveDeName(item) {
+    const treeNode = this.getNodeModel(item._nodeId);
+    if (treeNode) {
+      return calcDeCodeNameById(treeNode.appDataEntityId);
+    }
+    return calcDeCodeNameById(this.model.appDataEntityId);
+  }
 };
 
 // src/controller/control/wizard-panel/wizard-panel.controller.ts
@@ -30459,7 +30520,7 @@ var WizardPanelController = class extends ControlController {
 
 // src/controller/control/md-ctrl/md-ctrl.controller.ts
 import { RuntimeModelError as RuntimeModelError65 } from "@ibiz-template/core";
-import { isNil as isNil28 } from "ramda";
+import { isNil as isNil29 } from "ramda";
 
 // src/controller/control/md-ctrl/md-ctrl.service.ts
 var MDCtrlService = class extends MDControlService {
@@ -30686,7 +30747,7 @@ var MDCtrlController = class extends MDControlController {
       const groupMap = /* @__PURE__ */ new Map();
       items.forEach((item) => {
         const groupVal = item[groupAppDEFieldId];
-        if (isNil28(groupVal)) {
+        if (isNil29(groupVal)) {
           return;
         }
         if (!groupMap.has(groupVal)) {
@@ -30763,7 +30824,7 @@ var MDCtrlController = class extends MDControlController {
 
 // src/controller/control/kanban/kanban.controller.ts
 import { RuntimeError as RuntimeError61, RuntimeModelError as RuntimeModelError66 } from "@ibiz-template/core";
-import { isNil as isNil29 } from "ramda";
+import { isNil as isNil30 } from "ramda";
 
 // src/controller/control/kanban/kanban.service.ts
 var KanbanService = class extends DataViewControlService {
@@ -30848,7 +30909,7 @@ var KanbanController = class extends DataViewControlController {
     const isAsc = minorSortDir === "ASC";
     items.forEach((item) => {
       const sortValue = item[sortField];
-      if (isNil29(sortValue)) {
+      if (isNil30(sortValue)) {
         item[sortField] = 0;
       } else {
         const toNum = Number(sortValue);
@@ -30955,7 +31016,7 @@ var KanbanController = class extends DataViewControlController {
       const groupMap = /* @__PURE__ */ new Map();
       items.forEach((item) => {
         const groupVal = item[groupAppDEFieldId];
-        if (isNil29(groupVal)) {
+        if (isNil30(groupVal)) {
           return;
         }
         if (!groupMap.has(groupVal)) {
@@ -33169,27 +33230,47 @@ var ReportPanelController = class extends ControlController {
   }
 };
 
+// src/controller/control/gantt/gantt.controller.ts
+import { awaitTimeout as awaitTimeout4, RuntimeError as RuntimeError65 } from "@ibiz-template/core";
+
 // src/controller/control/gantt/gantt.service.ts
 import { ModelError as ModelError31 } from "@ibiz-template/core";
 var GanttService = class extends TreeService {
   /**
-   * 执行实体服务
+   * 获取节点草稿
    *
-   * @protected
-   * @param {string} appDataEntityId 实体标识
-   * @param {string} actionName 行为标识
-   * @param {IContext} context 上下文
-   * @param {IParams} params 参数
-   * @return {*}  {Promise<IHttpResponse<IData>>}
+   * @param {IDETreeDataSetNode} nodeModel
+   * @param {(IDETreeNodeRS | undefined)} nodeRS
+   * @param {(IGanttNodeData | undefined)} parentNodeData
+   * @param {TreeFetchOpts} opts
+   * @return {*}  {Promise<IGanttNodeData>}
    * @memberof GanttService
    */
-  execDeService(appDataEntityId, actionName, context, params) {
-    return this.app.deService.exec(
+  async getNodeDraft(nodeModel, nodeRS, parentNodeData, opts) {
+    var _a;
+    const { appDataEntityId } = nodeModel;
+    const { context, params, navContext, navParams } = nodeRS ? this.getNodeRSFilterParams(nodeRS, parentNodeData, opts) : {
+      context: opts.context,
+      params: opts.params,
+      navContext: {},
+      navParams: {}
+    };
+    const response = await this.app.deService.exec(
       appDataEntityId,
-      actionName,
+      "getdraft",
       context,
       params
     );
+    const { data } = response;
+    if (((_a = nodeRS == null ? void 0 : nodeRS.parentDER1N) == null ? void 0 : _a.pickupDEFName) && parentNodeData) {
+      data[nodeRS.parentDER1N.pickupDEFName] = parentNodeData._value;
+    }
+    return new GanttDataSetNodeData(this.model, nodeModel, parentNodeData, {
+      data: response.data,
+      leaf: true,
+      navContext,
+      navParams
+    });
   }
   /**
    * 获取子节点数据
@@ -33423,6 +33504,9 @@ var GanttService = class extends TreeService {
 
 // src/controller/control/gantt/gantt.controller.ts
 var GanttController = class extends TreeGridExController {
+  get _evt() {
+    return this.evt;
+  }
   /**
    * 初始化状态
    *
@@ -33464,59 +33548,286 @@ var GanttController = class extends TreeGridExController {
     this.state.ganttStyle = style;
   }
   /**
-   * 转化节点数据项
-   * vo -> do
-   * @param {IDETreeNode} nodeModel 节点模型
-   * @param {IData} data 数据
+   * 设置行属性的值
+   *
+   * @param {TreeGridExRowState} row
+   * @param {string} name
+   * @param {unknown} value
+   * @return {*}  {Promise<void>}
    * @memberof GanttController
    */
-  transformNodeDataItem(nodeModel, data) {
-    var _a;
-    const dataItem = {};
-    (_a = nodeModel.detreeNodeDataItems) == null ? void 0 : _a.forEach((item) => {
-      if (item.id && item.appDEFieldId && data.hasOwnProperty(item.id.toLowerCase())) {
-        Object.assign(dataItem, {
-          [item.appDEFieldId.toLowerCase()]: data[item.id.toLowerCase()]
-        });
-      }
-    });
-    return dataItem;
+  async setRowValue(row, name, value) {
+    const { beginDataItemName, endDataItemName } = this.model;
+    if (Object.prototype.hasOwnProperty.call(row.data, name) && !isValueChange(row.data[name], value)) {
+      return;
+    }
+    row.data[name] = value;
+    if (name === beginDataItemName) {
+      row.data._beginDataItemValue = value;
+    } else if (name === endDataItemName) {
+      row.data._endDataItemValue = value;
+    }
+    row.modified = true;
+    row.processing = true;
+    try {
+      await this.dataChangeNotify(row, [name]);
+    } finally {
+      row.processing = false;
+    }
   }
   /**
-   * 更新节点数据
+   * 修改节点时间
    *
-   * @param {(IGanttNodeData | IData)} nodeData 节点数据
-   * @param {IData} data 更新数据
-   * @param {boolean} [isTransformData=false] 是否转化数据项
-   * @return {*}
+   * @param {IGanttNodeData} nodeData
    * @memberof GanttController
    */
-  async updateNodeData(nodeData, data, isTransformData = false) {
-    const key = nodeData.srfkey ? "srfkey" : "_id";
-    const currentNode = this.state.items.find(
-      (item) => item[key] === nodeData[key]
-    );
-    if (!currentNode || !currentNode.srfkey) {
-      ibiz.log.error("\u627E\u4E0D\u5230\u5BF9\u5E94\u7684\u52A8\u6001\u5B9E\u4F53\u6811\u8282\u70B9\u6570\u636E", nodeData);
+  async modifyNodeTime(nodeData, { begin, end }) {
+    if (nodeData._nodeType !== "DE") {
+      throw new RuntimeError65("\u4E0D\u662F\u5B9E\u4F53\u7518\u7279\u8282\u70B9\u6570\u636E");
+    }
+    const rowState = this.getRowState(nodeData._id);
+    if (!rowState) {
+      throw new RuntimeError65("\u884C\u6570\u636E\u4E0D\u5B58\u5728");
+    }
+    const { beginDataItemName, endDataItemName } = this.model;
+    this.setRowValue(rowState, beginDataItemName, begin);
+    this.setRowValue(rowState, endDataItemName, end);
+    await this.save(rowState.data);
+  }
+  /**
+   * 保存
+   *
+   * @param {IGanttNodeData} nodeData
+   * @return {*}  {Promise<void>}
+   * @memberof GanttController
+   */
+  async save(nodeData) {
+    if (this.state.isSimple) {
+      ibiz.log.debug("\u7B80\u5355\u6A21\u5F0F\uFF0C\u4E0D\u4FDD\u5B58");
+      return;
+    }
+    if (nodeData._nodeType !== "DE") {
+      throw new RuntimeError65("\u975E\u5B9E\u4F53\u8282\u70B9\u6570\u636E\u4E0D\u80FD\u4FDD\u5B58");
+    }
+    const rowState = this.state.rows[nodeData._uuid];
+    if (!rowState) {
+      throw new RuntimeError65("\u884C\u6570\u636E\u4E0D\u5B58\u5728");
+    }
+    if (!rowState.modified) {
+      ibiz.log.debug("\u503C\u6CA1\u6709\u53D1\u751F\u6539\u53D8");
+      return;
+    }
+    if (rowState.processing) {
+      await awaitTimeout4(500, this.save.bind(this), [nodeData]);
       return;
     }
-    const nodeModel = this.getNodeModel(currentNode._nodeId);
-    if (nodeModel) {
-      const newData = isTransformData ? this.transformNodeDataItem(nodeModel, data) : data;
-      if (Object.keys(newData).length > 0) {
-        const deName = calcDeCodeNameById(nodeModel.appDataEntityId);
-        const tempContext = Object.assign(this.context.clone(), {
-          [deName]: currentNode.srfkey
+    const nodeModel = this.getNodeModel(nodeData._nodeId);
+    const { appDataEntityId } = nodeModel;
+    const isCreate = nodeData._deData.srfuf === 0 /* CREATE */;
+    const deName = calcDeCodeNameById(appDataEntityId);
+    const tempContext = this.context.clone();
+    tempContext[deName] = nodeData._deData.srfkey;
+    const app = ibiz.hub.getApp(this.context.srfappid);
+    let res;
+    try {
+      res = await app.deService.exec(
+        appDataEntityId,
+        isCreate ? "create" : "update",
+        tempContext,
+        nodeData._deData
+      );
+    } catch (error) {
+      await this._evt.emit("onSaveError", void 0);
+      this.actionNotification("".concat(isCreate ? "CREATE" : "UPDATE", "ERROR"), {
+        error,
+        data: rowState.data
+      });
+      throw error;
+    }
+    rowState.data._deData = res.data;
+    rowState.modified = false;
+    this.gridStateNotify(rowState, "SAVE" /* SAVE */);
+    await this._evt.emit("onSaveSuccess", void 0);
+  }
+  /**
+   * 删除
+   *
+   * @param {MDCtrlRemoveParams} [args]
+   * @return {*}  {Promise<void>}
+   * @memberof GanttController
+   */
+  async remove(args) {
+    const { context, params, data } = this.handlerAbilityParams(args);
+    if (!(data == null ? void 0 : data.length)) {
+      throw new RuntimeError65("\u672A\u9009\u4E2D\u6570\u636E");
+    }
+    if ((args == null ? void 0 : args.silent) !== true) {
+      const del = await ibiz.confirm.error({
+        title: "\u6570\u636E\u5220\u9664",
+        desc: "\u786E\u8BA4\u5220\u9664\u6570\u636E\uFF1F"
+      });
+      if (!del) {
+        return;
+      }
+    }
+    await this._evt.emit("onBeforeRemove", void 0);
+    await this.startLoading();
+    let needRefresh = false;
+    let refreshNode;
+    try {
+      const app = ibiz.hub.getApp(this.context.srfappid);
+      await handleAllSettled(
+        data.map(async (item) => {
+          if (item._nodeType === "DE") {
+            const tempContext = context.clone();
+            const nodeModel = this.getNodeModel(item._nodeId);
+            if (nodeModel && item._deData.srfuf !== 0 /* CREATE */) {
+              const { appDataEntityId } = nodeModel;
+              const deName = calcDeCodeNameById(appDataEntityId);
+              tempContext[deName] = item.srfkey;
+              await app.deService.exec(
+                appDataEntityId,
+                "remove",
+                tempContext,
+                params
+              );
+              if (refreshNode) {
+                refreshNode = item;
+              }
+              needRefresh = true;
+            }
+            this.afterRemove(item);
+          }
+        })
+      );
+      if ((args == null ? void 0 : args.silent) !== true) {
+        this.actionNotification("REMOVESUCCESS", {
+          data,
+          default: "\u6570\u636E[".concat(data.map((item) => item.srfmajortext).join("\u3001"), "]\u5220\u9664\u6210\u529F!")
         });
-        const response = await this.service.execDeService(
-          nodeModel.appDataEntityId,
-          "update",
-          tempContext,
-          newData
-        );
-        if (response.status === 200) {
-          this.refreshNodeChildren(nodeData, true);
+      }
+      if (needRefresh && !(args == null ? void 0 : args.notRefresh)) {
+        await this.refreshNodeChildren(refreshNode, true);
+      }
+    } catch (error) {
+      await this._evt.emit("onRemoveError", void 0);
+      this.actionNotification("REMOVEERROR", {
+        error,
+        data
+      });
+      throw error;
+    } finally {
+      await this.endLoading();
+    }
+    this.state.selectedData = [];
+    await this._evt.emit("onRemoveSuccess", void 0);
+  }
+  /**
+   * 后台删除结束后界面删除逻辑
+   *
+   * @param {GanttDataSetNodeData} data
+   * @memberof GanttController
+   */
+  afterRemove(data) {
+    var _a;
+    const index = this.state.items.findIndex((item) => item._uuid === data._uuid);
+    if (index !== -1) {
+      this.state.items.splice(index, 1);
+    }
+    if (this.state.rows[data._uuid]) {
+      delete this.state.rows[data._uuid];
+    }
+    if (data._deData.srfuf === 0 /* CREATE */ && data._parent) {
+      const parentNodeData = this.getNodeData(
+        data._parent._id
+      );
+      const childIndex = parentNodeData._children.findIndex(
+        (child) => child._uuid === data._uuid
+      );
+      if (childIndex !== -1) {
+        (_a = parentNodeData._children) == null ? void 0 : _a.splice(childIndex, 1);
+      }
+    }
+  }
+  /**
+   * 新建行
+   *
+   * @param {MDCtrlLoadParams} [args={}]
+   * @return {*}  {Promise<void>}
+   * @memberof GanttController
+   */
+  async newRow(args = {}) {
+    var _a;
+    const { data } = args;
+    const { editShowMode } = ibiz.config.grid;
+    if (editShowMode === "row") {
+      const editingRow = Object.values(this.state.rows).find(
+        (item) => item.showRowEdit
+      );
+      if (editingRow) {
+        throw new RuntimeError65("\u8BF7\u5148\u5B8C\u6210\u5F53\u524D\u884C\u7F16\u8F91\u4E2D\u7684\u884C\u7684\u64CD\u4F5C");
+      }
+    }
+    let parentModel;
+    let parentNodeData;
+    if (data) {
+      const item = Array.isArray(data) ? data[0] : data;
+      parentNodeData = this.getNodeData(item._id);
+      parentModel = this.getNodeModel(parentNodeData._nodeId);
+    } else {
+      parentNodeData = this.state.rootNodes[0];
+      parentModel = getRootNode(this.model);
+    }
+    if (parentModel) {
+      const nodeRSs = getChildNodeRSs(this.model, {
+        parentId: parentModel.id,
+        hasQuery: false
+      });
+      let nodeRS;
+      let nodeModel;
+      nodeRSs.forEach((_nodeRS) => {
+        const childNode = this.getNodeModel(_nodeRS.childDETreeNodeId);
+        if ((childNode == null ? void 0 : childNode.treeNodeType) === "DE" && childNode.appDataEntityId) {
+          nodeRS = _nodeRS;
+          nodeModel = childNode;
+        }
+      });
+      if (nodeModel) {
+        let draftData;
+        try {
+          draftData = await this.service.getNodeDraft(
+            nodeModel,
+            nodeRS,
+            parentNodeData,
+            {
+              hasQuery: false,
+              context: this.context.clone(),
+              params: this.params
+            }
+          );
+        } catch (error) {
+          this.actionNotification("GETDRAFTERROR", {
+            error
+          });
+          throw error;
+        }
+        const defaultVal = this.calcDefaultValue(draftData, true);
+        Object.assign(draftData, defaultVal);
+        const parentRow = this.getRowState(parentNodeData._id);
+        if ((_a = parentNodeData._children) == null ? void 0 : _a.length) {
+          parentNodeData._children.push(draftData);
+        } else {
+          parentNodeData._children = [draftData];
+        }
+        this.state.items.push(draftData);
+        const rowState = new TreeGridExRowState(draftData, this);
+        this.state.rows[draftData._uuid] = rowState;
+        this.gridStateNotify(rowState, "DRAFT" /* DRAFT */);
+        if (editShowMode === "row") {
+          this.switchRowEdit(rowState, true);
         }
+        this._evt.emit("onNewRow", { row: parentRow });
+        this.actionNotification("GETDRAFTSUCCESS", { data: draftData });
       }
     }
   }
@@ -33549,7 +33860,7 @@ import { QXEvent as QXEvent9 } from "qx-util";
 // src/controller/notification/async-action.controller.ts
 import { QXEvent as QXEvent7 } from "qx-util";
 import { clone as clone31 } from "ramda";
-import { isNil as isNil30, isNumber as isNumber2 } from "lodash-es";
+import { isNil as isNil31, isNumber as isNumber2 } from "lodash-es";
 import dayjs7 from "dayjs";
 var AsyncActionController = class {
   constructor() {
@@ -33624,14 +33935,14 @@ var AsyncActionController = class {
         data[key] = dayjs7(data[key]).format("YYYY-MM-DD HH:mm:ss");
       }
     });
-    if (!isNil30(data.actionresult)) {
+    if (!isNil31(data.actionresult)) {
       try {
         const json = JSON.parse(data.actionresult);
         data.actionresult = json;
       } catch (error) {
       }
     }
-    if (!isNil30(data.completionrate)) {
+    if (!isNil31(data.completionrate)) {
       const num = Number(data.completionrate);
       if (Number.isNaN(num)) {
         data.completionrate = void 0;
@@ -33805,20 +34116,32 @@ var InternalMessageController = class {
           position: "bottom-right"
         });
       }
+      this.refreshUnreadCount();
     });
   }
   async markRead(message) {
-    if (message.status !== "RECEIVED") {
-      return;
-    }
     const find = this.messages.find((msg) => msg.id === message.id);
-    if (!find) {
+    if (!find || find.status !== "RECEIVED") {
       return;
     }
     await this.service.markRead(message.id);
+    find.status = "READ";
+    this.unreadCount -= 1;
     this.evt.emit("unreadCountChange", this.unreadCount);
     this.evt.emit("dataChange");
   }
+  /**
+   * 把所有未读消息标记为已读
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2024-02-21 15:38:25
+   */
+  async batchMarkRead() {
+    await this.service.batchMarkRead();
+    await this.fetch();
+    this.unreadCount = 0;
+    this.evt.emit("unreadCountChange", this.unreadCount);
+  }
   /**
    * 获取完整信息
    * @author lxm
@@ -34053,7 +34376,7 @@ var AppHub = class {
       this.registerAppView(appView);
       return appView;
     }
-    throw new RuntimeError65("\u89C6\u56FE[".concat(id, "]\u4E0D\u5B58\u5728"));
+    throw new RuntimeError66("\u89C6\u56FE[".concat(id, "]\u4E0D\u5B58\u5728"));
   }
   /**
    * 根据视图模型路径，加参数重新计算视图模型
@@ -34074,7 +34397,7 @@ var AppHub = class {
       );
       return model;
     }
-    throw new RuntimeError65("\u89C6\u56FE[".concat(modelPath, "]\u4E0D\u5B58\u5728"));
+    throw new RuntimeError66("\u89C6\u56FE[".concat(modelPath, "]\u4E0D\u5B58\u5728"));
   }
   /**
    * 根据应用实体代码名称查找应用视图
@@ -34105,7 +34428,7 @@ var AppHub = class {
       this.registerAppDataEntity(entity, appId2);
       return entity;
     }
-    throw new RuntimeError65("\u672A\u627E\u5230\u5E94\u7528\u5B9E\u4F53[".concat(id, "]"));
+    throw new RuntimeError66("\u672A\u627E\u5230\u5E94\u7528\u5B9E\u4F53[".concat(id, "]"));
   }
   /**
    * 新建 hub 应用
@@ -34120,7 +34443,7 @@ var AppHub = class {
       return this.appMap.get(id);
     }
     if (!this.modelLoaderProvider) {
-      throw new RuntimeError65("\u8BF7\u5148\u6CE8\u518C\u6A21\u578B\u52A0\u8F7D\u9002\u914D\u5668");
+      throw new RuntimeError66("\u8BF7\u5148\u6CE8\u518C\u6A21\u578B\u52A0\u8F7D\u9002\u914D\u5668");
     }
     const appModel = await this.modelLoaderProvider.getApp(id);
     const app = new Application(appModel);
@@ -34251,7 +34574,7 @@ var EngineFactory = class {
 };
 
 // src/engine/view-base.engine.ts
-import { RuntimeError as RuntimeError66, findRecursiveChild as findRecursiveChild3 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError67, findRecursiveChild as findRecursiveChild3 } from "@ibiz-template/core";
 var ViewEngineBase = class {
   /**
    * 构造函数在视图控制器的构造函数逻辑内部执行
@@ -34359,9 +34682,6 @@ var ViewEngineBase = class {
     if (model.showCaptionBar === false) {
       names.push("view_captionbar");
     }
-    if (!getControl(model, "toolbar")) {
-      names.push("view_toolbar", "toolbar");
-    }
     const toolBarList = ["lefttoolbar", "righttoolbar", "footertoolbar"];
     toolBarList.forEach((name) => {
       if (!getControl(model, name)) {
@@ -34375,6 +34695,11 @@ var ViewEngineBase = class {
       if (!this.calcViewFooterVisible()) {
         names.push("view_footer");
       }
+      if (!this.isExistAndInLayout("lefttoolbar") && !this.isExistAndInLayout("righttoolbar") && model.showCaptionBar === false) {
+        names.push("view_toolbar");
+      }
+    } else if (!getControl(model, "toolbar")) {
+      names.push("view_toolbar", "toolbar");
     }
     return names;
   }
@@ -34504,7 +34829,7 @@ var ViewEngineBase = class {
     const { appDataEntityId } = this.view.model;
     const { evt, context, params } = this.view;
     if (!appDataEntityId) {
-      throw new RuntimeError66("\u8BE5\u89C6\u56FE\u6CA1\u6709\u5B9E\u4F53\uFF0C\u65E0\u6CD5\u52A0\u8F7D\u5B9E\u4F53\u6570\u636E");
+      throw new RuntimeError67("\u8BE5\u89C6\u56FE\u6CA1\u6709\u5B9E\u4F53\uFF0C\u65E0\u6CD5\u52A0\u8F7D\u5B9E\u4F53\u6570\u636E");
     }
     const app = ibiz.hub.getApp(context.srfappid);
     const res = await app.deService.exec(
@@ -34619,7 +34944,7 @@ var MDViewEngine = class extends ViewEngineBase {
       });
     }
     if (!this.view.state.noLoadDefault && model.loadDefault) {
-      if (this.searchBar && this.searchBar.hasDefaultSelect && this.xdataControlName === "grid") {
+      if (this.searchBar && this.searchBar.hasDefaultSelect && (this.xdataControlName === "grid" || this.xdataControlName === "treegrid")) {
         this.searchBar.setDefaultSelect();
       } else {
         this.load();
@@ -35028,7 +35353,7 @@ var GlobalUtil = class {
 };
 
 // src/logic-scheduler/executor/logic-executor.ts
-import { RuntimeError as RuntimeError67 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError68 } from "@ibiz-template/core";
 var LogicExecutor = class {
   /**
    * @author lxm
@@ -35049,7 +35374,7 @@ var LogicExecutor = class {
    */
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   execute(_executeParams) {
-    throw new RuntimeError67("Method not implemented.");
+    throw new RuntimeError68("Method not implemented.");
   }
   /**
    * 销毁方法
@@ -35486,7 +35811,7 @@ var LogicSchedulerCenter = class {
 };
 
 // src/logic-scheduler/trigger/logic-trigger.ts
-import { RuntimeError as RuntimeError68 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError69 } from "@ibiz-template/core";
 var LogicTrigger = class {
   /**
    * @author lxm
@@ -35546,7 +35871,7 @@ var LogicTrigger = class {
     if (this.executor) {
       return this.executor.execute(executeParams);
     }
-    throw new RuntimeError68("".concat(this.logic.id, "\u6CA1\u6709\u7ED1\u5B9Aexecutor"));
+    throw new RuntimeError69("".concat(this.logic.id, "\u6CA1\u6709\u7ED1\u5B9Aexecutor"));
   }
   /**
    * 销毁方法
@@ -35563,12 +35888,12 @@ var CustomTrigger = class extends LogicTrigger {
 };
 
 // src/logic-scheduler/trigger/item-dyna-logic-trigger.ts
-import { RuntimeError as RuntimeError69 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError70 } from "@ibiz-template/core";
 var ItemDynaLogicTrigger = class extends LogicTrigger {
   bindExecutor(executor) {
     super.bindExecutor(executor);
     if (this.executor.type !== "SCRIPT") {
-      throw new RuntimeError69(
+      throw new RuntimeError70(
         "\u9884\u5B9A\u4E49\u903B\u8F91\u7C7B\u578B".concat(this.type, "\u7684\u89E6\u53D1\u5668\u7C7B\u578B\u53EA\u80FD\u662F\u811A\u672C")
       );
     }
@@ -35604,7 +35929,7 @@ var ItemDynaLogicTrigger = class extends LogicTrigger {
 };
 
 // src/logic-scheduler/trigger/timer-trigger.ts
-import { RuntimeError as RuntimeError70, RuntimeModelError as RuntimeModelError72 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError71, RuntimeModelError as RuntimeModelError72 } from "@ibiz-template/core";
 var TimerTrigger = class extends LogicTrigger {
   constructor() {
     super(...arguments);
@@ -35616,7 +35941,7 @@ var TimerTrigger = class extends LogicTrigger {
     }
     this.timer = setInterval(() => {
       if (!this.scheduler.defaultParamsCb) {
-        throw new RuntimeError70("\u5B9A\u65F6\u5668\u7F3A\u5C11\u9ED8\u8BA4\u53C2\u6570\u56DE\u8C03");
+        throw new RuntimeError71("\u5B9A\u65F6\u5668\u7F3A\u5C11\u9ED8\u8BA4\u53C2\u6570\u56DE\u8C03");
       }
       const params = this.scheduler.defaultParamsCb();
       this.executor.execute(params);
@@ -35633,7 +35958,7 @@ var TimerTrigger = class extends LogicTrigger {
 // src/logic-scheduler/executor/app-ui-logic-executor.ts
 import {
   ModelError as ModelError34,
-  RuntimeError as RuntimeError71,
+  RuntimeError as RuntimeError72,
   RuntimeModelError as RuntimeModelError73
 } from "@ibiz-template/core";
 import { notNilEmpty as notNilEmpty9 } from "qx-util";
@@ -35671,7 +35996,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const { context, params, ...rest } = parameters;
     const { data } = parameters;
     if (!(data == null ? void 0 : data[0])) {
-      throw new RuntimeError71("opendata\u6CA1\u6709\u53EF\u64CD\u4F5C\u6570\u636E\uFF01");
+      throw new RuntimeError72("opendata\u6CA1\u6709\u53EF\u64CD\u4F5C\u6570\u636E\uFF01");
     }
     const openViewRefs = appUILogic.openDataAppViews;
     let openViewRef;
@@ -35731,7 +36056,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const openViewRefs = appUILogic.openDataAppViews;
     const findView = openViewRefs == null ? void 0 : openViewRefs.find((item) => item.refMode === formTypeValue);
     if (!findView) {
-      throw new RuntimeError71(
+      throw new RuntimeError72(
         "\u6CA1\u6709\u627E\u5230\u4E0E\u8868\u5355\u7C7B\u578B".concat(formTypeValue, "\u76F8\u5173\u7684\u5B9E\u4F53\u7684\u7F16\u8F91\u89C6\u56FE")
       );
     }
@@ -35856,7 +36181,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     }
     const selectData = (_a = result.data) == null ? void 0 : _a[0];
     if (!selectData) {
-      throw new RuntimeError71("\u8BF7\u9009\u4E2D\u4E00\u6761\u6570\u636E");
+      throw new RuntimeError72("\u8BF7\u9009\u4E2D\u4E00\u6761\u6570\u636E");
     }
     const indexType = selectData.srfkey;
     const findView = newDataAppViews == null ? void 0 : newDataAppViews.find(
@@ -35866,7 +36191,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
       }
     );
     if (!findView) {
-      throw new RuntimeError71(
+      throw new RuntimeError72(
         "\u6CA1\u6709\u627E\u5230\u4E0E\u7D22\u5F15\u7C7B\u578B".concat(indexType, "\u76F8\u5173\u7684\u5B9E\u4F53\u7684\u7F16\u8F91\u89C6\u56FE")
       );
     }
@@ -35903,7 +36228,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
         }
       });
       if (pickParentFieldName === void 0) {
-        throw new RuntimeError71(
+        throw new RuntimeError72(
           "\u6CA1\u6709\u627E\u5230".concat(pickParentDeName, "\u5728\u5F53\u524D\u5B9E\u4F53\u7684\u5916\u952E\u5C5E\u6027")
         );
       }
@@ -36092,6 +36417,14 @@ var PluginStaticResource = class {
    * @param {string} mateUrl import.mate.url
    */
   constructor(mateUrl) {
+    /**
+     * 是否为 http || https 开头
+     *
+     * @author chitanda
+     * @date 2022-11-07 14:11:28
+     * @protected
+     */
+    this.urlReg = /^http[s]?:\/\/[^\s]*/;
     /**
      * 已经输出过路径的 style 标签
      *
@@ -36113,6 +36446,9 @@ var PluginStaticResource = class {
    * @return {*}  {string}
    */
   dir(pathStr) {
+    if (this.urlReg.test(pathStr)) {
+      return pathStr;
+    }
     return this.url.origin + path.resolve(this.baseDir, pathStr);
   }
   /**
@@ -36125,7 +36461,7 @@ var PluginStaticResource = class {
    */
   async loadStyle(urls) {
     const all = urls.map((styleUrl) => {
-      const url = this.dir(styleUrl);
+      const url = this.urlReg.test(styleUrl) ? styleUrl : this.dir(styleUrl);
       if (this.styleElementMap.has(url)) {
         return false;
       }