@juzhenfe/page-model 3.16.4 → 3.16.6

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

@@ -50,15 +50,15 @@ 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;
@@ -93,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,15 +49,15 @@ 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;
@@ -92,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,15 +29,15 @@ 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;
@@ -72,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,15 +9,15 @@ 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;
@@ -52,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,18 +20,21 @@ 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;
@@ -63,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,15 +164,15 @@ 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;
@@ -206,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);
@@ -3692,6 +3692,7 @@ const getPageModelDefaultConfig = () => {
       showTools: true,
       rowClickSelect: false,
       columnParamsQueryImmediate: true,
+      exportPageSize: 200,
       pagination: {
         background: true,
         pagerCount: 5
@@ -5527,37 +5528,15 @@ 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) => {
@@ -5646,18 +5625,13 @@ const _sfc_main$z = defineComponent({
       emit("closed");
     };
     const show = (element) => {
+      const { nextZIndex } = useZIndex();
       if (element instanceof DOMRect) {
         currentTriggerElement = null;
         popoverRectInfo.value = element;
         if (visible.value) {
           hide();
         }
-        visible.value = true;
-        setTimeout(() => {
-          popoverRef.value.style.zIndex = nextZIndex();
-          getPopoverElementRect();
-          bindEvent();
-        }, 0);
       } else {
         if (visible.value) {
           if (currentTriggerElement === element) {
@@ -5668,13 +5642,14 @@ const _sfc_main$z = defineComponent({
         }
         currentTriggerElement = element;
         getPopoverTriggerElementRectInfo(currentTriggerElement);
-        visible.value = true;
-        setTimeout(() => {
-          popoverRef.value.style.zIndex = nextZIndex();
-          getPopoverElementRect();
-          bindEvent();
-        }, 0);
       }
+      visible.value = true;
+      setTimeout(() => {
+        var _a;
+        popoverRef.value.style.zIndex = (_a = props.zIndex) != null ? _a : nextZIndex();
+        getPopoverElementRect();
+        bindEvent();
+      }, 0);
     };
     __expose({
       show,
@@ -5682,22 +5657,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
-          })
-        }, [
-          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-52bb96cb"]]);
+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";
@@ -6443,9 +6423,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);
       });
@@ -6501,7 +6483,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({
@@ -6610,7 +6595,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, {
@@ -8320,7 +8306,7 @@ const _sfc_main$t = defineComponent({
 });
 var ColumnTools$1 = /* @__PURE__ */ _export_sfc(_sfc_main$t, [["__scopeId", "data-v-5b551558"]]);
 var index_vue_vue_type_style_index_0_scoped_true_lang$9 = "";
-const _withScopeId$2 = (n) => (pushScopeId("data-v-cdb9e970"), n = n(), popScopeId(), n);
+const _withScopeId$2 = (n) => (pushScopeId("data-v-51c518c5"), n = n(), popScopeId(), n);
 const _hoisted_1$d = { class: "export-columns" };
 const _hoisted_2$5 = {
   key: 0,
@@ -8455,7 +8441,7 @@ const _sfc_main$s = defineComponent({
           }
           const hasPagination = ((_c = tableManager2.table.pagination) == null ? void 0 : _c.show) !== false;
           const reqPageSize = formData.pageSize;
-          const exportPageSize = !hasPagination ? reqPageSize : config.table.exportPageSize || 200;
+          const exportPageSize = !hasPagination ? reqPageSize : config.table.exportPageSize;
           const perTimePageSize = Math.min(reqPageSize, exportPageSize);
           const requestTimes = Math.ceil(reqPageSize / perTimePageSize);
           const lastRequestPageSize = reqPageSize - (requestTimes - 1) * perTimePageSize;
@@ -8517,6 +8503,7 @@ const _sfc_main$s = defineComponent({
             exportEls
           });
         } catch (error) {
+          console.log(error);
           ElMessage.warning("\u6570\u636E\u83B7\u53D6\u5931\u8D25!");
         } finally {
           showProgress.value = false;
@@ -8548,6 +8535,20 @@ const _sfc_main$s = defineComponent({
         }
       }
     };
+    const onBeforeClose = async (done) => {
+      if (apiLoadingProgress.value != null) {
+        await ElMessageBox.confirm("\u6587\u4EF6\u6B63\u5728\u5BFC\u51FA\u4E2D\uFF0C\u662F\u5426\u53D6\u6D88\u5BFC\u51FA\uFF1F", "\u63D0\u793A", {
+          type: "warning"
+        });
+        done();
+      } else {
+        done();
+      }
+    };
+    const handleCancel = () => {
+      const hide = () => visible.value = false;
+      onBeforeClose(hide);
+    };
     const show = (data) => {
       visible.value = true;
       renderdEls.value = data.els;
@@ -8570,6 +8571,7 @@ const _sfc_main$s = defineComponent({
       stopExportLoadingTextTimer();
       tableManager = null;
       cancelFn && cancelFn();
+      cancelFn = null;
       emit("closed");
     };
     __expose({
@@ -8589,14 +8591,13 @@ const _sfc_main$s = defineComponent({
       const _directive_loading = resolveDirective("loading");
       return openBlock(), createBlock(_sfc_main$D, {
         modelValue: visible.value,
-        "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => visible.value = $event),
+        "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => visible.value = $event),
         title: "\u5BFC\u51FA\u8868\u683C\u6570\u636E",
         width: "700px",
         "dialog-props": {
           appendToBody: true,
           destroyOnClose: true,
-          closeOnClickModal: false,
-          closeOnPressEscape: false
+          beforeClose: onBeforeClose
         },
         "dialog-events": {
           closed: onClosed
@@ -8607,7 +8608,7 @@ const _sfc_main$s = defineComponent({
             createVNode(_component_el_button, {
               disabled: libLoading.value,
               type: "info",
-              onClick: _cache[3] || (_cache[3] = ($event) => visible.value = false)
+              onClick: handleCancel
             }, {
               default: withCtx(() => [
                 createTextVNode("\u53D6\u6D88")
@@ -8763,11 +8764,11 @@ const _sfc_main$s = defineComponent({
           ])) : createCommentVNode("", true)
         ]),
         _: 1
-      }, 8, ["modelValue", "dialog-events"]);
+      }, 8, ["modelValue", "dialog-props", "dialog-events"]);
     };
   }
 });
-var ExportForm = /* @__PURE__ */ _export_sfc(_sfc_main$s, [["__scopeId", "data-v-cdb9e970"]]);
+var ExportForm = /* @__PURE__ */ _export_sfc(_sfc_main$s, [["__scopeId", "data-v-51c518c5"]]);
 const SAVE_NAME$2 = "table-columns";
 const columnsSaver$1 = new ConfigSaver(SAVE_NAME$2);
 const saveTableColumns = columnsSaver$1.setContents.bind(columnsSaver$1);
@@ -10786,6 +10787,8 @@ const _sfc_main$g = defineComponent({
       showFormClumnTool
     });
     return (_ctx, _cache) => {
+      const _component_el_icon = resolveComponent("el-icon");
+      const _component_el_tooltip = resolveComponent("el-tooltip");
       const _component_el_form_item = resolveComponent("el-form-item");
       const _component_el_form = resolveComponent("el-form");
       return openBlock(), createBlock(_component_el_form, mergeProps({
@@ -10808,6 +10811,27 @@ const _sfc_main$g = defineComponent({
                 label: item.userLabel || item.label,
                 prop: item.prop
               }), {
+                label: withCtx(({ label }) => [
+                  createElementVNode("span", null, toDisplayString(label), 1),
+                  item.helpTextAsTooltip ? (openBlock(), createBlock(_component_el_tooltip, {
+                    key: 0,
+                    effect: "dark",
+                    content: renderDeText(item.helpText, formManager.formData),
+                    placement: "top"
+                  }, {
+                    default: withCtx(() => [
+                      createVNode(_component_el_icon, {
+                        class: normalizeClass(unref(createBEMName)("help-text-icon"))
+                      }, {
+                        default: withCtx(() => [
+                          createVNode(unref(questionFilled))
+                        ]),
+                        _: 1
+                      }, 8, ["class"])
+                    ]),
+                    _: 2
+                  }, 1032, ["content"])) : createCommentVNode("", true)
+                ]),
                 default: withCtx(() => [
                   createElementVNode("div", {
                     class: normalizeClass(unref(createBEMName)("content"))
@@ -10835,7 +10859,7 @@ const _sfc_main$g = defineComponent({
                         class: normalizeClass(unref(createBEMName)("suffix"))
                       }, toDisplayString(renderDeText(item.suffix, formManager.formData)), 3)) : createCommentVNode("", true)
                     ], 2),
-                    item.helpText ? (openBlock(), createElementBlock("div", {
+                    item.helpText && !item.helpTextAsTooltip ? (openBlock(), createElementBlock("div", {
                       key: 0,
                       class: normalizeClass(unref(createBEMName)("help-text"))
                     }, [
@@ -14626,7 +14650,7 @@ const defineEditableTable = function(config) {
 };
 var iconfont = "";
 const name = "@juzhenfe/page-model";
-const version = "3.16.4";
+const version = "3.16.6";
 const types = "dist/main.d.ts";
 const main = "dist/index.umd.js";
 const keywords = [