@jetlinks-web/components 2.3.9 → 2.4.0

package/es/ConfigProvider/context.js

@@ -1,5 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { configProviderProps } from 'ant-design-vue/es/config-provider/context';
+import "@jetlinks-web/constants";
 export var configProps = function configProps() {
   return _objectSpread(_objectSpread({}, configProviderProps()), {}, {
     IconConfig: {
@@ -7,6 +8,12 @@ export var configProps = function configProps() {
     },
     MapConfig: {
       type: Object
+    },
+    SearchConfig: {
+      type: Object
+    },
+    PermissionButtonConfig: {
+      type: Object
     }
   });
 };

package/es/ConfigProvider/index.js

@@ -2,7 +2,7 @@ import { createVNode as _createVNode } from "vue";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { defineComponent, provide, reactive, h } from 'vue';
 import { configProps } from './context';
-import { ComponentsEnum, MAPConfig } from '@jetlinks-web/constants';
+import { ComponentsEnum, MAPConfig, PermissionButtonConfig, SearchConfig } from '@jetlinks-web/constants';
 import { ConfigProvider } from 'ant-design-vue';
 import { omit } from 'lodash-es';
 import Empty from '../Empty';
@@ -14,10 +14,15 @@ var JConfigProvider = defineComponent({
     var slots = _ref.slots;
     var _iconConfig = reactive(props.IconConfig || {});
     var _mapConfig = reactive(props.MapConfig || {});
+    var _searchConfig = reactive(props.SearchConfig || {});
+    var _PermissionButtonConfig = reactive(props.PermissionButtonConfig || {});
     provide(ComponentsEnum.Icon, _iconConfig); // 全局Icon 配置
     provide(MAPConfig, _mapConfig); // 全局地图配置
+    provide(SearchConfig, _searchConfig); // 全局搜索配置
+    provide(PermissionButtonConfig, _PermissionButtonConfig); // 权限组件
+    console.log('_PermissionButtonConfig', _PermissionButtonConfig, props.PermissionButtonConfig);
     return function () {
-      return h(ConfigProvider, _objectSpread({}, omit(props, ['IconConfig', 'MapConfig'])), {
+      return h(ConfigProvider, _objectSpread({}, omit(props, ['IconConfig', 'MapConfig', 'SearchConfig'])), {
         default: slots.default,
         renderEmpty: function renderEmpty() {
           var _slots$renderEmpty;

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

package/es/PermissionButton/confirm.js

@@ -0,0 +1,79 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import { createVNode, render as vueRender, h } from 'vue';
+import { destroyFns } from './index';
+import 'lodash-es';
+var confirm = function confirm(config, components) {
+  var container = document.createDocumentFragment();
+  var confirmDialogInstance = null;
+  var currentConfig = _objectSpread(_objectSpread({}, config), {}, {
+    visible: true
+  });
+  function destroy() {
+    if (confirmDialogInstance) {
+      // destroy
+      vueRender(null, container);
+      confirmDialogInstance.component.update();
+      confirmDialogInstance = null;
+    }
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    var triggerCancel = args.some(function (param) {
+      return param && param.triggerCancel;
+    });
+    if (config.onCancel && triggerCancel) {
+      config.onCancel.apply(config, args);
+    }
+    for (var i = 0; i < destroyFns.length; i++) {
+      var fn = destroyFns[i];
+      if (fn === close) {
+        destroyFns.splice(i, 1);
+        break;
+      }
+    }
+  }
+  function close() {
+    var _this = this;
+    for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+      args[_key2] = arguments[_key2];
+    }
+    currentConfig = _objectSpread(_objectSpread({}, currentConfig), {}, {
+      visible: false,
+      afterClose: function afterClose() {
+        if (typeof config.afterClose === 'function') {
+          config.afterClose();
+        }
+        destroy.apply(_this, args);
+      }
+    });
+    update(currentConfig);
+  }
+  function update(configUpdate) {
+    if (typeof configUpdate === 'function') {
+      currentConfig = configUpdate(currentConfig);
+    } else {
+      currentConfig = _objectSpread(_objectSpread({}, currentConfig), configUpdate);
+    }
+    if (confirmDialogInstance) {
+      _extends(confirmDialogInstance.component.props, currentConfig);
+      confirmDialogInstance.component.update();
+    }
+  }
+  var Wrapper = function Wrapper(p) {
+    return h(components, _objectSpread({}, p));
+  };
+  function render(props) {
+    var vm = createVNode(Wrapper, _objectSpread({}, props));
+    vm.appContext = config.parentContext || config.appContext || vm.appContext;
+    vueRender(vm, container);
+    return vm;
+  }
+  confirmDialogInstance = render(currentConfig);
+  destroyFns.push(close);
+  return {
+    destroy: close,
+    update: update
+  };
+};
+export default confirm;

package/es/PermissionButton/index.js

@@ -2,12 +2,14 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 var _excluded = ["popConfirm", "tooltip", "hasPermission", "noPermissionTitle"];
-import { h, defineComponent, computed } from "vue";
+import { h, defineComponent, computed, inject } from "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";
 import { usePermission } from '@jetlinks-web/hooks';
+import confirm from './confirm';
+import { PermissionButtonConfig } from "@jetlinks-web/constants";
 var definedProps = _objectSpread({
   tooltip: {
     type: Object
@@ -26,6 +28,7 @@ var definedProps = _objectSpread({
     type: String
   }
 }, omit(buttonProps(), 'icon'));
+export var destroyFns = [];
 var PermissionButton = defineComponent({
   name: 'JPermissionButton',
   // @ts-ignore
@@ -35,6 +38,9 @@ var PermissionButton = defineComponent({
     var slots = _ref.slots;
     var _usePermission = usePermission(props.hasPermission),
       hasPerm = _usePermission.hasPerm;
+    var context = inject(PermissionButtonConfig, {
+      components: undefined
+    });
     var permission = computed(function () {
       if (!props.hasPermission || props.hasPermission === true) {
         return true;
@@ -58,19 +64,24 @@ var PermissionButton = defineComponent({
         noPermissionTitle = props.noPermissionTitle,
         buttonProps = _objectWithoutProperties(props, _excluded);
       if (popConfirm) {
+        console.log('context', context);
         buttonProps.onClick = function () {
-          Modal.confirm({
-            title: popConfirm.title,
-            content: popConfirm.content,
-            onOk: function onOk() {
-              var _popConfirm$onConfirm;
-              return (_popConfirm$onConfirm = popConfirm.onConfirm) === null || _popConfirm$onConfirm === void 0 ? void 0 : _popConfirm$onConfirm.call(popConfirm);
-            },
-            onCancel: function onCancel() {
-              var _popConfirm$onCancel;
-              (_popConfirm$onCancel = popConfirm.onCancel) === null || _popConfirm$onCancel === void 0 ? void 0 : _popConfirm$onCancel.call(popConfirm);
-            }
-          });
+          if (context.components) {
+            confirm(popConfirm, context.components);
+          } else {
+            Modal.confirm({
+              title: popConfirm.title,
+              content: popConfirm.content,
+              onOk: function onOk() {
+                var _popConfirm$onConfirm;
+                return (_popConfirm$onConfirm = popConfirm.onConfirm) === null || _popConfirm$onConfirm === void 0 ? void 0 : _popConfirm$onConfirm.call(popConfirm);
+              },
+              onCancel: function onCancel() {
+                var _popConfirm$onCancel;
+                (_popConfirm$onCancel = popConfirm.onCancel) === null || _popConfirm$onCancel === void 0 ? void 0 : _popConfirm$onCancel.call(popConfirm);
+              }
+            });
+          }
         };
       }
       var button = !slots.button ? h(Button, _objectSpread(_objectSpread({}, buttonProps), {}, {

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-1725970196627"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1726059570162"), 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-1725970197062"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1726059570482"), 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-1725970196437"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1726059569799"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "JSearch-item" };
 const _hoisted_2 = {
     key: 0,
@@ -277,7 +277,6 @@ const __sfc_main__ = _defineComponent({
                     value: item.column,
                 };
             });
-            console.log(props.onlyValue);
             if (!props.onlyValue) {
                 // 获取第一个值
                 const sortColumn = cloneDeep(props.columns);
@@ -317,7 +316,6 @@ const __sfc_main__ = _defineComponent({
             termsModel.value = undefined;
         };
         watch(() => props.columns, () => {
-            console.log(props.columns);
             if (props.columns) {
                 handleItem();
             }

package/es/Search/Search.js

@@ -7,6 +7,7 @@
   "labelWidth": "props",
   "resetText": "props",
   "submitText": "props",
+  "align": "props",
   "JColumnsProps": "setup-maybe-ref",
   "SearchItemData": "setup-maybe-ref",
   "SearchProps": "setup-maybe-ref",
@@ -20,14 +21,20 @@
   "reactive": "setup-const",
   "ref": "setup-const",
   "provide": "setup-const",
+  "watch": "setup-const",
+  "computed": "setup-const",
+  "inject": "setup-const",
   "termsParamsFormat": "setup-maybe-ref",
   "SearchItem": "setup-const",
   "optionsMapKey": "setup-maybe-ref",
+  "SearchConfig": "setup-maybe-ref",
   "props": "setup-reactive-const",
   "columnOptionMap": "setup-ref",
   "emit": "setup-const",
   "terms": "setup-reactive-const",
   "searchItems": "setup-ref",
+  "context": "setup-maybe-ref",
+  "footerStyles": "setup-ref",
   "itemValueChange": "setup-const",
   "handleItems": "setup-const",
   "searchSubmit": "setup-const",
@@ -36,15 +43,16 @@
 } */
 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-1725970196539"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1726059569957"), 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';
 import { set } from 'lodash-es';
-import { reactive, ref, provide } from 'vue';
+import { reactive, ref, provide, watch, computed, inject } from 'vue';
 import { termsParamsFormat } from './util';
 import SearchItem from './Item.js';
 import { optionsMapKey } from './setting';
+import { SearchConfig } from '@jetlinks-web/constants';
 const __sfc_main__ = _defineComponent({
     ...{
         name: 'JSearch',
@@ -84,6 +92,10 @@ const __sfc_main__ = _defineComponent({
             type: String,
             default: '搜索',
         },
+        align: {
+            type: String,
+            default: 'value'
+        }
     },
     emits: ["search"],
     setup(__props, { emit: __emit }) {
@@ -93,6 +105,14 @@ const __sfc_main__ = _defineComponent({
         // 当前查询条件
         const terms = reactive({ terms: [] });
         const searchItems = ref([]); // 当前查询条件列表
+        const context = inject(SearchConfig, { align: props.align });
+        const footerStyles = computed(() => {
+            const align = context.align || props.align;
+            if (align === 'value') {
+                return { paddingLeft: `${props.labelWidth + 8}px` };
+            }
+            return {};
+        });
         provide(optionsMapKey, columnOptionMap);
         const itemValueChange = (value, index) => {
             set(terms.terms, [index], value);
@@ -159,7 +179,9 @@ const __sfc_main__ = _defineComponent({
                 emit('search', []);
             }
         };
-        handleItems();
+        watch(() => props.columns, () => {
+            handleItems();
+        }, { immediate: true, deep: true });
         return (_ctx, _cache) => {
             return (_openBlock(), _createBlock(_unref(Form), {
                 model: terms,
@@ -205,9 +227,7 @@ const __sfc_main__ = _defineComponent({
                                                 }, () => [
                                                     _createElementVNode("div", {
                                                         class: "JSearch-footer--btns",
-                                                        style: _normalizeStyle({
-                                                            paddingLeft: `${__props.labelWidth + 8}px`,
-                                                        })
+                                                        style: _normalizeStyle(footerStyles.value)
                                                     }, [
                                                         _createVNode(_unref(Button), {
                                                             type: "stroke",

package/lib/ConfigProvider/context.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.configProps = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _context = require("ant-design-vue/es/config-provider/context");
+require("@jetlinks-web/constants");
 var configProps = exports.configProps = function configProps() {
   return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _context.configProviderProps)()), {}, {
     IconConfig: {
@@ -14,6 +15,12 @@ var configProps = exports.configProps = function configProps() {
     },
     MapConfig: {
       type: Object
+    },
+    SearchConfig: {
+      type: Object
+    },
+    PermissionButtonConfig: {
+      type: Object
     }
   });
 };

package/lib/ConfigProvider/index.js

@@ -20,10 +20,15 @@ var JConfigProvider = (0, _vue.defineComponent)({
     var slots = _ref.slots;
     var _iconConfig = (0, _vue.reactive)(props.IconConfig || {});
     var _mapConfig = (0, _vue.reactive)(props.MapConfig || {});
+    var _searchConfig = (0, _vue.reactive)(props.SearchConfig || {});
+    var _PermissionButtonConfig = (0, _vue.reactive)(props.PermissionButtonConfig || {});
     (0, _vue.provide)(_constants.ComponentsEnum.Icon, _iconConfig); // 全局Icon 配置
     (0, _vue.provide)(_constants.MAPConfig, _mapConfig); // 全局地图配置
+    (0, _vue.provide)(_constants.SearchConfig, _searchConfig); // 全局搜索配置
+    (0, _vue.provide)(_constants.PermissionButtonConfig, _PermissionButtonConfig); // 权限组件
+    console.log('_PermissionButtonConfig', _PermissionButtonConfig, props.PermissionButtonConfig);
     return function () {
-      return (0, _vue.h)(_antDesignVue.ConfigProvider, (0, _objectSpread2.default)({}, (0, _lodashEs.omit)(props, ['IconConfig', 'MapConfig'])), {
+      return (0, _vue.h)(_antDesignVue.ConfigProvider, (0, _objectSpread2.default)({}, (0, _lodashEs.omit)(props, ['IconConfig', 'MapConfig', 'SearchConfig'])), {
         default: slots.default,
         renderEmpty: function renderEmpty() {
           var _slots$renderEmpty;

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

package/lib/PermissionButton/confirm.js

@@ -0,0 +1,86 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _vue = require("vue");
+var _index = require("./index");
+require("lodash");
+var confirm = function confirm(config, components) {
+  var container = document.createDocumentFragment();
+  var confirmDialogInstance = null;
+  var currentConfig = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, config), {}, {
+    visible: true
+  });
+  function destroy() {
+    if (confirmDialogInstance) {
+      // destroy
+      (0, _vue.render)(null, container);
+      confirmDialogInstance.component.update();
+      confirmDialogInstance = null;
+    }
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    var triggerCancel = args.some(function (param) {
+      return param && param.triggerCancel;
+    });
+    if (config.onCancel && triggerCancel) {
+      config.onCancel.apply(config, args);
+    }
+    for (var i = 0; i < _index.destroyFns.length; i++) {
+      var fn = _index.destroyFns[i];
+      if (fn === close) {
+        _index.destroyFns.splice(i, 1);
+        break;
+      }
+    }
+  }
+  function close() {
+    var _this = this;
+    for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+      args[_key2] = arguments[_key2];
+    }
+    currentConfig = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, currentConfig), {}, {
+      visible: false,
+      afterClose: function afterClose() {
+        if (typeof config.afterClose === 'function') {
+          config.afterClose();
+        }
+        destroy.apply(_this, args);
+      }
+    });
+    update(currentConfig);
+  }
+  function update(configUpdate) {
+    if (typeof configUpdate === 'function') {
+      currentConfig = configUpdate(currentConfig);
+    } else {
+      currentConfig = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, currentConfig), configUpdate);
+    }
+    if (confirmDialogInstance) {
+      (0, _extends2.default)(confirmDialogInstance.component.props, currentConfig);
+      confirmDialogInstance.component.update();
+    }
+  }
+  var Wrapper = function Wrapper(p) {
+    return (0, _vue.h)(components, (0, _objectSpread2.default)({}, p));
+  };
+  function render(props) {
+    var vm = (0, _vue.createVNode)(Wrapper, (0, _objectSpread2.default)({}, props));
+    vm.appContext = config.parentContext || config.appContext || vm.appContext;
+    (0, _vue.render)(vm, container);
+    return vm;
+  }
+  confirmDialogInstance = render(currentConfig);
+  _index.destroyFns.push(close);
+  return {
+    destroy: close,
+    update: update
+  };
+};
+var _default = exports.default = confirm;

package/lib/PermissionButton/index.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.destroyFns = exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
@@ -14,6 +14,8 @@ require("ant-design-vue/es");
 var _lodashEs = require("lodash");
 var _button = require("ant-design-vue/es/button/button");
 var _hooks = require("@jetlinks-web/hooks");
+var _confirm = _interopRequireDefault(require("./confirm"));
+var _constants = require("@jetlinks-web/constants");
 var _excluded = ["popConfirm", "tooltip", "hasPermission", "noPermissionTitle"];
 var definedProps = (0, _objectSpread2.default)({
   tooltip: {
@@ -33,6 +35,7 @@ var definedProps = (0, _objectSpread2.default)({
     type: String
   }
 }, (0, _lodashEs.omit)((0, _button.buttonProps)(), 'icon'));
+var destroyFns = exports.destroyFns = [];
 var PermissionButton = (0, _vue.defineComponent)({
   name: 'JPermissionButton',
   // @ts-ignore
@@ -42,6 +45,9 @@ var PermissionButton = (0, _vue.defineComponent)({
     var slots = _ref.slots;
     var _usePermission = (0, _hooks.usePermission)(props.hasPermission),
       hasPerm = _usePermission.hasPerm;
+    var context = (0, _vue.inject)(_constants.PermissionButtonConfig, {
+      components: undefined
+    });
     var permission = (0, _vue.computed)(function () {
       if (!props.hasPermission || props.hasPermission === true) {
         return true;
@@ -65,19 +71,24 @@ var PermissionButton = (0, _vue.defineComponent)({
         noPermissionTitle = props.noPermissionTitle,
         buttonProps = (0, _objectWithoutProperties2.default)(props, _excluded);
       if (popConfirm) {
+        console.log('context', context);
         buttonProps.onClick = function () {
-          _antDesignVue.Modal.confirm({
-            title: popConfirm.title,
-            content: popConfirm.content,
-            onOk: function onOk() {
-              var _popConfirm$onConfirm;
-              return (_popConfirm$onConfirm = popConfirm.onConfirm) === null || _popConfirm$onConfirm === void 0 ? void 0 : _popConfirm$onConfirm.call(popConfirm);
-            },
-            onCancel: function onCancel() {
-              var _popConfirm$onCancel;
-              (_popConfirm$onCancel = popConfirm.onCancel) === null || _popConfirm$onCancel === void 0 ? void 0 : _popConfirm$onCancel.call(popConfirm);
-            }
-          });
+          if (context.components) {
+            (0, _confirm.default)(popConfirm, context.components);
+          } else {
+            _antDesignVue.Modal.confirm({
+              title: popConfirm.title,
+              content: popConfirm.content,
+              onOk: function onOk() {
+                var _popConfirm$onConfirm;
+                return (_popConfirm$onConfirm = popConfirm.onConfirm) === null || _popConfirm$onConfirm === void 0 ? void 0 : _popConfirm$onConfirm.call(popConfirm);
+              },
+              onCancel: function onCancel() {
+                var _popConfirm$onCancel;
+                (_popConfirm$onCancel = popConfirm.onCancel) === null || _popConfirm$onCancel === void 0 ? void 0 : _popConfirm$onCancel.call(popConfirm);
+              }
+            });
+          }
         };
       }
       var button = !slots.button ? (0, _vue.h)(_antDesignVue.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, buttonProps), {}, {

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-1725970196617"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1726059570170"), 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-1725970197074"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1726059570504"), 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-1725970196374"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1726059569871"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "JSearch-item" };
 const _hoisted_2 = {
     key: 0,
@@ -277,7 +277,6 @@ const __sfc_main__ = _defineComponent({
                     value: item.column,
                 };
             });
-            console.log(props.onlyValue);
             if (!props.onlyValue) {
                 // 获取第一个值
                 const sortColumn = cloneDeep(props.columns);
@@ -317,7 +316,6 @@ const __sfc_main__ = _defineComponent({
             termsModel.value = undefined;
         };
         watch(() => props.columns, () => {
-            console.log(props.columns);
             if (props.columns) {
                 handleItem();
             }

package/lib/Search/Search.js

@@ -7,6 +7,7 @@
   "labelWidth": "props",
   "resetText": "props",
   "submitText": "props",
+  "align": "props",
   "JColumnsProps": "setup-maybe-ref",
   "SearchItemData": "setup-maybe-ref",
   "SearchProps": "setup-maybe-ref",
@@ -20,14 +21,20 @@
   "reactive": "setup-const",
   "ref": "setup-const",
   "provide": "setup-const",
+  "watch": "setup-const",
+  "computed": "setup-const",
+  "inject": "setup-const",
   "termsParamsFormat": "setup-maybe-ref",
   "SearchItem": "setup-const",
   "optionsMapKey": "setup-maybe-ref",
+  "SearchConfig": "setup-maybe-ref",
   "props": "setup-reactive-const",
   "columnOptionMap": "setup-ref",
   "emit": "setup-const",
   "terms": "setup-reactive-const",
   "searchItems": "setup-ref",
+  "context": "setup-maybe-ref",
+  "footerStyles": "setup-ref",
   "itemValueChange": "setup-const",
   "handleItems": "setup-const",
   "searchSubmit": "setup-const",
@@ -36,15 +43,16 @@
 } */
 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-1725970196510"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1726059569983"), 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';
 import { set } from 'lodash-es';
-import { reactive, ref, provide } from 'vue';
+import { reactive, ref, provide, watch, computed, inject } from 'vue';
 import { termsParamsFormat } from './util';
 import SearchItem from './Item.js';
 import { optionsMapKey } from './setting';
+import { SearchConfig } from '@jetlinks-web/constants';
 const __sfc_main__ = _defineComponent({
     ...{
         name: 'JSearch',
@@ -84,6 +92,10 @@ const __sfc_main__ = _defineComponent({
             type: String,
             default: '搜索',
         },
+        align: {
+            type: String,
+            default: 'value'
+        }
     },
     emits: ["search"],
     setup(__props, { emit: __emit }) {
@@ -93,6 +105,14 @@ const __sfc_main__ = _defineComponent({
         // 当前查询条件
         const terms = reactive({ terms: [] });
         const searchItems = ref([]); // 当前查询条件列表
+        const context = inject(SearchConfig, { align: props.align });
+        const footerStyles = computed(() => {
+            const align = context.align || props.align;
+            if (align === 'value') {
+                return { paddingLeft: `${props.labelWidth + 8}px` };
+            }
+            return {};
+        });
         provide(optionsMapKey, columnOptionMap);
         const itemValueChange = (value, index) => {
             set(terms.terms, [index], value);
@@ -159,7 +179,9 @@ const __sfc_main__ = _defineComponent({
                 emit('search', []);
             }
         };
-        handleItems();
+        watch(() => props.columns, () => {
+            handleItems();
+        }, { immediate: true, deep: true });
         return (_ctx, _cache) => {
             return (_openBlock(), _createBlock(_unref(Form), {
                 model: terms,
@@ -205,9 +227,7 @@ const __sfc_main__ = _defineComponent({
                                                 }, () => [
                                                     _createElementVNode("div", {
                                                         class: "JSearch-footer--btns",
-                                                        style: _normalizeStyle({
-                                                            paddingLeft: `${__props.labelWidth + 8}px`,
-                                                        })
+                                                        style: _normalizeStyle(footerStyles.value)
                                                     }, [
                                                         _createVNode(_unref(Button), {
                                                             type: "stroke",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetlinks-web/components",
-  "version": "2.3.9",
+  "version": "2.4.0",
   "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.3",
-    "@jetlinks-web/utils": "^1.2.1",
-    "@jetlinks-web/hooks": "^1.0.16"
+    "@jetlinks-web/hooks": "^1.0.16",
+    "@jetlinks-web/constants": "^1.0.5",
+    "@jetlinks-web/utils": "^1.2.1"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",