@vtx/map 1.2.30 → 6.0.0-beta.1

package/lib/VtxSearchMap/VtxSearchMap.less

@@ -1,26 +1,29 @@
-@import (reference) '~antd/lib/style/themes/index.less';
-
-.vtx-ui-searchmap-searchmodal{
+.vtx-ui-searchmap-searchmodal {
     z-index: 1001;
-    .ant-modal{
-        width: e('calc(100% - 200px)') !important;
+
+    .ant-modal {
+        width: calc(100% - 200px) !important;
         min-width: 800px;
         height: 70vh;
-        .ant-modal-title{
-            color: @primary-color;
+
+        .ant-modal-title {
+            color: var(--ant-color-primary);
         }
-        .ant-modal-content{
+
+        .ant-modal-content {
             width: 100%;
             height: 100%;
-            .ant-modal-body{
+
+            .ant-modal-body {
                 width: 100%;
-                height: e('calc(100% - 108px)') !important;
+                height: calc(100% - 108px) !important;
                 padding: 0px;
-                background-color: @body-background;
+                background-color: var(--ant-color-background);
             }
         }
     }
-    .vtx-ui-searchmap-searchmap{
+
+    .vtx-ui-searchmap-searchmap {
         width: 100%;
         height: 100%;
         padding-top: 48px;
@@ -28,32 +31,40 @@
         box-sizing: border-box;
         position: relative;
         overflow: hidden;
-        .vtx-ui-searchmap-top,.vtx-ui-searchmap-bottom{
+
+        .vtx-ui-searchmap-top,
+        .vtx-ui-searchmap-bottom {
             width: 100%;
             height: 48px;
             position: absolute;
             left: 0px;
             padding: 10px 15px;
-            button{
+            box-sizing: border-box;
+
+            button {
                 margin-left: 10px;
             }
         }
-        .vtx-ui-searchmap-top{
+
+        .vtx-ui-searchmap-top {
             top: 0px;
-            border-bottom: 1px solid @border-color-base;
+            border-bottom: 1px solid var(--ant-color-border);
             display: flex;
             align-items: center;
             justify-content: space-between;
             flex-wrap: nowrap;
             white-space: nowrap;
+
             .vtx-ui-searchmap-top-right {
                 display: flex;
                 align-items: center;
                 justify-content: flex-end;
+
                 div+div {
                     margin-left: 8px;
                 }
             }
+
             // .vtx-ui-searchmap-othermodal{
             //     position: absolute;
             //     right: 25px;
@@ -76,28 +87,34 @@
             //     cursor: pointer;
             // }
         }
-        .vtx-ui-searchmap-bottom{
+
+        .vtx-ui-searchmap-bottom {
             bottom: 0px;
-            border-top: 1px solid @border-color-base;
+            border-top: 1px solid var(--ant-color-border);
             text-align: right;
         }
-        .vtx-ui-searchmap-content{
+
+        .vtx-ui-searchmap-content {
             width: 100%;
             height: 100%;
             position: relative;
             padding-left: 25px;
-            .vtx-ui-searchmap-show{
+
+            .vtx-ui-searchmap-show {
                 display: inline-block;
                 width: 100%;
                 height: 100%;
             }
-            .vtx-ui-searchmap-hidden{
+
+            .vtx-ui-searchmap-hidden {
                 display: none;
             }
-            .vtx-ui-searchmap-w_l{
+
+            .vtx-ui-searchmap-w_l {
                 width: 300px !important;
             }
-            .vtx-ui-searchmap-content_left{
+
+            .vtx-ui-searchmap-content_left {
                 width: 25px;
                 height: 100%;
                 display: inline-block;
@@ -106,59 +123,67 @@
                 transition-duration: 0.3s;
                 transition-property: width;
                 vertical-align: top;
-                border-right: 1px solid @border-color-base;
+                border-right: 1px solid var(--ant-color-border);
                 position: absolute;
                 top: 0px;
                 left: 0px;
                 z-index: 10;
-                background-color: @body-background;
-                .vtx-ui-searchmap-listtitle{
+                background-color:  var(--ant-color-background);
+
+                .vtx-ui-searchmap-listtitle {
                     width: 100%;
                     height: 30px;
                     line-height: 30px;
-                    border-bottom: 1px solid @border-color-base;;
-                    .vtx-ui-searchmap-title{
+                    border-bottom: 1px solid var(--ant-color-border);
+
+                    .vtx-ui-searchmap-title {
                         width: e('calc(100% - 30px)');
                         display: inline-block;
                         padding-left: 15px;
                         font-size: 15px;
                     }
-                    .vtx-ui-searchmap-btn{
+
+                    .vtx-ui-searchmap-btn {
                         display: inline-block;
                         width: 30px;
                         text-align: center;
-                        color: @primary-color;
+                        color: var(--ant-color-primary);
                         height: 30px;
                         line-height: 30px;
                         cursor: pointer;
                     }
                 }
-                .vtx-ui-searchmap-lists{
+
+                .vtx-ui-searchmap-lists {
                     width: 100%;
                     line-height: 35px;
-                    border-bottom: 1px solid @border-color-base;;
+                    border-bottom: 1px solid var(--ant-color-border);
                     font-size: 12px;
                     overflow: hidden;
                     text-overflow: ellipsis;
                     white-space: nowrap;
-                    padding:0px 15px;
+                    padding: 0px 15px;
                     cursor: pointer;
                     color: #999;
-                    &:hover{
+
+                    &:hover {
                         background-color: #ECF6FD;
-                        color: @primary-color;
+                        color: var(--ant-color-primary);
                     }
                 }
-                .vtx-ui-searchmap-lists.vtx-ui-searchmap-select{
+
+                .vtx-ui-searchmap-lists.vtx-ui-searchmap-select {
                     background-color: #ECF6FD;
-                    color: @primary-color;
+                    color: var(--ant-color-primary);
                 }
-                .vtx-ui-searchmap-scrollauto{
+
+                .vtx-ui-searchmap-scrollauto {
                     height: e('calc(100% - 30px)');
                     overflow-y: auto;
                 }
             }
-            .vtx-ui-searchmap-content_right{
+
+            .vtx-ui-searchmap-content_right {
                 width: 100%;
                 height: 100%;
                 display: inline-block;
@@ -167,9 +192,10 @@
                 transition-duration: 0.3s;
                 transition-property: width;
             }
-            .vtx-ui-searchmap-btn{
+
+            .vtx-ui-searchmap-btn {
                 text-align: center;
-                color: @primary-color;
+                color: var(--ant-color-primary);
                 height: 30px;
                 line-height: 30px;
                 cursor: pointer;
@@ -177,7 +203,8 @@
         }
     }
 }
-.vtx-ui-searchmap-showlabel{
+
+.vtx-ui-searchmap-showlabel {
     margin-left: 0;
     width: 100px;
     line-height: 25px;
@@ -194,15 +221,15 @@
     word-break: normal;
     overflow: hidden;
 }
-.vtx-ui-searchmap-hiddenlabel{
+
+.vtx-ui-searchmap-hiddenlabel {
     display: none;
 }
 
-.vtx-ui-searchmap-bottom{
+.vtx-ui-searchmap-bottom {
     display: flex;
     align-items: center;
     justify-content: space-between;
-    .vtx-ui-searchmap-address {
-        
-    }
+
+    .vtx-ui-searchmap-address {}
 }

package/lib/VtxSearchMap/VtxSearchMapAntd3.less

@@ -1 +1 @@
-@import (reference) '~antd/lib/style/themes/index.less';
+// @import (reference) '~antd/lib/style/themes/index.less';

package/lib/VtxSearchMap/index.js

@@ -6,15 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "VtxSearchMap", {
   enumerable: true,
   get: function get() {
-    return _VtxSearchMap["default"];
-  }
-});
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function get() {
-    return _VtxSearchMap["default"];
+    return _VtxSearchMap.default;
   }
 });
+exports.default = void 0;
 var _VtxSearchMap = _interopRequireDefault(require("./VtxSearchMap"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
-//# sourceMappingURL=index.js.map
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _default = exports.default = _VtxSearchMap.default;

package/lib/VtxSearchMap/mapping.js

@@ -13,5 +13,4 @@ var iconMapping = exports.iconMapping = {
   sync: 'sync',
   'double-left': 'doubleleft',
   'double-right': 'doubleright'
-};
-//# sourceMappingURL=mapping.js.map
+};

package/lib/VtxSearchMap/style/index.js

@@ -1,28 +1 @@
-"use strict";
-
-require("antd/lib/button/style");
-require("antd/lib/input/style");
-require("antd/lib/message/style");
-require("antd/lib/icon/style");
-require("antd/lib/checkbox/style");
-require("../../VtxMap/AMap/AMap.less");
-require("../../VtxMap/BMap/Map.less");
-require("../../VtxMap/GMap/Map.less");
-require("../../VtxMap/OMap/Map.less");
-require("../../VtxMap/TMap/TMap.less");
-require("../../VtxMap/OlMap/Map.less");
-require("../../VtxMap/Map.less");
-var _default = require("../../default");
-switch (_default.antdMajorVersion) {
-  case '4':
-    require('../../VtxModal/VtxModal.less');
-    require('../VtxSearchMap.less');
-    break;
-  case '3':
-    require('../../VtxModal/VtxModalAntd3.less');
-    require('../VtxSearchMapAntd3.less');
-    break;
-  default:
-    break;
-}
-//# sourceMappingURL=index.js.map
+"use strict";

package/lib/default.js

@@ -3,47 +3,67 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.antdMajorVersion = exports.VtxMapIcon = void 0;
+exports.default = exports.VtxMapIcon = void 0;
+exports.ensurejQuery = ensurejQuery;
 exports.getTMapTK = getTMapTK;
-var _package = require("antd/package.json");
-var createFromIconfontCN;
-var antdMajorVersion = exports.antdMajorVersion = _package.version.substring(0, 1);
-
+exports.loadScript = loadScript;
 // 必须是3.9.0之后的版本
-if (antdMajorVersion === '3') {
-  createFromIconfontCN = require('antd/lib/icon')["default"].createFromIconfontCN;
-} else if (antdMajorVersion === '4') {
-  createFromIconfontCN = require('@ant-design/icons').createFromIconfontCN;
-}
+
+var createFromIconfontCN = require("@ant-design/icons").createFromIconfontCN;
 var globalCfg = window.VtxPublicServiceAddress || {};
 var VtxMapIcon = exports.VtxMapIcon = createFromIconfontCN({
-  // scriptUrl: '//at.alicdn.com/t/font_2865072_vy1sa1whz3l.js',
-  scriptUrl: "".concat(globalCfg.mapServerURL || '//vortexplugin.cloudhw.cn/mapplugin', "/icon_font.js")
+  scriptUrl: "".concat(globalCfg.mapServerURL || "//vortexplugin.cloudhw.cn/mapplugin", "/icon_font.js")
 });
-window._BMapSecurityConfig = {
-  // 代理服务器地址
-  serviceHost: '/_BMapService/'
-};
-var _default = exports["default"] = {
+var configUrl = {
   // 百度地图资源请求地址
-  bmapScriptUrl: globalCfg.bmapScriptUrl ? globalCfg.bmapScriptUrl : '/_BMapService/getscript?v=3.0',
+  bmapScriptUrl: globalCfg.bmapScriptUrl ? globalCfg.bmapScriptUrl : "//api.map.baidu.com/getscript?v=3.0&ak=42IughV5lDxAt0wI8AhDVuGR",
   // 高德地图资源请求地址
-  amapScriptUrl: globalCfg.amapScriptUrl ? globalCfg.amapScriptUrl : '//webapi.amap.com/maps?v=1.4.14&key=e59ef9272e3788ac59d9a22f0f8cf9fe&plugin=AMap.Geolocation,AMap.MarkerClusterer,AMap.MapType,AMap.Scale,AMap.ToolBar,AMap.DistrictSearch,AMap.RangingTool,AMap.MouseTool,AMap.PolyEditor,AMap.CircleEditor,AMap.PlaceSearch,AMap.Heatmap',
+  amapScriptUrl: globalCfg.amapScriptUrl ? globalCfg.amapScriptUrl : "//webapi.amap.com/maps?v=1.4.14&key=e59ef9272e3788ac59d9a22f0f8cf9fe&plugin=AMap.Geolocation,AMap.MarkerClusterer,AMap.MapType,AMap.Scale,AMap.ToolBar,AMap.DistrictSearch,AMap.RangingTool,AMap.MouseTool,AMap.PolyEditor,AMap.CircleEditor,AMap.PlaceSearch,AMap.Heatmap",
   // 天地图资源请求地址
   tmapScriptUrl: globalCfg.tmapScriptUrl ? globalCfg.tmapScriptUrl : "//api.tianditu.gov.cn/api?v=4.0&tk=".concat(getTMapTK()),
   //地图服务地址ip
-  mapServerURL: globalCfg.mapServerURL ? globalCfg.mapServerURL : '//vortexplugin.cloudhw.cn/mapplugin',
+  mapServerURL: globalCfg.mapServerURL ? globalCfg.mapServerURL : "//vortexplugin.cloudhw.cn/mapplugin",
   //arcgis地图服务ip
-  arcgisServerURL: globalCfg.arcgisServerURL ? globalCfg.arcgisServerURL : '//vortexplugin.cloudhw.cn/gis',
+  arcgisServerURL: globalCfg.arcgisServerURL ? globalCfg.arcgisServerURL : "//vortexplugin.cloudhw.cn/gis",
   //openlayer地图服务ip
-  openlayerServerURL: globalCfg.openlayerServerURL ? globalCfg.openlayerServerURL : '//vortexplugin.cloudhw.cn/openlayer'
+  openlayerServerURL: globalCfg.openlayerServerURL ? globalCfg.openlayerServerURL : "//vortexplugin.cloudhw.cn/openlayer",
+  jqueryScriptUrl: globalCfg.jqueryScriptUrl ? globalCfg.jqueryScriptUrl : "https://vortexplugin.cloudhw.cn/jquery/jquery.min.js"
 };
 function getTMapTK() {
   if (window.TMapTK) {
     return window.TMapTK;
   } else {
-    var tks = ['b95ec6e55998a6408862ab2ac36c4950', '0e3608ea5e57ac901f1e14e653818910', '55bbbfecae274ce7de92579f15a5fbad'];
+    var tks = ["b95ec6e55998a6408862ab2ac36c4950", "0e3608ea5e57ac901f1e14e653818910", "55bbbfecae274ce7de92579f15a5fbad"];
     return tks[Math.floor(Math.random() * 3)];
   }
 }
-//# sourceMappingURL=default.js.map
+function loadScript(url, callback) {
+  var script = document.createElement('script');
+  script.type = 'text/javascript';
+  if (script.readyState) {
+    //IE
+    script.onreadystatechange = function () {
+      if (script.readyState == 'loaded' || script.readyState == 'complete') {
+        script.onreadystatechange = null;
+        callback && callback();
+      }
+    };
+  } else {
+    //Others
+    script.onload = function () {
+      callback();
+    };
+  }
+  script.src = url;
+  document.body.appendChild(script);
+}
+function ensurejQuery() {
+  return new Promise(function (resolve) {
+    if (window.$) {
+      resolve();
+    } else {
+      loadScript(configUrl.jqueryScriptUrl, resolve);
+    }
+  });
+}
+var _default = exports.default = configUrl;

package/lib/index.js

@@ -3,37 +3,36 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "VtxMap", {
-  enumerable: true,
-  get: function get() {
-    return _VtxMap.VtxMap;
-  }
-});
-Object.defineProperty(exports, "VtxOptMap", {
-  enumerable: true,
-  get: function get() {
-    return _VtxMap.VtxOptMap;
-  }
-});
-Object.defineProperty(exports, "VtxSearchCheckMap", {
-  enumerable: true,
-  get: function get() {
-    return _VtxSearchCheckMap.VtxSearchCheckMap;
-  }
-});
-Object.defineProperty(exports, "VtxSearchMap", {
-  enumerable: true,
-  get: function get() {
-    return _VtxSearchMap.VtxSearchMap;
-  }
-});
-Object.defineProperty(exports, "VtxZoomMap", {
-  enumerable: true,
-  get: function get() {
-    return _VtxMap.VtxZoomMap;
-  }
-});
 var _VtxMap = require("./VtxMap");
+Object.keys(_VtxMap).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _VtxMap[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _VtxMap[key];
+    }
+  });
+});
 var _VtxSearchMap = require("./VtxSearchMap");
+Object.keys(_VtxSearchMap).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _VtxSearchMap[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _VtxSearchMap[key];
+    }
+  });
+});
 var _VtxSearchCheckMap = require("./VtxSearchCheckMap");
-//# sourceMappingURL=index.js.map
+Object.keys(_VtxSearchCheckMap).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _VtxSearchCheckMap[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _VtxSearchCheckMap[key];
+    }
+  });
+});

package/lib/utils/util.js

@@ -10,8 +10,8 @@ exports.transformGCJ2ToWGS = transformGCJ2ToWGS;
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 var x_pi = 3.14159265358979324 * 3000.0 / 180.0;
 // GCJ02 --> BD09
@@ -126,5 +126,4 @@ var MapTypeEnum = exports.MapTypeEnum = {
   olmap: 'wgs84',
   tmap: 'wgs84',
   arcgis: 'wgs84'
-};
-//# sourceMappingURL=util.js.map
+};

package/package.json

@@ -1,63 +1,55 @@
 {
   "name": "@vtx/map",
-  "version": "1.2.30",
+  "version": "6.0.0-beta.1",
   "description": "@vtx/map",
   "main": "lib/index.js",
+  "module": "es/index.js",
   "scripts": {
     "start": "dumi dev",
     "docs:dark": "cross-env UMI_COLOR=dark dumi dev",
     "docs:build": "dumi build",
     "build": "gulp compile",
+    "compile": "father build",
     "build:old": "rimraf lib && babel src --out-dir lib && node styleProcessor.js",
-    "prepublish": "npm run build"
+    "prepublish": "npm run build",
+    "publish:beta": "npm publish --tag beta"
   },
   "files": [
     "lib"
   ],
   "dependencies": {
     "immutable": "^3.8.2",
-    "lodash": "^4.17.10"
+    "lodash-es": "^4.17.21"
   },
   "devDependencies": {
-    "@babel/core": "^7.18.2",
-    "@babel/plugin-proposal-class-properties": "^7.17.12",
-    "@babel/plugin-transform-runtime": "^7.18.2",
-    "@babel/preset-env": "^7.18.2",
-    "@babel/preset-react": "^7.17.12",
-    "antd": "^4.21.2",
-    "babel-cli": "^6.14.0",
-    "babel-core": "^6.18.2",
-    "babel-eslint": "^7.1.1",
-    "babel-loader": "^6.2.7",
-    "babel-plugin-add-module-exports": "^0.2.1",
-    "babel-plugin-import": "^1.13.5",
-    "babel-plugin-transform-remove-console": "^6.8.5",
-    "babel-plugin-transform-runtime": "^6.9.0",
-    "babel-polyfill": "^6.9.1",
-    "babel-preset-es2015": "^6.24.1",
-    "babel-preset-react": "^6.24.1",
-    "babel-preset-stage-0": "^6.24.1",
+    "ahooks": "^3.9.6",
+    "@ant-design/icons": "^6.0.0",
+    "antd": "^6.0.0",
     "compile": "^0.0.2",
     "cross-env": "^7.0.3",
-    "dumi": "^1.1.40",
+    "dumi": "^2.4.21",
+    "dumi-theme-vortex-style": "^1.0.0",
     "gulp": "^4.0.2",
     "gulp-babel": "^8.0.0",
     "gulp-bump": "^3.2.0",
     "gulp-clean": "^0.4.0",
     "gulp-less": "^5.0.0",
     "gulp-sourcemaps": "^3.0.0",
-    "jquery": "^3.6.0",
     "less": "^3.9.0",
     "less-plugin-autoprefix": "^2.0.0",
     "less-plugin-npm-import": "^2.1.0",
     "merge2": "^1.4.1",
     "rimraf": "^2.6.2",
-    "through2": "^4.0.2"
+    "use-deep-compare": "^1.3.0",
+    "through2": "^4.0.2",
+    "father": "^4.6.7"
   },
   "peerDependencies": {
-    "react": ">=16.12.0",
-    "react-dom": ">=16.12.0"
+    "antd": "^6.0.0",
+    "react": ">=18.0.0",
+    "react-dom": ">=18.0.0",
+    "@ant-design/icons": "^6.0.0"
   },
   "author": "vortex",
   "license": "MIT"
-}
+}

package/lib/VtxMap/AMap/AMap.css

@@ -1,27 +0,0 @@
-.A_Map_rangingTool {
-  width: 7px;
-  height: 7px;
-  background: #fff;
-  border: 2px solid #ff0000;
-  padding: 0px;
-  border-radius: 7px;
-}
-.amap-marker-label {
-  border: 0px !important;
-  background-color: transparent !important;
-}
-.amap-marker-content {
-  position: relative;
-  white-space: inherit !important;
-}
-.amap-info-content {
-  padding: 0 !important;
-}
-.vtx_gmap_html_pointCollection_a {
-  position: absolute;
-  top: 0px;
-  left: 0px;
-}
-.vtx_gmap_html_pointCollection_a canvas {
-  z-index: 1;
-}