gs-bim-air 3.0.3 → 3.0.5

package/src/viewerWrapper/commands/showEditLabel/lib/label.ts

@@ -1,56 +0,0 @@
-import * as Longan from "gs-longan";
-import { ObjectPreSelector } from "gs-bim-air-core/gsDevFx/operators/objectPreSelector";
-import { SvgDraw } from "../../../../plugins/svgDraw";
-import { Viewer } from "gs-bim-air-core/gsDevFx/viewer";
-import { GPUPreSelector } from "gs-bim-air-core/gsDevFx/operators/gpuPreSelector";
-import { CameraMouse } from "gs-bim-air-core/gsDevFx/operators/cameraMouse";
-import { LabelObject } from "gs-bim-air-core/gsDevFx/objects/labelObjects/labelObject";
-export default class Label {
-  viewer: Viewer;
-
-  svgDraw: SvgDraw;
-  activeLabelIndex = null;
-
-  constructor(svgDraw, viewer) {
-    this.svgDraw = svgDraw;
-    this.viewer = viewer;
-  }
-
-  begin() {}
-
-  operatorChange() {
-    this.viewer.operatorManager.clear();
-
-    this.viewer.operatorManager.add(new CameraMouse());
-    let gpuPreSelector = new GPUPreSelector();
-    this.viewer.operatorManager.add(gpuPreSelector);
-    // let objectPreSelector = new ObjectPreSelector();
-
-    // this.viewer.operatorManager.add(objectPreSelector);
-    // objectPreSelector.vertexSelection = true;
-    // objectPreSelector.edgeSelection = true;
-    // objectPreSelector.faceSelection = true;
-    // objectPreSelector.highlightVertex = true;
-    // objectPreSelector.highlightEdge = true;
-    // objectPreSelector.highlightFace = true;
-  }
-
-  clearActive() {
-    this.activeLabelIndex = null;
-  }
-
-  clearAll() {}
-
-  deleteActiveLabel() {
-    let labelObjects = this.viewer.labelManager.labelObjects;
-
-    if (labelObjects) {
-      labelObjects.childObjects.forEach((item: LabelObject) => {
-        if (item.active) {
-          item.remove();
-          // labelService.deleteLabel(item.id);
-        }
-      });
-    }
-  }
-}

package/src/viewerWrapper/commands/showEditLabel/lib/leadtext.ts

@@ -1,130 +0,0 @@
-import { LabelObjects } from "gs-bim-air-core/gsDevFx/objects/labelObjects";
-import Label from "./label";
-
-import * as Longan from "gs-longan";
-import { LabelObject } from "gs-bim-air-core/gsDevFx/objects/labelObjects/labelObject";
-import { LeadTextLable, LeadTextObject } from "gs-bim-air-core/gsDevFx/objects/labelObjects/leadTextObject";
-import { LabelObjectSelector } from "gs-bim-air-core/gsDevFx/operators/labelObjectSelector";
-import { CommandShowEditLabel, LabelType } from "../commandShowEditLabel";
-import { ViewerEvent } from "gs-longan";
-import { isPC } from "gs-longan";
-import { labelService } from "../../../../api/labelService";
-import { Message } from "element-ui";
-
-export default class LeadText extends Label {
-  currentPoint;
-
-  labelMessage: string = "";
-  labelObjects: LabelObjects;
-
-  constructor(svgDraw, viewer) {
-    super(svgDraw, viewer);
-
-    this.init();
-  }
-
-  init() {
-    super.begin();
-  }
-
-  addLabelObject(point: number[]) {
-    // let labelObjects = this.viewer.labelManager.labelObjects;
-    // if (!labelObjects) {
-    //   labelObjects = new LabelObjects(this.viewer);
-    //   let viewPointStateObject = this.viewer.process.findRenderObject("ViewPointStateObject");
-    //   this.viewer.process.addRenderObject(viewPointStateObject, labelObjects);
-    // }
-
-    let labelObjects = this.viewer.labelManager.labelObjects;
-
-    let leadTextObject = new LeadTextObject(this.viewer);
-    leadTextObject.position = point;
-    let instance = this.viewer.process.commandManager.currentCommand as CommandShowEditLabel;
-    // let commandShowEditLabel = instance;
-    leadTextObject.labelMessage = instance.commandData.labelMessage;
-    leadTextObject.clickFun = (obj: LeadTextObject) => {
-      let instance = obj.viewer.process.commandManager.currentCommand as CommandShowEditLabel;
-      if (instance.typeName !== "CommandShowEditLabel" && isPC()) {
-        instance = new CommandShowEditLabel();
-        obj.viewer.process.commandManager.execute(instance);
-      }
-
-      instance.commandData.position = obj.position;
-      // commandShowEditLabel.commandData.isLeadTextLabelEditing = true
-      instance.commandData.labelMessage = obj.labelMessage;
-      instance.activeLabelTypeChange(LabelType.LeadText);
-    };
-    // this.viewer.process.addRenderObject(labelObjects, leadTextObject);
-    labelObjects.addChildObject(leadTextObject);
-
-    // 画出最新的角度线
-    labelObjects.clearActive();
-    leadTextObject.active = true;
-    labelObjects.render();
-
-    instance.commandData.position = point;
-    instance.activeLabelTypeChange(LabelType.LeadText);
-    labelService.createLabel(this.viewer.projectSceneManager.currentScene.id, leadTextObject.toJson()).then((data) => {
-      leadTextObject.fromJson(data as LeadTextLable);
-    });
-  }
-
-  // updateLabelText(text) {
-  //     let lightModel = this.viewer.process.renderObject;
-  //     let labelObjects: LabelObjects = null;
-  //     for (let i = 0; i < lightModel.childObjects.length; i++) {
-  //         let ro = lightModel.childObjects[i];
-  //         if (ro.typeName == "LabelObjects") {
-  //             labelObjects = ro as LabelObjects;
-  //             break;
-  //         }
-  //     }
-  //     // labelObjects.leadTextList[this.activeLabelIndex].data = text
-  // }
-
-  operatorChange() {
-    super.operatorChange();
-
-    let labelObjectSelector: LabelObjectSelector = new LabelObjectSelector();
-    this.viewer.operatorManager.add(labelObjectSelector);
-
-    let instance = this.viewer.process.commandManager.currentCommand as CommandShowEditLabel;
-
-    // labelObjectSelector.lButtonDown.add(() => {
-    //   instance.commandData.isSelectPositionTip = false;
-    //   instance.commandData.isLeadTextLabelEditing = true;
-    // });
-
-    labelObjectSelector.addLabelObject.add((point: Float64Array) => {
-      if (!instance.commandData.labelMessage) {
-        Message.warning("请先输入文字");
-        return;
-      }
-      this.addLabelObject(Array.from(point));
-      this.currentPoint = point;
-    });
-
-    labelObjectSelector.windowKeyDown.add((e: ViewerEvent) => {
-      if ((e.uiEvent as any).key === "Delete") {
-        this.deleteActiveLabel();
-        // saveModel()
-        // this.activeLabelIndex = null
-      }
-    });
-  }
-
-  // deleteActiveLabel() {
-  //   let labelObjects = this.viewer.labelManager.labelObjects;
-
-  //   if (labelObjects) {
-  //     labelObjects.childObjects.forEach((item: LabelObject) => {
-  //       if (item.active) {
-  //         item.remove();
-  //       }
-  //     });
-  //   }
-  //   //删除角度数据时面板数据清零
-  //   // let commandShowMeasure = CommandShowMeasure.instance;
-  //   // commandShowMeasure.commandData.angleValue = 0;
-  // }
-}

package/src/viewerWrapper/commands/showEditLabel/lib/location.ts

@@ -1,86 +0,0 @@
-import { LabelObjects } from "gs-bim-air-core/gsDevFx/objects/labelObjects";
-import Label from "./label";
-
-import * as Longan from "gs-longan";
-import { LabelObject } from "gs-bim-air-core/gsDevFx/objects/labelObjects/labelObject";
-import { LocationLable, LocationObject } from "gs-bim-air-core/gsDevFx/objects/labelObjects/locationObject";
-import { LabelObjectSelector } from "gs-bim-air-core/gsDevFx/operators/labelObjectSelector";
-import { CommandShowEditLabel, LabelType } from "../commandShowEditLabel";
-import { ViewerEvent } from "gs-longan";
-import { isPC } from "gs-longan";
-import { labelService } from "../../../../api/labelService";
-
-export default class Location extends Label {
-  constructor(svgDraw, viewer) {
-    super(svgDraw, viewer);
-    this.init();
-  }
-
-  init() {
-    super.begin();
-  }
-
-  addLabelObject(point: number[]) {
-    // let labelObjects = this.viewer.labelManager.labelObjects;
-    // if (!labelObjects) {
-    //   labelObjects = new LabelObjects(this.viewer);
-    //   let viewPointStateObject = this.viewer.process.findRenderObject("ViewPointStateObject");
-    //   this.viewer.process.addRenderObject(viewPointStateObject, labelObjects);
-    // }
-    let labelObjects = this.viewer.labelManager.labelObjects;
-
-    let locationObject = new LocationObject(this.viewer);
-    locationObject.position = point;
-    // this.viewer.process.addRenderObject(labelObjects, locationObject);
-    locationObject.clickFun = (obj: LocationObject) => {
-      let instance = obj.viewer.process.commandManager.currentCommand as CommandShowEditLabel;
-      if (instance.typeName !== "CommandShowEditLabel" && isPC()) {
-        instance = new CommandShowEditLabel();
-        obj.viewer.process.commandManager.execute(instance);
-      }
-
-      instance.commandData.position = obj.position;
-      instance.activeLabelTypeChange(LabelType.Location);
-    };
-    labelObjects.addChildObject(locationObject);
-
-    // 画出最新的角度线
-    labelObjects.clearActive();
-    locationObject.active = true;
-    labelObjects.render();
-    let instance = this.viewer.process.commandManager.currentCommand as CommandShowEditLabel;
-    instance.commandData.position = point;
-    instance.activeLabelTypeChange(LabelType.Location);
-    labelService.createLabel(this.viewer.projectSceneManager.currentScene.id, locationObject.toJson()).then((data) => {
-      locationObject.fromJson(data as LocationLable);
-    });
-  }
-
-  operatorChange() {
-    console.log("labelObjectSelector operatorChange");
-
-    super.operatorChange();
-
-    let labelObjectSelector: LabelObjectSelector = new LabelObjectSelector();
-    this.viewer.operatorManager.add(labelObjectSelector);
-
-    labelObjectSelector.addLabelObject.add((point: Float64Array) => {
-      this.addLabelObject(Array.from(point));
-    });
-
-    labelObjectSelector.windowKeyDown.add((e: ViewerEvent) => {
-      console.log("labelObjectSelector");
-      if ((e.uiEvent as any).key === "Delete") {
-        this.deleteActiveLabel();
-        // saveModel()
-        // this.activeLabelIndex = null
-      }
-    });
-
-    //切换标签类型时，若激活的对象不是该类型，面板数据清零
-    let instance = this.viewer.process.commandManager.currentCommand as CommandShowEditLabel;
-    if (instance.commandData.labelType !== LabelType.Location) {
-      instance.commandData.position = [0, 0, 0];
-    }
-  }
-}

package/src/viewerWrapper/commands/showEditLabel/showEditLabel.vue

@@ -1,359 +0,0 @@
-<template>
-  <div class="showEditLabel">
-    <!-- <div class="button-group top">
-      <gs-button-group :activeIndex="activeButtonIndex">
-        <gs-button-icon
-          icon="locationlabel"
-          title="定位标签"
-          :active="true"
-          @click="labelTypeChange(LabelType.Location)" />
-        <gs-button-icon icon="el-icon-circle-plus" title="引线标签" @click="labelTypeChange(LabelType.LeadText)" />
-        <gs-button-icon icon="el-icon-picture" title="图片标签" @click="labelTypeChange(LabelType.Image)" />
-      </gs-button-group>
-    </div> -->
-    <div class="middle">
-      <div v-show="currentLabelType === LabelType.Location">
-        <div class="input-row" style="color: rgb(226, 74, 27)">
-          <span>X:</span>
-          <span>{{ commandData.position[0].toFixed(3) }}</span>
-          m
-        </div>
-        <div class="input-row" style="color: rgb(144, 226, 74)">
-          <span>Y:</span>
-          <span>{{ commandData.position[1].toFixed(3) }}</span>
-          m
-        </div>
-        <div class="input-row" style="color: rgb(74, 144, 226)">
-          <span>Z:</span>
-          <span>{{ commandData.position[2].toFixed(3) }}</span>
-          m
-        </div>
-      </div>
-
-      <div v-show="currentLabelType === LabelType.LeadText">
-        <div v-show="isLeadTextLabelEditing" class="labelEditing">
-          <div style="text-align: left; padding-bottom: 5px; font-size: 14px; line-height: 20px">编辑标签内容：</div>
-          <div style="display: flex; align-items: center">
-            <el-input
-              v-model="leadTextValue"
-              placeholder="请输入标签内容"
-              size="mini"
-              style="margin-right: 5px"></el-input>
-            <el-button type="text" icon="el-icon-check" title="确定" @click="addLeadTextLabelConfirm"></el-button>
-            <!-- <el-button type="text" icon="el-icon-close" title="取消" @click="addLeadTextLabelCancel"></el-button> -->
-          </div>
-        </div>
-      </div>
-
-      <div v-show="currentLabelType === LabelType.LeadText">
-        <div style="text-align: left; padding-bottom: 5px; font-size: 14px; color: #aaa" v-show="isSelectPositionTip">
-          <div style="text-align: left; padding-bottom: 5px; font-size: 14px; line-height: 20px">
-            标签内容：{{ leadTextValue }}
-            <el-button type="text" icon="el-icon-edit" title="编辑" @click="addLeadTextLabelEdit"></el-button>
-          </div>
-          请在模型上选择标签位置
-        </div>
-      </div>
-
-      <div v-show="currentLabelType === LabelType.Image">
-        <div style="text-align: left; padding-bottom: 5px; font-size: 14px; color: #aaa" v-show="isSelectPositionTip">
-          请在模型上选择图片标签位置
-        </div>
-      </div>
-
-      <div v-show="currentLabelType === LabelType.Image">
-        <div style="text-align: left" v-show="isChooseImage">
-          选择图片：
-          <el-button type="primary" round @click="uploadFileClick" v-show="!imageValue">
-            <i class="el-icon-plus"></i>
-            上传
-          </el-button>
-          <input type="file" ref="upload" :accept="acceptFileType" v-show="false" @change="uploadFileChange()" />
-          <div class="image-wrapper" v-show="imageValue">
-            <el-image :src="imageValue"></el-image>
-            <div class="button-group">
-              <el-button type="text" @click="addImageConfirm">确认</el-button>
-              <el-button type="text" @click="deleteUploadFileClick">取消</el-button>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <div style="text-align: left" class="bottom">
-      <el-button type="info" round size="mini" @click="clearAllClick">删除全部</el-button>
-    </div>
-  </div>
-</template>
-
-<script lang="ts">
-import { Component, Inject, Prop, Vue } from "vue-property-decorator";
-import { CommandShowEditLabel, LabelType } from "./commandShowEditLabel";
-import GsButtonIcon from "../../../components/gs/gsButtonIcon/gs-button-icon.vue";
-import GsButtonGroup from "../../../components/gs/gsButtonGroup/gs-button-group.vue";
-import fileType from "../../../utils/fileType";
-import { compressImage, fileToBase64 } from "../../../utils/fileUtility";
-import { Image as ElImage } from "element-ui";
-Vue.use(ElImage);
-@Component({
-  components: { GsButtonIcon, GsButtonGroup },
-})
-export default class ShowEditLabel extends Vue {
-  @Prop() componentData;
-  @Inject() getViewer;
-
-  commandShowEditLabel: CommandShowEditLabel;
-  LabelType = LabelType;
-  currentLabelType: LabelType = LabelType.Location;
-  leadTextValue = "";
-  isLeadTextLabelEditing = true;
-  isSelectPositionTip = false;
-  activeButtonIndex = 0;
-
-  imageValue = "";
-  picture;
-  isChooseImage = false;
-  acceptFileType = fileType.acceptFileType(fileType.image);
-
-  get viewer() {
-    return this.getViewer();
-  }
-
-  get commandData() {
-    let commandData = this.componentData;
-    if (commandData) {
-      this.currentLabelType = commandData.labelType;
-      // 设置按钮组的高亮
-      this.activeButtonIndex = commandData.labelType;
-      // // 设置文本输入框是否出现
-      this.isLeadTextLabelEditing = commandData.isLeadTextLabelEditing;
-      // // 设置选择图片提示是否出现
-      this.isChooseImage = commandData.isChooseImage;
-      // // 设置选择位置提示是否出现
-      this.isSelectPositionTip = commandData.isSelectPositionTip;
-      this.leadTextValue = commandData.labelMessage;
-      this.imageValue = commandData.picture;
-    }
-    return (
-      this.componentData || {
-        labelType: LabelType.Location,
-        position: [0, 0, 0],
-        labelMessage: "",
-        isLeadTextLabelEditing: true,
-        isSelectPositionTip: false,
-        isChooseImage: false,
-      }
-    );
-  }
-
-  labelTypeChange(type: LabelType) {
-    this.currentLabelType = type;
-
-    let commandShowEditLabel = this.viewer.process.commandManager.currentCommand as CommandShowEditLabel;
-    commandShowEditLabel.labelTypeChange(type);
-  }
-
-  addLeadTextLabelConfirm() {
-    let instance = this.viewer.process.commandManager.currentCommand as CommandShowEditLabel;
-    instance.commandData.isSelectPositionTip = true;
-    instance.commandData.isLeadTextLabelEditing = false;
-    instance.addLeadTextLabelConfirm(this.leadTextValue);
-  }
-
-  addLeadTextLabelCancel() {
-    let instance = this.viewer.process.commandManager.currentCommand as CommandShowEditLabel;
-    instance.commandData.isSelectPositionTip = true;
-    instance.commandData.isLeadTextLabelEditing = false;
-  }
-
-  addLeadTextLabelEdit() {
-    let instance = this.viewer.process.commandManager.currentCommand as CommandShowEditLabel;
-
-    instance.commandData.isSelectPositionTip = false;
-    instance.commandData.isLeadTextLabelEditing = true;
-  }
-
-  addImageConfirm() {
-    let instance = this.viewer.process.commandManager.currentCommand as CommandShowEditLabel;
-    if (instance.typeName !== "CommandShowEditLabel") {
-      instance = new CommandShowEditLabel();
-      this.viewer.process.commandManager.execute(instance);
-    }
-
-    instance.commandData.isSelectPositionTip = true;
-    instance.commandData.isChooseImage = false;
-    this.picture = this.imageValue;
-    instance.addImageConfirm(this.picture);
-    this.imageValue = "";
-  }
-
-  deleteUploadFileClick() {
-    this.imageValue = "";
-    // this.picture = "";
-    (this.$refs.upload as any).value = "";
-
-    let instance = this.viewer.process.commandManager.currentCommand as CommandShowEditLabel;
-    if (instance.typeName !== "CommandShowEditLabel") {
-      instance = new CommandShowEditLabel();
-      this.viewer.process.commandManager.execute(instance);
-    }
-
-    instance.commandData.isSelectPositionTip = false;
-    instance.commandData.isChooseImage = true;
-    instance.commandData.picture = "";
-  }
-
-  uploadFileClick() {
-    let commandShowEditLabel = this.viewer.process.commandManager.currentCommand as CommandShowEditLabel;
-    (this.$refs.upload as any).click();
-  }
-
-  uploadFileChange() {
-    let file = (this.$refs.upload as HTMLInputElement).files[0];
-    // console.log(file, "uploadFile-----");
-    if (file) {
-      fileToBase64(file).then((result: any) => {
-        compressImage(result.data, 0.1).then((data) => {
-          let fileName = result.name;
-          let names = fileName.split(".");
-          fileName = names[0];
-          this.imageValue = data;
-        });
-        // this.picture = data;
-      });
-    }
-    (this.$refs.upload as HTMLInputElement).value = "";
-  }
-
-  // saveLabelClick() {
-  //   saveModel(this.viewer).then(() => {
-  //     Message.success("标签保存成功！");
-  //   });
-  // }
-
-  clearAllClick() {
-    let commandShowEditLabel = this.viewer.process.commandManager.currentCommand as CommandShowEditLabel;
-    commandShowEditLabel.clearAll();
-  }
-
-  setData() {
-    this.$emit("setData", {
-      icon: "label",
-      title: "标签",
-      bottom: "20px",
-      right: "20px",
-    });
-  }
-
-  mounted() {
-    this.setData();
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/scss/site";
-@import "../../../assets/theme/handle.scss";
-
-.showEditLabel {
-  min-width: 250px;
-  height: 100%;
-  min-height: 50px;
-  display: flex;
-  flex-direction: column;
-  // padding: 10px;
-  border-radius: 0 0 4px 4px;
-  font-size: 14px;
-  // text-align: left;
-  .button-group {
-    display: flex;
-    justify-content: flex-end;
-    // border-bottom: 1px solid rgba(255, 255, 255, 0.15);
-    // padding: 4px 10px;
-  }
-
-  .top {
-    margin: 0 10px;
-    padding: 4px 0;
-    border-bottom: 1px solid rgba(255, 255, 255, 0.15);
-  }
-  .middle {
-    padding: 10px;
-    height: calc(100% - 49px);
-    box-sizing: border-box;
-    overflow: auto;
-    // // min-height: 80px;
-    // flex: 1;
-    :deep(.el-input__inner) {
-      background: transparent;
-      border: 1px solid rgba(255, 255, 255, 0.15);
-      border-radius: 4px;
-      color: $gs-primary-fontColor;
-    }
-    .labelEditing {
-      // .el-button--text:nth-child(3) {
-      //   color: $gs-primary-active;
-      // }
-      // .el-button--text:nth-child(4) {
-      //   color: $gs-primary-fontColor;
-      // }
-    }
-  }
-  .bottom {
-    border-top: 1px solid rgba(255, 255, 255, 0.15);
-    display: flex;
-    // justify-content: space-between;
-    justify-content: flex-end;
-    align-items: center;
-    padding: 10px;
-    border-top: 1px solid rgba(255, 255, 255, 0.15);
-
-    .el-button--text {
-      color: $gs-primary-active;
-    }
-
-    i {
-      font-size: 18px;
-    }
-  }
-}
-
-.input-row {
-  text-align: left;
-  padding: 5px 0;
-  color: $gs-primary-fontColor;
-
-  span {
-    display: inline-block;
-
-    &:first-child {
-      width: 40px;
-      text-align: right;
-    }
-
-    &:last-child {
-      padding-left: 20px;
-    }
-  }
-}
-
-.image-wrapper {
-  // max-height: 80px;
-  // max-width: 230px;
-  // display: flex;
-  margin-top: 5px;
-  text-align: center;
-  .el-image {
-    // width: 200px;
-    :deep(img) {
-      max-height: 80px;
-      max-width: 200px;
-    }
-  }
-
-  .button-group {
-    // width: 30px;
-    text-align: left;
-  }
-}
-</style>