@jetlinks-web/components 2.3.0 → 2.3.1

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-1725345293616"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1725526196668"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { style: { "color": "#1d2129" } };
 const _hoisted_2 = {
     key: 0,

package/es/FullPage/FullPage.js

@@ -6,7 +6,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-1725345293925"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1725526195909"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "full-page-warp-content" };
 import { ref } from 'vue';
 import { useElementBounding } from '@vueuse/core';

package/es/PermissionButton/index.js

@@ -3,7 +3,7 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 var _excluded = ["popConfirm", "tooltip", "hasPermission", "noPermissionTitle"];
 import { h, defineComponent, computed } from "vue";
-import { Button, Tooltip, Popconfirm } from 'ant-design-vue';
+import { Button, Tooltip, Modal } from 'ant-design-vue';
 import "ant-design-vue/es";
 import { omit } from "lodash-es";
 import { buttonProps } from "ant-design-vue/es/button/button";
@@ -33,8 +33,6 @@ var PermissionButton = defineComponent({
   props: definedProps,
   setup: function setup(props, _ref) {
     var slots = _ref.slots;
-    var popConfirm = props.popConfirm,
-      tooltip = props.tooltip;
     var _usePermission = usePermission(props.hasPermission),
       hasPerm = _usePermission.hasPerm;
     var permission = computed(function () {
@@ -49,11 +47,9 @@ var PermissionButton = defineComponent({
       }
       return true;
     });
-    var hasPopConfirm = computed(function () {
-      return !!popConfirm;
-    }); // 是否包含确认弹窗
+    // const hasPopConfirm = computed(() => !!props.popConfirm) // 是否包含确认弹窗
     var hasTooltip = computed(function () {
-      return !!tooltip;
+      return !!props.tooltip;
     }); // 是否包含文字提示
     return function () {
       var popConfirm = props.popConfirm,
@@ -61,6 +57,20 @@ var PermissionButton = defineComponent({
         hasPermission = props.hasPermission,
         noPermissionTitle = props.noPermissionTitle,
         buttonProps = _objectWithoutProperties(props, _excluded);
+      if (popConfirm) {
+        buttonProps.onClick = function () {
+          Modal.confirm({
+            title: popConfirm.title,
+            content: popConfirm.content,
+            onOk: function onOk() {
+              return popConfirm.onConfirm();
+            },
+            onCancel: function onCancel() {
+              popConfirm.onCancel();
+            }
+          });
+        };
+      }
       var button = !slots.button ? h(Button, _objectSpread(_objectSpread({}, buttonProps), {}, {
         disabled: isPermission.value
       }), {
@@ -90,21 +100,21 @@ var PermissionButton = defineComponent({
         }
       }) : undefined;
       // 二次确认
-      var _popConfirm = popConfirm ? h(Popconfirm, _extends({
-        overlayStyle: {
-          width: '220px'
-        }
-      }, popConfirm, {
-        disabled: !permission.value || buttonProps.disabled
-      }), {
-        default: function _default() {
-          return tooltip ? _tooltip : button;
-        }
-      }) : undefined;
+      // const _popConfirm = popConfirm ?
+      //     h(Popconfirm,
+      //         Object.assign(
+      //             {overlayStyle: {width: '220px'}},
+      //             popConfirm,
+      //             {
+      //                 disabled: !permission.value || buttonProps.disabled
+      //             }
+      //         ),
+      //         {default: () => tooltip ? _tooltip : button})
+      //     : undefined
       if (permission.value) {
-        if (hasPopConfirm.value) {
-          return _popConfirm;
-        }
+        // if (hasPopConfirm.value) {
+        //     return _popConfirm
+        // }
         if (hasTooltip.value) {
           return _tooltip;
         }

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-1725345294479"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1725526197817"), n = n(), _popScopeId(), n);
 const _hoisted_1 = ["onClick"];
 const __sfc_main__ = Object.assign({
     name: 'JRadioButton',

package/es/Search/Advanced/SaveHistory.js

@@ -21,7 +21,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, createVNode as _createVNode, withCtx as _withCtx, 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-1725345295640"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1725526198917"), n = n(), _popScopeId(), n);
 const _hoisted_1 = {
     key: 0,
     style: { "width": "240px" }

package/es/Search/Item.js

@@ -78,7 +78,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-1725345294732"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1725526198084"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "JSearch-item" };
 const _hoisted_2 = {
     key: 0,

package/es/Search/Search.js

@@ -36,7 +36,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-1725345294853"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1725526198189"), 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-1725345293592"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1725526196639"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { style: { "color": "#1d2129" } };
 const _hoisted_2 = {
     key: 0,

package/lib/FullPage/FullPage.js

@@ -6,7 +6,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-1725345293934"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1725526195900"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "full-page-warp-content" };
 import { ref } from 'vue';
 import { useElementBounding } from '@vueuse/core';

package/lib/PermissionButton/index.js

@@ -40,8 +40,6 @@ var PermissionButton = (0, _vue.defineComponent)({
   props: definedProps,
   setup: function setup(props, _ref) {
     var slots = _ref.slots;
-    var popConfirm = props.popConfirm,
-      tooltip = props.tooltip;
     var _usePermission = (0, _hooks.usePermission)(props.hasPermission),
       hasPerm = _usePermission.hasPerm;
     var permission = (0, _vue.computed)(function () {
@@ -56,11 +54,9 @@ var PermissionButton = (0, _vue.defineComponent)({
       }
       return true;
     });
-    var hasPopConfirm = (0, _vue.computed)(function () {
-      return !!popConfirm;
-    }); // 是否包含确认弹窗
+    // const hasPopConfirm = computed(() => !!props.popConfirm) // 是否包含确认弹窗
     var hasTooltip = (0, _vue.computed)(function () {
-      return !!tooltip;
+      return !!props.tooltip;
     }); // 是否包含文字提示
     return function () {
       var popConfirm = props.popConfirm,
@@ -68,6 +64,20 @@ var PermissionButton = (0, _vue.defineComponent)({
         hasPermission = props.hasPermission,
         noPermissionTitle = props.noPermissionTitle,
         buttonProps = (0, _objectWithoutProperties2.default)(props, _excluded);
+      if (popConfirm) {
+        buttonProps.onClick = function () {
+          _antDesignVue.Modal.confirm({
+            title: popConfirm.title,
+            content: popConfirm.content,
+            onOk: function onOk() {
+              return popConfirm.onConfirm();
+            },
+            onCancel: function onCancel() {
+              popConfirm.onCancel();
+            }
+          });
+        };
+      }
       var button = !slots.button ? (0, _vue.h)(_antDesignVue.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, buttonProps), {}, {
         disabled: isPermission.value
       }), {
@@ -97,21 +107,21 @@ var PermissionButton = (0, _vue.defineComponent)({
         }
       }) : undefined;
       // 二次确认
-      var _popConfirm = popConfirm ? (0, _vue.h)(_antDesignVue.Popconfirm, (0, _extends2.default)({
-        overlayStyle: {
-          width: '220px'
-        }
-      }, popConfirm, {
-        disabled: !permission.value || buttonProps.disabled
-      }), {
-        default: function _default() {
-          return tooltip ? _tooltip : button;
-        }
-      }) : undefined;
+      // const _popConfirm = popConfirm ?
+      //     h(Popconfirm,
+      //         Object.assign(
+      //             {overlayStyle: {width: '220px'}},
+      //             popConfirm,
+      //             {
+      //                 disabled: !permission.value || buttonProps.disabled
+      //             }
+      //         ),
+      //         {default: () => tooltip ? _tooltip : button})
+      //     : undefined
       if (permission.value) {
-        if (hasPopConfirm.value) {
-          return _popConfirm;
-        }
+        // if (hasPopConfirm.value) {
+        //     return _popConfirm
+        // }
         if (hasTooltip.value) {
           return _tooltip;
         }

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-1725345294465"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1725526197806"), n = n(), _popScopeId(), n);
 const _hoisted_1 = ["onClick"];
 const __sfc_main__ = Object.assign({
     name: 'JRadioButton',

package/lib/Search/Advanced/SaveHistory.js

@@ -21,7 +21,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, createVNode as _createVNode, withCtx as _withCtx, 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-1725345295629"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1725526198895"), n = n(), _popScopeId(), n);
 const _hoisted_1 = {
     key: 0,
     style: { "width": "240px" }

package/lib/Search/Item.js

@@ -78,7 +78,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-1725345294677"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1725526197992"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "JSearch-item" };
 const _hoisted_2 = {
     key: 0,

package/lib/Search/Search.js

@@ -36,7 +36,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-1725345294831"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1725526198169"), 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.3.0",
+  "version": "2.3.1",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -152,9 +152,9 @@
     "webpack-dev-server": "^4.0.0",
     "webpack-merge": "^5.0.0",
     "webpackbar": "^5.0.2",
-    "@jetlinks-web/constants": "^1.0.2",
-    "@jetlinks-web/utils": "^1.2.0",
-    "@jetlinks-web/hooks": "^1.0.15"
+    "@jetlinks-web/constants": "^1.0.3",
+    "@jetlinks-web/hooks": "^1.0.16",
+    "@jetlinks-web/utils": "^1.2.1"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",