@ibiz-template/runtime 0.4.13 → 0.4.14

package/dist/index.esm.js

@@ -1032,6 +1032,25 @@ function getAllPanelField(model) {
   return _getAllPanelField(model);
 }
 
+// src/model/toolbar/toolbar.ts
+import { recursiveIterate } from "@ibiz-template/core";
+function getUIActionItemsByActionLevel(toolbar, actionLevel) {
+  const result = [];
+  recursiveIterate(
+    toolbar,
+    (item) => {
+      if (item.itemType === "DEUIACTION") {
+        const uiItem = item;
+        if (uiItem.actionLevel === actionLevel) {
+          result.push(uiItem);
+        }
+      }
+    },
+    { childrenFields: ["detoolbarItems"] }
+  );
+  return result;
+}
+
 // src/utils/open-redirect-view/open-redirect-view.ts
 async function openRedirectView(appView, context, params = {}, opts = {}) {
   return openDERedirectView(
@@ -6725,7 +6744,7 @@ var MethodDto = class _MethodDto {
               field.refAppDataEntityId
             );
             const items = await service.selectLocal(context, {
-              srfpkey: data[this.entity.keyAppDEFieldId]
+              // srfpkey: data[this.entity.keyAppDEFieldId!],
             });
             if (items) {
               const arr = [];
@@ -14313,7 +14332,7 @@ var CaptionBarController = class extends ControlController {
 };
 
 // src/controller/control/toolbar/toolbar.controllerr.ts
-import { recursiveIterate, RuntimeError as RuntimeError46 } from "@ibiz-template/core";
+import { recursiveIterate as recursiveIterate2, RuntimeError as RuntimeError46 } from "@ibiz-template/core";
 
 // src/ui-action/provider/backend-ui-action-provider.ts
 import { RuntimeModelError as RuntimeModelError47 } from "@ibiz-template/core";
@@ -16466,7 +16485,7 @@ var ToolbarController = class extends ControlController {
   async onCreated() {
     await super.onCreated();
     this.state.viewMode = this.ctx.view.modal.mode;
-    recursiveIterate(
+    recursiveIterate2(
       this.model,
       (item) => {
         if (item.itemType === "DEUIACTION") {
@@ -16516,7 +16535,7 @@ var ToolbarController = class extends ControlController {
       if (_data) {
         logicParams.data = [_data];
       }
-      recursiveIterate(
+      recursiveIterate2(
         this.model,
         (item) => {
           const itemState = this.state.buttonsState[item.id];
@@ -16561,7 +16580,7 @@ var ToolbarController = class extends ControlController {
   }
   initControlScheduler(logics = []) {
     const actualLogics = [...logics];
-    recursiveIterate(
+    recursiveIterate2(
       this.model,
       (item) => {
         if (item.controlLogics) {
@@ -18243,7 +18262,7 @@ var ChartExpBarController = class extends ExpBarControlController {
 import { RuntimeError as RuntimeError49 } from "@ibiz-template/core";
 
 // src/controller/control/form/form/form.controller.ts
-import { debounceAndAsyncMerge, recursiveIterate as recursiveIterate2 } from "@ibiz-template/core";
+import { debounceAndAsyncMerge, recursiveIterate as recursiveIterate3 } from "@ibiz-template/core";
 var FormController = class extends ControlController {
   constructor() {
     super(...arguments);
@@ -18455,7 +18474,7 @@ var FormController = class extends ControlController {
    */
   initControlScheduler(logics = []) {
     const actualLogics = [...logics];
-    recursiveIterate2(
+    recursiveIterate3(
       this.model,
       (item) => {
         if (item.controlLogics) {
@@ -18471,10 +18490,10 @@ var FormController = class extends ControlController {
 };
 
 // src/controller/control/form/search-form/search-form.service.ts
-import { recursiveIterate as recursiveIterate4 } from "@ibiz-template/core";
+import { recursiveIterate as recursiveIterate5 } from "@ibiz-template/core";
 
 // src/controller/control/form/form/form.service.ts
-import { recursiveIterate as recursiveIterate3 } from "@ibiz-template/core";
+import { recursiveIterate as recursiveIterate4 } from "@ibiz-template/core";
 var FormService = class extends ControlService {
   /**
    * 设置表单项的默认值
@@ -18486,7 +18505,7 @@ var FormService = class extends ControlService {
    * @param {('create' | 'update')} type 新建还是更新
    */
   setDefault(data, context, params, type) {
-    recursiveIterate3(
+    recursiveIterate4(
       this.model,
       (item) => {
         if (item.detailType === "FORMITEM") {
@@ -18542,7 +18561,7 @@ var SearchFormService = class extends FormService {
    * @date 2022-08-31 18:08:37
    */
   initUIDataMap() {
-    recursiveIterate4(
+    recursiveIterate5(
       this.model,
       (item) => {
         if (item.detailType === "FORMITEM") {
@@ -19913,6 +19932,16 @@ var FormItemController = class extends FormDetailController {
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl.controller.ts
 import { BitMask } from "@ibiz-template/core";
 var FormMDCtrlController = class extends FormDetailController {
+  /**
+   * 名称
+   * @author lxm
+   * @date 2023-11-22 03:31:02
+   * @readonly
+   * @type {string}
+   */
+  get name() {
+    return this.model.id;
+  }
   /**
    * 上下文
    *
@@ -20001,6 +20030,15 @@ import {
   RuntimeModelError as RuntimeModelError53
 } from "@ibiz-template/core";
 var FormMDCtrlMDController = class extends FormMDCtrlController {
+  constructor() {
+    super(...arguments);
+    /**
+     * 忽略下一次自身对应表单项数据变更
+     * @author lxm
+     * @date 2023-12-19 11:47:21
+     */
+    this.ignoreNextSelfChange = false;
+  }
   /**
    * 表单项名称
    *
@@ -20037,10 +20075,10 @@ var FormMDCtrlMDController = class extends FormMDCtrlController {
   setMDControl(controller) {
     this.mdController = controller;
     controller.evt.on("onSaveSuccess", () => {
-      this.updateFormItem();
+      this.notifyFormDataChange();
     });
     controller.evt.on("onRemoveSuccess", () => {
-      this.updateFormItem();
+      this.notifyFormDataChange();
     });
   }
   updateFormItem() {
@@ -20089,11 +20127,26 @@ var FormMDCtrlMDController = class extends FormMDCtrlController {
     this.refresh();
   }
   async dataChangeNotify(names) {
+    if (names.includes(this.model.id) && this.ignoreNextSelfChange) {
+      this.ignoreNextSelfChange = false;
+      return;
+    }
     await super.dataChangeNotify(names);
     if (names.includes(this.model.id)) {
       this.refresh();
     }
   }
+  /**
+   * 通知表单多数据部件对应的表单项数据变更
+   * @author lxm
+   * @date 2023-12-19 11:46:13
+   * @protected
+   */
+  notifyFormDataChange() {
+    this.updateFormItem();
+    this.ignoreNextSelfChange = true;
+    this.form.dataChangeNotify([this.name]);
+  }
 };
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.controller.ts
@@ -20108,6 +20161,12 @@ var FormMDCtrlFormState = class extends FormDetailState {
 var FormMDCtrlFormController = class extends FormMDCtrlController {
   constructor() {
     super(...arguments);
+    /**
+     * 忽略下一次自身对应表单项数据变更
+     * @author lxm
+     * @date 2023-12-19 11:47:21
+     */
+    this.ignoreNextSelfChange = false;
     /**
      * 表单控制器Map
      * @author lxm
@@ -20173,7 +20232,7 @@ var FormMDCtrlFormController = class extends FormMDCtrlController {
    */
   async formStateNotify(state) {
     await super.formStateNotify(state);
-    await this.fetchData();
+    await this.refresh();
   }
   /**
    * 设置表单控制器
@@ -20192,10 +20251,10 @@ var FormMDCtrlFormController = class extends FormMDCtrlController {
           item.context[this.deName] = formData.srfkey;
         }
       }
-      this.updateFormItem();
+      this.notifyFormDataChange();
     });
     controller.evt.on("onRemoveSuccess", () => {
-      this.updateFormItem();
+      this.notifyFormDataChange();
     });
   }
   /**
@@ -20242,11 +20301,26 @@ var FormMDCtrlFormController = class extends FormMDCtrlController {
     this.fetchData();
   }
   async dataChangeNotify(names) {
+    if (names.includes(this.model.id) && this.ignoreNextSelfChange) {
+      this.ignoreNextSelfChange = false;
+      return;
+    }
     await super.dataChangeNotify(names);
     if (names.includes(this.model.id)) {
       this.refresh();
     }
   }
+  /**
+   * 通知表单多数据部件对应的表单项数据变更
+   * @author lxm
+   * @date 2023-12-19 11:46:13
+   * @protected
+   */
+  notifyFormDataChange() {
+    this.updateFormItem();
+    this.ignoreNextSelfChange = true;
+    this.form.dataChangeNotify([this.name]);
+  }
 };
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater.controller.ts
@@ -20270,16 +20344,6 @@ var FormMDCtrlRepeaterController = class extends FormMDCtrlController {
      */
     this.isSingleData = false;
   }
-  /**
-   * 名称
-   * @author lxm
-   * @date 2023-11-22 03:31:02
-   * @readonly
-   * @type {string}
-   */
-  get name() {
-    return this.model.id;
-  }
   /**
    * 多数据重复器对应的表单里的值
    *
@@ -20479,7 +20543,7 @@ import { clone as clone21 } from "ramda";
 
 // src/controller/control/form/edit-form/edit-form.service.ts
 import {
-  recursiveIterate as recursiveIterate5,
+  recursiveIterate as recursiveIterate6,
   RuntimeModelError as RuntimeModelError55
 } from "@ibiz-template/core";
 var EditFormService = class extends FormService {
@@ -20701,7 +20765,7 @@ var EditFormService = class extends FormService {
       // 向导预置
       "srfnextform"
     ];
-    recursiveIterate5(
+    recursiveIterate6(
       this.model,
       (item) => {
         if (item.detailType === "FORMITEM" || item.detailType === "MDCTRL") {
@@ -21419,7 +21483,7 @@ import {
   awaitTimeout as awaitTimeout2,
   debounceAndAsyncMerge as debounceAndAsyncMerge2,
   mergeDefaultInLeft,
-  recursiveIterate as recursiveIterate6,
+  recursiveIterate as recursiveIterate7,
   RuntimeError as RuntimeError52,
   RuntimeModelError as RuntimeModelError57
 } from "@ibiz-template/core";
@@ -21950,7 +22014,7 @@ var GridController = class extends MDControlController {
    * @return {*}  {Promise<void>}
    */
   initColumnStates() {
-    recursiveIterate6(
+    recursiveIterate7(
       this.model,
       (column) => {
         if (column.columnType !== "GROUPGRIDCOLUMN") {
@@ -23305,7 +23369,7 @@ var ListController = class extends MDControlController {
 };
 
 // src/controller/control/panel/panel/panel.controller.ts
-import { recursiveIterate as recursiveIterate7, RuntimeError as RuntimeError54 } from "@ibiz-template/core";
+import { recursiveIterate as recursiveIterate8, RuntimeError as RuntimeError54 } from "@ibiz-template/core";
 var PanelController = class extends ControlController {
   constructor(model, context, params, ctx, container) {
     super(model, context, params, ctx);
@@ -23514,7 +23578,7 @@ var PanelController = class extends ControlController {
   }
   initControlScheduler(logics = []) {
     const actualLogics = [...logics];
-    recursiveIterate7(
+    recursiveIterate8(
       this.model,
       (item) => {
         if (item.controlLogics) {
@@ -24024,7 +24088,7 @@ var PickupViewPanelController = class extends ControlController {
 };
 
 // src/controller/control/search-bar/search-bar.controller.ts
-import { recursiveIterate as recursiveIterate8 } from "@ibiz-template/core";
+import { recursiveIterate as recursiveIterate9 } from "@ibiz-template/core";
 import { isNil as isNil23 } from "ramda";
 
 // src/controller/control/search-bar/search-bar-filter.controller.ts
@@ -24231,7 +24295,7 @@ var SearchBarController = class extends ControlController {
     }
     let hasFilter = false;
     let hasError = false;
-    recursiveIterate8(this.state.filterNodes[0], (node) => {
+    recursiveIterate9(this.state.filterNodes[0], (node) => {
       if (node.leaf) {
         if (node.field && node.valueOP && !isNil23(node.value)) {
           hasFilter = true;
@@ -24510,7 +24574,7 @@ var TabExpPanelController = class extends ControlController {
 import {
   RuntimeError as RuntimeError55,
   RuntimeModelError as RuntimeModelError60,
-  recursiveIterate as recursiveIterate9
+  recursiveIterate as recursiveIterate10
 } from "@ibiz-template/core";
 
 // src/controller/control/tree/tree.service.ts
@@ -24813,6 +24877,12 @@ var TreeController = class extends MDControlController {
      * @date 2023-12-14 03:05:38
      */
     this.dropNodeRss = /* @__PURE__ */ new Map();
+    /**
+     * 节点对应的上下文菜单里第一个行为级别为常用操作的项
+     * @author lxm
+     * @date 2023-12-19 03:14:03
+     */
+    this.nodeClickTBUIActionItem = /* @__PURE__ */ new Map();
   }
   initState() {
     super.initState();
@@ -24851,6 +24921,7 @@ var TreeController = class extends MDControlController {
       }
     }
     this.initDropNodeRss();
+    this.initNodeClickTBUIActionItem();
     this.service = new TreeService(this.model);
     await this.service.init(this.context);
     this.model.detreeNodes.forEach((node) => {
@@ -24903,6 +24974,24 @@ var TreeController = class extends MDControlController {
       }
     });
   }
+  /**
+   * 初始化节点点击后触发的第一个常用操作的上下文菜单项
+   * @author lxm
+   * @date 2023-12-19 03:18:43
+   * @protected
+   */
+  initNodeClickTBUIActionItem() {
+    var _a;
+    (_a = this.model.detreeNodes) == null ? void 0 : _a.forEach((node) => {
+      var _a2, _b;
+      if ((_b = (_a2 = node.decontextMenu) == null ? void 0 : _a2.detoolbarItems) == null ? void 0 : _b.length) {
+        const items = getUIActionItemsByActionLevel(node.decontextMenu, 200);
+        if (items.length > 0) {
+          this.nodeClickTBUIActionItem.set(node.id, items[0]);
+        }
+      }
+    });
+  }
   /**
    * 树部件加载，从根节点开始重新加载
    *
@@ -24964,7 +25053,7 @@ var TreeController = class extends MDControlController {
       this.state.rootNodes = nodes;
     }
     this.state.items = [];
-    recursiveIterate9(
+    recursiveIterate10(
       { children: this.state.rootNodes },
       (node) => {
         this.state.items.push(node);
@@ -24980,7 +25069,11 @@ var TreeController = class extends MDControlController {
    * @returns {*}  {Promise<void>}
    * @memberof TreeController
    */
-  async onTreeNodeClick(nodeData) {
+  async onTreeNodeClick(nodeData, event) {
+    if (this.nodeClickTBUIActionItem.has(nodeData.nodeId)) {
+      const item = this.nodeClickTBUIActionItem.get(nodeData.nodeId);
+      return this.doUIAction(item.uiactionId, nodeData, event, item.appId);
+    }
     if (this.state.navigational) {
       const nodeModel = this.getNodeModel(nodeData.nodeId);
       if (!(nodeModel == null ? void 0 : nodeModel.navAppViewId)) {
@@ -25118,7 +25211,7 @@ var TreeController = class extends MDControlController {
    */
   calcExpandedKeys(nodes) {
     let expandedKeys = [...this.state.expandedKeys];
-    recursiveIterate9({ children: nodes }, (node) => {
+    recursiveIterate10({ children: nodes }, (node) => {
       var _a;
       if ((_a = node.children) == null ? void 0 : _a.length) {
         expandedKeys.push(node.id);
@@ -26353,7 +26446,7 @@ var KanbanController = class extends DataViewControlController {
 };
 
 // src/controller/control/tree-grid-ex/tree-grid-ex.controller.ts
-import { recursiveIterate as recursiveIterate10 } from "@ibiz-template/core";
+import { recursiveIterate as recursiveIterate11 } from "@ibiz-template/core";
 
 // src/controller/control/tree-grid-ex/tree-grid-ex.service.ts
 import { isArray as isArray10 } from "qx-util";
@@ -26593,7 +26686,7 @@ var TreeGridExController = class extends MDControlController {
    * @memberof TreeGridExController
    */
   initColumnStates() {
-    recursiveIterate10(
+    recursiveIterate11(
       this.model,
       (column) => {
         if (column.columnType !== "GROUPGRIDCOLUMN") {
@@ -26681,7 +26774,7 @@ var TreeGridExController = class extends MDControlController {
       this.state.rootNodes = nodes;
     }
     this.state.items = [];
-    recursiveIterate10(
+    recursiveIterate11(
       { children: this.state.rootNodes },
       (node) => {
         this.state.items.push(node);
@@ -26700,7 +26793,7 @@ var TreeGridExController = class extends MDControlController {
    */
   calcExpandedKeys(nodes) {
     let expandedKeys = [];
-    recursiveIterate10({ children: nodes }, (node) => {
+    recursiveIterate11({ children: nodes }, (node) => {
       var _a;
       if ((_a = node.children) == null ? void 0 : _a.length) {
         expandedKeys.push(node.id);
@@ -27446,7 +27539,7 @@ var ReportPanelController = class extends ControlController {
 };
 
 // src/controller/control/gantt/gantt.controller.ts
-import { recursiveIterate as recursiveIterate11 } from "@ibiz-template/core";
+import { recursiveIterate as recursiveIterate12 } from "@ibiz-template/core";
 
 // src/controller/control/gantt/gantt.service.ts
 import { ModelError as ModelError30 } from "@ibiz-template/core";
@@ -27835,7 +27928,7 @@ var GanttController = class extends MDControlController {
    * @memberof GanttController
    */
   initColumnStates() {
-    recursiveIterate11(
+    recursiveIterate12(
       this.model,
       (column) => {
         if (column.columnType !== "GROUPGRIDCOLUMN") {
@@ -27953,7 +28046,7 @@ var GanttController = class extends MDControlController {
       this.state.rootNodes = nodes;
     }
     this.state.items = [];
-    recursiveIterate11(
+    recursiveIterate12(
       { children: this.state.rootNodes },
       (node) => {
         this.state.items.push(node);
@@ -30563,6 +30656,7 @@ export {
   getRootNode,
   getTreeNode,
   getUIActionById,
+  getUIActionItemsByActionLevel,
   getUIActionProvider,
   getUILogicNodeProvider,
   getViewEngines,