hy-dispatch-ui-v3 0.2.59 → 0.2.61

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

@@ -5,18 +5,18 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var vue = require('vue');
 var elementPlus = require('element-plus');
 var iconsVue = require('@element-plus/icons-vue');
-var index$5 = require('./js/index.js');
+var index = require('./js/index.js');
 var search = require('./js/search.js');
 var headerItem = require('./cpns/headerItem.vue.js');
 var columnSelect = require('./cpns/columnSelect.vue.js');
 var virtualTable = require('./cpns/virtualTable.vue.js');
 var useLocale = require('../../hooks/useLocale.js');
 var useMixins = require('../../hooks/useMixins.js');
-var index = require('../hyIcon/index.js');
-var index$1 = require('../hyTooltip/index.js');
-var index$2 = require('../hyInput/index.js');
-var index$3 = require('../hyButton/index.js');
-var index$4 = require('../hySearch/index.js');
+var index$1 = require('../hyIcon/index.js');
+var index$2 = require('../hyTooltip/index.js');
+var index$3 = require('../hyInput/index.js');
+var index$4 = require('../hyButton/index.js');
+var index$5 = require('../hySearch/index.js');
 var adaptive = require('../../utils/adaptive.js');
 var is = require('../../utils/is.js');
 
@@ -252,7 +252,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       getTableDataSource,
       onSizeChangeHandler,
       onCurrentChangeHandler,
-      onSearchQueryHandler
+      onSearchQueryHandler,
+      showAppTableLoading,
+      closeAppTableLoading
     } = useMixins.useMixins(
       {
         props,
@@ -264,7 +266,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         operatorDropdownRef,
         appSearchRef
       },
-      [index$5.useAppTableWrapper, search.useAppTableSearch]
+      [index.useAppTableWrapper, search.useAppTableSearch]
     );
     if (props.defaultGetData) {
       getData(1);
@@ -279,7 +281,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       getTableDataSource,
       clearSelection,
       clearSelectedList,
-      toggleRowExpansion
+      toggleRowExpansion,
+      showAppTableLoading,
+      closeAppTableLoading
     });
     return (_ctx, _cache) => {
       return vue.openBlock(), vue.createElementBlock(
@@ -308,7 +312,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 class: "h-[32px] flex items-center gap-[10px] clickBox px-3 select-none rounded hover:bg-background-2",
                 onClick: vue.unref(switchShowFilter)
               }, [
-                vue.createVNode(vue.unref(index.HyIcon), {
+                vue.createVNode(vue.unref(index$1.HyIcon), {
                   "svg-name": "ops-button-screen",
                   "class-name": "!w-3 !h-3"
                 }),
@@ -320,7 +324,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                   /* TEXT */
                 )
               ], 8, ["onClick"])) : vue.createCommentVNode("v-if", true),
-              vue.unref(searchPlaceholder) ? (vue.openBlock(), vue.createBlock(vue.unref(index$1.HyTooltip), {
+              vue.unref(searchPlaceholder) ? (vue.openBlock(), vue.createBlock(vue.unref(index$2.HyTooltip), {
                 key: 2,
                 "is-always": "",
                 overLine: 1,
@@ -332,7 +336,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                   }, null, 8, ["innerHTML"])
                 ]),
                 default: vue.withCtx(() => [
-                  vue.createVNode(vue.unref(index$2.HyInputSearch), {
+                  vue.createVNode(vue.unref(index$3.HyInputSearch), {
                     modelValue: __props.filterModel.query,
                     "onUpdate:modelValue": ($event) => __props.filterModel.query = $event,
                     placeholder: vue.unref(t)("table.searchFor", [__props.controllerText || ""]),
@@ -341,13 +345,13 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 ]),
                 _: 1
                 /* STABLE */
-              })) : (vue.openBlock(), vue.createBlock(vue.unref(index$3.HyButton), {
+              })) : (vue.openBlock(), vue.createBlock(vue.unref(index$4.HyButton), {
                 key: 3,
                 type: "primary",
                 onClick: ($event) => vue.unref(getData)()
               }, {
                 default: vue.withCtx(() => [
-                  vue.createVNode(vue.unref(index.HyIcon), {
+                  vue.createVNode(vue.unref(index$1.HyIcon), {
                     class: "w-[12px] h-[12px]",
                     "svg-name": "ops-button-icon-refres-v2"
                   })
@@ -365,7 +369,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             ])) : vue.createCommentVNode("v-if", true)
           ])) : vue.createCommentVNode("v-if", true),
           vue.createCommentVNode(" \u67E5\u8BE2\u8FC7\u6EE4 "),
-          __props.filterColumns.length > 0 ? (vue.openBlock(), vue.createBlock(vue.unref(index$4.HySearch), {
+          __props.filterColumns.length > 0 ? (vue.openBlock(), vue.createBlock(vue.unref(index$5.HySearch), {
             key: 1,
             ref_key: "appSearchRef",
             ref: appSearchRef,
@@ -449,11 +453,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                 }, {
                                   default: vue.withCtx(() => [
                                     vue.renderSlot(_ctx.$slots, column.headerSlot, vue.mergeProps({ ref_for: true }, { column, $index: scope.$index }), () => [
-                                      !vue.unref(is.isEmpty)(vue.unref(index$5.renderHeaderHandler)(column, scope)) ? (vue.openBlock(), vue.createBlock(vue.unref(index$1.HyTooltip), {
+                                      !vue.unref(is.isEmpty)(vue.unref(index.renderHeaderHandler)(column, scope)) ? (vue.openBlock(), vue.createBlock(vue.unref(index$2.HyTooltip), {
                                         key: 0,
                                         "is-always": false,
                                         "over-line": 1,
-                                        content: vue.unref(index$5.renderHeaderHandler)(column, scope)
+                                        content: vue.unref(index.renderHeaderHandler)(column, scope)
                                       }, null, 8, ["content"])) : vue.createCommentVNode("v-if", true)
                                     ])
                                   ]),
@@ -469,12 +473,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                   (vue.openBlock(true), vue.createElementBlock(
                                     vue.Fragment,
                                     null,
-                                    vue.renderList(vue.unref(index$5.operatorFilterHandler)(
+                                    vue.renderList(vue.unref(index.operatorFilterHandler)(
                                       column,
                                       scope,
                                       "default"
                                     ), (citem, cindex) => {
-                                      return vue.openBlock(), vue.createBlock(vue.unref(index$1.HyTooltip), {
+                                      return vue.openBlock(), vue.createBlock(vue.unref(index$2.HyTooltip), {
                                         key: cindex,
                                         "is-always": "",
                                         overLine: 1,
@@ -482,12 +486,15 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                       }, {
                                         default: vue.withCtx(() => [
                                           vue.createElementVNode("div", {
-                                            class: vue.normalizeClass(["w-[40px] h-[48px] inline-flex flex-col items-center justify-center text-xs hover:font-bold border border-transparent hover:border-theme hover:shadow-[0px_0px_5px_0px_rgba(var(--hy-theme),0.5)] rounded box-border cursor-pointer", citem.className]),
-                                            onClick: vue.withModifiers(($event) => vue.unref(index$5.operatorClickHandler)(cindex, column, scope, "default"), ["stop"]),
+                                            class: vue.normalizeClass(["w-[40px] h-[48px] inline-flex flex-col items-center justify-center text-xs hover:font-bold border border-transparent hover:border-theme hover:shadow-[0px_0px_5px_0px_rgba(var(--hy-theme),0.5)] rounded box-border", [
+                                              citem.className,
+                                              vue.unref(index.operatorDisabledHandler)(citem, scope) ? "cursor-not-allowed text-[var(--hy-el-text-color-disabled)] hover:border-[rgba(var(--hy-auxiliary),1)] hover:shadow-[0px_0px_5px_0px_rgba(var(--hy-auxiliary),0.5)]" : "cursor-pointer hover:border-theme hover:shadow-[0px_0px_5px_0px_rgba(var(--hy-theme),0.5)]"
+                                            ]]),
+                                            onClick: vue.withModifiers(($event) => vue.unref(index.operatorClickHandler)(cindex, column, scope, "default"), ["stop"]),
                                             onContextmenu: vue.withModifiers(() => {
                                             }, ["stop"])
                                           }, [
-                                            vue.createVNode(vue.unref(index.HyIcon), {
+                                            vue.createVNode(vue.unref(index$1.HyIcon), {
                                               "svg-name": citem.svgName,
                                               "class-name": "!w-4 !h-4"
                                             }, null, 8, ["svg-name"]),
@@ -513,7 +520,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                     128
                                     /* KEYED_FRAGMENT */
                                   )),
-                                  vue.unref(index$5.operatorFilterHandler)(column, scope, "more")?.length ? (vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElDropdown), {
+                                  vue.unref(index.operatorFilterHandler)(column, scope, "more")?.length ? (vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElDropdown), {
                                     key: 0,
                                     ref_for: true,
                                     ref_key: "operatorDropdownRef",
@@ -521,7 +528,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                     trigger: "click",
                                     "popper-style": "min-width: 150px",
                                     placement: "bottom",
-                                    onCommand: ($event) => vue.unref(index$5.operatorClickHandler)($event, column, scope, "more")
+                                    onCommand: ($event) => vue.unref(index.operatorClickHandler)($event, column, scope, "more")
                                   }, {
                                     dropdown: vue.withCtx(() => [
                                       vue.createVNode(
@@ -532,7 +539,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                             (vue.openBlock(true), vue.createElementBlock(
                                               vue.Fragment,
                                               null,
-                                              vue.renderList(vue.unref(index$5.operatorFilterHandler)(
+                                              vue.renderList(vue.unref(index.operatorFilterHandler)(
                                                 column,
                                                 scope,
                                                 "more"
@@ -540,7 +547,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                                 return vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElDropdownItem), {
                                                   key: cindex,
                                                   command: cindex,
-                                                  disabled: vue.unref(index$5.operatorDisabledHandler)(citem, scope)
+                                                  disabled: vue.unref(index.operatorDisabledHandler)(citem, scope)
                                                 }, {
                                                   default: vue.withCtx(() => [
                                                     vue.createElementVNode("span", null, [
@@ -551,13 +558,13 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                                         1
                                                         /* TEXT */
                                                       ),
-                                                      vue.unref(index$5.operatorDisabledHandler)(citem, scope) ? (vue.openBlock(), vue.createElementBlock(
+                                                      vue.unref(index.operatorDisabledHandler)(citem, scope) ? (vue.openBlock(), vue.createElementBlock(
                                                         "span",
                                                         {
                                                           key: 0,
                                                           class: "text-xs leading-1"
                                                         },
-                                                        "\uFF08" + vue.toDisplayString(vue.unref(index$5.operatorDisableTextdHandler)(citem, scope)) + "\uFF09",
+                                                        "\uFF08" + vue.toDisplayString(vue.unref(index.operatorDisableTextdHandler)(citem, scope)) + "\uFF09",
                                                         1
                                                         /* TEXT */
                                                       )) : vue.createCommentVNode("v-if", true)
@@ -585,7 +592,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                         onContextmenu: vue.withModifiers(() => {
                                         }, ["stop"])
                                       }, [
-                                        vue.createVNode(vue.unref(index$1.HyTooltip), {
+                                        vue.createVNode(vue.unref(index$2.HyTooltip), {
                                           "is-always": "",
                                           overLine: 1,
                                           content: vue.unref(t)("table.moreOperations")
@@ -623,11 +630,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                   vue.Fragment,
                                   { key: 2 },
                                   [
-                                    !vue.unref(is.isEmpty)(vue.unref(index$5.renderContentHandler)(column, scope)) ? (vue.openBlock(), vue.createBlock(vue.unref(index$1.HyTooltip), {
+                                    !vue.unref(is.isEmpty)(vue.unref(index.renderContentHandler)(column, scope)) ? (vue.openBlock(), vue.createBlock(vue.unref(index$2.HyTooltip), {
                                       key: 0,
                                       "over-line": 2,
                                       "is-always": false,
-                                      content: vue.unref(index$5.renderContentHandler)(column, scope)
+                                      content: vue.unref(index.renderContentHandler)(column, scope)
                                     }, null, 8, ["content"])) : (vue.openBlock(), vue.createElementBlock("span", {
                                       key: 1,
                                       class: "text-auxiliary"
@@ -754,7 +761,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             "virtual-triggering": "",
             trigger: "contextmenu",
             placement: "bottom",
-            onCommand: ($event) => vue.unref(index$5.operatorClickHandler)(
+            onCommand: ($event) => vue.unref(index.operatorClickHandler)(
               $event,
               vue.unref(tableTriggerRef).column,
               vue.unref(tableTriggerRef).scope
@@ -766,14 +773,14 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                   (vue.openBlock(true), vue.createElementBlock(
                     vue.Fragment,
                     null,
-                    vue.renderList(vue.unref(index$5.operatorFilterHandler)(
+                    vue.renderList(vue.unref(index.operatorFilterHandler)(
                       vue.unref(tableTriggerRef).column,
                       vue.unref(tableTriggerRef).scope
                     ), (citem, cindex) => {
                       return vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElDropdownItem), {
                         key: cindex,
                         command: cindex,
-                        disabled: vue.unref(index$5.operatorDisabledHandler)(citem, vue.unref(tableTriggerRef).scope)
+                        disabled: vue.unref(index.operatorDisabledHandler)(citem, vue.unref(tableTriggerRef).scope)
                       }, {
                         default: vue.withCtx(() => [
                           vue.createElementVNode("span", null, [
@@ -784,13 +791,13 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                               1
                               /* TEXT */
                             ),
-                            vue.unref(index$5.operatorDisabledHandler)(citem, vue.unref(tableTriggerRef).scope) ? (vue.openBlock(), vue.createElementBlock(
+                            vue.unref(index.operatorDisabledHandler)(citem, vue.unref(tableTriggerRef).scope) ? (vue.openBlock(), vue.createElementBlock(
                               "span",
                               {
                                 key: 0,
                                 class: "text-xs leading-1"
                               },
-                              "\uFF08" + vue.toDisplayString(vue.unref(index$5.operatorDisableTextdHandler)(citem, vue.unref(tableTriggerRef).scope)) + "\uFF09",
+                              "\uFF08" + vue.toDisplayString(vue.unref(index.operatorDisableTextdHandler)(citem, vue.unref(tableTriggerRef).scope)) + "\uFF09",
                               1
                               /* TEXT */
                             )) : vue.createCommentVNode("v-if", true)

package/lib/components/hyTableForm/batchTableForm.vue.js

@@ -65,6 +65,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     beforeDataHandle: {
       type: Function
     },
+    onExpandRowChange: {
+      type: Function
+    },
     templateConfig: {
       type: Object,
       default: () => ({
@@ -153,7 +156,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
           try {
             isUploading.value = true;
             emits("uploading");
-            formColumns;
             const data = await index$2.doReadExcel(files, props);
             if (!data) {
               elementPlus.ElMessage.warning("\u8BFB\u53D6\u6587\u4EF6\u5931\u8D25");
@@ -527,6 +529,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             }, _ctx.$attrs, {
               tableColumns: __props.tableColumns,
               formColumns: __props.formColumns,
+              onExpandRowChange: __props.onExpandRowChange,
               rules: __props.rules,
               rowClickExpand: __props.rowClickExpand,
               columnNum: __props.columnNum,
@@ -544,7 +547,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                   ])
                 };
               })
-            ]), 1040, ["tableColumns", "formColumns", "rules", "rowClickExpand", "columnNum", "size"])
+            ]), 1040, ["tableColumns", "formColumns", "onExpandRowChange", "rules", "rowClickExpand", "columnNum", "size"])
           ])) : vue.createCommentVNode("v-if", true),
           submitting.value ? (vue.openBlock(), vue.createElementBlock("div", {
             key: 1,

package/lib/components/hyTableForm/tableForm.vue.js

@@ -21,6 +21,9 @@ const __default__ = vue.defineComponent({
 });
 const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
   props: {
+    onExpandRowChange: {
+      type: Function
+    },
     // 表格配置项
     tableColumns: {
       // 表格的列
@@ -135,6 +138,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       }
     }
     async function onExpandRowChange(row) {
+      if (props.onExpandRowChange) {
+        props.onExpandRowChange(row);
+      }
       await vue.nextTick();
       if (!formRef.value) return;
       const valid = await initValidateHandler([row]);

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

@@ -16,7 +16,7 @@ const deviceStatus = {
   1: "\u5728\u7EBF"
 };
 const useAppTreeWrapper = (hy) => {
-  const { props, emits, slots, treeRef, VirtualTree } = hy;
+  const { props: props2, 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(
-    () => props.showCheckbox,
+    () => props2.showCheckbox,
     (newVal) => {
       virtualTree?.setRowSelection({
-        type: props.showCheckbox ? "checkbox" : "radio"
+        type: props2.showCheckbox ? "checkbox" : "radio"
       });
     }
   );
   function getData(dataList) {
     return new Promise((resolve) => {
       hy.loading.value = true;
-      if (props.disableSelection?.length) {
+      if (props2.disableSelection?.length) {
         setDisAbleSelectionMap();
       }
       if (!virtualTree) {
@@ -61,9 +61,9 @@ const useAppTreeWrapper = (hy) => {
           // 可视区域外的缓冲项数量
           indent: 16,
           emptyText: "\u6682\u65E0\u6570\u636E",
-          business: props.treeType,
+          business: props2.treeType,
           // 自定义整体的插槽
-          renderItem: props.treeType === treeConfig.treeTypeConfig.user ? (data, node) => setUserSlot(data) : setSlot("treeParentSlot"),
+          renderItem: props2.treeType === treeConfig.treeTypeConfig.user ? (data, node) => setUserSlot(data) : setSlot("treeParentSlot"),
           // // 自定义状态右侧插槽
           renderRight: (data) => {
             let renderRight = setSlot("renderRight");
@@ -89,9 +89,9 @@ const useAppTreeWrapper = (hy) => {
             return true;
           },
           // // 自定义状态模块
-          renderStatus: props.treeType === treeConfig.treeTypeConfig.device || props.treeType === treeConfig.treeTypeConfig.channel ? (data) => setRenderStatus(data) : null,
+          renderStatus: props2.treeType === treeConfig.treeTypeConfig.device || props2.treeType === treeConfig.treeTypeConfig.channel ? (data) => setRenderStatus(data) : null,
           renderEmpty: () => {
-            if (!props.showCustomEmpty || hy.filterValue.value) return true;
+            if (!props2.showCustomEmpty || hy.filterValue.value) return true;
             let renderEmpty = setSlot("renderEmpty");
             if (renderEmpty) {
               const target = renderEmpty();
@@ -102,29 +102,31 @@ const useAppTreeWrapper = (hy) => {
           props: {
             showStatus: true,
             disabled: (data) => {
-              if (data.dataType === 3 || data.dataType === 5) {
+              if (data.dataType === 5 || data.dataType === 3) {
                 if (hy.disableSelectionMap.value) {
-                  return hy.disableSelectionMap.value.get(data.id);
+                  return data.dataType === 3 ? hy.disableSelectionMap.value.get(data.deviceId) : hy.disableSelectionMap.value.get(data.id);
                 }
                 return false;
               }
               return false;
             },
-            ...props.treeProps
+            ...props2.treeProps
           },
           rowSelection: {
-            type: props.showCheckbox ? "checkbox" : "radio",
-            highlight: props.highlight,
-            checkStrictly: props.checkStrictly,
+            type: props2.showCheckbox ? "checkbox" : "radio",
+            highlight: props2.highlight,
+            checkStrictly: props2.checkStrictly,
             // 是否显示选项 showSinglebox 单选为true时部门不显示其他节点显示选择框
             showSelect: (data) => {
               if (data.dataType === 1) {
-                return props.showCheckbox;
+                return props2.showCheckbox;
               }
-              return props.showCheckbox || props.showSinglebox;
+              return props2.showCheckbox || props2.showSinglebox;
             },
             // 单选时是否可以取消选择
-            cancelable: true,
+            cancelable: props2.cancelable,
+            // 是否显示多选框或单选框
+            showSelectBox: props2.showSelectBox,
             // 选中回调
             onCheckChange: (data, info, checked) => {
               console.log("onCheckChange", info);
@@ -141,25 +143,35 @@ const useAppTreeWrapper = (hy) => {
               );
             }
           },
+          // 是否在点击节点的时候展开或者收缩节点
+          expandOnClickNode: props2.expandOnClickNode,
+          // 是否在点击节点的时候选中节点
+          checkOnClickNode: props2.checkOnClickNode,
+          // 点击叶节点(最后一个子节点)时是否检查或取消节点
+          checkOnClickLeaf: props2.checkOnClickLeaf,
+          // 双击父节点会触发选中功能
+          checkOnDblclickParentNode: props2.checkOnDblclickParentNode,
           // 筛选方法
           filterMethod: ({ filterValue: filterValue2 }, data) => {
             let isFilter = true;
             if (filterValue2) {
               isFilter = isFilter && !!filterNodeMethod(data, filterValue2, {
-                treeFilterParam: props.treeFilterParam
+                treeFilterParam: props2.treeFilterParam
               });
             }
             return isFilter;
           },
           businessConfig: {
             // 是否开启按在线离线状态排序
-            sortByStatus: props.deviceOrderSort,
+            sortByStatus: props2.deviceOrderSort,
             // 是否只显示在线设备
-            showOnlineState: props.showOnlineOnly,
+            showOnlineState: props2.showOnlineOnly,
             // 是否清空没有业务项（设备、用户、采集器）的部门和群组
-            clearEmptyBusiness: props.clearEmptyBusiness,
+            clearEmptyBusiness: props2.clearEmptyBusiness,
             // 是否显示通道节点的选择框
-            isShowChannelSelect: props.isShowChannelSelect
+            isShowChannelSelect: props2.isShowChannelSelect,
+            // 初始化过滤数据
+            filterConfig: props2.filterConfig
           },
           // 初始化时处理数据，想回显必须return值，若想要过滤，可不return
           handleMethod: (data) => {
@@ -180,7 +192,7 @@ const useAppTreeWrapper = (hy) => {
           },
           // 双击事件
           onNodeDblClick: (data, node, event) => {
-            if (props.treeType !== "channel") {
+            if (props2.treeType !== "channel") {
               emits("on-dblclick", [{ ...data }]);
             } else {
               if (data.channelId) {
@@ -220,13 +232,13 @@ const useAppTreeWrapper = (hy) => {
             document.body.click();
           },
           onLoad: () => {
-            if (props.showOnlineOnly && !virtualTree._flattenTree?.length && !hy.filterValue.value) {
+            if (props2.showOnlineOnly && !virtualTree._flattenTree?.length && !hy.filterValue.value) {
               elementPlus.ElMessage.warning("\u6682\u65E0\u8BBE\u5907\u5904\u4E8E\u5728\u7EBF\u72B6\u6001");
             }
-            if (props.defaultSelectedOrgID && props.showCheckbox && props.treeType === "device") {
+            if (props2.defaultSelectedOrgID && props2.showCheckbox && props2.treeType === "device") {
               setSelectedOrg(dataList);
-            } else if (props.selectedByDefault?.length) {
-              setCheckedKeys(props.selectedByDefault);
+            } else if (props2.selectedByDefault?.length) {
+              setCheckedKeys(props2.selectedByDefault);
             }
             if (hy.filterValue.value) {
               getFilterValue();
@@ -242,13 +254,13 @@ const useAppTreeWrapper = (hy) => {
           {
             data: dataList,
             businessConfig: {
-              sortByStatus: props.deviceOrderSort,
-              showOnlineState: props.showOnlineOnly,
-              clearEmptyBusiness: props.clearEmptyBusiness
+              sortByStatus: props2.deviceOrderSort,
+              showOnlineState: props2.showOnlineOnly,
+              clearEmptyBusiness: props2.clearEmptyBusiness
             }
           },
           () => {
-            if (props.showOnlineOnly && !virtualTree._flattenTree?.length && !hy.filterValue.value) {
+            if (props2.showOnlineOnly && !virtualTree._flattenTree?.length && !hy.filterValue.value) {
               elementPlus.ElMessage.success("\u6682\u65E0\u8BBE\u5907\u5904\u4E8E\u5728\u7EBF\u72B6\u6001");
             }
             if (hy.filterValue.value) {
@@ -265,7 +277,7 @@ const useAppTreeWrapper = (hy) => {
   }
   function setEmpty() {
     let content = ``;
-    if (!props.showOnlineOnly) {
+    if (!props2.showOnlineOnly) {
       setTimeout(() => {
         if (hy.addDeviceDom.value) {
           hy.addDeviceDom.value.removeEventListener("click", addDevice);
@@ -294,7 +306,7 @@ const useAppTreeWrapper = (hy) => {
   }
   function setDisAbleSelectionMap() {
     const map = /* @__PURE__ */ new Map();
-    props.disableSelection.forEach((v) => {
+    props2.disableSelection.forEach((v) => {
       map.set(v.id, true);
     });
     hy.disableSelectionMap.value = map;
@@ -318,7 +330,7 @@ const useAppTreeWrapper = (hy) => {
     container.style.display = "flex";
     container.style.width = "100%";
     const dutyHtml = `<div class="flex treeDeviceBox">
-                  ${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"
+                  ${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"
                           style="border-color: ${data.rosterContentColor};background-color: ${data.rosterContentColor}70;">
                           ${data.rosterContentSimple}
                          </span>` : ""}
@@ -387,31 +399,35 @@ const useAppTreeWrapper = (hy) => {
     emits("on-addDevice");
   }
   function singleRemovalFn(row) {
-    if (props.treeType === "device") {
+    if (props2.treeType === "device") {
       virtualTree.setChecked(row.channelId || row.deviceId, false, true);
-    } else if (props.treeType) {
+    } else if (props2.treeType) {
       virtualTree.setChecked(row.id, false, true);
-    } else if (!props.treeType && props.treeProps) {
-      virtualTree.setChecked(row[`${props.treeProps.value}`], false, true);
+    } else if (!props2.treeType && props2.treeProps) {
+      virtualTree.setChecked(row[`${props2.treeProps.value}`], false, true);
     }
   }
   function setCheckedKeys(dataList) {
-    if (props.treeType === "device" || props.treeType === "channel") {
+    if (props2.treeType === "device" || props2.treeType === "channel") {
       virtualTree?.setCheckedKeys(
         dataList.map((v) => v.channelId || v.deviceId),
         true
       );
-    } else if (props.treeType) {
+    } else if (props2.treeType) {
       virtualTree?.setCheckedKeys(
         dataList.map((v) => v.id),
         true
       );
-    } else if (!props.treeType && props.treeProps) {
+    } else if (!props2.treeType && props2.treeProps) {
+      console.log(
+        "\u9009\u4E2D\u56DE\u8C03",
+        dataList.map((v) => v[`${props2.treeProps.value}`])
+      );
       virtualTree?.setCheckedKeys(
-        dataList.map((v) => v[`${props.treeProps.value}`])
+        dataList.map((v) => v[`${props2.treeProps.value}`])
       );
     }
-    if (props.isBackDefaultSelected) {
+    if (props2.isBackDefaultSelected) {
       setTimeout(() => {
         const deviceList = virtualTree?.getCheckedBusinessNodes(true) || [];
         emits("on-selectedDataList", deviceList);
@@ -419,17 +435,17 @@ const useAppTreeWrapper = (hy) => {
     }
   }
   function setChecked(data, type) {
-    if (props.treeType === "device") {
+    if (props2.treeType === "device") {
       virtualTree?.setChecked(data.channelId || data.deviceId, type, true);
-    } else if (props.treeType) {
+    } else if (props2.treeType) {
       virtualTree?.setChecked(data.id, type, true);
-    } else if (!props.treeType && props.treeProps) {
-      virtualTree?.setChecked(data[`${props.treeProps.value}`], type, true);
+    } else if (!props2.treeType && props2.treeProps) {
+      virtualTree?.setChecked(data[`${props2.treeProps.value}`], type, true);
     }
   }
   function setSelectedOrg(deviceList) {
     for (let i = 0; i < deviceList.length; i++) {
-      if (props.defaultSelectedOrgID === deviceList[i].id) {
+      if (props2.defaultSelectedOrgID === deviceList[i].id) {
         if (deviceList[i].deviceList?.length) {
           setCheckedKeys(deviceList[i].deviceList);
         }
@@ -445,13 +461,13 @@ const useAppTreeWrapper = (hy) => {
     return virtualTree?.getCheckedBusinessNodes(true) || [];
   }
   function setFilterListType(type) {
-    if (props.selectFilterList?.length) {
+    if (props2.selectFilterList?.length) {
       hy.selectFilterList.value = JSON.parse(
-        JSON.stringify(props.selectFilterList)
+        JSON.stringify(props2.selectFilterList)
       );
       return;
     }
-    if (props.treeType === "device") {
+    if (props2.treeType === "device") {
       hy.selectFilterList.value = [
         {
           label: "\u5168\u90E8",
@@ -469,7 +485,7 @@ const useAppTreeWrapper = (hy) => {
           placeholder: "\u8BBE\u5907\u53F7\u3001\u8BBE\u5907\u540D\u79F0\u8FDB\u884C\u7B5B\u9009"
         }
       ];
-    } else if (props.treeType === "user") {
+    } else if (props2.treeType === "user") {
       hy.selectFilterList.value = [
         {
           label: "\u5168\u90E8",
@@ -531,7 +547,7 @@ function filterNodeMethod(data, value, { selectFilterType, treeFilterParam = []
   const includesValue = (field) => {
     return field && field.toString().includes(value.toString());
   };
-  if (!type) {
+  if (!props.treeType) {
     let filterType = false;
     for (let i = 0; i < treeFilterParam.length; i++) {
       const item = treeFilterParam[i];