@juzhenfe/page-model 3.16.3 → 3.16.5

package/dist/components/column-filter-tools/index.vue.d.ts

@@ -50,19 +50,21 @@ declare const _sfc_main: import("vue").DefineComponent<{
             required: false;
             default: string;
         };
+        zIndex: {
+            type: NumberConstructor;
+            required: false;
+        };
     }, {
         BEMSpace: string;
         props: any;
         emit: (event: "closed", ...args: any[]) => void;
-        nextZIndex: () => number;
         visible: import("vue").Ref<boolean>;
-        isRender: import("vue").Ref<boolean>;
-        hideTimer: any;
-        triggerType: "element" | "rect";
         currentTriggerElement: HTMLElement;
         popoverRectInfo: import("vue").Ref<any>;
         getPopoverTriggerElementRectInfo: (element: HTMLElement) => void;
         popoverRef: import("vue").Ref<HTMLElement>;
+        popoverElementRect: import("vue").Ref<DOMRect>;
+        getPopoverElementRect: () => void;
         popoverStyle: import("vue").ComputedRef<{
             top?: undefined;
             left?: undefined;
@@ -79,7 +81,6 @@ declare const _sfc_main: import("vue").DefineComponent<{
         bindEvent: () => void;
         unbindEvent: () => void;
         hide: () => void;
-        zIndex: import("vue").Ref<number>;
         show: (element: HTMLElement | DOMRect) => void;
     }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "closed"[], "closed", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
         width: {
@@ -92,6 +93,10 @@ declare const _sfc_main: import("vue").DefineComponent<{
             required: false;
             default: string;
         };
+        zIndex: {
+            type: NumberConstructor;
+            required: false;
+        };
     }>> & {
         onClosed?: (...args: any[]) => any;
     }, {

package/dist/components/column-sort-tools/index.vue.d.ts

@@ -49,19 +49,21 @@ declare const _sfc_main: import("vue").DefineComponent<{
             required: false;
             default: string;
         };
+        zIndex: {
+            type: NumberConstructor;
+            required: false;
+        };
     }, {
         BEMSpace: string;
         props: any;
         emit: (event: "closed", ...args: any[]) => void;
-        nextZIndex: () => number;
         visible: import("vue").Ref<boolean>;
-        isRender: import("vue").Ref<boolean>;
-        hideTimer: any;
-        triggerType: "element" | "rect";
         currentTriggerElement: HTMLElement;
         popoverRectInfo: import("vue").Ref<any>;
         getPopoverTriggerElementRectInfo: (element: HTMLElement) => void;
         popoverRef: import("vue").Ref<HTMLElement>;
+        popoverElementRect: import("vue").Ref<DOMRect>;
+        getPopoverElementRect: () => void;
         popoverStyle: import("vue").ComputedRef<{
             top?: undefined;
             left?: undefined;
@@ -78,7 +80,6 @@ declare const _sfc_main: import("vue").DefineComponent<{
         bindEvent: () => void;
         unbindEvent: () => void;
         hide: () => void;
-        zIndex: import("vue").Ref<number>;
         show: (element: HTMLElement | DOMRect) => void;
     }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "closed"[], "closed", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
         width: {
@@ -91,6 +92,10 @@ declare const _sfc_main: import("vue").DefineComponent<{
             required: false;
             default: string;
         };
+        zIndex: {
+            type: NumberConstructor;
+            required: false;
+        };
     }>> & {
         onClosed?: (...args: any[]) => any;
     }, {

package/dist/components/line-clamp-tools/index.vue.d.ts

@@ -29,19 +29,21 @@ declare const _sfc_main: import("vue").DefineComponent<{
             required: false;
             default: string;
         };
+        zIndex: {
+            type: NumberConstructor;
+            required: false;
+        };
     }, {
         BEMSpace: string;
         props: any;
         emit: (event: "closed", ...args: any[]) => void;
-        nextZIndex: () => number;
         visible: import("vue").Ref<boolean>;
-        isRender: import("vue").Ref<boolean>;
-        hideTimer: any;
-        triggerType: "element" | "rect";
         currentTriggerElement: HTMLElement;
         popoverRectInfo: import("vue").Ref<any>;
         getPopoverTriggerElementRectInfo: (element: HTMLElement) => void;
         popoverRef: import("vue").Ref<HTMLElement>;
+        popoverElementRect: import("vue").Ref<DOMRect>;
+        getPopoverElementRect: () => void;
         popoverStyle: import("vue").ComputedRef<{
             top?: undefined;
             left?: undefined;
@@ -58,7 +60,6 @@ declare const _sfc_main: import("vue").DefineComponent<{
         bindEvent: () => void;
         unbindEvent: () => void;
         hide: () => void;
-        zIndex: import("vue").Ref<number>;
         show: (element: HTMLElement | DOMRect) => void;
     }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "closed"[], "closed", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
         width: {
@@ -71,6 +72,10 @@ declare const _sfc_main: import("vue").DefineComponent<{
             required: false;
             default: string;
         };
+        zIndex: {
+            type: NumberConstructor;
+            required: false;
+        };
     }>> & {
         onClosed?: (...args: any[]) => any;
     }, {

package/dist/components/simple-popover/index.vue.d.ts

@@ -9,19 +9,21 @@ declare const _sfc_main: import("vue").DefineComponent<{
         required: false;
         default: string;
     };
+    zIndex: {
+        type: NumberConstructor;
+        required: false;
+    };
 }, {
     BEMSpace: string;
     props: any;
     emit: (event: "closed", ...args: any[]) => void;
-    nextZIndex: () => number;
     visible: import("vue").Ref<boolean>;
-    isRender: import("vue").Ref<boolean>;
-    hideTimer: any;
-    triggerType: "element" | "rect";
     currentTriggerElement: HTMLElement;
     popoverRectInfo: import("vue").Ref<any>;
     getPopoverTriggerElementRectInfo: (element: HTMLElement) => void;
     popoverRef: import("vue").Ref<HTMLElement>;
+    popoverElementRect: import("vue").Ref<DOMRect>;
+    getPopoverElementRect: () => void;
     popoverStyle: import("vue").ComputedRef<{
         top?: undefined;
         left?: undefined;
@@ -38,7 +40,6 @@ declare const _sfc_main: import("vue").DefineComponent<{
     bindEvent: () => void;
     unbindEvent: () => void;
     hide: () => void;
-    zIndex: import("vue").Ref<number>;
     show: (element: HTMLElement | DOMRect) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "closed"[], "closed", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     width: {
@@ -51,6 +52,10 @@ declare const _sfc_main: import("vue").DefineComponent<{
         required: false;
         default: string;
     };
+    zIndex: {
+        type: NumberConstructor;
+        required: false;
+    };
 }>> & {
     onClosed?: (...args: any[]) => any;
 }, {

package/dist/components/table/components/context-menu/index.vue.d.ts

@@ -20,22 +20,27 @@ declare const _sfc_main: import("vue").DefineComponent<{}, {
         };
         placement: {
             type: StringConstructor;
+            /**
+             * 按钮数量
+             */
             required: false;
             default: string;
         };
+        zIndex: {
+            type: NumberConstructor;
+            required: false;
+        };
     }, {
         BEMSpace: string;
         props: any;
         emit: (event: "closed", ...args: any[]) => void;
-        nextZIndex: () => number;
         visible: import("vue").Ref<boolean>;
-        isRender: import("vue").Ref<boolean>;
-        hideTimer: any;
-        triggerType: "element" | "rect";
         currentTriggerElement: HTMLElement;
         popoverRectInfo: import("vue").Ref<any>;
         getPopoverTriggerElementRectInfo: (element: HTMLElement) => void;
         popoverRef: import("vue").Ref<HTMLElement>;
+        popoverElementRect: import("vue").Ref<DOMRect>;
+        getPopoverElementRect: () => void;
         popoverStyle: import("vue").ComputedRef<{
             top?: undefined;
             left?: undefined;
@@ -52,7 +57,6 @@ declare const _sfc_main: import("vue").DefineComponent<{}, {
         bindEvent: () => void;
         unbindEvent: () => void;
         hide: () => void;
-        zIndex: import("vue").Ref<number>;
         show: (element: HTMLElement | DOMRect) => void;
     }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "closed"[], "closed", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
         width: {
@@ -62,9 +66,16 @@ declare const _sfc_main: import("vue").DefineComponent<{}, {
         };
         placement: {
             type: StringConstructor;
+            /**
+             * 按钮数量
+             */
             required: false;
             default: string;
         };
+        zIndex: {
+            type: NumberConstructor;
+            required: false;
+        };
     }>> & {
         onClosed?: (...args: any[]) => any;
     }, {

package/dist/components/table/components/table-column/index.vue.d.ts

@@ -18,6 +18,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
     onCancelEditContent: (row: AnyObject, cellKey: string, restoreKey: string) => void;
     simplePopoverRef: import("vue").Ref<any>;
     filterZoneRef: import("vue").Ref<any>;
+    currentShowFilterColumn: import("vue").Ref<PageModel.TableBaseItem<any, any>>;
     showSimplePopover: (element: HTMLElement, column: PageModel.TableBaseItem<any>) => void;
     hideSimplePopover: () => void;
     handleColumnScreen: () => void;
@@ -163,19 +164,21 @@ declare const _sfc_main: import("vue").DefineComponent<{
             required: false;
             default: string;
         };
+        zIndex: {
+            type: NumberConstructor;
+            required: false;
+        };
     }, {
         BEMSpace: string;
         props: any;
         emit: (event: "closed", ...args: any[]) => void;
-        nextZIndex: () => number;
         visible: import("vue").Ref<boolean>;
-        isRender: import("vue").Ref<boolean>;
-        hideTimer: any;
-        triggerType: "element" | "rect";
         currentTriggerElement: HTMLElement;
         popoverRectInfo: import("vue").Ref<any>;
         getPopoverTriggerElementRectInfo: (element: HTMLElement) => void;
         popoverRef: import("vue").Ref<HTMLElement>;
+        popoverElementRect: import("vue").Ref<DOMRect>;
+        getPopoverElementRect: () => void;
         popoverStyle: import("vue").ComputedRef<{
             top?: undefined;
             left?: undefined;
@@ -192,7 +195,6 @@ declare const _sfc_main: import("vue").DefineComponent<{
         bindEvent: () => void;
         unbindEvent: () => void;
         hide: () => void;
-        zIndex: import("vue").Ref<number>;
         show: (element: HTMLElement | DOMRect) => void;
     }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "closed"[], "closed", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
         width: {
@@ -205,6 +207,10 @@ declare const _sfc_main: import("vue").DefineComponent<{
             required: false;
             default: string;
         };
+        zIndex: {
+            type: NumberConstructor;
+            required: false;
+        };
     }>> & {
         onClosed?: (...args: any[]) => any;
     }, {

package/dist/index.es.js

@@ -4,7 +4,7 @@ var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
-import { reactive, defineComponent, openBlock, createElementBlock, computed, ref, resolveComponent, normalizeClass, unref, createVNode, mergeProps, withCtx, Fragment, renderList, createBlock, createElementVNode, toDisplayString, nextTick, watch, markRaw, getCurrentInstance, resolveDynamicComponent, renderSlot, h, inject, createTextVNode, withModifiers, toRefs, onUnmounted, useSlots, toHandlers, createSlots, onMounted, createCommentVNode, render, Teleport, normalizeStyle, withDirectives, vShow, pushScopeId, popScopeId, resolveDirective, Transition, onActivated, watchEffect, normalizeProps, guardReactiveProps, provide } from "vue";
+import { reactive, defineComponent, openBlock, createElementBlock, computed, ref, resolveComponent, normalizeClass, unref, createVNode, mergeProps, withCtx, Fragment, renderList, createBlock, createElementVNode, toDisplayString, nextTick, watch, markRaw, getCurrentInstance, resolveDynamicComponent, renderSlot, h, inject, createTextVNode, withModifiers, toRefs, onUnmounted, useSlots, toHandlers, createSlots, onMounted, createCommentVNode, render, Teleport, Transition, normalizeStyle, withDirectives, vShow, pushScopeId, popScopeId, resolveDirective, onActivated, watchEffect, normalizeProps, guardReactiveProps, provide } from "vue";
 import { ElMessage, ElLoading, useZIndex, ElMessageBox } from "element-plus";
 function defineConfig(config) {
   return reactive(config);
@@ -5527,44 +5527,29 @@ const _sfc_main$z = defineComponent({
   ...__default__$i,
   props: {
     width: { default: 200 },
-    placement: { default: "right" }
+    placement: { default: "right" },
+    zIndex: {}
   },
   emits: ["closed"],
   setup(__props, { expose: __expose, emit: __emit }) {
     const { BEMSpace } = createBEMSpace("simple-popover");
     const props = __props;
     const emit = __emit;
-    const { nextZIndex } = useZIndex();
     const visible = ref(false);
-    const isRender = ref(false);
-    let hideTimer = null;
-    watch(
-      () => visible.value,
-      (val) => {
-        if (val) {
-          isRender.value = true;
-          if (hideTimer) {
-            clearTimeout(hideTimer);
-            hideTimer = null;
-          }
-        } else {
-          hideTimer = setTimeout(() => {
-            isRender.value = false;
-          }, 300);
-        }
-      },
-      {
-        deep: true,
-        immediate: true
-      }
-    );
     let currentTriggerElement = null;
     const popoverRectInfo = ref({});
     const getPopoverTriggerElementRectInfo = (element) => {
       popoverRectInfo.value = element.getBoundingClientRect();
     };
     const popoverRef = ref();
+    const popoverElementRect = ref();
+    const getPopoverElementRect = () => {
+      if (popoverRef.value) {
+        popoverElementRect.value = popoverRef.value.getBoundingClientRect();
+      }
+    };
     const popoverStyle = computed(() => {
+      var _a, _b;
       const { top, left, width, height } = popoverRectInfo.value;
       if (top == null) {
         return {};
@@ -5572,16 +5557,21 @@ const _sfc_main$z = defineComponent({
       let _left = 0;
       if (props.placement === "left") {
         _left = left - props.width + width - 2;
-        _left = Math.max(_left, 10);
+        _left = Math.max(_left, 20);
       } else {
         _left = left;
         const rightEdge = left + props.width;
         if (rightEdge > window.innerWidth) {
-          _left = left - (rightEdge - window.innerWidth) - 10;
+          _left = left - (rightEdge - window.innerWidth) - 20;
         }
       }
+      let topValue = top + height + 4;
+      const contentHeight = (_b = (_a = popoverElementRect.value) == null ? void 0 : _a.height) != null ? _b : 0;
+      if (topValue + contentHeight > window.innerHeight) {
+        topValue = top - contentHeight - 4;
+      }
       return {
-        top: top + height + 4 + "px",
+        top: topValue + "px",
         left: _left + "px",
         width: props.width + "px"
       };
@@ -5598,9 +5588,8 @@ const _sfc_main$z = defineComponent({
       }
     };
     const isPopperChildElement = (element) => {
-      var _a;
       let _element = element;
-      while (_element && !((_a = _element.className) == null ? void 0 : _a.includes("el-popper"))) {
+      while (_element && (typeof _element.className !== "string" || !_element.className.includes("el-popper"))) {
         _element = _element.parentElement;
       }
       if (_element) {
@@ -5634,19 +5623,14 @@ const _sfc_main$z = defineComponent({
       visible.value = false;
       emit("closed");
     };
-    const zIndex = ref(0);
     const show = (element) => {
+      const { nextZIndex } = useZIndex();
       if (element instanceof DOMRect) {
         currentTriggerElement = null;
         popoverRectInfo.value = element;
         if (visible.value) {
           hide();
         }
-        zIndex.value = nextZIndex();
-        visible.value = true;
-        setTimeout(() => {
-          bindEvent();
-        }, 0);
       } else {
         if (visible.value) {
           if (currentTriggerElement === element) {
@@ -5655,14 +5639,16 @@ const _sfc_main$z = defineComponent({
           }
           unbindEvent();
         }
-        zIndex.value = nextZIndex();
         currentTriggerElement = element;
         getPopoverTriggerElementRectInfo(currentTriggerElement);
-        visible.value = true;
-        setTimeout(() => {
-          bindEvent();
-        }, 0);
       }
+      visible.value = true;
+      setTimeout(() => {
+        var _a;
+        popoverRef.value.style.zIndex = (_a = props.zIndex) != null ? _a : nextZIndex();
+        getPopoverElementRect();
+        bindEvent();
+      }, 0);
     };
     __expose({
       show,
@@ -5670,23 +5656,27 @@ const _sfc_main$z = defineComponent({
     });
     return (_ctx, _cache) => {
       return openBlock(), createBlock(Teleport, { to: "body" }, [
-        isRender.value ? (openBlock(), createElementBlock("div", {
-          key: 0,
-          ref_key: "popoverRef",
-          ref: popoverRef,
-          class: normalizeClass([unref(BEMSpace), { visible: visible.value }]),
-          style: normalizeStyle({
-            ...popoverStyle.value,
-            zIndex: zIndex.value
-          })
-        }, [
-          renderSlot(_ctx.$slots, "default", {}, void 0, true)
-        ], 6)) : createCommentVNode("", true)
+        createVNode(Transition, { name: "el-fade-in" }, {
+          default: withCtx(() => [
+            visible.value ? (openBlock(), createElementBlock("div", {
+              key: 0,
+              ref_key: "popoverRef",
+              ref: popoverRef,
+              class: normalizeClass([unref(BEMSpace)]),
+              style: normalizeStyle({
+                ...popoverStyle.value
+              })
+            }, [
+              renderSlot(_ctx.$slots, "default", {}, void 0, true)
+            ], 6)) : createCommentVNode("", true)
+          ]),
+          _: 3
+        })
       ]);
     };
   }
 });
-var SimplePopover = /* @__PURE__ */ _export_sfc(_sfc_main$z, [["__scopeId", "data-v-200a6b63"]]);
+var SimplePopover = /* @__PURE__ */ _export_sfc(_sfc_main$z, [["__scopeId", "data-v-3e2ba5be"]]);
 var FilterItemTypeEnum$1 = /* @__PURE__ */ ((FilterItemTypeEnum2) => {
   FilterItemTypeEnum2["\u6587\u5B57"] = "string";
   FilterItemTypeEnum2["\u6570\u5B57"] = "number";
@@ -6432,9 +6422,11 @@ const _sfc_main$x = defineComponent({
     };
     const simplePopoverRef = ref();
     const filterZoneRef = ref();
+    const currentShowFilterColumn = ref();
     const showSimplePopover = (element, column) => {
       var _a;
       (_a = simplePopoverRef.value) == null ? void 0 : _a.show(element);
+      currentShowFilterColumn.value = column;
       nextTick(() => {
         filterZoneRef.value.show(column);
       });
@@ -6490,7 +6482,10 @@ const _sfc_main$x = defineComponent({
                   key: 2,
                   class: normalizeClass([
                     "el-table__header-filter",
-                    { active: tableManager.value.columnParamsKey[column.prop] }
+                    {
+                      focus: currentShowFilterColumn.value && currentShowFilterColumn.value._columnKey === column._columnKey,
+                      active: tableManager.value.columnParamsKey[column.prop]
+                    }
                   ]),
                   title: "\u8BBE\u7F6E\u7B5B\u9009",
                   style: normalizeStyle({
@@ -6599,7 +6594,8 @@ const _sfc_main$x = defineComponent({
         createVNode(SimplePopover, {
           ref_key: "simplePopoverRef",
           ref: simplePopoverRef,
-          width: 320
+          width: 320,
+          onClosed: _cache[0] || (_cache[0] = ($event) => currentShowFilterColumn.value = null)
         }, {
           default: withCtx(() => [
             createVNode(FilterZone$1, {
@@ -9696,8 +9692,7 @@ const _sfc_main$n = defineComponent({
           default: withCtx(() => [
             createVNode(ColumnTools$1, {
               els: filteredUserEls.value,
-              onSaveColumns,
-              onExport: showExport
+              onSaveColumns
             }, null, 8, ["els"])
           ]),
           _: 1
@@ -14616,7 +14611,7 @@ const defineEditableTable = function(config) {
 };
 var iconfont = "";
 const name = "@juzhenfe/page-model";
-const version = "3.16.3";
+const version = "3.16.5";
 const types = "dist/main.d.ts";
 const main = "dist/index.umd.js";
 const keywords = [