hy-dispatch-ui-v3 0.2.59 → 0.2.60

package/lib/locale/zh_CN.js

@@ -31,7 +31,8 @@ var zh_CN = {
     wednesday: "\u661F\u671F\u4E09",
     thursday: "\u661F\u671F\u56DB",
     friday: "\u661F\u671F\u4E94",
-    saturday: "\u661F\u671F\u516D"
+    saturday: "\u661F\u671F\u516D",
+    help: "\u5E2E\u52A9"
   },
   form: {
     department: "\u6240\u5C5E\u90E8\u95E8",
@@ -144,6 +145,21 @@ var zh_CN = {
     endMonth: "\u7ED3\u675F\u6708\u4EFD",
     startYear: "\u5F00\u59CB\u5E74\u4EFD",
     endYear: "\u7ED3\u675F\u5E74\u4EFD"
+  },
+  departmentType: {
+    editDepartmentType: "\u7F16\u8F91\u90E8\u95E8\u7C7B\u578B",
+    addDepartmentType: "\u6DFB\u52A0\u90E8\u95E8\u7C7B\u578B",
+    departmentIcon: "\u90E8\u95E8\u56FE\u6807",
+    upload: "\u4E0A \u4F20",
+    pleaseUploadDepartmentTypeIcon: "\u8BF7\u4E0A\u4F20\u90E8\u95E8\u7C7B\u578B\u56FE\u6807",
+    iconSize44px: "\u56FE\u6807\u5C3A\u5BF844px",
+    ifNoIconUseTheDefaultIcon: "\u82E5\u65E0\u56FE\u6807\u5219\u4F7F\u7528\u9ED8\u8BA4\u56FE\u6807",
+    departmentTypeName: "\u90E8\u95E8\u7C7B\u578B\u540D\u79F0",
+    pleaseEnterTheDepartmentTypeName: "\u8BF7\u8F93\u5165\u90E8\u95E8\u7C7B\u578B\u540D\u79F0",
+    imageUploadFailedLogoSizeWithin2M: "\u56FE\u7247\u4E0A\u4F20\u5931\u8D25\uFF0Clogo\u5927\u5C0F2M\u4EE5\u5185\u3002",
+    editDeviceCover: "\u7F16\u8F91\u8BBE\u5907\u5C01\u9762",
+    close: "\u5173 \u95ED",
+    save: "\u4FDD \u5B58"
   }
 };
 

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

@@ -0,0 +1,8 @@
+export default {
+  id: 'hy-icon-ops-linear-shouqi',
+  symbol: `<symbol id="hy-icon-ops-linear-shouqi" viewBox="0 0 16 16">
+    <g id="hy-icon-ops-linear-shouqi-导航/shouqi" stroke="none" stroke-width="1"  fill-rule="evenodd">
+        <path d="M1,2 C1.55228475,2 2,2.44771525 2,3 L2,13 C2,13.5522847 1.55228475,14 1,14 C0.44771525,14 0,13.5522847 0,13 L0,3 C0,2.44771525 0.44771525,2 1,2 Z M14.9962476,6.99721351 L7.22134415,6.99721351 L7.22134415,6.99721351 L10.3410325,3.80591026 C10.6688751,3.47054177 10.6627742,2.93290294 10.3274057,2.60506033 C10.3232766,2.6010239 10.3191065,2.59702968 10.3148959,2.59307831 C9.96535062,2.26505074 9.41645109,2.28110608 9.08667668,2.62900381 L4.65060824,7.30886388 C4.28556459,7.69396911 4.2848692,8.29714332 4.64902391,8.68308924 L9.01892515,13.3144877 C9.35293318,13.668483 9.91067004,13.6846858 10.2646653,13.3506778 C10.2790116,13.3371414 10.2928995,13.3231273 10.3063053,13.308659 C10.6624129,12.9243285 10.6464065,12.3259543 10.2702613,11.9612115 L7.22134415,9.00471827 L7.22134415,9.00471827 L14.9962476,9.00471827 C15.5506048,9.00471827 16,8.55532302 16,8.00096589 C16,7.44660876 15.5506048,6.99721351 14.9962476,6.99721351 Z" id="hy-icon-ops-linear-shouqi-收起"  fill-rule="nonzero"></path>
+    </g>
+</symbol>`,
+};

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

@@ -0,0 +1,8 @@
+export default {
+  id: 'hy-icon-ops-linear-zhankai',
+  symbol: `<symbol id="hy-icon-ops-linear-zhankai" viewBox="0 0 16 16">
+    <g id="hy-icon-ops-linear-zhankai-导航/zhankai" stroke="none" stroke-width="1"  fill-rule="evenodd">
+        <path d="M15,2 C15.5522847,2 16,2.44771525 16,3 L16,13 C16,13.5522847 15.5522847,14 15,14 C14.4477153,14 14,13.5522847 14,13 L14,3 C14,2.44771525 14.4477153,2 15,2 Z M1.00375238,6.99721351 L8.77865585,6.99721351 L8.77865585,6.99721351 L5.65896747,3.80591026 C5.33112486,3.47054177 5.33722579,2.93290294 5.67259429,2.60506033 C5.67672338,2.6010239 5.68089354,2.59702968 5.68510411,2.59307831 C6.03464938,2.26505074 6.58354891,2.28110608 6.91332332,2.62900381 L11.3493918,7.30886388 C11.7144354,7.69396911 11.7151308,8.29714332 11.3509761,8.68308924 L6.98107485,13.3144877 C6.64706682,13.668483 6.08932996,13.6846858 5.73533471,13.3506778 C5.72098837,13.3371414 5.70710053,13.3231273 5.69369467,13.308659 C5.33758707,12.9243285 5.35359349,12.3259543 5.72973868,11.9612115 L8.77865585,9.00471827 L8.77865585,9.00471827 L1.00375238,9.00471827 C0.449395248,9.00471827 0,8.55532302 0,8.00096589 C0,7.44660876 0.449395248,6.99721351 1.00375238,6.99721351 Z" id="hy-icon-ops-linear-zhankai-形状结合"  fill-rule="nonzero"></path>
+    </g>
+</symbol>`,
+};

package/lib/style/index.scss

@@ -90,3 +90,56 @@ video {
   -ms-user-select: none; /*IE10*/
   user-select: none;
 }
+
+.search_lightColor {
+  min-width: 254px;
+  line-height: 32px;
+  background: rgba(var(--hy-background), 1);
+  border-radius: 8px;
+  padding: 4px;
+  display: flex;
+  border: 1px solid rgba(var(--hy-border), 1);
+  transition: 0.3s;
+  position: relative;
+  z-index: 1;
+}
+
+.search_lightColor:focus,
+.search_lightColor:hover {
+  border-color: rgba(var(--hy-theme), 1);
+}
+.search_lightColor .hy-el-input .hy-el-input__wrapper {
+  background: rgba(var(--hy-background), 1);
+  border-color: rgba(var(--hy-background), 1);
+  box-shadow: none;
+  padding: 0 26px 0 10px;
+  font-size: 12px;
+  color: rgba(var(--hy-main), 1);
+}
+
+.search_lightColor .hy-el-input .hy-el-input__wrapper:focus,
+.search_lightColor .hy-el-input .hy-el-input__wrapper:hover {
+  border-color: rgba(var(--hy-background), 1);
+  box-shadow: none;
+}
+
+.search_lightColor .searchBox:active {
+  opacity: 0.6;
+}
+.search_lightColor .searchBox {
+  width: 42px;
+  height: 32px;
+  background: rgba(var(--hy-background-3), 1);
+  border-radius: 8px;
+  line-height: 30px;
+  text-align: center;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+}
+.search_lightColor .searchBox .svgBox {
+  width: 18px;
+  height: 18px;
+  vertical-align: middle;
+}

package/lib/style/theme.scss

@@ -20,59 +20,6 @@
   --hy-border: 54, 93, 132;
 }
 
-.search_lightColor {
-  min-width: 254px;
-  line-height: 32px;
-  background: rgba(var(--hy-background), 1);
-  border-radius: 8px;
-  padding: 4px;
-  display: flex;
-  border: 1px solid rgba(var(--hy-border), 1);
-  transition: 0.3s;
-  position: relative;
-  z-index: 1;
-}
-
-.search_lightColor:focus,
-.search_lightColor:hover {
-  border-color: rgba(var(--hy-theme), 1);
-}
-.search_lightColor .hy-el-input .hy-el-input__wrapper {
-  background: rgba(var(--hy-background), 1);
-  border-color: rgba(var(--hy-background), 1);
-  box-shadow: none;
-  padding: 0 26px 0 10px;
-  font-size: 12px;
-  color: rgba(var(--hy-main), 1);
-}
-
-.search_lightColor .hy-el-input .hy-el-input__wrapper:focus,
-.search_lightColor .hy-el-input .hy-el-input__wrapper:hover {
-  border-color: rgba(var(--hy-background), 1);
-  box-shadow: none;
-}
-
-.search_lightColor .searchBox:active {
-  opacity: 0.6;
-}
-.search_lightColor .searchBox {
-  width: 42px;
-  height: 32px;
-  background: rgba(var(--hy-background-3), 1);
-  border-radius: 8px;
-  line-height: 30px;
-  text-align: center;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  cursor: pointer;
-}
-.search_lightColor .searchBox .svgBox {
-  width: 18px;
-  height: 18px;
-  vertical-align: middle;
-}
-
 .deviceType-sos {
   font-size: 14px;
   font-weight: bold;

package/lib/utils/form.js

@@ -52,9 +52,10 @@ function clearSpace(value, type = "between") {
   }
   return value;
 }
-const genRuleRequiredMsgHandler = (config) => {
+const genRuleRequiredMsgHandler = (column, model) => {
   const { t } = useLocale.useLocale();
-  const { type, prop, label } = config || {};
+  const { type, prop } = column || {};
+  const label = columnLabelHandler(column, model);
   if (!prop || !prop?.length) return "";
   switch (type) {
     case "input":
@@ -75,20 +76,71 @@ const requiredHandler = (column, model) => {
   if (is.isFunction(required)) return required(column, model);
   return false;
 };
+const ruleHandler = (column, model) => {
+  const rules = vue.unref(column.rules);
+  if (is.isArray(rules)) return [...rules];
+  if (is.isObject(rules)) return [rules];
+  if (is.isFunction(rules)) {
+    return ruleHandler({ rules: rules(column, model) }, model);
+  }
+  return [];
+};
 const columnRuleHandler = (column, model) => {
-  let { rules } = column;
-  rules = is.isArray(rules) ? [...rules] : is.isObject(rules) ? [rules] : [];
+  const rules = ruleHandler(column, model);
   if (column.required) {
     rules.unshift({
       required: requiredHandler(column, model),
-      message: genRuleRequiredMsgHandler(column)
+      message: genRuleRequiredMsgHandler(column, model)
     });
   }
   return rules;
 };
+const genColumnDefaultLabel = (column) => {
+  if (column.label) return vue.unref(column.label);
+  const { t } = useLocale.useLocale();
+  switch (column.type) {
+    // 部门级联选择框
+    case "org-cascader":
+      return t("form.department");
+  }
+};
+const columnLabelHandler = (column, model) => {
+  const label = vue.unref(column.label);
+  if (is.isEmpty(label)) return "";
+  if (is.isFunction(label)) {
+    return label(column, model);
+  }
+  return label;
+};
+function columnPlaceholderHandler(column, model) {
+  const { t } = useLocale.useLocale();
+  const { type, attrs = {} } = column || {};
+  const label = columnLabelHandler(column, model);
+  let placeholder = attrs.placeholder;
+  switch (type) {
+    case "input":
+    case "input-number":
+    case "lat":
+    case "lon":
+      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;
+}
 
 exports.clearSpace = clearSpace;
+exports.columnLabelHandler = columnLabelHandler;
+exports.columnPlaceholderHandler = columnPlaceholderHandler;
 exports.columnRuleHandler = columnRuleHandler;
+exports.genColumnDefaultLabel = genColumnDefaultLabel;
 exports.genRuleRequiredMsgHandler = genRuleRequiredMsgHandler;
 exports.genValueByProp = genValueByProp;
 exports.getValueByProp = getValueByProp;

package/lib/utils/index.js

@@ -50,7 +50,10 @@ exports.fileUpload = file.fileUpload;
 exports.presignedUrl = file.presignedUrl;
 exports.sizeToTextHandler = file.sizeToTextHandler;
 exports.clearSpace = form.clearSpace;
+exports.columnLabelHandler = form.columnLabelHandler;
+exports.columnPlaceholderHandler = form.columnPlaceholderHandler;
 exports.columnRuleHandler = form.columnRuleHandler;
+exports.genColumnDefaultLabel = form.genColumnDefaultLabel;
 exports.genRuleRequiredMsgHandler = form.genRuleRequiredMsgHandler;
 exports.genValueByProp = form.genValueByProp;
 exports.getValueByProp = form.getValueByProp;

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

@@ -268,6 +268,10 @@ class bigMap extends events.EventEmitter {
         const center2 = target.getCenter();
         return latAndLngCheckExport(center2);
       },
+      // 自适应地图容器大小
+      invalidateSize: function(target) {
+        return target.invalidateSize();
+      },
       // 四个角
       getBounds: function(target) {
         const bounds = target.getBounds();

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

@@ -170,6 +170,9 @@ class Google extends events.EventEmitter {
       getCenter: function(target) {
         return target.getCenter();
       },
+      invalidateSize: function(target) {
+        return null;
+      },
       fitBounds: function(target, params) {
         if (!Array.isArray(params)) {
           params = [params];

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

@@ -369,6 +369,10 @@ class Leafletjs extends events.EventEmitter {
         const { lng: lng2, lat: lat2 } = latAndLngCheckExport(center2);
         return L.latLng(lat2, lng2);
       },
+      // 自适应地图容器大小
+      invalidateSize: function(target) {
+        return target.invalidateSize();
+      },
       // 四个角
       getBounds: function(target) {
         const bounds = target.getBounds();
@@ -427,24 +431,20 @@ class Leafletjs extends events.EventEmitter {
     return map;
   }
   // 设置地图瓦片地址
-  setLayersUrl(map) {
+  setLayersUrl(map, changeColorType = true) {
     const layersUrlList = this.initParams.layersUrlList || [];
     const layersIndex = this.initParams.layersIndex || 0;
-    const layersOption = layersUrlList[layersIndex];
-    if (!layersOption) {
+    const layersUrls = layersUrlList[layersIndex];
+    if (!layersUrls) {
       return;
     }
     const { mapServerType } = this.initParams;
     if (mapServerType === "WMTS" || mapServerType === "Dynamic") {
-      return this.createLayers(map, layersOption);
+      return this.createLayers(map, layersUrls);
     }
-    const { layersUrls = "", filter, key } = layersOption;
     layersUrls.split(",").forEach((layersUrl) => {
-      if (layersUrl.indexOf("{mapKey}") !== -1) {
-        layersUrl = layersUrl.replace("{mapKey}", key);
-      }
-      if (filter) {
-        this.createCustomLayers(map, layersUrl, { filter });
+      if (changeColorType) {
+        this.createCustomLayers(map, layersUrl);
       } else {
         this.createLayers(map, layersUrl);
       }

package/lib/utils/map/index.js

@@ -5,6 +5,7 @@ var leafletjs = require('./hook/leafletjs.js');
 var bigMap = require('./hook/bigMap.js');
 var events = require('events');
 var hyCommon = require('hy-common');
+var useApi = require('../../hooks/useApi.js');
 
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 const scriptPromises = new globalThis.Map();
@@ -54,17 +55,17 @@ function setMapServer(mapType, mapConfig = {}) {
   if (mapType === "gaode" && window.AMap?.Map) {
     return Promise.resolve();
   }
-  if (mapType === "bigMap" && window.BM) {
+  if (mapType === "bigmap" && window.BM) {
     return Promise.resolve();
   }
-  if (mapType !== "gaode" && mapType !== "bigMap") {
+  if (mapType !== "gaode" && mapType !== "bigmap") {
     return Promise.resolve();
   }
   if (mapServerPromises.has(mapType)) {
     return mapServerPromises.get(mapType);
   }
   const promise = (async () => {
-    if (mapType === "bigMap") {
+    if (mapType === "bigmap") {
       const staticBaseUrl = mapConfig.staticBaseUrl;
       await loadScript(staticUrl("bigemap.js", staticBaseUrl));
       await Promise.all([
@@ -109,6 +110,8 @@ function setPoiServer(mapConfig) {
     projectCoordinate: data.projectPoiCoordinate,
     mapSk: data.mapSk
   };
+  const { api } = useApi.useApi();
+  hyCommon.Common.setAxios(api.value);
   return new hyCommon.Map({
     poiServer
   });
@@ -166,6 +169,22 @@ class InitMap extends events.EventEmitter {
   }
   // 初始化地图
   NewMap(params = {}) {
+    const leftletjsObj = {};
+    if (params.mapType === "leafletjs") {
+      const { layersServer, layersUrl, mapKey, mapServerType } = params;
+      if (layersUrl && mapServerType !== "WMTS") {
+        const layersUrlList = (layersUrl || "").split(",").filter(Boolean);
+        leftletjsObj.layersUrlList = layersUrlList.map((url) => {
+          const index = url.indexOf("{mapKey}");
+          if (index !== -1) {
+            return url.replace("{mapKey}", mapKey);
+          }
+          return url;
+        });
+      } else {
+        leftletjsObj.layersUrlList = params.mapServerList;
+      }
+    }
     params = {
       mapType: "gaode",
       // 地图类型
@@ -184,13 +203,14 @@ class InitMap extends events.EventEmitter {
       // 地图瓦片地址
       zoomOffset: params.zoomOffset || 0,
       // 缩放偏移量
-      ...params
+      ...params,
+      ...leftletjsObj
     };
     if (params.mapType === "gaode") {
       this.map = new gaode.default(params);
-    } else if (params.mapType === "leaflet") {
+    } else if (params.mapType === "leafletjs") {
       this.map = new leafletjs.default(params);
-    } else if (params.mapType === "bigMap") {
+    } else if (params.mapType === "bigmap") {
       this.map = new bigMap.default(params);
     }
   }

package/lib/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hy-dispatch-ui-v3",
-  "version": "0.2.59",
+  "version": "0.2.60",
   "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.4",
+    "hy-virtual-tree": "^2.4.5",
     "leaflet": "^1.5.1",
     "leaflet-pip": "^1.1.0",
     "leaflet-polylinedecorator": "^1.6.0",