ele-admin-plus 1.1.9-beta.1 → 1.1.9-beta.2

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 (9) hide show
  1. package/es/ele-data-table/index.d.ts +1 -1
  2. package/es/ele-data-table/index.js +1 -1
  3. package/es/ele-pro-table/index.d.ts +5 -6
  4. package/es/ele-pro-table/index.js +13 -1
  5. package/lib/ele-data-table/index.cjs +1 -1
  6. package/lib/ele-data-table/index.d.ts +1 -1
  7. package/lib/ele-pro-table/index.cjs +12 -0
  8. package/lib/ele-pro-table/index.d.ts +5 -6
  9. package/package.json +1 -1
package/es/ele-data-table/index.d.ts CHANGED
@@ -289,6 +289,7 @@ declare const _default: import("vue").DefineComponent<{
289
289
  };
290
290
  flexible: BooleanConstructor;
291
291
  }>> & {
292
+ onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
292
293
  onSelect?: ((_selection: DataItem[], _row: DataItem) => any) | undefined;
293
294
  onSelectAll?: ((_selection: DataItem[]) => any) | undefined;
294
295
  onSelectionChange?: ((_selection: DataItem[]) => any) | undefined;
@@ -306,7 +307,6 @@ declare const _default: import("vue").DefineComponent<{
306
307
  onFilterChange?: ((_filter: Filter) => any) | undefined;
307
308
  onCurrentChange?: ((_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => any) | undefined;
308
309
  onHeaderDragend?: ((_width: number, _old: number, _column: Column, _e: MouseEvent) => any) | undefined;
309
- onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
310
310
  "onUpdate:currentRowKey"?: ((_currentRowKey?: DataKey | undefined) => any) | undefined;
311
311
  "onUpdate:selectedRowKeys"?: ((_selectedRowKeys?: DataKey[] | undefined) => any) | undefined;
312
312
  }, {
package/es/ele-data-table/index.js CHANGED
@@ -165,7 +165,7 @@ const index = defineComponent({
165
165
  const isChanged = arrayIsChanged(tableState.checked, checked);
166
166
  tableState.checked = checked;
167
167
  tableState.checkedKeys = checkedKeys;
168
- if (isChanged) {
168
+ if (isChanged || force && arrayIsChanged(methods.getSelectionRows(), checked)) {
169
169
  methods.clearSelection();
170
170
  checked.forEach((row) => {
171
171
  toggleRowSelectionPro(tableRef.value, row, true);
package/es/ele-pro-table/index.d.ts CHANGED
@@ -202,13 +202,13 @@ declare const _default: import("vue").DefineComponent<{
202
202
  setScrollTop: (top?: number | undefined) => void;
203
203
  setScrollLeft: (left?: number | undefined) => void;
204
204
  setCurrentRowKey: (key?: import("../ele-data-table/types").DataKey | null | undefined) => void;
205
- getCurrentRow: () => DataItem | undefined;
205
+ getCurrentRow: () => DataItem | undefined; /** 当前页码 */
206
206
  setSelectedRows: (rows?: DataItem[] | undefined) => void;
207
207
  setSelectedRowKeys: (keys?: import("../ele-data-table/types").DataKey[] | undefined, rows?: DataItem[] | undefined) => void;
208
208
  toggleRowExpansionAll: (expanded?: boolean | undefined) => void;
209
209
  updateSelectedAndChecked: () => void;
210
210
  }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
211
- done: (_result: DoneParams<DataItem>, _parent?: DataItem | undefined) => boolean;
211
+ done: (_result: DoneParams<DataItem>, _parent?: DataItem | undefined) => boolean; /** 当前页码 */
212
212
  'update:selections': (_selections: DataItem[]) => boolean;
213
213
  'update:current': (_current?: DataItem | null | undefined) => boolean;
214
214
  columnsChange: (_columns: Columns) => boolean;
@@ -227,12 +227,11 @@ declare const _default: import("vue").DefineComponent<{
227
227
  rowContextmenu: (_row: DataItem, _column: import("./types").Column, _e: MouseEvent) => boolean;
228
228
  rowDblclick: (_row: DataItem, _column: import("./types").Column, _e: MouseEvent) => boolean;
229
229
  headerClick: (_column: import("./types").Column, _e: MouseEvent) => boolean;
230
- headerContextmenu: (_column: import("./types").Column, _e: MouseEvent) => boolean;
230
+ headerContextmenu: (_column: import("./types").Column, _e: MouseEvent) => boolean; /** 当前页码 */
231
231
  sortChange: (_sorter: Sorter) => boolean;
232
- filterChange: (_filter: Filter) => boolean; /** 每页显示数量 */
232
+ filterChange: (_filter: Filter) => boolean;
233
233
  currentChange: (_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => boolean;
234
234
  headerDragend: (_width: number, _old: number, _column: import("./types").Column, _e: MouseEvent) => boolean;
235
- /** 数据请求状态 */
236
235
  expandChange: (_row: DataItem, _expanded: boolean) => boolean;
237
236
  'update:currentRowKey': (_currentRowKey?: import("../ele-data-table/types").DataKey | undefined) => boolean;
238
237
  'update:selectedRowKeys': (_selectedRowKeys?: import("../ele-data-table/types").DataKey[] | undefined) => boolean;
@@ -401,6 +400,7 @@ declare const _default: import("vue").DefineComponent<{
401
400
  reserveCurrent: BooleanConstructor;
402
401
  selectedRowKeys: import("vue").PropType<import("../ele-data-table/types").DataKey[]>;
403
402
  }>> & {
403
+ onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
404
404
  onSelect?: ((_selection: DataItem[], _row: DataItem) => any) | undefined;
405
405
  onSelectAll?: ((_selection: DataItem[]) => any) | undefined;
406
406
  onSelectionChange?: ((_selection: DataItem[]) => any) | undefined;
@@ -418,7 +418,6 @@ declare const _default: import("vue").DefineComponent<{
418
418
  onFilterChange?: ((_filter: Filter) => any) | undefined;
419
419
  onCurrentChange?: ((_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => any) | undefined;
420
420
  onHeaderDragend?: ((_width: number, _old: number, _column: import("./types").Column, _e: MouseEvent) => any) | undefined;
421
- onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
422
421
  "onUpdate:currentRowKey"?: ((_currentRowKey?: import("../ele-data-table/types").DataKey | undefined) => any) | undefined;
423
422
  "onUpdate:selectedRowKeys"?: ((_selectedRowKeys?: import("../ele-data-table/types").DataKey[] | undefined) => any) | undefined;
424
423
  onDone?: ((_result: DoneParams<DataItem>, _parent?: DataItem | undefined) => any) | undefined;
package/es/ele-pro-table/index.js CHANGED
@@ -1,4 +1,4 @@
1
- import { defineComponent, ref, computed, watch, onMounted, resolveComponent, openBlock, createBlock, normalizeProps, guardReactiveProps, withCtx, mergeProps as mergeProps$1, renderSlot, createSlots, renderList, createCommentVNode, createElementBlock, normalizeStyle } from "vue";
1
+ import { defineComponent, ref, computed, watch, onMounted, nextTick, resolveComponent, openBlock, createBlock, normalizeProps, guardReactiveProps, withCtx, mergeProps as mergeProps$1, renderSlot, createSlots, renderList, createCommentVNode, createElementBlock, normalizeStyle } from "vue";
2
2
  import { pick } from "../utils/core";
3
3
  import { useGlobalProps, useLicense, UNAUTHORIZED_TIP } from "../ele-config-provider/receiver";
4
4
  import EleLoading from "../ele-loading/index";
@@ -249,6 +249,18 @@ const _sfc_main = defineComponent({
249
249
  reload(void 0, row, resolve);
250
250
  };
251
251
  const onDone = (result, parent) => {
252
+ nextTick(() => {
253
+ if (props.current != null) {
254
+ methods.setCurrentRowKey(
255
+ getValue(props.current, getRowKey(props.rowKey))
256
+ );
257
+ }
258
+ if (props.selections != null && props.selections.length) {
259
+ methods.setSelectedRowKeys(
260
+ getRowKeys(props.selections, getRowKey(props.rowKey))
261
+ );
262
+ }
263
+ });
252
264
  emit("done", result, parent);
253
265
  };
254
266
  const onRefresh = () => {
package/lib/ele-data-table/index.cjs CHANGED
@@ -166,7 +166,7 @@ const index = vue.defineComponent({
166
166
  const isChanged = util.arrayIsChanged(tableState.checked, checked);
167
167
  tableState.checked = checked;
168
168
  tableState.checkedKeys = checkedKeys;
169
- if (isChanged) {
169
+ if (isChanged || force && util.arrayIsChanged(methods.getSelectionRows(), checked)) {
170
170
  methods.clearSelection();
171
171
  checked.forEach((row) => {
172
172
  util.toggleRowSelectionPro(tableRef.value, row, true);
package/lib/ele-data-table/index.d.ts CHANGED
@@ -289,6 +289,7 @@ declare const _default: import("vue").DefineComponent<{
289
289
  };
290
290
  flexible: BooleanConstructor;
291
291
  }>> & {
292
+ onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
292
293
  onSelect?: ((_selection: DataItem[], _row: DataItem) => any) | undefined;
293
294
  onSelectAll?: ((_selection: DataItem[]) => any) | undefined;
294
295
  onSelectionChange?: ((_selection: DataItem[]) => any) | undefined;
@@ -306,7 +307,6 @@ declare const _default: import("vue").DefineComponent<{
306
307
  onFilterChange?: ((_filter: Filter) => any) | undefined;
307
308
  onCurrentChange?: ((_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => any) | undefined;
308
309
  onHeaderDragend?: ((_width: number, _old: number, _column: Column, _e: MouseEvent) => any) | undefined;
309
- onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
310
310
  "onUpdate:currentRowKey"?: ((_currentRowKey?: DataKey | undefined) => any) | undefined;
311
311
  "onUpdate:selectedRowKeys"?: ((_selectedRowKeys?: DataKey[] | undefined) => any) | undefined;
312
312
  }, {
package/lib/ele-pro-table/index.cjs CHANGED
@@ -250,6 +250,18 @@ const _sfc_main = vue.defineComponent({
250
250
  reload(void 0, row, resolve);
251
251
  };
252
252
  const onDone = (result, parent) => {
253
+ vue.nextTick(() => {
254
+ if (props2.current != null) {
255
+ methods.setCurrentRowKey(
256
+ util.getValue(props2.current, util$1.getRowKey(props2.rowKey))
257
+ );
258
+ }
259
+ if (props2.selections != null && props2.selections.length) {
260
+ methods.setSelectedRowKeys(
261
+ util.getRowKeys(props2.selections, util$1.getRowKey(props2.rowKey))
262
+ );
263
+ }
264
+ });
253
265
  emit("done", result, parent);
254
266
  };
255
267
  const onRefresh = () => {
package/lib/ele-pro-table/index.d.ts CHANGED
@@ -202,13 +202,13 @@ declare const _default: import("vue").DefineComponent<{
202
202
  setScrollTop: (top?: number | undefined) => void;
203
203
  setScrollLeft: (left?: number | undefined) => void;
204
204
  setCurrentRowKey: (key?: import("../ele-data-table/types").DataKey | null | undefined) => void;
205
- getCurrentRow: () => DataItem | undefined;
205
+ getCurrentRow: () => DataItem | undefined; /** 当前页码 */
206
206
  setSelectedRows: (rows?: DataItem[] | undefined) => void;
207
207
  setSelectedRowKeys: (keys?: import("../ele-data-table/types").DataKey[] | undefined, rows?: DataItem[] | undefined) => void;
208
208
  toggleRowExpansionAll: (expanded?: boolean | undefined) => void;
209
209
  updateSelectedAndChecked: () => void;
210
210
  }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
211
- done: (_result: DoneParams<DataItem>, _parent?: DataItem | undefined) => boolean;
211
+ done: (_result: DoneParams<DataItem>, _parent?: DataItem | undefined) => boolean; /** 当前页码 */
212
212
  'update:selections': (_selections: DataItem[]) => boolean;
213
213
  'update:current': (_current?: DataItem | null | undefined) => boolean;
214
214
  columnsChange: (_columns: Columns) => boolean;
@@ -227,12 +227,11 @@ declare const _default: import("vue").DefineComponent<{
227
227
  rowContextmenu: (_row: DataItem, _column: import("./types").Column, _e: MouseEvent) => boolean;
228
228
  rowDblclick: (_row: DataItem, _column: import("./types").Column, _e: MouseEvent) => boolean;
229
229
  headerClick: (_column: import("./types").Column, _e: MouseEvent) => boolean;
230
- headerContextmenu: (_column: import("./types").Column, _e: MouseEvent) => boolean;
230
+ headerContextmenu: (_column: import("./types").Column, _e: MouseEvent) => boolean; /** 当前页码 */
231
231
  sortChange: (_sorter: Sorter) => boolean;
232
- filterChange: (_filter: Filter) => boolean; /** 每页显示数量 */
232
+ filterChange: (_filter: Filter) => boolean;
233
233
  currentChange: (_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => boolean;
234
234
  headerDragend: (_width: number, _old: number, _column: import("./types").Column, _e: MouseEvent) => boolean;
235
- /** 数据请求状态 */
236
235
  expandChange: (_row: DataItem, _expanded: boolean) => boolean;
237
236
  'update:currentRowKey': (_currentRowKey?: import("../ele-data-table/types").DataKey | undefined) => boolean;
238
237
  'update:selectedRowKeys': (_selectedRowKeys?: import("../ele-data-table/types").DataKey[] | undefined) => boolean;
@@ -401,6 +400,7 @@ declare const _default: import("vue").DefineComponent<{
401
400
  reserveCurrent: BooleanConstructor;
402
401
  selectedRowKeys: import("vue").PropType<import("../ele-data-table/types").DataKey[]>;
403
402
  }>> & {
403
+ onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
404
404
  onSelect?: ((_selection: DataItem[], _row: DataItem) => any) | undefined;
405
405
  onSelectAll?: ((_selection: DataItem[]) => any) | undefined;
406
406
  onSelectionChange?: ((_selection: DataItem[]) => any) | undefined;
@@ -418,7 +418,6 @@ declare const _default: import("vue").DefineComponent<{
418
418
  onFilterChange?: ((_filter: Filter) => any) | undefined;
419
419
  onCurrentChange?: ((_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => any) | undefined;
420
420
  onHeaderDragend?: ((_width: number, _old: number, _column: import("./types").Column, _e: MouseEvent) => any) | undefined;
421
- onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
422
421
  "onUpdate:currentRowKey"?: ((_currentRowKey?: import("../ele-data-table/types").DataKey | undefined) => any) | undefined;
423
422
  "onUpdate:selectedRowKeys"?: ((_selectedRowKeys?: import("../ele-data-table/types").DataKey[] | undefined) => any) | undefined;
424
423
  onDone?: ((_result: DoneParams<DataItem>, _parent?: DataItem | undefined) => any) | undefined;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ele-admin-plus",
3
- "version": "1.1.9-beta.1",
3
+ "version": "1.1.9-beta.2",
4
4
  "type": "module",
5
5
  "scripts": {
6
6
  "dev": "vite --host --config vite.global.ts",