@realsee/dnalogel 0.1.7-alpha.4 → 0.1.7-alpha.8

package/libs/gltf-viewer/index.d.ts

@@ -16,7 +16,10 @@ export interface GLTFViewerConfig {
     ambientLight?: THREE.AmbientLight | false;
     minFov?: number;
     maxFov?: number;
-    toneMapping?: boolean;
+    toneMapping?: {
+        toneMapping?: THREE.ToneMapping;
+        toneMappingExposure?: number;
+    };
 }
 export interface GLTFViewerState {
     fov: number;
@@ -43,14 +46,16 @@ export declare class GLTFViewer extends Subscribe<GLTFViewerEventMap> {
         latitude?: number;
         longitude?: number;
     });
+    set minFov(fov: number);
+    get minFov(): number;
+    set maxFov(fov: number);
+    get maxFov(): number;
     /**
      *
      * @param url glTF 模型CDN地址
      * @param options adaptive 是否开启自适应fov
      */
-    load(url: string, options?: {
-        adaptive: boolean;
-    }): void;
+    load(url: string): void;
     /**
      * 挂载
      * @param container
@@ -66,4 +71,8 @@ export declare class GLTFViewer extends Subscribe<GLTFViewerEventMap> {
      * 销毁
      */
     dispose(): void;
+    /**
+     * 响应式fov
+     */
+    fitFov(): void;
 }

package/libs/gltf-viewer/index.js

@@ -23,12 +23,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.GLTFViewer = void 0;
 
+require("core-js/modules/es.object.assign.js");
+
 require("core-js/modules/es.function.bind.js");
 
 require("core-js/modules/web.timers.js");
 
-require("core-js/modules/es.object.assign.js");
-
 require("core-js/modules/es.object.to-string.js");
 
 require("core-js/modules/es.promise.js");
@@ -77,6 +77,8 @@ var _uuid = _interopRequireDefault(require("./uuid"));
 
 var _Subscribe2 = require("./Subscribe");
 
+var _formatRad = require("./formatRad");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -102,7 +104,10 @@ var Controller = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "longitude", 0);
     (0, _defineProperty2["default"])(this, "latitude", 0);
     (0, _defineProperty2["default"])(this, "needsRender", false);
-    this.config = config; // 异步事件回调
+    this.config = Object.assign({
+      maxFov: 120,
+      minFov: 1
+    }, config); // 异步事件回调
 
     this.callbacks = callbacks; // 默认状态参数
 
@@ -135,8 +140,11 @@ var Controller = /*#__PURE__*/function () {
     this.renderer.outputEncoding = THREE.sRGBEncoding;
 
     if (config.toneMapping) {
-      this.renderer.toneMapping = THREE.ReinhardToneMapping;
-      this.renderer.toneMappingExposure = 1.5;
+      var _config$toneMapping = config.toneMapping,
+          toneMapping = _config$toneMapping.toneMapping,
+          toneMappingExposure = _config$toneMapping.toneMappingExposure;
+      if (toneMapping) this.renderer.toneMapping = toneMapping;
+      if (toneMappingExposure !== undefined) this.renderer.toneMappingExposure = toneMappingExposure;
     }
 
     if (config.backgroundColor) {
@@ -149,10 +157,10 @@ var Controller = /*#__PURE__*/function () {
     } // 相机
 
 
-    this.camera = new THREE.PerspectiveCamera(this.fov, 1, 0.1, 1000); // 光照
+    this.camera = new THREE.PerspectiveCamera(this.fov, 1, 0.1, 1500); // 光照
 
     if (config.pointLight !== false) {
-      this.pointLight = config.pointLight || new THREE.PointLight(0xfffffff, 1, 10000);
+      this.pointLight = config.pointLight || new THREE.PointLight(0xfffffff, 1, 1500);
       this.scene.add(this.pointLight);
     }
 
@@ -267,18 +275,14 @@ var Controller = /*#__PURE__*/function () {
 
       this.target = object;
       this.target.scene.visible = false;
-      this.scene.add(this.target.scene); // {
-      //   const boxHelper = new THREE.BoxHelper(this.target.scene, 0x2bb8aa)
-      //   this.scene.add(boxHelper)
-      //   const axesHelper = new THREE.AxesHelper(300)
-      //   this.scene.add(axesHelper)
-      // }
-
+      this.scene.add(this.target.scene);
       setTimeout(function () {
         if (object === _this3.target) {
           _this3.target.scene.visible = true;
 
           _this3.update({});
+
+          _this3.callbacks.loaded(object);
         }
       }, 50);
     }
@@ -348,7 +352,9 @@ var Controller = /*#__PURE__*/function () {
       if (!center || !radius) return;
       var box = new THREE.Box3();
       box.expandByObject(this.target.scene);
-      box.getCenter(center); // 距离
+      box.getCenter(center);
+      longitude = (0, _formatRad.formatRad)(longitude);
+      latitude = Math.max(-Math.PI / 2 + 0.01, Math.min(+Math.PI / 2, latitude)); // 距离
 
       var distance = radius / Math.sin(Math.PI / 4) * 3;
       {// debug
@@ -388,34 +394,13 @@ var Controller = /*#__PURE__*/function () {
         fov = calcFov(d, radius * 2, this.renderer.domElement.offsetWidth / this.renderer.domElement.offsetHeight);
       }
 
+      fov = Math.max(this.minFov, Math.min(this.maxFov, fov));
+
       if (fov !== this.fov) {
-        fov = Math.max(this.minFov, Math.min(this.maxFov, fov));
         this.camera.fov = fov;
         this.camera.updateProjectionMatrix();
       }
 
-      this.camera.updateProjectionMatrix(); // const center = new THREE.Vector3()
-      // const box = new THREE.Box3()
-      // if (this.target) {
-      //   box.expandByObject(this.target.scene)
-      //   box.getCenter(center)
-      // }
-      // longitude = formatRad(longitude)
-      // latitude = Math.max(-Math.PI / 2 + 0.01, Math.min(+Math.PI / 2, latitude))
-      // const distance = Math.max(center.distanceTo(box.min), center.distanceTo(box.max))
-      // const direction = coordsToDirection({ longitude, latitude })
-      // direction.setLength(distance * 3)
-      // this.camera.position.copy(center.clone().add(direction))
-      // this.camera.lookAt(center)
-      // const lightDirection = coordsToDirection({ longitude, latitude: -Math.PI / 6 })
-      // lightDirection.setLength(distance * 3)
-      // if (this.pointLight) this.pointLight.position.copy(center.clone().add(lightDirection))
-      // if (fov !== this.fov) {
-      //   fov = Math.max(25, Math.min(this.maxFov, fov))
-      //   this.camera.fov = fov
-      //   this.camera.updateProjectionMatrix()
-      // }
-
       var needsRender = this.fov !== fov || this.longitude !== longitude || this.latitude !== latitude;
       Object.assign(this, {
         longitude: longitude,
@@ -574,8 +559,6 @@ var Controller = /*#__PURE__*/function () {
         loader.load(url, function (gltf) {
           _this6.setTarget(gltf);
 
-          _this6.callbacks.loaded(gltf);
-
           resolve(true);
         }, function (xhr) {
           _this6.callbacks.progressing(xhr.loaded / xhr.total * 100);
@@ -684,18 +667,41 @@ var GLTFViewer = /*#__PURE__*/function (_Subscribe) {
         longitude: longitude === undefined ? controller.longitude : longitude
       });
     }
+  }, {
+    key: "minFov",
+    get: function get() {
+      var controller = caches[this.uuid];
+      if (!controller) throw new Error(ERROR_NO_CONTROLLER);
+      return controller.minFov;
+    },
+    set: function set(fov) {
+      var controller = caches[this.uuid];
+      if (!controller) throw new Error(ERROR_NO_CONTROLLER);
+      controller.config.minFov = fov;
+      controller.update({});
+    }
+  }, {
+    key: "maxFov",
+    get: function get() {
+      var controller = caches[this.uuid];
+      if (!controller) throw new Error(ERROR_NO_CONTROLLER);
+      return controller.maxFov;
+    }
     /**
      *
      * @param url glTF 模型CDN地址
      * @param options adaptive 是否开启自适应fov
      */
-
+    ,
+    set: function set(fov) {
+      var controller = caches[this.uuid];
+      if (!controller) throw new Error(ERROR_NO_CONTROLLER);
+      controller.config.maxFov = fov;
+      controller.update({});
+    }
   }, {
     key: "load",
     value: function load(url) {
-      var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
-        adaptive: true
-      };
       var controller = caches[this.uuid];
       if (!controller) throw new Error(ERROR_NO_CONTROLLER);
       controller.load(url);
@@ -737,6 +743,19 @@ var GLTFViewer = /*#__PURE__*/function (_Subscribe) {
       if (controller.dispose) controller.dispose();
       delete caches[this.uuid];
     }
+    /**
+     * 响应式fov
+     */
+
+  }, {
+    key: "fitFov",
+    value: function fitFov() {
+      var controller = caches[this.uuid];
+      if (!controller) throw new Error(ERROR_NO_CONTROLLER);
+      controller.update({
+        fov: 0
+      });
+    }
   }]);
   return GLTFViewer;
 }(_Subscribe2.Subscribe);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/dnalogel",
-  "version": "0.1.7-alpha.4",
+  "version": "0.1.7-alpha.8",
   "description": "如视前端 Components、Plugins 兼部分 SDKs \"Dnalogel\" 库。",
   "author": "BEIKE REALSEE TECHNOLOGY (HK) LIMITED",
   "peerDependencies": {

package/plugins/CSS3DRenderPlugin/index.js

@@ -47,6 +47,8 @@ var _centerPoint = _interopRequireDefault(require("../../shared-utils/three/cent
 
 var _transformPositionToVector = _interopRequireDefault(require("../../shared-utils/three/transformPositionToVector3"));
 
+var _createResizeObserver = _interopRequireDefault(require("./utils/createResizeObserver"));
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -125,13 +127,19 @@ var CSS3DRenderPlugin = function CSS3DRenderPlugin(five) {
     var render = function () {
       if (!inited) {
         var css3DRendererSetSize = function css3DRendererSetSize() {
-          var rendererWidth = (0, _evenNumber["default"])(fiveElement.clientWidth);
-          var rendererHeight = (0, _evenNumber["default"])(fiveElement.clientHeight);
+          // 这里evenNumber策略是遇到奇数会加1，不知道为啥会触发滚动条显示，导致fiveElement变小，fiveElement变小又触发了这里的resize，宽高变小，滚动条消失，然后又触发resize。。。无限循环
+          // 为了规避上面这种情况，evenNumber设置了一个参数，遇到奇数可选择减一
+          var rendererWidth = (0, _evenNumber["default"])(fiveElement.clientWidth, {
+            smaller: true
+          });
+          var rendererHeight = (0, _evenNumber["default"])(fiveElement.clientHeight, {
+            smaller: true
+          });
           css3DRenderer.setSize(rendererWidth, rendererHeight);
         };
 
         css3DRendererSetSize();
-        resizeObserver = new ResizeObserver(css3DRendererSetSize);
+        resizeObserver = (0, _createResizeObserver["default"])(css3DRendererSetSize, fiveElement);
         css3DRenderer.domElement.style.position = 'absolute';
         css3DRenderer.domElement.style.top = '0';
         css3DRenderer.domElement.style.userSelect = 'none';
@@ -144,10 +152,10 @@ var CSS3DRenderPlugin = function CSS3DRenderPlugin(five) {
         };
 
         return function () {
-          var _resizeObserver;
+          var _resizeObserver, _resizeObserver$obser;
 
           scene.add(css3DObject);
-          (_resizeObserver = resizeObserver) === null || _resizeObserver === void 0 ? void 0 : _resizeObserver.observe(fiveElement);
+          (_resizeObserver = resizeObserver) === null || _resizeObserver === void 0 ? void 0 : (_resizeObserver$obser = _resizeObserver.observe) === null || _resizeObserver$obser === void 0 ? void 0 : _resizeObserver$obser.call(_resizeObserver);
           renderEveryFrame();
 
           if (mode === 'behind' && mesh) {
@@ -190,9 +198,9 @@ var CSS3DRenderPlugin = function CSS3DRenderPlugin(five) {
         if (mode === 'behind') state.behindMode = undefined;
 
         if (!state.behindMode && !state.frontMode) {
-          var _resizeObserver2;
+          var _resizeObserver2, _resizeObserver2$unob;
 
-          (_resizeObserver2 = resizeObserver) === null || _resizeObserver2 === void 0 ? void 0 : _resizeObserver2.unobserve(fiveElement);
+          (_resizeObserver2 = resizeObserver) === null || _resizeObserver2 === void 0 ? void 0 : (_resizeObserver2$unob = _resizeObserver2.unobserve) === null || _resizeObserver2$unob === void 0 ? void 0 : _resizeObserver2$unob.call(_resizeObserver2);
         }
       }
 
@@ -209,9 +217,6 @@ var CSS3DRenderPlugin = function CSS3DRenderPlugin(five) {
       state.disposeCallbacks.push(dispose);
     }
 
-    console.log({
-      autoRender: autoRender
-    });
     if (autoRender) render();
     return {
       container: container,

package/plugins/CSS3DRenderPlugin/utils/createResizeObserver.d.ts

@@ -0,0 +1,7 @@
+/**
+ * @description: 究极简陋的 ResizeObserver polyfill
+ */
+export default function createResizeObserver(func: () => any, element?: HTMLElement): {
+    observe: () => void;
+    unobserve: () => void;
+};

package/plugins/CSS3DRenderPlugin/utils/createResizeObserver.js

@@ -0,0 +1,34 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = createResizeObserver;
+
+/**
+ * @description: 究极简陋的 ResizeObserver polyfill
+ */
+function createResizeObserver(func, element) {
+  if (!element || typeof ResizeObserver === 'undefined') {
+    return {
+      observe: function observe() {
+        return window.addEventListener('resize', func);
+      },
+      unobserve: function unobserve() {
+        return window.removeEventListener('resize', func);
+      }
+    };
+  } else {
+    var observer = new ResizeObserver(func);
+    return {
+      observe: function observe() {
+        return observer.observe(element);
+      },
+      unobserve: function unobserve() {
+        return observer.unobserve(element);
+      }
+    };
+  }
+}

package/plugins/ModelChassisCompassPlugin/index.d.ts

@@ -15,5 +15,5 @@ export interface ModelChassisCompassPluginExportType {
 /**
  * 模型底盘指南针插件
  */
-declare const ModelChassisCompassPlugin: FivePlugin<ModelChassisCompassPluginParameterType, ModelChassisCompassPluginExportType>;
+export declare const ModelChassisCompassPlugin: FivePlugin<ModelChassisCompassPluginParameterType, ModelChassisCompassPluginExportType>;
 export default ModelChassisCompassPlugin;

package/plugins/ModelChassisCompassPlugin/index.js

@@ -21,7 +21,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
+exports["default"] = exports.ModelChassisCompassPlugin = void 0;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
@@ -153,5 +153,6 @@ var ModelChassisCompassPlugin = function ModelChassisCompassPlugin(five, params)
   };
 };
 
+exports.ModelChassisCompassPlugin = ModelChassisCompassPlugin;
 var _default = ModelChassisCompassPlugin;
 exports["default"] = _default;

package/plugins/floorplan/Assets/floorplanExtraObject.d.ts

@@ -1 +1 @@
-export declare const FLOORPLANE_EXTRA_OBJECT_IMAGE = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAC0AAAAwCAYAAACFUvPfAAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAALaADAAQAAAABAAAAMAAAAADe2FZjAAAEF0lEQVRoBe2WzWskRRiHf13V092TxI2oEzYeVDwITtyDuCiihwiCePGgxIM3vYgHL4J4UIhBRA8i/gPqyUvWg7AiIuIeloDiYUHJLOK6BPwIk9nNODM9Xf1RVe1b3elJRjCZmQ6euqGmuqer33rq4e23GqiOykBloDJQGagMVAYqA5WBykBlYFYD1qwP/tdzaZqOx9zYOLxeX0+L5yzLGp0X/03a25MOnGRcBtx+6Rlo9SL08G4EooFnxa8Yiivox5/h5Ys/4cl7NVorNDRnngX+0MIkVMeMSf23zyKML8J7/Dy8hwF2Buh9CnS+AEQIdLspBuGb+M7/qLW4qJrNpsLapjYhpwVnx3BMfCtNNx3Etc9xywvnMf80wG8HmQainw0RxSGrnmeBp+8k5/j9S0HbvXb5io0Lz880/0wPHV1NlhLd316He+4xOCv5ragF7L9PrH1qBJyB0626x/lC+qrSvH5r/W+n1WpxUM5nMY4GPeH8lHJaPgfeAFQHCL+ntkXT+vnUc3W6pvTIwC0wy3rA4dwLmK2avZ7Eo9uKBuYJfgJscbs8dLCxDMt+EOEPBEZNEWyBYHqTz6bPXrzUnNrSShxHIsYiOL69zrCGLLcLqJP68tB+9w5wj+YhWDafQ2s61wNqxjZhmrQ2pvMFCEvXuCUZ7wqH794ZWs28LJqlTXSUyuksF2M/yOwqgkx2c1ADa4wLAQRk2sAGQQakhN6yFC2hltfz5kSY44NKQeeh+vtI/SSzWhg2CzCgmWISmKUGmaYFBDfCSymnfxJ6/+ospVcWOLLp5DGP/y0P/Rp66O99DQNq7Po3Ds0a0wY+My2QSv2N2mO/OyxR2o6UQk+Lv7yJ06JYSnnolZVU9cUn2O9SmaMWGFBqYXRwbqAJWIi94TX5biotpcGl1DXZ6LnqIbNDTnmUgi52Mv5l5ysMxIcZcGjy2DTK4ZHlcBC14zeSge4qphICjj3bS0A7o9nSp2TOkm7aZ8bGZy/jxhO87V91G0+dfY/Z7BWIIK9KYUi5qy/Hf8YfBG3sqJTHiQWhmTVkbip+wX3x6volVSx+LPAxF+VLXhZ8VQ+iP2Rta/iWe5v42Fngj0BbdnRTXh12ZIcKhTaGbcYjybRwXBU1lu9KlndXp04NM52poKWO0RZsviNaP9a6grkO972+st05pXhE5c1hTEluJy7XUejGUQNLMbAmTdWY1rKBLW3aTJqBZ7nZkb36DhYCreeYHbMUXHvaYi5XDK70EcgulmRjm77wNtenzuXCbmnTRaAx493rbGf3Jr/njMzj920CnKdUaFCjlDioy7NYNvOdGrQJNgI32/L2tkXfFPlxgToqjWVhD6KdLnQRdARf/HHQz2r2X2Gqy8pAZaAyUBmoDFQGKgP/q4F/AJYg9/s0ZoABAAAAAElFTkSuQmCC";
+export declare const FLOORPLAN_EXTRA_OBJECT_IMAGE = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAC0AAAAwCAYAAACFUvPfAAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAALaADAAQAAAABAAAAMAAAAADe2FZjAAAEF0lEQVRoBe2WzWskRRiHf13V092TxI2oEzYeVDwITtyDuCiihwiCePGgxIM3vYgHL4J4UIhBRA8i/gPqyUvWg7AiIuIeloDiYUHJLOK6BPwIk9nNODM9Xf1RVe1b3elJRjCZmQ6euqGmuqer33rq4e23GqiOykBloDJQGagMVAYqA5WBykBlYFYD1qwP/tdzaZqOx9zYOLxeX0+L5yzLGp0X/03a25MOnGRcBtx+6Rlo9SL08G4EooFnxa8Yiivox5/h5Ys/4cl7NVorNDRnngX+0MIkVMeMSf23zyKML8J7/Dy8hwF2Buh9CnS+AEQIdLspBuGb+M7/qLW4qJrNpsLapjYhpwVnx3BMfCtNNx3Etc9xywvnMf80wG8HmQainw0RxSGrnmeBp+8k5/j9S0HbvXb5io0Lz880/0wPHV1NlhLd316He+4xOCv5ragF7L9PrH1qBJyB0626x/lC+qrSvH5r/W+n1WpxUM5nMY4GPeH8lHJaPgfeAFQHCL+ntkXT+vnUc3W6pvTIwC0wy3rA4dwLmK2avZ7Eo9uKBuYJfgJscbs8dLCxDMt+EOEPBEZNEWyBYHqTz6bPXrzUnNrSShxHIsYiOL69zrCGLLcLqJP68tB+9w5wj+YhWDafQ2s61wNqxjZhmrQ2pvMFCEvXuCUZ7wqH794ZWs28LJqlTXSUyuksF2M/yOwqgkx2c1ADa4wLAQRk2sAGQQakhN6yFC2hltfz5kSY44NKQeeh+vtI/SSzWhg2CzCgmWISmKUGmaYFBDfCSymnfxJ6/+ospVcWOLLp5DGP/y0P/Rp66O99DQNq7Po3Ds0a0wY+My2QSv2N2mO/OyxR2o6UQk+Lv7yJ06JYSnnolZVU9cUn2O9SmaMWGFBqYXRwbqAJWIi94TX5biotpcGl1DXZ6LnqIbNDTnmUgi52Mv5l5ysMxIcZcGjy2DTK4ZHlcBC14zeSge4qphICjj3bS0A7o9nSp2TOkm7aZ8bGZy/jxhO87V91G0+dfY/Z7BWIIK9KYUi5qy/Hf8YfBG3sqJTHiQWhmTVkbip+wX3x6volVSx+LPAxF+VLXhZ8VQ+iP2Rta/iWe5v42Fngj0BbdnRTXh12ZIcKhTaGbcYjybRwXBU1lu9KlndXp04NM52poKWO0RZsviNaP9a6grkO972+st05pXhE5c1hTEluJy7XUejGUQNLMbAmTdWY1rKBLW3aTJqBZ7nZkb36DhYCreeYHbMUXHvaYi5XDK70EcgulmRjm77wNtenzuXCbmnTRaAx493rbGf3Jr/njMzj920CnKdUaFCjlDioy7NYNvOdGrQJNgI32/L2tkXfFPlxgToqjWVhD6KdLnQRdARf/HHQz2r2X2Gqy8pAZaAyUBmoDFQGKgP/q4F/AJYg9/s0ZoABAAAAAElFTkSuQmCC";

package/plugins/floorplan/Assets/floorplanExtraObject.js

@@ -5,6 +5,6 @@ require("core-js/modules/es.object.define-property.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.FLOORPLANE_EXTRA_OBJECT_IMAGE = void 0;
-var FLOORPLANE_EXTRA_OBJECT_IMAGE = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAC0AAAAwCAYAAACFUvPfAAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAALaADAAQAAAABAAAAMAAAAADe2FZjAAAEF0lEQVRoBe2WzWskRRiHf13V092TxI2oEzYeVDwITtyDuCiihwiCePGgxIM3vYgHL4J4UIhBRA8i/gPqyUvWg7AiIuIeloDiYUHJLOK6BPwIk9nNODM9Xf1RVe1b3elJRjCZmQ6euqGmuqer33rq4e23GqiOykBloDJQGagMVAYqA5WBykBlYFYD1qwP/tdzaZqOx9zYOLxeX0+L5yzLGp0X/03a25MOnGRcBtx+6Rlo9SL08G4EooFnxa8Yiivox5/h5Ys/4cl7NVorNDRnngX+0MIkVMeMSf23zyKML8J7/Dy8hwF2Buh9CnS+AEQIdLspBuGb+M7/qLW4qJrNpsLapjYhpwVnx3BMfCtNNx3Etc9xywvnMf80wG8HmQainw0RxSGrnmeBp+8k5/j9S0HbvXb5io0Lz880/0wPHV1NlhLd316He+4xOCv5ragF7L9PrH1qBJyB0626x/lC+qrSvH5r/W+n1WpxUM5nMY4GPeH8lHJaPgfeAFQHCL+ntkXT+vnUc3W6pvTIwC0wy3rA4dwLmK2avZ7Eo9uKBuYJfgJscbs8dLCxDMt+EOEPBEZNEWyBYHqTz6bPXrzUnNrSShxHIsYiOL69zrCGLLcLqJP68tB+9w5wj+YhWDafQ2s61wNqxjZhmrQ2pvMFCEvXuCUZ7wqH794ZWs28LJqlTXSUyuksF2M/yOwqgkx2c1ADa4wLAQRk2sAGQQakhN6yFC2hltfz5kSY44NKQeeh+vtI/SSzWhg2CzCgmWISmKUGmaYFBDfCSymnfxJ6/+ospVcWOLLp5DGP/y0P/Rp66O99DQNq7Po3Ds0a0wY+My2QSv2N2mO/OyxR2o6UQk+Lv7yJ06JYSnnolZVU9cUn2O9SmaMWGFBqYXRwbqAJWIi94TX5biotpcGl1DXZ6LnqIbNDTnmUgi52Mv5l5ysMxIcZcGjy2DTK4ZHlcBC14zeSge4qphICjj3bS0A7o9nSp2TOkm7aZ8bGZy/jxhO87V91G0+dfY/Z7BWIIK9KYUi5qy/Hf8YfBG3sqJTHiQWhmTVkbip+wX3x6volVSx+LPAxF+VLXhZ8VQ+iP2Rta/iWe5v42Fngj0BbdnRTXh12ZIcKhTaGbcYjybRwXBU1lu9KlndXp04NM52poKWO0RZsviNaP9a6grkO972+st05pXhE5c1hTEluJy7XUejGUQNLMbAmTdWY1rKBLW3aTJqBZ7nZkb36DhYCreeYHbMUXHvaYi5XDK70EcgulmRjm77wNtenzuXCbmnTRaAx493rbGf3Jr/njMzj920CnKdUaFCjlDioy7NYNvOdGrQJNgI32/L2tkXfFPlxgToqjWVhD6KdLnQRdARf/HHQz2r2X2Gqy8pAZaAyUBmoDFQGKgP/q4F/AJYg9/s0ZoABAAAAAElFTkSuQmCC';
-exports.FLOORPLANE_EXTRA_OBJECT_IMAGE = FLOORPLANE_EXTRA_OBJECT_IMAGE;
+exports.FLOORPLAN_EXTRA_OBJECT_IMAGE = void 0;
+var FLOORPLAN_EXTRA_OBJECT_IMAGE = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAC0AAAAwCAYAAACFUvPfAAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAALaADAAQAAAABAAAAMAAAAADe2FZjAAAEF0lEQVRoBe2WzWskRRiHf13V092TxI2oEzYeVDwITtyDuCiihwiCePGgxIM3vYgHL4J4UIhBRA8i/gPqyUvWg7AiIuIeloDiYUHJLOK6BPwIk9nNODM9Xf1RVe1b3elJRjCZmQ6euqGmuqer33rq4e23GqiOykBloDJQGagMVAYqA5WBykBlYFYD1qwP/tdzaZqOx9zYOLxeX0+L5yzLGp0X/03a25MOnGRcBtx+6Rlo9SL08G4EooFnxa8Yiivox5/h5Ys/4cl7NVorNDRnngX+0MIkVMeMSf23zyKML8J7/Dy8hwF2Buh9CnS+AEQIdLspBuGb+M7/qLW4qJrNpsLapjYhpwVnx3BMfCtNNx3Etc9xywvnMf80wG8HmQainw0RxSGrnmeBp+8k5/j9S0HbvXb5io0Lz880/0wPHV1NlhLd316He+4xOCv5ragF7L9PrH1qBJyB0626x/lC+qrSvH5r/W+n1WpxUM5nMY4GPeH8lHJaPgfeAFQHCL+ntkXT+vnUc3W6pvTIwC0wy3rA4dwLmK2avZ7Eo9uKBuYJfgJscbs8dLCxDMt+EOEPBEZNEWyBYHqTz6bPXrzUnNrSShxHIsYiOL69zrCGLLcLqJP68tB+9w5wj+YhWDafQ2s61wNqxjZhmrQ2pvMFCEvXuCUZ7wqH794ZWs28LJqlTXSUyuksF2M/yOwqgkx2c1ADa4wLAQRk2sAGQQakhN6yFC2hltfz5kSY44NKQeeh+vtI/SSzWhg2CzCgmWISmKUGmaYFBDfCSymnfxJ6/+ospVcWOLLp5DGP/y0P/Rp66O99DQNq7Po3Ds0a0wY+My2QSv2N2mO/OyxR2o6UQk+Lv7yJ06JYSnnolZVU9cUn2O9SmaMWGFBqYXRwbqAJWIi94TX5biotpcGl1DXZ6LnqIbNDTnmUgi52Mv5l5ysMxIcZcGjy2DTK4ZHlcBC14zeSge4qphICjj3bS0A7o9nSp2TOkm7aZ8bGZy/jxhO87V91G0+dfY/Z7BWIIK9KYUi5qy/Hf8YfBG3sqJTHiQWhmTVkbip+wX3x6volVSx+LPAxF+VLXhZ8VQ+iP2Rta/iWe5v42Fngj0BbdnRTXh12ZIcKhTaGbcYjybRwXBU1lu9KlndXp04NM52poKWO0RZsviNaP9a6grkO972+st05pXhE5c1hTEluJy7XUejGUQNLMbAmTdWY1rKBLW3aTJqBZ7nZkb36DhYCreeYHbMUXHvaYi5XDK70EcgulmRjm77wNtenzuXCbmnTRaAx493rbGf3Jr/njMzj920CnKdUaFCjlDioy7NYNvOdGrQJNgI32/L2tkXfFPlxgToqjWVhD6KdLnQRdARf/HHQz2r2X2Gqy8pAZaAyUBmoDFQGKgP/q4F/AJYg9/s0ZoABAAAAAElFTkSuQmCC';
+exports.FLOORPLAN_EXTRA_OBJECT_IMAGE = FLOORPLAN_EXTRA_OBJECT_IMAGE;

package/plugins/floorplan/ModelFloorplanPlugin/Controller.js

@@ -620,8 +620,8 @@ var ModelFloorplanPluginController = /*#__PURE__*/function () {
         floorplanData: this.floorplanData,
         onRoomHeightClick: this.handleClick,
         cameraImage: cameraImage,
-        hoverEnable: hoverEnable !== null && hoverEnable !== void 0 ? hoverEnable : true,
         getLabelElement: getLabelElement,
+        hoverEnable: hoverEnable !== null && hoverEnable !== void 0 ? hoverEnable : false,
         roomLabelsEnable: roomLabelsEnable !== null && roomLabelsEnable !== void 0 ? roomLabelsEnable : true,
         compassEnable: compassEnable !== null && compassEnable !== void 0 ? compassEnable : true,
         ruleLabelsEnable: ruleLabelsEnable !== null && ruleLabelsEnable !== void 0 ? ruleLabelsEnable : true,

package/plugins/floorplan/ModelFloorplanPlugin/components/NowFloor/RuleLabels.js

@@ -96,7 +96,7 @@ function RulesItem(props) {
     if (isTop) return "translate(".concat(translateMain, "px, ").concat(-translateSecond, "px)");
     if (isBottom) return "translate(".concat(translateMain, "px, ").concat(translateSecond, "px)");
     if (isLeft) return "translate(".concat(-translateSecond, "px, ").concat(-translateMain, "px)");
-    if (isRight) return "translate(".concat(translateSecond, "px, ").concat(translateMain, "px)");
+    if (isRight) return "translate(".concat(translateSecond, "px, ").concat(-translateMain - lengthPx, "px)");
   }(); // 把点位的户型图坐标转成距离起始位置的像素值
 
 
@@ -116,8 +116,7 @@ function RulesItem(props) {
     transform: "".concat(transform, " ").concat(isRow ? '' : 'rotate(-90deg)'),
     transformOrigin: "".concat(isRight ? 'right top' : '').concat(isLeft ? 'left bottom' : ''),
     left: isRow ? 0 : undefined,
-    top: isRight ? 0 : undefined,
-    bottom: isLeft ? 0 : undefined
+    bottom: !isRow ? 0 : undefined
   }, (0, _defineProperty2["default"])(_rulesStyle, type, 0), (0, _defineProperty2["default"])(_rulesStyle, "width", lengthPx + 'px'), (0, _defineProperty2["default"])(_rulesStyle, "height", (0, _px2rem["default"])(5)), (0, _defineProperty2["default"])(_rulesStyle, "display", 'flex'), (0, _defineProperty2["default"])(_rulesStyle, "alignItems", 'center'), _rulesStyle);
   var ruleLineStyle = {
     background: '#fff',

package/plugins/floorplan/PanoFloorplanRadarPlugin/Controller.d.ts

@@ -19,7 +19,7 @@ export default class PanoFloorplanRadarPluginController {
     private wrapper;
     private size;
     private extraObjects?;
-    private orginExtraObjects?;
+    private originExtraObjects?;
     private configs;
     constructor(five: Five, params?: PanoFloorplanRadarPluginControllerParameter);
     dispose: () => void;

package/plugins/floorplan/PanoFloorplanRadarPlugin/Controller.js

@@ -153,7 +153,7 @@ var PanoFloorplanRadarPluginController = /*#__PURE__*/function () {
   }, {
     key: "setExtraObjectsWith3DPositions",
     value: function setExtraObjectsWith3DPositions(data) {
-      this.orginExtraObjects = data;
+      this.originExtraObjects = data;
       if (!this.data) return;
       this.extraObjects = (0, _formatData.formatExtraObjects)(data, this.five, this.data);
       this.render();
@@ -188,8 +188,8 @@ var PanoFloorplanRadarPluginController = /*#__PURE__*/function () {
     value: function render() {
       if (!this.data || !this.pxmm || !this.wrapper) return;
 
-      if (!this.extraObjects && this.orginExtraObjects) {
-        this.extraObjects = (0, _formatData.formatExtraObjects)(this.orginExtraObjects, this.five, this.data);
+      if (!this.extraObjects && this.originExtraObjects) {
+        this.extraObjects = (0, _formatData.formatExtraObjects)(this.originExtraObjects, this.five, this.data);
       }
 
       var props = {

package/plugins/floorplan/TopviewFloorplanPlugin/Controller.d.ts

@@ -7,6 +7,9 @@ export interface TopviewFloorplanPluginParameterType {
     scale?: number;
     hoverEnable?: boolean;
     autoShowEnable?: boolean;
+    compassEnable?: boolean;
+    ruleLabelsEnable?: boolean;
+    roomLabelsEnable?: boolean;
     cameraImage?: {
         style: React.CSSProperties;
     };

package/plugins/floorplan/TopviewFloorplanPlugin/Controller.js

@@ -238,6 +238,13 @@ var TopviewFloorplanPluginController = /*#__PURE__*/function () {
     value: function render(duration) {
       if (!this.container) return;
       if (this.size.width === 0) return;
+      var _this$configs = this.configs,
+          cameraImage = _this$configs.cameraImage,
+          hoverEnable = _this$configs.hoverEnable,
+          getLabelElement = _this$configs.getLabelElement,
+          roomLabelsEnable = _this$configs.roomLabelsEnable,
+          compassEnable = _this$configs.compassEnable,
+          ruleLabelsEnable = _this$configs.ruleLabelsEnable;
       var props = {
         five: this.five,
         pxmm: this.pxmm,
@@ -247,9 +254,12 @@ var TopviewFloorplanPluginController = /*#__PURE__*/function () {
         floorIndex: this.floorIndex,
         floorplanData: this.floorplanData,
         onRoomHeightClick: this.handleClick,
-        cameraImage: this.configs.cameraImage,
-        hoverEnable: this.configs.hoverEnable,
-        getLabelElement: this.configs.getLabelElement,
+        cameraImage: cameraImage,
+        hoverEnable: hoverEnable !== null && hoverEnable !== void 0 ? hoverEnable : false,
+        roomLabelsEnable: roomLabelsEnable !== null && roomLabelsEnable !== void 0 ? roomLabelsEnable : true,
+        compassEnable: compassEnable !== null && compassEnable !== void 0 ? compassEnable : true,
+        ruleLabelsEnable: ruleLabelsEnable !== null && ruleLabelsEnable !== void 0 ? ruleLabelsEnable : true,
+        getLabelElement: getLabelElement,
         lastPanoramaLongitude: this.lastPanoramaLongitude
       };
 

package/plugins/floorplan/typings/floorplanServerData.d.ts

@@ -1,5 +1,5 @@
 /** 房屋数据映射表 */
-export declare const ROOM_DETILE_TYPE_MAP: ({
+export declare const ROOM_FETILE_TYPE_MAP: ({
     type: number;
     floorType: number;
     roomType: string;

package/plugins/floorplan/typings/floorplanServerData.js

@@ -5,10 +5,10 @@ require("core-js/modules/es.object.define-property.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ROOM_TYPE_MAP = exports.ROOM_DETILE_TYPE_MAP = exports.FLOOR_TYPE_MAP = void 0;
+exports.ROOM_TYPE_MAP = exports.ROOM_FETILE_TYPE_MAP = exports.FLOOR_TYPE_MAP = void 0;
 
 /** 房屋数据映射表 */
-var ROOM_DETILE_TYPE_MAP = [{
+var ROOM_FETILE_TYPE_MAP = [{
   type: 0,
   floorType: 1,
   roomType: '100900000012',
@@ -308,7 +308,7 @@ var ROOM_DETILE_TYPE_MAP = [{
 }];
 /** 地板信息映射表 */
 
-exports.ROOM_DETILE_TYPE_MAP = ROOM_DETILE_TYPE_MAP;
+exports.ROOM_FETILE_TYPE_MAP = ROOM_FETILE_TYPE_MAP;
 var FLOOR_TYPE_MAP = [{
   type: 0,
   description: '木质地板'

package/plugins/floorplan/utils/formatData.js

@@ -199,7 +199,7 @@ function formatExtraObjects(data, five, floorplanData) {
   var extraObjects = data.map(function (object) {
     var position = object.position;
     var icon = object.icon ? object.icon : {
-      url: _floorplanExtraObject.FLOORPLANE_EXTRA_OBJECT_IMAGE,
+      url: _floorplanExtraObject.FLOORPLAN_EXTRA_OBJECT_IMAGE,
       width: 45,
       height: 48
     };

package/shared-utils/math/evenNumber.d.ts

@@ -1 +1,3 @@
-export default function evenNumber(num: number): number;
+export default function evenNumber(num: number, config?: {
+    smaller?: boolean;
+}): number;

package/shared-utils/math/evenNumber.js

@@ -7,7 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = evenNumber;
 
-function evenNumber(num) {
+require("core-js/modules/es.number.constructor.js");
+
+function evenNumber(num, config) {
   var roundNum = Math.round(num);
-  return roundNum % 2 === 0 ? roundNum : roundNum + 1;
+  return roundNum % 2 === 0 ? roundNum : roundNum + Number(config !== null && config !== void 0 && config.smaller ? -1 : 1);
 }