gs-bim-air 3.0.3 → 3.0.5

package/src/viewerWrapper/components/leftToolbar/toolbar.vue

@@ -1,124 +0,0 @@
-<template>
-  <div class="left-toolbar">
-    <div class="btns" :style="{ maxHeight: toolbarMaxHeight }" v-show="isExpand">
-      <div v-for="(btn, index) in btns" :key="index" :class="{ 'btn-wrapper': true, active: checkActive(btn) }">
-        <div v-if="!btn.key || (btn.key && toolbarVisible[btn.key])" class="btn" @click="btnClick(btn)">
-          <gs-icon :svgName="checkActive(btn) ? btn.activeIcon : btn.icon" size="24px"></gs-icon>
-          <div class="text">{{ btn.title }}</div>
-          <i
-            v-show="btn.children && btn.children.length > 0"
-            :class="`el-icon-arrow-${currentExpand == btn.title ? 'up' : 'down'}`"
-            :title="currentExpand == btn.title ? '收起子级按钮' : '展开子级按钮'"
-            @click.stop="toggleExpand(btn)"></i>
-        </div>
-        <el-collapse-transition>
-          <div v-show="btn.children && btn.children.length > 0 && currentExpand == btn.title" class="children-wrapper">
-            <div v-for="(child, index) in btn.children" :key="index">
-              <div
-                v-if="!child.key || (child.key && toolbarVisible[child.key])"
-                class="child-btn"
-                @click="btnClick(child)">
-                <gs-icon :svgName="checkActive(child) ? child.activeIcon : child.icon" size="24px"></gs-icon>
-                <div class="text">{{ child.title }}</div>
-              </div>
-            </div>
-          </div>
-        </el-collapse-transition>
-      </div>
-    </div>
-    <div class="drop-btn" v-if="isExpand" :title="isExpand ? '收起' : '展开'" @click="isExpand = !isExpand">
-      <i class="GSBimAir icon-shouhui"></i>
-    </div>
-    <div class="expand-btn" v-else :title="isExpand ? '收起' : '展开'" @click="isExpand = !isExpand">
-      <i class="GSBimAir icon-shouhui"></i>
-    </div>
-  </div>
-</template>
-
-<script lang="ts" src="./toolbar.ts"></script>
-
-<style lang="scss" scoped>
-@import "../../../assets/scss/site";
-
-.left-toolbar {
-  position: absolute;
-  left: 10px;
-  top: 10px;
-  z-index: 1000;
-  border-radius: 10px;
-  overflow: hidden;
-  .btns {
-    overflow: auto;
-    // 不显示滚动条
-    &::-webkit-scrollbar {
-      display: none;
-    }
-    .btn-wrapper {
-      .btn {
-        display: flex;
-        align-items: center;
-        flex-direction: column;
-        min-width: 60px;
-        padding: 8px 0;
-        color: #a9abae;
-        font-size: 12px;
-        cursor: pointer;
-        .text {
-          margin-top: 4px;
-        }
-        i {
-          color: #fff;
-          &:hover {
-            color: #62ceff;
-          }
-        }
-      }
-      .children-wrapper {
-        background: #393b3d;
-        .child-btn {
-          display: flex;
-          align-items: center;
-          flex-direction: column;
-          min-width: 60px;
-          padding: 8px 0;
-          color: #a9abae;
-          font-size: 12px;
-          cursor: pointer;
-          .text {
-            margin-top: 4px;
-          }
-        }
-      }
-
-      &.active {
-        .btn {
-          background: rgba(255, 255, 255, 0.15);
-          color: #ffffff;
-        }
-      }
-    }
-  }
-
-  .drop-btn {
-    background: #252728;
-    cursor: pointer;
-    color: #fff;
-    padding: 2px 0;
-    i {
-      font-size: 12px;
-    }
-  }
-  .expand-btn {
-    width: 60px;
-    background: #252728;
-    cursor: pointer;
-    color: #fff;
-    padding: 2px 0;
-    border-radius: 10px;
-    transform: rotate(180deg);
-    i {
-      font-size: 12px;
-    }
-  }
-}
-</style>

package/src/viewerWrapper/components/rightToolbar/toolbar.ts

@@ -1,210 +0,0 @@
-import * as Longan from "gs-longan";
-import * as LonganViewer from "gs-longan";
-import { LButtonState } from "gs-longan";
-import { Component, Inject, Vue } from "vue-property-decorator";
-
-import store from "../../../store";
-import { TouchOpertionType } from "gs-longan";
-import GsButtonGroup from "../../../components/gs/gsButtonGroup/gs-button-group.vue";
-import GsButtonIcon from "../../../components/gs/gsButtonIcon/gs-button-icon.vue";
-import { ComponentSelector } from "gs-bim-air-core/gsDevFx/operators/componentSelector";
-import { Viewer } from "gs-bim-air-core/gsDevFx/viewer";
-import { fullScreenToggle, isFullscreen } from "../../../utils/documentUtility";
-import { CameraMouse } from "gs-bim-air-core/gsDevFx/operators/cameraMouse";
-
-@Component({
-  components: {
-    GsButtonIcon,
-    GsButtonGroup,
-  },
-})
-export default class RightToolbar extends Vue {
-  @Inject() getViewer;
-  isSecondToolbarShow = false;
-  dialogVisible = false;
-  lButtonSate = LButtonState.select;
-  isFullScreen = false;
-  store = store;
-
-  get viewer(): Viewer {
-    return this.getViewer();
-  }
-
-  // iconSrc(index) {
-  //   return require(`@/assets/images/modelEdit/矢量智能对象@2x(${index}).png`);
-  // }
-
-  fullScreenClick() {
-    fullScreenToggle();
-    this.isFullScreen = !isFullscreen();
-  }
-
-  showStructureTreeClick() {
-    // CommandShowStructureTree.instance.toggle()
-  }
-
-  showSecondToolbar() {
-    this.isSecondToolbarShow = !this.isSecondToolbarShow;
-  }
-
-  setViewModel(tag) {
-    let viewer = this.viewer;
-    switch (tag) {
-      case "fit_world":
-        viewer.fitWorld();
-        break;
-      case "front":
-        viewer.setViewMode(Longan.ViewMode.YZ);
-        break;
-      case "back":
-        viewer.setViewMode(Longan.ViewMode.ZY);
-        break;
-      case "left":
-        viewer.setViewMode(Longan.ViewMode.XZ);
-        break;
-      case "right":
-        viewer.setViewMode(Longan.ViewMode.ZX);
-        break;
-      case "up":
-        viewer.setViewMode(Longan.ViewMode.XY);
-        break;
-      case "down":
-        viewer.setViewMode(Longan.ViewMode.YX);
-        break;
-      case "iso":
-        viewer.setViewMode(Longan.ViewMode.Iso);
-        break;
-    }
-    viewer.updateDisplay();
-  }
-
-  setCameraMouseModelClick(model) {
-    // this.viewer.options.events.lButtonState = model;
-    let viewer = this.viewer;
-    let currentCommand = viewer.process.commandManager.currentCommand;
-    if (currentCommand.typeName !== "CommandSelect") {
-      if (model === 0) {
-        this.lButtonSate = LButtonState.select;
-      } else if (model === 1) {
-        this.lButtonSate = LButtonState.rotation;
-      } else if (model === 2) {
-        this.lButtonSate = LButtonState.translation;
-      } else if (model === 3) {
-        this.lButtonSate = LButtonState.scale;
-      }
-
-      this.saveLButtonState();
-      return;
-    }
-
-    let cameraMouse: CameraMouse = null;
-    viewer.operatorManager.operatorList.items.forEach((operator) => {
-      if (operator instanceof CameraMouse) {
-        cameraMouse = operator;
-      }
-    });
-
-    // let cameraMouse: Longan.CameraMouse =
-    //   viewer.operatorManager.find("CameraMouse");
-
-    let cameraTouch: Longan.CameraTouch = viewer.operatorManager.find("CameraTouch");
-
-    let componentSelector = this.viewer.operatorManager.find("ComponentSelector") as ComponentSelector;
-    if (!componentSelector) {
-      componentSelector = new ComponentSelector();
-      viewer.operatorManager.add(componentSelector);
-    }
-
-    if (model == 0) {
-      if (this.lButtonSate == LButtonState.select) {
-        return;
-      }
-      if (cameraMouse) {
-        cameraMouse.lButtonSate = LButtonState.select;
-      }
-      if (cameraTouch) {
-        cameraTouch.operationType = TouchOpertionType.Pan;
-      }
-      this.lButtonSate = LButtonState.select;
-
-      let segmentObject = viewer.selectionManager.selectedObject;
-      if (segmentObject) {
-        // let properties = viewer.propertyManager.getProperty(segmentObject);
-        // if (properties) {
-        //   store.commit("propertiesChange", properties);
-        // }
-      }
-    } else if (model == 1) {
-      if (this.lButtonSate == LButtonState.rotation) {
-        return;
-      }
-
-      // viewer.selectionManager.clearAllSelectionAndHighlight();
-
-      if (cameraMouse) {
-        cameraMouse.lButtonSate = LButtonState.rotation;
-      }
-      if (cameraTouch) {
-        cameraTouch.operationType = TouchOpertionType.Rotate;
-      }
-      this.lButtonSate = LButtonState.rotation;
-    } else if (model == 2) {
-      if (this.lButtonSate == LButtonState.translation) {
-        return;
-      }
-
-      if (cameraMouse) {
-        cameraMouse.lButtonSate = LButtonState.translation;
-      }
-      if (cameraTouch) {
-        cameraTouch.operationType = TouchOpertionType.Pan;
-      }
-
-      this.lButtonSate = LButtonState.translation;
-    } else if (model == 3) {
-      if (this.lButtonSate == LButtonState.scale) {
-        return;
-      }
-
-      if (cameraMouse) {
-        cameraMouse.lButtonSate = LButtonState.scale;
-      }
-      this.lButtonSate = LButtonState.scale;
-    }
-
-    this.saveLButtonState();
-  }
-
-  findModelId(segment: Longan.Segment) {
-    if (segment.property.list.items["modelId"]) {
-      // console.log("segment.property.list.items", segment.property.list.items)
-      return segment.property.list.items["modelId"];
-    } else if (segment.owner) {
-      return this.findModelId(segment.owner);
-    } else {
-      return null;
-    }
-  }
-
-  dataURLtoFile(dataurl, filename) {
-    let arr = dataurl.split(",");
-    let mime = arr[0].match(/:(.*?);/)[1];
-    let bstr = atob(arr[1]);
-    let n = bstr.length;
-    let u8arr = new Uint8Array(n);
-    while (n--) {
-      u8arr[n] = bstr.charCodeAt(n);
-    }
-    return new File([u8arr], filename, { type: mime });
-  }
-
-  saveLButtonState() {
-    // store.commit("operator/setLButtonState", this.lButtonSate);
-    this.viewer.options.events.lButtonState = this.lButtonSate;
-  }
-
-  mounted() {
-    // store.commit("operator/setLButtonState", this.lButtonSate);
-    // this.saveLButtonState();
-  }
-}

package/src/viewerWrapper/components/rightToolbar/toolbar.vue

@@ -1,78 +0,0 @@
-<template>
-  <div class="right-toolbar">
-    <div class="first-toolbar-wrapper">
-      <gs-button-icon icon="jvzhong" @click="setViewModel('fit_world')" title="自动居中" />
-      <gs-button-icon icon="quanping" @click="fullScreenClick" :active="isFullScreen" />
-      <!--      <gs-button-icon :src="iconSrc(17)" @click="showStructureTreeClick" />-->
-      <gs-button-icon icon="more" @click="showSecondToolbar" :active="true" />
-
-      <div class="divider"></div>
-      <gs-button-group>
-        <gs-button-icon icon="shubiao" @click="setCameraMouseModelClick(0)" />
-        <gs-button-icon icon="rotate" @click="setCameraMouseModelClick(1)" />
-        <gs-button-icon icon="yidongdao" @click="setCameraMouseModelClick(2)" />
-        <gs-button-icon icon="fangdajing" @click="setCameraMouseModelClick(3)" />
-      </gs-button-group>
-    </div>
-
-    <div class="second-toolbar-wrapper" v-show="isSecondToolbarShow">
-      <gs-button-group>
-        <gs-button-icon icon="front" @click="setViewModel('front')" title="向前" />
-
-        <gs-button-icon icon="back" @click="setViewModel('back')" title="向后" />
-        <gs-button-icon icon="left" @click="setViewModel('left')" title="向左" />
-        <gs-button-icon icon="right" @click="setViewModel('right')" title="向右" />
-        <gs-button-icon icon="up" @click="setViewModel('up')" title="向上" />
-        <gs-button-icon icon="down" @click="setViewModel('down')" title="向下" />
-        <gs-button-icon icon="iso" @click="setViewModel('iso')" title="iso" />
-      </gs-button-group>
-    </div>
-  </div>
-</template>
-
-<script lang="ts" src="./toolbar.ts"></script>
-
-<style lang="scss" scoped>
-@import "../../../assets/scss/site";
-@import "../../../assets/theme/handle.scss";
-.right-toolbar {
-  position: absolute;
-  right: 20px;
-  top: 180px;
-  z-index: 1000;
-}
-
-.first-toolbar-wrapper {
-  width: 47px;
-  background: $gs-primary-background;
-  opacity: 0.95;
-  border-radius: 4px;
-  padding: 10px 0;
-  display: flex;
-  flex-direction: column;
-}
-
-.second-toolbar-wrapper {
-  width: 47px;
-  background: $gs-primary-background;
-  opacity: 0.95;
-  border-radius: 4px;
-  padding: 10px 0;
-
-  position: absolute;
-  right: 50px;
-  top: 50px;
-  z-index: 1000;
-  display: flex;
-  flex-direction: column;
-}
-
-.divider {
-  height: 2px;
-  width: 22px;
-  background: $gs-primary-fontColor;
-  opacity: 0.4;
-  border-radius: 0;
-  margin: 15px auto;
-}
-</style>

package/src/viewerWrapper/module/addModel.ts

@@ -1,55 +0,0 @@
-
-import { Segment, Viewer, ViewMode, ViewModel } from "gs-longan";
-import axios from "../../axiosRequestExport";
-
-export default function addModel(
-  viewModel: ViewModel,
-  viewer: Viewer,
-  path: string
-): Promise<any> {
-  if (viewModel === undefined || viewer === undefined) {
-    return;
-  }
-
-  if (viewModel.process.renderObject) {
-    axios.get(path).then((file) => {
-      console.log(file);
-      // let lightModel = new LightModel();
-
-      // if (file.name.lastIndexOf(".gsl") == file.name.length - 4) {
-      //   lightModel.name = (file.name as string).substring(
-      //     0,
-      //     file.name.length - 4
-      //   );
-      // } else if (file.name.lastIndexOf(".gsl.sz") == file.name.length - 7) {
-      //   lightModel.name = (file.name as string).substring(
-      //     0,
-      //     file.name.length - 7
-      //   );
-      // } else {
-      //   lightModel.name = file.name;
-      // }
-
-      // lightModel.modelFile = file.name;
-
-      // viewModel.process.addRenderObject(
-      //   viewModel.process.renderObject,
-      //   lightModel
-      // );
-
-      // let fileSegment: Segment;
-      // if ((file.name as string).lastIndexOf(".sz") == file.name.length - 3) {
-      //   fileSegment = lightModel.segment.fromStreamWithCompression(data);
-      //   lightModel._modelKey = fileSegment.key;
-      // } else {
-      //   fileSegment = lightModel.segment.fromStream(data);
-      //   lightModel._modelKey = fileSegment.key;
-      // }
-
-      // viewer.fitWorld();
-      // viewer.updateDisplay();
-      // viewer.setViewMode(ViewMode.Iso, true);
-      // viewer.updateDisplay();
-    });
-  }
-}

package/src/viewerWrapper/module/addRotatePointSVG.ts

@@ -1,74 +0,0 @@
-import { SvgDraw } from "../../plugins/svgDraw";
-import { Container } from "@svgdotjs/svg.js";
-import { rotatePoint1, rotatePoint2 } from "../../assets/svgs/rotatePoint";
-import * as Longan from "gs-longan";
-
-import { Viewer } from "gs-bim-air-core/gsDevFx/viewer";
-import { LonganCore } from "gs-longan";
-import { CameraMouse } from "gs-bim-air-core/gsDevFx/operators/cameraMouse";
-
-export default function addRotatePointSVG(viewer: Viewer) {
-  //右键显示的svg中心点
-  let svgDraw = SvgDraw.getInstance(viewer.container.id);
-  // let rotatePointSVG = svgDraw.draw.svg(rotatePoint).width(36).height(36).attr("style", "pointer-events: auto; transform-origin：rotatePoint").hide()
-  let draw = svgDraw.draw as Container;
-
-  let path1 = rotatePoint1;
-  let path2 = rotatePoint2;
-  let pathSvg1 = draw.path(path1).fill("#f99c34");
-  let pathSvg2 = draw.path(path2).fill("#989898");
-  let rotatePointSVG = draw.group().add(pathSvg1).add(pathSvg2).width(30).height(30).hide();
-  CameraMouse.drawRotatePointSVG.add((vector) => {
-    let pixelPos = LonganCore.JS_Compute_Coordinates_By_Key(
-      viewer.sceneKey,
-      "world",
-      new Float32Array(vector.asArray()),
-      "pixels"
-    );
-    rotatePointSVG.show().move(pixelPos[0] - 15, pixelPos[1] - 15);
-  });
-  CameraMouse.clearRotatePointSVG.add(() => {
-    rotatePointSVG.hide();
-  });
-
-  // // 添加svg选框
-  // let startX = null
-  // let startY = null
-  // let rect = null
-
-  // Longan.CameraMouse.lButtonDown.add((cm, e) => {
-  //     startX = (e.uiEvent as MouseEvent).offsetX
-  //     startY = (e.uiEvent as MouseEvent).offsetY
-  // })
-  // Longan.CameraMouse.lButtonDownAndMove.add((cm, e) => {
-  //     let endX = (e.uiEvent as MouseEvent).offsetX
-  //     let endY = (e.uiEvent as MouseEvent).offsetY
-  //     if (rect) {
-  //         rect.remove()
-  //         rect = null
-  //     }
-  //     rect = drawRect(startX, startY, endX, endY, draw)
-  // })
-  // Longan.CameraMouse.lButtonUp.add((cm, e) => {
-  //     if (rect) {
-  //         rect.remove()
-  //         rect = null
-  //     }
-  // })
-  // document.onclick = (e) => {
-  //     // console.log("eeee", e)
-  // }
-  // // Longan.CameraMouse
-}
-
-// function drawRect(x1, y1, x2, y2, draw) {
-//     const X1 = Math.min(x1, x2)
-//     const Y1 = Math.min(y1, y2)
-//     const X2 = Math.max(x1, x2)
-//     const Y2 = Math.max(y1, y2)
-//     let rect = draw.rect(X2 - X1, Y2 - Y1).move(X1, Y1).fill("transparent").stroke({
-//         color: '#E09C0D',
-//         width: 3,
-//     })
-//     return rect
-// }