hy-dispatch-ui-v3 0.2.62 → 0.2.64

package/es/components/hyOrgCascader/orgCascader.vue.mjs

@@ -1,8 +1,9 @@
 import { defineComponent, useModel, useTemplateRef, ref, computed, watch, onUnmounted, openBlock, createElementBlock, createElementVNode, normalizeStyle, createVNode, unref, renderSlot, toDisplayString, createCommentVNode, createBlock, normalizeClass, mergeModels } from 'vue';
 import { ElCascader } from 'element-plus';
+import '../../hooks/index.mjs';
 import { getOrgTreeSimple, orgTreeDatahandler } from './js/index.mjs';
-import { useLocale } from '../../hooks/useLocale.mjs';
 import { useSubscribe } from '../../hooks/useSubscribe.mjs';
+import { useLocale } from '../../hooks/useLocale.mjs';
 
 import "./style/orgCascader.scss";
 

package/es/components/hyRadioGroup/index.mjs

@@ -1,4 +1,5 @@
 import _sfc_main from './radioGroup.vue.mjs';
+import '../../utils/index.mjs';
 import { withInstall } from '../../utils/handler.mjs';
 
 const HyRadioGroup = withInstall(_sfc_main);

package/es/components/hyRadioGroup/radioGroup.vue.mjs

@@ -1,4 +1,4 @@
-import { useModel, useTemplateRef, ref, computed, watch, openBlock, createElementBlock, normalizeClass, Fragment, renderList, renderSlot, createTextVNode, toDisplayString, normalizeStyle, createCommentVNode, mergeModels, defineComponent, nextTick } from 'vue';
+import { defineComponent, useModel, useTemplateRef, ref, computed, nextTick, watch, openBlock, createElementBlock, normalizeClass, Fragment, renderList, renderSlot, createTextVNode, toDisplayString, normalizeStyle, createCommentVNode, mergeModels } from 'vue';
 
 import "./style/radioGroup.scss";
 
@@ -82,7 +82,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
               return openBlock(), 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)
               }, [
                 renderSlot(_ctx.$slots, "default", {
                   item,

package/es/components/hySearch/cpns/searchItem.vue.mjs

@@ -1,6 +1,8 @@
 import { computed, unref, openBlock, createBlock, withCtx, createElementVNode, normalizeStyle, createCommentVNode, normalizeClass, renderSlot, createElementBlock, toDisplayString, Fragment, createVNode, mergeProps, withKeys, renderList } from 'vue';
 import { ElFormItem, ElSelect, ElCascader } from 'element-plus';
-import { columnShowHandler, columnItemStyle, columnItemInputStyle, isDisabled, optionsHandler, isSelectedTimeRange, timeRangeHandler } from '../js/index.mjs';
+import '../../../utils/index.mjs';
+import '../../index.mjs';
+import { timeRangeHandler, columnShowHandler, columnItemStyle, columnItemInputStyle, isDisabled, optionsHandler, isSelectedTimeRange } from '../js/index.mjs';
 import { isArray } from '../../../utils/is.mjs';
 import { setValueByProp, getValueByProp, columnPlaceholderHandler, columnLabelHandler } from '../../../utils/form.mjs';
 import { HyInput } from '../../hyInput/index.mjs';

package/es/components/hySearch/index.mjs

@@ -1,4 +1,5 @@
 import _sfc_main from './search.vue.mjs';
+import '../../utils/index.mjs';
 export { resetAppSearchValue, useAppSearch } from './js/useAppSearch.mjs';
 import { withInstall } from '../../utils/handler.mjs';
 

package/es/components/hySearch/js/index.mjs

@@ -1,7 +1,9 @@
 import dayjs from 'dayjs';
-import { ref, unref } from 'vue';
+import { unref, ref } from 'vue';
+import '../../../utils/index.mjs';
+import '../../../hooks/index.mjs';
+import { isNumber, isString, isBoolean, isFunction, isEmpty, isArray } from '../../../utils/is.mjs';
 import { useResizeObserver } from '../../../hooks/useResizeObserver.mjs';
-import { isEmpty, isArray, isBoolean, isFunction, isNumber, isString } from '../../../utils/is.mjs';
 
 function columnItemStyle(props, column) {
   const { width } = column;

package/es/components/hySearch/js/useAppSearch.mjs

@@ -1,8 +1,10 @@
 import { unref, toRef } from 'vue';
-import { funRunHandler, mergeDeep } from '../../../utils/handler.mjs';
-import { genValueByProp, genColumnDefaultLabel } from '../../../utils/form.mjs';
+import '../../../hooks/index.mjs';
+import '../../../utils/index.mjs';
 import { useLocale } from '../../../hooks/useLocale.mjs';
 import { isNumber } from '../../../utils/is.mjs';
+import { genColumnDefaultLabel, genValueByProp } from '../../../utils/form.mjs';
+import { mergeDeep, funRunHandler } from '../../../utils/handler.mjs';
 
 const genColumnWidth = (config) => {
   let { width, inputWidth, type, attrs } = config || {};

package/es/components/hySearch/search.vue.mjs

@@ -1,6 +1,9 @@
 import { defineComponent, useTemplateRef, computed, unref, onUnmounted, openBlock, createElementBlock, normalizeClass, createElementVNode, createVNode, toDisplayString, Fragment, createCommentVNode, withDirectives, normalizeStyle, withCtx, vShow, mergeProps, renderList, createBlock, createSlots, renderSlot } from 'vue';
 import { ElIcon, ElForm } from 'element-plus';
 import { ArrowDown } from '@element-plus/icons-vue';
+import '../../hooks/index.mjs';
+import '../../utils/index.mjs';
+import '../index.mjs';
 import _sfc_main$1 from './cpns/searchItem.vue.mjs';
 import { useShrink, isEmptyValue } from './js/index.mjs';
 import { resetAppSearchValue } from './js/useAppSearch.mjs';

package/es/components/hyTable/cpns/columnSelect.vue.mjs

@@ -1,14 +1,17 @@
-import { useTemplateRef, ref, computed, unref, watch, openBlock, createBlock, withCtx, createElementVNode, toDisplayString, createVNode, normalizeClass, createCommentVNode, createElementBlock, Fragment, renderList, createTextVNode, nextTick } from 'vue';
+import { useTemplateRef, ref, computed, unref, nextTick, watch, openBlock, createBlock, withCtx, createElementVNode, toDisplayString, createVNode, normalizeClass, createCommentVNode, createElementBlock, Fragment, renderList, createTextVNode } from 'vue';
 import Sortable from 'sortablejs';
-import { ElPopover, ElCheckboxGroup, ElIcon, ElMessage } from 'element-plus';
+import { ElMessage, ElPopover, ElCheckboxGroup, ElIcon } from 'element-plus';
 import { Warning } from '@element-plus/icons-vue';
+import '../../../hooks/index.mjs';
+import '../../../utils/index.mjs';
+import '../../index.mjs';
 import { tableColumnShowHandler, tableColumnHandler } from '../js/index.mjs';
 import _sfc_main$1 from './columnSelectItem.vue.mjs';
 import { useLocale } from '../../../hooks/useLocale.mjs';
+import { isEmpty } from '../../../utils/is.mjs';
 import { HyIcon } from '../../hyIcon/index.mjs';
 import { HyTooltip } from '../../hyTooltip/index.mjs';
 import { HyButton } from '../../hyButton/index.mjs';
-import { isEmpty } from '../../../utils/is.mjs';
 
 const _sfc_main = {
   __name: "columnSelect",

package/es/components/hyTable/cpns/columnSelectItem.vue.mjs

@@ -1,7 +1,9 @@
 import { openBlock, createBlock, unref, withCtx, createElementVNode, toDisplayString, createElementBlock, createCommentVNode, Fragment, renderList, normalizeClass, createVNode, withModifiers } from 'vue';
 import { ElPopover, ElIcon, ElCheckbox } from 'element-plus';
 import { Lock } from '@element-plus/icons-vue';
+import '../../../hooks/index.mjs';
 import { renderHeaderHandler } from '../js/index.mjs';
+import '../../index.mjs';
 import { useLocale } from '../../../hooks/useLocale.mjs';
 import { HyTooltip } from '../../hyTooltip/index.mjs';
 
@@ -23,6 +25,7 @@ const _sfc_main = {
   },
   emits: ["checked"],
   setup(__props, { emit: __emit }) {
+    const props = __props;
     const emits = __emit;
     const { t } = useLocale();
     function onClickHandler(column) {

package/es/components/hyTable/cpns/headerItem.vue.mjs

@@ -1,6 +1,9 @@
 import { computed, openBlock, createElementBlock, createElementVNode, createVNode, unref, withModifiers, withCtx, renderSlot } from 'vue';
 import { ElIcon } from 'element-plus';
 import { ArrowUpBold, ArrowDownBold } from '@element-plus/icons-vue';
+import '../../index.mjs';
+import '../../../utils/index.mjs';
+import '../js/index.mjs';
 
 const _sfc_main = {
   __name: "headerItem",

package/es/components/hyTable/cpns/virtualTable.vue.mjs

@@ -1,16 +1,19 @@
-import { computed, ref, openBlock, createBlock, unref, withCtx, renderSlot, createCommentVNode, createElementBlock, Fragment, renderList, normalizeStyle, withModifiers, normalizeClass, createVNode, mergeProps, createTextVNode, toDisplayString, createElementVNode, normalizeProps, guardReactiveProps } from 'vue';
+import { useModel, computed, ref, openBlock, createBlock, unref, withCtx, renderSlot, createCommentVNode, createElementBlock, Fragment, renderList, normalizeStyle, withModifiers, normalizeClass, createVNode, mergeProps, createTextVNode, toDisplayString, createElementVNode, normalizeProps, guardReactiveProps, mergeModels } from 'vue';
 import { ElTableV2, ElIcon, ElCheckbox, ElDropdown, ElDropdownMenu, ElDropdownItem } from 'element-plus';
 import { ArrowRight, MoreFilled } from '@element-plus/icons-vue';
+import '../../index.mjs';
+import '../../../hooks/index.mjs';
+import '../../../utils/index.mjs';
 import { operatorFilterHandler, operatorClickHandler, operatorDisabledHandler, operatorDisableTextdHandler, renderContentHandler, renderHeaderHandler } from '../js/index.mjs';
 import _sfc_main$1 from './headerItem.vue.mjs';
 import { useLocale } from '../../../hooks/useLocale.mjs';
-import { isNumber, isEmpty, isBoolean, isArray, isString, isFunction } from '../../../utils/is.mjs';
+import { isNumber, isString, isFunction, isArray, isBoolean, isEmpty } from '../../../utils/is.mjs';
 import { HyTooltip } from '../../hyTooltip/index.mjs';
 import { HyIcon } from '../../hyIcon/index.mjs';
 
 const _sfc_main = {
   __name: "virtualTable",
-  props: {
+  props: /* @__PURE__ */ mergeModels({
     rowKey: {
       type: [String, Number],
       default: "id"
@@ -59,12 +62,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__ */ mergeModels(["search", "select", "select-all", "expand-click"], ["update:expandedRowKeys"]),
   setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const emits = __emit;
+    const expandedRowKeys = useModel(__props, "expandedRowKeys");
     const { t } = useLocale();
     const avgWidth = computed(() => {
       const { total, totalWidth } = props.columns.reduce(
@@ -181,6 +195,7 @@ const _sfc_main = {
       }
       const checkedNodeMap = new Map(selectedMap.value);
       const isChecked = isBoolean(selected) ? selected : !checkedNodeMap.has(key);
+      const checkStrictly = false;
       const toggle = (node, checked) => {
         const nodeKey = getRowKey(node);
         if (isSelectable(node)) {
@@ -191,7 +206,7 @@ const _sfc_main = {
           }
         }
         const children = node.children;
-        if (children) {
+        if (!checkStrictly && children) {
           children.forEach((childNode) => {
             toggle(childNode, checked);
           });
@@ -252,46 +267,12 @@ const _sfc_main = {
       const { allChecked } = handler(list, checkedNodeMap, indeterminateKeys2);
       return { checkedNodeMap, indeterminateKeys: indeterminateKeys2, allChecked };
     }
-    const expandedKeys = ref([]);
-    const expandedMap = 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 = isBoolean(expanded) ? expanded : !isNumber(index);
-      if (isExpanded) {
-        if (!isNumber(index)) {
-          if (props.expandMode === "accordion" && isExpandTable.value) {
-            expandedKeys.value = [getRowKey(row)];
-          } else {
-            expandedKeys.value.push(getRowKey(row));
-          }
-        }
-      } else {
-        if (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();
@@ -300,8 +281,8 @@ const _sfc_main = {
     });
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(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,
@@ -383,10 +364,11 @@ const _sfc_main = {
                             type: "button",
                             "aria-label": "\u5C55\u5F00\u5F53\u524D\u884C",
                             "aria-expanded": "false",
-                            class: normalizeClass(["hy-el-table-v2__expand-icon", { "is-expanded": expandedMap.value.has(getRowKey(row)) }]),
+                            class: normalizeClass(["hy-el-table-v2__expand-icon", { "is-expanded": __props.expandRowKeyMap.has(getRowKey(row)) }]),
                             onClick: withModifiers(($event) => onRowExpandSwitch({
                               rowData: _ctx.rowData,
                               row,
+                              rowIndex: $index,
                               rowKey: getRowKey(row)
                             }), ["stop"])
                           }, [

package/es/components/hyTable/index.mjs

@@ -1,4 +1,5 @@
 import _sfc_main from './table.vue.mjs';
+import '../../utils/index.mjs';
 export { useAppTable } from './js/useAppTable.mjs';
 import { withInstall } from '../../utils/handler.mjs';
 

package/es/components/hyTable/js/index.mjs

@@ -1,8 +1,10 @@
-import { ref, computed, watch, watchEffect, unref, nextTick } from 'vue';
-import { ElLoading } from 'element-plus';
-import { usePermissionMap } from '../../../hooks/usePermissionMap.mjs';
+import { unref, ref, computed, watch, nextTick, watchEffect } from 'vue';
+import '../../../hooks/index.mjs';
+import '../../../utils/index.mjs';
+import '../../index.mjs';
+import { isPermission, isBoolean, isFunction, isNumber, isString, isArray } from '../../../utils/is.mjs';
 import { useLocale } from '../../../hooks/useLocale.mjs';
-import { isString, isBoolean, isFunction, isPermission, isNumber, isArray } from '../../../utils/is.mjs';
+import { ElLoading as HyLoading } from '../../hyLoading/index.mjs';
 
 function tableColumnShowHandler(column) {
   if (column.permission && !isPermission(column.permission)) {
@@ -28,7 +30,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];
@@ -150,7 +152,6 @@ const useAppTableWrapper = (hy) => {
     tableDropdownRef,
     operatorDropdownRef
   } = hy;
-  const { permissionMap } = usePermissionMap();
   const { t } = useLocale();
   const CACHE_COLUMNS_KEY = props.controller || props.url || "CACHE_COLUMNS_KEY";
   const tableDataSource = ref([]);
@@ -198,14 +199,11 @@ const useAppTableWrapper = (hy) => {
   function showAppTableLoading() {
     if (loadingInstance || !props.showLoading) return;
     closeAppTableLoading();
-    loadingInstance = ElLoading.service({
+    loadingInstance = HyLoading.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();
@@ -263,6 +261,73 @@ const useAppTableWrapper = (hy) => {
       operatorDropdownRef.value?.handleClose();
     }
   }
+  const expandRowKeys = ref([]);
+  const expandRowKeyMap = computed(() => {
+    return expandRowKeys.value.reduce((keyMap, key, index) => {
+      keyMap.set(key, index);
+      return keyMap;
+    }, /* @__PURE__ */ new Map());
+  });
+  const isExpandTable = 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 = computed(() => {
+    return isExpandTable.value && props.expandMode === "accordion";
+  });
+  function setRowExpansion(list = []) {
+    const keys = (list || []).map((item) => {
+      return isString(item) || isNumber(item) ? item : getRowKey(item);
+    }).filter(Boolean);
+    expandRowKeys.value = isAccordionMode.value ? [keys[0]] : keys;
+  }
+  function toggleRowExpansion(row, expanded) {
+    const key = isString(row) || isNumber(row) ? row : getRowKey(row);
+    const index = expandRowKeyMap.value.get(key);
+    const isExpanded = isBoolean(expanded) ? expanded : !isNumber(index);
+    if (isAccordionMode.value) {
+      if (isExpanded) {
+        expandRowKeys.value = [key];
+      } else if (index >= 0) {
+        expandRowKeys.value = [];
+      }
+    } else {
+      if (isExpanded && !isNumber(index)) {
+        expandRowKeys.value.push(key);
+      } else if (!isExpanded && 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 && !isNumber(index)) {
+          expandRowKeys.value.push(key);
+          isExpanded = true;
+        } else if (!expandedRows && 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 = ref([]);
   const selectedMap = computed(() => {
     return (selectedList.value || []).reduce((map, row, index) => {
@@ -339,22 +404,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 (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 = ref(false);
   function onSearchInputHandler() {
     isSearchFocus.value = true;
@@ -386,10 +435,13 @@ const useAppTableWrapper = (hy) => {
     getSelectedList,
     clearSelection,
     clearSelectedList,
+    expandRowKeys,
+    expandRowKeyMap,
+    setRowExpansion,
     toggleRowExpansion,
+    onTableRowExpandChangeHandler,
     onTableSelectHandler,
     onTableRowContextmenuHandler,
-    onTableRowExpandChangeHandler,
     onTableRowClickHandler,
     onTableColumnsSelectHandler,
     // 搜索选中

package/es/components/hyTable/js/search.mjs

@@ -1,4 +1,6 @@
 import { ref, nextTick, unref } from 'vue';
+import '../../../utils/index.mjs';
+import '../../../hooks/index.mjs';
 import { useApi } from '../../../hooks/useApi.mjs';
 import { isEmpty, isNumber, isString } from '../../../utils/is.mjs';
 

package/es/components/hyTable/js/useAppTable.mjs

@@ -1,7 +1,10 @@
 import { toRef } from 'vue';
-import { isEmpty, isBoolean, isString, isObject, isPermission } from '../../../utils/is.mjs';
-import { useAppSearch } from '../../hySearch/js/useAppSearch.mjs';
+import '../../../hooks/index.mjs';
+import '../../../utils/index.mjs';
+import '../../index.mjs';
 import { useLocale } from '../../../hooks/useLocale.mjs';
+import { isPermission, isBoolean, isString, isObject, isEmpty } from '../../../utils/is.mjs';
+import { useAppSearch } from '../../hySearch/js/useAppSearch.mjs';
 
 function getColumnDefaultConfig(column) {
   const { t } = useLocale();
@@ -23,7 +26,8 @@ function getColumnDefaultConfig(column) {
     case "operator":
       return {
         label: t("table.operator"),
-        prop: `operator_prop`
+        prop: `operator_prop`,
+        fixed: "right"
       };
     default:
       return {};
@@ -108,8 +112,8 @@ const useAppTable = (config = {}) => {
   try {
     for (let i = 0; i < columns?.length; i++) {
       const column = columns[i];
-      if (isEmpty(column.prop) && column.type === "default") {
-        throw Error("\u3010column.prop\u3011\u4E0D\u80FD\u4E3A\u7A7A");
+      if (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/es/components/hyTable/table.vue.mjs

@@ -1,6 +1,9 @@
-import { defineComponent, useModel, useTemplateRef, openBlock, createElementBlock, createCommentVNode, createElementVNode, createBlock, unref, createVNode, toDisplayString, withCtx, renderSlot, normalizeClass, createSlots, renderList, normalizeProps, guardReactiveProps, mergeProps, Fragment, withModifiers, mergeModels } from 'vue';
+import { defineComponent, useModel, useTemplateRef, openBlock, createElementBlock, createCommentVNode, createElementVNode, createBlock, unref, createVNode, toDisplayString, withCtx, renderSlot, normalizeClass, createSlots, renderList, normalizeProps, guardReactiveProps, mergeProps, Fragment, withModifiers, isRef, mergeModels } from 'vue';
 import { ElTable, ElTableColumn, ElDropdown, ElIcon, ElDropdownMenu, ElDropdownItem, ElAutoResizer, ElPagination } from 'element-plus';
 import { MoreFilled } from '@element-plus/icons-vue';
+import '../index.mjs';
+import '../../hooks/index.mjs';
+import '../../utils/index.mjs';
 import { useAppTableWrapper, operatorFilterHandler, operatorClickHandler, operatorDisabledHandler, operatorDisableTextdHandler, renderContentHandler, renderHeaderHandler } from './js/index.mjs';
 import { useAppTableSearch } from './js/search.mjs';
 import _sfc_main$2 from './cpns/headerItem.vue.mjs';
@@ -185,10 +188,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       type: String,
       default: "default"
       // deafult-默认 accordion-手风琴
-    },
-    onExpandChange: {
-      // 展开回调
-      type: Function
     }
   }, {
     "loading": { type: Boolean, default: false },
@@ -197,6 +196,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
   emits: /* @__PURE__ */ mergeModels([
     "row-click",
     "select-all",
+    "expand-change",
     "on-select-checkbox",
     "reqSuccess",
     "search-data"
@@ -227,6 +227,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       setTableRowClassName,
       clearSelection,
       clearSelectedList,
+      expandRowKeys,
+      expandRowKeyMap,
+      setRowExpansion,
       toggleRowExpansion,
       onTableRowClickHandler,
       onTableRowContextmenuHandler,
@@ -278,6 +281,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       getTableDataSource,
       clearSelection,
       clearSelectedList,
+      setRowExpansion,
       toggleRowExpansion,
       showAppTableLoading,
       closeAppTableLoading
@@ -406,6 +410,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 style: {
                   "font-size": `${unref(parseRem)(__props.fontSize)}rem`
                 },
+                "expand-row-keys": unref(expandRowKeys),
                 onSelect: unref(onTableSelectHandler),
                 onSelectAll: unref(onTableSelectHandler),
                 onRowClick: unref(onTableRowClickHandler),
@@ -658,13 +663,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"])) : createCommentVNode("v-if", true),
+              }, 16, ["row-key", "data", "show-header", "row-class-name", "class", "style", "expand-row-keys", "onSelect", "onSelectAll", "onRowClick", "onRowContextmenu", "onExpandChange"])) : createCommentVNode("v-if", true),
               __props.type === "virtual" ? (openBlock(), createBlock(unref(ElAutoResizer), { key: 1 }, {
                 default: withCtx(({ height, width }) => [
                   createVNode(_sfc_main$3, mergeProps({
                     ref_key: "tableRef",
                     ref: tableRef
                   }, _ctx.$attrs, {
+                    expandedRowKeys: unref(expandRowKeys),
+                    "onUpdate:expandedRowKeys": ($event) => isRef(expandRowKeys) ? expandRowKeys.value = $event : null,
+                    expandRowKeyMap: unref(expandRowKeyMap),
                     width,
                     height,
                     data: unref(tableDataSource),
@@ -684,7 +692,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                     onSelectAll: unref(onTableSelectHandler),
                     onRowClick: unref(onTableRowClickHandler),
                     onRowContextmenu: unref(onTableRowContextmenuHandler),
-                    onExpandChange: __props.onExpandChange
+                    onExpandClick: unref(onTableRowExpandChangeHandler)
                   }), createSlots({
                     empty: withCtx(() => [
                       createElementVNode("div", { class: "w-full h-full flex items-center justify-center border-b border-border" }, [
@@ -710,7 +718,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/es/components/hyTableActionButton/index.mjs

@@ -1,4 +1,5 @@
 import _sfc_main from './tableActionButton.vue.mjs';
+import '../../utils/index.mjs';
 import { withInstall } from '../../utils/handler.mjs';
 
 const HyTableActionButton = withInstall(_sfc_main);

package/es/components/hyTableActionButton/tableActionButton.vue.mjs

@@ -1,11 +1,14 @@
-import { defineComponent, ref, computed, watch, openBlock, createElementBlock, createBlock, unref, withCtx, createVNode, normalizeClass, createTextVNode, toDisplayString, createElementVNode, Fragment, renderList, createCommentVNode, normalizeStyle } from 'vue';
+import { defineComponent, ref, computed, unref, watch, openBlock, createElementBlock, createBlock, withCtx, createVNode, normalizeClass, createTextVNode, toDisplayString, createElementVNode, Fragment, renderList, createCommentVNode, normalizeStyle } from 'vue';
 import { ElPopover, ElIcon } from 'element-plus';
 import { Warning, ArrowDown } from '@element-plus/icons-vue';
+import '../../hooks/index.mjs';
+import '../../utils/index.mjs';
+import '../index.mjs';
 import { useLocale } from '../../hooks/useLocale.mjs';
+import { isPermission, isBoolean, isFunction } from '../../utils/is.mjs';
 import { HyTooltip } from '../hyTooltip/index.mjs';
 import { HyButton } from '../hyButton/index.mjs';
 import { HyIcon } from '../hyIcon/index.mjs';
-import { isPermission } from '../../utils/is.mjs';
 
 import "./style/tableActionButton.scss";
 
@@ -115,11 +118,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         return false;
       }
       const show = unref(operate.show);
-      if (operate.show === null || operate.show === void 0) {
-        return true;
-      } else {
-        return !!show;
-      }
+      if (isBoolean(show)) return show;
+      if (isFunction(show)) return show();
+      return true;
     }
     watch(() => props.operateList, setSelectedData, { deep: true, immediate: true });
     __expose({});

package/es/components/hyTableForm/batchTableForm.vue.mjs

@@ -1,14 +1,17 @@
 import { defineComponent, useTemplateRef, useModel, ref, nextTick, openBlock, createElementBlock, withDirectives, createElementVNode, createVNode, unref, withCtx, Fragment, renderList, createCommentVNode, toDisplayString, renderSlot, vShow, createTextVNode, mergeProps, createSlots, normalizeProps, guardReactiveProps, normalizeStyle, mergeModels } from 'vue';
-import { ElUpload, ElIcon, ElMessage } from 'element-plus';
+import { ElMessage, ElUpload, ElIcon } from 'element-plus';
 import { Loading } from '@element-plus/icons-vue';
+import '../../hooks/index.mjs';
+import '../../utils/index.mjs';
+import '../index.mjs';
 import _sfc_main$1 from './tableForm.vue.mjs';
 import { doReadExcel } from './js/index.mjs';
 import { useApi } from '../../hooks/useApi.mjs';
 import { useLocale } from '../../hooks/useLocale.mjs';
+import { HyConfirmDialog } from '../hyConfirmDialog/index.mjs';
 import { isArray } from '../../utils/is.mjs';
 import { HyIcon } from '../hyIcon/index.mjs';
 import { HyButton } from '../hyButton/index.mjs';
-import { HyConfirmDialog } from '../hyConfirmDialog/index.mjs';
 
 import "./style/batchTableForm.scss";