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

package/lib/index.css

@@ -19813,6 +19813,10 @@
   display: grid;
   grid-template-columns: repeat(var(--column-num), 1fr);
   gap: 10px 16px;
+  -webkit-box-align: end;
+  -webkit-align-items: flex-end;
+      -ms-flex-align: end;
+          align-items: flex-end;
 }
 .xrk-search[data-v-a1781a06] > .xrk-form .xrk-form-item {
   margin-bottom: 0px;
@@ -19833,6 +19837,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;
 }
@@ -19843,7 +19850,6 @@
   margin-left: 0;
 }
 .xrk-search .btn-group[data-v-a1781a06] {
-  margin-top: 24px;
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -20530,6 +20536,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

@@ -71495,7 +71495,7 @@ script$F.__file = "packages/base/button/button.vue";
 
 var _hoisted_1$i = /*#__PURE__*/ createTextVNode("更多");
 var _hoisted_2$b = { class: "btn-group" };
-var _hoisted_3$a = ["onClick"];
+var _hoisted_3$9 = ["onClick"];
 var __default__$C = {
     name: 'base-button-more'
 };
@@ -71614,7 +71614,7 @@ var script$E = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$C
                                             (_b = (_a = popoverRef.value) === null || _a === void 0 ? void 0 : _a.hide) === null || _b === void 0 ? void 0 : _b.call(_a);
                                             (_c = (btn.onClick || btn.click)) === null || _c === void 0 ? void 0 : _c();
                                         }
-                                    }, toDisplayString(btn.content), 11 /* TEXT, CLASS, PROPS */, _hoisted_3$a));
+                                    }, toDisplayString(btn.content), 11 /* TEXT, CLASS, PROPS */, _hoisted_3$9));
                                 }), 128 /* KEYED_FRAGMENT */))
                             ])
                         ]; }),
@@ -71830,7 +71830,7 @@ var _hoisted_2$a = {
     key: 0,
     style: { "position": "absolute", "width": "100%", "height": "100%", "left": "0", "top": "0" }
 };
-var _hoisted_3$9 = {
+var _hoisted_3$8 = {
     key: 0,
     style: { "position": "absolute", "width": "100%", "height": "100%", "left": "0", "top": "0" }
 };
@@ -72074,7 +72074,7 @@ var script$C = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$A
                                         var _a;
                                         return [
                                             ((_a = unref(slots)) === null || _a === void 0 ? void 0 : _a.default)
-                                                ? (openBlock(), createElementBlock("div", _hoisted_3$9, [
+                                                ? (openBlock(), createElementBlock("div", _hoisted_3$8, [
                                                     renderSlot(_ctx.$slots, "default", {
                                                         slotScope: { activeIndex: activeIndex.value }
                                                     })
@@ -74249,9 +74249,8 @@ 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 _hoisted_1$c = { class: "btn-group-left" };
+var _hoisted_2$8 = { class: "btn-group-right" };
 var __default__$h = {
     name: 'xrk-search'
 };
@@ -74278,9 +74277,11 @@ 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 isExpand = ref(false);
         var getCurrentColumns = computed(function () {
@@ -74425,12 +74426,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;
             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 +74467,11 @@ 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: "btn-group",
+                    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 +74497,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,7 +74521,7 @@ var script$j = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$h
                             }))
                             : createCommentVNode("v-if", true)
                     ]),
-                    createElementVNode("div", _hoisted_3$8, [
+                    createElementVNode("div", _hoisted_2$8, [
                         (openBlock(true), createElementBlock(Fragment, null, renderList(__props.otherComponents, function (_a, index) {
                             var render = _a.render;
                             return (openBlock(), createBlock(unref(BaseSearchRender), {
@@ -74526,7 +74530,7 @@ var script$j = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$h
                             }, null, 8 /* PROPS */, ["render"]));
                         }), 128 /* KEYED_FRAGMENT */))
                     ])
-                ])
+                ], 4 /* STYLE */)
             ], 6 /* CLASS, STYLE */));
         };
     } }));
@@ -77324,6 +77328,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 +77387,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 +77432,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 +77906,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

@@ -71498,7 +71498,7 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
 
   var _hoisted_1$i = /*#__PURE__*/ vue.createTextVNode("更多");
   var _hoisted_2$b = { class: "btn-group" };
-  var _hoisted_3$a = ["onClick"];
+  var _hoisted_3$9 = ["onClick"];
   var __default__$C = {
       name: 'base-button-more'
   };
@@ -71617,7 +71617,7 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
                                               (_b = (_a = popoverRef.value) === null || _a === void 0 ? void 0 : _a.hide) === null || _b === void 0 ? void 0 : _b.call(_a);
                                               (_c = (btn.onClick || btn.click)) === null || _c === void 0 ? void 0 : _c();
                                           }
-                                      }, vue.toDisplayString(btn.content), 11 /* TEXT, CLASS, PROPS */, _hoisted_3$a));
+                                      }, vue.toDisplayString(btn.content), 11 /* TEXT, CLASS, PROPS */, _hoisted_3$9));
                                   }), 128 /* KEYED_FRAGMENT */))
                               ])
                           ]; }),
@@ -71833,7 +71833,7 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
       key: 0,
       style: { "position": "absolute", "width": "100%", "height": "100%", "left": "0", "top": "0" }
   };
-  var _hoisted_3$9 = {
+  var _hoisted_3$8 = {
       key: 0,
       style: { "position": "absolute", "width": "100%", "height": "100%", "left": "0", "top": "0" }
   };
@@ -72077,7 +72077,7 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
                                           var _a;
                                           return [
                                               ((_a = vue.unref(slots)) === null || _a === void 0 ? void 0 : _a.default)
-                                                  ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_3$9, [
+                                                  ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_3$8, [
                                                       vue.renderSlot(_ctx.$slots, "default", {
                                                           slotScope: { activeIndex: activeIndex.value }
                                                       })
@@ -74252,9 +74252,8 @@ 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 _hoisted_1$c = { class: "btn-group-left" };
+  var _hoisted_2$8 = { class: "btn-group-right" };
   var __default__$h = {
       name: 'xrk-search'
   };
@@ -74281,9 +74280,11 @@ 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 isExpand = vue.ref(false);
           var getCurrentColumns = vue.computed(function () {
@@ -74428,12 +74429,12 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
               handleResetClick: handleResetClick
           });
           return function (_ctx, _cache) {
-              var _a, _b;
+              var _a, _b, _c, _d, _e;
               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 +74470,11 @@ 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: "btn-group",
+                      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 +74500,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,7 +74524,7 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
                               }))
                               : vue.createCommentVNode("v-if", true)
                       ]),
-                      vue.createElementVNode("div", _hoisted_3$8, [
+                      vue.createElementVNode("div", _hoisted_2$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), {
@@ -74529,7 +74533,7 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
                               }, null, 8 /* PROPS */, ["render"]));
                           }), 128 /* KEYED_FRAGMENT */))
                       ])
-                  ])
+                  ], 4 /* STYLE */)
               ], 6 /* CLASS, STYLE */));
           };
       } }));
@@ -77327,6 +77331,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 +77390,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 +77435,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 +77909,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/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.98",
   "description": "",
   "main": "lib/index.esm.js",
   "typings": "lib/packages/index.d.ts",