验证节点，验证element

Author: zhaokai

src/service/2DPlot/PlotLayer2D.js

@@ -4,7 +4,7 @@
  * @Author: zk
  * @Date: 2022-05-13 10:34:57
  * @LastEditors: zk
- * @LastEditTime: 2022-06-13 17:08:19
+ * @LastEditTime: 2022-06-22 10:01:17
  */
 
 import { DrawPlotObjectFactory2D } from './Draw/DrawPlotObjectFactory2D';
@@ -278,14 +278,15 @@ class PlotLayer2D {
         const symbolManager = SymbolManager.instance;
 
         const leaf = symbolManager.getLeafByID(id);
+        if(!leaf) return null;
 
         const element = await leaf.getElement();
+        if(!element) return null
         const plotObj = PlotObjectFactory.createInstance(element.type, {
             element,
             positions: element.positions,
             canvas: this
         });
-
         plotObj.fromGeoJSON(geoFeature);
         this.addPlot(plotObj);
     }

src/service/2DPlot/PlotLayer2DGroup.js

@@ -4,7 +4,7 @@
  * @Author: zk
  * @Date: 2022-05-13 11:01:10
  * @LastEditors: zk
- * @LastEditTime: 2022-06-15 19:53:34
+ * @LastEditTime: 2022-06-22 10:01:40
  */
 
 import { fabric } from 'fabric';
@@ -246,7 +246,11 @@ export const PlotLayer2DGroup = fabric.util.createClass(fabric.Canvas, {
     drawUtilPlotObject(id, options) {
         const symbol = SymbolManager.instance;
         const leaf = symbol.getLeafByID(id);
+
+        if(!leaf) return null;
+
         return leaf.getElement().then((element) => {
+            if(!element)return null;
             const plotObj = PlotObjectFactory.createInstance(element.type, {
                 element,
                 positions: options.positions,

src/service/3DPlot/PlotLayer3D.js

@@ -253,8 +253,10 @@ class PlotLayer3D extends Observable {
         const symbolManager = SymbolManager.instance;
 
         const leaf = symbolManager.getLeafByID(id);
+        if(!leaf) return null;
 
         leaf.getElement().then(function (element) {
+            if(!element) return null;
             const primitive = PrimitiveFactory.createInstance(element.type, {
                 positions: element.positions,
                 element,

src/service/3DPlot/PlotLayer3DGroup.js

@@ -216,7 +216,9 @@ class PlotLayer3DGroup {
     drawUtilPlotObject(id, options) {
         const symbol = SymbolManager.instance;
         const leaf = symbol.getLeafByID(id);
+        if(!leaf)return null;
         return leaf.getElement().then((element) => {
+            if(!element) return null;
             // 待修改问题：positions传参无效
             //   const primitive = PrimitiveFactory.createInstance(element.type, {
             //     positions:options.positions,
@@ -233,7 +235,9 @@ class PlotLayer3DGroup {
         });
     }
     removeDrawUtilPlotObject(primitive) {
-        this._utilPlotCanvas.removePlot(primitive);
+        if(primitive){
+            this._utilPlotCanvas.removePlot(primitive);
+        }
     }
     /**
      * @function: Module:3DPlot.PlotLayer3DGroup.getPlotObjectById

src/service/PlotBase/SvgLoader/element/extend/ReplaceRectElement.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-11-04 17:02:07
- * @LastEditTime: 2022-05-23 19:00:31
+ * @LastEditTime: 2022-06-22 10:00:07
  * @LastEditors: zk
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \MapGISPlotBase\src\base\SvgLoader\element\extend\ReplacedGroupElement.js
@@ -45,6 +45,8 @@ export default class ReplaceRectElement extends RectElement {
 
     const symbol = symbolManager.getLeafByID(parseInt(id,10));
 
+    if(!symbol) return;
+
     const that = this;
 
     symbol.getSvg().then(function (res) {

src/service/PlotBase/SvgLoader/element/extend/ReplacedGroupElement.js

@@ -1,8 +1,8 @@
 /*
  * @Author: your name
  * @Date: 2021-11-04 17:02:07
- * @LastEditTime: 2022-05-10 15:25:05
- * @LastEditors: Do not edit
+ * @LastEditTime: 2022-06-22 09:59:46
+ * @LastEditors: zk
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \MapGISPlotBase\src\base\SvgLoader\element\extend\ReplacedGroupElement.js
  */
@@ -35,6 +35,8 @@ export default class ReplacedGroupElement extends GElement {
 
     const symbol = symbolManager.getLeafByID(parseInt(id,10));
 
+    if(!symbol) return;
+
     var that = this;
 
     symbol.getSvg().then(function (res) {

src/service/PlotBase/SymbolManager/ServerSymbolManager.js

@@ -28,7 +28,7 @@ export default class ServerSymbolManager {
         return leaves[i];
       }
     }
-
+    LogTool.warn(`符号库id为${symbolId}的节点不存在`)
     return null;
 
   }
@@ -56,7 +56,6 @@ export default class ServerSymbolManager {
       LogTool.error(symbolId, "对应的符号不存在");
       return undefined;
     }
-
     return symbol.getImage();
   }
 }

src/service/PlotBase/SymbolManager/SymbolBase.js

@@ -49,10 +49,6 @@ export default class SymbolBase {
       return false;
     }
 
-    if (!defined(json.id)) {
-      LogTool.warn("json.id is not defined");
-    }
-
     this.id = json.id;
 
     this.name = json.name;

src/service/PlotBase/SymbolManager/SymbolManager.js

@@ -2,9 +2,9 @@
  * @Description:
  * @Version: 2.0
  * @Date: 2021-07-22 11:46:16
- * @LastEditTime: 2022-01-14 09:49:26
+ * @LastEditTime: 2022-06-22 09:54:09
  * @Author: xinxiao
- * @LastEditors: Do not edit
+ * @LastEditors: zk
  */
 import {defined} from "../../PlotUtilBase/Check";
 import LogTool from "../../PlotUtilBase/Log/LogTool";
@@ -59,7 +59,7 @@ export default class SymbolManager {
         return leaves[i];
       }
     }
-
+    LogTool.warn(`符号库id为${id}的节点不存在！`)
     return null;
   }
 

src/service/PlotBase/SymbolManager/SymbolNode.js

@@ -2,7 +2,7 @@
  * @Description:
  * @Version: 2.0
  * @Date: 2021-07-22 11:46:54
- * @LastEditTime: 2022-06-15 14:47:07
+ * @LastEditTime: 2022-06-22 09:39:55
  * @Author: xinxiao
  * @LastEditors: zk
  */
@@ -69,7 +69,12 @@ export default class SymbolNode extends SymbolBase {
      */
     async getElement() {
         const elem = ElementFactory.createInstance(await this.getSvg(), this.type);
-        elem.symbolManager(this);
+        
+        if(elem){
+            elem.symbolManager(this);
+        }else{
+            LogTool.warn(`符号类型${this.type}未注册!`)
+        }
         return elem;
     }