@ibiz-template/runtime 0.1.29 → 0.1.31

package/dist/index.esm.js

@@ -6159,7 +6159,7 @@ var GlobalConfig = class {
     // 全局视图配置
     this.view = {
       enableDataInfoBar: true,
-      enableExpCache: true
+      expCacheMode: "TABEXPPANEL:"
     };
     // 全局表格配置
     this.grid = {
@@ -11167,6 +11167,9 @@ var AppDataEntity = class _AppDataEntity {
    * @return {*}  {unknown}
    */
   convertVal(value, dataType) {
+    if (value == null) {
+      return value;
+    }
     if (isNil7(dataType)) {
       return value;
     }
@@ -11361,6 +11364,7 @@ var MethodInput = class {
 };
 
 // src/service/service/entity/method/method-renturn.ts
+import { isNilOrEmpty as isNilOrEmpty5 } from "qx-util";
 var MethodReturn = class {
   /**
    * Creates an instance of MethodReturn.
@@ -11401,6 +11405,9 @@ var MethodReturn = class {
       const items = await this.dto.sets(context, [data]);
       return items[0];
     }
+    if (isNilOrEmpty5(data)) {
+      data = {};
+    }
     return new AppDataEntity(this.entity, data);
   }
 };
@@ -15321,7 +15328,7 @@ function getOriginData(data) {
 
 // src/controller/utils/value-rule/value-rule.ts
 import { RuntimeError as RuntimeError20 } from "@ibiz-template/core";
-import { isNilOrEmpty as isNilOrEmpty5 } from "qx-util";
+import { isNilOrEmpty as isNilOrEmpty6 } from "qx-util";
 function generateRules(itemVRs, name, valueItemName) {
   const rules = [];
   itemVRs.forEach((item) => {
@@ -15360,7 +15367,7 @@ function generateRules(itemVRs, name, valueItemName) {
       const valueName = valueItemName || name;
       rules.push({
         validator: (rule, value, callback, source) => {
-          if (isNilOrEmpty5(source[valueName])) {
+          if (isNilOrEmpty6(source[valueName])) {
             return true;
           }
           const { isPast, infoMessage } = verifyDeRules(
@@ -16411,6 +16418,7 @@ var CodeListEditorController = class extends EditorController {
 // src/controller/common/control/control.controller.ts
 import { NoticeError } from "@ibiz-template/core";
 import { isNil as isNil16 } from "ramda";
+import { notNilEmpty as notNilEmpty8 } from "qx-util";
 var ControlController = class extends BaseController {
   /**
    * Creates an instance of ControlController.
@@ -16423,6 +16431,15 @@ var ControlController = class extends BaseController {
    */
   constructor(model, context, params, ctx) {
     super(model, context, params, ctx);
+    /**
+     * 部件参数
+     *
+     * @author zk
+     * @date 2023-09-26 03:09:21
+     * @type {IData}
+     * @memberof ControlController
+     */
+    this.controlParams = {};
     /**
      * 子适配器
      * @author lxm
@@ -16478,6 +16495,7 @@ var ControlController = class extends BaseController {
       const provider = await getControlProvider(this.controlPanel);
       this.providers[this.controlPanel.name] = provider;
     }
+    this.handleControlParams();
     this.initControlScheduler(this.model.controlLogics);
   }
   async onDestroyed() {
@@ -16556,6 +16574,22 @@ var ControlController = class extends BaseController {
       });
     }
   }
+  /**
+   * 部件参数解析
+   *
+   * @author zk
+   * @date 2023-09-27 07:09:08
+   * @protected
+   * @memberof ControlController
+   */
+  handleControlParams() {
+    const { ctrlParams } = this.model.controlParam;
+    let params = {};
+    if (notNilEmpty8(ctrlParams)) {
+      params = convertNavData(ctrlParams, this.params, this.context);
+    }
+    Object.assign(this.controlParams, params);
+  }
   /**
    * 初始化部件逻辑调度器
    * @author lxm
@@ -19881,7 +19915,7 @@ var UIActionProviderBase = class {
   async isConfirm(action, args) {
     const confirmMsg = this.calcMessage("confirm", action, args);
     if (action.enableConfirm && confirmMsg) {
-      return ibiz.modal.confirm({ title: confirmMsg });
+      return ibiz.confirm.warning({ title: "\u64CD\u4F5C\u786E\u8BA4", desc: confirmMsg });
     }
     return true;
   }
@@ -20813,6 +20847,10 @@ var ContainerPortletController = class extends PortletPartController {
 var ViewPortletController = class extends PortletPartController {
 };
 
+// src/controller/control/dashboard/portlet/menu-portlet/menu-portlet.controller.ts
+var MenuPortletController = class extends PortletPartController {
+};
+
 // src/controller/control/data-view/data-view.controller.ts
 import { RuntimeModelError as RuntimeModelError47 } from "@ibiz-template/core";
 import { isNil as isNil18 } from "ramda";
@@ -21324,6 +21362,24 @@ var ExpBarControlController = class extends ControlController {
     );
     return control;
   }
+  /**
+   * 是否缓存
+   *
+   * @author zk
+   * @date 2023-09-27 09:09:59
+   * @readonly
+   * @type {boolean}
+   * @memberof ExpBarControlController
+   */
+  get isCache() {
+    if (this.controlParams.expcache === "CACHE") {
+      return true;
+    }
+    if (this.controlParams.expcache === "NO_CACHE") {
+      return false;
+    }
+    return ibiz.config.view.expCacheMode.includes(this.model.controlType);
+  }
   /**
    * 创建完成
    *
@@ -21430,7 +21486,10 @@ var ExpBarControlController = class extends ControlController {
         this.xDataController.setSelection([selectItem]);
       }
       this._evt.emit("onNavViewChange", {
-        navViewMsg: { key: this.state.srfnav },
+        navViewMsg: {
+          key: this.state.srfnav,
+          isCache: this.isCache
+        },
         context: this.context
       });
     } else if (selectItem) {
@@ -21450,7 +21509,12 @@ var ExpBarControlController = class extends ControlController {
     const data = this.xDataController.state.items[0];
     if (!data) {
       this.state.srfnav = "";
-      this._evt.emit("onNavViewChange", { navViewMsg: { key: "" } });
+      this._evt.emit("onNavViewChange", {
+        navViewMsg: {
+          key: "",
+          isCache: this.isCache
+        }
+      });
       return;
     }
     this.xDataController.setActive(data);
@@ -21537,7 +21601,8 @@ var ExpBarControlController = class extends ControlController {
       key: data[this.navKeyName],
       context: result.context,
       params: result.params,
-      viewId: viewModelId
+      viewId: viewModelId,
+      isCache: this.isCache
     };
   }
   /**
@@ -21744,6 +21809,7 @@ var TreeExpBarController = class extends ExpBarControlController {
     return {
       key: nodeId,
       viewId: nodeModel.navAppViewId,
+      isCache: this.isCache,
       ...result
     };
   }
@@ -22476,7 +22542,7 @@ var FormButtonController = class extends FormDetailController {
 
 // src/controller/control/form/form-detail/form-druipart/form-druipart.controller.ts
 import { isOverlap as isOverlap2 } from "@ibiz-template/core";
-import { createUUID as createUUID4, notNilEmpty as notNilEmpty8 } from "qx-util";
+import { createUUID as createUUID4, notNilEmpty as notNilEmpty9 } from "qx-util";
 
 // src/controller/control/form/form-detail/form-druipart/form-druipart.state.ts
 var FormDruipartState = class extends FormDetailState {
@@ -22571,7 +22637,7 @@ var FormDRUIPartController = class extends FormDetailController {
   calcViewParams() {
     let newContext = this.form.context.clone();
     const navContexts = this.model.navigateContexts;
-    if (notNilEmpty8(navContexts)) {
+    if (notNilEmpty9(navContexts)) {
       newContext = Object.assign(
         newContext,
         convertNavData(
@@ -22740,7 +22806,7 @@ var FormGroupPanelController = class extends FormDetailController {
 
 // src/controller/control/form/form-detail/form-item/form-item.controller.ts
 import Schema from "async-validator";
-import { isNilOrEmpty as isNilOrEmpty6 } from "qx-util";
+import { isNilOrEmpty as isNilOrEmpty7 } from "qx-util";
 
 // src/controller/control/form/form-detail/form-item/form-item.state.ts
 var FormItemState = class extends FormDetailState {
@@ -22978,7 +23044,7 @@ var FormItemController = class extends FormDetailController {
       this.state.error = null;
       return true;
     }
-    if (this.state.required && isNilOrEmpty6(this.data[this.name])) {
+    if (this.state.required && isNilOrEmpty7(this.data[this.name])) {
       this.state.error = "\u8BF7\u586B\u5199".concat(this.model.caption || "");
       return false;
     }
@@ -26125,7 +26191,7 @@ var GridUAColumnController = class extends GridColumnController {
 // src/controller/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.controller.ts
 import { RuntimeError as RuntimeError44 } from "@ibiz-template/core";
 import Schema2 from "async-validator";
-import { isNilOrEmpty as isNilOrEmpty7 } from "qx-util";
+import { isNilOrEmpty as isNilOrEmpty8 } from "qx-util";
 var GridFieldEditColumnController = class extends GridFieldColumnController {
   constructor() {
     super(...arguments);
@@ -26358,7 +26424,7 @@ var GridFieldEditColumnController = class extends GridFieldColumnController {
    */
   async validate(row) {
     const editName = this.fieldName;
-    if (ibiz.config.grid.editShowMode !== "cell" && row.editColStates[editName].required && isNilOrEmpty7(row.data[editName])) {
+    if (ibiz.config.grid.editShowMode !== "cell" && row.editColStates[editName].required && isNilOrEmpty8(row.data[editName])) {
       row.errors[editName] = "\u8BF7\u586B\u5199".concat(this.model.caption || "");
       return false;
     }
@@ -27354,6 +27420,24 @@ var TabExpPanelController = class extends ControlController {
      */
     this.isShowIcon = false;
   }
+  /**
+   * 是否缓存
+   *
+   * @author zk
+   * @date 2023-09-27 09:09:59
+   * @readonly
+   * @type {boolean}
+   * @memberof ExpBarControlController
+   */
+  get isCache() {
+    if (this.controlParams.expcache === "CACHE") {
+      return true;
+    }
+    if (this.controlParams.expcache === "NO_CACHE") {
+      return false;
+    }
+    return ibiz.config.view.expCacheMode.includes(this.model.controlType);
+  }
   /**
    * 初始化state的属性
    *
@@ -27533,7 +27617,8 @@ var TabExpPanelController = class extends ControlController {
       key: tabViewPanel.codeName.toLowerCase(),
       context,
       params,
-      viewId: tabViewPanel.embeddedAppDEViewId
+      viewId: tabViewPanel.embeddedAppDEViewId,
+      isCache: this.isCache
     };
   }
 };
@@ -27832,10 +27917,12 @@ var TreeController = class extends MDControlController {
   initState() {
     super.initState();
     this.state.defaultExpandedKeys = [];
+    this.state.expandedKeys = [];
     this.state.size = 0;
   }
   async onCreated() {
     await super.onCreated();
+    this.state.expandedKeys = [...this.state.defaultExpandedKeys];
     this.service = new TreeService(this.model);
     await this.service.init(this.context);
     this.model.detreeNodes.forEach((node) => {
@@ -27861,8 +27948,17 @@ var TreeController = class extends MDControlController {
    */
   async load(args = {}) {
     const isInitialLoad = args.isInitialLoad === true;
-    const nodes = await this.loadNodes();
-    this.state.expandedKeys = this.calcExpandedKeys(nodes);
+    if (isInitialLoad) {
+      await this.startLoading();
+    }
+    let nodes;
+    try {
+      nodes = await this.loadNodes();
+    } finally {
+      if (isInitialLoad) {
+        await this.endLoading();
+      }
+    }
     await this.afterLoad(args, nodes);
     this.state.isLoaded = true;
     await this.evt.emit("onLoadSuccess", {
@@ -27880,19 +27976,12 @@ var TreeController = class extends MDControlController {
   async loadNodes(parentNode) {
     const params = await this.getFetchParams();
     const hasQuery = !!params.query;
-    const defaultExpandedKeys = !parentNode ? this.state.defaultExpandedKeys : void 0;
-    await this.startLoading();
-    let nodes;
-    try {
-      nodes = await this.service.fetchChildNodes(parentNode, {
-        context: this.context.clone(),
-        params,
-        hasQuery,
-        defaultExpandedKeys
-      }) || [];
-    } finally {
-      await this.endLoading();
-    }
+    const nodes = await this.service.fetchChildNodes(parentNode, {
+      context: this.context.clone(),
+      params,
+      hasQuery,
+      defaultExpandedKeys: this.state.expandedKeys
+    }) || [];
     if (parentNode) {
       parentNode.children = nodes;
     } else {
@@ -27905,6 +27994,7 @@ var TreeController = class extends MDControlController {
         this.state.items.push(node);
       }
     );
+    this.state.expandedKeys = this.calcExpandedKeys(nodes);
     return nodes;
   }
   /**
@@ -27930,6 +28020,24 @@ var TreeController = class extends MDControlController {
       await this.setActive(nodeData);
     }
   }
+  /**
+   * 树节点数据变更事件处理
+   * @author lxm
+   * @date 2023-09-28 01:48:05
+   * @param {ITreeNodeData} nodeData
+   * @param {boolean} isExpand true为展开，false为折叠
+   */
+  onExpandChange(nodeData, isExpand) {
+    const hasKey = this.state.expandedKeys.includes(nodeData.id);
+    if (isExpand && !hasKey) {
+      this.state.expandedKeys.push(nodeData.id);
+    } else if (!isExpand && hasKey) {
+      const index = this.state.expandedKeys.indexOf(nodeData.id);
+      if (index !== -1) {
+        this.state.expandedKeys.splice(index, 1);
+      }
+    }
+  }
   /**
    * 树节点双击事件
    * @author lxm
@@ -28013,7 +28121,7 @@ var TreeController = class extends MDControlController {
     };
   }
   /**
-   * 计算展开节点集合
+   * 计算展开节点集合(根据加载的子节点计算所有的展开节点标识集合)
    * @author lxm
    * @date 2023-08-09 05:19:36
    * @param {ITreeNodeData[]} nodes
@@ -28021,17 +28129,14 @@ var TreeController = class extends MDControlController {
    * @return {*}  {string[]}
    */
   calcExpandedKeys(nodes) {
-    let expandedKeys = [];
+    let expandedKeys = [...this.state.expandedKeys];
     recursiveIterate6({ children: nodes }, (node) => {
       var _a;
       if ((_a = node.children) == null ? void 0 : _a.length) {
         expandedKeys.push(node.id);
       }
     });
-    if (this.state.defaultExpandedKeys.length) {
-      expandedKeys.push(...this.state.defaultExpandedKeys);
-      expandedKeys = Array.from(new Set(expandedKeys));
-    }
+    expandedKeys = Array.from(new Set(expandedKeys));
     return expandedKeys;
   }
   /**
@@ -30849,7 +30954,7 @@ import {
   RuntimeError as RuntimeError55,
   RuntimeModelError as RuntimeModelError58
 } from "@ibiz-template/core";
-import { notNilEmpty as notNilEmpty9 } from "qx-util";
+import { notNilEmpty as notNilEmpty10 } from "qx-util";
 var AppUILogicExecutor = class extends LogicExecutor {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   execute(executeParams) {
@@ -30911,7 +31016,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     );
     let tempParams = {};
     const navParams = openViewRef.navigateParams;
-    if (notNilEmpty9(navParams)) {
+    if (notNilEmpty10(navParams)) {
       tempParams = convertNavData(navParams, data[0], params, context);
     }
     return ibiz.commands.execute(
@@ -30996,12 +31101,12 @@ var AppUILogicExecutor = class extends LogicExecutor {
     let tempParams = {};
     const _data = (data == null ? void 0 : data[0]) || {};
     const navContexts = newViewRef.navigateContexts;
-    if (notNilEmpty9(navContexts)) {
+    if (notNilEmpty10(navContexts)) {
       tempContext = convertNavData(navContexts, _data, params, context);
     }
     tempContext = Object.assign(context, tempContext);
     const navParams = newViewRef.navigateParams;
-    if (notNilEmpty9(navParams)) {
+    if (notNilEmpty10(navParams)) {
       tempParams = convertNavData(navParams, _data, params, context);
     }
     if (params.srfcopymode) {
@@ -31445,6 +31550,7 @@ export {
   MDCtrlController,
   MDCtrlService,
   MDViewEngine,
+  MenuPortletController,
   MethodDto,
   MobMDCtrlRowState,
   MobViewController,