【杨琨】【颜色修改】

killer1992 · killer1992 · commit 36ed1e4bcf26 · 2022-05-26T14:34:55.000+08:00
diff --git a/src/service/3DPlot/Draw/DrawPoint.js b/src/service/3DPlot/Draw/DrawPoint.js
@@ -35,18 +35,20 @@ export default class DrawPoint extends DrawObject {
             if (!worldPos) return;
 
             symbol.getElement().then(function (res) {
-                const {classificationType} = that._symbol;
+                const {classificationType, id} = that._symbol;
                 res.classificationType = classificationType;
                 const {style} = that._symbol;
                 if(style && style.nodeStyles){
                     res.initNodeStyles(style.nodeStyles);
                 }
-
+                if(id){
+                    res.featureId = id;
+                }
                 that._primitive = PrimitiveFactory.createInstance(symbol.type, {
                     positions: that.m_coords,
                     element: res
                 });
-
+                that._primitive.id = id;
                 const lnglat = CesiumUtil.cartesian3ToDegrees(
                     viewer.scene.globe.ellipsoid,
                     worldPos
diff --git a/src/service/3DPlot/Draw/DrawPolyline.js b/src/service/3DPlot/Draw/DrawPolyline.js
@@ -59,16 +59,20 @@ export default class DrawPolyline extends DrawObject {
 
       symbol.getElement().then(function (res) {
         if (!that._isAdded) {
-          const {classificationType} = that._symbol;
+          const {classificationType, id} = that._symbol;
           res.classificationType = classificationType;
           const {style} = that._symbol;
           if(style && style.nodeStyles){
             res.initNodeStyles(style.nodeStyles);
           }
+          if(id){
+            res.featureId = id;
+          }
           that._primitive = PrimitiveFactory.createInstance(symbol.type, {
             positions: that.m_coords,
             element: res,
           });
+          that._primitive.id = id;
           that._isAdded = true;
           that._plotLayer._primitiveCollection.add(that._primitive);
         }
diff --git a/src/service/3DPlot/PlotLayer3D.js b/src/service/3DPlot/PlotLayer3D.js
@@ -17,8 +17,6 @@ class PlotLayer3D extends Observable {
     super();
     //viewer对象
     this._viewer = viewer;
-    //标绘图元id列表
-    this._plotList = [];
     //primitive数组
     this._primitiveCollection = new Cesium.PrimitiveCollection();
     //图元可否编辑
@@ -40,7 +38,6 @@ class PlotLayer3D extends Observable {
    */
   addPlot(plot) {
     this._primitiveCollection.add(plot);
-    this._plotList.push(plot.id);
     return plot;
   }
 
@@ -55,33 +52,11 @@ class PlotLayer3D extends Observable {
    * @function module:PlotLayer3D.removePlotByID
    * @description 根据标绘图元ID删除标绘图元
    * @param id - {String} 必选项，要删除的标绘图元ID
-   * @return {Object} json
+   * @return {Object} json，被删除的标绘图元
    */
   removePlotByID(id) {
-    //删除图元列表中的id
-    for (let j = 0; j < this._plotList.length; j++) {
-      if (id === this._plotList[j]) {
-        this._plotList.splice(j, 1);
-        break;
-      }
-    }
-
-    return this._removePlotByID(id);
-  }
-
-  _removePlotByID(id) {
-    let scene = this._getScene();
-    let result;
-
-    //删除标绘图元
-    for (let i = 0; i < scene.primitives.length; i++) {
-      if (id === scene.primitives[i].id) {
-        result = scene.primitives.remove(scene.primitives[i]);
-        break;
-      }
-    }
-
-    return result;
+    let plot = this.getPlotByID(id);
+    return this.removePlot(plot);
   }
 
   /**
@@ -91,42 +66,45 @@ class PlotLayer3D extends Observable {
    * @return {Object} json
    */
   removePlot(plot) {
-    let scene = this._getScene();
-
-    //删除图元列表中的id
-    for (let i = 0; i < this._plotList.length; i++) {
-      if (id === this._plotList[i]) {
-        this._plotList.splice(i, 1);
-        break;
-      }
+    let plotLayer = this._getPlotLayer();
+    if(plotLayer){
+      return plotLayer.remove(plot);
     }
-
-    return scene.primitives.remove(plot);
   }
 
   /**
    * @function module:PlotLayer3D.getPlotByID
    * @description 根据标绘图元ID获取标绘图元
    * @param id - {String} 必选项，标绘图元ID
-   * @return {Object} json
+   * @return {Object} json，没找到返回undefined
    */
   getPlotByID(id) {
-    let index = this._getPlotIndexById(id);
-    let scene = this._getScene();
+    let plotLayer = this._getPlotLayer();
+
+    if(!plotLayer) {
+      return undefined;
+    }
 
+    let index = this._getPlotIndexById(id, plotLayer);
+    const {_primitives} = plotLayer;
     if (index !== undefined) {
       return _primitives[index];
     }
     return undefined;
   }
 
-  _getPlotIndexById(id) {
-    let scene = this._getScene();
-
+  /**
+   * @description 根据标绘图元ID获取标绘图元的index
+   * @private
+   *
+   * @param id - {String} 必选项，标绘图元ID
+   * @param plotLayer - {Object} 必选项，标绘图层
+   * @return {Number} index
+   */
+  _getPlotIndexById(id, plotLayer) {
     let index = undefined;
 
-    const {_primitives} = scene.primitives;
-
+    const {_primitives} = plotLayer;
     for (let i = 0; i < _primitives.length; i++) {
       if (id === _primitives[i].id) {
         index = i;
@@ -136,17 +114,35 @@ class PlotLayer3D extends Observable {
 
     return index;
   }
+  /**
+   * @description 根据标绘图层ID获取标绘图层
+   * @private
+   *
+   * @return {Object} plotLayer 标绘图层，没找到返回undefined
+   */
+  _getPlotLayer() {
+    let scene = this._getScene();
+    //根据图层id寻找标绘图层
+    const {_primitives} = scene.primitives;
+    //标绘图层
+    let primitiveCollection;
+    for (let i = 0; i < _primitives.length; i++) {
+      if (this._id === _primitives[i]._id) {
+        primitiveCollection = _primitives[i];
+        break;
+      }
+    }
+
+    return primitiveCollection;
+  }
 
   /**
    * @function module:PlotLayer3D.removeAll
    * @description 移除图层下的所有标绘图元
    */
   removeAll() {
-    for (let i = 0; i < this._plotList.length; i++) {
-      this._removePlotByID(this._plotList[i]);
-    }
-
-    this._plotList = [];
+    let plotLayer = this._getPlotLayer();
+    plotLayer.removeAll();
   }
 
   /**
@@ -206,8 +202,6 @@ class PlotLayer3D extends Observable {
       primitive.fromGeoJSON(geoFeature);
       primitive.id = id + "_" + parseInt(String(Math.random() * 1000000000));
 
-      that._plotList.push(primitive.id);
-
       that._addPrimitive(primitive);
     });
   }
diff --git a/src/service/3DPlot/Primitive/BasePlotPrimitive.js b/src/service/3DPlot/Primitive/BasePlotPrimitive.js
@@ -12,7 +12,7 @@
  * @property show 是否显示
  */
 
-export default class BasePlotPrimitive {
+class BasePlotPrimitive {
     constructor(options) {
         Cesium.Check.defined('options', options);
         Cesium.Check.defined('options.element', options.element);
@@ -35,7 +35,7 @@ export default class BasePlotPrimitive {
 
         this._positions = [];
 
-        const { positions } = this._elem;
+        const {positions} = this._elem;
         for (let i = 0; i < positions.length; i += 1) {
             const tempPos = this._elem.positions[i];
             this._positions.push(Cesium.Cartesian3.fromDegrees(tempPos.x, tempPos.y));
@@ -237,7 +237,7 @@ export default class BasePlotPrimitive {
             v[s] = this[s];
         });
         return v;
-        
+
     }
 
     /**
@@ -295,7 +295,7 @@ export default class BasePlotPrimitive {
                         type: 'Image',
                         uniforms: {
                             image: this.getColorRamp([0.0, 1], [wallColor, WallGradColor], true),
-                            repeat: { x: 1, y: 1 }
+                            repeat: {x: 1, y: 1}
                         }
                     }
                 })
@@ -367,4 +367,20 @@ export default class BasePlotPrimitive {
         else ctx.fillRect(0, 0, 100, 1);
         return ramp;
     }
+
+    /**
+     * @description: 设置标绘图元样式，必须通过此方法设置，修改样式的属性无效
+     * @param key {String} 样式名
+     * @param value {Any} 样式值
+     * @param value {Any} 样式值
+     * @param nodeIds {String} 图元部件ID字符串，可传入多个id，以逗号分隔，当id有多个时，可统一修改多个部件的样式，
+     * 若找不到id则不做改变
+     * @return {*}
+     */
+    setStyle(key, value, nodeIds) {
+        console.log("this._elem",this._elem)
+        this.setValue(key, value, nodeIds);
+    }
 }
+
+export default BasePlotPrimitive;
diff --git a/src/service/PlotBase/SvgLoader/element/BasePlotElement.js b/src/service/PlotBase/SvgLoader/element/BasePlotElement.js
@@ -334,7 +334,7 @@ class BasePlotElement extends SvgElement {
     setNodeAttr(type, value, childIds) {
         const {baseSVGAttributes, extendElementAttributes} =
             this.getSaveBaseAttributes();
-        const baseSVGStyleAttributes = this.styleObject.getSVGStyleNameArr();
+        const baseSVGStyleAttributes = this.getStyleObject().getSVGStyleNameArr();
 
         let val = value;
 
