hy-dispatch-ui-v3 0.2.52 → 0.2.54

package/es/utils/map/index.mjs

@@ -0,0 +1,291 @@
+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';
+
+const scriptPromises = new globalThis.Map();
+const mapServerPromises = new globalThis.Map();
+const AMAP_PLUGINS = [
+  "AMap.MouseTool",
+  "AMap.RangingTool",
+  "AMap.PolyEditor",
+  "AMap.MarkerClusterer",
+  "AMap.Scale",
+  "AMap.GeometryUtil"
+];
+const staticAssets = {
+  "bigemap.js": new URL("../../static/map/bigemap.js", import.meta.url).href,
+  "markercluster.js": new URL(
+    "../../static/map/markercluster.js",
+    import.meta.url
+  ).href,
+  "bmDraw.js": new URL("../../static/map/bmDraw.js", import.meta.url).href,
+  "bm.geometryutil.js": new URL(
+    "../../static/map/bm.geometryutil.js",
+    import.meta.url
+  ).href,
+  "moveMarker.js": new URL("../../static/map/moveMarker.js", import.meta.url).href
+};
+const staticUrl = (file) => {
+  const url = staticAssets[file];
+  if (!url) {
+    throw new Error(`Unknown map asset: ${file}`);
+  }
+  return url;
+};
+function setMapServer(mapType, mapConfig = {}) {
+  if (mapType === "gaode" && window.AMap?.Map) {
+    return Promise.resolve();
+  }
+  if (mapType === "bigMap" && window.BM) {
+    return Promise.resolve();
+  }
+  if (mapType !== "gaode" && mapType !== "bigMap") {
+    return Promise.resolve();
+  }
+  if (mapServerPromises.has(mapType)) {
+    return mapServerPromises.get(mapType);
+  }
+  const promise = (async () => {
+    if (mapType === "bigMap") {
+      await loadScript(staticUrl("bigemap.js"));
+      await Promise.all([
+        loadScript(staticUrl("markercluster.js")),
+        loadScript(staticUrl("bmDraw.js")),
+        loadScript(staticUrl("bm.geometryutil.js")),
+        loadScript(staticUrl("moveMarker.js"))
+      ]);
+      bmInit();
+      return;
+    }
+    window._AMapSecurityConfig = {
+      securityJsCode: mapConfig.mapSk || "024a144126a2a762fee60e0ca1d0aeeb"
+    };
+    const plugins = AMAP_PLUGINS.join(",");
+    const url = `https://webapi.amap.com/maps?v=1.4.15&key=${encodeURIComponent(mapConfig.mapKey || "")}&plugin=${plugins}`;
+    await loadScript(url);
+    if (!window.AMap?.Map) {
+      throw new Error("AMap SDK loaded without exposing window.AMap.Map");
+    }
+  })().catch((error) => {
+    mapServerPromises.delete(mapType);
+    throw error;
+  });
+  mapServerPromises.set(mapType, promise);
+  return promise;
+}
+function setPoiServer(mapConfig) {
+  const data = mapConfig;
+  data.mapCoordinate = typeof data.bmCorrect === "number" ? data.bmCorrect : data.mapCoordinate;
+  data.serverCoordinate = 1;
+  data.projectCoordinate = 1;
+  data.projectPoiCoordinate = 1;
+  data.poiServer = data.poiServer || {};
+  let city = data.poiServer.city || "";
+  city = city.split("-");
+  const poiServer = {
+    mapPoiType: "gaode",
+    ...data.poiServer,
+    city: city[city.length - 1],
+    mapCoordinate: data.mapCoordinate,
+    projectCoordinate: data.projectPoiCoordinate,
+    mapSk: data.mapSk
+  };
+  return new hyCommon.Map({
+    poiServer
+  });
+}
+function loadScript(url) {
+  const absoluteUrl = new URL(url, document.baseURI).href;
+  if (scriptPromises.has(absoluteUrl)) {
+    return scriptPromises.get(absoluteUrl);
+  }
+  const promise = new Promise((resolve, reject) => {
+    const script = document.createElement("script");
+    script.type = "text/javascript";
+    script.setAttribute("data-callType", "callScript");
+    if (script.readyState) {
+      script.onreadystatechange = function() {
+        if (script.readyState === "loaded" || script.readyState === "complete") {
+          script.onreadystatechange = null;
+          resolve();
+        }
+      };
+    } else {
+      script.onload = () => {
+        resolve();
+      };
+    }
+    script.onerror = () => {
+      scriptPromises.delete(absoluteUrl);
+      script.remove();
+      reject(new Error(`Map script failed to load: ${absoluteUrl}`));
+    };
+    script.src = absoluteUrl;
+    document.querySelector("head").appendChild(script);
+  });
+  scriptPromises.set(absoluteUrl, promise);
+  return promise;
+}
+function bmInit() {
+  (function() {
+    var originalInitTile = window.BM.GridLayer.prototype._initTile;
+    window.BM.GridLayer.include({
+      _initTile: function(tile) {
+        originalInitTile.call(this, tile);
+        var tileSize = this.getTileSize();
+        tile.style.width = tileSize.x + 1 + "px";
+        tile.style.height = tileSize.y + 1 + "px";
+      }
+    });
+  })();
+}
+class Map extends EventEmitter {
+  constructor(request) {
+    super();
+    this.map = null;
+    this.NewMap(request);
+  }
+  // 初始化地图
+  NewMap(params = {}) {
+    params = {
+      mapType: "gaode",
+      // 地图类型
+      lang: "zh_cn",
+      // 语言
+      layersIndex: null,
+      // 图层索引
+      // 高德参数
+      defaultMapStyle: params.defaultMapStyle,
+      // 地图默认样式
+      // crs 坐标系
+      crs: params.crs,
+      bmUiName: params.bmUiName,
+      // 地图默认样式
+      layersUrlList: params.layersUrlList,
+      // 地图瓦片地址
+      zoomOffset: params.zoomOffset || 0,
+      // 缩放偏移量
+      ...params
+    };
+    if (params.mapType === "gaode") {
+      this.map = new Google(params);
+    } else if (params.mapType === "leaflet") {
+      this.map = new Leafletjs(params);
+    } else if (params.mapType === "bigMap") {
+      this.map = new bigMap(params);
+    }
+  }
+  InitMap(domId, option) {
+    option = {
+      // 地图最小缩放级别
+      minZoom: option.minZoom || 8,
+      // 地图最大缩放级别
+      maxZoom: option.maxZoom || 18,
+      // 地图默认缩放级别
+      zoom: option.zoom || 13,
+      // 地图中心点
+      center: option.center,
+      // 地图初始化成功回调
+      completeCallbacks: option.completeCallbacks,
+      /*  === gaode === */
+      // defaultMapStyle: option.defaultMapStyle,
+      /*  === leafletjs === */
+      ...option
+    };
+    return this.map.InitMap(domId, option);
+  }
+  // 自定义 h5 图标
+  DivIcon(option) {
+    option = {
+      html: option.html,
+      className: option.className,
+      iconSize: option.iconSize,
+      iconAnchor: option.iconAnchor,
+      ...option
+    };
+    return this.map.DivIcon(option);
+  }
+  // 自定义 marker
+  Marker(option) {
+    option = {
+      ...option,
+      icon: option.icon,
+      zIndexOffset: option.zIndexOffset,
+      position: option.position,
+      extData: option.extData,
+      // 上饶指定参数
+      pane: option.pane || "markerPane",
+      // 高德偏移
+      offset: option.offset
+    };
+    return this.map.Marker(option);
+  }
+  // 自定义 Circle
+  Circle(latLngList, option) {
+    option = {
+      ...option,
+      radius: option.radius,
+      color: option.color,
+      opacity: option.opacity,
+      weight: option.weight,
+      fillColor: option.fillColor,
+      fillOpacity: option.fillOpacity
+    };
+    return this.map.Circle(latLngList, option);
+  }
+  // 自定义 Polygon
+  Polygon(pathList = [], option) {
+    option = {
+      ...option,
+      color: option.color,
+      opacity: option.opacity,
+      weight: option.weight,
+      fillColor: option.fillColor,
+      fillOpacity: option.fillOpacity
+    };
+    return this.map.Polygon(pathList, option);
+  }
+  // 自定义 MarkerClusterGroup
+  MarkerClusterGroup(map, markerList = [], option) {
+    return this.map.MarkerClusterGroup(map, markerList, option);
+  }
+  // 自定义 popup
+  Popup(option) {
+    option = {
+      closeOnClick: false,
+      ...option
+    };
+    return this.map.Popup(option);
+  }
+  // 自定义 Polyline
+  Polyline(latLngList, option) {
+    option = {
+      closeOnClick: false,
+      ...option,
+      color: option.color,
+      opacity: option.opacity,
+      weight: option.weight
+    };
+    return this.map.Polyline(latLngList, option);
+  }
+  // 自定义 轨迹回放
+  TrackPlayer(latLngList = [], option = {}, map) {
+    return this.map.TrackPlayer(latLngList, option, map);
+  }
+  // 自定义地图工具
+  CreatePm(pmType = "rectangle", options = {}, map) {
+    return this.map.CreatePm(pmType, options, map);
+  }
+  // 电子围栏
+  CreateFence(pmType = "rectangle", options = {}, map) {
+    return this.map.CreateFence(pmType, options, map);
+  }
+  // 测距工具 labelColor labelFillColor lineColor
+  RangingTool(options = {}, map) {
+    return this.map.RangingTool(options, map);
+  }
+}
+
+export { Map as default, setMapServer, setPoiServer };

package/es/utils/map/js/mapProxy.mjs

@@ -0,0 +1,38 @@
+const createMapProxy = (target, handlers = {}) => {
+  return new Proxy(target, {
+    get(_target, prop) {
+      if (handlers[prop]) {
+        return (...args) => handlers[prop](_target, ...args);
+      }
+      return _target[prop];
+    },
+    set(_target, prop, value) {
+      if (prop === "_proxy") return true;
+      return Reflect.set(_target, prop, value);
+    }
+  });
+};
+const createWrappedHandlerStore = () => {
+  const wrappedHandlerMap = /* @__PURE__ */ new Map();
+  return {
+    // 记录：原始回调 -> 实际注册到地图的包装回调
+    remember(types, originalFn, wrappedFn) {
+      if (!wrappedHandlerMap.has(types)) {
+        wrappedHandlerMap.set(types, /* @__PURE__ */ new Map());
+      }
+      wrappedHandlerMap.get(types).set(originalFn, wrappedFn);
+    },
+    // 取出并移除记录，取不到返回 undefined（说明该回调未被包装）
+    take(types, originalFn) {
+      const typeMap = wrappedHandlerMap.get(types);
+      const wrappedFn = typeMap && typeMap.get(originalFn);
+      if (wrappedFn) typeMap.delete(originalFn);
+      return wrappedFn;
+    },
+    clear() {
+      wrappedHandlerMap.clear();
+    }
+  };
+};
+
+export { createMapProxy, createWrappedHandlerStore, createMapProxy as default };

package/es/utils/map/js/webgis.mjs

@@ -0,0 +1,153 @@
+var PI = 3.141592653589793;
+var a = 6378245;
+var ee = 0.006693421622965943;
+function delta(lat, lon) {
+  const a2 = 6378245;
+  const ee2 = 0.006693421622965943;
+  let dLat = ToLat(lon - 105, lat - 35);
+  let dLon = ToLon(lon - 105, lat - 35);
+  const radLat = lat / 180 * PI;
+  let magic = Math.sin(radLat);
+  magic = 1 - ee2 * magic * magic;
+  const sqrtMagic = Math.sqrt(magic);
+  dLat = dLat * 180 / (a2 * (1 - ee2) / (magic * sqrtMagic) * PI);
+  dLon = dLon * 180 / (a2 / sqrtMagic * Math.cos(radLat) * PI);
+  return {
+    lat: dLat,
+    lon: dLon
+  };
+}
+function ToLat(x, y) {
+  let ret = -100 + 2 * x + 3 * y + 0.2 * y * y + 0.1 * x * y + 0.2 * Math.sqrt(Math.abs(x));
+  ret += (20 * Math.sin(6 * x * PI) + 20 * Math.sin(2 * x * PI)) * 2 / 3;
+  ret += (20 * Math.sin(y * PI) + 40 * Math.sin(y / 3 * PI)) * 2 / 3;
+  ret += (160 * Math.sin(y / 12 * PI) + 320 * Math.sin(y * PI / 30)) * 2 / 3;
+  return ret;
+}
+function ToLon(x, y) {
+  let ret = 300 + x + 2 * y + 0.1 * x * x + 0.1 * x * y + 0.1 * Math.sqrt(Math.abs(x));
+  ret += (20 * Math.sin(6 * x * PI) + 20 * Math.sin(2 * x * PI)) * 2 / 3;
+  ret += (20 * Math.sin(x * PI) + 40 * Math.sin(x / 3 * PI)) * 2 / 3;
+  ret += (150 * Math.sin(x / 12 * PI) + 300 * Math.sin(x / 30 * PI)) * 2 / 3;
+  return ret;
+}
+const Coordinate = {
+  "WGS84": 0};
+const reverseCoordinate = {
+  0: "WGS84",
+  1: "GCJ02",
+  2: "BD09"
+};
+const conversionCoordinateMap = {
+  "WGS84": {
+    "GCJ02": WGS84ToGCJ02,
+    "BD09": WGS84ToBD09
+  },
+  "GCJ02": {
+    "WGS84": GCJ02ToWGS84,
+    "BD09": GCJ02ToBD09
+  },
+  "BD09": {
+    "GCJ02": BD09ToGCJ02,
+    "WGS84": BD09ToWGS84
+  }
+};
+function getMapConfig() {
+  return window.sessionStorage.getItem("mapConfig") ? JSON.parse(sessionStorage.getItem("mapConfig")) : {};
+}
+function exportCoordinate(latLng) {
+  const { mapCoordinate = Coordinate.WGS84, projectCoordinate = Coordinate.WGS84 } = getMapConfig();
+  return getCoordinate(latLng, {
+    importCoordinate: mapCoordinate,
+    leaveCoordinate: projectCoordinate
+  });
+}
+function importCoordinate(latLng) {
+  const { mapCoordinate = Coordinate.WGS84, projectCoordinate = Coordinate.WGS84 } = getMapConfig();
+  return getCoordinate(latLng, {
+    importCoordinate: projectCoordinate,
+    leaveCoordinate: mapCoordinate
+  });
+}
+function getCoordinate(latLng, { importCoordinate: importCoordinate2, leaveCoordinate }) {
+  let { lat = 0, lng = 0 } = latLng || {};
+  lat = Number(lat);
+  lng = Number(lng);
+  const importValue = reverseCoordinate[importCoordinate2];
+  const leaveValue = reverseCoordinate[leaveCoordinate];
+  if (importValue === leaveValue) {
+    return latLng;
+  } else {
+    const item = conversionCoordinateMap[importValue];
+    if (item) {
+      const conversion = item[leaveValue];
+      if (conversion) {
+        return conversion(lat, lng);
+      }
+    }
+  }
+}
+function GCJ02ToWGS84(gcjLat, gcjLon) {
+  const d = delta(gcjLat, gcjLon);
+  return {
+    lat: gcjLat - d.lat,
+    lng: gcjLon - d.lon
+  };
+}
+function GCJ02ToBD09(gcjLat, gcjLon) {
+  const x = gcjLon;
+  const y = gcjLat;
+  const z = Math.sqrt(x * x + y * y) + 2e-5 * Math.sin(y * PI);
+  const theta = Math.atan2(y, x) + 3e-6 * Math.cos(x * PI);
+  const bdLon = z * Math.cos(theta) + 65e-4;
+  const bdLat = z * Math.sin(theta) + 6e-3;
+  return {
+    lat: bdLat,
+    lng: bdLon
+  };
+}
+function BD09ToGCJ02(bdLat, bdLon) {
+  const x = bdLon - 65e-4;
+  const y = bdLat - 6e-3;
+  const z = Math.sqrt(x * x + y * y) - 2e-5 * Math.sin(y * PI);
+  const theta = Math.atan2(y, x) - 3e-6 * Math.cos(x * PI);
+  const ggLon = z * Math.cos(theta);
+  const ggLat = z * Math.sin(theta);
+  return {
+    lat: ggLat,
+    lng: ggLon
+  };
+}
+function BD09ToWGS84(bdLat, bdLon) {
+  const gcj02 = BD09ToGCJ02(bdLat, bdLon);
+  return GCJ02ToWGS84(gcj02.lat, gcj02.lng);
+}
+function WGS84ToBD09(wgLat, wgLon) {
+  const gcj02 = WGS84ToGCJ02(wgLat, wgLon);
+  const x = gcj02.lng;
+  const y = gcj02.lat;
+  const z = Math.sqrt(x * x + y * y) + 2e-5 * Math.sin(y * PI);
+  const theta = Math.atan2(y, x) + 3e-6 * Math.cos(x * PI);
+  const bdLon = z * Math.cos(theta) + 65e-4;
+  const bdLat = z * Math.sin(theta) + 6e-3;
+  return {
+    lat: bdLat,
+    lng: bdLon
+  };
+}
+function WGS84ToGCJ02(wgLat, wgLon) {
+  var marsPoint = { lng: 0, lat: 0 };
+  var dLat = ToLat(wgLon - 105, wgLat - 35);
+  var dLon = ToLon(wgLon - 105, wgLat - 35);
+  var radLat = wgLat / 180 * PI;
+  var magic = Math.sin(radLat);
+  magic = 1 - ee * magic * magic;
+  var sqrtMagic = Math.sqrt(magic);
+  dLat = dLat * 180 / (a * (1 - ee) / (magic * sqrtMagic) * PI);
+  dLon = dLon * 180 / (a / sqrtMagic * Math.cos(radLat) * PI);
+  marsPoint.lat = wgLat + dLat;
+  marsPoint.lng = wgLon + dLon;
+  return marsPoint;
+}
+
+export { BD09ToGCJ02, BD09ToWGS84, GCJ02ToBD09, GCJ02ToWGS84, WGS84ToBD09, WGS84ToGCJ02, exportCoordinate, importCoordinate };

package/es/version.mjs

@@ -1,3 +1,3 @@
-const version = "0.2.51";
+const version = "0.2.53";
 
 export { version };

package/lib/components/hyBatchUploadDialog/batchUploadDialog.vue.js

@@ -7,8 +7,8 @@ var elementPlus = require('element-plus');
 var iconsVue = require('@element-plus/icons-vue');
 var index = require('../hyDialog/index.js');
 var index$1 = require('../hyTableForm/index.js');
-var index$2 = require('../hyTooltip/index.js');
-var index$3 = require('../hyButton/index.js');
+var index$2 = require('../hyButton/index.js');
+var index$3 = require('../hyTooltip/index.js');
 
 import "./style/batchUploadDialog.scss";
 
@@ -104,11 +104,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     const emits = __emit;
     const batchTableFormRef = vue.useTemplateRef("batchTableFormRef");
     const visible = vue.useModel(__props, "modelValue");
-    const showSubmit = vue.ref(false);
+    const HyDialogRef = vue.useTemplateRef("HyDialogRef");
+    const currentStep = vue.ref(1);
     const isSubmitting = vue.ref(false);
+    const totalElements = vue.ref(0);
     const failedCount = vue.ref(0);
     const failedStatus = vue.ref(null);
-    const HyDialogRef = vue.useTemplateRef("HyDialogRef");
     function setDragLevelIndex(dragLevel) {
       HyDialogRef.value.setDragLevelIndex(dragLevel);
     }
@@ -119,26 +120,26 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       emits("onDialogMousedown", e);
     }
     async function show() {
-      visible.value = true;
-      showSubmit.value = false;
+      currentStep.value = 1;
       failedCount.value = 0;
+      totalElements.value = 0;
       failedStatus.value = null;
+      visible.value = true;
     }
     function onTableUploadingHandler(...args) {
       emits("uploading", ...args);
     }
     function onTableUploadedHandler(...args) {
-      showSubmit.value = true;
       emits("uploaded", ...args);
     }
     function onTableResetHandler(...args) {
       failedCount.value = 0;
       failedStatus.value = null;
-      showSubmit.value = false;
       emits("reset", ...args);
     }
     function onTableValidateHandler(params) {
       const { row, prop, isValid, message, total, success, failed } = params;
+      totalElements.value = total;
       failedCount.value = failed;
       failedStatus.value = !failed ? null : failedStatus.value || "validate";
       emits("validate", params);
@@ -160,10 +161,18 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       isSubmitting.value = false;
       emits("submit", params);
     }
+    function onNextStep() {
+      batchTableFormRef.value.nextStep();
+    }
     async function onSubmitHandler() {
       const res = await batchTableFormRef.value.validate();
       if (props.uploadType === "custom") {
-        return { ...res, result: res.total === res.success };
+        const dataSource = batchTableFormRef.value.getTableDataSource();
+        onTableSubmitHandler({
+          ...res,
+          result: res.total === res.success,
+          dataSource
+        });
       } else {
         batchTableFormRef.value.submitDataSource();
       }
@@ -229,16 +238,39 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
               1
               /* TEXT */
             ))
+          ])) : currentStep.value === 2 && !totalElements.value ? (vue.openBlock(), vue.createElementBlock("div", {
+            key: 1,
+            class: "flex items-center gap-1.5 text-xs text-warning"
+          }, [
+            vue.createVNode(vue.unref(elementPlus.ElIcon), null, {
+              default: vue.withCtx(() => [
+                vue.createVNode(vue.unref(iconsVue.Warning))
+              ]),
+              _: 1
+              /* STABLE */
+            }),
+            vue.createElementVNode("span", null, "\u5F53\u524D\u672A\u5BFC\u5165\u6570\u636E\uFF0C\u8BF7\u60A8\u5BFC\u5165\u6DFB\u52A0\u6570\u636E")
           ])) : vue.createCommentVNode("v-if", true)
         ]),
         "operate-right-box": vue.withCtx(() => [
-          showSubmit.value ? (vue.openBlock(), vue.createBlock(vue.unref(index$2.HyTooltip), {
+          currentStep.value === 1 ? (vue.openBlock(), vue.createBlock(vue.unref(index$2.HyButton), {
             key: 0,
+            type: "primary",
+            class: "!min-w-[120px]",
+            onClick: onNextStep
+          }, {
+            default: vue.withCtx(() => [
+              vue.createTextVNode("\u8FDB\u5165\u6DFB\u52A0")
+            ]),
+            _: 1
+            /* STABLE */
+          })) : currentStep.value === 2 ? (vue.openBlock(), vue.createBlock(vue.unref(index$3.HyTooltip), {
+            key: 1,
             disabled: !isSubmitting.value,
             content: "\u6570\u636E\u6B63\u5728\u5BFC\u5165\u4E2D\uFF0C\u8BF7\u7A0D\u7B49"
           }, {
             default: vue.withCtx(() => [
-              vue.createVNode(vue.unref(index$3.HyButton), {
+              vue.createVNode(vue.unref(index$2.HyButton), {
                 type: "primary",
                 loading: isSubmitting.value,
                 class: "!min-w-[120px]",
@@ -264,6 +296,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             key: 0,
             ref_key: "batchTableFormRef",
             ref: batchTableFormRef,
+            step: currentStep.value,
+            "onUpdate:step": ($event) => currentStep.value = $event,
             tableColumns: __props.tableColumns,
             formColumns: __props.formColumns,
             rules: __props.rules,
@@ -292,7 +326,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 ])
               };
             })
-          ]), 1032, ["tableColumns", "formColumns", "rules", "emptyText", "fontSize", "rowClickExpand", "columnNum", "size", "beforeDataHandle", "submit-handler"])) : vue.createCommentVNode("v-if", true)
+          ]), 1032, ["step", "onUpdate:step", "tableColumns", "formColumns", "rules", "emptyText", "fontSize", "rowClickExpand", "columnNum", "size", "beforeDataHandle", "submit-handler"])) : vue.createCommentVNode("v-if", true)
         ]),
         _: 2
         /* DYNAMIC */

package/lib/components/hyConfirmDialog/confirmDialog.vue.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var vue = require('vue');
 var elementPlus = require('element-plus');
-var iconsVue = require('@element-plus/icons-vue');
 var useLocale = require('../../hooks/useLocale.js');
-var index = require('../hyButton/index.js');
+var index = require('../hyIcon/index.js');
+var index$1 = require('../hyButton/index.js');
 
 const __default__ = vue.defineComponent({
   name: "HyConfirmDialog"
@@ -161,15 +161,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 onClick: onCloseHandler
               },
               [
-                vue.createVNode(vue.unref(elementPlus.ElIcon), {
-                  size: "18",
-                  color: "rgb(var(--hy-danger-2))"
-                }, {
-                  default: vue.withCtx(() => [
-                    vue.createVNode(vue.unref(iconsVue.CircleClose))
-                  ]),
-                  _: 1
-                  /* STABLE */
+                vue.createVNode(vue.unref(index.HyIcon), {
+                  "svg-name": "layout-dialog-close-v2",
+                  "class-name": "!w-[18px] !h-[18px]"
                 })
               ],
               2
@@ -180,16 +174,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         default: vue.withCtx(() => [
           vue.createElementVNode("div", { class: "flex flex-col items-center justify-between pt-[37px] pb-[27px]" }, [
             vue.createElementVNode("div", { class: "flex flex-col items-center text-main" }, [
-              vue.createVNode(vue.unref(elementPlus.ElIcon), {
-                size: "40",
-                color: __props.iconColor
-              }, {
-                default: vue.withCtx(() => [
-                  vue.createVNode(vue.unref(iconsVue.Warning))
-                ]),
-                _: 1
-                /* STABLE */
-              }, 8, ["color"]),
+              vue.createCommentVNode(' <el-icon size="40" :color="iconColor"><Warning /></el-icon> '),
+              vue.createVNode(vue.unref(index.HyIcon), {
+                "svg-name": "dispatch-share1-prompt",
+                class: "!w-[40px] !h-[40px]",
+                style: vue.normalizeStyle({ color: __props.iconColor })
+              }, null, 8, ["style"]),
               vue.createElementVNode(
                 "div",
                 {
@@ -208,7 +198,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
               key: 0,
               class: "pt-[32px]"
             }, [
-              __props.showCancel ? (vue.openBlock(), vue.createBlock(vue.unref(index.HyButton), {
+              __props.showCancel ? (vue.openBlock(), vue.createBlock(vue.unref(index$1.HyButton), {
                 key: 0,
                 type: __props.cancelType,
                 disabled: loading.value,
@@ -224,7 +214,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 _: 1
                 /* STABLE */
               }, 8, ["type", "disabled"])) : vue.createCommentVNode("v-if", true),
-              __props.showSubmit ? (vue.openBlock(), vue.createBlock(vue.unref(index.HyButton), {
+              __props.showSubmit ? (vue.openBlock(), vue.createBlock(vue.unref(index$1.HyButton), {
                 key: 1,
                 type: __props.submitType,
                 disabled: loading.value,