@ibiz-template/vue3-util 0.7.34 → 0.7.37-alpha.3

package/lib/panel-component/single-data-container/single-data-container.controller.cjs

@@ -91,6 +91,29 @@ class SingleDataContainerController extends runtime.PanelItemController {
       })
     );
   }
+  /**
+   * 计算导航参数
+   *
+   * @author tony001
+   * @date 2024-07-30 18:07:52
+   * @protected
+   * @return {*}  {IData}
+   */
+  computeNavParams() {
+    const { navigateContexts, navigateParams } = this.model;
+    const context = this.panel.context.clone();
+    Object.assign(
+      context,
+      runtime.convertNavData(navigateContexts, this.panel.params, this.panel.context)
+    );
+    const params = runtime.convertNavData(
+      navigateParams,
+      this.panel.params,
+      this.panel.context
+    );
+    Object.assign(params, this.panel.params);
+    return { context, params };
+  }
   /**
    * 根据来源类型初始化容器数据
    * @author lxm
@@ -235,12 +258,13 @@ class SingleDataContainerController extends runtime.PanelItemController {
         ibiz.i18n.t("vue3Util.panelComponent.noConfiguredEntity")
       );
     }
+    const { context, params } = this.computeNavParams();
     const data = await runtime.execDELogicById(
       appDELogicId,
       appDataEntityId,
-      this.panel.context,
+      context,
       this.panel.data,
-      this.panel.params
+      params
     );
     if (!data) {
       throw new core.RuntimeError(
@@ -288,12 +312,13 @@ class SingleDataContainerController extends runtime.PanelItemController {
       );
     }
     const app = ibiz.hub.getApp(this.panel.context.srfappid);
+    const { context, params } = this.computeNavParams();
     const res = await app.deService.exec(
       appDataEntityId,
       appDEMethodId,
-      this.panel.context,
-      [],
-      this.panel.params
+      context,
+      void 0,
+      params
     );
     if (res.ok && res.data) {
       this.setData(res.data);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-util",
-  "version": "0.7.34",
+  "version": "0.7.37-alpha.3",
   "description": "vue3 工具包",
   "main": "lib/index.cjs",
   "types": "es/index.d.ts",
@@ -40,10 +40,10 @@
   "license": "MIT",
   "devDependencies": {
     "@ibiz-template/cli": "^0.3.10",
-    "@ibiz-template/core": "^0.7.32",
-    "@ibiz-template/runtime": "^0.7.34",
+    "@ibiz-template/core": "^0.7.35-alpha.1",
+    "@ibiz-template/runtime": "^0.7.37-alpha.3",
     "@ibiz-template/theme": "^0.7.32",
-    "@ibiz/model-core": "^0.1.46",
+    "@ibiz/model-core": "^0.1.53",
     "@types/path-browserify": "^1.0.2",
     "@types/qs": "^6.9.11",
     "@types/systemjs": "^6.13.5",
@@ -60,7 +60,7 @@
   "peerDependencies": {
     "@ibiz-template/core": "^0.6.0",
     "@ibiz-template/runtime": "^0.6.0",
-    "@ibiz/model-core": "^0.1.46",
+    "@ibiz/model-core": "^0.1.53",
     "dayjs": "^1.11.10",
     "path-browserify": "^1.0.1",
     "pinia": "^2.1.7",