hy-dispatch-ui-v3 0.2.63 → 0.2.65

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

@@ -14,7 +14,7 @@ const deviceStatus = {
   1: "\u5728\u7EBF"
 };
 const useAppTreeWrapper = (hy) => {
-  const { props: props2, emits, slots, treeRef, VirtualTree } = hy;
+  const { props, emits, slots, treeRef, VirtualTree } = hy;
   const instance = getCurrentInstance();
   const slotAppContext = instance ? {
     ...instance.appContext,
@@ -33,17 +33,17 @@ const useAppTreeWrapper = (hy) => {
   const selectFilterList = ref([]);
   const loading = ref(true);
   watch(
-    () => props2.showCheckbox,
+    () => props.showCheckbox,
     (newVal) => {
       virtualTree?.setRowSelection({
-        type: props2.showCheckbox ? "checkbox" : "radio"
+        type: props.showCheckbox ? "checkbox" : "radio"
       });
     }
   );
   function getData(dataList) {
     return new Promise((resolve) => {
       hy.loading.value = true;
-      if (props2.disableSelection?.length) {
+      if (props.disableSelection?.length) {
         setDisAbleSelectionMap();
       }
       if (!virtualTree) {
@@ -59,9 +59,9 @@ const useAppTreeWrapper = (hy) => {
           // 可视区域外的缓冲项数量
           indent: 16,
           emptyText: "\u6682\u65E0\u6570\u636E",
-          business: props2.treeType,
+          business: props.treeType,
           // 自定义整体的插槽
-          renderItem: props2.treeType === treeTypeConfig.user ? (data, node) => setUserSlot(data, node) : setSlot("treeParentSlot"),
+          renderItem: props.treeType === treeTypeConfig.user ? (data, node) => setUserSlot(data, node) : setSlot("treeParentSlot"),
           // // 自定义状态右侧插槽
           renderRight: (data) => {
             let renderRight = setSlot("renderRight");
@@ -87,9 +87,9 @@ const useAppTreeWrapper = (hy) => {
             return true;
           },
           // // 自定义状态模块
-          renderStatus: props2.treeType === treeTypeConfig.device || props2.treeType === treeTypeConfig.channel ? (data) => setRenderStatus(data) : null,
+          renderStatus: props.treeType === treeTypeConfig.device || props.treeType === treeTypeConfig.channel ? (data) => setRenderStatus(data) : null,
           renderEmpty: () => {
-            if (!props2.showCustomEmpty || hy.filterValue.value) return true;
+            if (!props.showCustomEmpty || hy.filterValue.value) return true;
             let renderEmpty = setSlot("renderEmpty");
             if (renderEmpty) {
               const target = renderEmpty();
@@ -108,23 +108,23 @@ const useAppTreeWrapper = (hy) => {
               }
               return false;
             },
-            ...props2.treeProps
+            ...props.treeProps
           },
           rowSelection: {
-            type: props2.showCheckbox ? "checkbox" : "radio",
-            highlight: props2.highlight,
-            checkStrictly: props2.checkStrictly,
+            type: props.showCheckbox ? "checkbox" : "radio",
+            highlight: props.highlight,
+            checkStrictly: props.checkStrictly,
             // 是否显示选项 showSinglebox 单选为true时部门不显示其他节点显示选择框
             showSelect: (data) => {
               if (data.dataType === 1) {
-                return props2.showCheckbox;
+                return props.showCheckbox;
               }
-              return props2.showCheckbox || props2.showSinglebox;
+              return props.showCheckbox || props.showSinglebox;
             },
             // 单选时是否可以取消选择
-            cancelable: props2.cancelable,
+            cancelable: props.cancelable,
             // 是否显示多选框或单选框
-            showSelectBox: props2.showSelectBox,
+            showSelectBox: props.showSelectBox,
             // 选中回调
             onCheckChange: (data, info, checked) => {
               console.log("onCheckChange", info);
@@ -137,42 +137,51 @@ const useAppTreeWrapper = (hy) => {
                 "on-check-tree",
                 JSON.parse(
                   JSON.stringify(info.checkedBusinessNodes || info.checkedNodes)
-                )
+                ),
+                {
+                  data,
+                  info,
+                  checked
+                }
               );
             }
           },
           // 是否在点击节点的时候展开或者收缩节点
-          expandOnClickNode: props2.expandOnClickNode,
+          expandOnClickNode: props.expandOnClickNode,
           // 是否在点击节点的时候选中节点
-          checkOnClickNode: props2.checkOnClickNode,
+          checkOnClickNode: props.checkOnClickNode,
           // 点击叶节点(最后一个子节点)时是否检查或取消节点
-          checkOnClickLeaf: props2.checkOnClickLeaf,
+          checkOnClickLeaf: props.checkOnClickLeaf,
           // 双击父节点会触发选中功能
-          checkOnDblclickParentNode: props2.checkOnDblclickParentNode,
+          checkOnDblclickParentNode: props.checkOnDblclickParentNode,
           // 筛选方法
           filterMethod: ({ filterValue: filterValue2 }, data) => {
             let isFilter = true;
-            if (props2.filterMethod) {
-              isFilter = props2.filterMethod(data, { filterValue: filterValue2 });
+            console.log("111111111", isFilter, props.filterMethod);
+            if (props.filterMethod) {
+              isFilter = props.filterMethod(data, {
+                filterValue: filterValue2
+              });
             }
             if (filterValue2) {
               isFilter = isFilter && !!filterNodeMethod(data, filterValue2, {
-                treeFilterParam: props2.treeFilterParam
+                treeFilterParam: props.treeFilterParam,
+                treeType: props.treeType
               });
             }
             return isFilter;
           },
           businessConfig: {
             // 是否开启按在线离线状态排序
-            sortByStatus: props2.deviceOrderSort,
+            sortByStatus: props.deviceOrderSort,
             // 是否只显示在线设备
-            showOnlineState: props2.showOnlineOnly,
+            showOnlineState: props.showOnlineOnly,
             // 是否清空没有业务项（设备、用户、采集器）的部门和群组
-            clearEmptyBusiness: props2.clearEmptyBusiness,
+            clearEmptyBusiness: props.clearEmptyBusiness,
             // 是否显示通道节点的选择框
-            isShowChannelSelect: props2.isShowChannelSelect,
+            isShowChannelSelect: props.isShowChannelSelect,
             // 初始化过滤数据
-            filterConfig: props2.filterConfig
+            filterConfig: props.filterConfig
           },
           // 初始化时处理数据，想回显必须return值，若想要过滤，可不return
           handleMethod: (data) => {
@@ -193,7 +202,7 @@ const useAppTreeWrapper = (hy) => {
           },
           // 双击事件
           onNodeDblClick: (data, node, event) => {
-            if (props2.treeType !== "channel") {
+            if (props.treeType !== "channel") {
               emits("on-dblclick", [{ ...data }]);
             } else {
               if (data.channelId) {
@@ -233,13 +242,13 @@ const useAppTreeWrapper = (hy) => {
             document.body.click();
           },
           onLoad: () => {
-            if (props2.showOnlineOnly && !virtualTree._flattenTree?.length && !hy.filterValue.value) {
+            if (props.showOnlineOnly && !virtualTree._flattenTree?.length && !hy.filterValue.value) {
               ElMessage.warning("\u6682\u65E0\u8BBE\u5907\u5904\u4E8E\u5728\u7EBF\u72B6\u6001");
             }
-            if (props2.defaultSelectedOrgID && props2.showCheckbox && props2.treeType === "device") {
+            if (props.defaultSelectedOrgID && props.showCheckbox && props.treeType === "device") {
               setSelectedOrg(dataList);
-            } else if (props2.selectedByDefault?.length) {
-              setCheckedKeys(props2.selectedByDefault);
+            } else if (props.selectedByDefault?.length) {
+              setCheckedKeys(props.selectedByDefault);
             }
             if (hy.filterValue.value) {
               getFilterValue();
@@ -255,13 +264,13 @@ const useAppTreeWrapper = (hy) => {
           {
             data: dataList,
             businessConfig: {
-              sortByStatus: props2.deviceOrderSort,
-              showOnlineState: props2.showOnlineOnly,
-              clearEmptyBusiness: props2.clearEmptyBusiness
+              sortByStatus: props.deviceOrderSort,
+              showOnlineState: props.showOnlineOnly,
+              clearEmptyBusiness: props.clearEmptyBusiness
             }
           },
           () => {
-            if (props2.showOnlineOnly && !virtualTree._flattenTree?.length && !hy.filterValue.value) {
+            if (props.showOnlineOnly && !virtualTree._flattenTree?.length && !hy.filterValue.value) {
               ElMessage.success("\u6682\u65E0\u8BBE\u5907\u5904\u4E8E\u5728\u7EBF\u72B6\u6001");
             }
             if (hy.filterValue.value) {
@@ -278,7 +287,7 @@ const useAppTreeWrapper = (hy) => {
   }
   function setEmpty() {
     let content = ``;
-    if (!props2.showOnlineOnly) {
+    if (!props.showOnlineOnly) {
       setTimeout(() => {
         if (hy.addDeviceDom.value) {
           hy.addDeviceDom.value.removeEventListener("click", addDevice);
@@ -307,7 +316,7 @@ const useAppTreeWrapper = (hy) => {
   }
   function setDisAbleSelectionMap() {
     const map = /* @__PURE__ */ new Map();
-    props2.disableSelection.forEach((v) => {
+    props.disableSelection.forEach((v) => {
       map.set(v.id, true);
     });
     hy.disableSelectionMap.value = map;
@@ -331,7 +340,7 @@ const useAppTreeWrapper = (hy) => {
     container.style.display = "flex";
     container.style.width = "100%";
     const dutyHtml = `<div class="flex treeDeviceBox">
-                  ${props2.getDutyRoster === 1 && data.rosterContent ? `<span class="w-[22px] h-[22px] text-xs rounded border box-border text-main flex justify-center items-center mr-1"
+                  ${props.getDutyRoster === 1 && data.rosterContent ? `<span class="w-[22px] h-[22px] text-xs rounded border box-border text-main flex justify-center items-center mr-1"
                           style="border-color: ${data.rosterContentColor};background-color: ${data.rosterContentColor}70;">
                           ${data.rosterContentSimple}
                          </span>` : ""}
@@ -409,36 +418,45 @@ const useAppTreeWrapper = (hy) => {
   function setDeviceStatus(payload) {
     virtualTree?.updateData([payload]);
   }
-  function singleRemovalFn(row) {
-    if (props2.treeType === "device") {
+  function singleRemovalFn(row, isForce = false) {
+    if (props.treeType === "device" || props.treeType === "channel") {
       virtualTree.setChecked(row.channelId || row.deviceId, false, true);
-    } else if (props2.treeType) {
-      virtualTree.setChecked(row.id, false, true);
-    } else if (!props2.treeType && props2.treeProps) {
-      virtualTree.setChecked(row[`${props2.treeProps.value}`], false, true);
+    } else if (props.treeType) {
+      virtualTree.setChecked(row.id, false, true, isForce);
+    } else if (!props.treeType && props.treeProps) {
+      virtualTree.setChecked(
+        row[`${props.treeProps.value}`],
+        false,
+        true,
+        isForce
+      );
     }
   }
-  function setCheckedKeys(dataList) {
-    if (props2.treeType === "device" || props2.treeType === "channel") {
+  function setCheckedKeys(dataList, isForce = false) {
+    if (props.treeType === "device" || props.treeType === "channel") {
       virtualTree?.setCheckedKeys(
         dataList.map((v) => v.channelId || v.deviceId),
-        true
+        true,
+        isForce
       );
-    } else if (props2.treeType) {
+    } else if (props.treeType) {
       virtualTree?.setCheckedKeys(
         dataList.map((v) => v.id),
-        true
+        true,
+        isForce
       );
-    } else if (!props2.treeType && props2.treeProps) {
+    } else if (!props.treeType && props.treeProps) {
       console.log(
         "\u9009\u4E2D\u56DE\u8C03",
-        dataList.map((v) => v[`${props2.treeProps.value}`])
+        dataList.map((v) => v[`${props.treeProps.value}`])
       );
       virtualTree?.setCheckedKeys(
-        dataList.map((v) => v[`${props2.treeProps.value}`])
+        dataList.map((v) => v[`${props.treeProps.value}`]),
+        false,
+        isForce
       );
     }
-    if (props2.isBackDefaultSelected) {
+    if (props.isBackDefaultSelected) {
       setTimeout(() => {
         const deviceList = virtualTree?.getCheckedBusinessNodes(true) || [];
         emits("on-selectedDataList", deviceList);
@@ -446,17 +464,17 @@ const useAppTreeWrapper = (hy) => {
     }
   }
   function setChecked(data, type) {
-    if (props2.treeType === "device") {
+    if (props.treeType === "device") {
       virtualTree?.setChecked(data.channelId || data.deviceId, type, true);
-    } else if (props2.treeType) {
+    } else if (props.treeType) {
       virtualTree?.setChecked(data.id, type, true);
-    } else if (!props2.treeType && props2.treeProps) {
-      virtualTree?.setChecked(data[`${props2.treeProps.value}`], type, true);
+    } else if (!props.treeType && props.treeProps) {
+      virtualTree?.setChecked(data[`${props.treeProps.value}`], type, true);
     }
   }
   function setSelectedOrg(deviceList) {
     for (let i = 0; i < deviceList.length; i++) {
-      if (props2.defaultSelectedOrgID === deviceList[i].id) {
+      if (props.defaultSelectedOrgID === deviceList[i].id) {
         if (deviceList[i].deviceList?.length) {
           setCheckedKeys(deviceList[i].deviceList);
         }
@@ -468,17 +486,20 @@ const useAppTreeWrapper = (hy) => {
       }
     }
   }
-  function getSelectedDataList() {
-    return virtualTree?.getCheckedBusinessNodes(true) || [];
+  function getSelectedDataList(leafOnly = false) {
+    if (props.treeType) {
+      return virtualTree?.getCheckedBusinessNodes(leafOnly) || [];
+    }
+    return virtualTree?.getCheckedNodes(leafOnly) || [];
   }
   function setFilterListType(type) {
-    if (props2.selectFilterList?.length) {
+    if (props.selectFilterList?.length) {
       hy.selectFilterList.value = JSON.parse(
-        JSON.stringify(props2.selectFilterList)
+        JSON.stringify(props.selectFilterList)
       );
       return;
     }
-    if (props2.treeType === "device") {
+    if (props.treeType === "device") {
       hy.selectFilterList.value = [
         {
           label: "\u5168\u90E8",
@@ -496,7 +517,7 @@ const useAppTreeWrapper = (hy) => {
           placeholder: "\u8BBE\u5907\u53F7\u3001\u8BBE\u5907\u540D\u79F0\u8FDB\u884C\u7B5B\u9009"
         }
       ];
-    } else if (props2.treeType === "user") {
+    } else if (props.treeType === "user") {
       hy.selectFilterList.value = [
         {
           label: "\u5168\u90E8",
@@ -530,6 +551,9 @@ const useAppTreeWrapper = (hy) => {
       refreshData();
     }
   }
+  function getNode(id) {
+    return virtualTree.getNode(id);
+  }
   return {
     filterValue,
     virtualTree,
@@ -549,16 +573,17 @@ const useAppTreeWrapper = (hy) => {
     selectFilterType,
     selectedDataList,
     getSelectedDataList,
-    loading
+    loading,
+    getNode
   };
 };
-function filterNodeMethod(data, value, { selectFilterType, treeFilterParam = [] }) {
+function filterNodeMethod(data, value, { selectFilterType, treeFilterParam = [], treeType }) {
   let type = data.dataType;
   if (selectFilterType) type = selectFilterType;
   const includesValue = (field) => {
     return field && field.toString().includes(value.toString());
   };
-  if (!props.treeType) {
+  if (!treeType) {
     let filterType = false;
     for (let i = 0; i < treeFilterParam.length; i++) {
       const item = treeFilterParam[i];

package/es/components/hyTree/tree.vue.mjs

@@ -183,7 +183,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     // 外部自定义过滤函数
     filterMethod: {
       type: Function,
-      default: () => null
+      default: null
     }
   },
   emits: [
@@ -218,7 +218,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       getInputPlaceholder,
       onChange,
       getSelectedDataList,
-      loading
+      loading,
+      getNode
     } = useMixins(
       {
         props,
@@ -240,7 +241,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       setCheckedKeys,
       setChecked,
       getSelectedDataList,
-      refreshData
+      refreshData,
+      getNode
     });
     return (_ctx, _cache) => {
       const _directive_loading = resolveDirective("loading");

package/es/static/hy-svg-icons/hy-icon-ops-list-lod.js

@@ -0,0 +1,14 @@
+export default {
+  id: 'hy-icon-ops-list-lod',
+  defs: `<linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="hy-icon-ops-list-lod-linearGradient-1">
+            <stop stop-color="#FFFFFF" offset="0%"></stop>
+            <stop stop-color="#73F6FF" offset="100%"></stop>
+        </linearGradient>`,
+  symbol: `<symbol id="hy-icon-ops-list-lod" viewBox="0 0 28 7">
+    <g id="hy-icon-ops-list-lod-部门管理" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="hy-icon-ops-list-lod-缩小化-自适应说明" transform="translate(-1263, -986)" fill="url(#hy-icon-ops-list-lod-linearGradient-1)" fill-rule="nonzero">
+            <path d="M1267.42105,986.85 C1268.23495,986.85 1268.89474,987.535564 1268.89474,988.38125 L1268.89474,991.44375 C1268.89474,992.289436 1268.23495,992.975 1267.42105,992.975 L1264.47368,992.975 C1263.65979,992.975 1263,992.289436 1263,991.44375 L1263,988.38125 C1263,987.535564 1263.65979,986.85 1264.47368,986.85 L1267.42105,986.85 L1267.42105,986.85 Z M1278.47368,986.85 C1279.28758,986.85 1279.94737,987.535564 1279.94737,988.38125 L1279.94737,991.44375 C1279.94737,992.289436 1279.28758,992.975 1278.47368,992.975 L1275.52632,992.975 C1274.71242,992.975 1274.05263,992.289436 1274.05263,991.44375 L1274.05263,988.38125 C1274.05263,987.535564 1274.71242,986.85 1275.52632,986.85 L1278.47368,986.85 L1278.47368,986.85 Z M1289.52632,986.85 C1290.34021,986.85 1291,987.535564 1291,988.38125 L1291,991.44375 C1291,992.289436 1290.34021,992.975 1289.52632,992.975 L1286.57895,992.975 C1285.76505,992.975 1285.10526,992.289436 1285.10526,991.44375 L1285.10526,988.38125 C1285.10526,987.535564 1285.76505,986.85 1286.57895,986.85 L1289.52632,986.85 L1289.52632,986.85 Z" id="hy-icon-ops-list-lod-lod"></path>
+        </g>
+    </g>
+</symbol>`,
+};

package/es/version.mjs

@@ -1,3 +1,3 @@
-const version = "0.2.62";
+const version = "0.2.64";
 
 export { version };

package/lib/components/hyBatchUploadDialog/batchUploadDialog.vue.js

@@ -212,6 +212,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       },
       setData: (source) => {
         batchTableFormRef.value.setData(source);
+      },
+      setDragLevelIndex: (dragLevel) => {
+        HyDialogRef.value.setDragLevelIndex(dragLevel);
       }
     });
     return (_ctx, _cache) => {

package/lib/components/hyDialog/dialog.vue.js

@@ -6,8 +6,10 @@ var vue = require('vue');
 var elementPlus = require('element-plus');
 require('../index.js');
 require('../../hooks/index.js');
+require('../../utils/index.js');
 var useLocale = require('../../hooks/useLocale.js');
 var index = require('../hyButton/index.js');
+var is = require('../../utils/is.js');
 var index$1 = require('../hyIcon/index.js');
 
 import "./style/dialog.scss";
@@ -283,7 +285,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                     vue.Fragment,
                                     null,
                                     vue.renderList(__props.titleBasicInfoList, (basicInfoItem, index) => {
-                                      return vue.openBlock(), vue.createElementBlock("li", {
+                                      return vue.withDirectives((vue.openBlock(), vue.createElementBlock("li", {
                                         key: index,
                                         class: "flex px-2 py-1 text-xs"
                                       }, [
@@ -301,6 +303,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                           1
                                           /* TEXT */
                                         )
+                                      ])), [
+                                        [
+                                          vue.vShow,
+                                          vue.unref(is.isFunction)(basicInfoItem.show) ? basicInfoItem.show() : true
+                                        ]
                                       ]);
                                     }),
                                     128

package/lib/components/hyForm/cpns/locationSelect.vue.js

@@ -56,7 +56,7 @@ const _sfc_main = {
       default: false
     }
   },
-  emits: ["setMapSize"],
+  emits: ["setMapSize", "complete"],
   setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const emits = __emit;
@@ -212,6 +212,7 @@ const _sfc_main = {
         setMarker(res.latlng);
         throughCoordinatePosition(latlng.lng, latlng.lat);
       });
+      emits("complete");
     }
     function setMarker({ lat, lng }) {
       if (marker) {

package/lib/components/hyForm/form.vue.js

@@ -57,7 +57,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       // 'large' | 'default' | 'small'
     }
   },
-  emits: ["on-allMapSelect"],
+  emits: ["on-allMapSelect", "complete"],
   setup(__props, { expose: __expose, emit: __emit }) {
     const emit = __emit;
     const props = __props;
@@ -85,6 +85,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       allMapSelect.value = !allMapSelect.value;
       emit("on-allMapSelect", allMapSelect.value);
     }
+    function complete() {
+      emit("complete");
+    }
     __expose({
       validate: async (callback) => {
         await vue.nextTick();
@@ -135,7 +138,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         rules: __props.rules,
         "label-position": "top",
         size: __props.size,
-        class: "px-2",
         "hide-required-asterisk": ""
       }, _ctx.$attrs), {
         default: vue.withCtx(() => [
@@ -277,7 +279,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                             size: __props.size,
                             style: vue.normalizeStyle(vue.unref(index.columnItemStyle)(props, column)),
                             allMapSelect: allMapSelect.value,
-                            onSetMapSize: setMapSize
+                            onSetMapSize: setMapSize,
+                            onComplete: complete
                           }, null, 8, ["model", "column", "rules", "columnNum", "loading", "disabled", "readonly", "size", "style", "allMapSelect"])) : vue.createCommentVNode("v-if", true)
                         ],
                         64

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

@@ -17,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"
@@ -66,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(
@@ -260,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();
@@ -308,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,
@@ -391,7 +368,7 @@ 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,