hy-dispatch-ui-v3 0.2.59 → 0.2.61

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

@@ -2,7 +2,7 @@ import { computed, unref, openBlock, createBlock, withCtx, createElementVNode, n
 import { ElFormItem, ElSelect } from 'element-plus';
 import { columnShowHandler, columnItemStyle, columnItemInputStyle, isDisabled, optionsHandler, isSelectedTimeRange, timeRangeHandler } from '../js/index.mjs';
 import { isArray } from '../../../utils/is.mjs';
-import { setValueByProp, getValueByProp } from '../../../utils/form.mjs';
+import { setValueByProp, getValueByProp, columnPlaceholderHandler, columnLabelHandler } from '../../../utils/form.mjs';
 import { HyInput } from '../../hyInput/index.mjs';
 import { HyDatePicker } from '../../hyDatePicker/index.mjs';
 import { HyTimePicker } from '../../hyTimePicker/index.mjs';
@@ -56,6 +56,13 @@ const _sfc_main = {
         setValueByProp(props.model, prop, val);
       }
     });
+    const columnAttrs = computed(() => {
+      return {
+        ...props.column.attrs,
+        label: columnLabelHandler(props.column, props.model),
+        placeholder: columnPlaceholderHandler(props.column, props.model)
+      };
+    });
     function onChangeHandler(value, column) {
       emits("search");
     }
@@ -96,14 +103,14 @@ const _sfc_main = {
                   "div",
                   {
                     class: normalizeClass(["flex items-center text-auxiliary text-xs whitespace-nowrap", {
-                      "border-r border-border px-3": __props.column.labelSlot && _ctx.$slots[__props.column.labelSlot] || __props.column.label
+                      "border-r border-border px-3": __props.column.labelSlot && _ctx.$slots[__props.column.labelSlot] || unref(columnLabelHandler)(__props.column, props.model)
                     }])
                   },
                   [
                     __props.column.labelSlot && _ctx.$slots[__props.column.labelSlot] ? renderSlot(_ctx.$slots, __props.column.labelSlot, { column: __props.column }, void 0, void 0, 0) : (openBlock(), createElementBlock(
                       "span",
                       { key: 1 },
-                      toDisplayString(__props.column.label),
+                      toDisplayString(unref(columnLabelHandler)(__props.column, props.model)),
                       1
                       /* TEXT */
                     ))
@@ -128,7 +135,7 @@ const _sfc_main = {
                         createVNode(unref(HyInput), mergeProps({
                           modelValue: bindValue.value,
                           "onUpdate:modelValue": ($event) => bindValue.value = $event
-                        }, __props.column.attrs, {
+                        }, columnAttrs.value, {
                           disabled: unref(isDisabled)(props, __props.column),
                           onKeydown: withKeys(($event) => onKeydownEnterHander($event, __props.column), ["enter"]),
                           onChange: ($event) => onChangeHandler($event, __props.column)
@@ -144,7 +151,7 @@ const _sfc_main = {
                         createVNode(unref(ElSelect), mergeProps({
                           modelValue: bindValue.value,
                           "onUpdate:modelValue": ($event) => bindValue.value = $event
-                        }, __props.column.attrs, {
+                        }, columnAttrs.value, {
                           disabled: unref(isDisabled)(props, __props.column),
                           options: unref(optionsHandler)(props, __props.column),
                           onChange: ($event) => onChangeHandler($event, __props.column)
@@ -162,7 +169,7 @@ const _sfc_main = {
                           "daterange",
                           "monthrange",
                           "yearrange"
-                        ].includes(__props.column.attrs?.type) && unref(isArray)(__props.column.field) ? (openBlock(), createBlock(unref(HyDatePicker), mergeProps({
+                        ].includes(columnAttrs.value?.type) && unref(isArray)(__props.column.field) ? (openBlock(), createBlock(unref(HyDatePicker), mergeProps({
                           key: 0,
                           start: bindValue.value,
                           "onUpdate:start": ($event) => bindValue.value = $event,
@@ -171,7 +178,7 @@ const _sfc_main = {
                           "is-range": true,
                           style: { "width": "100%" },
                           timeRangeFill: __props.column.timeRangeFill
-                        }, __props.column.attrs, {
+                        }, columnAttrs.value, {
                           disabled: unref(isDisabled)(props, __props.column),
                           onChange: ($event) => onChangeHandler($event, __props.column)
                         }), null, 16, ["start", "onUpdate:start", "end", "onUpdate:end", "timeRangeFill", "disabled", "onChange"])) : (openBlock(), createBlock(unref(HyDatePicker), mergeProps({
@@ -181,7 +188,7 @@ const _sfc_main = {
                           "is-range": false,
                           style: { "width": "100%" },
                           timeRangeFill: __props.column.timeRangeFill
-                        }, __props.column.attrs, {
+                        }, columnAttrs.value, {
                           disabled: unref(isDisabled)(props, __props.column),
                           onChange: ($event) => onChangeHandler($event, __props.column)
                         }), null, 16, ["modelValue", "onUpdate:modelValue", "timeRangeFill", "disabled", "onChange"]))
@@ -193,7 +200,7 @@ const _sfc_main = {
                       { key: 4 },
                       [
                         createCommentVNode(" \u65F6\u95F4\u9009\u62E9\u6846 "),
-                        __props.column.attrs.isRange ? (openBlock(), createBlock(unref(HyTimePicker), mergeProps({
+                        columnAttrs.value.isRange ? (openBlock(), createBlock(unref(HyTimePicker), mergeProps({
                           key: 0,
                           start: bindValue.value,
                           "onUpdate:start": ($event) => bindValue.value = $event,
@@ -201,7 +208,7 @@ const _sfc_main = {
                           "onUpdate:end": ($event) => bindValue2.value = $event,
                           "is-range": true,
                           style: { "width": "100%" }
-                        }, __props.column.attrs, {
+                        }, columnAttrs.value, {
                           disabled: unref(isDisabled)(props, __props.column),
                           onChange: onChangeHandler
                         }), null, 16, ["start", "onUpdate:start", "end", "onUpdate:end", "disabled"])) : (openBlock(), createBlock(unref(HyTimePicker), mergeProps({
@@ -210,7 +217,7 @@ const _sfc_main = {
                           "onUpdate:modelValue": ($event) => bindValue.value = $event,
                           "is-range": false,
                           style: { "width": "100%" }
-                        }, __props.column.attrs, {
+                        }, columnAttrs.value, {
                           disabled: unref(isDisabled)(props, __props.column),
                           onChange: onChangeHandler
                         }), null, 16, ["modelValue", "onUpdate:modelValue", "disabled"]))
@@ -225,7 +232,7 @@ const _sfc_main = {
                         createVNode(unref(HyOrgCascader), mergeProps({
                           modelValue: bindValue.value,
                           "onUpdate:modelValue": ($event) => bindValue.value = $event
-                        }, __props.column.attrs, {
+                        }, columnAttrs.value, {
                           disabled: unref(isDisabled)(props, __props.column),
                           onChange: onChangeHandler
                         }), null, 16, ["modelValue", "onUpdate:modelValue", "disabled"])
@@ -241,7 +248,7 @@ const _sfc_main = {
               4
               /* STYLE */
             ),
-            __props.column.type === "date-picker" && ["daterange", "datetimerange"].includes(__props.column.attrs?.type) && __props.column.timeRangeOptions?.length ? (openBlock(), createElementBlock("div", {
+            __props.column.type === "date-picker" && ["daterange", "datetimerange"].includes(columnAttrs.value?.type) && __props.column.timeRangeOptions?.length ? (openBlock(), createElementBlock("div", {
               key: 0,
               class: "flex text-main select-none"
             }, [

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

@@ -1,37 +1,9 @@
 import { unref, toRef } from 'vue';
 import { funRunHandler, mergeDeep } from '../../../utils/handler.mjs';
-import { genValueByProp } from '../../../utils/form.mjs';
+import { genValueByProp, genColumnDefaultLabel } from '../../../utils/form.mjs';
 import { useLocale } from '../../../hooks/useLocale.mjs';
 import { isNumber } from '../../../utils/is.mjs';
 
-const genDefaultLabel = (config) => {
-  if (config.label) return config.label;
-  const { t } = useLocale();
-  switch (config.type) {
-    // 部门级联选择框
-    case "org-cascader":
-      return t("form.department");
-  }
-};
-const genPlaceholderHandler = (config) => {
-  const { t } = useLocale();
-  const { type, label, attrs = {} } = config || {};
-  let placeholder = attrs.placeholder, startPlaceholder = attrs.startPlaceholder, endPlaceholder = attrs.endPlaceholder;
-  switch (type) {
-    case "input":
-      placeholder = placeholder || t("hy.pleaseEnterPlaceholder", [label]);
-      break;
-    case "select":
-    case "date-picker":
-    case "time-picker":
-    case "org-cascader":
-      placeholder = placeholder || t("hy.pleaseSelectPlaceholder", [label]);
-      break;
-    default:
-      placeholder = placeholder || label;
-  }
-  return { placeholder, startPlaceholder, endPlaceholder };
-};
 const genColumnWidth = (config) => {
   let { width, inputWidth, type, attrs } = config || {};
   if (!width && !inputWidth) {
@@ -84,12 +56,10 @@ const timeRangeOptionsHandler = (config) => {
   }, []);
 };
 function appSearchItemHandler(column = {}) {
-  const label = genDefaultLabel(column);
-  const { placeholder} = genPlaceholderHandler({ ...column, label });
+  const label = genColumnDefaultLabel(column);
   const attrs = {
     clearable: true,
-    ...column.attrs || {},
-    placeholder
+    ...column.attrs || {}
   };
   const { width, inputWidth } = genColumnWidth(column);
   column = mergeDeep(

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

@@ -457,7 +457,15 @@ const _sfc_main = {
                             }, {
                               default: withCtx(() => [
                                 createElementVNode("div", {
-                                  class: 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]),
+                                  class: normalizeClass(["w-[40px] h-[48px] inline-flex flex-col items-center justify-center text-xs hover:font-bold border border-transparent rounded box-border", [
+                                    citem.className,
+                                    unref(operatorDisabledHandler)(citem, {
+                                      column,
+                                      row,
+                                      $index,
+                                      cellIndex
+                                    }) ? "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: ($event) => unref(operatorClickHandler)(
                                     cindex,
                                     column,

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

@@ -1,8 +1,8 @@
 import { ref, computed, watch, watchEffect, unref, nextTick } from 'vue';
 import { ElLoading } from 'element-plus';
-import { isString, isBoolean, isFunction, isPermission, isNumber, isArray } from '../../../utils/is.mjs';
-import { useLocale } from '../../../hooks/useLocale.mjs';
 import { usePermissionMap } from '../../../hooks/usePermissionMap.mjs';
+import { useLocale } from '../../../hooks/useLocale.mjs';
+import { isString, isBoolean, isFunction, isPermission, isNumber, isArray } from '../../../utils/is.mjs';
 
 function tableColumnShowHandler(column) {
   if (column.permission && !isPermission(column.permission)) {
@@ -123,6 +123,7 @@ function operatorFilterHandler(column, scope, type = "all") {
 function operatorClickHandler(command, column, scope, type = "all") {
   const operator = operatorFilterHandler(column, scope, type);
   const target = operator[command];
+  if (operatorDisabledHandler(target, scope)) return;
   target?.handler && target.handler(scope);
 }
 function renderHeaderHandler(column, scope) {
@@ -394,7 +395,9 @@ const useAppTableWrapper = (hy) => {
     // 搜索选中
     isSearchFocus,
     onSearchInputHandler,
-    onSearchBlurHandler
+    onSearchBlurHandler,
+    showAppTableLoading,
+    closeAppTableLoading
   };
 };
 

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

@@ -54,6 +54,7 @@ function useAppTableSearch(hy) {
   }
   async function resetFields() {
     await nextTick();
+    props.filterModel.query = null;
     if (appSearchRef.value) {
       appSearchRef.value.resetFields();
     }

package/es/components/hyTable/table.vue.mjs

@@ -1,7 +1,7 @@
 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 { ElTable, ElTableColumn, ElDropdown, ElIcon, ElDropdownMenu, ElDropdownItem, ElAutoResizer, ElPagination } from 'element-plus';
 import { MoreFilled } from '@element-plus/icons-vue';
-import { operatorFilterHandler, operatorClickHandler, operatorDisabledHandler, operatorDisableTextdHandler, renderContentHandler, renderHeaderHandler, useAppTableWrapper } from './js/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';
 import _sfc_main$1 from './cpns/columnSelect.vue.mjs';
@@ -248,7 +248,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       getTableDataSource,
       onSizeChangeHandler,
       onCurrentChangeHandler,
-      onSearchQueryHandler
+      onSearchQueryHandler,
+      showAppTableLoading,
+      closeAppTableLoading
     } = useMixins(
       {
         props,
@@ -275,7 +277,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       getTableDataSource,
       clearSelection,
       clearSelectedList,
-      toggleRowExpansion
+      toggleRowExpansion,
+      showAppTableLoading,
+      closeAppTableLoading
     });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock(
@@ -478,7 +482,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                       }, {
                                         default: withCtx(() => [
                                           createElementVNode("div", {
-                                            class: 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]),
+                                            class: 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,
+                                              unref(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: withModifiers(($event) => unref(operatorClickHandler)(cindex, column, scope, "default"), ["stop"]),
                                             onContextmenu: withModifiers(() => {
                                             }, ["stop"])

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

@@ -61,6 +61,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     beforeDataHandle: {
       type: Function
     },
+    onExpandRowChange: {
+      type: Function
+    },
     templateConfig: {
       type: Object,
       default: () => ({
@@ -149,7 +152,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
           try {
             isUploading.value = true;
             emits("uploading");
-            formColumns;
             const data = await doReadExcel(files, props);
             if (!data) {
               ElMessage.warning("\u8BFB\u53D6\u6587\u4EF6\u5931\u8D25");
@@ -523,6 +525,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,
@@ -540,7 +543,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                   ])
                 };
               })
-            ]), 1040, ["tableColumns", "formColumns", "rules", "rowClickExpand", "columnNum", "size"])
+            ]), 1040, ["tableColumns", "formColumns", "onExpandRowChange", "rules", "rowClickExpand", "columnNum", "size"])
           ])) : createCommentVNode("v-if", true),
           submitting.value ? (openBlock(), createElementBlock("div", {
             key: 1,

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

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

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

@@ -14,7 +14,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 = getCurrentInstance();
   const slotAppContext = instance ? {
     ...instance.appContext,
@@ -33,17 +33,17 @@ const useAppTreeWrapper = (hy) => {
   const selectFilterList = ref([]);
   const loading = ref(true);
   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) {
@@ -59,9 +59,9 @@ const useAppTreeWrapper = (hy) => {
           // 可视区域外的缓冲项数量
           indent: 16,
           emptyText: "\u6682\u65E0\u6570\u636E",
-          business: props.treeType,
+          business: props2.treeType,
           // 自定义整体的插槽
-          renderItem: props.treeType === treeTypeConfig.user ? (data, node) => setUserSlot(data) : setSlot("treeParentSlot"),
+          renderItem: props2.treeType === treeTypeConfig.user ? (data, node) => setUserSlot(data) : setSlot("treeParentSlot"),
           // // 自定义状态右侧插槽
           renderRight: (data) => {
             let renderRight = setSlot("renderRight");
@@ -87,9 +87,9 @@ const useAppTreeWrapper = (hy) => {
             return true;
           },
           // // 自定义状态模块
-          renderStatus: props.treeType === treeTypeConfig.device || props.treeType === treeTypeConfig.channel ? (data) => setRenderStatus(data) : null,
+          renderStatus: props2.treeType === treeTypeConfig.device || props2.treeType === 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();
@@ -100,29 +100,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);
@@ -139,25 +141,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) => {
@@ -178,7 +190,7 @@ const useAppTreeWrapper = (hy) => {
           },
           // 双击事件
           onNodeDblClick: (data, node, event) => {
-            if (props.treeType !== "channel") {
+            if (props2.treeType !== "channel") {
               emits("on-dblclick", [{ ...data }]);
             } else {
               if (data.channelId) {
@@ -218,13 +230,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) {
               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();
@@ -240,13 +252,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) {
               ElMessage.success("\u6682\u65E0\u8BBE\u5907\u5904\u4E8E\u5728\u7EBF\u72B6\u6001");
             }
             if (hy.filterValue.value) {
@@ -263,7 +275,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);
@@ -292,7 +304,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;
@@ -316,7 +328,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>` : ""}
@@ -385,31 +397,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);
@@ -417,17 +433,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);
         }
@@ -443,13 +459,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",
@@ -467,7 +483,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",
@@ -529,7 +545,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];