hy-dispatch-ui-v3 0.2.62 → 0.2.64

package/lib/components/hyNoPermissionsMap/noPermissionsMap.vue.js

@@ -3,6 +3,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var vue = require('vue');
+require('../../hooks/index.js');
+require('../index.js');
 var useLocale = require('../../hooks/useLocale.js');
 var index = require('../hyIcon/index.js');
 
@@ -20,6 +22,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
   },
   emits: [],
   setup(__props, { expose: __expose, emit: __emit }) {
+    const props = __props;
+    const emits = __emit;
     const { t } = useLocale.useLocale();
     __expose({});
     return (_ctx, _cache) => {

package/lib/components/hyOrgCascader/index.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var orgCascader = require('./orgCascader.vue.js');
+require('../../utils/index.js');
 var handler = require('../../utils/handler.js');
 
 const HyOrgCascader = handler.withInstall(orgCascader.default);

package/lib/components/hyOrgCascader/js/index.js

@@ -2,6 +2,7 @@
 
 var Axios = require('axios');
 var vue = require('vue');
+require('../../../hooks/index.js');
 var useApi = require('../../../hooks/useApi.js');
 
 let throttleFn = null;
@@ -33,6 +34,7 @@ function getOrgTreeSimple() {
 function orgTreeDatahandler(data) {
   const cascaderMap = /* @__PURE__ */ new Map();
   const handler = (list = [], parentIdsList = []) => {
+    ;
     (list || []).forEach((item) => {
       item.label = item.companyName;
       item.value = item.id;

package/lib/components/hyOrgCascader/orgCascader.vue.js

@@ -4,9 +4,10 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var vue = require('vue');
 var elementPlus = require('element-plus');
+require('../../hooks/index.js');
 var index = require('./js/index.js');
-var useLocale = require('../../hooks/useLocale.js');
 var useSubscribe = require('../../hooks/useSubscribe.js');
+var useLocale = require('../../hooks/useLocale.js');
 
 import "./style/orgCascader.scss";
 

package/lib/components/hyRadioGroup/index.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var radioGroup = require('./radioGroup.vue.js');
+require('../../utils/index.js');
 var handler = require('../../utils/handler.js');
 
 const HyRadioGroup = handler.withInstall(radioGroup.default);

package/lib/components/hyRadioGroup/radioGroup.vue.js

@@ -86,7 +86,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
               return vue.openBlock(), vue.createElementBlock("li", {
                 key: index,
                 class: "w-0 flex-1 flex items-center justify-center text-main clickBox",
-                onClick: ($event) => switchSelect(item)
+                onClick: ($event) => switchSelect(item, index, $event)
               }, [
                 vue.renderSlot(_ctx.$slots, "default", {
                   item,

package/lib/components/hySearch/cpns/searchItem.vue.js

@@ -4,6 +4,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var vue = require('vue');
 var elementPlus = require('element-plus');
+require('../../../utils/index.js');
+require('../../index.js');
 var index = require('../js/index.js');
 var is = require('../../../utils/is.js');
 var form = require('../../../utils/form.js');

package/lib/components/hySearch/index.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var search = require('./search.vue.js');
+require('../../utils/index.js');
 var useAppSearch = require('./js/useAppSearch.js');
 var handler = require('../../utils/handler.js');
 

package/lib/components/hySearch/js/index.js

@@ -2,8 +2,10 @@
 
 var dayjs = require('dayjs');
 var vue = require('vue');
-var useResizeObserver = require('../../../hooks/useResizeObserver.js');
+require('../../../utils/index.js');
+require('../../../hooks/index.js');
 var is = require('../../../utils/is.js');
+var useResizeObserver = require('../../../hooks/useResizeObserver.js');
 
 function columnItemStyle(props, column) {
   const { width } = column;

package/lib/components/hySearch/js/useAppSearch.js

@@ -1,10 +1,12 @@
 'use strict';
 
 var vue = require('vue');
-var handler = require('../../../utils/handler.js');
-var form = require('../../../utils/form.js');
+require('../../../hooks/index.js');
+require('../../../utils/index.js');
 var useLocale = require('../../../hooks/useLocale.js');
 var is = require('../../../utils/is.js');
+var form = require('../../../utils/form.js');
+var handler = require('../../../utils/handler.js');
 
 const genColumnWidth = (config) => {
   let { width, inputWidth, type, attrs } = config || {};

package/lib/components/hySearch/search.vue.js

@@ -5,6 +5,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var vue = require('vue');
 var elementPlus = require('element-plus');
 var iconsVue = require('@element-plus/icons-vue');
+require('../../hooks/index.js');
+require('../../utils/index.js');
+require('../index.js');
 var searchItem = require('./cpns/searchItem.vue.js');
 var index = require('./js/index.js');
 var useAppSearch = require('./js/useAppSearch.js');

package/lib/components/hyTable/cpns/columnSelect.vue.js

@@ -6,13 +6,16 @@ var vue = require('vue');
 var Sortable = require('sortablejs');
 var elementPlus = require('element-plus');
 var iconsVue = require('@element-plus/icons-vue');
+require('../../../hooks/index.js');
+require('../../../utils/index.js');
+require('../../index.js');
 var index = require('../js/index.js');
 var columnSelectItem = require('./columnSelectItem.vue.js');
 var useLocale = require('../../../hooks/useLocale.js');
+var is = require('../../../utils/is.js');
 var index$1 = require('../../hyIcon/index.js');
 var index$2 = require('../../hyTooltip/index.js');
 var index$3 = require('../../hyButton/index.js');
-var is = require('../../../utils/is.js');
 
 const _sfc_main = {
   __name: "columnSelect",

package/lib/components/hyTable/cpns/columnSelectItem.vue.js

@@ -5,7 +5,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var vue = require('vue');
 var elementPlus = require('element-plus');
 var iconsVue = require('@element-plus/icons-vue');
+require('../../../hooks/index.js');
 var index = require('../js/index.js');
+require('../../index.js');
 var useLocale = require('../../../hooks/useLocale.js');
 var index$1 = require('../../hyTooltip/index.js');
 
@@ -27,6 +29,7 @@ const _sfc_main = {
   },
   emits: ["checked"],
   setup(__props, { emit: __emit }) {
+    const props = __props;
     const emits = __emit;
     const { t } = useLocale.useLocale();
     function onClickHandler(column) {

package/lib/components/hyTable/cpns/headerItem.vue.js

@@ -5,6 +5,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var vue = require('vue');
 var elementPlus = require('element-plus');
 var iconsVue = require('@element-plus/icons-vue');
+require('../../index.js');
+require('../../../utils/index.js');
+require('../js/index.js');
 
 const _sfc_main = {
   __name: "headerItem",

package/lib/components/hyTable/cpns/virtualTable.vue.js

@@ -5,6 +5,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var vue = require('vue');
 var elementPlus = require('element-plus');
 var iconsVue = require('@element-plus/icons-vue');
+require('../../index.js');
+require('../../../hooks/index.js');
+require('../../../utils/index.js');
 var index = require('../js/index.js');
 var headerItem = require('./headerItem.vue.js');
 var useLocale = require('../../../hooks/useLocale.js');
@@ -14,7 +17,7 @@ var index$2 = require('../../hyIcon/index.js');
 
 const _sfc_main = {
   __name: "virtualTable",
-  props: {
+  props: /* @__PURE__ */ vue.mergeModels({
     rowKey: {
       type: [String, Number],
       default: "id"
@@ -63,12 +66,23 @@ const _sfc_main = {
       type: String,
       default: "default"
       // deafult-默认 accordion-手风琴
+    },
+    expandRowKeyMap: {
+      type: Map,
+      default: () => /* @__PURE__ */ new Map()
     }
-  },
-  emits: ["search", "select", "select-all", "expand-change"],
+  }, {
+    "expandedRowKeys": {
+      type: Array,
+      default: () => []
+    },
+    "expandedRowKeysModifiers": {}
+  }),
+  emits: /* @__PURE__ */ vue.mergeModels(["search", "select", "select-all", "expand-click"], ["update:expandedRowKeys"]),
   setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const emits = __emit;
+    const expandedRowKeys = vue.useModel(__props, "expandedRowKeys");
     const { t } = useLocale.useLocale();
     const avgWidth = vue.computed(() => {
       const { total, totalWidth } = props.columns.reduce(
@@ -185,6 +199,7 @@ const _sfc_main = {
       }
       const checkedNodeMap = new Map(selectedMap.value);
       const isChecked = is.isBoolean(selected) ? selected : !checkedNodeMap.has(key);
+      const checkStrictly = false;
       const toggle = (node, checked) => {
         const nodeKey = getRowKey(node);
         if (isSelectable(node)) {
@@ -195,7 +210,7 @@ const _sfc_main = {
           }
         }
         const children = node.children;
-        if (children) {
+        if (!checkStrictly && children) {
           children.forEach((childNode) => {
             toggle(childNode, checked);
           });
@@ -256,46 +271,12 @@ const _sfc_main = {
       const { allChecked } = handler(list, checkedNodeMap, indeterminateKeys2);
       return { checkedNodeMap, indeterminateKeys: indeterminateKeys2, allChecked };
     }
-    const expandedKeys = vue.ref([]);
-    const expandedMap = vue.computed(() => {
-      return expandedKeys.value.reduce((keyMap, key, index) => {
-        keyMap.set(key, index);
-        return keyMap;
-      }, /* @__PURE__ */ new Map());
-    });
-    function toggleRowExpansion(row, expanded) {
-      const index = expandedMap.value.get(getRowKey(row));
-      const isExpanded = is.isBoolean(expanded) ? expanded : !is.isNumber(index);
-      if (isExpanded) {
-        if (!is.isNumber(index)) {
-          if (props.expandMode === "accordion" && isExpandTable.value) {
-            expandedKeys.value = [getRowKey(row)];
-          } else {
-            expandedKeys.value.push(getRowKey(row));
-          }
-        }
-      } else {
-        if (is.isNumber(index)) {
-          expandedKeys.value.splice(index, 1);
-        }
-      }
-      if (isExpandTable.value) {
-        const expandedList = expandedKeys.value.reduce((list, key) => {
-          list.push(dataSourceMap.value.get(key));
-          return list;
-        }, []);
-        emits("expand-change", row, expandedList);
-      } else {
-        emits("expand-change", row, isExpanded);
-      }
-    }
-    function onRowExpandSwitch({ row, rowKey }) {
-      toggleRowExpansion(row, !expandedMap.value.has(rowKey));
+    function onRowExpandSwitch({ row, rowKey, ...args }) {
+      emits("expand-click", row, !props.expandRowKeyMap.has(rowKey));
     }
     __expose({
       toggleRowSelection,
       toggleAllSelection,
-      toggleRowExpansion,
       clearSelection: () => {
         isAllChecked.value = false;
         selectedMap.value.clear();
@@ -304,8 +285,8 @@ const _sfc_main = {
     });
     return (_ctx, _cache) => {
       return vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElTableV2), {
-        "expanded-row-keys": expandedKeys.value,
-        "onUpdate:expandedRowKeys": ($event) => expandedKeys.value = $event,
+        "expanded-row-keys": expandedRowKeys.value,
+        "onUpdate:expandedRowKeys": ($event) => expandedRowKeys.value = $event,
         "row-key": __props.rowKey,
         data: dataSource.value,
         columns: tableColumns.value,
@@ -387,10 +368,11 @@ const _sfc_main = {
                             type: "button",
                             "aria-label": "\u5C55\u5F00\u5F53\u524D\u884C",
                             "aria-expanded": "false",
-                            class: vue.normalizeClass(["hy-el-table-v2__expand-icon", { "is-expanded": expandedMap.value.has(getRowKey(row)) }]),
+                            class: vue.normalizeClass(["hy-el-table-v2__expand-icon", { "is-expanded": __props.expandRowKeyMap.has(getRowKey(row)) }]),
                             onClick: vue.withModifiers(($event) => onRowExpandSwitch({
                               rowData: _ctx.rowData,
                               row,
+                              rowIndex: $index,
                               rowKey: getRowKey(row)
                             }), ["stop"])
                           }, [

package/lib/components/hyTable/index.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var table = require('./table.vue.js');
+require('../../utils/index.js');
 var useAppTable = require('./js/useAppTable.js');
 var handler = require('../../utils/handler.js');
 

package/lib/components/hyTable/js/index.js

@@ -1,10 +1,12 @@
 'use strict';
 
 var vue = require('vue');
-var elementPlus = require('element-plus');
-var usePermissionMap = require('../../../hooks/usePermissionMap.js');
-var useLocale = require('../../../hooks/useLocale.js');
+require('../../../hooks/index.js');
+require('../../../utils/index.js');
+require('../../index.js');
 var is = require('../../../utils/is.js');
+var useLocale = require('../../../hooks/useLocale.js');
+var index = require('../../hyLoading/index.js');
 
 function tableColumnShowHandler(column) {
   if (column.permission && !is.isPermission(column.permission)) {
@@ -30,7 +32,7 @@ function tableColumnsEditableleHandler(columns, columnsEditablele) {
       column
     });
   }
-  Array.from(sortSet.values()).reduce((a, b) => a - b);
+  const sortList = Array.from(sortSet.values()).reduce((a, b) => a - b);
   const columnsList = Object.keys(columnsEditableleObj).reduce(
     (columnsList2, key) => {
       const list = columnsEditableleObj[key];
@@ -152,7 +154,6 @@ const useAppTableWrapper = (hy) => {
     tableDropdownRef,
     operatorDropdownRef
   } = hy;
-  const { permissionMap } = usePermissionMap.usePermissionMap();
   const { t } = useLocale.useLocale();
   const CACHE_COLUMNS_KEY = props.controller || props.url || "CACHE_COLUMNS_KEY";
   const tableDataSource = vue.ref([]);
@@ -200,14 +201,11 @@ const useAppTableWrapper = (hy) => {
   function showAppTableLoading() {
     if (loadingInstance || !props.showLoading) return;
     closeAppTableLoading();
-    loadingInstance = elementPlus.ElLoading.service({
+    loadingInstance = index.ElLoading.service({
       target: containerRef.value,
       body: false,
       fullscreen: false,
-      text: t("hy.loading"),
-      lock: true,
-      // spinner: 'el-icon-loading',
-      background: "rgba(0, 0, 0, 0.8)"
+      lock: true
     });
     loadingTimer = setTimeout(() => {
       closeAppTableLoading();
@@ -265,6 +263,73 @@ const useAppTableWrapper = (hy) => {
       operatorDropdownRef.value?.handleClose();
     }
   }
+  const expandRowKeys = vue.ref([]);
+  const expandRowKeyMap = vue.computed(() => {
+    return expandRowKeys.value.reduce((keyMap, key, index) => {
+      keyMap.set(key, index);
+      return keyMap;
+    }, /* @__PURE__ */ new Map());
+  });
+  const isExpandTable = vue.computed(() => {
+    if (props.type === "default") {
+      return tableColumnsList.value.some((column) => column.type === "expand");
+    } else if (props.type === "virtual") {
+      return tableColumnsList.value.some(
+        (column) => column.type === "expand" && column.expandType === "expand"
+      );
+    }
+    return false;
+  });
+  const isAccordionMode = vue.computed(() => {
+    return isExpandTable.value && props.expandMode === "accordion";
+  });
+  function setRowExpansion(list = []) {
+    const keys = (list || []).map((item) => {
+      return is.isString(item) || is.isNumber(item) ? item : getRowKey(item);
+    }).filter(Boolean);
+    expandRowKeys.value = isAccordionMode.value ? [keys[0]] : keys;
+  }
+  function toggleRowExpansion(row, expanded) {
+    const key = is.isString(row) || is.isNumber(row) ? row : getRowKey(row);
+    const index = expandRowKeyMap.value.get(key);
+    const isExpanded = is.isBoolean(expanded) ? expanded : !is.isNumber(index);
+    if (isAccordionMode.value) {
+      if (isExpanded) {
+        expandRowKeys.value = [key];
+      } else if (index >= 0) {
+        expandRowKeys.value = [];
+      }
+    } else {
+      if (isExpanded && !is.isNumber(index)) {
+        expandRowKeys.value.push(key);
+      } else if (!isExpanded && is.isNumber(index)) {
+        expandRowKeys.value.splice(index, 1);
+      }
+    }
+    emits("expand-change", row, isExpanded);
+  }
+  function onTableRowExpandChangeHandler(row, expandedRows) {
+    if (props.type === "virtual") {
+      toggleRowExpansion(row, expandedRows);
+    } else {
+      let isExpanded = false;
+      if (!isExpandTable.value) {
+        const key = getRowKey(row);
+        const index = expandRowKeyMap.value.get(key);
+        if (expandedRows && !is.isNumber(index)) {
+          expandRowKeys.value.push(key);
+          isExpanded = true;
+        } else if (!expandedRows && is.isNumber(index)) {
+          expandRowKeys.value.splice(index, 1);
+          isExpanded = false;
+        }
+      } else {
+        isExpanded = isAccordionMode.value && expandedRows.length > 1 || expandRowKeys.value.length > expandedRows.length;
+        expandRowKeys.value = isAccordionMode.value && expandedRows.length > 1 ? [getRowKey(row)] : expandedRows.map((item) => getRowKey(item));
+      }
+      emits("expand-change", row, isExpanded);
+    }
+  }
   const selectedList = vue.ref([]);
   const selectedMap = vue.computed(() => {
     return (selectedList.value || []).reduce((map, row, index) => {
@@ -341,22 +406,6 @@ const useAppTableWrapper = (hy) => {
     }
     return className.filter(Boolean).join(" ");
   }
-  function toggleRowExpansion(row) {
-    if (tableRef.value && tableColumns.value.some((column) => column.type === "expand")) {
-      tableRef.value.toggleRowExpansion(row);
-    }
-  }
-  function onTableRowExpandChangeHandler(row, expandedRows) {
-    if (is.isBoolean(expandedRows) || props.expandMode !== "accordion" || expandedRows.length <= 1) {
-      props.onExpandChange && props.onExpandChange(row, expandedRows);
-      return;
-    } else {
-      expandedRows.forEach((item) => {
-        if (getRowKey(row) === getRowKey(item)) return;
-        toggleRowExpansion(item);
-      });
-    }
-  }
   const isSearchFocus = vue.ref(false);
   function onSearchInputHandler() {
     isSearchFocus.value = true;
@@ -388,10 +437,13 @@ const useAppTableWrapper = (hy) => {
     getSelectedList,
     clearSelection,
     clearSelectedList,
+    expandRowKeys,
+    expandRowKeyMap,
+    setRowExpansion,
     toggleRowExpansion,
+    onTableRowExpandChangeHandler,
     onTableSelectHandler,
     onTableRowContextmenuHandler,
-    onTableRowExpandChangeHandler,
     onTableRowClickHandler,
     onTableColumnsSelectHandler,
     // 搜索选中

package/lib/components/hyTable/js/search.js

@@ -1,6 +1,8 @@
 'use strict';
 
 var vue = require('vue');
+require('../../../utils/index.js');
+require('../../../hooks/index.js');
 var useApi = require('../../../hooks/useApi.js');
 var is = require('../../../utils/is.js');
 

package/lib/components/hyTable/js/useAppTable.js

@@ -1,9 +1,12 @@
 'use strict';
 
 var vue = require('vue');
+require('../../../hooks/index.js');
+require('../../../utils/index.js');
+require('../../index.js');
+var useLocale = require('../../../hooks/useLocale.js');
 var is = require('../../../utils/is.js');
 var useAppSearch = require('../../hySearch/js/useAppSearch.js');
-var useLocale = require('../../../hooks/useLocale.js');
 
 function getColumnDefaultConfig(column) {
   const { t } = useLocale.useLocale();
@@ -25,7 +28,8 @@ function getColumnDefaultConfig(column) {
     case "operator":
       return {
         label: t("table.operator"),
-        prop: `operator_prop`
+        prop: `operator_prop`,
+        fixed: "right"
       };
     default:
       return {};
@@ -110,8 +114,8 @@ const useAppTable = (config = {}) => {
   try {
     for (let i = 0; i < columns?.length; i++) {
       const column = columns[i];
-      if (is.isEmpty(column.prop) && column.type === "default") {
-        throw Error("\u3010column.prop\u3011\u4E0D\u80FD\u4E3A\u7A7A");
+      if (is.isEmpty(column.prop) && !/^(selection|index|expand|operator)$/.test(column.type)) {
+        console.error("\u3010column.prop\u3011\u4E0D\u80FD\u4E3A\u7A7A");
       }
       const sort = getColumnSort(column);
       if (!defaultSortInfo && sort.default) {

package/lib/components/hyTable/table.vue.js

@@ -5,6 +5,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var vue = require('vue');
 var elementPlus = require('element-plus');
 var iconsVue = require('@element-plus/icons-vue');
+require('../index.js');
+require('../../hooks/index.js');
+require('../../utils/index.js');
 var index = require('./js/index.js');
 var search = require('./js/search.js');
 var headerItem = require('./cpns/headerItem.vue.js');
@@ -189,10 +192,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       type: String,
       default: "default"
       // deafult-默认 accordion-手风琴
-    },
-    onExpandChange: {
-      // 展开回调
-      type: Function
     }
   }, {
     "loading": { type: Boolean, default: false },
@@ -201,6 +200,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
   emits: /* @__PURE__ */ vue.mergeModels([
     "row-click",
     "select-all",
+    "expand-change",
     "on-select-checkbox",
     "reqSuccess",
     "search-data"
@@ -231,6 +231,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       setTableRowClassName,
       clearSelection,
       clearSelectedList,
+      expandRowKeys,
+      expandRowKeyMap,
+      setRowExpansion,
       toggleRowExpansion,
       onTableRowClickHandler,
       onTableRowContextmenuHandler,
@@ -282,6 +285,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       getTableDataSource,
       clearSelection,
       clearSelectedList,
+      setRowExpansion,
       toggleRowExpansion,
       showAppTableLoading,
       closeAppTableLoading
@@ -410,6 +414,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 style: {
                   "font-size": `${vue.unref(adaptive.parseRem)(__props.fontSize)}rem`
                 },
+                "expand-row-keys": vue.unref(expandRowKeys),
                 onSelect: vue.unref(onTableSelectHandler),
                 onSelectAll: vue.unref(onTableSelectHandler),
                 onRowClick: vue.unref(onTableRowClickHandler),
@@ -662,13 +667,16 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 ]),
                 _: 3
                 /* FORWARDED */
-              }, 16, ["row-key", "data", "show-header", "row-class-name", "class", "style", "onSelect", "onSelectAll", "onRowClick", "onRowContextmenu", "onExpandChange"])) : vue.createCommentVNode("v-if", true),
+              }, 16, ["row-key", "data", "show-header", "row-class-name", "class", "style", "expand-row-keys", "onSelect", "onSelectAll", "onRowClick", "onRowContextmenu", "onExpandChange"])) : vue.createCommentVNode("v-if", true),
               __props.type === "virtual" ? (vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElAutoResizer), { key: 1 }, {
                 default: vue.withCtx(({ height, width }) => [
                   vue.createVNode(virtualTable.default, vue.mergeProps({
                     ref_key: "tableRef",
                     ref: tableRef
                   }, _ctx.$attrs, {
+                    expandedRowKeys: vue.unref(expandRowKeys),
+                    "onUpdate:expandedRowKeys": ($event) => vue.isRef(expandRowKeys) ? expandRowKeys.value = $event : null,
+                    expandRowKeyMap: vue.unref(expandRowKeyMap),
                     width,
                     height,
                     data: vue.unref(tableDataSource),
@@ -688,7 +696,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                     onSelectAll: vue.unref(onTableSelectHandler),
                     onRowClick: vue.unref(onTableRowClickHandler),
                     onRowContextmenu: vue.unref(onTableRowContextmenuHandler),
-                    onExpandChange: __props.onExpandChange
+                    onExpandClick: vue.unref(onTableRowExpandChangeHandler)
                   }), vue.createSlots({
                     empty: vue.withCtx(() => [
                       vue.createElementVNode("div", { class: "w-full h-full flex items-center justify-center border-b border-border" }, [
@@ -714,7 +722,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                         ])
                       };
                     })
-                  ]), 1040, ["width", "height", "data", "columns", "columns-editable", "show-header", "row-class-name", "show-all-select", "style", "row-key", "filter-model", "expandMode", "onSearch", "onSelect", "onSelectAll", "onRowClick", "onRowContextmenu", "onExpandChange"])
+                  ]), 1040, ["expandedRowKeys", "onUpdate:expandedRowKeys", "expandRowKeyMap", "width", "height", "data", "columns", "columns-editable", "show-header", "row-class-name", "show-all-select", "style", "row-key", "filter-model", "expandMode", "onSearch", "onSelect", "onSelectAll", "onRowClick", "onRowContextmenu", "onExpandClick"])
                 ]),
                 _: 3
                 /* FORWARDED */

package/lib/components/hyTableActionButton/index.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var tableActionButton = require('./tableActionButton.vue.js');
+require('../../utils/index.js');
 var handler = require('../../utils/handler.js');
 
 const HyTableActionButton = handler.withInstall(tableActionButton.default);

package/lib/components/hyTableActionButton/tableActionButton.vue.js

@@ -5,11 +5,14 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var vue = require('vue');
 var elementPlus = require('element-plus');
 var iconsVue = require('@element-plus/icons-vue');
+require('../../hooks/index.js');
+require('../../utils/index.js');
+require('../index.js');
 var useLocale = require('../../hooks/useLocale.js');
+var is = require('../../utils/is.js');
 var index = require('../hyTooltip/index.js');
 var index$1 = require('../hyButton/index.js');
 var index$2 = require('../hyIcon/index.js');
-var is = require('../../utils/is.js');
 
 import "./style/tableActionButton.scss";
 
@@ -119,11 +122,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         return false;
       }
       const show = vue.unref(operate.show);
-      if (operate.show === null || operate.show === void 0) {
-        return true;
-      } else {
-        return !!show;
-      }
+      if (is.isBoolean(show)) return show;
+      if (is.isFunction(show)) return show();
+      return true;
     }
     vue.watch(() => props.operateList, setSelectedData, { deep: true, immediate: true });
     __expose({});