deeptwins-engine-3d 0.1.43 → 0.1.45

package/dist/esm/tool/fetch.js

@@ -0,0 +1,222 @@
+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 _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+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(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); }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+/**
+ * Fetch 请求配置选项
+ */
+
+/**
+ * Fetch 请求响应
+ */
+
+/**
+ * 封装的 fetch 请求函数
+ * @param url 请求地址
+ * @param options 请求配置
+ * @returns Promise<FetchUrlResponse>
+ */
+export function fetchUrl(_x) {
+  return _fetchUrl.apply(this, arguments);
+}
+
+/**
+ * GET 请求快捷方法
+ */
+function _fetchUrl() {
+  _fetchUrl = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(url) {
+    var options,
+      _options$method,
+      method,
+      _options$headers,
+      headers,
+      body,
+      _options$timeout,
+      timeout,
+      params,
+      _options$responseType,
+      responseType,
+      _options$credentials,
+      credentials,
+      requestUrl,
+      urlObj,
+      config,
+      controller,
+      timeoutId,
+      response,
+      data,
+      _data,
+      error,
+      timeoutError,
+      networkError,
+      _args = arguments;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          options = _args.length > 1 && _args[1] !== undefined ? _args[1] : {};
+          _options$method = options.method, method = _options$method === void 0 ? 'GET' : _options$method, _options$headers = options.headers, headers = _options$headers === void 0 ? {} : _options$headers, body = options.body, _options$timeout = options.timeout, timeout = _options$timeout === void 0 ? 30000 : _options$timeout, params = options.params, _options$responseType = options.responseType, responseType = _options$responseType === void 0 ? 'json' : _options$responseType, _options$credentials = options.credentials, credentials = _options$credentials === void 0 ? 'same-origin' : _options$credentials; // 构建 URL 和查询参数
+          requestUrl = url;
+          if (params && Object.keys(params).length > 0) {
+            urlObj = new URL(url, window.location.href);
+            Object.keys(params).forEach(function (key) {
+              var value = params[key];
+              if (value !== null && value !== undefined) {
+                urlObj.searchParams.append(key, String(value));
+              }
+            });
+            requestUrl = urlObj.toString();
+          }
+
+          // 构建请求配置
+          config = {
+            method: method,
+            headers: _objectSpread({
+              'Content-Type': 'application/json'
+            }, headers),
+            credentials: credentials
+          }; // 添加请求体
+          if (body && ['POST', 'PUT', 'PATCH'].includes(method)) {
+            if (typeof body === 'string') {
+              config.body = body;
+            } else {
+              config.body = JSON.stringify(body);
+            }
+          }
+
+          // 创建超时控制
+          controller = new AbortController();
+          timeoutId = setTimeout(function () {
+            return controller.abort();
+          }, timeout);
+          config.signal = controller.signal;
+          _context.prev = 9;
+          _context.next = 12;
+          return fetch(requestUrl, config);
+        case 12:
+          response = _context.sent;
+          clearTimeout(timeoutId);
+
+          // 获取响应数据
+          _context.t0 = responseType;
+          _context.next = _context.t0 === 'json' ? 17 : _context.t0 === 'text' ? 21 : _context.t0 === 'blob' ? 25 : _context.t0 === 'arrayBuffer' ? 29 : 33;
+          break;
+        case 17:
+          _context.next = 19;
+          return response.json();
+        case 19:
+          data = _context.sent;
+          return _context.abrupt("break", 36);
+        case 21:
+          _context.next = 23;
+          return response.text();
+        case 23:
+          data = _context.sent;
+          return _context.abrupt("break", 36);
+        case 25:
+          _context.next = 27;
+          return response.blob();
+        case 27:
+          data = _context.sent;
+          return _context.abrupt("break", 36);
+        case 29:
+          _context.next = 31;
+          return response.arrayBuffer();
+        case 31:
+          data = _context.sent;
+          return _context.abrupt("break", 36);
+        case 33:
+          _context.next = 35;
+          return response.json();
+        case 35:
+          data = _context.sent;
+        case 36:
+          if (response.ok) {
+            _context.next = 41;
+            break;
+          }
+          error = new Error(((_data = data) === null || _data === void 0 ? void 0 : _data.message) || "HTTP ".concat(response.status, ": ").concat(response.statusText));
+          error.status = response.status;
+          error.data = data;
+          throw error;
+        case 41:
+          return _context.abrupt("return", {
+            data: data,
+            status: response.status,
+            statusText: response.statusText,
+            headers: response.headers
+          });
+        case 44:
+          _context.prev = 44;
+          _context.t1 = _context["catch"](9);
+          if (!(_context.t1.name === 'AbortError')) {
+            _context.next = 50;
+            break;
+          }
+          timeoutError = new Error("\u8BF7\u6C42\u8D85\u65F6\uFF08".concat(timeout, "ms\uFF09"));
+          timeoutError.code = 'TIMEOUT';
+          throw timeoutError;
+        case 50:
+          if (!(_context.t1 instanceof TypeError)) {
+            _context.next = 54;
+            break;
+          }
+          networkError = new Error('网络连接失败，请检查网络设置');
+          networkError.code = 'NETWORK_ERROR';
+          throw networkError;
+        case 54:
+          throw _context.t1;
+        case 55:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[9, 44]]);
+  }));
+  return _fetchUrl.apply(this, arguments);
+}
+export function get(url, params, options) {
+  return fetchUrl(url, _objectSpread(_objectSpread({}, options), {}, {
+    method: 'GET',
+    params: params
+  }));
+}
+
+/**
+ * POST 请求快捷方法
+ */
+export function post(url, body, options) {
+  return fetchUrl(url, _objectSpread(_objectSpread({}, options), {}, {
+    method: 'POST',
+    body: body
+  }));
+}
+
+/**
+ * PUT 请求快捷方法
+ */
+export function put(url, body, options) {
+  return fetchUrl(url, _objectSpread(_objectSpread({}, options), {}, {
+    method: 'PUT',
+    body: body
+  }));
+}
+
+/**
+ * DELETE 请求快捷方法
+ */
+export function del(url, body, options) {
+  return fetchUrl(url, _objectSpread(_objectSpread({}, options), {}, {
+    method: 'DELETE',
+    body: body
+  }));
+}
+export default {
+  get: get,
+  post: post,
+  put: put,
+  delete: del
+};

package/dist/esm/videoFusion/BaseVideo.d.ts

@@ -5,7 +5,7 @@ export default class BaseVideo {
     videoElement: any;
     videoPolygonLayer: any;
     isDestroyed: boolean;
-    videoType: 'video' | 'hls' | '';
+    videoType: 'video' | 'hls' | 'custom' | '';
     status: 'PREPARE' | 'READY' | 'START' | 'PLAYING' | 'PAUSE';
     synchronizer: any;
     hls: any;

package/dist/esm/videoFusion/BaseVideo.js

@@ -35,6 +35,9 @@ var BaseVideo = /*#__PURE__*/function () {
     if (options.hls) {
       this.videoType = 'hls';
     }
+    if (options.custom) {
+      this.videoType = 'custom';
+    }
     this._init();
     this._initMaskImage();
   }
@@ -124,6 +127,18 @@ var BaseVideo = /*#__PURE__*/function () {
             }
           });
         }
+      } else if (this.videoType === 'custom') {
+        var _this$options$custom = this.options.custom,
+          _width2 = _this$options$custom.width,
+          _height2 = _this$options$custom.height,
+          onReady = _this$options$custom.onReady;
+        this.videoElement.width = _width2;
+        this.videoElement.height = _height2;
+        videoContainer.appendChild(this.videoElement);
+        if (onReady) {
+          this.status = 'READY';
+          onReady(this.videoElement, this.play, this.pause);
+        }
       }
     }
 
@@ -147,12 +162,23 @@ var BaseVideo = /*#__PURE__*/function () {
       canvas.width = width;
       canvas.height = height;
       var ctx = canvas.getContext('2d');
+
       // 1. 叠加当前视频帧
       ctx.globalAlpha = 1.0; // 确保视频帧不透明
       ctx.drawImage(this.videoElement, 0, 0, width, height);
+
       // 2. 应用羽化遮罩
       ctx.globalCompositeOperation = 'destination-in'; // 使用遮罩影响透明度
-      ctx.drawImage(this._maskImage, 0, 0, width, height);
+
+      var maskCanvas = document.createElement('canvas');
+      maskCanvas.width = width;
+      maskCanvas.height = height;
+      var maskCtx = maskCanvas.getContext('2d');
+      if (maskCtx && this._maskImage) {
+        // 绘制并拉伸遮罩图片到整个画布
+        maskCtx.drawImage(this._maskImage, 0, 0, width, height);
+        ctx.drawImage(maskCanvas, 0, 0);
+      }
       ctx.globalCompositeOperation = 'source-over'; // 还原默认混合模式
       return canvas;
     }
@@ -213,6 +239,16 @@ var BaseVideo = /*#__PURE__*/function () {
           });
         }
       }
+      if (this.synchronizer && this.videoType === 'custom') {
+        this.getMap().clock.shouldAnimate = true;
+      }
+      if (!this.synchronizer && this.videoType === 'custom') {
+        this.synchronizer = new Cesium.VideoSynchronizer({
+          clock: this.getMap().clock,
+          element: this.videoElement
+        });
+        this.getMap().clock.shouldAnimate = true;
+      }
     }
 
     // 监听错误
@@ -234,6 +270,9 @@ var BaseVideo = /*#__PURE__*/function () {
         this.hls.stopLoad();
         this.getMap().clock.shouldAnimate = false;
       }
+      if (this.videoType === 'custom') {
+        this.getMap().clock.shouldAnimate = false;
+      }
       this.videoElement.pause();
     }
 
@@ -277,6 +316,10 @@ var BaseVideo = /*#__PURE__*/function () {
         this.hls && this.hls.destroyed();
         this.getMap().clock.shouldAnimate = false;
       }
+      if (this.videoType === 'custom') {
+        this.synchronizer && this.synchronizer.destroy();
+        this.getMap().clock.shouldAnimate = false;
+      }
       this.videoElement.remove();
       this.videoPolygonLayer.remove();
     }

package/dist/esm/videoFusion/VideoProject.js

@@ -50,6 +50,9 @@ var VideoProject = /*#__PURE__*/function (_BaseVideo) {
         this.options.hls.autoPlay && this.status === 'READY' && this.play();
         videoOptions = merge(DEFAULT_VIDEO_TEXTURE_HLS(), this.options.hls);
       }
+      if (this.videoType === 'custom') {
+        videoOptions = merge({}, this.options.custom);
+      }
       var _this$options = this.options,
         _this$options$type = _this$options.type,
         type = _this$options$type === void 0 ? 'fixed' : _this$options$type,

package/dist/esm/videoFusion/VideoTexture.js

@@ -46,6 +46,9 @@ var VideoTexture = /*#__PURE__*/function (_BaseVideo) {
         this.options.hls.autoPlay && this.status === 'READY' && this.play();
         videoOptions = merge(DEFAULT_VIDEO_TEXTURE_HLS(), this.options.hls);
       }
+      if (this.videoType === 'custom') {
+        videoOptions = merge({}, this.options.custom);
+      }
       var _this$options$style = this.options.style,
         _this$options$style2 = _this$options$style === void 0 ? {
           edgeFeather: false

package/dist/esm/visualization/PointCluster.js

@@ -15,6 +15,7 @@ import { cloneDeep, flattenDeep, merge } from 'lodash';
 import { v4 as uuidv4 } from 'uuid';
 import { DEFAULT_POINT_CLUSTER_STYLE } from "../constant";
 import BaseSource from "../graphicLayer/BaseSource";
+import BillboardPrimitive from "../graphicLayer/BillboardPrimitive";
 import PrimitiveCluster from "../tool/PrimitiveCluster";
 import * as utils from "../tool/utils";
 var PointCluster = /*#__PURE__*/function () {
@@ -68,17 +69,21 @@ var PointCluster = /*#__PURE__*/function () {
       primitiveCluster.pixelRange = this.options.pixelRange;
       primitiveCluster.minimumClusterSize = 1;
       this.source.forEach(function (t) {
-        var billboard = _objectSpread(_objectSpread({
-          id: uuidv4()
-        }, merge({
+        var style = BillboardPrimitive.handleOptions(merge({
           width: 30,
           height: 30
-        }, _this.options.billboard || {})), {}, {
+        }, utils.styleFun(cloneDeep(_this.options.billboard || {}), t.properties)));
+        var billboard = _objectSpread(_objectSpread({
+          id: uuidv4()
+        }, style), {}, {
           position: t.positions,
-          source: t
+          properties: t.properties,
+          geometry: t.geometry,
+          style: _this.options.billboard
         });
         _this.billboards.push(billboard);
-        _this.billboardsCollectionCombine.add(billboard);
+        var billboarded = _this.billboardsCollectionCombine.add(billboard);
+        billboarded.properties = t.properties;
       });
 
       // 将数据传给primitiveCluster的标签属性
@@ -101,16 +106,38 @@ var PointCluster = /*#__PURE__*/function () {
           }
         }
         if (step == -1) {
-          if (_this.options.billboard) {
-            var _this$options$billboa, _this$options$billboa2, _this$options$billboa3;
-            cluster.billboard.image = (_this$options$billboa = _this.options.billboard) === null || _this$options$billboa === void 0 ? void 0 : _this$options$billboa.image;
-            cluster.billboard.width = (_this$options$billboa2 = _this.options.billboard) === null || _this$options$billboa2 === void 0 ? void 0 : _this$options$billboa2.width;
-            cluster.billboard.height = (_this$options$billboa3 = _this.options.billboard) === null || _this$options$billboa3 === void 0 ? void 0 : _this$options$billboa3.height;
-          } else {
+          if (_this.options.onCustomRender) {
             cluster.billboard.show = false;
+            var clusterPoints = _this.billboards.filter(function (t) {
+              return clusteredEntities.includes(t.id);
+            });
+            _this.options.onCustomRender(step, utils.cartesian3ToLngLatAlt(cluster.billboard.position), clusterPoints);
+          } else {
+            if (_this.options.billboard) {
+              var billboard = _this.billboardsCollectionCombine._billboards.find(function (t) {
+                return clusteredEntities.includes(t.id);
+              });
+              var style = BillboardPrimitive.handleOptions(merge({
+                width: 30,
+                height: 30
+              }, utils.styleFun(cloneDeep(_this.options.billboard || {}), (billboard === null || billboard === void 0 ? void 0 : billboard.properties) || {})));
+              Object.keys(style).forEach(function (key) {
+                cluster.billboard[key] = style[key];
+              });
+            } else {
+              cluster.billboard.show = false;
+            }
           }
         } else {
-          cluster.billboard.image = _this._drawImage(clusteredEntities.length, _this.options.grade[step].size, _this.options.grade[step].color);
+          if (_this.options.onCustomRender) {
+            cluster.billboard.show = false;
+            var _clusterPoints = _this.billboards.filter(function (t) {
+              return clusteredEntities.includes(t.id);
+            });
+            _this.options.onCustomRender(step, utils.cartesian3ToLngLatAlt(cluster.billboard.position), _clusterPoints);
+          } else {
+            cluster.billboard.image = _this._drawImage(clusteredEntities.length, _this.options.grade[step].size, _this.options.grade[step].color);
+          }
         }
       });
     }