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

package/es/ele-data-table/index.d.ts

@@ -289,6 +289,7 @@ declare const _default: import("vue").DefineComponent<{
     };
     flexible: BooleanConstructor;
 }>> & {
+    onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
     onSelect?: ((_selection: DataItem[], _row: DataItem) => any) | undefined;
     onSelectAll?: ((_selection: DataItem[]) => any) | undefined;
     onSelectionChange?: ((_selection: DataItem[]) => any) | undefined;
@@ -306,7 +307,6 @@ declare const _default: import("vue").DefineComponent<{
     onFilterChange?: ((_filter: Filter) => any) | undefined;
     onCurrentChange?: ((_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => any) | undefined;
     onHeaderDragend?: ((_width: number, _old: number, _column: Column, _e: MouseEvent) => any) | undefined;
-    onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
     "onUpdate:currentRowKey"?: ((_currentRowKey?: DataKey | undefined) => any) | undefined;
     "onUpdate:selectedRowKeys"?: ((_selectedRowKeys?: DataKey[] | undefined) => any) | undefined;
 }, {

package/es/ele-data-table/index.js

@@ -165,7 +165,7 @@ const index = defineComponent({
       const isChanged = arrayIsChanged(tableState.checked, checked);
       tableState.checked = checked;
       tableState.checkedKeys = checkedKeys;
-      if (isChanged) {
+      if (isChanged || force && arrayIsChanged(methods.getSelectionRows(), checked)) {
         methods.clearSelection();
         checked.forEach((row) => {
           toggleRowSelectionPro(tableRef.value, row, true);

package/es/ele-pro-table/index.d.ts

@@ -202,13 +202,13 @@ declare const _default: import("vue").DefineComponent<{
     setScrollTop: (top?: number | undefined) => void;
     setScrollLeft: (left?: number | undefined) => void;
     setCurrentRowKey: (key?: import("../ele-data-table/types").DataKey | null | undefined) => void;
-    getCurrentRow: () => DataItem | undefined;
+    getCurrentRow: () => DataItem | undefined; /** 当前页码 */
     setSelectedRows: (rows?: DataItem[] | undefined) => void;
     setSelectedRowKeys: (keys?: import("../ele-data-table/types").DataKey[] | undefined, rows?: DataItem[] | undefined) => void;
     toggleRowExpansionAll: (expanded?: boolean | undefined) => void;
     updateSelectedAndChecked: () => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-    done: (_result: DoneParams<DataItem>, _parent?: DataItem | undefined) => boolean;
+    done: (_result: DoneParams<DataItem>, _parent?: DataItem | undefined) => boolean; /** 当前页码 */
     'update:selections': (_selections: DataItem[]) => boolean;
     'update:current': (_current?: DataItem | null | undefined) => boolean;
     columnsChange: (_columns: Columns) => boolean;
@@ -227,12 +227,11 @@ declare const _default: import("vue").DefineComponent<{
     rowContextmenu: (_row: DataItem, _column: import("./types").Column, _e: MouseEvent) => boolean;
     rowDblclick: (_row: DataItem, _column: import("./types").Column, _e: MouseEvent) => boolean;
     headerClick: (_column: import("./types").Column, _e: MouseEvent) => boolean;
-    headerContextmenu: (_column: import("./types").Column, _e: MouseEvent) => boolean;
+    headerContextmenu: (_column: import("./types").Column, _e: MouseEvent) => boolean; /** 当前页码 */
     sortChange: (_sorter: Sorter) => boolean;
-    filterChange: (_filter: Filter) => boolean; /** 每页显示数量 */
+    filterChange: (_filter: Filter) => boolean;
     currentChange: (_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => boolean;
     headerDragend: (_width: number, _old: number, _column: import("./types").Column, _e: MouseEvent) => boolean;
-    /** 数据请求状态 */
     expandChange: (_row: DataItem, _expanded: boolean) => boolean;
     'update:currentRowKey': (_currentRowKey?: import("../ele-data-table/types").DataKey | undefined) => boolean;
     'update:selectedRowKeys': (_selectedRowKeys?: import("../ele-data-table/types").DataKey[] | undefined) => boolean;
@@ -401,6 +400,7 @@ declare const _default: import("vue").DefineComponent<{
     reserveCurrent: BooleanConstructor;
     selectedRowKeys: import("vue").PropType<import("../ele-data-table/types").DataKey[]>;
 }>> & {
+    onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
     onSelect?: ((_selection: DataItem[], _row: DataItem) => any) | undefined;
     onSelectAll?: ((_selection: DataItem[]) => any) | undefined;
     onSelectionChange?: ((_selection: DataItem[]) => any) | undefined;
@@ -418,7 +418,6 @@ declare const _default: import("vue").DefineComponent<{
     onFilterChange?: ((_filter: Filter) => any) | undefined;
     onCurrentChange?: ((_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => any) | undefined;
     onHeaderDragend?: ((_width: number, _old: number, _column: import("./types").Column, _e: MouseEvent) => any) | undefined;
-    onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
     "onUpdate:currentRowKey"?: ((_currentRowKey?: import("../ele-data-table/types").DataKey | undefined) => any) | undefined;
     "onUpdate:selectedRowKeys"?: ((_selectedRowKeys?: import("../ele-data-table/types").DataKey[] | undefined) => any) | undefined;
     onDone?: ((_result: DoneParams<DataItem>, _parent?: DataItem | undefined) => any) | undefined;

package/es/ele-pro-table/index.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, computed, watch, onMounted, resolveComponent, openBlock, createBlock, normalizeProps, guardReactiveProps, withCtx, mergeProps as mergeProps$1, renderSlot, createSlots, renderList, createCommentVNode, createElementBlock, normalizeStyle } from "vue";
+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";
 import { pick } from "../utils/core";
 import { useGlobalProps, useLicense, UNAUTHORIZED_TIP } from "../ele-config-provider/receiver";
 import EleLoading from "../ele-loading/index";
@@ -249,6 +249,18 @@ const _sfc_main = defineComponent({
       reload(void 0, row, resolve);
     };
     const onDone = (result, parent) => {
+      nextTick(() => {
+        if (props.current != null) {
+          methods.setCurrentRowKey(
+            getValue(props.current, getRowKey(props.rowKey))
+          );
+        }
+        if (props.selections != null && props.selections.length) {
+          methods.setSelectedRowKeys(
+            getRowKeys(props.selections, getRowKey(props.rowKey))
+          );
+        }
+      });
       emit("done", result, parent);
     };
     const onRefresh = () => {

package/es/ele-steps/index.js

@@ -1,4 +1,4 @@
-import { defineComponent, computed, resolveComponent, openBlock, createBlock, mergeProps, withCtx, createElementBlock, Fragment, renderList, renderSlot } from "vue";
+import { defineComponent, computed, resolveComponent, openBlock, createBlock, mergeProps, withCtx, createElementBlock, Fragment, renderList, createSlots, renderSlot } from "vue";
 import { ElSteps, ElStep } from "element-plus";
 import { useLicense } from "../ele-config-provider/receiver";
 import { omit } from "../utils/core";
@@ -33,17 +33,19 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   }), {
     default: withCtx(() => [
       (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.items, (item, index2) => {
-        return openBlock(), createBlock(_component_ElStep, mergeProps({ key: index2 }, item), {
-          default: withCtx(() => [
-            (openBlock(true), createElementBlock(Fragment, null, renderList(Object.keys(_ctx.$slots).filter((k) => "default" !== k), (name) => {
-              return renderSlot(_ctx.$slots, name, {
-                index: index2,
-                item
-              });
-            }), 256))
-          ]),
-          _: 2
-        }, 1040);
+        return openBlock(), createBlock(_component_ElStep, mergeProps({ key: index2 }, item), createSlots({ _: 2 }, [
+          renderList(Object.keys(_ctx.$slots).filter((k) => "default" !== k), (name) => {
+            return {
+              name,
+              fn: withCtx(() => [
+                renderSlot(_ctx.$slots, name, {
+                  index: index2,
+                  item
+                })
+              ])
+            };
+          })
+        ]), 1040);
       }), 128))
     ]),
     _: 3

package/lib/ele-data-table/index.cjs

@@ -166,7 +166,7 @@ const index = vue.defineComponent({
       const isChanged = util.arrayIsChanged(tableState.checked, checked);
       tableState.checked = checked;
       tableState.checkedKeys = checkedKeys;
-      if (isChanged) {
+      if (isChanged || force && util.arrayIsChanged(methods.getSelectionRows(), checked)) {
         methods.clearSelection();
         checked.forEach((row) => {
           util.toggleRowSelectionPro(tableRef.value, row, true);

package/lib/ele-data-table/index.d.ts

@@ -289,6 +289,7 @@ declare const _default: import("vue").DefineComponent<{
     };
     flexible: BooleanConstructor;
 }>> & {
+    onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
     onSelect?: ((_selection: DataItem[], _row: DataItem) => any) | undefined;
     onSelectAll?: ((_selection: DataItem[]) => any) | undefined;
     onSelectionChange?: ((_selection: DataItem[]) => any) | undefined;
@@ -306,7 +307,6 @@ declare const _default: import("vue").DefineComponent<{
     onFilterChange?: ((_filter: Filter) => any) | undefined;
     onCurrentChange?: ((_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => any) | undefined;
     onHeaderDragend?: ((_width: number, _old: number, _column: Column, _e: MouseEvent) => any) | undefined;
-    onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
     "onUpdate:currentRowKey"?: ((_currentRowKey?: DataKey | undefined) => any) | undefined;
     "onUpdate:selectedRowKeys"?: ((_selectedRowKeys?: DataKey[] | undefined) => any) | undefined;
 }, {

package/lib/ele-pro-table/index.cjs

@@ -250,6 +250,18 @@ const _sfc_main = vue.defineComponent({
       reload(void 0, row, resolve);
     };
     const onDone = (result, parent) => {
+      vue.nextTick(() => {
+        if (props2.current != null) {
+          methods.setCurrentRowKey(
+            util.getValue(props2.current, util$1.getRowKey(props2.rowKey))
+          );
+        }
+        if (props2.selections != null && props2.selections.length) {
+          methods.setSelectedRowKeys(
+            util.getRowKeys(props2.selections, util$1.getRowKey(props2.rowKey))
+          );
+        }
+      });
       emit("done", result, parent);
     };
     const onRefresh = () => {

package/lib/ele-pro-table/index.d.ts

@@ -202,13 +202,13 @@ declare const _default: import("vue").DefineComponent<{
     setScrollTop: (top?: number | undefined) => void;
     setScrollLeft: (left?: number | undefined) => void;
     setCurrentRowKey: (key?: import("../ele-data-table/types").DataKey | null | undefined) => void;
-    getCurrentRow: () => DataItem | undefined;
+    getCurrentRow: () => DataItem | undefined; /** 当前页码 */
     setSelectedRows: (rows?: DataItem[] | undefined) => void;
     setSelectedRowKeys: (keys?: import("../ele-data-table/types").DataKey[] | undefined, rows?: DataItem[] | undefined) => void;
     toggleRowExpansionAll: (expanded?: boolean | undefined) => void;
     updateSelectedAndChecked: () => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-    done: (_result: DoneParams<DataItem>, _parent?: DataItem | undefined) => boolean;
+    done: (_result: DoneParams<DataItem>, _parent?: DataItem | undefined) => boolean; /** 当前页码 */
     'update:selections': (_selections: DataItem[]) => boolean;
     'update:current': (_current?: DataItem | null | undefined) => boolean;
     columnsChange: (_columns: Columns) => boolean;
@@ -227,12 +227,11 @@ declare const _default: import("vue").DefineComponent<{
     rowContextmenu: (_row: DataItem, _column: import("./types").Column, _e: MouseEvent) => boolean;
     rowDblclick: (_row: DataItem, _column: import("./types").Column, _e: MouseEvent) => boolean;
     headerClick: (_column: import("./types").Column, _e: MouseEvent) => boolean;
-    headerContextmenu: (_column: import("./types").Column, _e: MouseEvent) => boolean;
+    headerContextmenu: (_column: import("./types").Column, _e: MouseEvent) => boolean; /** 当前页码 */
     sortChange: (_sorter: Sorter) => boolean;
-    filterChange: (_filter: Filter) => boolean; /** 每页显示数量 */
+    filterChange: (_filter: Filter) => boolean;
     currentChange: (_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => boolean;
     headerDragend: (_width: number, _old: number, _column: import("./types").Column, _e: MouseEvent) => boolean;
-    /** 数据请求状态 */
     expandChange: (_row: DataItem, _expanded: boolean) => boolean;
     'update:currentRowKey': (_currentRowKey?: import("../ele-data-table/types").DataKey | undefined) => boolean;
     'update:selectedRowKeys': (_selectedRowKeys?: import("../ele-data-table/types").DataKey[] | undefined) => boolean;
@@ -401,6 +400,7 @@ declare const _default: import("vue").DefineComponent<{
     reserveCurrent: BooleanConstructor;
     selectedRowKeys: import("vue").PropType<import("../ele-data-table/types").DataKey[]>;
 }>> & {
+    onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
     onSelect?: ((_selection: DataItem[], _row: DataItem) => any) | undefined;
     onSelectAll?: ((_selection: DataItem[]) => any) | undefined;
     onSelectionChange?: ((_selection: DataItem[]) => any) | undefined;
@@ -418,7 +418,6 @@ declare const _default: import("vue").DefineComponent<{
     onFilterChange?: ((_filter: Filter) => any) | undefined;
     onCurrentChange?: ((_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => any) | undefined;
     onHeaderDragend?: ((_width: number, _old: number, _column: import("./types").Column, _e: MouseEvent) => any) | undefined;
-    onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
     "onUpdate:currentRowKey"?: ((_currentRowKey?: import("../ele-data-table/types").DataKey | undefined) => any) | undefined;
     "onUpdate:selectedRowKeys"?: ((_selectedRowKeys?: import("../ele-data-table/types").DataKey[] | undefined) => any) | undefined;
     onDone?: ((_result: DoneParams<DataItem>, _parent?: DataItem | undefined) => any) | undefined;

package/lib/ele-steps/index.cjs

@@ -34,17 +34,19 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   }), {
     default: vue.withCtx(() => [
       (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.items, (item, index2) => {
-        return vue.openBlock(), vue.createBlock(_component_ElStep, vue.mergeProps({ key: index2 }, item), {
-          default: vue.withCtx(() => [
-            (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(Object.keys(_ctx.$slots).filter((k) => "default" !== k), (name) => {
-              return vue.renderSlot(_ctx.$slots, name, {
-                index: index2,
-                item
-              });
-            }), 256))
-          ]),
-          _: 2
-        }, 1040);
+        return vue.openBlock(), vue.createBlock(_component_ElStep, vue.mergeProps({ key: index2 }, item), vue.createSlots({ _: 2 }, [
+          vue.renderList(Object.keys(_ctx.$slots).filter((k) => "default" !== k), (name) => {
+            return {
+              name,
+              fn: vue.withCtx(() => [
+                vue.renderSlot(_ctx.$slots, name, {
+                  index: index2,
+                  item
+                })
+              ])
+            };
+          })
+        ]), 1040);
       }), 128))
     ]),
     _: 3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ele-admin-plus",
-  "version": "1.1.8",
+  "version": "1.1.9-beta.2",
   "type": "module",
   "scripts": {
     "dev": "vite --host --config vite.global.ts",