@jetlinks-web/components 2.4.21 → 2.4.22

package/es/EditTable/FormItem.js

@@ -48,7 +48,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "onFieldChange": "setup-const"
 } */
 import { toDisplayString as _toDisplayString, createElementVNode as _createElementVNode, openBlock as _openBlock, createElementBlock as _createElementBlock, createCommentVNode as _createCommentVNode, resolveComponent as _resolveComponent, withCtx as _withCtx, createVNode as _createVNode, renderSlot as _renderSlot, normalizeClass as _normalizeClass, Fragment as _Fragment, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1740636292654"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1740639304953"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { style: { "color": "#1d2129" } };
 const _hoisted_2 = {
     key: 0,

package/es/FullPage/FullPage.js

@@ -9,7 +9,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, renderSlot as _renderSlot, createElementVNode as _createElementVNode, normalizeStyle as _normalizeStyle, openBlock as _openBlock, createElementBlock as _createElementBlock, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1740636293406"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1740639305607"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "full-page-warp-content" };
 import { ref, inject } from 'vue';
 import { useElementBounding } from '@vueuse/core';

package/es/ProTable/ProTable.js

@@ -1,3 +1,9 @@
+function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) {
+    return lhs;
+}
+else {
+    return rhsFn();
+} }
 function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) {
     const op = ops[i];
     const fn = ops[i + 1];
@@ -73,14 +79,18 @@ const __sfc_main__ = _defineComponent({
         ...proTableProps
     },
     setup(__props, { expose: __expose }) {
-        const tableConfig = inject(TableConfig, {});
+        const tableConfig = inject(TableConfig, {
+            pagination: {}
+        });
         const props = __props;
         const slots = useSlots();
         const myPagination = computed(() => {
-            console.log(props.pagination);
+            const globalPagination = tableConfig.pagination || {};
+            let showQuickJumper = _nullishCoalesce(_nullishCoalesce(globalPagination.showQuickJumper, () => (props.pagination.showQuickJumper)), () => (false));
             return {
-                isShowContent: tableConfig.isShowContent,
+                ...globalPagination,
                 ...props.pagination,
+                showQuickJumper
             };
         });
         const loading = ref(false);

package/es/ProTable/setting.js

@@ -116,7 +116,6 @@ export var proTableProps = _objectSpread(_objectSpread(_objectSpread({}, _conten
     default: function _default() {
       return {
         showSizeChanger: true,
-        showQuickJumper: false,
         size: 'size',
         pageSizeOptions: ['12', '24', '48', '96']
       };

package/es/RadioButton/RadioButton.js

@@ -10,7 +10,7 @@
   "onClick": "setup-const"
 } */
 import { unref as _unref, renderList as _renderList, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock, toDisplayString as _toDisplayString, normalizeClass as _normalizeClass, normalizeStyle as _normalizeStyle, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1740636294972"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1740639306875"), n = n(), _popScopeId(), n);
 const _hoisted_1 = ["onClick"];
 const __sfc_main__ = Object.assign({
     name: 'JRadioButton',

package/es/Search/Advanced/SaveHistory.js

@@ -23,7 +23,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, createVNode as _createVNode, withCtx as _withCtx, toDisplayString as _toDisplayString, createTextVNode as _createTextVNode, openBlock as _openBlock, createElementBlock as _createElementBlock, createCommentVNode as _createCommentVNode, createBlock as _createBlock, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1740636295613"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1740639307542"), n = n(), _popScopeId(), n);
 const _hoisted_1 = {
     key: 0,
     style: { "width": "240px" }

package/es/Search/Item.js

@@ -80,7 +80,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, openBlock as _openBlock, createBlock as _createBlock, createCommentVNode as _createCommentVNode, toDisplayString as _toDisplayString, createElementBlock as _createElementBlock, createVNode as _createVNode, Fragment as _Fragment, normalizeStyle as _normalizeStyle, mergeProps as _mergeProps, resolveDynamicComponent as _resolveDynamicComponent, withCtx as _withCtx, createElementVNode as _createElementVNode, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1740636295065"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1740639306282"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "JSearch-item" };
 const _hoisted_2 = {
     key: 0,

package/es/Search/Search.js

@@ -45,7 +45,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { renderList as _renderList, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock, createVNode as _createVNode, unref as _unref, withCtx as _withCtx, createBlock as _createBlock, renderSlot as _renderSlot, toDisplayString as _toDisplayString, createTextVNode as _createTextVNode, normalizeStyle as _normalizeStyle, createElementVNode as _createElementVNode, normalizeClass as _normalizeClass, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1740636295190"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1740639306523"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "JSearch-content simple" };
 const _hoisted_2 = { class: "JSearch-items" };
 import { Button, Row, Col, Form, FormItemRest, } from 'ant-design-vue';

package/lib/EditTable/FormItem.js

@@ -48,7 +48,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "onFieldChange": "setup-const"
 } */
 import { toDisplayString as _toDisplayString, createElementVNode as _createElementVNode, openBlock as _openBlock, createElementBlock as _createElementBlock, createCommentVNode as _createCommentVNode, resolveComponent as _resolveComponent, withCtx as _withCtx, createVNode as _createVNode, renderSlot as _renderSlot, normalizeClass as _normalizeClass, Fragment as _Fragment, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1740636292677"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1740639304928"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { style: { "color": "#1d2129" } };
 const _hoisted_2 = {
     key: 0,

package/lib/FullPage/FullPage.js

@@ -9,7 +9,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, renderSlot as _renderSlot, createElementVNode as _createElementVNode, normalizeStyle as _normalizeStyle, openBlock as _openBlock, createElementBlock as _createElementBlock, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1740636293397"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1740639305580"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "full-page-warp-content" };
 import { ref, inject } from 'vue';
 import { useElementBounding } from '@vueuse/core';

package/lib/ProTable/ProTable.js

@@ -1,3 +1,9 @@
+function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) {
+    return lhs;
+}
+else {
+    return rhsFn();
+} }
 function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) {
     const op = ops[i];
     const fn = ops[i + 1];
@@ -73,14 +79,18 @@ const __sfc_main__ = _defineComponent({
         ...proTableProps
     },
     setup(__props, { expose: __expose }) {
-        const tableConfig = inject(TableConfig, {});
+        const tableConfig = inject(TableConfig, {
+            pagination: {}
+        });
         const props = __props;
         const slots = useSlots();
         const myPagination = computed(() => {
-            console.log(props.pagination);
+            const globalPagination = tableConfig.pagination || {};
+            let showQuickJumper = _nullishCoalesce(_nullishCoalesce(globalPagination.showQuickJumper, () => (props.pagination.showQuickJumper)), () => (false));
             return {
-                isShowContent: tableConfig.isShowContent,
+                ...globalPagination,
                 ...props.pagination,
+                showQuickJumper
             };
         });
         const loading = ref(false);

package/lib/ProTable/setting.js

@@ -123,7 +123,6 @@ var proTableProps = exports.proTableProps = (0, _objectSpread2.default)((0, _obj
     default: function _default() {
       return {
         showSizeChanger: true,
-        showQuickJumper: false,
         size: 'size',
         pageSizeOptions: ['12', '24', '48', '96']
       };

package/lib/RadioButton/RadioButton.js

@@ -10,7 +10,7 @@
   "onClick": "setup-const"
 } */
 import { unref as _unref, renderList as _renderList, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock, toDisplayString as _toDisplayString, normalizeClass as _normalizeClass, normalizeStyle as _normalizeStyle, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1740636294962"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1740639306884"), n = n(), _popScopeId(), n);
 const _hoisted_1 = ["onClick"];
 const __sfc_main__ = Object.assign({
     name: 'JRadioButton',

package/lib/Search/Advanced/SaveHistory.js

@@ -23,7 +23,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, createVNode as _createVNode, withCtx as _withCtx, toDisplayString as _toDisplayString, createTextVNode as _createTextVNode, openBlock as _openBlock, createElementBlock as _createElementBlock, createCommentVNode as _createCommentVNode, createBlock as _createBlock, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1740636295598"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1740639307553"), n = n(), _popScopeId(), n);
 const _hoisted_1 = {
     key: 0,
     style: { "width": "240px" }

package/lib/Search/Item.js

@@ -80,7 +80,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, openBlock as _openBlock, createBlock as _createBlock, createCommentVNode as _createCommentVNode, toDisplayString as _toDisplayString, createElementBlock as _createElementBlock, createVNode as _createVNode, Fragment as _Fragment, normalizeStyle as _normalizeStyle, mergeProps as _mergeProps, resolveDynamicComponent as _resolveDynamicComponent, withCtx as _withCtx, createElementVNode as _createElementVNode, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1740636294998"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1740639306359"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "JSearch-item" };
 const _hoisted_2 = {
     key: 0,

package/lib/Search/Search.js

@@ -45,7 +45,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { renderList as _renderList, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock, createVNode as _createVNode, unref as _unref, withCtx as _withCtx, createBlock as _createBlock, renderSlot as _renderSlot, toDisplayString as _toDisplayString, createTextVNode as _createTextVNode, normalizeStyle as _normalizeStyle, createElementVNode as _createElementVNode, normalizeClass as _normalizeClass, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1740636295159"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1740639306563"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "JSearch-content simple" };
 const _hoisted_2 = { class: "JSearch-items" };
 import { Button, Row, Col, Form, FormItemRest, } from 'ant-design-vue';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetlinks-web/components",
-  "version": "2.4.21",
+  "version": "2.4.22",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -157,8 +157,8 @@
     "webpack-merge": "^5.0.0",
     "webpackbar": "^5.0.2",
     "@jetlinks-web/constants": "^1.0.8",
-    "@jetlinks-web/utils": "^1.2.7",
-    "@jetlinks-web/hooks": "^1.0.22"
+    "@jetlinks-web/hooks": "^1.0.22",
+    "@jetlinks-web/utils": "^1.2.7"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",