dcim-topology2d 2.0.2 → 2.0.5

package/core/src/utils/params.js

@@ -1,46 +1,15 @@
-import { syncMqttData, clearMqttParams } from '../store';
-export function categoryDataParams(data) {
-    clearMqttParams();
-    getParams(data);
-}
-export function setParams(assetId) {
-    const params = {
-        tagIds: syncMqttData.params.tagIds.join(","),
-        assetIds: syncMqttData.params.assetIds.join(","),
-        areaIds: syncMqttData.params.areaIds.join(","),
-        routingkey: syncMqttData.params.routingkey,
-        echart: syncMqttData.params.tagEcharts.join(","),
-        echartData: syncMqttData.params.echartData
-    }
-    if (syncMqttData.params.echartAssemblyData && syncMqttData.params.echartAssemblyData.length) {
-        params.echartAssemblyData = syncMqttData.params.echartAssemblyData;
-    }
-    if(assetId) {
-        params.varValueIds = syncMqttData.params.varVaule.join(",");
-    }else {
-        if(syncMqttData.params.assetIds.length && syncMqttData.params.varVaule.length) {
-            const assetId = syncMqttData.params.assetIds[syncMqttData.params.assetIds.length -1];
-            for(let va = 0; va < syncMqttData.params.varVaule.length; va++) {
-                syncMqttData.params.varVaule[va] = `${assetId}_${syncMqttData.params.varVaule[va]}`;
-            }
-            params.varValueIds = syncMqttData.params.varVaule.join(",");
-        }else {
-            params.varVaule = syncMqttData.params.varVaule.join(",");
-        }
-    }
-    return params;
-}
+import {commonStore} from '../store';
 // 获取绑定数据的参数
-export function getParams(data) {
+export function getParams(id, data) {
     data.map((item) => {
-        filterParams(item);
+        filterParams(id, item);
         if (item.children && item.children.length) {
-            getParams(item.children);
+            getParams(id, item.children);
         }
     });
 }
 // 过滤出参数
-export function filterParams(node) {
+export function filterParams(id, node) {
     let tagIds = [];
     let kpiAddrs = [];
     let assetIds = [];
@@ -48,7 +17,13 @@ export function filterParams(node) {
     let tagEcharts = [];
     let echartData = [];
     let varVaule = [];
-    let isMqttEventType = node.events.find((ev) => {return ev.type === 3});
+    let doorIds = [];
+    let isMqttEventType = false;
+    node.events.map((ev) => {
+        if(ev.value && ev.value === 'entranceGuard') doorIds.push(ev.params); // 门禁参数
+        if(ev.type === 3) isMqttEventType = true;
+    });
+    if(doorIds.length) commonStore[id].mqttParams.doorIds = [...commonStore[id].mqttParams.doorIds, ...doorIds];
     if(!isMqttEventType) return;
     if (node.data && Array.isArray(node.data) && node.data.length) {
         node.data.map((item) => {
@@ -72,54 +47,11 @@ export function filterParams(node) {
     if (node.data && Object.prototype.toString.call(node.data) === '[object Object]' && node.data.params && node.data.params.id) {
         echartData.push(node.data.params.id);
     }
-    syncMqttData.params.tagIds = [...syncMqttData.params.tagIds, ...tagIds];
-    syncMqttData.params.kpiAddrs = [...syncMqttData.params.kpiAddrs, ...kpiAddrs];
-    syncMqttData.params.assetIds = [...syncMqttData.params.assetIds, ...assetIds];
-    syncMqttData.params.areaIds = [...syncMqttData.params.areaIds, ...areaIds];
-    syncMqttData.params.varVaule = [...syncMqttData.params.varVaule, ...varVaule];
-    syncMqttData.params.tagEcharts = [...syncMqttData.params.tagEcharts, ...tagEcharts];
-    syncMqttData.params.echartData = [...syncMqttData.params.echartData, ...echartData];
-}
-// 根据指标地址数据获取测点数据
-export function getTagIdsForKpiAddrs(data) {
-    let tagIds = [];
-    if (data && data.length > 0) {
-        data.map((item) => {
-            tagIds.push(item.tagId);
-        })
-        // syncMqttData.params.detailAssetData = data;
-    }
-    syncMqttData.params.tagIds = tagIds;
-    syncMqttData.params.echartAssemblyData = data.echartAssemblyData;
-}
-// 获取绑定值类型参数
-export function getVarValueIdsForVarData(data) {
-    const ids = [];
-    if(data && data.length) {
-        data.map((item) => {
-            if(item.varVal) ids.push(item.assetVarIds);
-        })
-    }
-    syncMqttData.params.varVaule = ids;
-}
-// 固定资产详情数据赋值
-export function renderForAssetPoperties(asset, data) {
-    if(!(asset && Object.keys(asset).length)) return;
-    data.map((node) => {
-        if (node.data && Array.isArray(node.data) && node.data.length) {
-            node.data.map((item) => {
-                if (item.key === 'assetKey' && asset[item.value]) {
-                    if (['imgUrl', 'principleImg'].includes(item.value)) {
-                        node.text = '';
-                        node.image = `${syncMqttData.params.pathRewrite}${asset[item.value]}`;
-                    } else {
-                        node.text = asset[item.value];
-                    }
-                }
-            })
-        }
-        if (node.children && node.children.length) {
-            renderForAssetPoperties(asset, node.children);
-        }
-    });
+    commonStore[id].mqttParams.tagIds = [...commonStore[id].mqttParams.tagIds, ...tagIds];
+    commonStore[id].mqttParams.kpiAddrs = [...commonStore[id].mqttParams.kpiAddrs, ...kpiAddrs];
+    commonStore[id].mqttParams.assetIds = [...commonStore[id].mqttParams.assetIds, ...assetIds];
+    commonStore[id].mqttParams.areaIds = [...commonStore[id].mqttParams.areaIds, ...areaIds];
+    commonStore[id].mqttParams.varVaule = [...commonStore[id].mqttParams.varVaule, ...varVaule];
+    commonStore[id].mqttParams.tagEcharts = [...commonStore[id].mqttParams.tagEcharts, ...tagEcharts];
+    commonStore[id].mqttParams.echartData = [...commonStore[id].mqttParams.echartData, ...echartData];
 }

package/myShape-diagram/index.js

@@ -0,0 +1,196 @@
+// 源码版写法
+import { registerNode } from '../core'
+
+// 组件版写法和bundle一致
+// window.Le5leTopology.registerNode
+
+// 画骨架
+
+function drawOuterLine(ctx, node) {
+    const R = Math.floor((node.rect.width - 6) / 2);
+    const r = Math.round((R * 1) / 2);
+
+    ctx.beginPath();
+    // 上半个圆形
+    ctx.arc(node.rect.x + R, node.rect.y + r, r, 0, Math.PI, true);
+    // 下半个圆形
+    const theta = Math.acos((r * 1.0) / R);
+    ctx.arc(
+            node.rect.x + R,
+            node.rect.y + node.rect.height - R,
+            R,
+            theta + Math.PI,
+            -theta,
+            true
+    ); // 逆时针
+    ctx.closePath();
+    ctx.stroke();
+}
+
+// 画底色
+function drawBasic(ctx, node) {
+    const lingrad = ctx.createLinearGradient(
+            node.rect.x,
+            node.rect.y,
+            node.rect.width,
+            node.rect.height
+    );
+    lingrad.addColorStop(0, 'mediumvioletred');
+    lingrad.addColorStop(0.2, 'darkorange');
+    lingrad.addColorStop(0.4, 'gold');
+    lingrad.addColorStop(0.6, 'limegreen');
+    lingrad.addColorStop(0.8, 'navy');
+    lingrad.addColorStop(1, 'purple');
+    ctx.fillStyle = lingrad;
+    ctx.fill('evenodd');
+}
+
+function getYByValue(node, i) {
+    const R = Math.floor((node.rect.width - 6) / 2);
+    const r = Math.round((R * 1) / 2);
+
+    const min = 0;
+    const max = 40;
+
+    // 刻度线总高度
+    const scale_height = node.rect.height - 2 * R - 2 * r;
+    // 0刻度线所在位置
+    const zero_scale_y = node.rect.height - 2 * R;
+    const dy_dtem = scale_height / (max - min);
+    return zero_scale_y - dy_dtem * node.value;
+}
+
+// 画刻度线
+function drawScale(ctx, node) {
+    const min = 0;
+    const max = 40;
+    const R = Math.floor((node.rect.width - 6) / 2);
+    const r = Math.round((R * 1) / 2);
+
+    for (let i = min; i <= max; i++) {
+        // 画刻度线
+        const y = getYByValue(node, i);
+        ctx.beginPath();
+        ctx.moveTo(R + r, y);
+        if (i % 10 == 0) {
+            ctx.lineWidth = 2;
+            ctx.lineTo(R + r - (r * 2) / 3, y);
+            // ctx.font = "15px bold";
+            ctx.fillText(i + '', R + r, y + 6);
+            ctx.stroke();
+        } else {
+            ctx.lineWidth = 1;
+            if (i % 5 == 0) {
+                ctx.lineTo(R + r - r / 2, y);
+            } else {
+                ctx.lineTo(R + r - r / 3, y);
+            }
+            ctx.stroke();
+        }
+    }
+}
+
+/////////////////////
+// end 以下代码不完整，代码来自网上改写，仅作参考
+/////////////////////
+
+// 自定义图形库绘画函数
+export function thermometer(ctx, node) {
+    ctx.beginPath();
+
+    drawOuterLine(ctx, node);
+    drawBasic(ctx, node);
+    ctx.clearRect(
+            node.rect.x,
+            node.rect.y,
+            node.rect.width,
+            getYByValue(node, node.value)
+    );
+    drawOuterLine(ctx, node);
+    drawScale(ctx, node);
+}
+
+// 自定义图形库绘画函数
+export function pool(ctx, node) {
+    var wr = node.borderRadius;
+    var hr = node.borderRadius;
+    if (node.borderRadius < 1) {
+        wr = node.rect.width * node.borderRadius;
+        hr = node.rect.height * node.borderRadius;
+    }
+    var r = wr < hr ? wr : hr;
+    if (node.rect.width < 2 * r) {
+        r = node.rect.width / 2;
+    }
+    if (node.rect.height < 2 * r) {
+        r = node.rect.height / 2;
+    }
+    ctx.beginPath();
+    ctx.strokeStyle = "rgba(0,0,0,.0)"
+    var value = (1-node.value) * (node.rect.height - node.lineWidth/2)
+    ctx.moveTo(node.rect.x + node.lineWidth/2, node.rect.y + value);
+    ctx.lineTo(node.rect.ex - node.lineWidth/2, node.rect.y + value);
+    ctx.arcTo(node.rect.ex - node.lineWidth/2, node.rect.y + node.rect.height - node.lineWidth/2, node.rect.x + node.lineWidth/2, node.rect.y + node.rect.height - node.lineWidth/2, r);
+    ctx.arcTo(node.rect.x + node.lineWidth/2, node.rect.y + node.rect.height - node.lineWidth/2, node.rect.x + node.lineWidth/2, node.rect.y, r);
+    ctx.lineTo(node.rect.x + node.lineWidth/2, node.rect.y + value);
+    ctx.closePath();
+    (node.fillStyle || node.bkType) && ctx.fill();
+    ctx.stroke();
+
+    ctx.beginPath();
+    ctx.strokeStyle = node.strokeStyle
+    ctx.lineWidth = node.lineWidth
+    ctx.moveTo(node.rect.x + node.rect.width, node.rect.y);
+    ctx.arcTo(node.rect.x + node.rect.width, node.rect.y + node.rect.height, node.rect.x, node.rect.y + node.rect.height, r);
+    ctx.arcTo(node.rect.x, node.rect.y + node.rect.height, node.rect.x, node.rect.y, r);
+    ctx.arcTo(node.rect.x, node.rect.y, node.rect.x + node.rect.width, node.rect.y, r);
+    // ctx.closePath();
+    (node.fillStyle || node.bkType);
+    ctx.stroke();
+}
+
+// 自定义图形库绘画函数
+export function  electricFan(ctx, node) {
+    var wwr = node.rect.width / 2;
+    var hwr = node.rect.height / 2;
+    var hwr = node.rect.height / 2;
+    var x0 = node.rect.x + node.rect.width /2
+    var y0 = node.rect.y + node.rect.height / 2
+    var withinRadius = wwr < hwr ? wwr : hwr;
+    ctx.beginPath();
+    ctx.lineWidth = node.lineWidth
+    ctx.arc(x0,y0,withinRadius,0,2*Math.PI);
+    ctx.closePath();
+    ctx.stroke();
+    ctx.beginPath();
+    ctx.lineWidth = 1;
+    var fanCount = node.fanCount;
+    for(var i = 0; i < fanCount; i++){
+        var fanAngle = 2 * Math.PI / fanCount * i;
+        var x1 = x0 - withinRadius*Math.sin(fanAngle);
+        var y1 = y0 - withinRadius*Math.cos(fanAngle);
+        var xr = x0 - withinRadius*Math.sin(fanAngle)/2;
+        var yr = y0 - withinRadius*Math.cos(fanAngle)/2;
+        ctx.moveTo(x0, y0);
+        ctx.lineTo(x1, y1);
+        ctx.arc(xr, yr, withinRadius/2, Math.PI / 2 - fanAngle,3 * Math.PI / 2 - fanAngle);
+    }
+    ctx.closePath();
+    (node.fillStyle || node.bkType) && ctx.fill();
+    ctx.stroke();
+    ctx.beginPath();
+    ctx.lineWidth = 3;
+    ctx.arc(x0,y0,withinRadius/5,0,2*Math.PI);
+    ctx.closePath();
+    (node.fillStyle || node.bkType) && ctx.fill();
+    ctx.stroke();
+}
+
+// 注册自定义图形库
+export function registerMyShape() {
+    registerNode('electricFan', electricFan);
+    registerNode('pool', pool);
+    registerNode('thermometer', thermometer);
+}
+
+// src\views\data.ts 里面加载到工具栏，第一个就是此自定义图形库

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dcim-topology2d",
-  "version": "2.0.2",
+  "version": "2.0.5",
   "description": "",
   "main": "-",
   "scripts": {

package/store/actions.js

@@ -1,17 +1 @@
-// element 交互过渡数据
-export const elementInteractivePoor = {};
-// echarts
-export const echartsDataPool = {}; // echarts Dom节点数据
-export const echartsOptionsPool = {}; // echarts options节点数据
-export const echartsRealDataPool = {}; // echarts 实时数据
-
-// tabs
-export const switchTabDataPool = {};
-
-// form
-export const tableDataPool = {};
-export const selectDataPool = {};
-export const selectRealDataPool = {};
-
-// iframe
-export const iframeDataPool = {};
+export const plugsPool = {};

package/store/clear.js

@@ -1,66 +1,4 @@
-import {
-    echartsDataPool,
-    echartsOptionsPool,
-    echartsRealDataPool,
-    switchTabDataPool,
-    tableDataPool,
-    selectDataPool,
-    elementInteractivePoor,
-    selectRealDataPool,
-    iframeDataPool
-} from './actions';
 import {setEventListener} from "../core";
-
-export const clearDataPool = function (){
-    for (let [key, node] of Object.entries(echartsDataPool)) {
-        if(node) {
-            clearInterval(node.timeTicket);
-            if(node.chart) {
-                node.chart.off('mouseover');
-                node.chart.off('mouseout');
-                node.chart.dispose();
-            }
-            if(node.div && node.div.parentNode) node.div.parentNode.removeChild(node.div);
-        }
-        delete echartsDataPool[key];
-    }
-    for (let key of Object.keys(echartsOptionsPool)) {
-        delete echartsOptionsPool[key];
-    }
-    for (let key of Object.keys(echartsRealDataPool)) {
-        delete echartsRealDataPool[key];
-    }
-    for (let key of Object.keys(switchTabDataPool)) {
-        delete switchTabDataPool[key];
-    }
-    for (let key of Object.keys(tableDataPool)) {
-        delete tableDataPool[key];
-    }
-    if(Object.keys(selectDataPool).length) {
-        let dropdownEle = null,
-                dropdownListEle = null;
-        for (let [key, node] of Object.entries(selectDataPool)) {
-            if(!dropdownEle) {
-                dropdownEle = node.dom.selectDropdown;
-                dropdownListEle = node.dom.selectDropdownUl;
-            }
-            if(node.dom.selectEle && node.dom.selectEle.parentNode) node.dom.selectEle.parentNode.removeChild(node.dom.selectEle);
-            delete selectDataPool[key];
-        }
-        if(dropdownEle) dropdownEle.style.display = 'none';
-        if(dropdownListEle) dropdownListEle.innerHTML = '';
-    }
-    for (let key of Object.keys(elementInteractivePoor)) {
-        delete elementInteractivePoor[key];
-    }
-    for (let key of Object.keys(selectRealDataPool)) {
-        delete selectRealDataPool[key];
-    }
-    for (let [key, node] of Object.entries(iframeDataPool)) {
-        node.iframe.parentNode.removeChild(node.iframe);
-        delete iframeDataPool[key];
-    }
-}
 export const removeAllElement = function (){
     const documentDefineEle = document.querySelectorAll('.documentDefine');
     if(documentDefineEle) {

package/core/src/poll.js

@@ -1,37 +0,0 @@
-// 轮询
-var POLL = /** @class */ (function () {
-    function POLL(data, message, val) {
-        this.data = data;
-        this.client = message;
-        this.val = val;
-        this.init();
-    };
-    POLL.prototype.init = function () {
-        let topics = ''
-        this.getPen(this.data.pens, topics, JSON.stringify(this.client))
-    };
-    POLL.prototype.getPen = function (pens, topics, message) {
-        const _this = this;
-        pens.forEach((pen)=>{
-            if(pen.children != undefined){
-            _this.getPen(pen.children, topics, message)
-            }else{
-                var item = pen;
-                for (var _b = 0, _c = item.events; _b < _c.length; _b++) {
-                    var event_1 = _c[_b];
-                    // if (event_1.type === EventType.Poll) {
-                    if ((event_1.type ===3 && this.val === 'Mqtt') || (event_1.type ===4 && this.val === 'Poll')
-                    || (event_1.type ===5 && this.val === 'Poll1') || (event_1.type ===6 && this.val === 'Poll2')) {
-                        event_1.name = topics;
-                        if(message){
-                            item.doSocketMqtt(event_1, message.toString());
-                        }
-                    }
-                }
-            }
-        })
-    };
-    return POLL;
-}());
-export { POLL };
-//# sourceMappingURL=mqtt.js.map

package/myShape-diagram/myShape.js

@@ -1,196 +0,0 @@
-// 源码版写法
-import { registerNode } from '../core'
-
-// 组件版写法和bundle一致
-// window.Le5leTopology.registerNode
-
-// 画骨架
-
-function drawOuterLine(ctx, node) {
-  const R = Math.floor((node.rect.width - 6) / 2);
-  const r = Math.round((R * 1) / 2);
-
-  ctx.beginPath();
-  // 上半个圆形
-  ctx.arc(node.rect.x + R, node.rect.y + r, r, 0, Math.PI, true);
-  // 下半个圆形
-  const theta = Math.acos((r * 1.0) / R);
-  ctx.arc(
-    node.rect.x + R,
-    node.rect.y + node.rect.height - R,
-    R,
-    theta + Math.PI,
-    -theta,
-    true
-  ); // 逆时针
-  ctx.closePath();
-  ctx.stroke();
-}
-
-// 画底色
-function drawBasic(ctx, node) {
-  const lingrad = ctx.createLinearGradient(
-    node.rect.x,
-    node.rect.y,
-    node.rect.width,
-    node.rect.height
-  );
-  lingrad.addColorStop(0, 'mediumvioletred');
-  lingrad.addColorStop(0.2, 'darkorange');
-  lingrad.addColorStop(0.4, 'gold');
-  lingrad.addColorStop(0.6, 'limegreen');
-  lingrad.addColorStop(0.8, 'navy');
-  lingrad.addColorStop(1, 'purple');
-  ctx.fillStyle = lingrad;
-  ctx.fill('evenodd');
-}
-
-function getYByValue(node, i) {
-  const R = Math.floor((node.rect.width - 6) / 2);
-  const r = Math.round((R * 1) / 2);
-
-  const min = 0;
-  const max = 40;
-
-  // 刻度线总高度
-  const scale_height = node.rect.height - 2 * R - 2 * r;
-  // 0刻度线所在位置
-  const zero_scale_y = node.rect.height - 2 * R;
-  const dy_dtem = scale_height / (max - min);
-  return zero_scale_y - dy_dtem * node.value;
-}
-
-// 画刻度线
-function drawScale(ctx, node) {
-  const min = 0;
-  const max = 40;
-  const R = Math.floor((node.rect.width - 6) / 2);
-  const r = Math.round((R * 1) / 2);
-
-  for (let i = min; i <= max; i++) {
-    // 画刻度线
-    const y = getYByValue(node, i);
-    ctx.beginPath();
-    ctx.moveTo(R + r, y);
-    if (i % 10 == 0) {
-      ctx.lineWidth = 2;
-      ctx.lineTo(R + r - (r * 2) / 3, y);
-      // ctx.font = "15px bold";
-      ctx.fillText(i + '', R + r, y + 6);
-      ctx.stroke();
-    } else {
-      ctx.lineWidth = 1;
-      if (i % 5 == 0) {
-        ctx.lineTo(R + r - r / 2, y);
-      } else {
-        ctx.lineTo(R + r - r / 3, y);
-      }
-      ctx.stroke();
-    }
-  }
-}
-
-/////////////////////
-// end 以下代码不完整，代码来自网上改写，仅作参考
-/////////////////////
-
-// 自定义图形库绘画函数
-export function thermometer(ctx, node) {
-  ctx.beginPath();
-
-  drawOuterLine(ctx, node);
-  drawBasic(ctx, node);
-  ctx.clearRect(
-    node.rect.x,
-    node.rect.y,
-    node.rect.width,
-    getYByValue(node, node.value)
-  );
-  drawOuterLine(ctx, node);
-  drawScale(ctx, node);
-}
-
-// 自定义图形库绘画函数
-export function pool(ctx, node) {
-  var wr = node.borderRadius;
-  var hr = node.borderRadius;
-  if (node.borderRadius < 1) {
-      wr = node.rect.width * node.borderRadius;
-      hr = node.rect.height * node.borderRadius;
-  }
-  var r = wr < hr ? wr : hr;
-  if (node.rect.width < 2 * r) {
-      r = node.rect.width / 2;
-  }
-  if (node.rect.height < 2 * r) {
-      r = node.rect.height / 2;
-  }
-  ctx.beginPath();
-  ctx.strokeStyle = "rgba(0,0,0,.0)"
-  var value = (1-node.value) * (node.rect.height - node.lineWidth/2)
-  ctx.moveTo(node.rect.x + node.lineWidth/2, node.rect.y + value);
-  ctx.lineTo(node.rect.ex - node.lineWidth/2, node.rect.y + value);
-  ctx.arcTo(node.rect.ex - node.lineWidth/2, node.rect.y + node.rect.height - node.lineWidth/2, node.rect.x + node.lineWidth/2, node.rect.y + node.rect.height - node.lineWidth/2, r);
-  ctx.arcTo(node.rect.x + node.lineWidth/2, node.rect.y + node.rect.height - node.lineWidth/2, node.rect.x + node.lineWidth/2, node.rect.y, r);
-  ctx.lineTo(node.rect.x + node.lineWidth/2, node.rect.y + value);
-  ctx.closePath();
-  (node.fillStyle || node.bkType) && ctx.fill();
-  ctx.stroke();
-
-  ctx.beginPath();
-  ctx.strokeStyle = node.strokeStyle
-  ctx.lineWidth = node.lineWidth
-  ctx.moveTo(node.rect.x + node.rect.width, node.rect.y);
-  ctx.arcTo(node.rect.x + node.rect.width, node.rect.y + node.rect.height, node.rect.x, node.rect.y + node.rect.height, r);
-  ctx.arcTo(node.rect.x, node.rect.y + node.rect.height, node.rect.x, node.rect.y, r);
-  ctx.arcTo(node.rect.x, node.rect.y, node.rect.x + node.rect.width, node.rect.y, r);
-  // ctx.closePath();
-  (node.fillStyle || node.bkType);
-  ctx.stroke();
-}
-
-// 自定义图形库绘画函数
-export function  electricFan(ctx, node) {
-  var wwr = node.rect.width / 2;
-  var hwr = node.rect.height / 2;
-  var hwr = node.rect.height / 2;
-  var x0 = node.rect.x + node.rect.width /2
-  var y0 = node.rect.y + node.rect.height / 2
-  var withinRadius = wwr < hwr ? wwr : hwr;
-  ctx.beginPath();
-  ctx.lineWidth = node.lineWidth
-  ctx.arc(x0,y0,withinRadius,0,2*Math.PI);
-  ctx.closePath();
-  ctx.stroke();
-  ctx.beginPath();
-  ctx.lineWidth = 1;
-  var fanCount = node.fanCount;
-  for(var i = 0; i < fanCount; i++){
-    var fanAngle = 2 * Math.PI / fanCount * i;
-    var x1 = x0 - withinRadius*Math.sin(fanAngle);
-    var y1 = y0 - withinRadius*Math.cos(fanAngle);
-    var xr = x0 - withinRadius*Math.sin(fanAngle)/2;
-    var yr = y0 - withinRadius*Math.cos(fanAngle)/2;
-    ctx.moveTo(x0, y0);
-    ctx.lineTo(x1, y1);
-    ctx.arc(xr, yr, withinRadius/2, Math.PI / 2 - fanAngle,3 * Math.PI / 2 - fanAngle);
-  }
-  ctx.closePath();
-  (node.fillStyle || node.bkType) && ctx.fill();
-  ctx.stroke();
-  ctx.beginPath();
-  ctx.lineWidth = 3;
-  ctx.arc(x0,y0,withinRadius/5,0,2*Math.PI);
-  ctx.closePath();
-  (node.fillStyle || node.bkType) && ctx.fill();
-  ctx.stroke();
-}
-
-// 注册自定义图形库
-export function registerMyShape() {
-  registerNode('electricFan', electricFan);
-  registerNode('pool', pool);
-  registerNode('thermometer', thermometer);
-}
-
-// src\views\data.ts 里面加载到工具栏，第一个就是此自定义图形库