hy-dispatch-ui-v3 0.2.63 → 0.2.65

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

@@ -6,7 +6,6 @@ require('../../../utils/index.js');
 require('../../index.js');
 var is = require('../../../utils/is.js');
 var useLocale = require('../../../hooks/useLocale.js');
-var usePermissionMap = require('../../../hooks/usePermissionMap.js');
 var index = require('../../hyLoading/index.js');
 
 function tableColumnShowHandler(column) {
@@ -155,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([]);
@@ -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/useAppTable.js

@@ -28,7 +28,8 @@ function getColumnDefaultConfig(column) {
     case "operator":
       return {
         label: t("table.operator"),
-        prop: `operator_prop`
+        prop: `operator_prop`,
+        fixed: "right"
       };
     default:
       return {};
@@ -113,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

@@ -192,10 +192,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       type: String,
       default: "default"
       // deafult-默认 accordion-手风琴
-    },
-    onExpandChange: {
-      // 展开回调
-      type: Function
     }
   }, {
     "loading": { type: Boolean, default: false },
@@ -204,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"
@@ -234,6 +231,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       setTableRowClassName,
       clearSelection,
       clearSelectedList,
+      expandRowKeys,
+      expandRowKeyMap,
+      setRowExpansion,
       toggleRowExpansion,
       onTableRowClickHandler,
       onTableRowContextmenuHandler,
@@ -285,6 +285,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       getTableDataSource,
       clearSelection,
       clearSelectedList,
+      setRowExpansion,
       toggleRowExpansion,
       showAppTableLoading,
       closeAppTableLoading
@@ -413,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),
@@ -665,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),
@@ -691,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" }, [
@@ -717,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/tableActionButton.vue.js

@@ -122,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({});

package/lib/components/hyTree/js/index.js

@@ -16,7 +16,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 = vue.getCurrentInstance();
   const slotAppContext = instance ? {
     ...instance.appContext,
@@ -35,17 +35,17 @@ const useAppTreeWrapper = (hy) => {
   const selectFilterList = vue.ref([]);
   const loading = vue.ref(true);
   vue.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) {
@@ -61,9 +61,9 @@ const useAppTreeWrapper = (hy) => {
           // 可视区域外的缓冲项数量
           indent: 16,
           emptyText: "\u6682\u65E0\u6570\u636E",
-          business: props2.treeType,
+          business: props.treeType,
           // 自定义整体的插槽
-          renderItem: props2.treeType === treeConfig.treeTypeConfig.user ? (data, node) => setUserSlot(data, node) : setSlot("treeParentSlot"),
+          renderItem: props.treeType === treeConfig.treeTypeConfig.user ? (data, node) => setUserSlot(data, node) : setSlot("treeParentSlot"),
           // // 自定义状态右侧插槽
           renderRight: (data) => {
             let renderRight = setSlot("renderRight");
@@ -89,9 +89,9 @@ const useAppTreeWrapper = (hy) => {
             return true;
           },
           // // 自定义状态模块
-          renderStatus: props2.treeType === treeConfig.treeTypeConfig.device || props2.treeType === treeConfig.treeTypeConfig.channel ? (data) => setRenderStatus(data) : null,
+          renderStatus: props.treeType === treeConfig.treeTypeConfig.device || props.treeType === treeConfig.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();
@@ -110,23 +110,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);
@@ -139,42 +139,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) => {
@@ -195,7 +204,7 @@ const useAppTreeWrapper = (hy) => {
           },
           // 双击事件
           onNodeDblClick: (data, node, event) => {
-            if (props2.treeType !== "channel") {
+            if (props.treeType !== "channel") {
               emits("on-dblclick", [{ ...data }]);
             } else {
               if (data.channelId) {
@@ -235,13 +244,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) {
               elementPlus.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();
@@ -257,13 +266,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) {
               elementPlus.ElMessage.success("\u6682\u65E0\u8BBE\u5907\u5904\u4E8E\u5728\u7EBF\u72B6\u6001");
             }
             if (hy.filterValue.value) {
@@ -280,7 +289,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);
@@ -309,7 +318,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;
@@ -333,7 +342,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>` : ""}
@@ -411,36 +420,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);
@@ -448,17 +466,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);
         }
@@ -470,17 +488,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",
@@ -498,7 +519,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",
@@ -532,6 +553,9 @@ const useAppTreeWrapper = (hy) => {
       refreshData();
     }
   }
+  function getNode(id) {
+    return virtualTree.getNode(id);
+  }
   return {
     filterValue,
     virtualTree,
@@ -551,16 +575,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/lib/components/hyTree/tree.vue.js

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

package/lib/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/lib/version.js

@@ -1,5 +1,5 @@
 'use strict';
 
-const version = "0.2.62";
+const version = "0.2.64";
 
 exports.version = version;