hy-dispatch-ui-v3 0.2.65 → 0.2.67

package/lib/index.js

@@ -12,32 +12,38 @@ var index$1 = require('./components/hyInput/index.js');
 var index$2 = require('./components/hyLoading/index.js');
 var index$3 = require('./components/hyTimePicker/index.js');
 var index$4 = require('./components/hyTooltip/index.js');
-var index$5 = require('./bussiness/hyAddDepartmentType/index.js');
-var index$6 = require('./components/hyAudioPlayer/index.js');
-var index$7 = require('./components/hyTableForm/index.js');
-var index$8 = require('./components/hyBatchUploadDialog/index.js');
-var index$9 = require('./components/hyButton/index.js');
-var index$a = require('./components/hyConfigProvider/index.js');
-var index$b = require('./components/hyConfirmDialog/index.js');
-var index$c = require('./components/hyCutter/index.js');
-var index$d = require('./components/hyDialog/index.js');
-var index$e = require('./components/hyForm/index.js');
-var index$f = require('./components/hyIcon/index.js');
-var index$g = require('./components/hyIconBox/index.js');
-var index$h = require('./components/hyMap/index.js');
-var index$i = require('./bussiness/hyMapAearchPlace/index.js');
-var index$j = require('./components/hyMenu/index.js');
-var index$k = require('./components/hyNoPermissions/index.js');
-var index$l = require('./components/hyNoPermissionsMap/index.js');
-var index$m = require('./components/hyOrgCascader/index.js');
-var index$n = require('./components/hyRadioGroup/index.js');
-var index$o = require('./components/hySearch/index.js');
-var index$p = require('./components/hyTable/index.js');
-var index$q = require('./components/hyTableActionButton/index.js');
-var index$r = require('./components/hyTree/index.js');
-var index$s = require('./components/hyUserAvatar/index.js');
-var index$t = require('./components/hyVideoPlayer/index.js');
-var index$u = require('./utils/map/index.js');
+var index$5 = require('./bussiness/hyAcquisitionStationTree/index.js');
+var index$6 = require('./bussiness/hyAddDepartmentType/index.js');
+var index$7 = require('./components/hyAudioPlayer/index.js');
+var index$8 = require('./components/hyTableForm/index.js');
+var index$9 = require('./components/hyBatchUploadDialog/index.js');
+var index$a = require('./components/hyButton/index.js');
+var index$b = require('./components/hyConfigProvider/index.js');
+var index$c = require('./components/hyConfirmDialog/index.js');
+var index$d = require('./components/hyCutter/index.js');
+var index$e = require('./bussiness/hyDeviceTree/index.js');
+var index$f = require('./components/hyDialog/index.js');
+var index$g = require('./components/hyForm/index.js');
+var index$h = require('./components/hyIcon/index.js');
+var index$i = require('./components/hyIconBox/index.js');
+var index$j = require('./components/hyMap/index.js');
+var index$k = require('./bussiness/hyMapAearchPlace/index.js');
+var index$l = require('./components/hyMenu/index.js');
+var index$m = require('./components/hyNoPermissions/index.js');
+var index$n = require('./components/hyNoPermissionsMap/index.js');
+var index$o = require('./components/hyOrgCascader/index.js');
+var index$p = require('./bussiness/hyOrgGroupTree/index.js');
+var index$q = require('./bussiness/hyPlanGroupDeviceTree/index.js');
+var index$r = require('./components/hyRadioGroup/index.js');
+var index$s = require('./components/hySearch/index.js');
+var index$t = require('./components/hyTable/index.js');
+var index$u = require('./components/hyTableActionButton/index.js');
+var index$v = require('./components/hyTour/index.js');
+var index$w = require('./components/hyTree/index.js');
+var index$x = require('./components/hyUserAvatar/index.js');
+var index$y = require('./bussiness/hyUserTree/index.js');
+var index$z = require('./components/hyVideoPlayer/index.js');
+var index$A = require('./utils/map/index.js');
 var permission = require('./utils/permission.js');
 var crypto = require('./utils/crypto.js');
 var file = require('./utils/file.js');
@@ -83,35 +89,41 @@ exports.ElTimePicker = index$3.ElTimePicker;
 exports.HyTimePicker = index$3.HyTimePicker;
 exports.ElTooltip = index$4.ElTooltip;
 exports.HyTooltip = index$4.HyTooltip;
-exports.HyAddDepartmentType = index$5.HyAddDepartmentType;
-exports.HyAudioPlayer = index$6.HyAudioPlayer;
-exports.HyBatchTableForm = index$7.HyBatchTableForm;
-exports.HyTableForm = index$7.HyTableForm;
-exports.HyBatchUploadDialog = index$8.HyBatchUploadDialog;
-exports.HyButton = index$9.HyButton;
-exports.HyConfigProvider = index$a.HyConfigProvider;
-exports.HyConfirmDialog = index$b.HyConfirmDialog;
-exports.HyCutter = index$c.HyCutter;
-exports.HyDialog = index$d.HyDialog;
-exports.HyForm = index$e.HyForm;
-exports.HyIcon = index$f.HyIcon;
-exports.HyIconBox = index$g.HyIconBox;
-exports.HyMap = index$h.HyMap;
-exports.HyMapAearchPlace = index$i.HyMapAearchPlace;
-exports.HyMenu = index$j.HyMenu;
-exports.HyNoPermissions = index$k.HyNoPermissions;
-exports.HyNoPermissionsMap = index$l.HyNoPermissionsMap;
-exports.HyOrgCascader = index$m.HyOrgCascader;
-exports.HyRadioGroup = index$n.HyRadioGroup;
-exports.HySearch = index$o.HySearch;
-exports.HyTable = index$p.HyTable;
-exports.HyTableActionButton = index$q.HyTableActionButton;
-exports.HyTree = index$r.HyTree;
-exports.HyUserAvatar = index$s.HyUserAvatar;
-exports.HyVideoPlayer = index$t.HyVideoPlayer;
-exports.InitMap = index$u.InitMap;
-exports.setMapServer = index$u.setMapServer;
-exports.setPoiServer = index$u.setPoiServer;
+exports.HyAcquisitionStationTree = index$5.HyAcquisitionStationTree;
+exports.HyAddDepartmentType = index$6.HyAddDepartmentType;
+exports.HyAudioPlayer = index$7.HyAudioPlayer;
+exports.HyBatchTableForm = index$8.HyBatchTableForm;
+exports.HyTableForm = index$8.HyTableForm;
+exports.HyBatchUploadDialog = index$9.HyBatchUploadDialog;
+exports.HyButton = index$a.HyButton;
+exports.HyConfigProvider = index$b.HyConfigProvider;
+exports.HyConfirmDialog = index$c.HyConfirmDialog;
+exports.HyCutter = index$d.HyCutter;
+exports.HyDeviceTree = index$e.HyDeviceTree;
+exports.HyDialog = index$f.HyDialog;
+exports.HyForm = index$g.HyForm;
+exports.HyIcon = index$h.HyIcon;
+exports.HyIconBox = index$i.HyIconBox;
+exports.HyMap = index$j.HyMap;
+exports.HyMapAearchPlace = index$k.HyMapAearchPlace;
+exports.HyMenu = index$l.HyMenu;
+exports.HyNoPermissions = index$m.HyNoPermissions;
+exports.HyNoPermissionsMap = index$n.HyNoPermissionsMap;
+exports.HyOrgCascader = index$o.HyOrgCascader;
+exports.HyOrgGroupTree = index$p.HyOrgGroupTree;
+exports.HyPlanGroupDeviceTree = index$q.HyPlanGroupDeviceTree;
+exports.HyRadioGroup = index$r.HyRadioGroup;
+exports.HySearch = index$s.HySearch;
+exports.HyTable = index$t.HyTable;
+exports.HyTableActionButton = index$u.HyTableActionButton;
+exports.HyTour = index$v.HyTour;
+exports.HyTree = index$w.HyTree;
+exports.HyUserAvatar = index$x.HyUserAvatar;
+exports.HyUserTree = index$y.HyUserTree;
+exports.HyVideoPlayer = index$z.HyVideoPlayer;
+exports.InitMap = index$A.InitMap;
+exports.setMapServer = index$A.setMapServer;
+exports.setPoiServer = index$A.setPoiServer;
 exports.PERMISSION = permission.PERMISSION;
 exports.base64Decrypt = crypto.base64Decrypt;
 exports.encryptToBase64 = crypto.encryptToBase64;

package/lib/static/hy-svg-icons/hy-icon-ops-linear-arrow.js

@@ -0,0 +1,10 @@
+export default {
+  id: 'hy-icon-ops-linear-arrow',
+  symbol: `<symbol id="hy-icon-ops-linear-arrow" viewBox="0 0 6 6">
+    <g id="hy-icon-ops-linear-arrow-部门管理" stroke="none" stroke-width="1"  fill-rule="evenodd">
+        <g id="hy-icon-ops-linear-arrow-缩小化-组件说明-清除" transform="translate(-524, -155)"  fill-rule="nonzero">
+            <path d="M527.5474,155.206715 C527.421954,155.075391 527.249559,155.000932 527.069246,155.000193 C526.890413,154.995823 526.717619,155.065901 526.591092,155.19411 L524.200321,157.582204 C523.936243,157.845664 523.932818,158.276291 524.19267,158.544035 C524.452522,158.811779 524.877251,158.815252 525.141328,158.551792 L526.384529,157.302963 L526.384529,160.321289 C526.384529,160.696131 526.684237,161 527.053945,161 C527.423653,161 527.723361,160.696131 527.723361,160.321289 L527.723361,157.358229 L528.848936,158.539187 C529.015151,158.7136 529.260514,158.784857 529.492599,158.726117 C529.724684,158.667378 529.908231,158.487565 529.974101,158.254413 C530.03997,158.021261 529.978154,157.770191 529.811938,157.595778 L527.5474,155.206715 Z" id="hy-icon-ops-linear-arrow-Arrow"></path>
+        </g>
+    </g>
+</symbol>`,
+};

package/lib/style/element/hy-element.scss

@@ -1002,11 +1002,32 @@
   }
 }
 
+.hy-el-notification {
+  --hy-el-notification-title-color: rgba(var(--hy-main), 1);
+  --hy-el-notification-content-color: rgba(var(--hy-main), 1);
+  --hy-el-notification-close-color: rgba(var(--hy-main), 1);
+  background: rgba(var(--hy-background-2), 1);
+}
 
-// 指引
-.hy-el-tour__content{
-  .hy-el-tour__body{
+.hy-el-tour {
+  .hy-el-tour__hollow {
+    fill: rgba(0, 0, 0, 0.9) !important;
+  }
+  .hy-el-tour__content {
+    border: 1px solid rgba(var(--hy-theme), 1);
+  }
+  .hy-el-tour__arrow {
+    border: 1px solid rgba(var(--hy-theme), 1);
+  }
+  .hy-el-tour__title {
+    color: rgba(var(--hy-main), 1);
+    font-weight: bold;
+  }
+  .hy-el-tour__body {
     color: rgba(var(--hy-main), 1);
   }
+  .hy-el-tour__footer {
+    display: none;
+  }
 }
 

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/style/theme.scss

@@ -3,6 +3,7 @@
   --hy-add: 44, 232, 152; // 新增
   --hy-success: 44, 232, 152; // 成功
   --hy-success-2: 44, 232, 152; // 成功
+  --hy-success-3: 45, 255, 211; // 成功
   --hy-info: 144, 147, 153; // 灰色
   --hy-warning: 248, 166, 45; // 警告
   --hy-danger: 201, 37, 37; // 删除

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);
@@ -355,7 +357,15 @@ class bigMap extends events.EventEmitter {
   layerGroup(map, markers = []) {
     const layerGroup = this.BM.layerGroup(markers);
     layerGroup.addTo(map);
-    return layerGroup;
+    const handlers = {
+      addLayer: function(target, addItem) {
+        return target.addLayer(addItem);
+      },
+      clearLayers: function(target) {
+        return target.clearLayers();
+      }
+    };
+    return mapProxy.createMapProxy(layerGroup, handlers);
   }
   // 自定义图标
   DivIcon(option) {

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,15 +192,48 @@ 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);
     layerGroup.setMap(map);
-    return layerGroup;
+    const handlers = {
+      addLayer: function(target, addItem) {
+        return target.addLayer(addItem);
+      },
+      clearLayers: function(target) {
+        return target.clearLayers();
+      }
+    };
+    return mapProxy.createMapProxy(layerGroup, handlers);
   }
   // 自定义图标
   DivIcon(option) {

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服务规范不一样，主要体现在路由访问参数）
@@ -574,7 +586,16 @@ class Leafletjs extends events.EventEmitter {
   }
   // 地图图层
   layerGroup(map, markers = []) {
-    return L.layerGroup(markers).addTo(getInitMap(map));
+    const layerGroup = L.layerGroup(markers).addTo(getInitMap(map));
+    const handlers = {
+      addLayer: function(target, addItem) {
+        return target.addLayer(addItem);
+      },
+      clearLayers: function(target) {
+        return target.clearLayers();
+      }
+    };
+    return mapProxy.createMapProxy(layerGroup, handlers);
   }
   // 自定义图标
   DivIcon(option) {

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.64";
+const version = "0.2.66";
 
 exports.version = version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hy-dispatch-ui-v3",
-  "version": "0.2.65",
+  "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",