@ibiz-template/vue3-util 0.7.38-alpha.12 → 0.7.38-alpha.33

package/es/common/view-shell/view-shell.mjs

@@ -2,7 +2,7 @@ import { defineComponent, ref, watch, h, resolveComponent, withDirectives, creat
 import { calcDynaSysParams, getViewProvider, getErrorViewProvider } from '@ibiz-template/runtime';
 import { RuntimeError } from '@ibiz-template/core';
 import { createUUID } from 'qx-util';
-import { isNil, isEmpty, clone } from 'ramda';
+import { clone, isNil, isEmpty } from 'ramda';
 import '../../use/index.mjs';
 import './view-shell.css';
 import { useNamespace } from '../../use/namespace/namespace.mjs';
@@ -25,7 +25,9 @@ const IBizViewShell = /* @__PURE__ */ defineComponent({
       type: String
     }
   },
-  setup(props) {
+  setup(props, {
+    attrs
+  }) {
     const ns = useNamespace("view-shell");
     const isComplete = ref(false);
     const errMsg = ref("");
@@ -34,6 +36,7 @@ const IBizViewShell = /* @__PURE__ */ defineComponent({
     const hasAuthority = ref(true);
     const context = ref(props.context);
     const params = ref(props.params || {});
+    let dynaViewCacheKey = "";
     watch(() => ({
       context: props.context,
       params: props.params
@@ -76,6 +79,13 @@ const IBizViewShell = /* @__PURE__ */ defineComponent({
       return checkResult;
     };
     let viewModel;
+    const getDynaViewCacheKey = (args) => {
+      const copyArgs = clone(args);
+      if (copyArgs.srfdatatype) {
+        delete copyArgs.srfdatatype;
+      }
+      return JSON.stringify(copyArgs);
+    };
     const initViewModel = async () => {
       if (props.modelData) {
         viewModel = props.modelData;
@@ -100,7 +110,7 @@ const IBizViewShell = /* @__PURE__ */ defineComponent({
           }));
         }
         const loadModelParams = await calcDynaSysParams(appDataEntityId, context.value, {
-          viewParams: params,
+          viewParams: params.value,
           appId: viewModel.appId
         });
         if (params.value.srfdatatype) {
@@ -142,7 +152,15 @@ const IBizViewShell = /* @__PURE__ */ defineComponent({
             }
           }
         }
+        const curDynaViewCacheKey = getDynaViewCacheKey(loadModelParams);
+        if (curDynaViewCacheKey === dynaViewCacheKey) {
+          setTimeout(() => {
+            isComplete.value = true;
+          });
+          return;
+        }
         viewModelData.value = await ibiz.hub.loadAppView(viewModel.appId, viewModel.id, loadModelParams);
+        dynaViewCacheKey = getDynaViewCacheKey(loadModelParams);
       } else {
         viewModelData.value = viewModel;
       }
@@ -166,6 +184,11 @@ const IBizViewShell = /* @__PURE__ */ defineComponent({
       } = redrawData;
       Object.assign(context.value, redrawData.context);
       Object.assign(params.value, redrawData.params);
+      const modal = attrs.modal;
+      if (modal) {
+        modal.hooks.shouldDismiss.clear();
+        modal.hooks.beforeDismiss.clear();
+      }
       if (isReloadModel) {
         await init();
       } else {

package/es/index.mjs

@@ -58,6 +58,7 @@ export { IBizPanelItemRender } from './panel-component/panel-item-render/index.m
 export { TeleportPlaceholderProvider } from './panel-component/teleport-placeholder/teleport-placeholder.provider.mjs';
 export { IBizTeleportPlaceholder } from './panel-component/teleport-placeholder/index.mjs';
 export { IBizPanelContainerTabs } from './panel-component/panel-container-tabs/index.mjs';
+export { IBizPanelCtrlViewPageCaption } from './panel-component/panel-ctrl-view-page-caption/index.mjs';
 export { AppRedirectView } from './view/app-redirect-view/app-redirect-view.mjs';
 export { IBizView } from './view/common/index.mjs';
 export { TodoRedirect } from './view/todo-redirect/todo-redirect.mjs';

package/es/panel-component/index.d.ts

@@ -14,4 +14,5 @@ export * from './panel-tab-page';
 export * from './panel-item-render';
 export * from './teleport-placeholder';
 export * from './panel-container-tabs';
+export * from './panel-ctrl-view-page-caption';
 //# sourceMappingURL=index.d.ts.map

package/es/panel-component/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/panel-component/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,WAAW,CAAC;AAC1B,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,yBAAyB,CAAC;AACxC,cAAc,kBAAkB,CAAC;AACjC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC;AACvC,cAAc,wBAAwB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/panel-component/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,WAAW,CAAC;AAC1B,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,yBAAyB,CAAC;AACxC,cAAc,kBAAkB,CAAC;AACjC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC;AACvC,cAAc,wBAAwB,CAAC;AACvC,cAAc,gCAAgC,CAAC"}

package/es/panel-component/index.mjs

@@ -14,6 +14,7 @@ export { IBizPanelTabPage } from './panel-tab-page/index.mjs';
 export { IBizPanelItemRender } from './panel-item-render/index.mjs';
 export { IBizTeleportPlaceholder } from './teleport-placeholder/index.mjs';
 export { IBizPanelContainerTabs } from './panel-container-tabs/index.mjs';
+export { IBizPanelCtrlViewPageCaption } from './panel-ctrl-view-page-caption/index.mjs';
 export { PanelContainerState } from './panel-container/panel-container.state.mjs';
 export { PanelContainerController } from './panel-container/panel-container.controller.mjs';
 export { PanelCtrlPosController } from './panel-ctrl-pos/panel-ctrl-pos.controller.mjs';

package/es/panel-component/panel-container/panel-container.css

@@ -1 +1 @@
-.ibiz-panel-container{width:100%;height:100%}.ibiz-panel-container>.ibiz-row{height:100%;overflow-x:hidden;overflow-y:auto}.ibiz-panel-container.is-hidden{display:none}
+.ibiz-panel-container{--ibiz-panel-scroll:auto;width:100%;height:100%}.ibiz-panel-container>.ibiz-row{height:100%;overflow:hidden var(--ibiz-panel-scroll)}.ibiz-panel-container.is-hidden{display:none}

package/es/panel-component/panel-ctrl-view-page-caption/index.d.ts

@@ -0,0 +1,24 @@
+export declare const IBizPanelCtrlViewPageCaption: import("../../util").TypeWithInstall<import("vue").DefineComponent<{
+    modelData: {
+        type: import("vue").PropType<import("@ibiz/model-core").IPanelItem>;
+        required: true;
+    };
+    controller: {
+        type: import("vue").PropType<import("./panel-ctrl-view-page-caption.controller").PanelCtrlViewPageCaptionController>;
+        required: true;
+    };
+}, {
+    ns: import("@ibiz-template/core").Namespace;
+    classArr: import("vue").ComputedRef<(string | false)[]>;
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+    modelData: {
+        type: import("vue").PropType<import("@ibiz/model-core").IPanelItem>;
+        required: true;
+    };
+    controller: {
+        type: import("vue").PropType<import("./panel-ctrl-view-page-caption.controller").PanelCtrlViewPageCaptionController>;
+        required: true;
+    };
+}>>, {}, {}>>;
+export default IBizPanelCtrlViewPageCaption;
+//# sourceMappingURL=index.d.ts.map

package/es/panel-component/panel-ctrl-view-page-caption/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/panel-component/panel-ctrl-view-page-caption/index.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;;;;aASxC,CAAC;AAEF,eAAe,4BAA4B,CAAC"}

package/es/panel-component/panel-ctrl-view-page-caption/index.mjs

@@ -0,0 +1,19 @@
+import { registerPanelItemProvider } from '@ibiz-template/runtime';
+import '../../util/index.mjs';
+import { PanelCtrlViewPageCaption } from './panel-ctrl-view-page-caption.mjs';
+import { PanelCtrlViewPageProvider } from './panel-ctrl-view-page-caption.provider.mjs';
+import { withInstall } from '../../util/install.mjs';
+
+"use strict";
+const IBizPanelCtrlViewPageCaption = withInstall(
+  PanelCtrlViewPageCaption,
+  function(v) {
+    v.component(PanelCtrlViewPageCaption.name, PanelCtrlViewPageCaption);
+    registerPanelItemProvider(
+      "CTRLPOS_VIEW_PAGECAPTION",
+      () => new PanelCtrlViewPageProvider()
+    );
+  }
+);
+
+export { IBizPanelCtrlViewPageCaption, IBizPanelCtrlViewPageCaption as default };

package/es/panel-component/panel-ctrl-view-page-caption/panel-ctrl-view-page-caption.controller.d.ts

@@ -0,0 +1,29 @@
+import { IPanelItemState, PanelItemController } from '@ibiz-template/runtime';
+interface viewPagecaptionState extends IPanelItemState {
+    /**
+     * 标题
+     *
+     * @type {string}
+     * @memberof viewPagecaptionState
+     */
+    caption: string;
+}
+export declare class PanelCtrlViewPageCaptionController extends PanelItemController {
+    /**
+     *状态
+     *
+     * @type {viewPagecaptionState}
+     * @memberof PanelCtrlViewPageCaptionController
+     */
+    state: viewPagecaptionState;
+    /**
+     * 初始化
+     *
+     * @protected
+     * @return {*}  {Promise<void>}
+     * @memberof PanelCtrlViewPageCaptionController
+     */
+    protected onInit(): Promise<void>;
+}
+export {};
+//# sourceMappingURL=panel-ctrl-view-page-caption.controller.d.ts.map

package/es/panel-component/panel-ctrl-view-page-caption/panel-ctrl-view-page-caption.controller.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"panel-ctrl-view-page-caption.controller.d.ts","sourceRoot":"","sources":["../../../src/panel-component/panel-ctrl-view-page-caption/panel-ctrl-view-page-caption.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE9E,UAAU,oBAAqB,SAAQ,eAAe;IACpD;;;;;OAKG;IACH,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,kCAAmC,SAAQ,mBAAmB;IACzE;;;;;OAKG;IACH,KAAK,EAAG,oBAAoB,CAAC;IAE7B;;;;;;OAMG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;CAYxC"}

package/es/panel-component/panel-ctrl-view-page-caption/panel-ctrl-view-page-caption.controller.mjs

@@ -0,0 +1,24 @@
+import { PanelItemController } from '@ibiz-template/runtime';
+
+"use strict";
+class PanelCtrlViewPageCaptionController extends PanelItemController {
+  /**
+   * 初始化
+   *
+   * @protected
+   * @return {*}  {Promise<void>}
+   * @memberof PanelCtrlViewPageCaptionController
+   */
+  async onInit() {
+    await super.onInit();
+    this.state.caption = this.panel.view.model.caption || "";
+    this.panel.view.evt.on(
+      "onViewInfoChange",
+      ({ caption: _caption, dataInfo }) => {
+        this.state.caption = "".concat(this.panel.view.model.caption).concat(dataInfo ? "-".concat(dataInfo) : "");
+      }
+    );
+  }
+}
+
+export { PanelCtrlViewPageCaptionController };

package/es/panel-component/panel-ctrl-view-page-caption/panel-ctrl-view-page-caption.d.ts

@@ -0,0 +1,25 @@
+import { PropType } from 'vue';
+import { PanelCtrlViewPageCaptionController } from './panel-ctrl-view-page-caption.controller';
+export declare const PanelCtrlViewPageCaption: import("vue").DefineComponent<{
+    modelData: {
+        type: PropType<import("@ibiz/model-core").IPanelItem>;
+        required: true;
+    };
+    controller: {
+        type: PropType<PanelCtrlViewPageCaptionController>;
+        required: true;
+    };
+}, {
+    ns: import("@ibiz-template/core").Namespace;
+    classArr: import("vue").ComputedRef<(string | false)[]>;
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+    modelData: {
+        type: PropType<import("@ibiz/model-core").IPanelItem>;
+        required: true;
+    };
+    controller: {
+        type: PropType<PanelCtrlViewPageCaptionController>;
+        required: true;
+    };
+}>>, {}, {}>;
+//# sourceMappingURL=panel-ctrl-view-page-caption.d.ts.map

package/es/panel-component/panel-ctrl-view-page-caption/panel-ctrl-view-page-caption.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"panel-ctrl-view-page-caption.d.ts","sourceRoot":"","sources":["../../../src/panel-component/panel-ctrl-view-page-caption/panel-ctrl-view-page-caption.tsx"],"names":[],"mappings":"AACA,OAAO,EAA6B,QAAQ,EAAE,MAAM,KAAK,CAAC;AAE1D,OAAO,EAAE,kCAAkC,EAAE,MAAM,2CAA2C,CAAC;AAE/F,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;YAkDnC,CAAC"}

package/es/panel-component/panel-ctrl-view-page-caption/panel-ctrl-view-page-caption.mjs

@@ -0,0 +1,49 @@
+import { defineComponent, computed, createVNode } from 'vue';
+import '../../use/index.mjs';
+import { useNamespace } from '../../use/namespace/namespace.mjs';
+
+"use strict";
+const PanelCtrlViewPageCaption = /* @__PURE__ */ defineComponent({
+  name: "IBizPanelCtrlViewPageCaption",
+  props: {
+    modelData: {
+      type: Object,
+      required: true
+    },
+    controller: {
+      type: Object,
+      required: true
+    }
+  },
+  setup(props) {
+    const ns = useNamespace("panel-ctrl-view-page-caption");
+    const classArr = computed(() => {
+      const {
+        id
+      } = props.modelData;
+      const result = [ns.b(), ns.m(id)];
+      result.push(...props.controller.containerClass);
+      return result;
+    });
+    return {
+      ns,
+      classArr
+    };
+  },
+  render() {
+    let editor = null;
+    if (this.controller.data) {
+      editor = createVNode("span", {
+        "class": this.ns.b("content")
+      }, [this.controller.state.caption]);
+    }
+    return createVNode("div", {
+      "class": this.classArr,
+      "onClick": () => {
+        this.controller.onClick();
+      }
+    }, [editor]);
+  }
+});
+
+export { PanelCtrlViewPageCaption };

package/es/panel-component/panel-ctrl-view-page-caption/panel-ctrl-view-page-caption.provider.d.ts

@@ -0,0 +1,17 @@
+import { IPanelItemProvider, PanelController, PanelItemController } from '@ibiz-template/runtime';
+import { IPanelCtrlPos } from '@ibiz/model-core';
+import { PanelCtrlViewPageCaptionController } from './panel-ctrl-view-page-caption.controller';
+/**
+ * 面板控件占位适配器
+ *
+ * @author lxm
+ * @date 2022-09-19 22:09:03
+ * @export
+ * @class PanelCtrlPosProvider
+ * @implements {EditorProvider}
+ */
+export declare class PanelCtrlViewPageProvider implements IPanelItemProvider {
+    component: string;
+    createController(panelItem: IPanelCtrlPos, panel: PanelController, parent: PanelItemController | undefined): Promise<PanelCtrlViewPageCaptionController>;
+}
+//# sourceMappingURL=panel-ctrl-view-page-caption.provider.d.ts.map

package/es/panel-component/panel-ctrl-view-page-caption/panel-ctrl-view-page-caption.provider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"panel-ctrl-view-page-caption.provider.d.ts","sourceRoot":"","sources":["../../../src/panel-component/panel-ctrl-view-page-caption/panel-ctrl-view-page-caption.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,mBAAmB,EACpB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,kCAAkC,EAAE,MAAM,2CAA2C,CAAC;AAE/F;;;;;;;;GAQG;AACH,qBAAa,yBAA0B,YAAW,kBAAkB;IAClE,SAAS,EAAE,MAAM,CAAkC;IAE7C,gBAAgB,CACpB,SAAS,EAAE,aAAa,EACxB,KAAK,EAAE,eAAe,EACtB,MAAM,EAAE,mBAAmB,GAAG,SAAS,GACtC,OAAO,CAAC,kCAAkC,CAAC;CAK/C"}

package/es/panel-component/panel-ctrl-view-page-caption/panel-ctrl-view-page-caption.provider.mjs

@@ -0,0 +1,15 @@
+import { PanelCtrlViewPageCaptionController } from './panel-ctrl-view-page-caption.controller.mjs';
+
+"use strict";
+class PanelCtrlViewPageProvider {
+  constructor() {
+    this.component = "IBizPanelCtrlViewPageCaption";
+  }
+  async createController(panelItem, panel, parent) {
+    const c = new PanelCtrlViewPageCaptionController(panelItem, panel, parent);
+    await c.init();
+    return c;
+  }
+}
+
+export { PanelCtrlViewPageProvider };

package/es/view/common/index.d.ts

@@ -22,7 +22,7 @@ export declare const IBizView: import("../../util").TypeWithInstall<import("vue"
     ns: import("@ibiz-template/core").Namespace;
     controls: import("@ibiz/model-core").IControl[];
     teleportControls: import("@ibiz/model-core").IControl[];
-    viewClassNames: import("vue").ComputedRef<(string | undefined)[]>;
+    viewClassNames: import("vue").ComputedRef<(string | string[] | undefined)[]>;
     onLayoutPanelCreated: (controller: import("@ibiz-template/runtime").IViewLayoutPanelController) => void;
     getCtrlProps: (ctrl: import("@ibiz/model-core").IControl, slotProps?: IData) => IParams;
     renderControl: (ctrl: import("@ibiz/model-core").IControl, slotProps?: IData) => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {

package/es/view/common/view.d.ts

@@ -26,7 +26,7 @@ export declare const View: import("vue").DefineComponent<{
     ns: import("@ibiz-template/core").Namespace;
     controls: IControl[];
     teleportControls: IControl[];
-    viewClassNames: import("vue").ComputedRef<(string | undefined)[]>;
+    viewClassNames: import("vue").ComputedRef<(string | string[] | undefined)[]>;
     onLayoutPanelCreated: (controller: IViewLayoutPanelController) => void;
     getCtrlProps: (ctrl: IControl, slotProps?: IData) => IParams;
     renderControl: (ctrl: IControl, slotProps?: IData) => VNode;

package/es/view/common/view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../../src/view/common/view.tsx"],"names":[],"mappings":"AAAA,OAAO,EAIL,MAAM,EACN,0BAA0B,EAC1B,aAAa,EACb,cAAc,EACf,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAGL,QAAQ,EAER,KAAK,EAIN,MAAM,KAAK,CAAC;AACb,OAAO,aAAa,CAAC;AAGrB,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;uCAsDC,0BAA0B,KACrC,IAAI;yBAmBqB,QAAQ,cAAa,KAAK,KAAQ,OAAO;0BAkBxC,QAAQ,cAAa,KAAK,KAAQ,KAAK;+BA9DlC,QAAQ,KAAG,MAAM,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;MAsLjE,CAAC"}
+{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../../src/view/common/view.tsx"],"names":[],"mappings":"AAAA,OAAO,EAIL,MAAM,EACN,0BAA0B,EAC1B,aAAa,EACb,cAAc,EACf,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAGL,QAAQ,EAER,KAAK,EAIN,MAAM,KAAK,CAAC;AACb,OAAO,aAAa,CAAC;AAGrB,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;uCAuDC,0BAA0B,KACrC,IAAI;yBAmBqB,QAAQ,cAAa,KAAK,KAAQ,OAAO;0BAkBxC,QAAQ,cAAa,KAAK,KAAQ,KAAK;+BA/DlC,QAAQ,KAAG,MAAM,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;MAuLjE,CAAC"}

package/es/view/common/view.mjs

@@ -70,7 +70,7 @@ const View = /* @__PURE__ */ defineComponent({
     } = c.model;
     const typeClass = viewType.toLowerCase();
     const sysCssName = sysCss == null ? void 0 : sysCss.cssName;
-    const viewClassNames = computed(() => [ns.b(), ns.b(typeClass), ns.m(codeName), sysCssName, c.state.viewMessages.TOP ? "has-top-message" : "", c.state.viewMessages.BOTTOM ? "has-bottom-message" : ""]);
+    const viewClassNames = computed(() => [ns.b(), ns.b(typeClass), ns.m(codeName), sysCssName, c.state.viewMessages.TOP ? "has-top-message" : "", c.state.viewMessages.BOTTOM ? "has-bottom-message" : "", c.state.presetClassList]);
     const onLayoutPanelCreated = (controller) => {
       c.setLayoutPanel(controller);
     };

package/lib/common/view-shell/view-shell.cjs

@@ -27,7 +27,9 @@ const IBizViewShell = /* @__PURE__ */ vue.defineComponent({
       type: String
     }
   },
-  setup(props) {
+  setup(props, {
+    attrs
+  }) {
     const ns = namespace.useNamespace("view-shell");
     const isComplete = vue.ref(false);
     const errMsg = vue.ref("");
@@ -36,6 +38,7 @@ const IBizViewShell = /* @__PURE__ */ vue.defineComponent({
     const hasAuthority = vue.ref(true);
     const context = vue.ref(props.context);
     const params = vue.ref(props.params || {});
+    let dynaViewCacheKey = "";
     vue.watch(() => ({
       context: props.context,
       params: props.params
@@ -78,6 +81,13 @@ const IBizViewShell = /* @__PURE__ */ vue.defineComponent({
       return checkResult;
     };
     let viewModel;
+    const getDynaViewCacheKey = (args) => {
+      const copyArgs = ramda.clone(args);
+      if (copyArgs.srfdatatype) {
+        delete copyArgs.srfdatatype;
+      }
+      return JSON.stringify(copyArgs);
+    };
     const initViewModel = async () => {
       if (props.modelData) {
         viewModel = props.modelData;
@@ -102,7 +112,7 @@ const IBizViewShell = /* @__PURE__ */ vue.defineComponent({
           }));
         }
         const loadModelParams = await runtime.calcDynaSysParams(appDataEntityId, context.value, {
-          viewParams: params,
+          viewParams: params.value,
           appId: viewModel.appId
         });
         if (params.value.srfdatatype) {
@@ -144,7 +154,15 @@ const IBizViewShell = /* @__PURE__ */ vue.defineComponent({
             }
           }
         }
+        const curDynaViewCacheKey = getDynaViewCacheKey(loadModelParams);
+        if (curDynaViewCacheKey === dynaViewCacheKey) {
+          setTimeout(() => {
+            isComplete.value = true;
+          });
+          return;
+        }
         viewModelData.value = await ibiz.hub.loadAppView(viewModel.appId, viewModel.id, loadModelParams);
+        dynaViewCacheKey = getDynaViewCacheKey(loadModelParams);
       } else {
         viewModelData.value = viewModel;
       }
@@ -168,6 +186,11 @@ const IBizViewShell = /* @__PURE__ */ vue.defineComponent({
       } = redrawData;
       Object.assign(context.value, redrawData.context);
       Object.assign(params.value, redrawData.params);
+      const modal = attrs.modal;
+      if (modal) {
+        modal.hooks.shouldDismiss.clear();
+        modal.hooks.beforeDismiss.clear();
+      }
       if (isReloadModel) {
         await init();
       } else {

package/lib/index.cjs

@@ -60,14 +60,15 @@ var index$d = require('./panel-component/panel-item-render/index.cjs');
 var teleportPlaceholder_provider = require('./panel-component/teleport-placeholder/teleport-placeholder.provider.cjs');
 var index$e = require('./panel-component/teleport-placeholder/index.cjs');
 var index$f = require('./panel-component/panel-container-tabs/index.cjs');
+var index$g = require('./panel-component/panel-ctrl-view-page-caption/index.cjs');
 var appRedirectView = require('./view/app-redirect-view/app-redirect-view.cjs');
-var index$g = require('./view/common/index.cjs');
+var index$h = require('./view/common/index.cjs');
 var todoRedirect = require('./view/todo-redirect/todo-redirect.cjs');
-var index$h = require('./view/portal-view/index.cjs');
-var index$i = require('./view/de-redirect-view/index.cjs');
-var index$j = require('./view/html-view/index.cjs');
-var index$k = require('./control/panel/view-layout-panel/index.cjs');
-var index$l = require('./control/panel/panel/index.cjs');
+var index$i = require('./view/portal-view/index.cjs');
+var index$j = require('./view/de-redirect-view/index.cjs');
+var index$k = require('./view/html-view/index.cjs');
+var index$l = require('./control/panel/view-layout-panel/index.cjs');
+var index$m = require('./control/panel/panel/index.cjs');
 var pluginFactory = require('./plugin/plugin-factory/plugin-factory.cjs');
 var clickOutside = require('./use/click-outside/click-outside.cjs');
 var useControlController = require('./use/control/use-control-controller/use-control-controller.cjs');
@@ -75,11 +76,11 @@ var event = require('./use/event/event.cjs');
 var focusBlur = require('./use/focus-blur/focus-blur.cjs');
 var namespace = require('./use/namespace/namespace.cjs');
 var route = require('./use/route/route.cjs');
-var index$m = require('./use/util/index.cjs');
+var index$n = require('./use/util/index.cjs');
 var useViewController = require('./use/view/use-view-controller/use-view-controller.cjs');
 var vue = require('./use/vue/vue.cjs');
 var codelistListen = require('./use/codeList-listen/codelist-listen.cjs');
-var index$n = require('./use/storage/index.cjs');
+var index$o = require('./use/storage/index.cjs');
 var autofocusBlur = require('./use/autofocus-blur/autofocus-blur.cjs');
 var overlayContainer = require('./util/overlay-container/overlay-container.cjs');
 var overlayPopoverContainer = require('./util/overlay-popover-container/overlay-popover-container.cjs');
@@ -92,7 +93,7 @@ var render = require('./util/render/render.cjs');
 var overlayViewUtil = require('./util/overlay-view-util/overlay-view-util.cjs');
 var appStore = require('./util/store/app-store/app-store.cjs');
 var uiStore = require('./util/store/ui-store/ui-store.cjs');
-var index$o = require('./util/store/index.cjs');
+var index$p = require('./util/store/index.cjs');
 var common = require('./props/common.cjs');
 var textBox = require('./props/editor/text-box.cjs');
 var span = require('./props/editor/span.cjs');
@@ -119,8 +120,8 @@ var markdown = require('./props/editor/markdown.cjs');
 var array = require('./props/editor/array.cjs');
 var cascader = require('./props/editor/cascader.cjs');
 var colorPicker = require('./props/editor/color-picker.cjs');
-var index$p = require('./locale/en/index.cjs');
-var index$q = require('./locale/zh-CN/index.cjs');
+var index$q = require('./locale/en/index.cjs');
+var index$r = require('./locale/zh-CN/index.cjs');
 
 "use strict";
 
@@ -173,14 +174,15 @@ exports.IBizPanelItemRender = index$d.IBizPanelItemRender;
 exports.TeleportPlaceholderProvider = teleportPlaceholder_provider.TeleportPlaceholderProvider;
 exports.IBizTeleportPlaceholder = index$e.IBizTeleportPlaceholder;
 exports.IBizPanelContainerTabs = index$f.IBizPanelContainerTabs;
+exports.IBizPanelCtrlViewPageCaption = index$g.IBizPanelCtrlViewPageCaption;
 exports.AppRedirectView = appRedirectView.AppRedirectView;
-exports.IBizView = index$g.IBizView;
+exports.IBizView = index$h.IBizView;
 exports.TodoRedirect = todoRedirect.TodoRedirect;
-exports.IBizPortalView = index$h.IBizPortalView;
-exports.IBizDeRedirectView = index$i.IBizDeRedirectView;
-exports.IBizHtmlView = index$j.IBizHtmlView;
-exports.IBizViewLayoutPanelControl = index$k.IBizViewLayoutPanelControl;
-exports.IBizPanelControl = index$l.IBizPanelControl;
+exports.IBizPortalView = index$i.IBizPortalView;
+exports.IBizDeRedirectView = index$j.IBizDeRedirectView;
+exports.IBizHtmlView = index$k.IBizHtmlView;
+exports.IBizViewLayoutPanelControl = index$l.IBizViewLayoutPanelControl;
+exports.IBizPanelControl = index$m.IBizPanelControl;
 exports.PluginFactory = pluginFactory.PluginFactory;
 exports.useClickOutside = clickOutside.useClickOutside;
 exports.useControlController = useControlController.useControlController;
@@ -189,8 +191,8 @@ exports.useFocusAndBlur = focusBlur.useFocusAndBlur;
 exports.useNamespace = namespace.useNamespace;
 exports.useRouteKey = route.useRouteKey;
 exports.useRouterQuery = route.useRouterQuery;
-exports.useCtx = index$m.useCtx;
-exports.useMobCtx = index$m.useMobCtx;
+exports.useCtx = index$n.useCtx;
+exports.useMobCtx = index$n.useMobCtx;
 exports.useViewController = useViewController.useViewController;
 exports.EmptyVNode = vue.EmptyVNode;
 exports.getOrigin = vue.getOrigin;
@@ -201,7 +203,7 @@ exports.useForceTogether = vue.useForceTogether;
 exports.useProps = vue.useProps;
 exports.usePropsWatch = vue.usePropsWatch;
 exports.useCodeListListen = codelistListen.useCodeListListen;
-exports.useLocalCacheKey = index$n.useLocalCacheKey;
+exports.useLocalCacheKey = index$o.useLocalCacheKey;
 exports.useAutoFocusBlur = autofocusBlur.useAutoFocusBlur;
 exports.OverlayContainer = overlayContainer.OverlayContainer;
 exports.OverlayPopoverContainer = overlayPopoverContainer.OverlayPopoverContainer;
@@ -228,7 +230,7 @@ exports.openViewModal = overlayViewUtil.openViewModal;
 exports.openViewPopover = overlayViewUtil.openViewPopover;
 exports.useAppStore = appStore.useAppStore;
 exports.useUIStore = uiStore.useUIStore;
-exports.piniaInstance = index$o.piniaInstance;
+exports.piniaInstance = index$p.piniaInstance;
 exports.RequiredProp = common.RequiredProp;
 exports.getGridInputIpProps = textBox.getGridInputIpProps;
 exports.getGridInputNumberProps = textBox.getGridInputNumberProps;
@@ -286,5 +288,5 @@ exports.getCascaderProps = cascader.getCascaderProps;
 exports.getGridCascaderProps = cascader.getGridCascaderProps;
 exports.getColorPickerProps = colorPicker.getColorPickerProps;
 exports.getGridColorPickerProps = colorPicker.getGridColorPickerProps;
-exports.en = index$p.en;
-exports.zhCn = index$q.zhCn;
+exports.en = index$q.en;
+exports.zhCn = index$r.zhCn;

package/lib/panel-component/index.cjs

@@ -16,6 +16,7 @@ var index$c = require('./panel-tab-page/index.cjs');
 var index$d = require('./panel-item-render/index.cjs');
 var index$e = require('./teleport-placeholder/index.cjs');
 var index$f = require('./panel-container-tabs/index.cjs');
+var index$g = require('./panel-ctrl-view-page-caption/index.cjs');
 var panelContainer_state = require('./panel-container/panel-container.state.cjs');
 var panelContainer_controller = require('./panel-container/panel-container.controller.cjs');
 var panelCtrlPos_controller = require('./panel-ctrl-pos/panel-ctrl-pos.controller.cjs');
@@ -59,6 +60,7 @@ exports.IBizPanelTabPage = index$c.IBizPanelTabPage;
 exports.IBizPanelItemRender = index$d.IBizPanelItemRender;
 exports.IBizTeleportPlaceholder = index$e.IBizTeleportPlaceholder;
 exports.IBizPanelContainerTabs = index$f.IBizPanelContainerTabs;
+exports.IBizPanelCtrlViewPageCaption = index$g.IBizPanelCtrlViewPageCaption;
 exports.PanelContainerState = panelContainer_state.PanelContainerState;
 exports.PanelContainerController = panelContainer_controller.PanelContainerController;
 exports.PanelCtrlPosController = panelCtrlPos_controller.PanelCtrlPosController;

package/lib/panel-component/panel-container/panel-container.css

@@ -1 +1 @@
-.ibiz-panel-container{width:100%;height:100%}.ibiz-panel-container>.ibiz-row{height:100%;overflow-x:hidden;overflow-y:auto}.ibiz-panel-container.is-hidden{display:none}
+.ibiz-panel-container{--ibiz-panel-scroll:auto;width:100%;height:100%}.ibiz-panel-container>.ibiz-row{height:100%;overflow:hidden var(--ibiz-panel-scroll)}.ibiz-panel-container.is-hidden{display:none}

package/lib/panel-component/panel-ctrl-view-page-caption/index.cjs

@@ -0,0 +1,24 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var runtime = require('@ibiz-template/runtime');
+require('../../util/index.cjs');
+var panelCtrlViewPageCaption = require('./panel-ctrl-view-page-caption.cjs');
+var panelCtrlViewPageCaption_provider = require('./panel-ctrl-view-page-caption.provider.cjs');
+var install = require('../../util/install.cjs');
+
+"use strict";
+const IBizPanelCtrlViewPageCaption = install.withInstall(
+  panelCtrlViewPageCaption.PanelCtrlViewPageCaption,
+  function(v) {
+    v.component(panelCtrlViewPageCaption.PanelCtrlViewPageCaption.name, panelCtrlViewPageCaption.PanelCtrlViewPageCaption);
+    runtime.registerPanelItemProvider(
+      "CTRLPOS_VIEW_PAGECAPTION",
+      () => new panelCtrlViewPageCaption_provider.PanelCtrlViewPageProvider()
+    );
+  }
+);
+
+exports.IBizPanelCtrlViewPageCaption = IBizPanelCtrlViewPageCaption;
+exports.default = IBizPanelCtrlViewPageCaption;