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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/lib/index.css +36 -10
  2. package/lib/index.esm.js +53 -29
  3. package/lib/index.umd.js +53 -29
  4. package/lib/packages/xrk/table/index.d.ts +5 -1
  5. package/package.json +1 -1
package/lib/index.css CHANGED
@@ -19811,8 +19811,12 @@
19811
19811
  }
19812
19812
  .xrk-search[data-v-a1781a06] > .xrk-form {
19813
19813
  display: grid;
19814
- grid-template-columns: repeat(4, 1fr);
19814
+ grid-template-columns: repeat(var(--column-num), 1fr);
19815
19815
  gap: 10px 16px;
19816
+ -webkit-box-align: end;
19817
+ -webkit-align-items: flex-end;
19818
+ -ms-flex-align: end;
19819
+ align-items: flex-end;
19816
19820
  }
19817
19821
  .xrk-search[data-v-a1781a06] > .xrk-form .xrk-form-item {
19818
19822
  margin-bottom: 0px;
@@ -19833,6 +19837,9 @@
19833
19837
  .xrk-search[data-v-a1781a06] > .xrk-form .xrk-form-item .xrk-select__caret {
19834
19838
  color: #161616 !important;
19835
19839
  }
19840
+ .xrk-search[data-v-a1781a06] > .xrk-form .xrk-form-item .xrk-input__count-inner {
19841
+ background: transparent;
19842
+ }
19836
19843
  .xrk-search[data-v-a1781a06] > .xrk-form .xrk-form-item__label {
19837
19844
  padding-right: 6px !important;
19838
19845
  }
@@ -19843,7 +19850,6 @@
19843
19850
  margin-left: 0;
19844
19851
  }
19845
19852
  .xrk-search .btn-group[data-v-a1781a06] {
19846
- margin-top: 24px;
19847
19853
  display: -webkit-box;
19848
19854
  display: -webkit-flex;
19849
19855
  display: -ms-flexbox;
@@ -19852,15 +19858,32 @@
19852
19858
  -webkit-align-items: center;
19853
19859
  -ms-flex-align: center;
19854
19860
  align-items: center;
19855
- -webkit-box-pack: justify;
19856
- -webkit-justify-content: space-between;
19857
- -ms-flex-pack: justify;
19858
- justify-content: space-between;
19861
+ gap: 12px;
19859
19862
  }
19860
- .xrk-search .btn-group .btn-group-left[data-v-a1781a06] {
19861
- -webkit-flex-shrink: 0;
19862
- -ms-flex-negative: 0;
19863
- flex-shrink: 0;
19863
+ .xrk-search.xrk-search-line[data-v-a1781a06] {
19864
+ display: -webkit-box;
19865
+ display: -webkit-flex;
19866
+ display: -ms-flexbox;
19867
+ display: flex;
19868
+ -webkit-flex-wrap: wrap;
19869
+ -ms-flex-wrap: wrap;
19870
+ flex-wrap: wrap;
19871
+ }
19872
+ .xrk-search.xrk-search-line[data-v-a1781a06] > .xrk-form {
19873
+ width: calc(var(--column-len) / var(--column-num) * 100%);
19874
+ grid-template-columns: repeat(var(--column-len), 1fr);
19875
+ margin-right: 16px;
19876
+ }
19877
+ .xrk-search.xrk-search-line .btn-group[data-v-a1781a06] {
19878
+ min-width: calc((var(--column-num) - var(--column-len)) / var(--column-num) * 100% - 16px);
19879
+ -webkit-box-align: end;
19880
+ -webkit-align-items: flex-end;
19881
+ -ms-flex-align: end;
19882
+ align-items: flex-end;
19883
+ -webkit-box-pack: end;
19884
+ -webkit-justify-content: flex-end;
19885
+ -ms-flex-pack: end;
19886
+ justify-content: flex-end;
19864
19887
  }
19865
19888
  .base_text_title {
19866
19889
  min-height: var(--base-text-title-min-height, 54px);
@@ -20513,6 +20536,9 @@
20513
20536
  .base-layout-menu .main-menu[data-v-cbc34618]::-webkit-scrollbar {
20514
20537
  display: none; /* Chrome/Safari/Opera */
20515
20538
  }
20539
+ .base-layout-menu .main-menu[data-v-cbc34618] .xrk-collapse-item {
20540
+ padding: 0 8px 0 4px;
20541
+ }
20516
20542
  .base-layout-menu .main-menu[data-v-cbc34618] .xrk-collapse-item__content {
20517
20543
  padding-bottom: 0;
20518
20544
  }
package/lib/index.esm.js CHANGED
@@ -71495,7 +71495,7 @@ script$F.__file = "packages/base/button/button.vue";
71495
71495
 
71496
71496
  var _hoisted_1$i = /*#__PURE__*/ createTextVNode("更多");
71497
71497
  var _hoisted_2$b = { class: "btn-group" };
71498
- var _hoisted_3$a = ["onClick"];
71498
+ var _hoisted_3$9 = ["onClick"];
71499
71499
  var __default__$C = {
71500
71500
  name: 'base-button-more'
71501
71501
  };
@@ -71614,7 +71614,7 @@ var script$E = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$C
71614
71614
  (_b = (_a = popoverRef.value) === null || _a === void 0 ? void 0 : _a.hide) === null || _b === void 0 ? void 0 : _b.call(_a);
71615
71615
  (_c = (btn.onClick || btn.click)) === null || _c === void 0 ? void 0 : _c();
71616
71616
  }
71617
- }, toDisplayString(btn.content), 11 /* TEXT, CLASS, PROPS */, _hoisted_3$a));
71617
+ }, toDisplayString(btn.content), 11 /* TEXT, CLASS, PROPS */, _hoisted_3$9));
71618
71618
  }), 128 /* KEYED_FRAGMENT */))
71619
71619
  ])
71620
71620
  ]; }),
@@ -71830,7 +71830,7 @@ var _hoisted_2$a = {
71830
71830
  key: 0,
71831
71831
  style: { "position": "absolute", "width": "100%", "height": "100%", "left": "0", "top": "0" }
71832
71832
  };
71833
- var _hoisted_3$9 = {
71833
+ var _hoisted_3$8 = {
71834
71834
  key: 0,
71835
71835
  style: { "position": "absolute", "width": "100%", "height": "100%", "left": "0", "top": "0" }
71836
71836
  };
@@ -72074,7 +72074,7 @@ var script$C = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$A
72074
72074
  var _a;
72075
72075
  return [
72076
72076
  ((_a = unref(slots)) === null || _a === void 0 ? void 0 : _a.default)
72077
- ? (openBlock(), createElementBlock("div", _hoisted_3$9, [
72077
+ ? (openBlock(), createElementBlock("div", _hoisted_3$8, [
72078
72078
  renderSlot(_ctx.$slots, "default", {
72079
72079
  slotScope: { activeIndex: activeIndex.value }
72080
72080
  })
@@ -74249,9 +74249,8 @@ var script$k = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$i
74249
74249
  script$k.__scopeId = "data-v-17eda5db";
74250
74250
  script$k.__file = "packages/base/form/form-item.vue";
74251
74251
 
74252
- var _hoisted_1$c = { class: "xrk-search" };
74253
- var _hoisted_2$8 = { class: "btn-group" };
74254
- var _hoisted_3$8 = { class: "btn-group-left" };
74252
+ var _hoisted_1$c = { class: "btn-group-left" };
74253
+ var _hoisted_2$8 = { class: "btn-group-right" };
74255
74254
  var __default__$h = {
74256
74255
  name: 'xrk-search'
74257
74256
  };
@@ -74277,6 +74276,13 @@ var script$j = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$h
74277
74276
  var searchFormRef = ref();
74278
74277
  var searchBtn = computed(function () { return (__assign({ text: '搜索', show: true }, props.searchBtn)); });
74279
74278
  var resetBtn = computed(function () { return (__assign({ text: '重置', show: true }, props.resetBtn)); });
74279
+ var columnNum = ref(5);
74280
+ var searchStyle = computed(function () {
74281
+ return {
74282
+ '--column-num': columnNum.value,
74283
+ '--column-len': props.columns.length
74284
+ };
74285
+ });
74280
74286
  var isExpand = ref(false);
74281
74287
  var getCurrentColumns = computed(function () {
74282
74288
  var _a;
@@ -74284,7 +74290,7 @@ var script$j = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$h
74284
74290
  return props === null || props === void 0 ? void 0 : props.columns;
74285
74291
  }
74286
74292
  else {
74287
- return (_a = props === null || props === void 0 ? void 0 : props.columns) === null || _a === void 0 ? void 0 : _a.slice(0, 8);
74293
+ return (_a = props === null || props === void 0 ? void 0 : props.columns) === null || _a === void 0 ? void 0 : _a.slice(0, columnNum.value * 2);
74288
74294
  }
74289
74295
  });
74290
74296
  var _getPleaseText = function (type) {
@@ -74420,8 +74426,13 @@ var script$j = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$h
74420
74426
  handleResetClick: handleResetClick
74421
74427
  });
74422
74428
  return function (_ctx, _cache) {
74423
- var _a;
74424
- return (openBlock(), createElementBlock("div", _hoisted_1$c, [
74429
+ var _a, _b, _c, _d, _e;
74430
+ return (openBlock(), createElementBlock("div", {
74431
+ class: normalizeClass(["xrk-search", {
74432
+ '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
74433
+ }]),
74434
+ style: normalizeStyle(__assign({ marginBottom: ((_c = __props.columns) === null || _c === void 0 ? void 0 : _c.length) ? '16px' : 0 }, unref(searchStyle)))
74435
+ }, [
74425
74436
  createVNode(script$b, {
74426
74437
  model: searchValue,
74427
74438
  ref_key: "searchFormRef",
@@ -74456,8 +74467,11 @@ var script$j = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$h
74456
74467
  ]; }),
74457
74468
  _: 1 /* STABLE */
74458
74469
  }, 8 /* PROPS */, ["model"]),
74459
- createElementVNode("div", _hoisted_2$8, [
74460
- createElementVNode("div", _hoisted_3$8, [
74470
+ createElementVNode("div", {
74471
+ class: "btn-group",
74472
+ style: normalizeStyle({ marginTop: ((_d = __props.columns) === null || _d === void 0 ? void 0 : _d.length) ? '24px' : 0 })
74473
+ }, [
74474
+ createElementVNode("div", _hoisted_1$c, [
74461
74475
  (unref(searchBtn).show)
74462
74476
  ? (openBlock(), createBlock(script$F, {
74463
74477
  key: 0,
@@ -74483,7 +74497,7 @@ var script$j = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$h
74483
74497
  _: 1 /* STABLE */
74484
74498
  }))
74485
74499
  : createCommentVNode("v-if", true),
74486
- (__props.columns && ((_a = __props.columns) === null || _a === void 0 ? void 0 : _a.length) >= 8)
74500
+ (__props.columns && ((_e = __props.columns) === null || _e === void 0 ? void 0 : _e.length) > columnNum.value * 2)
74487
74501
  ? (openBlock(), createBlock(script$F, {
74488
74502
  key: 2,
74489
74503
  type: "default",
@@ -74507,15 +74521,17 @@ var script$j = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$h
74507
74521
  }))
74508
74522
  : createCommentVNode("v-if", true)
74509
74523
  ]),
74510
- (openBlock(true), createElementBlock(Fragment, null, renderList(__props.otherComponents, function (_a, index) {
74511
- var render = _a.render;
74512
- return (openBlock(), createBlock(unref(BaseSearchRender), {
74513
- render: render,
74514
- key: index
74515
- }, null, 8 /* PROPS */, ["render"]));
74516
- }), 128 /* KEYED_FRAGMENT */))
74517
- ])
74518
- ]));
74524
+ createElementVNode("div", _hoisted_2$8, [
74525
+ (openBlock(true), createElementBlock(Fragment, null, renderList(__props.otherComponents, function (_a, index) {
74526
+ var render = _a.render;
74527
+ return (openBlock(), createBlock(unref(BaseSearchRender), {
74528
+ render: render,
74529
+ key: index
74530
+ }, null, 8 /* PROPS */, ["render"]));
74531
+ }), 128 /* KEYED_FRAGMENT */))
74532
+ ])
74533
+ ], 4 /* STYLE */)
74534
+ ], 6 /* CLASS, STYLE */));
74519
74535
  };
74520
74536
  } }));
74521
74537
 
@@ -76464,7 +76480,7 @@ var script$9 = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$9
76464
76480
  var _selectionAllLoading = ref(false);
76465
76481
  var _selectionRowLoading = ref(false);
76466
76482
  var getAlign = computed(function () {
76467
- if (props === null || props === void 0 ? void 0 : props.isBothEnds)
76483
+ if ((props === null || props === void 0 ? void 0 : props.isBothEnds) || (props === null || props === void 0 ? void 0 : props.type))
76468
76484
  return (props === null || props === void 0 ? void 0 : props.align) || 'center';
76469
76485
  return (props === null || props === void 0 ? void 0 : props.align) || 'left';
76470
76486
  });
@@ -77312,6 +77328,11 @@ var script$3 = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$3
77312
77328
  var menusRef = ref();
77313
77329
  var activeMenus = ref([]);
77314
77330
  var _menus = ref([]);
77331
+ var paddingLeft = computed(function () {
77332
+ if (props.level === 0)
77333
+ return (props.level + 1) * 12 + 'px';
77334
+ return (props.level + 1) * 16 + 'px';
77335
+ });
77315
77336
  var checkHasChild = function (menu) {
77316
77337
  return Array.isArray(menu.menuList) && menu.menuList.length > 0;
77317
77338
  };
@@ -77366,7 +77387,7 @@ var script$3 = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$3
77366
77387
  title: withCtx(function () { return [
77367
77388
  createElementVNode("div", {
77368
77389
  style: normalizeStyle({
77369
- paddingLeft: (__props.level + 1) * 12 + 'px'
77390
+ paddingLeft: unref(paddingLeft)
77370
77391
  }),
77371
77392
  class: normalizeClass(menuClassName),
77372
77393
  name: menu.url,
@@ -77411,7 +77432,7 @@ var script$3 = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$3
77411
77432
  }, [
77412
77433
  createElementVNode("div", {
77413
77434
  style: normalizeStyle({
77414
- paddingLeft: (__props.level + 1) * 12 + 'px'
77435
+ paddingLeft: unref(paddingLeft)
77415
77436
  }),
77416
77437
  class: normalizeClass(menuClassName),
77417
77438
  name: menu.name
@@ -77830,7 +77851,7 @@ var script$1 = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$1
77830
77851
  clearSearchValues: function () { var _a, _b; return (_b = (_a = XrkSearchRef.value) === null || _a === void 0 ? void 0 : _a.clearSearchValues) === null || _b === void 0 ? void 0 : _b.call(_a); },
77831
77852
  setSearchValue: function (key, value) { var _a, _b; return (_b = (_a = XrkSearchRef.value) === null || _a === void 0 ? void 0 : _a.setSearchValue) === null || _b === void 0 ? void 0 : _b.call(_a, key, value); },
77832
77853
  getSearchValue: function () { var _a, _b; return (_b = (_a = XrkSearchRef.value) === null || _a === void 0 ? void 0 : _a.getSearchValue) === null || _b === void 0 ? void 0 : _b.call(_a); },
77833
- initCurrentList: function (customQuery) { return __awaiter(_this, void 0, void 0, function () {
77854
+ initCurrentList: function (customQuery, config) { return __awaiter(_this, void 0, void 0, function () {
77834
77855
  return __generator(this, function (_a) {
77835
77856
  switch (_a.label) {
77836
77857
  case 0:
@@ -77838,8 +77859,12 @@ var script$1 = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$1
77838
77859
  return [4 /*yield*/, (getList === null || getList === void 0 ? void 0 : getList(__assign(__assign({}, (customQuery || {})), query.value)))];
77839
77860
  case 1:
77840
77861
  _a.sent();
77841
- tableToTop();
77842
- checkTableNeedScroll();
77862
+ if (!(config === null || config === void 0 ? void 0 : config.noChange)) {
77863
+ if (!(config === null || config === void 0 ? void 0 : config.noToTop))
77864
+ tableToTop();
77865
+ if (!(config === null || config === void 0 ? void 0 : config.noScroll))
77866
+ checkTableNeedScroll();
77867
+ }
77843
77868
  return [2 /*return*/];
77844
77869
  }
77845
77870
  });
@@ -77881,7 +77906,6 @@ var script$1 = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$1
77881
77906
  (!__props.searchConfig.hide)
77882
77907
  ? (openBlock(), createBlock(script$j, {
77883
77908
  key: 1,
77884
- style: { "margin-bottom": "16px" },
77885
77909
  ref_key: "XrkSearchRef",
77886
77910
  ref: XrkSearchRef,
77887
77911
  columns: __props.searchConfig.searchColumns,
package/lib/index.umd.js CHANGED
@@ -71498,7 +71498,7 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
71498
71498
 
71499
71499
  var _hoisted_1$i = /*#__PURE__*/ vue.createTextVNode("更多");
71500
71500
  var _hoisted_2$b = { class: "btn-group" };
71501
- var _hoisted_3$a = ["onClick"];
71501
+ var _hoisted_3$9 = ["onClick"];
71502
71502
  var __default__$C = {
71503
71503
  name: 'base-button-more'
71504
71504
  };
@@ -71617,7 +71617,7 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
71617
71617
  (_b = (_a = popoverRef.value) === null || _a === void 0 ? void 0 : _a.hide) === null || _b === void 0 ? void 0 : _b.call(_a);
71618
71618
  (_c = (btn.onClick || btn.click)) === null || _c === void 0 ? void 0 : _c();
71619
71619
  }
71620
- }, vue.toDisplayString(btn.content), 11 /* TEXT, CLASS, PROPS */, _hoisted_3$a));
71620
+ }, vue.toDisplayString(btn.content), 11 /* TEXT, CLASS, PROPS */, _hoisted_3$9));
71621
71621
  }), 128 /* KEYED_FRAGMENT */))
71622
71622
  ])
71623
71623
  ]; }),
@@ -71833,7 +71833,7 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
71833
71833
  key: 0,
71834
71834
  style: { "position": "absolute", "width": "100%", "height": "100%", "left": "0", "top": "0" }
71835
71835
  };
71836
- var _hoisted_3$9 = {
71836
+ var _hoisted_3$8 = {
71837
71837
  key: 0,
71838
71838
  style: { "position": "absolute", "width": "100%", "height": "100%", "left": "0", "top": "0" }
71839
71839
  };
@@ -72077,7 +72077,7 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
72077
72077
  var _a;
72078
72078
  return [
72079
72079
  ((_a = vue.unref(slots)) === null || _a === void 0 ? void 0 : _a.default)
72080
- ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_3$9, [
72080
+ ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_3$8, [
72081
72081
  vue.renderSlot(_ctx.$slots, "default", {
72082
72082
  slotScope: { activeIndex: activeIndex.value }
72083
72083
  })
@@ -74252,9 +74252,8 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
74252
74252
  script$k.__scopeId = "data-v-17eda5db";
74253
74253
  script$k.__file = "packages/base/form/form-item.vue";
74254
74254
 
74255
- var _hoisted_1$c = { class: "xrk-search" };
74256
- var _hoisted_2$8 = { class: "btn-group" };
74257
- var _hoisted_3$8 = { class: "btn-group-left" };
74255
+ var _hoisted_1$c = { class: "btn-group-left" };
74256
+ var _hoisted_2$8 = { class: "btn-group-right" };
74258
74257
  var __default__$h = {
74259
74258
  name: 'xrk-search'
74260
74259
  };
@@ -74280,6 +74279,13 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
74280
74279
  var searchFormRef = vue.ref();
74281
74280
  var searchBtn = vue.computed(function () { return (__assign({ text: '搜索', show: true }, props.searchBtn)); });
74282
74281
  var resetBtn = vue.computed(function () { return (__assign({ text: '重置', show: true }, props.resetBtn)); });
74282
+ var columnNum = vue.ref(5);
74283
+ var searchStyle = vue.computed(function () {
74284
+ return {
74285
+ '--column-num': columnNum.value,
74286
+ '--column-len': props.columns.length
74287
+ };
74288
+ });
74283
74289
  var isExpand = vue.ref(false);
74284
74290
  var getCurrentColumns = vue.computed(function () {
74285
74291
  var _a;
@@ -74287,7 +74293,7 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
74287
74293
  return props === null || props === void 0 ? void 0 : props.columns;
74288
74294
  }
74289
74295
  else {
74290
- return (_a = props === null || props === void 0 ? void 0 : props.columns) === null || _a === void 0 ? void 0 : _a.slice(0, 8);
74296
+ return (_a = props === null || props === void 0 ? void 0 : props.columns) === null || _a === void 0 ? void 0 : _a.slice(0, columnNum.value * 2);
74291
74297
  }
74292
74298
  });
74293
74299
  var _getPleaseText = function (type) {
@@ -74423,8 +74429,13 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
74423
74429
  handleResetClick: handleResetClick
74424
74430
  });
74425
74431
  return function (_ctx, _cache) {
74426
- var _a;
74427
- return (vue.openBlock(), vue.createElementBlock("div", _hoisted_1$c, [
74432
+ var _a, _b, _c, _d, _e;
74433
+ return (vue.openBlock(), vue.createElementBlock("div", {
74434
+ class: vue.normalizeClass(["xrk-search", {
74435
+ '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
74436
+ }]),
74437
+ style: vue.normalizeStyle(__assign({ marginBottom: ((_c = __props.columns) === null || _c === void 0 ? void 0 : _c.length) ? '16px' : 0 }, vue.unref(searchStyle)))
74438
+ }, [
74428
74439
  vue.createVNode(script$b, {
74429
74440
  model: searchValue,
74430
74441
  ref_key: "searchFormRef",
@@ -74459,8 +74470,11 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
74459
74470
  ]; }),
74460
74471
  _: 1 /* STABLE */
74461
74472
  }, 8 /* PROPS */, ["model"]),
74462
- vue.createElementVNode("div", _hoisted_2$8, [
74463
- vue.createElementVNode("div", _hoisted_3$8, [
74473
+ vue.createElementVNode("div", {
74474
+ class: "btn-group",
74475
+ style: vue.normalizeStyle({ marginTop: ((_d = __props.columns) === null || _d === void 0 ? void 0 : _d.length) ? '24px' : 0 })
74476
+ }, [
74477
+ vue.createElementVNode("div", _hoisted_1$c, [
74464
74478
  (vue.unref(searchBtn).show)
74465
74479
  ? (vue.openBlock(), vue.createBlock(script$F, {
74466
74480
  key: 0,
@@ -74486,7 +74500,7 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
74486
74500
  _: 1 /* STABLE */
74487
74501
  }))
74488
74502
  : vue.createCommentVNode("v-if", true),
74489
- (__props.columns && ((_a = __props.columns) === null || _a === void 0 ? void 0 : _a.length) >= 8)
74503
+ (__props.columns && ((_e = __props.columns) === null || _e === void 0 ? void 0 : _e.length) > columnNum.value * 2)
74490
74504
  ? (vue.openBlock(), vue.createBlock(script$F, {
74491
74505
  key: 2,
74492
74506
  type: "default",
@@ -74510,15 +74524,17 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
74510
74524
  }))
74511
74525
  : vue.createCommentVNode("v-if", true)
74512
74526
  ]),
74513
- (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(__props.otherComponents, function (_a, index) {
74514
- var render = _a.render;
74515
- return (vue.openBlock(), vue.createBlock(vue.unref(BaseSearchRender), {
74516
- render: render,
74517
- key: index
74518
- }, null, 8 /* PROPS */, ["render"]));
74519
- }), 128 /* KEYED_FRAGMENT */))
74520
- ])
74521
- ]));
74527
+ vue.createElementVNode("div", _hoisted_2$8, [
74528
+ (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(__props.otherComponents, function (_a, index) {
74529
+ var render = _a.render;
74530
+ return (vue.openBlock(), vue.createBlock(vue.unref(BaseSearchRender), {
74531
+ render: render,
74532
+ key: index
74533
+ }, null, 8 /* PROPS */, ["render"]));
74534
+ }), 128 /* KEYED_FRAGMENT */))
74535
+ ])
74536
+ ], 4 /* STYLE */)
74537
+ ], 6 /* CLASS, STYLE */));
74522
74538
  };
74523
74539
  } }));
74524
74540
 
@@ -76467,7 +76483,7 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
76467
76483
  var _selectionAllLoading = vue.ref(false);
76468
76484
  var _selectionRowLoading = vue.ref(false);
76469
76485
  var getAlign = vue.computed(function () {
76470
- if (props === null || props === void 0 ? void 0 : props.isBothEnds)
76486
+ if ((props === null || props === void 0 ? void 0 : props.isBothEnds) || (props === null || props === void 0 ? void 0 : props.type))
76471
76487
  return (props === null || props === void 0 ? void 0 : props.align) || 'center';
76472
76488
  return (props === null || props === void 0 ? void 0 : props.align) || 'left';
76473
76489
  });
@@ -77315,6 +77331,11 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
77315
77331
  var menusRef = vue.ref();
77316
77332
  var activeMenus = vue.ref([]);
77317
77333
  var _menus = vue.ref([]);
77334
+ var paddingLeft = vue.computed(function () {
77335
+ if (props.level === 0)
77336
+ return (props.level + 1) * 12 + 'px';
77337
+ return (props.level + 1) * 16 + 'px';
77338
+ });
77318
77339
  var checkHasChild = function (menu) {
77319
77340
  return Array.isArray(menu.menuList) && menu.menuList.length > 0;
77320
77341
  };
@@ -77369,7 +77390,7 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
77369
77390
  title: vue.withCtx(function () { return [
77370
77391
  vue.createElementVNode("div", {
77371
77392
  style: vue.normalizeStyle({
77372
- paddingLeft: (__props.level + 1) * 12 + 'px'
77393
+ paddingLeft: vue.unref(paddingLeft)
77373
77394
  }),
77374
77395
  class: vue.normalizeClass(menuClassName),
77375
77396
  name: menu.url,
@@ -77414,7 +77435,7 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
77414
77435
  }, [
77415
77436
  vue.createElementVNode("div", {
77416
77437
  style: vue.normalizeStyle({
77417
- paddingLeft: (__props.level + 1) * 12 + 'px'
77438
+ paddingLeft: vue.unref(paddingLeft)
77418
77439
  }),
77419
77440
  class: vue.normalizeClass(menuClassName),
77420
77441
  name: menu.name
@@ -77833,7 +77854,7 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
77833
77854
  clearSearchValues: function () { var _a, _b; return (_b = (_a = XrkSearchRef.value) === null || _a === void 0 ? void 0 : _a.clearSearchValues) === null || _b === void 0 ? void 0 : _b.call(_a); },
77834
77855
  setSearchValue: function (key, value) { var _a, _b; return (_b = (_a = XrkSearchRef.value) === null || _a === void 0 ? void 0 : _a.setSearchValue) === null || _b === void 0 ? void 0 : _b.call(_a, key, value); },
77835
77856
  getSearchValue: function () { var _a, _b; return (_b = (_a = XrkSearchRef.value) === null || _a === void 0 ? void 0 : _a.getSearchValue) === null || _b === void 0 ? void 0 : _b.call(_a); },
77836
- initCurrentList: function (customQuery) { return __awaiter(_this, void 0, void 0, function () {
77857
+ initCurrentList: function (customQuery, config) { return __awaiter(_this, void 0, void 0, function () {
77837
77858
  return __generator(this, function (_a) {
77838
77859
  switch (_a.label) {
77839
77860
  case 0:
@@ -77841,8 +77862,12 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
77841
77862
  return [4 /*yield*/, (getList === null || getList === void 0 ? void 0 : getList(__assign(__assign({}, (customQuery || {})), query.value)))];
77842
77863
  case 1:
77843
77864
  _a.sent();
77844
- tableToTop();
77845
- checkTableNeedScroll();
77865
+ if (!(config === null || config === void 0 ? void 0 : config.noChange)) {
77866
+ if (!(config === null || config === void 0 ? void 0 : config.noToTop))
77867
+ tableToTop();
77868
+ if (!(config === null || config === void 0 ? void 0 : config.noScroll))
77869
+ checkTableNeedScroll();
77870
+ }
77846
77871
  return [2 /*return*/];
77847
77872
  }
77848
77873
  });
@@ -77884,7 +77909,6 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
77884
77909
  (!__props.searchConfig.hide)
77885
77910
  ? (vue.openBlock(), vue.createBlock(script$j, {
77886
77911
  key: 1,
77887
- style: { "margin-bottom": "16px" },
77888
77912
  ref_key: "XrkSearchRef",
77889
77913
  ref: XrkSearchRef,
77890
77914
  columns: __props.searchConfig.searchColumns,
package/lib/packages/xrk/table/index.d.ts CHANGED
@@ -32,7 +32,11 @@ export declare type XrkTableRef<S extends Record<string, any> = any, T extends R
32
32
  /**
33
33
  * 刷新当前页，可传入自定义参数（只会作用与这次列表获取，相同变量会被search组件设置的值覆盖）
34
34
  */
35
- initCurrentList: (customQuery?: S) => Promise<void>;
35
+ initCurrentList: (customQuery?: S, config?: {
36
+ noToTop?: boolean;
37
+ noScroll?: boolean;
38
+ noChange?: boolean;
39
+ }) => Promise<void>;
36
40
  /**
37
41
  * 回到第一页，并刷新列表，可传入自定义参数（只会作用与这次列表获取，相同变量会被search组件设置的值覆盖）
38
42
  */
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "xrk-components",
3
- "version": "2.0.0-beta.96",
3
+ "version": "2.0.0-beta.98",
4
4
  "description": "",
5
5
  "main": "lib/index.esm.js",
6
6
  "typings": "lib/packages/index.d.ts",