xrk-components 2.0.0-beta.97 → 2.0.0-beta.99

package/lib/index.css

@@ -19810,11 +19810,21 @@
           box-sizing: border-box;
 }
 .xrk-search[data-v-a1781a06] > .xrk-form {
-  display: grid;
-  grid-template-columns: repeat(var(--column-num), 1fr);
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
   gap: 10px 16px;
+  -webkit-box-align: end;
+  -webkit-align-items: flex-end;
+      -ms-flex-align: end;
+          align-items: flex-end;
+  -webkit-flex-wrap: wrap;
+      -ms-flex-wrap: wrap;
+          flex-wrap: wrap;
 }
 .xrk-search[data-v-a1781a06] > .xrk-form .xrk-form-item {
+  width: calc((100% - 16px * (var(--column-num) - 1)) / var(--column-num));
   margin-bottom: 0px;
 }
 .xrk-search[data-v-a1781a06] > .xrk-form .xrk-form-item .xrk-form-item__label {
@@ -19833,6 +19843,9 @@
 .xrk-search[data-v-a1781a06] > .xrk-form .xrk-form-item .xrk-select__caret {
   color: #161616 !important;
 }
+.xrk-search[data-v-a1781a06] > .xrk-form .xrk-form-item .xrk-input__count-inner {
+  background: transparent;
+}
 .xrk-search[data-v-a1781a06] > .xrk-form .xrk-form-item__label {
   padding-right: 6px !important;
 }
@@ -19842,8 +19855,52 @@
 .xrk-search[data-v-a1781a06] > .xrk-form .xrk-button + .xrk-button {
   margin-left: 0;
 }
+@media screen and (min-width: 1400px) and (max-width: 1500px) {
+.xrk-search[data-v-a1781a06] {
+    display: block !important;
+}
+.xrk-search[data-v-a1781a06] .xrk-form .xrk-form-item {
+    width: calc((100% - 16px * (var(--column-num) - 2)) / (var(--column-num) - 1)) !important;
+}
+.xrk-search[data-v-a1781a06] .btn-group {
+    -webkit-box-pack: start !important;
+    -webkit-justify-content: flex-start !important;
+        -ms-flex-pack: start !important;
+            justify-content: flex-start !important;
+    width: 100% !important;
+}
+}
+@media screen and (min-width: 1040px) and (max-width: 1399px) {
+.xrk-search[data-v-a1781a06] {
+    display: block !important;
+}
+.xrk-search[data-v-a1781a06] .xrk-form .xrk-form-item {
+    width: calc((100% - 16px * (var(--column-num) - 3)) / (var(--column-num) - 2)) !important;
+}
+.xrk-search[data-v-a1781a06] .btn-group {
+    -webkit-box-pack: start !important;
+    -webkit-justify-content: flex-start !important;
+        -ms-flex-pack: start !important;
+            justify-content: flex-start !important;
+    width: 100% !important;
+}
+}
+@media screen and (max-width: 1039px) {
+.xrk-search[data-v-a1781a06] {
+    display: block !important;
+}
+.xrk-search[data-v-a1781a06] .xrk-form .xrk-form-item {
+    width: calc((100% - 16px * (var(--column-num) - 4)) / (var(--column-num) - 3)) !important;
+}
+.xrk-search[data-v-a1781a06] .btn-group {
+    -webkit-box-pack: start !important;
+    -webkit-justify-content: flex-start !important;
+        -ms-flex-pack: start !important;
+            justify-content: flex-start !important;
+    width: 100% !important;
+}
+}
 .xrk-search .btn-group[data-v-a1781a06] {
-  margin-top: 24px;
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -19854,30 +19911,14 @@
           align-items: center;
   gap: 12px;
 }
-.xrk-search.xrk-search-line[data-v-a1781a06] {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-wrap: wrap;
-      -ms-flex-wrap: wrap;
-          flex-wrap: wrap;
-}
-.xrk-search.xrk-search-line[data-v-a1781a06] > .xrk-form {
-  width: calc(var(--column-len) / var(--column-num) * 100%);
-  grid-template-columns: repeat(var(--column-len), 1fr);
-  margin-right: 16px;
+.xrk-search .btn-group.fixed[data-v-a1781a06] {
+  width: 100%;
 }
-.xrk-search.xrk-search-line .btn-group[data-v-a1781a06] {
-  min-width: calc((var(--column-num) - var(--column-len)) / var(--column-num) * 100% - 16px);
-  -webkit-box-align: end;
-  -webkit-align-items: flex-end;
-      -ms-flex-align: end;
-          align-items: flex-end;
-  -webkit-box-pack: end;
-  -webkit-justify-content: flex-end;
-      -ms-flex-pack: end;
-          justify-content: flex-end;
+.xrk-search .btn-group.fixed .btn-group-right[data-v-a1781a06] {
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+      -ms-flex: 1;
+          flex: 1;
 }
 .base_text_title {
   min-height: var(--base-text-title-min-height, 54px);
@@ -20530,6 +20571,9 @@
 .base-layout-menu .main-menu[data-v-cbc34618]::-webkit-scrollbar {
   display: none; /* Chrome/Safari/Opera */
 }
+.base-layout-menu .main-menu[data-v-cbc34618] .xrk-collapse-item {
+  padding: 0 8px 0 4px;
+}
 .base-layout-menu .main-menu[data-v-cbc34618] .xrk-collapse-item__content {
   padding-bottom: 0;
 }

package/lib/index.esm.js

@@ -72567,7 +72567,7 @@ var BaseCheckboxButton = script$x;
 var BaseCheckboxGroup = script$v;
 var BaseCheckbox = script$w;
 
-var propsKey$1 = 'date-picker'; // 解决defineProps作用域问题
+var propsKey$2 = 'date-picker'; // 解决defineProps作用域问题
 var __default__$s = {
     name: 'base-date-picker'
 };
@@ -72593,7 +72593,7 @@ var script$u = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$s
         clearIcon: { type: null, required: false },
         validateEvent: { type: Boolean, required: false },
         disabledDate: { type: Function, required: false },
-        shortcuts: { type: null, required: false, default: (function () { return useGetGlobalDefaultProp(propsKey$1, 'shortcuts', []); }) },
+        shortcuts: { type: null, required: false, default: (function () { return useGetGlobalDefaultProp(propsKey$2, 'shortcuts', []); }) },
         cellClassName: { type: Function, required: false },
         teleported: { type: Boolean, required: false, default: true }
     }, emits: ["change", "visibleChange", "calendarChange", "update:modelValue"], setup: function (__props, _a) {
@@ -73126,9 +73126,9 @@ script$s.__file = "packages/base/input/input.vue";
 
 var BaseInput = script$s;
 
-var _withScopeId$4 = function (n) { return (pushScopeId("data-v-13bddb91"), n = n(), popScopeId(), n); };
+var _withScopeId$5 = function (n) { return (pushScopeId("data-v-13bddb91"), n = n(), popScopeId(), n); };
 var _hoisted_1$e = ["src"];
-var _hoisted_2$9 = /*#__PURE__*/ _withScopeId$4(function () {  return createElementVNode("svg", {
+var _hoisted_2$9 = /*#__PURE__*/ _withScopeId$5(function () {  return createElementVNode("svg", {
     xmlns: "http://www.w3.org/2000/svg",
     "xmlns:xlink": "http://www.w3.org/1999/xlink",
     fill: "none",
@@ -74249,9 +74249,13 @@ var script$k = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$i
 script$k.__scopeId = "data-v-17eda5db";
 script$k.__file = "packages/base/form/form-item.vue";
 
-var _hoisted_1$c = { class: "btn-group" };
-var _hoisted_2$8 = { class: "btn-group-left" };
-var _hoisted_3$8 = { class: "btn-group-right" };
+var _withScopeId$4 = function (n) { return (pushScopeId("data-v-a1781a06"), n = n(), popScopeId(), n); };
+var _hoisted_1$c = { class: "btn-group-left" };
+var _hoisted_2$8 = {
+    key: 0,
+    class: "btn-group-right"
+};
+var _hoisted_3$8 = /*#__PURE__*/ _withScopeId$4(function () {  return createElementVNode("div", { style: { "clear": "both" } }, null, -1 /* HOISTED */); });
 var __default__$h = {
     name: 'xrk-search'
 };
@@ -74278,9 +74282,17 @@ var script$j = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$h
         var searchBtn = computed(function () { return (__assign({ text: '搜索', show: true }, props.searchBtn)); });
         var resetBtn = computed(function () { return (__assign({ text: '重置', show: true }, props.resetBtn)); });
         var columnNum = ref(5);
-        var searchStyle = ref({
-            '--column-num': columnNum.value,
-            '--column-len': props.columns.length
+        var searchStyle = computed(function () {
+            return {
+                '--column-num': columnNum.value,
+                '--column-len': props.columns.length
+            };
+        });
+        var btnsFixed = computed(function () {
+            var _a, _b;
+            if (!((_a = props === null || props === void 0 ? void 0 : props.otherComponents) === null || _a === void 0 ? void 0 : _a.length))
+                return false;
+            return (_b = props === null || props === void 0 ? void 0 : props.otherComponents) === null || _b === void 0 ? void 0 : _b.some(function (item) { return (item === null || item === void 0 ? void 0 : item.fixed) === 'right'; });
         });
         var isExpand = ref(false);
         var getCurrentColumns = computed(function () {
@@ -74425,12 +74437,12 @@ var script$j = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$h
             handleResetClick: handleResetClick
         });
         return function (_ctx, _cache) {
-            var _a, _b;
+            var _a, _b, _c, _d, _e, _f;
             return (openBlock(), createElementBlock("div", {
                 class: normalizeClass(["xrk-search", {
-                        'xrk-search-line': ((_a = __props.columns) === null || _a === void 0 ? void 0 : _a.length) < columnNum.value
+                        'xrk-search-line': ((_a = __props.columns) === null || _a === void 0 ? void 0 : _a.length) && ((_b = __props.columns) === null || _b === void 0 ? void 0 : _b.length) < columnNum.value
                     }]),
-                style: normalizeStyle(searchStyle.value)
+                style: normalizeStyle(__assign({ marginBottom: ((_c = __props.columns) === null || _c === void 0 ? void 0 : _c.length) ? '16px' : 0 }, unref(searchStyle)))
             }, [
                 createVNode(script$b, {
                     model: searchValue,
@@ -74466,8 +74478,15 @@ var script$j = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$h
                     ]; }),
                     _: 1 /* STABLE */
                 }, 8 /* PROPS */, ["model"]),
-                createElementVNode("div", _hoisted_1$c, [
-                    createElementVNode("div", _hoisted_2$8, [
+                createElementVNode("div", {
+                    class: normalizeClass(["btn-group", {
+                            fixed: unref(btnsFixed)
+                        }]),
+                    style: normalizeStyle({
+                        marginTop: ((_d = __props.columns) === null || _d === void 0 ? void 0 : _d.length) ? '24px' : 0
+                    })
+                }, [
+                    createElementVNode("div", _hoisted_1$c, [
                         (unref(searchBtn).show)
                             ? (openBlock(), createBlock(script$F, {
                                 key: 0,
@@ -74493,7 +74512,7 @@ var script$j = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$h
                                 _: 1 /* STABLE */
                             }))
                             : createCommentVNode("v-if", true),
-                        (__props.columns && ((_b = __props.columns) === null || _b === void 0 ? void 0 : _b.length) > columnNum.value * 2)
+                        (__props.columns && ((_e = __props.columns) === null || _e === void 0 ? void 0 : _e.length) > columnNum.value * 2)
                             ? (openBlock(), createBlock(script$F, {
                                 key: 2,
                                 type: "default",
@@ -74517,16 +74536,21 @@ var script$j = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$h
                             }))
                             : createCommentVNode("v-if", true)
                     ]),
-                    createElementVNode("div", _hoisted_3$8, [
-                        (openBlock(true), createElementBlock(Fragment, null, renderList(__props.otherComponents, function (_a, index) {
-                            var render = _a.render;
-                            return (openBlock(), createBlock(unref(BaseSearchRender), {
-                                render: render,
-                                key: index
-                            }, null, 8 /* PROPS */, ["render"]));
-                        }), 128 /* KEYED_FRAGMENT */))
-                    ])
-                ])
+                    ((_f = __props.otherComponents) === null || _f === void 0 ? void 0 : _f.length)
+                        ? (openBlock(), createElementBlock("div", _hoisted_2$8, [
+                            (openBlock(true), createElementBlock(Fragment, null, renderList(__props.otherComponents, function (_a, index) {
+                                var render = _a.render, fixed = _a.fixed;
+                                return (openBlock(), createBlock(unref(BaseSearchRender), {
+                                    render: render,
+                                    key: index,
+                                    style: normalizeStyle({ float: fixed || 'none' })
+                                }, null, 8 /* PROPS */, ["render", "style"]));
+                            }), 128 /* KEYED_FRAGMENT */)),
+                            createCommentVNode(" 清除浮动 "),
+                            _hoisted_3$8
+                        ]))
+                        : createCommentVNode("v-if", true)
+                ], 6 /* CLASS, STYLE */)
             ], 6 /* CLASS, STYLE */));
         };
     } }));
@@ -76275,7 +76299,7 @@ var addParentIds = function (_a) {
     });
 };
 
-var propsKey = 'table'; // 解决defineProps作用域问题
+var propsKey$1 = 'table'; // 解决defineProps作用域问题
 var __default__$a = {
     name: 'base-table'
 };
@@ -76285,7 +76309,7 @@ var script$a = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$a
         height: { type: [String, Number], required: false, default: '100%' },
         maxHeight: { type: [String, Number], required: false },
         stripe: { type: Boolean, required: false, default: false },
-        border: { type: Boolean, required: false, default: (function () { return useGetGlobalDefaultProp(propsKey, 'border', false); }) },
+        border: { type: Boolean, required: false, default: (function () { return useGetGlobalDefaultProp(propsKey$1, 'border', true); }) },
         size: { type: String, required: false, default: 'large' },
         fit: { type: Boolean, required: false, default: true },
         rowClassName: { type: null, required: false },
@@ -76302,7 +76326,7 @@ var script$a = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$a
         emptyText: { type: String, required: false, default: '暂无数据' },
         defaultSort: { type: Object, required: false },
         useBaseClass: { type: Boolean, required: false, default: (function () {
-                return useGetGlobalDefaultProp(propsKey, 'useBaseClass', true);
+                return useGetGlobalDefaultProp(propsKey$1, 'useBaseClass', true);
             }) },
         spanMethod: { type: null, required: false },
         treeProps: { type: Object, required: false },
@@ -76392,7 +76416,7 @@ var script$a = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$a
                         : (openBlock(), createBlock(unref(BaseEmpty), { key: 1 }))
                 ]; }),
                 default: withCtx(function () { return [
-                    (openBlock(true), createElementBlock(Fragment, null, renderList(__props.columns, function (column, index) {
+                    (openBlock(true), createElementBlock(Fragment, null, renderList(__props.columns, function (column) {
                         return (openBlock(), createBlock(unref(BaseTableColumn), mergeProps({
                             key: column.prop,
                             pageAllData: __props.data,
@@ -76402,12 +76426,11 @@ var script$a = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$a
                             getSelectionRows: unref(getSelectionRows),
                             addSelectionRow: unref(addSelectionRow),
                             removeSelectionRow: unref(removeSelectionRow),
-                            clearSelectionRows: unref(clearSelectionRows),
-                            isBothEnds: !index || index === __props.columns.length - 1
+                            clearSelectionRows: unref(clearSelectionRows)
                         }, column, {
                             onSelect: handleColumnSelect,
                             onSelectAll: handleColumnSelectAll
-                        }), null, 16 /* FULL_PROPS */, ["pageAllData", "treeProps", "selectionIds", "selectionRows", "getSelectionRows", "addSelectionRow", "removeSelectionRow", "clearSelectionRows", "isBothEnds"]));
+                        }), null, 16 /* FULL_PROPS */, ["pageAllData", "treeProps", "selectionIds", "selectionRows", "getSelectionRows", "addSelectionRow", "removeSelectionRow", "clearSelectionRows"]));
                     }), 128 /* KEYED_FRAGMENT */))
                 ]; }),
                 _: 1 /* STABLE */
@@ -76419,6 +76442,7 @@ script$a.__scopeId = "data-v-968a9a5a";
 script$a.__file = "packages/base/table/table.vue";
 
 var _hoisted_1$6 = ["onClick"];
+var propsKey = 'table-column'; // 解决defineProps作用域问题
 var __default__$9 = {
     name: 'base-table-column'
 };
@@ -76442,7 +76466,6 @@ var script$9 = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$9
         className: { type: String, required: false },
         labelClassName: { type: String, required: false },
         children: { type: Array, required: false },
-        isBothEnds: { type: Boolean, required: false },
         renderHeader: { type: Function, required: false },
         renderHeaderSelectionLabel: { type: Function, required: false },
         formatter: { type: Function, required: false, default: function (_a) {
@@ -76476,9 +76499,9 @@ var script$9 = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$9
         var _selectionAllLoading = ref(false);
         var _selectionRowLoading = ref(false);
         var getAlign = computed(function () {
-            if ((props === null || props === void 0 ? void 0 : props.isBothEnds) || (props === null || props === void 0 ? void 0 : props.type))
+            if ((props === null || props === void 0 ? void 0 : props.type) || (props === null || props === void 0 ? void 0 : props.label) === '操作')
                 return (props === null || props === void 0 ? void 0 : props.align) || 'center';
-            return (props === null || props === void 0 ? void 0 : props.align) || 'left';
+            return (props === null || props === void 0 ? void 0 : props.align) || useGetGlobalDefaultProp(propsKey, 'align', 'center');
         });
         var BaseTableColumnHeaderSelectionLabelRender = defineComponent({
             name: 'table-column-header-selection-label-render',
@@ -77324,6 +77347,11 @@ var script$3 = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$3
         var menusRef = ref();
         var activeMenus = ref([]);
         var _menus = ref([]);
+        var paddingLeft = computed(function () {
+            if (props.level === 0)
+                return (props.level + 1) * 12 + 'px';
+            return (props.level + 1) * 16 + 'px';
+        });
         var checkHasChild = function (menu) {
             return Array.isArray(menu.menuList) && menu.menuList.length > 0;
         };
@@ -77378,7 +77406,7 @@ var script$3 = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$3
                                             title: withCtx(function () { return [
                                                 createElementVNode("div", {
                                                     style: normalizeStyle({
-                                                        paddingLeft: (__props.level + 1) * 12 + 'px'
+                                                        paddingLeft: unref(paddingLeft)
                                                     }),
                                                     class: normalizeClass(menuClassName),
                                                     name: menu.url,
@@ -77423,7 +77451,7 @@ var script$3 = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$3
                                             }, [
                                                 createElementVNode("div", {
                                                     style: normalizeStyle({
-                                                        paddingLeft: (__props.level + 1) * 12 + 'px'
+                                                        paddingLeft: unref(paddingLeft)
                                                     }),
                                                     class: normalizeClass(menuClassName),
                                                     name: menu.name
@@ -77897,7 +77925,6 @@ var script$1 = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$1
                 (!__props.searchConfig.hide)
                     ? (openBlock(), createBlock(script$j, {
                         key: 1,
-                        style: { "margin-bottom": "16px" },
                         ref_key: "XrkSearchRef",
                         ref: XrkSearchRef,
                         columns: __props.searchConfig.searchColumns,

package/lib/index.umd.js

@@ -72570,7 +72570,7 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
   var BaseCheckboxGroup = script$v;
   var BaseCheckbox = script$w;
 
-  var propsKey$1 = 'date-picker'; // 解决defineProps作用域问题
+  var propsKey$2 = 'date-picker'; // 解决defineProps作用域问题
   var __default__$s = {
       name: 'base-date-picker'
   };
@@ -72596,7 +72596,7 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
           clearIcon: { type: null, required: false },
           validateEvent: { type: Boolean, required: false },
           disabledDate: { type: Function, required: false },
-          shortcuts: { type: null, required: false, default: (function () { return useGetGlobalDefaultProp(propsKey$1, 'shortcuts', []); }) },
+          shortcuts: { type: null, required: false, default: (function () { return useGetGlobalDefaultProp(propsKey$2, 'shortcuts', []); }) },
           cellClassName: { type: Function, required: false },
           teleported: { type: Boolean, required: false, default: true }
       }, emits: ["change", "visibleChange", "calendarChange", "update:modelValue"], setup: function (__props, _a) {
@@ -73129,9 +73129,9 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
 
   var BaseInput = script$s;
 
-  var _withScopeId$4 = function (n) { return (vue.pushScopeId("data-v-13bddb91"), n = n(), vue.popScopeId(), n); };
+  var _withScopeId$5 = function (n) { return (vue.pushScopeId("data-v-13bddb91"), n = n(), vue.popScopeId(), n); };
   var _hoisted_1$e = ["src"];
-  var _hoisted_2$9 = /*#__PURE__*/ _withScopeId$4(function () {  return vue.createElementVNode("svg", {
+  var _hoisted_2$9 = /*#__PURE__*/ _withScopeId$5(function () {  return vue.createElementVNode("svg", {
       xmlns: "http://www.w3.org/2000/svg",
       "xmlns:xlink": "http://www.w3.org/1999/xlink",
       fill: "none",
@@ -74252,9 +74252,13 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
   script$k.__scopeId = "data-v-17eda5db";
   script$k.__file = "packages/base/form/form-item.vue";
 
-  var _hoisted_1$c = { class: "btn-group" };
-  var _hoisted_2$8 = { class: "btn-group-left" };
-  var _hoisted_3$8 = { class: "btn-group-right" };
+  var _withScopeId$4 = function (n) { return (vue.pushScopeId("data-v-a1781a06"), n = n(), vue.popScopeId(), n); };
+  var _hoisted_1$c = { class: "btn-group-left" };
+  var _hoisted_2$8 = {
+      key: 0,
+      class: "btn-group-right"
+  };
+  var _hoisted_3$8 = /*#__PURE__*/ _withScopeId$4(function () {  return vue.createElementVNode("div", { style: { "clear": "both" } }, null, -1 /* HOISTED */); });
   var __default__$h = {
       name: 'xrk-search'
   };
@@ -74281,9 +74285,17 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
           var searchBtn = vue.computed(function () { return (__assign({ text: '搜索', show: true }, props.searchBtn)); });
           var resetBtn = vue.computed(function () { return (__assign({ text: '重置', show: true }, props.resetBtn)); });
           var columnNum = vue.ref(5);
-          var searchStyle = vue.ref({
-              '--column-num': columnNum.value,
-              '--column-len': props.columns.length
+          var searchStyle = vue.computed(function () {
+              return {
+                  '--column-num': columnNum.value,
+                  '--column-len': props.columns.length
+              };
+          });
+          var btnsFixed = vue.computed(function () {
+              var _a, _b;
+              if (!((_a = props === null || props === void 0 ? void 0 : props.otherComponents) === null || _a === void 0 ? void 0 : _a.length))
+                  return false;
+              return (_b = props === null || props === void 0 ? void 0 : props.otherComponents) === null || _b === void 0 ? void 0 : _b.some(function (item) { return (item === null || item === void 0 ? void 0 : item.fixed) === 'right'; });
           });
           var isExpand = vue.ref(false);
           var getCurrentColumns = vue.computed(function () {
@@ -74428,12 +74440,12 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
               handleResetClick: handleResetClick
           });
           return function (_ctx, _cache) {
-              var _a, _b;
+              var _a, _b, _c, _d, _e, _f;
               return (vue.openBlock(), vue.createElementBlock("div", {
                   class: vue.normalizeClass(["xrk-search", {
-                          'xrk-search-line': ((_a = __props.columns) === null || _a === void 0 ? void 0 : _a.length) < columnNum.value
+                          'xrk-search-line': ((_a = __props.columns) === null || _a === void 0 ? void 0 : _a.length) && ((_b = __props.columns) === null || _b === void 0 ? void 0 : _b.length) < columnNum.value
                       }]),
-                  style: vue.normalizeStyle(searchStyle.value)
+                  style: vue.normalizeStyle(__assign({ marginBottom: ((_c = __props.columns) === null || _c === void 0 ? void 0 : _c.length) ? '16px' : 0 }, vue.unref(searchStyle)))
               }, [
                   vue.createVNode(script$b, {
                       model: searchValue,
@@ -74469,8 +74481,15 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
                       ]; }),
                       _: 1 /* STABLE */
                   }, 8 /* PROPS */, ["model"]),
-                  vue.createElementVNode("div", _hoisted_1$c, [
-                      vue.createElementVNode("div", _hoisted_2$8, [
+                  vue.createElementVNode("div", {
+                      class: vue.normalizeClass(["btn-group", {
+                              fixed: vue.unref(btnsFixed)
+                          }]),
+                      style: vue.normalizeStyle({
+                          marginTop: ((_d = __props.columns) === null || _d === void 0 ? void 0 : _d.length) ? '24px' : 0
+                      })
+                  }, [
+                      vue.createElementVNode("div", _hoisted_1$c, [
                           (vue.unref(searchBtn).show)
                               ? (vue.openBlock(), vue.createBlock(script$F, {
                                   key: 0,
@@ -74496,7 +74515,7 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
                                   _: 1 /* STABLE */
                               }))
                               : vue.createCommentVNode("v-if", true),
-                          (__props.columns && ((_b = __props.columns) === null || _b === void 0 ? void 0 : _b.length) > columnNum.value * 2)
+                          (__props.columns && ((_e = __props.columns) === null || _e === void 0 ? void 0 : _e.length) > columnNum.value * 2)
                               ? (vue.openBlock(), vue.createBlock(script$F, {
                                   key: 2,
                                   type: "default",
@@ -74520,16 +74539,21 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
                               }))
                               : vue.createCommentVNode("v-if", true)
                       ]),
-                      vue.createElementVNode("div", _hoisted_3$8, [
-                          (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(__props.otherComponents, function (_a, index) {
-                              var render = _a.render;
-                              return (vue.openBlock(), vue.createBlock(vue.unref(BaseSearchRender), {
-                                  render: render,
-                                  key: index
-                              }, null, 8 /* PROPS */, ["render"]));
-                          }), 128 /* KEYED_FRAGMENT */))
-                      ])
-                  ])
+                      ((_f = __props.otherComponents) === null || _f === void 0 ? void 0 : _f.length)
+                          ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_2$8, [
+                              (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(__props.otherComponents, function (_a, index) {
+                                  var render = _a.render, fixed = _a.fixed;
+                                  return (vue.openBlock(), vue.createBlock(vue.unref(BaseSearchRender), {
+                                      render: render,
+                                      key: index,
+                                      style: vue.normalizeStyle({ float: fixed || 'none' })
+                                  }, null, 8 /* PROPS */, ["render", "style"]));
+                              }), 128 /* KEYED_FRAGMENT */)),
+                              vue.createCommentVNode(" 清除浮动 "),
+                              _hoisted_3$8
+                          ]))
+                          : vue.createCommentVNode("v-if", true)
+                  ], 6 /* CLASS, STYLE */)
               ], 6 /* CLASS, STYLE */));
           };
       } }));
@@ -76278,7 +76302,7 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
       });
   };
 
-  var propsKey = 'table'; // 解决defineProps作用域问题
+  var propsKey$1 = 'table'; // 解决defineProps作用域问题
   var __default__$a = {
       name: 'base-table'
   };
@@ -76288,7 +76312,7 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
           height: { type: [String, Number], required: false, default: '100%' },
           maxHeight: { type: [String, Number], required: false },
           stripe: { type: Boolean, required: false, default: false },
-          border: { type: Boolean, required: false, default: (function () { return useGetGlobalDefaultProp(propsKey, 'border', false); }) },
+          border: { type: Boolean, required: false, default: (function () { return useGetGlobalDefaultProp(propsKey$1, 'border', true); }) },
           size: { type: String, required: false, default: 'large' },
           fit: { type: Boolean, required: false, default: true },
           rowClassName: { type: null, required: false },
@@ -76305,7 +76329,7 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
           emptyText: { type: String, required: false, default: '暂无数据' },
           defaultSort: { type: Object, required: false },
           useBaseClass: { type: Boolean, required: false, default: (function () {
-                  return useGetGlobalDefaultProp(propsKey, 'useBaseClass', true);
+                  return useGetGlobalDefaultProp(propsKey$1, 'useBaseClass', true);
               }) },
           spanMethod: { type: null, required: false },
           treeProps: { type: Object, required: false },
@@ -76395,7 +76419,7 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
                           : (vue.openBlock(), vue.createBlock(vue.unref(BaseEmpty), { key: 1 }))
                   ]; }),
                   default: vue.withCtx(function () { return [
-                      (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(__props.columns, function (column, index) {
+                      (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(__props.columns, function (column) {
                           return (vue.openBlock(), vue.createBlock(vue.unref(BaseTableColumn), vue.mergeProps({
                               key: column.prop,
                               pageAllData: __props.data,
@@ -76405,12 +76429,11 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
                               getSelectionRows: vue.unref(getSelectionRows),
                               addSelectionRow: vue.unref(addSelectionRow),
                               removeSelectionRow: vue.unref(removeSelectionRow),
-                              clearSelectionRows: vue.unref(clearSelectionRows),
-                              isBothEnds: !index || index === __props.columns.length - 1
+                              clearSelectionRows: vue.unref(clearSelectionRows)
                           }, column, {
                               onSelect: handleColumnSelect,
                               onSelectAll: handleColumnSelectAll
-                          }), null, 16 /* FULL_PROPS */, ["pageAllData", "treeProps", "selectionIds", "selectionRows", "getSelectionRows", "addSelectionRow", "removeSelectionRow", "clearSelectionRows", "isBothEnds"]));
+                          }), null, 16 /* FULL_PROPS */, ["pageAllData", "treeProps", "selectionIds", "selectionRows", "getSelectionRows", "addSelectionRow", "removeSelectionRow", "clearSelectionRows"]));
                       }), 128 /* KEYED_FRAGMENT */))
                   ]; }),
                   _: 1 /* STABLE */
@@ -76422,6 +76445,7 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
   script$a.__file = "packages/base/table/table.vue";
 
   var _hoisted_1$6 = ["onClick"];
+  var propsKey = 'table-column'; // 解决defineProps作用域问题
   var __default__$9 = {
       name: 'base-table-column'
   };
@@ -76445,7 +76469,6 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
           className: { type: String, required: false },
           labelClassName: { type: String, required: false },
           children: { type: Array, required: false },
-          isBothEnds: { type: Boolean, required: false },
           renderHeader: { type: Function, required: false },
           renderHeaderSelectionLabel: { type: Function, required: false },
           formatter: { type: Function, required: false, default: function (_a) {
@@ -76479,9 +76502,9 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
           var _selectionAllLoading = vue.ref(false);
           var _selectionRowLoading = vue.ref(false);
           var getAlign = vue.computed(function () {
-              if ((props === null || props === void 0 ? void 0 : props.isBothEnds) || (props === null || props === void 0 ? void 0 : props.type))
+              if ((props === null || props === void 0 ? void 0 : props.type) || (props === null || props === void 0 ? void 0 : props.label) === '操作')
                   return (props === null || props === void 0 ? void 0 : props.align) || 'center';
-              return (props === null || props === void 0 ? void 0 : props.align) || 'left';
+              return (props === null || props === void 0 ? void 0 : props.align) || useGetGlobalDefaultProp(propsKey, 'align', 'center');
           });
           var BaseTableColumnHeaderSelectionLabelRender = vue.defineComponent({
               name: 'table-column-header-selection-label-render',
@@ -77327,6 +77350,11 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
           var menusRef = vue.ref();
           var activeMenus = vue.ref([]);
           var _menus = vue.ref([]);
+          var paddingLeft = vue.computed(function () {
+              if (props.level === 0)
+                  return (props.level + 1) * 12 + 'px';
+              return (props.level + 1) * 16 + 'px';
+          });
           var checkHasChild = function (menu) {
               return Array.isArray(menu.menuList) && menu.menuList.length > 0;
           };
@@ -77381,7 +77409,7 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
                                               title: vue.withCtx(function () { return [
                                                   vue.createElementVNode("div", {
                                                       style: vue.normalizeStyle({
-                                                          paddingLeft: (__props.level + 1) * 12 + 'px'
+                                                          paddingLeft: vue.unref(paddingLeft)
                                                       }),
                                                       class: vue.normalizeClass(menuClassName),
                                                       name: menu.url,
@@ -77426,7 +77454,7 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
                                               }, [
                                                   vue.createElementVNode("div", {
                                                       style: vue.normalizeStyle({
-                                                          paddingLeft: (__props.level + 1) * 12 + 'px'
+                                                          paddingLeft: vue.unref(paddingLeft)
                                                       }),
                                                       class: vue.normalizeClass(menuClassName),
                                                       name: menu.name
@@ -77900,7 +77928,6 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
                   (!__props.searchConfig.hide)
                       ? (vue.openBlock(), vue.createBlock(script$j, {
                           key: 1,
-                          style: { "margin-bottom": "16px" },
                           ref_key: "XrkSearchRef",
                           ref: XrkSearchRef,
                           columns: __props.searchConfig.searchColumns,

package/lib/packages/base/table/table-column.d.ts

@@ -76,10 +76,6 @@ declare const _default: import("vue").DefineComponent<{
         type: ArrayConstructor;
         required: false;
     };
-    isBothEnds: {
-        type: BooleanConstructor;
-        required: false;
-    };
     renderHeader: {
         type: FunctionConstructor;
         required: false;
@@ -235,10 +231,6 @@ declare const _default: import("vue").DefineComponent<{
         type: ArrayConstructor;
         required: false;
     };
-    isBothEnds: {
-        type: BooleanConstructor;
-        required: false;
-    };
     renderHeader: {
         type: FunctionConstructor;
         required: false;
@@ -319,7 +311,6 @@ declare const _default: import("vue").DefineComponent<{
     "onSelect-all"?: ((...args: any[]) => any) | undefined;
 }, {
     showOverflowTooltip: boolean;
-    isBothEnds: boolean;
     formatter: Function;
 }>;
 export default _default;

package/lib/packages/base/table/types/type.d.ts

@@ -150,7 +150,6 @@ export declare type BaseTableColumnProps<T extends Record<string, any> = any> =
     className?: string;
     labelClassName?: string;
     children?: Array<BaseTableColumnProps<T>>;
-    isBothEnds?: boolean;
     /**
      * 自定义列头
      */

package/lib/packages/xrk/search/types/type.d.ts

@@ -111,6 +111,7 @@ export declare type ResetBtnType<T extends Record<string, any> = any> = {
     afterReset?: (searchValue: T) => void | T | Promise<T>;
 };
 export interface ComponentRender<Q extends Record<string, any> = any> {
+    fixed?: 'left' | 'right';
     render: (renderInfo: {
         columns: Array<SearchColumnType<Q>>;
         searchValue: Q;

package/lib/packages/xrk/table/index.d.ts

@@ -32,7 +32,11 @@ export declare type XrkTableRef<S extends Record<string, any> = any, T extends R
     /**
      * 刷新当前页，可传入自定义参数（只会作用与这次列表获取，相同变量会被search组件设置的值覆盖）
      */
-    initCurrentList: (customQuery?: S) => Promise<void>;
+    initCurrentList: (customQuery?: S, config?: {
+        noToTop?: boolean;
+        noScroll?: boolean;
+        noChange?: boolean;
+    }) => Promise<void>;
     /**
      * 回到第一页，并刷新列表，可传入自定义参数（只会作用与这次列表获取，相同变量会被search组件设置的值覆盖）
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xrk-components",
-  "version": "2.0.0-beta.97",
+  "version": "2.0.0-beta.99",
   "description": "",
   "main": "lib/index.esm.js",
   "typings": "lib/packages/index.d.ts",