hy-dispatch-ui-v3 0.2.66 → 0.2.67

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

@@ -34,10 +34,50 @@ const useAppTreeWrapper = (hy) => {
   const selectFilterType = vue.ref(null);
   const selectFilterList = vue.ref([]);
   const loading = vue.ref(true);
+  const noTreeSelData = vue.ref([]);
+  function getSelectedDataKey(data) {
+    if (!data) return void 0;
+    if (props.treeType === "device" || props.treeType === "channel") {
+      return data.channelId || data.deviceId;
+    }
+    if (props.treeType) {
+      return data.id;
+    }
+    return data[props.treeProps?.value];
+  }
+  function deleteNoTreeSelData(item) {
+    const index = hy.noTreeSelData.value.findIndex(
+      (v) => hy.getSelectedDataKey(v) === hy.getSelectedDataKey(item)
+    );
+    if (index !== -1) {
+      hy.noTreeSelData.value.splice(index, 1);
+    }
+  }
+  function updateNoTreeSelData(dataList) {
+    let selList = [];
+    if (props.treeType) {
+      selList = hy.virtualTree?.getCheckedBusinessNodes(true) || [];
+    } else {
+      selList = hy.virtualTree?.getCheckedNodes(true) || [];
+    }
+    const treeMap = /* @__PURE__ */ new Map();
+    selList.forEach((item) => {
+      const key = hy.getSelectedDataKey(item);
+      if (key) {
+        treeMap.set(key, true);
+      }
+    });
+    hy.noTreeSelData.value = dataList.filter(
+      (item) => !treeMap.get(hy.getSelectedDataKey(item))
+    );
+  }
+  function mergeNoTreeSelData(dataList) {
+    return [...hy.noTreeSelData.value, ...dataList];
+  }
   vue.watch(
     () => props.showCheckbox,
     (newVal) => {
-      virtualTree?.setRowSelection({
+      hy.virtualTree?.setRowSelection({
         type: props.showCheckbox ? "checkbox" : "radio"
       });
     }
@@ -46,10 +86,10 @@ const useAppTreeWrapper = (hy) => {
     return new Promise((resolve) => {
       hy.loading.value = true;
       if (props.disableSelection?.length) {
-        setDisAbleSelectionMap();
+        hy.setDisAbleSelectionMap();
       }
-      if (!virtualTree) {
-        virtualTree = new VirtualTree({
+      if (!hy.virtualTree) {
+        hy.virtualTree = new VirtualTree({
           // 指定容器
           container: treeRef.value,
           // 数据
@@ -64,25 +104,25 @@ const useAppTreeWrapper = (hy) => {
           // 树形业务类型
           business: props.treeType,
           // 自定义整体的插槽
-          renderItem: props.treeType === treeConfig.treeTypeConfig.user ? (data, node) => setUserSlot(data, node) : setSlot("treeParentSlot"),
+          renderItem: props.treeType === treeConfig.treeTypeConfig.user ? (data, node) => hy.setUserSlot(data, node) : props.treeType === treeConfig.treeTypeConfig.group ? (data, node) => hy.setGroupRenderItem(data, node) : hy.setSlot("treeParentSlot"),
           // // 自定义状态右侧插槽
           renderRight: (data) => {
-            let renderRight = setSlot("renderRight");
+            let renderRight = hy.setSlot("renderRight");
             if (renderRight) return renderRight(data);
             if (data.dataType === 1) {
-              let departmentRight = setSlot("departmentRight");
+              let departmentRight = hy.setSlot("departmentRight");
               if (departmentRight) {
                 return departmentRight(data);
               }
             }
             if (data.dataType === 3) {
-              let deviceOnlineRight = setSlot("deviceOnlineRight");
+              let deviceOnlineRight = hy.setSlot("deviceOnlineRight");
               if (deviceOnlineRight) {
                 return deviceOnlineRight(data);
               }
             }
             if ([11].includes(data.dataType)) {
-              let planGroupRight = setSlot("planGroupRight");
+              let planGroupRight = hy.setSlot("planGroupRight");
               if (planGroupRight) {
                 return planGroupRight(data);
               }
@@ -90,16 +130,16 @@ const useAppTreeWrapper = (hy) => {
             return true;
           },
           // // 自定义状态模块
-          renderStatus: props.treeType === treeConfig.treeTypeConfig.device || props.treeType === treeConfig.treeTypeConfig.channel ? (data) => setRenderStatus(data) : null,
+          renderStatus: props.treeType === treeConfig.treeTypeConfig.device || props.treeType === treeConfig.treeTypeConfig.channel ? (data) => hy.setRenderStatus(data) : null,
           // 暂无数据插槽
           renderEmpty: () => {
             if (!props.showCustomEmpty || hy.filterValue.value) return true;
-            let renderEmpty = setSlot("renderEmpty");
+            let renderEmpty = hy.setSlot("renderEmpty");
             if (renderEmpty) {
               const target = renderEmpty();
               return target.el;
             }
-            return setEmpty();
+            return hy.setEmpty();
           },
           props: {
             // 是否显示右侧业务状态
@@ -134,7 +174,6 @@ const useAppTreeWrapper = (hy) => {
             showSelectBox: props.showSelectBox,
             // 选中回调
             onCheckChange: (data, info, checked) => {
-              console.log("onCheckChange", info);
               if (data.dataType === 3 && !checked) {
                 emits("on-click-delete", JSON.parse(JSON.stringify(data)));
               } else if (data.dataType === 3) {
@@ -143,7 +182,11 @@ const useAppTreeWrapper = (hy) => {
               emits(
                 "on-check-tree",
                 JSON.parse(
-                  JSON.stringify(info.checkedBusinessNodes || info.checkedNodes)
+                  JSON.stringify(
+                    hy.mergeNoTreeSelData(
+                      info.checkedBusinessNodes || info.checkedNodes
+                    )
+                  )
                 ),
                 {
                   data,
@@ -248,16 +291,16 @@ const useAppTreeWrapper = (hy) => {
             document.body.click();
           },
           onLoad: () => {
-            if (props.showOnlineOnly && !virtualTree._flattenTree?.length && !hy.filterValue.value) {
+            if (props.showOnlineOnly && !hy.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") {
-              setSelectedOrg(dataList);
+              hy.setSelectedOrg(dataList);
             } else if (props.selectedByDefault?.length) {
-              setCheckedKeys(props.selectedByDefault);
+              hy.setCheckedKeys(props.selectedByDefault);
             }
             if (hy.filterValue.value) {
-              getFilterValue();
+              hy.getFilterValue();
             }
             setTimeout(() => {
               hy.loading.value = false;
@@ -266,7 +309,7 @@ const useAppTreeWrapper = (hy) => {
           }
         });
       } else {
-        virtualTree.setData(
+        hy.virtualTree.setData(
           {
             data: dataList,
             businessConfig: {
@@ -276,11 +319,11 @@ const useAppTreeWrapper = (hy) => {
             }
           },
           () => {
-            if (props.showOnlineOnly && !virtualTree._flattenTree?.length && !hy.filterValue.value) {
+            if (props.showOnlineOnly && !hy.virtualTree._flattenTree?.length && !hy.filterValue.value) {
               elementPlus.ElMessage.success("\u6682\u65E0\u8BBE\u5907\u5904\u4E8E\u5728\u7EBF\u72B6\u6001");
             }
             if (hy.filterValue.value) {
-              getFilterValue();
+              hy.getFilterValue();
             }
             setTimeout(() => {
               hy.loading.value = false;
@@ -318,7 +361,7 @@ const useAppTreeWrapper = (hy) => {
     return content;
   }
   function getFilterValue() {
-    virtualTree.filter({ filterValue: hy.filterValue.value }, false);
+    hy.virtualTree.filter({ filterValue: hy.filterValue.value }, false);
   }
   function setDisAbleSelectionMap() {
     const map = /* @__PURE__ */ new Map();
@@ -332,7 +375,7 @@ const useAppTreeWrapper = (hy) => {
     emits("on-refreshData");
   }
   function setRenderStatus(data) {
-    const slot = setSlot("renderStatus");
+    const slot = hy.setSlot("renderStatus");
     if (slot) {
       return slot(data);
     }
@@ -362,22 +405,24 @@ const useAppTreeWrapper = (hy) => {
   }
   function setUserSlot(data) {
     if (data.dataType === 1) {
-      const slot2 = setSlot("treeParentSlot");
+      const slot2 = hy.setSlot("treeParentSlot");
       if (slot2) {
         return slot2(data);
       }
       return true;
     }
-    const slot = setSlot("treeSelectedSlot");
+    const slot = hy.setSlot("treeSelectedSlot");
     if (slot) {
       return slot(data);
     }
     return true;
   }
   function setGroupRenderItem(data, node) {
-    const slot = setSlot("treeParentSlot");
-    if (slot) {
-      return slot(data, node);
+    if (data.dataType === 4) {
+      const slot = hy.setSlot("treeGroupSlot");
+      if (slot) {
+        return slot(data, node);
+      }
     }
     return true;
   }
@@ -422,81 +467,91 @@ const useAppTreeWrapper = (hy) => {
     emits("on-addDevice");
   }
   function setDeviceStatus(payload) {
-    virtualTree?.updateData([payload]);
+    hy.virtualTree?.updateData([payload]);
   }
   function singleRemovalFn(row, isForce = false) {
     if (props.treeType === "device" || props.treeType === "channel") {
-      virtualTree.setChecked(row.channelId || row.deviceId, false, true);
+      hy.virtualTree.setChecked(row.channelId || row.deviceId, false, true);
     } else if (props.treeType) {
-      virtualTree.setChecked(row.id, false, true, isForce);
+      hy.virtualTree.setChecked(row.id, false, true, isForce);
     } else if (!props.treeType && props.treeProps) {
-      virtualTree.setChecked(
+      hy.virtualTree.setChecked(
         row[`${props.treeProps.value}`],
         false,
         true,
         isForce
       );
     }
+    hy.deleteNoTreeSelData(row);
   }
   function setCheckedKeys(dataList, isForce = false) {
     if (props.treeType === "device" || props.treeType === "channel") {
-      virtualTree?.setCheckedKeys(
+      hy.virtualTree?.setCheckedKeys(
         dataList.map((v) => v.channelId || v.deviceId),
         true,
         isForce
       );
     } else if (props.treeType) {
-      virtualTree?.setCheckedKeys(
+      hy.virtualTree?.setCheckedKeys(
         dataList.map((v) => v.id),
         true,
         isForce
       );
     } else if (!props.treeType && props.treeProps) {
-      console.log(
-        "\u9009\u4E2D\u56DE\u8C03",
-        dataList.map((v) => v[`${props.treeProps.value}`])
-      );
-      virtualTree?.setCheckedKeys(
+      hy.virtualTree?.setCheckedKeys(
         dataList.map((v) => v[`${props.treeProps.value}`]),
         false,
         isForce
       );
     }
+    hy.updateNoTreeSelData(dataList);
     if (props.isBackDefaultSelected) {
       setTimeout(() => {
-        const deviceList = virtualTree?.getCheckedBusinessNodes(true) || [];
-        emits("on-selectedDataList", deviceList);
+        let deviceList = [];
+        if (props.treeType) {
+          deviceList = hy.virtualTree?.getCheckedBusinessNodes(true) || [];
+        } else {
+          deviceList = hy.virtualTree?.getCheckedNodes(true) || [];
+        }
+        emits("on-selectedDataList", hy.mergeNoTreeSelData(deviceList));
       });
     }
   }
   function setChecked(data, type = true) {
     if (props.treeType === "device") {
-      virtualTree?.setChecked(data.channelId || data.deviceId, type, true);
+      hy.virtualTree?.setChecked(data.channelId || data.deviceId, type, true);
     } else if (props.treeType) {
-      virtualTree?.setChecked(data.id, type, true);
+      hy.virtualTree?.setChecked(data.id, type, true);
     } else if (!props.treeType && props.treeProps) {
-      virtualTree?.setChecked(data[`${props.treeProps.value}`], type, false);
+      hy.virtualTree?.setChecked(data[`${props.treeProps.value}`], type, false);
+    }
+    if (!type) {
+      hy.deleteNoTreeSelData(data);
     }
   }
   function setSelectedOrg(deviceList) {
     for (let i = 0; i < deviceList.length; i++) {
       if (props.defaultSelectedOrgID === deviceList[i].id) {
         if (deviceList[i].deviceList?.length) {
-          setCheckedKeys(deviceList[i].deviceList);
+          hy.setCheckedKeys(deviceList[i].deviceList);
         }
         return true;
       }
       if (deviceList[i].children?.length) {
-        const org = setSelectedOrg(deviceList[i].children);
+        const org = hy.setSelectedOrg(deviceList[i].children);
         if (org) return true;
       }
     }
   }
   function getSelectedDataList(leafOnly = false) {
     if (props.treeType) {
-      return virtualTree?.getCheckedBusinessNodes(leafOnly) || [];
+      return hy.mergeNoTreeSelData(
+        hy.virtualTree?.getCheckedBusinessNodes(leafOnly) || []
+      );
     }
-    return virtualTree?.getCheckedNodes(leafOnly) || [];
+    return hy.mergeNoTreeSelData(
+      hy.virtualTree?.getCheckedNodes(leafOnly) || []
+    );
   }
   function setFilterListType(type) {
     if (props.selectFilterList?.length) {
@@ -558,7 +613,7 @@ const useAppTreeWrapper = (hy) => {
     }
   }
   function getNode(id) {
-    return virtualTree.getNode(id);
+    return hy.virtualTree.getNode(id);
   }
   return {
     filterValue,
@@ -566,6 +621,7 @@ const useAppTreeWrapper = (hy) => {
     permissionIdList,
     disableSelectionMap,
     addDeviceDom,
+    setDisAbleSelectionMap,
     getData,
     getFilterValue,
     refreshData,
@@ -573,6 +629,11 @@ const useAppTreeWrapper = (hy) => {
     setCheckedKeys,
     setChecked,
     setFilterListType,
+    setSelectedOrg,
+    setUserSlot,
+    setSlot,
+    setRenderStatus,
+    setEmpty,
     getInputPlaceholder,
     onChange,
     selectFilterList,
@@ -580,7 +641,14 @@ const useAppTreeWrapper = (hy) => {
     selectedDataList,
     getSelectedDataList,
     loading,
-    getNode
+    getNode,
+    noTreeSelData,
+    updateNoTreeSelData,
+    mergeNoTreeSelData,
+    getSelectedDataKey,
+    deleteNoTreeSelData,
+    setDeviceStatus,
+    setGroupRenderItem
   };
 };
 function filterNodeMethod(data, value, { selectFilterType, treeFilterParam = [], treeType }) {

package/lib/components/hyTree/tree.vue.js

@@ -206,7 +206,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       onChange,
       getSelectedDataList,
       loading,
-      getNode
+      getNode,
+      setDeviceStatus
     } = useMixins.useMixins(
       {
         props,
@@ -229,7 +230,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       setChecked,
       getSelectedDataList,
       refreshData,
-      getNode
+      getNode,
+      setDeviceStatus
     });
     return (_ctx, _cache) => {
       const _directive_loading = vue.resolveDirective("loading");

package/lib/style/index.scss

@@ -3,7 +3,6 @@
 * {
   margin: 0;
   padding: 0;
-  box-sizing: border-box;
 }
 html,
 body,

package/lib/style/tailwind.scss

@@ -54,7 +54,6 @@
 *,
 ::before,
 ::after {
-  box-sizing: border-box;
   /* 1 */
   border-width: 0;
   /* 2 */

package/lib/utils/is.js

@@ -2,7 +2,9 @@
 
 var vue = require('vue');
 require('../hooks/index.js');
+require('./index.js');
 var usePermissionMap = require('../hooks/usePermissionMap.js');
+var permission = require('./permission.js');
 
 const isString = (e) => typeof e === "string";
 const isNumber = (e) => typeof e === "number";
@@ -42,12 +44,12 @@ function isSupportH265() {
   }
   return { isSupport, isVersionLow };
 }
-function isPermission(permission) {
+function isPermission(permission$1) {
   const { permissionMap } = usePermissionMap.usePermissionMap();
-  if (!permission) {
+  if (!permission$1) {
     return true;
   }
-  return permissionMap.value.has(permission);
+  return permissionMap.value.has(permission.PERMISSION[`${permission$1}`]);
 }
 
 exports.isArray = isArray;

package/lib/utils/map/hook/bigMap.js

@@ -347,6 +347,8 @@ class bigMap extends events.EventEmitter {
       off: function(target, types, fn, context) {
         const wrappedFn = wrappedHandlers.take(types, fn);
         return target.off(types, wrappedFn || fn, context);
+      },
+      satelliteMapFn: function() {
       }
     };
     return mapProxy.createMapProxy(newMap, handlers);

package/lib/utils/map/hook/gaode.js

@@ -98,6 +98,7 @@ class Google extends events.EventEmitter {
       return mapProxy.createMapProxy(polygon, handlers);
     });
     this.initParams = request;
+    this.layerSateGroup = null;
   }
   InitMap(domId, option) {
     const { center } = option;
@@ -114,24 +115,33 @@ class Google extends events.EventEmitter {
       resizeEnable: true
     });
     newMap.on("complete", (e) => {
-      if (option.completeCallbacks) {
-        option.completeCallbacks(e);
-      }
+      newMap.plugin(
+        [
+          "AMap.MarkerClusterer",
+          "AMap.Scale",
+          "AMap.LayerGroup",
+          "AMap.Circle",
+          "AMap.TileLayer",
+          "AMap.GeometryUtil",
+          "AMap.MouseTool"
+        ],
+        () => {
+          this.layerSateGroup = new window.AMap.LayerGroup([
+            new window.AMap.TileLayer.Satellite()
+          ]);
+          this.layerSateGroup.setMap(newMap);
+          this.layerSateGroup.hide();
+          setTimeout(() => {
+            this.satelliteMapFn(newMap, option.satelliteMap);
+            if (option.completeCallbacks) {
+              option.completeCallbacks(e);
+            }
+          });
+        }
+      );
     });
-    newMap.plugin(
-      [
-        "AMap.MarkerClusterer",
-        "AMap.Scale",
-        "AMap.LayerGroup",
-        "AMap.Circle",
-        "AMap.TileLayer",
-        "AMap.GeometryUtil",
-        "AMap.MouseTool"
-      ],
-      () => {
-      }
-    );
     const wrappedHandlers = mapProxy.createWrappedHandlerStore();
+    const _this = this;
     const handlers = {
       // return 单位：m
       distance: function(target, latAndlng1, latAndlng2) {
@@ -182,10 +192,35 @@ class Google extends events.EventEmitter {
       // // 四个角
       getBounds: function(target) {
         return wrapBounds(target);
+      },
+      /* 判断地图颜色 */
+      satelliteMapFn: function(target, satelliteMap) {
+        if (satelliteMap === 3) {
+          _this.layerSateGroup.show();
+        } else {
+          if (satelliteMap === 1) {
+            target.setMapStyle(_this.initParams.defaultMapStyle);
+          } else {
+            target.setMapStyle(_this.initParams.currencyMapStyle);
+          }
+          _this.layerSateGroup.hide();
+        }
       }
     };
     return mapProxy.createMapProxy(newMap, handlers);
   }
+  satelliteMapFn(map, satelliteMap) {
+    if (satelliteMap === 3) {
+      this.layerSateGroup.show();
+    } else {
+      if (satelliteMap === 1) {
+        map.setMapStyle(this.initParams.defaultMapStyle);
+      } else {
+        map.setMapStyle(this.initParams.currencyMapStyle);
+      }
+      this.layerSateGroup.hide();
+    }
+  }
   // 地图图层
   layerGroup(map, markers = []) {
     const layerGroup = new window.AMap.LayerGroup(markers);

package/lib/utils/map/hook/leafletjs.js

@@ -330,6 +330,7 @@ class Leafletjs extends events.EventEmitter {
       return mapProxy.createMapProxy(polygon, handlers);
     });
     this.initParams = request;
+    this.tileLayerList = [];
   }
   // 初始化地图
   InitMap(domId, option) {
@@ -349,6 +350,7 @@ class Leafletjs extends events.EventEmitter {
     const newMap = L.map(domId, option);
     newMap.getInitMap = () => newMap;
     const wrappedHandlers = mapProxy.createWrappedHandlerStore();
+    const _this = this;
     const handlers = {
       // 删除地图
       removeMap: function(target, params) {
@@ -424,6 +426,10 @@ class Leafletjs extends events.EventEmitter {
       off: function(target, types, fn, context) {
         const wrappedFn = wrappedHandlers.take(types, fn);
         return target.off(types, wrappedFn || fn, context);
+      },
+      /* 判断地图颜色 */
+      satelliteMapFn: function(target, satelliteMap) {
+        _this.setLayersUrl(target, satelliteMap !== 2);
       }
     };
     const map = mapProxy.createMapProxy(newMap, handlers);
@@ -433,7 +439,7 @@ class Leafletjs extends events.EventEmitter {
         option.completeCallbacks();
       }
     });
-    this.setLayersUrl(map);
+    this.setLayersUrl(map, option.satelliteMap !== 2);
     return map;
   }
   // 设置地图瓦片地址
@@ -448,12 +454,18 @@ class Leafletjs extends events.EventEmitter {
     if (mapServerType === "WMTS" || mapServerType === "Dynamic") {
       return this.createLayers(map, layersUrls);
     }
+    this.tileLayerList.forEach((tileLayer) => {
+      tileLayer?.remove();
+    });
+    this.tileLayerList = [];
     layersUrls.split(",").forEach((layersUrl) => {
+      let tileLayer = null;
       if (changeColorType) {
-        this.createCustomLayers(map, layersUrl);
+        tileLayer = this.createCustomLayers(map, layersUrl);
       } else {
-        this.createLayers(map, layersUrl);
+        tileLayer = this.createLayers(map, layersUrl);
       }
+      this.tileLayerList.push(tileLayer);
     });
   }
   // 超图 WMTS 图层（不适用所有的WMTS图层，目前仅支持超图WMTS，因不同的WMTS服务规范不一样，主要体现在路由访问参数）

package/lib/utils/map/index.js

@@ -233,7 +233,7 @@ class InitMap extends events.EventEmitter {
       /*  === leafletjs === */
       ...option
     };
-    return this.map.InitMap(domId, option);
+    return this.map?.InitMap(domId, option);
   }
   // 自定义 h5 图标
   DivIcon(option) {

package/lib/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hy-dispatch-ui-v3",
-  "version": "0.2.66",
+  "version": "0.2.67",
   "main": "lib/index.js",
   "module": "es/index.mjs",
   "scripts": {
@@ -30,7 +30,7 @@
     "events": "^3.3.0",
     "express": "^5.2.1",
     "hy-common": "^0.0.39",
-    "hy-virtual-tree": "^2.4.5",
+    "hy-virtual-tree": "^2.4.10",
     "leaflet": "^1.5.1",
     "leaflet-pip": "^1.1.0",
     "leaflet-polylinedecorator": "^1.6.0",