hy-dispatch-ui-v3 0.2.66 → 0.2.68

package/es/utils/form.mjs

@@ -1,7 +1,7 @@
 import { unref } from 'vue';
 import '../hooks/index.mjs';
 import { isString, isArray, isBoolean, isFunction, isObject, isEmpty } from './is.mjs';
-import { useLocale } from '../hooks/useLocale.mjs';
+import { $t } from '../hooks/useLocale.mjs';
 
 function getValueByProp(model, prop) {
   if (isString(prop)) {
@@ -52,21 +52,20 @@ function clearSpace(value, type = "between") {
   return value;
 }
 const genRuleRequiredMsgHandler = (column, model) => {
-  const { t } = useLocale();
   const { type, prop } = column || {};
   const label = columnLabelHandler(column, model);
   if (!prop || !prop?.length) return "";
   switch (type) {
     case "input":
     case "input-number":
-      return t("hy.pleaseEnterPlaceholder", [label]);
+      return $t("hy.pleaseEnterPlaceholder", [label]);
     case "select":
     case "radio":
     case "checkbox":
     case "date-picker":
-      return t("hy.pleaseSelectPlaceholder", [label]);
+      return $t("hy.pleaseSelectPlaceholder", [label]);
     default:
-      return t("hy.cannotBeEmpty", [label]);
+      return $t("hy.cannotBeEmpty", [label]);
   }
 };
 const requiredHandler = (column, model) => {
@@ -96,11 +95,10 @@ const columnRuleHandler = (column, model) => {
 };
 const genColumnDefaultLabel = (column) => {
   if (column.label) return unref(column.label);
-  const { t } = useLocale();
   switch (column.type) {
     // 部门级联选择框
     case "org-cascader":
-      return t("form.department");
+      return $t("form.department");
   }
 };
 const columnLabelHandler = (column, model) => {
@@ -112,7 +110,6 @@ const columnLabelHandler = (column, model) => {
   return label;
 };
 function columnPlaceholderHandler(column, model) {
-  const { t } = useLocale();
   const { type, attrs = {} } = column || {};
   if (isFunction(attrs.placeholder)) {
     const placeholder2 = unref(attrs.placeholder);
@@ -125,13 +122,13 @@ function columnPlaceholderHandler(column, model) {
     case "input-number":
     case "lat":
     case "lon":
-      placeholder = placeholder || t("hy.pleaseEnterPlaceholder", [label]);
+      placeholder = placeholder || $t("hy.pleaseEnterPlaceholder", [label]);
       break;
     case "select":
     case "date-picker":
     case "time-picker":
     case "org-cascader":
-      placeholder = placeholder || t("hy.pleaseSelectPlaceholder", [label]);
+      placeholder = placeholder || $t("hy.pleaseSelectPlaceholder", [label]);
       break;
     default:
       placeholder = placeholder || label;

package/es/utils/handler.mjs

@@ -2,7 +2,7 @@ import 'vue';
 import { ElMessage } from 'element-plus';
 import { isFunction, isVueProxy, isArray, isObject, isEmpty } from './is.mjs';
 import '../index.mjs';
-import { useLocale } from '../hooks/useLocale.mjs';
+import { $t } from '../hooks/useLocale.mjs';
 
 function funRunHandler(target, ...args) {
   if (isFunction(target)) {
@@ -39,10 +39,7 @@ const mergeDeep = (target, value) => {
   if (isObject(target)) {
     const obj = {};
     Object.keys(target).forEach((key) => {
-      obj[key] = mergeDeep(
-        target[key],
-        isEmpty(value[key]) ? target[key] : value[key]
-      );
+      obj[key] = mergeDeep(target[key], isEmpty(value[key]) ? target[key] : value[key]);
     });
     Object.keys(value).forEach((key) => {
       if (isEmpty(value[key])) return;
@@ -83,11 +80,10 @@ const withInstall = (comp, name) => {
   return comp;
 };
 async function copyText(text) {
-  const { t } = useLocale();
   if (navigator.clipboard) {
     try {
       await navigator.clipboard.writeText(text);
-      ElMessage.success(t("hy.copySuccessfully"));
+      ElMessage.success($t("hy.copySuccessfully"));
       return;
     } catch {
     }
@@ -99,7 +95,7 @@ async function copyText(text) {
     input.select();
     document.execCommand("copy");
     document.body.removeChild(input);
-    ElMessage.success(t("hy.copySuccessfully"));
+    ElMessage.success($t("hy.copySuccessfully"));
   } catch (err) {
     console.error(err);
     return Promise.reject();

package/es/utils/input.mjs

@@ -1,5 +1,5 @@
 import '../hooks/index.mjs';
-import { useLocale } from '../hooks/useLocale.mjs';
+import { $t } from '../hooks/useLocale.mjs';
 
 function formatNumber(n) {
   n = n.toString();
@@ -9,15 +9,14 @@ function formatTimeFn(number, format) {
   const time = new Date(number);
   const newArr = [];
   const formatArr = ["Y", "M", "D", "day", "h", "m", "s"];
-  const { t } = useLocale();
   const arrWeek = [
-    t("hy.sunday"),
-    t("hy.monday"),
-    t("hy.tuesday"),
-    t("hy.wednesday"),
-    t("hy.thursday"),
-    t("hy.friday"),
-    t("hy.saturday")
+    $t("hy.sunday"),
+    $t("hy.monday"),
+    $t("hy.tuesday"),
+    $t("hy.wednesday"),
+    $t("hy.thursday"),
+    $t("hy.friday"),
+    $t("hy.saturday")
   ];
   newArr.push(time.getFullYear());
   newArr.push(formatNumber(time.getMonth() + 1));

package/es/utils/is.mjs

@@ -1,6 +1,8 @@
 import { isRef, isReactive, isReadonly, isProxy } from 'vue';
 import '../hooks/index.mjs';
+import './index.mjs';
 import { usePermissionMap } from '../hooks/usePermissionMap.mjs';
+import { PERMISSION } from './permission.mjs';
 
 const isString = (e) => typeof e === "string";
 const isNumber = (e) => typeof e === "number";
@@ -45,7 +47,7 @@ function isPermission(permission) {
   if (!permission) {
     return true;
   }
-  return permissionMap.value.has(permission);
+  return permissionMap.value.has(PERMISSION[`${permission}`]);
 }
 
 export { isArray, isBoolean, isEmpty, isFile, isFunction, isNull, isNumber, isObject, isOverflowing, isPermission, isString, isSupportH265, isSymbol, isUndefined, isVueProxy };

package/es/utils/map/hook/bigMap.mjs

@@ -8,9 +8,7 @@ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { en
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 const CIRCLE_SEGMENTS = 36;
 function remToPx(rem) {
-  const rootFontSize = parseFloat(
-    getComputedStyle(document.documentElement).fontSize
-  );
+  const rootFontSize = parseFloat(getComputedStyle(document.documentElement).fontSize);
   return rem * rootFontSize;
 }
 function rangingStartIconOption(options, dicId) {
@@ -308,11 +306,7 @@ class bigMap extends EventEmitter {
             if (!newEvent.layer.getLatLngs) {
               newEvent.layer.getLatLngs = () => {
                 const circle = newEvent.layer;
-                const points = circleToPolygonPoints(
-                  circle.getLatLng(),
-                  circle.getRadius() / 1e3,
-                  true
-                );
+                const points = circleToPolygonPoints(circle.getLatLng(), circle.getRadius() / 1e3, true);
                 return [latLngListCheckExport(points)];
               };
             } else {
@@ -343,6 +337,8 @@ class bigMap extends EventEmitter {
       off: function(target, types, fn, context) {
         const wrappedFn = wrappedHandlers.take(types, fn);
         return target.off(types, wrappedFn || fn, context);
+      },
+      satelliteMapFn: function() {
       }
     };
     return createMapProxy(newMap, handlers);
@@ -443,9 +439,7 @@ class bigMap extends EventEmitter {
     map.addLayer(displayCluster);
     const toNativeMarkers = (list = []) => {
       const markers = Array.isArray(list) ? list : [list];
-      return markers.map(
-        (marker) => marker?.getInitMarker ? marker.getInitMarker() : marker
-      ).filter(Boolean);
+      return markers.map((marker) => marker?.getInitMarker ? marker.getInitMarker() : marker).filter(Boolean);
     };
     const handlers = {
       remove: function(target) {
@@ -487,10 +481,7 @@ class bigMap extends EventEmitter {
       },
       // 圆形转多边形坐标
       getLatLngs: function(target) {
-        const points = circleToPolygonPoints(
-          target.getLatLng(),
-          target.getRadius() / 1e3
-        );
+        const points = circleToPolygonPoints(target.getLatLng(), target.getRadius() / 1e3);
         return [latLngListCheckExport(points)];
       }
     };
@@ -661,9 +652,7 @@ class bigMap extends EventEmitter {
       layer = e.layer;
       if (!layer._latlngs) {
         const center = latAndLngCheckExport(layer.getLatLng());
-        layer._latlngs = [
-          circleToPolygonPoints(center, layer.getRadius() / 1e3, true)
-        ];
+        layer._latlngs = [circleToPolygonPoints(center, layer.getRadius() / 1e3, true)];
       } else {
         layer._latlngs[0] = latLngListCheckExport(layer._latlngs[0]);
       }
@@ -802,12 +791,8 @@ class bigMap extends EventEmitter {
     function calcTotalDistance(index, preIndex) {
       const current = rangingMarker[index].options.extData.latlng;
       const previous = rangingMarker[preIndex].options.extData.latlng;
-      const distance = parseFloat(
-        (map.distance(current, previous) / 1e3).toFixed(2)
-      );
-      const total = parseFloat(
-        rangingMarker[preIndex].options.extData.distance || 0
-      );
+      const distance = parseFloat((map.distance(current, previous) / 1e3).toFixed(2));
+      const total = parseFloat(rangingMarker[preIndex].options.extData.distance || 0);
       return (distance + total).toFixed(2);
     }
     function removeLineBetween(groupIndex, aIndex, bIndex) {
@@ -823,9 +808,7 @@ class bigMap extends EventEmitter {
     function setStartIcon(index) {
       const markerItem = rangingMarker[index];
       markerItem.setIcon({
-        divIcon: _this.DivIcon(
-          rangingStartIconOption(options, markerItem.options.extData.dicId)
-        )
+        divIcon: _this.DivIcon(rangingStartIconOption(options, markerItem.options.extData.dicId))
       });
       markerItem.options.extData.distance = 0;
     }
@@ -833,14 +816,7 @@ class bigMap extends EventEmitter {
       const markerItem = rangingMarker[index];
       const isLast = showDeleteAll ?? !rangingMarker[index + 1]?.options?.extData?.distance;
       markerItem.setIcon({
-        divIcon: _this.DivIcon(
-          rangingPointIconOption(
-            options,
-            distance,
-            markerItem.options.extData.dicId,
-            isLast
-          )
-        )
+        divIcon: _this.DivIcon(rangingPointIconOption(options, distance, markerItem.options.extData.dicId, isLast))
       });
       markerItem.options.extData.distance = distance;
     }
@@ -868,10 +844,7 @@ class bigMap extends EventEmitter {
         rangingPointsIng.push({ lat, lng });
       } else {
         const latlngs = [
-          [
-            rangingPointsIng[rangingPointsIng.length - 1].lat,
-            rangingPointsIng[rangingPointsIng.length - 1].lng
-          ],
+          [rangingPointsIng[rangingPointsIng.length - 1].lat, rangingPointsIng[rangingPointsIng.length - 1].lng],
           [lat, lng]
         ];
         const polyline = _this.Polyline(latlngs, {
@@ -889,13 +862,9 @@ class bigMap extends EventEmitter {
           { lat: latlngs[1][0], lng: latlngs[1][1] }
         );
         distance = parseFloat((distance / 1e3).toFixed(2));
-        const total = parseFloat(
-          rangingMarker[rangingMarker.length - 1].options.extData.distance || 0
-        );
+        const total = parseFloat(rangingMarker[rangingMarker.length - 1].options.extData.distance || 0);
         distance = (distance + total).toFixed(2);
-        const customIcon = _this.DivIcon(
-          rangingPointIconOption(options, distance, dicId)
-        );
+        const customIcon = _this.DivIcon(rangingPointIconOption(options, distance, dicId));
         const markerItem = _this.Marker({
           position: { lat, lng },
           icon: customIcon,
@@ -961,10 +930,7 @@ class bigMap extends EventEmitter {
               if (changeIndex - 1 === index) {
                 setStartIcon(changeIndex);
               } else {
-                setPointIcon(
-                  changeIndex,
-                  calcTotalDistance(changeIndex, changeIndex - 1)
-                );
+                setPointIcon(changeIndex, calcTotalDistance(changeIndex, changeIndex - 1));
               }
               changeIndex++;
             }
@@ -997,10 +963,7 @@ class bigMap extends EventEmitter {
             let changeIndex = index + 1;
             while (rangingMarker[changeIndex]?.options?.extData?.distance) {
               const disIndex = changeIndex - 1 === index ? changeIndex - 2 : changeIndex - 1;
-              setPointIcon(
-                changeIndex,
-                calcTotalDistance(changeIndex, disIndex)
-              );
+              setPointIcon(changeIndex, calcTotalDistance(changeIndex, disIndex));
               changeIndex++;
             }
             setTimeout(() => {

package/es/utils/map/hook/gaode.mjs

@@ -94,6 +94,7 @@ class Google extends EventEmitter {
       return createMapProxy(polygon, handlers);
     });
     this.initParams = request;
+    this.layerSateGroup = null;
   }
   InitMap(domId, option) {
     const { center } = option;
@@ -110,31 +111,35 @@ class Google extends 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 = createWrappedHandlerStore();
+    const _this = this;
     const handlers = {
       // return 单位：m
       distance: function(target, latAndlng1, latAndlng2) {
-        return AMap.GeometryUtil.distance(
-          [latAndlng1.lng, latAndlng1.lat],
-          [latAndlng2.lng, latAndlng2.lat]
-        );
+        return AMap.GeometryUtil.distance([latAndlng1.lng, latAndlng1.lat], [latAndlng2.lng, latAndlng2.lat]);
       },
       // 删除地图
       removeMap: function(target) {
@@ -178,10 +183,35 @@ class Google extends 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 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);
@@ -205,10 +235,7 @@ class Google extends EventEmitter {
     let offset = null;
     const { html, iconSize, iconAnchor } = markerOptions.icon.option;
     if (markerOptions.offset) {
-      offset = new window.AMap.Pixel(
-        markerOptions.offset[0],
-        markerOptions.offset[1]
-      );
+      offset = new window.AMap.Pixel(markerOptions.offset[0], markerOptions.offset[1]);
     } else {
       const offsetX = iconAnchor[0] - iconSize[0] / 2;
       const offsetY = -iconAnchor[1];
@@ -243,10 +270,7 @@ class Google extends EventEmitter {
         target.setContent(html2);
         let setOffset = null;
         if (iconParams.offset) {
-          setOffset = new window.AMap.Pixel(
-            iconParams.offset[0],
-            iconParams.offset[1]
-          );
+          setOffset = new window.AMap.Pixel(iconParams.offset[0], iconParams.offset[1]);
         } else {
           const offsetX = iconAnchor2[0] - iconSize2[0] / 2;
           const offsetY = -iconAnchor2[1];
@@ -280,11 +304,7 @@ class Google extends EventEmitter {
       gridSize: option.maxClusterRadius
       // 聚合计算时网格的像素大小，默认60
     };
-    const displayCluster = new window.AMap.MarkerClusterer(
-      map,
-      markerList,
-      option
-    );
+    const displayCluster = new window.AMap.MarkerClusterer(map, markerList, option);
     const handlers = {
       // 清除聚合点
       remove: function(target) {