hy-dispatch-ui-v3 0.2.59 → 0.2.60

package/es/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/es/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/es/utils/form.mjs

@@ -1,5 +1,5 @@
 import { unref } from 'vue';
-import { isString, isArray, isObject, isBoolean, isFunction } from './is.mjs';
+import { isString, isArray, isEmpty, isFunction, isObject, isBoolean } from './is.mjs';
 import { useLocale } from '../hooks/useLocale.mjs';
 
 function getValueByProp(model, prop) {
@@ -50,9 +50,10 @@ function clearSpace(value, type = "between") {
   }
   return value;
 }
-const genRuleRequiredMsgHandler = (config) => {
+const genRuleRequiredMsgHandler = (column, model) => {
   const { t } = useLocale();
-  const { type, prop, label } = config || {};
+  const { type, prop } = column || {};
+  const label = columnLabelHandler(column, model);
   if (!prop || !prop?.length) return "";
   switch (type) {
     case "input":
@@ -73,16 +74,64 @@ const requiredHandler = (column, model) => {
   if (isFunction(required)) return required(column, model);
   return false;
 };
+const ruleHandler = (column, model) => {
+  const rules = unref(column.rules);
+  if (isArray(rules)) return [...rules];
+  if (isObject(rules)) return [rules];
+  if (isFunction(rules)) {
+    return ruleHandler({ rules: rules(column, model) }, model);
+  }
+  return [];
+};
 const columnRuleHandler = (column, model) => {
-  let { rules } = column;
-  rules = isArray(rules) ? [...rules] : 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 unref(column.label);
+  const { t } = useLocale();
+  switch (column.type) {
+    // 部门级联选择框
+    case "org-cascader":
+      return t("form.department");
+  }
+};
+const columnLabelHandler = (column, model) => {
+  const label = unref(column.label);
+  if (isEmpty(label)) return "";
+  if (isFunction(label)) {
+    return label(column, model);
+  }
+  return label;
+};
+function columnPlaceholderHandler(column, model) {
+  const { t } = 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;
+}
 
-export { clearSpace, columnRuleHandler, genRuleRequiredMsgHandler, genValueByProp, getValueByProp, setValueByProp };
+export { clearSpace, columnLabelHandler, columnPlaceholderHandler, columnRuleHandler, genColumnDefaultLabel, genRuleRequiredMsgHandler, genValueByProp, getValueByProp, setValueByProp };

package/es/utils/index.mjs

@@ -4,7 +4,7 @@ export { isArray, isBoolean, isEmpty, isFile, isFunction, isNull, isNumber, isOb
 export { cloneDeep, copyText, createUniqueId, funRunHandler, mergeDeep, withInstall } from './handler.mjs';
 export { formatDuration, getDefaultValueFormatByType } from './date.mjs';
 export { blobToDataURL, fileFormUpload, fileJsonUplaod, fileUpload, presignedUrl, sizeToTextHandler } from './file.mjs';
-export { clearSpace, columnRuleHandler, genRuleRequiredMsgHandler, genValueByProp, getValueByProp, setValueByProp } from './form.mjs';
+export { clearSpace, columnLabelHandler, columnPlaceholderHandler, columnRuleHandler, genColumnDefaultLabel, genRuleRequiredMsgHandler, genValueByProp, getValueByProp, setValueByProp } from './form.mjs';
 export { enterNumbersRrLetters, enterTheMumber, filterSpaces, formatNumber, formatTimeFn, getPublicFileSize, inputForbidden, keepTwoDecimalPlaces, onlyNumber } from './input.mjs';
 export { PERMISSION } from './permission.mjs';
 export { InitMap, setMapServer, setPoiServer } from './map/index.mjs';

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

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

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

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

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

@@ -345,6 +345,10 @@ class Leafletjs extends 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();
@@ -403,24 +407,20 @@ class Leafletjs extends 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/es/utils/map/index.mjs

@@ -2,7 +2,8 @@ import Google from './hook/gaode.mjs';
 import Leafletjs from './hook/leafletjs.mjs';
 import bigMap from './hook/bigMap.mjs';
 import { EventEmitter } from 'events';
-import hyCommon from 'hy-common';
+import hyCommon, { Common } from 'hy-common';
+import { useApi } from '../../hooks/useApi.mjs';
 
 const scriptPromises = new globalThis.Map();
 const mapServerPromises = new globalThis.Map();
@@ -51,17 +52,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([
@@ -106,6 +107,8 @@ function setPoiServer(mapConfig) {
     projectCoordinate: data.projectPoiCoordinate,
     mapSk: data.mapSk
   };
+  const { api } = useApi();
+  Common.setAxios(api.value);
   return new hyCommon.Map({
     poiServer
   });
@@ -163,6 +166,22 @@ class InitMap extends 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",
       // 地图类型
@@ -181,13 +200,14 @@ class InitMap extends EventEmitter {
       // 地图瓦片地址
       zoomOffset: params.zoomOffset || 0,
       // 缩放偏移量
-      ...params
+      ...params,
+      ...leftletjsObj
     };
     if (params.mapType === "gaode") {
       this.map = new Google(params);
-    } else if (params.mapType === "leaflet") {
+    } else if (params.mapType === "leafletjs") {
       this.map = new Leafletjs(params);
-    } else if (params.mapType === "bigMap") {
+    } else if (params.mapType === "bigmap") {
       this.map = new bigMap(params);
     }
   }

package/es/version.mjs

@@ -1,3 +1,3 @@
-const version = "0.2.58";
+const version = "0.2.59";
 
 export { version };

package/lib/_virtual/_plugin-vue_export-helper.js

@@ -0,0 +1,13 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _export_sfc = (sfc, props) => {
+  const target = sfc.__vccOpts || sfc;
+  for (const [key, val] of props) {
+    target[key] = val;
+  }
+  return target;
+};
+
+exports.default = _export_sfc;

package/lib/api/index.js

@@ -0,0 +1,147 @@
+'use strict';
+
+var vue = require('vue');
+var useLocale = require('../hooks/useLocale.js');
+var useApi = require('../hooks/useApi.js');
+
+const { t } = useLocale.useLocale();
+function selectApi(controller, params) {
+  return new Promise((resolve, reject) => {
+    const { api } = useApi.useApi();
+    const http = vue.unref(api);
+    if (!params) {
+      return reject(new Error(t("iDNotPassed")));
+    }
+    http.post(controller + "/select", {
+      id: params !== -1 ? params : null
+    }).then((res) => {
+      resolve(res);
+    }).catch((res) => {
+      reject(new Error(t("interfaceError")));
+    });
+  });
+}
+function detailApi(controller, params) {
+  return new Promise((resolve, reject) => {
+    const { api } = useApi.useApi();
+    const http = vue.unref(api);
+    if (!params) {
+      return reject(new Error(t("iDNotPassed")));
+    }
+    http.post(controller + "/detail", { id: params }).then((res) => {
+      resolve(res);
+    }).catch((res) => {
+      reject(new Error(t("interfaceError")));
+    });
+  });
+}
+function insertFnApi(controller, params) {
+  for (const obj in params) {
+    if (obj.indexOf("createDtm") > -1 || obj.indexOf("updateDtm") > -1) {
+      delete params[obj];
+    } else if (params[obj] === null) {
+      delete params[obj];
+    }
+  }
+  const url = controller + "/insert";
+  return new Promise((resolve, reject) => {
+    const { api } = useApi.useApi();
+    const http = vue.unref(api);
+    http.post(url, params, { isJSON: true }).then((res) => {
+      return resolve(res);
+    });
+  });
+}
+function saveFnApi(controller, params, options) {
+  for (const obj in params) {
+    if (obj.indexOf("createDtm") > -1 || obj.indexOf("updateDtm") > -1) {
+      delete params[obj];
+    } else if (params[obj] === null) {
+      delete params[obj];
+    }
+  }
+  const url = controller + "/save";
+  return new Promise((resolve, reject) => {
+    const { api } = useApi.useApi();
+    const http = vue.unref(api);
+    http.post(url, params, { isJSON: true, ...options }).then((res) => {
+      return resolve(res);
+    }).catch((res) => {
+      reject(res);
+    });
+  });
+}
+function saveApi(controller, params) {
+  for (const obj in params) {
+    if (obj.indexOf("createDtm") > -1 || obj.indexOf("updateDtm") > -1) {
+      delete params[obj];
+    } else if (params[obj] === null) {
+      delete params[obj];
+    }
+  }
+  let url = "";
+  if (params.id) {
+    url = controller + "/update";
+  } else {
+    url = controller + "/insert";
+  }
+  return new Promise((resolve, reject) => {
+    const { api } = useApi.useApi();
+    const http = vue.unref(api);
+    http.post(url, params, { isJSON: true }).then((res) => {
+      return resolve(res);
+    });
+  });
+}
+function findAllApi(controller, params) {
+  return new Promise((resolve, reject) => {
+    const { api } = useApi.useApi();
+    const http = vue.unref(api);
+    http.post(controller + "/findAll", params).then((res) => {
+      resolve(res);
+    });
+  });
+}
+function pageApi(controller, params, isJsonData) {
+  return new Promise((resolve, reject) => {
+    const { api } = useApi.useApi();
+    const http = vue.unref(api);
+    http.post(controller + "/page", params, { isJSON: isJsonData }).then((res) => {
+      resolve(res);
+    });
+  });
+}
+function deleteBatchApi(controller, ids) {
+  return new Promise((resolve, reject) => {
+    const { api } = useApi.useApi();
+    const http = vue.unref(api);
+    if (!ids) {
+      return reject(new Error(t("iDNotPassed")));
+    }
+    http.post(controller + "/deleteBatch", { ids }).then((res) => {
+      resolve(res);
+    });
+  });
+}
+function displayChangeApi(controller, ids, display) {
+  return new Promise((resolve) => {
+    const { api } = useApi.useApi();
+    const http = vue.unref(api);
+    http.post(controller + "/displayChange", {
+      ids: ids.toString(),
+      display
+    }).then(() => {
+      resolve();
+    });
+  });
+}
+
+exports.deleteBatchApi = deleteBatchApi;
+exports.detailApi = detailApi;
+exports.displayChangeApi = displayChangeApi;
+exports.findAllApi = findAllApi;
+exports.insertFnApi = insertFnApi;
+exports.pageApi = pageApi;
+exports.saveApi = saveApi;
+exports.saveFnApi = saveFnApi;
+exports.selectApi = selectApi;