@ibiz-template/vue3-components 0.1.29-dev.0 → 0.1.30

package/es/control/form/form-detail/form-tab-panel/form-tab-panel.css

@@ -1 +1 @@
-.ibiz-form-tab-panel{width:100%;height:100%;--ibiz-form-tab-panel-font-size:var(--ibiz-font-size-regular);--ibiz-form-tab-panel-header-border-color:var(--ibiz-color-border);--ibiz-form-tab-panel-text-color:var(--ibiz-color-text-2);--ibiz-form-tab-panel-bg-color:transparent;--ibiz-form-tab-panel-hover-text-color:var(--ibiz-color-text-0);--ibiz-form-tab-panel-hover-bg-color:transparent;--ibiz-form-tab-panel-active-text-color:var(--ibiz-color-text-0);--ibiz-form-tab-panel-active-bg-color:transparent;--ibiz-form-tab-panel-active-border-color:var(--ibiz-color-primary)}.ibiz-form-tab-panel>.el-tabs__header.is-top{margin:0}.ibiz-form-tab-panel>.el-tabs__header.is-top .el-tabs__item.is-top{font-size:var(--ibiz-form-tab-panel-font-size);color:var(--ibiz-form-tab-panel-text-color);background-color:var(--ibiz-form-tab-panel-bg-color)}.ibiz-form-tab-panel>.el-tabs__header.is-top .el-tabs__item.is-top:hover{color:var(--ibiz-form-tab-panel-hover-text-color);background-color:var(--ibiz-form-tab-panel-hover-bg-color)}.ibiz-form-tab-panel>.el-tabs__header.is-top .el-tabs__item.is-top.is-active{color:var(--ibiz-form-tab-panel-active-text-color);background-color:var(--ibiz-form-tab-panel-active-bg-color)}.ibiz-form-tab-panel .el-tabs__nav-wrap::after{background-color:var(--ibiz-form-tab-panel-header-border-color)}.ibiz-form-tab-panel .el-tabs__active-bar{background-color:var(--ibiz-form-tab-panel-active-border-color)}
+.ibiz-form-tab-panel{width:100%;height:100%;--ibiz-form-tab-panel-font-size:var(--ibiz-font-size-header-4);--ibiz-form-tab-panel-header-border-color:var(--ibiz-color-border);--ibiz-form-tab-panel-text-color:var(--ibiz-color-text-2);--ibiz-form-tab-panel-bg-color:transparent;--ibiz-form-tab-panel-hover-text-color:var(--ibiz-color-primary);--ibiz-form-tab-panel-hover-bg-color:transparent;--ibiz-form-tab-panel-active-text-color:var(--ibiz-color-primary);--ibiz-form-tab-panel-active-bg-color:transparent;--ibiz-form-tab-panel-active-border-color:var(--ibiz-color-primary)}.ibiz-form-tab-panel>.el-tabs__header.is-top{margin-bottom:var(--ibiz-spacing-tight)}.ibiz-form-tab-panel>.el-tabs__header.is-top .el-tabs__item.is-top{font-size:var(--ibiz-form-tab-panel-font-size);color:var(--ibiz-form-tab-panel-text-color);background-color:var(--ibiz-form-tab-panel-bg-color)}.ibiz-form-tab-panel>.el-tabs__header.is-top .el-tabs__item.is-top:hover{color:var(--ibiz-form-tab-panel-hover-text-color);background-color:var(--ibiz-form-tab-panel-hover-bg-color)}.ibiz-form-tab-panel>.el-tabs__header.is-top .el-tabs__item.is-top.is-active{color:var(--ibiz-form-tab-panel-active-text-color);background-color:var(--ibiz-form-tab-panel-active-bg-color)}.ibiz-form-tab-panel .el-tabs__nav-wrap::after{background-color:var(--ibiz-form-tab-panel-header-border-color)}.ibiz-form-tab-panel .el-tabs__active-bar{background-color:var(--ibiz-form-tab-panel-active-border-color)}

package/es/control/grid/grid/grid-control.util.d.ts

@@ -1,7 +1,27 @@
-import { ControlVO, GridController } from '@ibiz-template/runtime';
-import { IDEGridColumn } from '@ibiz/model-core';
+import { ControlVO, GridController, IControlProvider } from '@ibiz-template/runtime';
+import { IDEGrid, IDEGridColumn } from '@ibiz/model-core';
 import { TableColumnCtx } from 'element-plus';
 import { Ref } from 'vue';
+/**
+ * 表格部件props接口
+ *
+ * @author zk
+ * @date 2023-09-26 06:09:51
+ * @export
+ * @interface IGridProps
+ */
+export interface IGridProps {
+    modelData: IDEGrid;
+    context: IContext;
+    params: IParams;
+    provider: IControlProvider;
+    mdctrlActiveMode?: number;
+    singleSelect?: boolean;
+    rowEditOpen?: boolean;
+    isSimple: boolean;
+    data: Array<IData>;
+    loadDefault: boolean;
+}
 /**
  * 适配element的table的事件
  *
@@ -39,7 +59,7 @@ export declare function useAppGridPagination(c: GridController): {
     onPageSizeChange: (size: number) => void;
     onPageRefresh: () => void;
 };
-export declare function useAppGridBase(c: GridController, props: IData): {
+export declare function useAppGridBase(c: GridController, props: IGridProps): {
     tableData: Ref<IData>;
     renderColumns: Ref<IDEGridColumn[]>;
     defaultSort: Ref<IData>;

package/es/control/grid/grid/grid.d.ts

@@ -155,9 +155,9 @@ export declare const GridControl: import("vue").DefineComponent<{
     };
 }>>, {
     params: IParams;
-    isSimple: boolean;
     mdctrlActiveMode: number;
     singleSelect: boolean;
     rowEditOpen: boolean;
+    isSimple: boolean;
     loadDefault: boolean;
 }, {}>;

package/es/control/grid/grid/index.d.ts

@@ -137,10 +137,10 @@ export declare const IBizGridControl: import("@ibiz-template/vue3-util").TypeWit
     };
 }>>, {
     params: IParams;
-    isSimple: boolean;
     mdctrlActiveMode: number;
     singleSelect: boolean;
     rowEditOpen: boolean;
+    isSimple: boolean;
     loadDefault: boolean;
 }, {}>>;
 export default IBizGridControl;

package/es/control/index.mjs

@@ -91,6 +91,9 @@ export { PortletLayout } from './dashboard/portlet/portlet-layout/portlet-layout
 export { ViewPortletProvider } from './dashboard/portlet/view-portlet/view-portlet.provider.mjs';
 export { ViewPortlet } from './dashboard/portlet/view-portlet/view-portlet.mjs';
 export { IBizViewPortlet } from './dashboard/portlet/view-portlet/index.mjs';
+export { MenuPortletProvider } from './dashboard/portlet/menu-portlet/menu-portlet.provider.mjs';
+export { MenuPortlet } from './dashboard/portlet/menu-portlet/menu-portlet.mjs';
+export { IBizMenuPortlet } from './dashboard/portlet/menu-portlet/index.mjs';
 export { CalendarProvider } from './calendar/calendar.provider.mjs';
 export { KanbanProvider } from './kanban/kanban.provider.mjs';
 export { TreeGridExProvider } from './tree-grid-ex/tree-grid-ex.provider.mjs';

package/es/control/list/index.d.ts

@@ -77,9 +77,9 @@ export declare const IBizListControl: import("@ibiz-template/vue3-util").TypeWit
     };
 }>>, {
     params: IParams;
-    isSimple: boolean;
     mdctrlActiveMode: number;
     singleSelect: boolean;
+    isSimple: boolean;
     loadDefault: boolean;
 }, {}>>;
 export default IBizListControl;

package/es/control/list/list.d.ts

@@ -104,8 +104,8 @@ export declare const ListControl: import("vue").DefineComponent<{
     };
 }>>, {
     params: IParams;
-    isSimple: boolean;
     mdctrlActiveMode: number;
     singleSelect: boolean;
+    isSimple: boolean;
     loadDefault: boolean;
 }, {}>;

package/es/control/panel/panel/panel.mjs

@@ -72,11 +72,9 @@ const PanelControl = /* @__PURE__ */ defineComponent({
   setup(props) {
     const c = useControlController((...args) => new PanelController(...args));
     const ns = useNamespace(`control-${c.model.controlType.toLowerCase()}`);
-    watch(() => {
-      props.data;
-    }, () => {
-      if (props.data) {
-        c.setInputData(props.data);
+    watch(() => props.data, (newVal) => {
+      if (newVal) {
+        c.setInputData(newVal);
         c.load();
       }
     }, {

package/es/control/panel/view-layout-panel/view-layout-panel.mjs

@@ -32,11 +32,9 @@ const ViewLayoutPanelControl = /* @__PURE__ */ defineComponent({
   }) {
     const c = useControlController((...args) => new ViewLayoutPanelController(...args));
     const ns = useNamespace(`control-${c.model.controlType.toLowerCase()}`);
-    watch(() => {
-      props.data;
-    }, () => {
-      if (props.data) {
-        c.setInputData(props.data);
+    watch(() => props.data, (newVal) => {
+      if (newVal) {
+        c.setInputData(newVal);
         c.load();
       }
     }, {

package/es/control/tab-exp-panel/tab-exp-panel.css

@@ -1 +1 @@
-.ibiz-control-tabexppanel .el-tabs .el-tabs__header .el-tabs__nav-wrap{margin:0}.ibiz-control-tabexppanel .el-tabs .el-tabs__header .el-tabs__nav-wrap .el-tabs__nav .el-tabs__active-bar{background-color:var(--ibiz-color-primary)}.ibiz-control-tabexppanel .el-tabs .el-tabs__header .el-tabs__nav-wrap .el-tabs__nav .el-tabs__item{font-size:var(--ibiz-font-size-regular);color:var(--ibiz-color-text-2)}.ibiz-control-tabexppanel .el-tabs .el-tabs__header .el-tabs__nav-wrap .el-tabs__nav .el-tabs__item:hover{color:var(--ibiz-color-text-0)}.ibiz-control-tabexppanel .el-tabs .el-tabs__header .el-tabs__nav-wrap .el-tabs__nav .el-tabs__item.is-active{color:var(--ibiz-color-primary)}.ibiz-control-tabexppanel .el-tabs .el-tabs__header .el-tabs__nav-wrap .el-tabs__nav .el-tabs__item.is-top:nth-child(2){padding-left:0}.ibiz-control-tabexppanel .el-tabs .el-tabs__header .el-tabs__nav-wrap .el-tabs__nav .el-tabs__item.is-top:last-child{padding-right:0}
+.ibiz-control-tabexppanel .el-tabs .el-tabs__header{margin:0}.ibiz-control-tabexppanel .el-tabs .el-tabs__header .el-tabs__nav-wrap{margin:0}.ibiz-control-tabexppanel .el-tabs .el-tabs__header .el-tabs__nav-wrap .el-tabs__nav .el-tabs__active-bar{background-color:var(--ibiz-color-primary)}.ibiz-control-tabexppanel .el-tabs .el-tabs__header .el-tabs__nav-wrap .el-tabs__nav .el-tabs__item{font-size:var(--ibiz-font-size-regular);color:var(--ibiz-color-text-2)}.ibiz-control-tabexppanel .el-tabs .el-tabs__header .el-tabs__nav-wrap .el-tabs__nav .el-tabs__item:hover{color:var(--ibiz-color-text-0)}.ibiz-control-tabexppanel .el-tabs .el-tabs__header .el-tabs__nav-wrap .el-tabs__nav .el-tabs__item.is-active{color:var(--ibiz-color-primary)}.ibiz-control-tabexppanel .el-tabs .el-tabs__header .el-tabs__nav-wrap .el-tabs__nav .el-tabs__item.is-top:nth-child(2){padding-left:0}.ibiz-control-tabexppanel .el-tabs .el-tabs__header .el-tabs__nav-wrap .el-tabs__nav .el-tabs__item.is-top:last-child{padding-right:0}

package/es/control/tree/tree.css

@@ -1 +1 @@
-.ibiz-control-treeview{--ibiz-control-treeview-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base);padding:var(--ibiz-control-treeview-padding)}.ibiz-control-treeview-node{display:flex;flex-grow:1;flex-shrink:1;align-items:center;min-width:1px;height:100%;line-height:26px}.ibiz-control-treeview-node__icon{min-width:var(--ibiz-spacing-base);margin-right:var(--ibiz-spacing-tight)}.ibiz-control-treeview-node__label{flex-grow:1;flex-shrink:1;min-width:1px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-control-treeview-node:hover .ibiz-control-treeview-context-menu-trigger{display:inline-block}.ibiz-control-treeview-context-menu-trigger{display:none;flex-shrink:0;width:30px;text-align:center;cursor:pointer}.ibiz-control-treeview-context-menu-trigger__caption-icon{vertical-align:middle}
+.ibiz-control-treeview{--ibiz-control-treeview-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base);padding:var(--ibiz-control-treeview-padding)}.ibiz-control-treeview-node{display:flex;flex-grow:1;flex-shrink:1;align-items:center;min-width:1px;height:100%;line-height:26px}.ibiz-control-treeview-node__icon{min-width:var(--ibiz-spacing-base);margin-right:var(--ibiz-spacing-tight)}.ibiz-control-treeview-node__label{flex-grow:1;flex-shrink:1;min-width:1px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-control-treeview-node:hover .ibiz-control-treeview-context-menu-trigger{display:inline-block}.ibiz-control-treeview-context-menu-trigger{display:none;flex-shrink:0;width:30px;text-align:center;cursor:pointer}.ibiz-control-treeview-context-menu-trigger__caption-icon{vertical-align:middle}.ibiz-control-treeview-context-menu.mx-context-menu{padding:var(--ibiz-spacing-extra-tight) 0}.ibiz-control-treeview-context-menu.mx-context-menu .mx-context-menu-item{padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base)}

package/es/control/tree-grid/index.d.ts

@@ -138,10 +138,10 @@ export declare const IBizTreeGridControl: import("@ibiz-template/vue3-util").Typ
     };
 }>>, {
     params: IParams;
-    isSimple: boolean;
     mdctrlActiveMode: number;
     singleSelect: boolean;
     rowEditOpen: boolean;
+    isSimple: boolean;
     loadDefault: boolean;
 }, {}>>;
 export default IBizTreeGridControl;

package/es/control/tree-grid/tree-grid.d.ts

@@ -154,9 +154,9 @@ export declare const TreeGridControl: import("vue").DefineComponent<{
     };
 }>>, {
     params: IParams;
-    isSimple: boolean;
     mdctrlActiveMode: number;
     singleSelect: boolean;
     rowEditOpen: boolean;
+    isSimple: boolean;
     loadDefault: boolean;
 }, {}>;

package/es/editor/markdown/ibiz-markdown-editor/ibiz-markdown-editor.css

@@ -1 +1 @@
-.ibiz-markdown .ibiz-markdown-cherry{--ibiz-markdown-width:100%;width:var(--ibiz-markdown-width)}.ibiz-markdown .ibiz-markdown-cherry .cherry{width:100%;min-height:600px}.ibiz-markdown .ibiz-markdown-cherry .cherry .cherry-editor{overflow:visible}.ibiz-markdown .ibiz-markdown-cherry .cherry .cherry-editor .CodeMirror{overflow:visible}.ibiz-markdown.is-disabled .cherry{min-height:auto}.ibiz-markdown .cherry-preview--full{border-left:none}.ibiz-markdown .theme__dark,.ibiz-markdown .theme__light{color:var(--ibiz-form-item-text-color)}.ibiz-markdown .cherry-markdown h1 a::before,.ibiz-markdown .cherry-markdown h2 a::before,.ibiz-markdown .cherry-markdown h3 a::before,.ibiz-markdown .cherry-markdown h4 a::before,.ibiz-markdown .cherry-markdown h5 a::before,.ibiz-markdown .cherry-markdown h6 a::before{display:none}
+.ibiz-markdown .ibiz-markdown-cherry{--ibiz-markdown-width:100%;--ibiz-markdown-height:600px;width:var(--ibiz-markdown-width)}.ibiz-markdown .ibiz-markdown-cherry .cherry{width:100%;min-height:var(--ibiz-markdown-height)}.ibiz-markdown .ibiz-markdown-cherry .cherry .cherry-editor{overflow:visible}.ibiz-markdown .ibiz-markdown-cherry .cherry .cherry-editor .CodeMirror{overflow:visible}.ibiz-markdown.is-disabled .cherry{min-height:auto}.ibiz-markdown .cherry-preview--full{border-left:none}.ibiz-markdown .theme__dark,.ibiz-markdown .theme__light{color:var(--ibiz-form-item-text-color)}.ibiz-markdown .cherry-markdown h1 a::before,.ibiz-markdown .cherry-markdown h2 a::before,.ibiz-markdown .cherry-markdown h3 a::before,.ibiz-markdown .cherry-markdown h4 a::before,.ibiz-markdown .cherry-markdown h5 a::before,.ibiz-markdown .cherry-markdown h6 a::before{display:none}

package/es/editor/markdown/ibiz-markdown-editor/ibiz-markdown-editor.mjs

@@ -145,17 +145,29 @@ const IBizMarkDown = /* @__PURE__ */ defineComponent({
       theme.value = newVal;
       (_a = editor.value) == null ? void 0 : _a.setTheme(theme.value);
     });
-    const calcMarkDownMaxWidth = () => {
+    const calcMarkDownStyle = () => {
       if (window.ResizeObserver && markDownBox.value) {
-        cssVars.value = ns.cssVarBlock({
+        const tempCssVars = {
           width: `${markDownBox.value.offsetWidth}px`
-        });
+        };
+        if (typeof c.parent.model.height === "number") {
+          Object.assign(tempCssVars, {
+            height: `${c.parent.model.height}px`
+          });
+        }
+        cssVars.value = ns.cssVarBlock(tempCssVars);
         resizeObserver = new ResizeObserver((entries) => {
           const width = entries[0].contentRect.width;
           if (width !== lastMarkDownWidth) {
-            cssVars.value = ns.cssVarBlock({
+            const tempCssVars2 = {
               width: `${entries[0].contentRect.width}px`
-            });
+            };
+            if (typeof c.parent.model.height === "number") {
+              Object.assign(tempCssVars2, {
+                height: `${c.parent.model.height}px`
+              });
+            }
+            cssVars.value = ns.cssVarBlock(tempCssVars2);
             lastMarkDownWidth = width;
           }
         });
@@ -164,7 +176,7 @@ const IBizMarkDown = /* @__PURE__ */ defineComponent({
     };
     onMounted(() => {
       editorInit();
-      calcMarkDownMaxWidth();
+      calcMarkDownStyle();
     });
     onUnmounted(() => {
       editor.value = null;

package/es/editor/text-box/ibiz-input-number/ibiz-input-number.mjs

@@ -1,7 +1,6 @@
 import { defineComponent, ref, watch, createVNode, resolveComponent } from 'vue';
 import { getInputNumberProps, getEditorEmits, useNamespace } from '@ibiz-template/vue3-util';
 import './ibiz-input-number.css';
-import { toNumber } from 'lodash-es';
 
 "use strict";
 const IBizInputNumber = /* @__PURE__ */ defineComponent({
@@ -13,14 +12,8 @@ const IBizInputNumber = /* @__PURE__ */ defineComponent({
   }) {
     const ns = useNamespace("input-number");
     const c = props.controller;
-    const editorModel = c.model;
     const currentVal = ref("");
-    let precision = 0;
-    if (editorModel.editorParams) {
-      if (editorModel.editorParams.precision) {
-        precision = toNumber(editorModel.editorParams.precision);
-      }
-    }
+    const precision = c.precision || 0;
     watch(() => props.value, (newVal, oldVal) => {
       if (newVal !== oldVal) {
         const number = Number(newVal);

package/es/editor/text-box/text-box-editor.controller.d.ts

@@ -10,4 +10,12 @@ import { ITextBox } from '@ibiz/model-core';
  * @extends {EditorController}
  */
 export declare class TextBoxEditorController extends EditorController<ITextBox> {
+    /**
+     * 精度
+     * @author lxm
+     * @date 2023-09-26 10:22:47
+     * @type {number}
+     */
+    precision?: number;
+    protected onInit(): Promise<void>;
 }

package/es/editor/text-box/text-box-editor.controller.mjs

@@ -1,7 +1,28 @@
 import { EditorController } from '@ibiz-template/runtime';
+import { toNumber } from 'lodash-es';
 
 "use strict";
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 class TextBoxEditorController extends EditorController {
+  constructor() {
+    super(...arguments);
+    /**
+     * 精度
+     * @author lxm
+     * @date 2023-09-26 10:22:47
+     * @type {number}
+     */
+    __publicField(this, "precision");
+  }
+  async onInit() {
+    await super.onInit();
+    this.precision = this.editorParams.precision ? toNumber(this.editorParams.precision) : this.model.precision;
+  }
 }
 
 export { TextBoxEditorController };

package/es/index.mjs

@@ -100,6 +100,9 @@ export { PortletLayout } from './control/dashboard/portlet/portlet-layout/portle
 export { ViewPortletProvider } from './control/dashboard/portlet/view-portlet/view-portlet.provider.mjs';
 export { ViewPortlet } from './control/dashboard/portlet/view-portlet/view-portlet.mjs';
 export { IBizViewPortlet } from './control/dashboard/portlet/view-portlet/index.mjs';
+export { MenuPortletProvider } from './control/dashboard/portlet/menu-portlet/menu-portlet.provider.mjs';
+export { MenuPortlet } from './control/dashboard/portlet/menu-portlet/menu-portlet.mjs';
+export { IBizMenuPortlet } from './control/dashboard/portlet/menu-portlet/index.mjs';
 export { CalendarProvider } from './control/calendar/calendar.provider.mjs';
 export { KanbanProvider } from './control/kanban/kanban.provider.mjs';
 export { TreeGridExProvider } from './control/tree-grid-ex/tree-grid-ex.provider.mjs';

package/es/panel-component/nav-pos/nav-pos.controller.d.ts

@@ -47,6 +47,15 @@ export declare class NavPosController extends PanelItemController<IPanelRawItem>
      * @type {string[]}
      */
     refCtrlKeys: string[];
+    /**
+     * 自定义补充参数
+     *
+     * @author zk
+     * @date 2023-09-27 03:09:02
+     * @type {IData}
+     * @memberof NavPosController
+     */
+    rawItemParams: IData;
     /**
      * Route 对象
      *
@@ -56,6 +65,16 @@ export declare class NavPosController extends PanelItemController<IPanelRawItem>
      * @memberof NavPosController
      */
     get route(): RouteLocationNormalizedLoaded;
+    /**
+     * 导航项是否缓存
+     *
+     * @author zk
+     * @date 2023-09-27 03:09:49
+     * @param {INavViewMsg} navViewMsg
+     * @return {*}  {boolean}
+     * @memberof NavPosController
+     */
+    getExpItemIsCache(navViewMsg: INavViewMsg): boolean;
     /**
      * 设置 Router 对象
      *
@@ -130,4 +149,13 @@ export declare class NavPosController extends PanelItemController<IPanelRawItem>
      * @memberof NavPosController
      */
     openViewByModel(openViewMsg: INavViewMsg): void;
+    /**
+     * 处理自定义补充参数 [{key:'name',value:'data'}] => {name:'data'}
+     *
+     * @author zk
+     * @date 2023-09-27 03:09:55
+     * @protected
+     * @memberof NavPosController
+     */
+    protected handleRawItemParams(): void;
 }

package/es/panel-component/nav-pos/nav-pos.controller.mjs

@@ -1,4 +1,5 @@
 import { PanelItemController, Modal, ViewMode, OpenAppViewCommand } from '@ibiz-template/runtime';
+import { notNilEmpty } from 'qx-util';
 import { NavPosState } from './nav-pos.state.mjs';
 
 "use strict";
@@ -39,6 +40,15 @@ class NavPosController extends PanelItemController {
      * @type {string[]}
      */
     __publicField(this, "refCtrlKeys", []);
+    /**
+     * 自定义补充参数
+     *
+     * @author zk
+     * @date 2023-09-27 03:09:02
+     * @type {IData}
+     * @memberof NavPosController
+     */
+    __publicField(this, "rawItemParams", {});
   }
   /**
    * Route 对象
@@ -51,6 +61,24 @@ class NavPosController extends PanelItemController {
   get route() {
     return this.router.currentRoute.value;
   }
+  /**
+   * 导航项是否缓存
+   *
+   * @author zk
+   * @date 2023-09-27 03:09:49
+   * @param {INavViewMsg} navViewMsg
+   * @return {*}  {boolean}
+   * @memberof NavPosController
+   */
+  getExpItemIsCache(navViewMsg) {
+    if (this.rawItemParams.expcache === "CACHE") {
+      return true;
+    }
+    if (this.rawItemParams.expcache === "NO_CACHE") {
+      return false;
+    }
+    return navViewMsg.isCache;
+  }
   /**
    * 设置 Router 对象
    *
@@ -63,6 +91,7 @@ class NavPosController extends PanelItemController {
   async onInit() {
     var _a;
     await super.onInit();
+    this.handleRawItemParams();
     if ((_a = this.model.rawItem) == null ? void 0 : _a.rawItemParams) {
       this.model.rawItem.rawItemParams.find((item) => {
         if (item.key === "REFCTRL" && item.value) {
@@ -79,6 +108,15 @@ class NavPosController extends PanelItemController {
         this.openView(triggerEvent.navViewMsg);
       }
     });
+    const expRoute = this.panel.view.params.expmode;
+    if (expRoute === "ROUTE" && this.routeDepth) {
+      this.state.routeOpen = true;
+    } else if (expRoute === "NO_ROUTE") {
+      this.state.routeOpen = false;
+    } else {
+      this.state.routeOpen = !!this.routeDepth;
+    }
+    delete this.panel.view.params.expmode;
   }
   /**
    * 创建导航占位状态对象
@@ -128,7 +166,7 @@ class NavPosController extends PanelItemController {
       );
     } else {
       this.state.navViewMsgs[navViewMsg.key] = navViewMsg;
-      if (ibiz.config.view.enableExpCache) {
+      if (this.getExpItemIsCache(navViewMsg)) {
         this.state.cacheKeys.push(navViewMsg.key);
       }
       this.viewModals[navViewMsg.key] = new Modal({
@@ -170,7 +208,7 @@ class NavPosController extends PanelItemController {
       this.state.currentKey = openViewMsg.key;
       return;
     }
-    if (this.routeDepth) {
+    if (this.routeDepth && this.state.routeOpen) {
       this.openViewByPath(openViewMsg);
     } else {
       this.openViewByModel(openViewMsg);
@@ -190,13 +228,13 @@ class NavPosController extends PanelItemController {
       this.state.navViewMsgs[this.curNavViewMsg.key].fullPath = this.route.fullPath;
       return;
     }
-    if (this.state.cache && this.state.navViewMsgs[openViewMsg.key].fullPath) {
+    if (this.state.navViewMsgs[openViewMsg.key].fullPath && this.getExpItemIsCache(openViewMsg)) {
       this.router.push(this.state.navViewMsgs[openViewMsg.key].fullPath);
     } else {
       const tempContext = Object.assign(openViewMsg.context.clone(), {
         toRouteDepth: this.routeDepth + 1
       });
-      if (ibiz.config.view.enableExpCache) {
+      if (this.getExpItemIsCache(openViewMsg)) {
         this.state.cacheKeys.push(openViewMsg.key);
       }
       ibiz.commands.execute(
@@ -218,6 +256,26 @@ class NavPosController extends PanelItemController {
     this.setNavViewMsgs(openViewMsg);
     this.state.currentKey = openViewMsg.key;
   }
+  /**
+   * 处理自定义补充参数 [{key:'name',value:'data'}] => {name:'data'}
+   *
+   * @author zk
+   * @date 2023-09-27 03:09:55
+   * @protected
+   * @memberof NavPosController
+   */
+  handleRawItemParams() {
+    var _a;
+    let params = {};
+    const rawItemParams = (_a = this.model.rawItem) == null ? void 0 : _a.rawItemParams;
+    if (notNilEmpty(rawItemParams)) {
+      params = rawItemParams.reduce((param, item) => {
+        param[item.key.toLowerCase()] = item.value;
+        return param;
+      }, {});
+    }
+    Object.assign(this.rawItemParams, params);
+  }
 }
 
 export { NavPosController };

package/es/panel-component/nav-pos/nav-pos.mjs

@@ -58,7 +58,7 @@ const NavPos = /* @__PURE__ */ defineComponent({
       cache
     } = state;
     let content = null;
-    if (this.c.routeDepth) {
+    if (state.routeOpen) {
       content = createVNode(resolveComponent("iBizRouterView"), {
         "manualKey": currentKey,
         "modal": viewModals[currentKey],

package/es/panel-component/nav-pos/nav-pos.state.d.ts

@@ -14,6 +14,15 @@ export declare class NavPosState extends PanelItemState {
      * @memberof NavPosState
      */
     cache: boolean;
+    /**
+     * 是否是路由打开
+     *
+     * @author zk
+     * @date 2023-09-26 04:09:23
+     * @type {boolean}
+     * @memberof NavPosState
+     */
+    routeOpen: boolean;
     /**
      * 当前导航视图标识
      * @author lxm

package/es/panel-component/nav-pos/nav-pos.state.mjs

@@ -17,6 +17,15 @@ class NavPosState extends PanelItemState {
      * @memberof NavPosState
      */
     __publicField(this, "cache", true);
+    /**
+     * 是否是路由打开
+     *
+     * @author zk
+     * @date 2023-09-26 04:09:23
+     * @type {boolean}
+     * @memberof NavPosState
+     */
+    __publicField(this, "routeOpen", true);
     /**
      * 当前导航视图标识
      * @author lxm

package/es/util/app-modal/app-modal-component.mjs

@@ -23,9 +23,7 @@ const AppModalComponent = /* @__PURE__ */ defineComponent({
       zIndex
     } = useUIStore();
     const modalZIndex = zIndex.increment();
-    const customStyle = reactive({
-      [ns.cssVarBlockName("z-index")]: modalZIndex
-    });
+    const customStyle = reactive({});
     const {
       width,
       height
@@ -86,6 +84,7 @@ const AppModalComponent = /* @__PURE__ */ defineComponent({
       "align-center": true,
       "class": [this.ns.b(), this.options.placement && this.ns.m(this.options.placement), this.options.modalClass],
       "style": this.customStyle,
+      "z-index": this.modalZIndex,
       "onClosed": this.onClosed,
       "before-close": this.onBeforeClose
     }, {

package/es/util/app-modal/modal.css

@@ -1 +1 @@
-@charset "UTF-8";.ibiz-modal{--ibiz-modal-z-index:var(--ibiz-z-index-modal)}.ibiz-modal.el-dialog{z-index:var(--ibiz-modal-z-index)!important;overflow:visible}.ibiz-modal .el-dialog__header{position:relative;padding:0}.ibiz-modal .el-dialog__body{height:100%;padding:0}.ibiz-modal .el-dialog__headerbtn{top:-40px;right:-60px;border:2px solid var(--ibiz-color-white);border-radius:50%;display:flex;align-items:center;justify-content:center}.ibiz-modal .el-dialog__headerbtn .el-dialog__close{font-size:var(--ibiz-font-size-header-4);color:var(--ibiz-color-white)}
+@charset "UTF-8";.ibiz-modal{--ibiz-modal-z-index:var(--ibiz-z-index-modal)}.ibiz-modal.el-dialog{overflow:visible}.ibiz-modal .el-dialog__header{position:relative;padding:0}.ibiz-modal .el-dialog__body{height:100%;padding:0}.ibiz-modal .el-dialog__headerbtn{top:-40px;right:-60px;border:2px solid var(--ibiz-color-white);border-radius:50%;display:flex;align-items:center;justify-content:center}.ibiz-modal .el-dialog__headerbtn .el-dialog__close{font-size:var(--ibiz-font-size-header-4);color:var(--ibiz-color-white)}

package/es/util/app-popover/app-popover-component.mjs

@@ -4,6 +4,8 @@ import { Modal, ViewMode } from '@ibiz-template/runtime';
 import { useNamespace } from '@ibiz-template/vue3-util';
 import './popover.css';
 import { OverlayPopoverContainer } from '../overlay-popover-container/overlay-popover-container.mjs';
+import '../store/index.mjs';
+import { useUIStore } from '../store/ui-store/ui-store.mjs';
 
 "use strict";
 async function computePos(element, el, arrEl, opts) {
@@ -67,6 +69,10 @@ const AppPopoverComponent = /* @__PURE__ */ defineComponent({
     const autoClose = computed(() => {
       return props.opts.autoClose === true && isHover.value === false;
     });
+    const {
+      zIndex
+    } = useUIStore();
+    const popoverZIndex = zIndex.increment();
     function onMouseenter(e) {
       e.stopPropagation();
       isHover.value = true;
@@ -79,6 +85,7 @@ const AppPopoverComponent = /* @__PURE__ */ defineComponent({
       mode: ViewMode.POPOVER,
       viewUsage: 2,
       dismiss: (data) => {
+        zIndex.decrement();
         ctx.emit("dismiss", data);
       }
     });
@@ -133,6 +140,7 @@ const AppPopoverComponent = /* @__PURE__ */ defineComponent({
       isShow,
       isHover,
       modal,
+      popoverZIndex,
       present,
       dismiss,
       onMouseenter,
@@ -144,6 +152,9 @@ const AppPopoverComponent = /* @__PURE__ */ defineComponent({
     return createVNode("div", {
       "class": [this.ns.b(), this.ns.is("show", this.isShow), this.ns.is("hover", this.isHover)],
       "ref": "el",
+      "style": {
+        zIndex: this.popoverZIndex
+      },
       "onMouseenter": this.onMouseenter,
       "onMouseleave": this.onMouseleave
     }, [!this.opts.noArrow && createVNode("div", {

package/es/util/app-popover/popover.css

@@ -1 +1 @@
-.ibiz-popover{position:absolute;top:0;left:0;z-index:1;display:none;width:-moz-max-content;width:max-content;padding:calc(var(--ibiz-padding)/ 2);background-color:var(--ibiz-bg-color);border:var(--ibiz-border);border-radius:var(--ibiz-border-radius-base)}.ibiz-popover__arrow{position:absolute;width:8px;height:8px;background:var(--ibiz-bg-color);transform:rotate(45deg)}.ibiz-popover.is-show{display:block}
+.ibiz-popover{position:absolute;top:0;left:0;z-index:1;display:none;width:-moz-max-content;width:max-content;background-color:var(--ibiz-color-bg-2);border:1px solid var(--ibiz-color-border);border-radius:var(--ibiz-border-radius-medium)}.ibiz-popover__arrow{position:absolute;width:8px;height:8px;background:var(--ibiz-color-bg-2);transform:rotate(45deg)}.ibiz-popover.is-show{display:block}

package/es/util/confirm-util/confirm-util.d.ts

@@ -9,6 +9,7 @@ import { IConfirmUtil, ConfirmParams } from '@ibiz-template/runtime';
  * @implements {IConfirmUtil}
  */
 export declare class ConfirmUtil implements IConfirmUtil {
+    private ns;
     info(params: ConfirmParams): Promise<boolean>;
     success(params: ConfirmParams): Promise<boolean>;
     warning(params: ConfirmParams): Promise<boolean>;