Skip to content

T
topology-ui
提交 5ee6b811 authored 作者: jianglw's avatar jianglw
浏览文件
操作

修改部分代码

上级 50349fa8
隐藏空白字符变更
内嵌 并排
正在显示 包含 141 行增加 和 70 行删除
package-lock.json
浏览文件 @ 5ee6b811
......@@ -1221,23 +1221,23 @@
},
"@topology/activity-diagram": {
"version": "0.5.0",
"resolved": "https://registry.nlark.com/@topology/activity-diagram/download/@topology/activity-diagram-0.5.0.tgz",
"integrity": "sha1-5iRBaJ2MZRYng5faEoLWGbU2Zf0="
"resolved": "https://registry.npmmirror.com/@topology/activity-diagram/-/activity-diagram-0.5.0.tgz",
"integrity": "sha512-0QTDlw54J7Uix5UfIEowHNURsx7dD4VKo+nnELXynwNZ8keMzJ8pikBwar6hLcA36WlsIc/wYm712CJwWBPmhA=="
},
"@topology/chart-diagram": {
"version": "0.5.3",
"resolved": "https://registry.npmmirror.com/@topology/chart-diagram/download/@topology/chart-diagram-0.5.3.tgz",
"integrity": "sha1-vXyHI82764fdUoGH0jT7sLVOnFU="
"resolved": "https://registry.npmmirror.com/@topology/chart-diagram/-/chart-diagram-0.5.3.tgz",
"integrity": "sha512-SfgUOnHZVn5x+UZ4eTul/3nYqCHu7KJLz94fvsEvg2CMrsovcH9reiq18WwdjTgzTdSuyiwtomvbsJxAbHTGiw=="
},
"@topology/class-diagram": {
"version": "0.3.0",
"resolved": "https://registry.npm.taobao.org/@topology/class-diagram/download/@topology/class-diagram-0.3.0.tgz",
"integrity": "sha1-ruNwnNZXzSnxu67fyh2pjTKP894="
"resolved": "https://registry.npmmirror.com/@topology/class-diagram/-/class-diagram-0.3.0.tgz",
"integrity": "sha512-J+qKEg/+3EyyZotP2TbZtM+NcOeRh2PIEwzBZGS6KOU5RvBi4NMRO2DQNN++q8Zpb7RG7WYGAaTB2H4+YcXJzA=="
},
"@topology/core": {
"version": "0.5.34",
"resolved": "https://registry.npmmirror.com/@topology/core/download/@topology/core-0.5.34.tgz",
"integrity": "sha512-CAxxki9DWz9vSRDBEGpWU6XafYh87F2pIIVrt6xCZEfNiPREZV9sC7f1Gv4TVxFocc4jlID+ieP536dvt0usuQ==",
"version": "0.5.38",
"resolved": "https://registry.npmmirror.com/@topology/core/-/core-0.5.38.tgz",
"integrity": "sha512-a4IA++DDn8YFqdsfhpTvgGxhRBm//JoX637aJspXXRq0G51XMgUbiJ+SqfACykqbvZI4lG++1feWlnNqv+8KTg==",
"requires": {
"le5le-store": "^1.0.7",
"mitt": "^2.1.0",
......@@ -1246,8 +1246,8 @@
},
"@topology/flow-diagram": {
"version": "0.3.0",
"resolved": "https://registry.npm.taobao.org/@topology/flow-diagram/download/@topology/flow-diagram-0.3.0.tgz",
"integrity": "sha1-aHwZKeTxVbYZrimhKh3wlFduH8w="
"resolved": "https://registry.npmmirror.com/@topology/flow-diagram/-/flow-diagram-0.3.0.tgz",
"integrity": "sha512-GPV+CIbclzYgCO/lMePDfLY0OzAr1+7nyzMOVdABXezvlIw/zm59+2/KYQu5XGUqBoqjvjdrd4hbN8eYAKWZQw=="
},
"@topology/layout": {
"version": "0.3.0",
......@@ -1256,8 +1256,8 @@
},
"@topology/sequence-diagram": {
"version": "0.3.0",
"resolved": "https://registry.npm.taobao.org/@topology/sequence-diagram/download/@topology/sequence-diagram-0.3.0.tgz",
"integrity": "sha1-063nziEbofjNcpOOCSsTE68aCy0="
"resolved": "https://registry.npmmirror.com/@topology/sequence-diagram/-/sequence-diagram-0.3.0.tgz",
"integrity": "sha512-qSLXKd//lW5jb/e7nMRwxRWz/bXmkourVHBmZ2cRulZPe0KTeLiE/LkYJ+ffDFNDdCIYedHBC+CeQc3PULCqRQ=="
},
"@types/anymatch": {
"version": "1.3.1",
......@@ -2818,8 +2818,8 @@
},
"bl": {
"version": "4.1.0",
"resolved": "https://registry.npm.taobao.org/bl/download/bl-4.1.0.tgz?cache=0&sync_timestamp=1612867124041&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbl%2Fdownload%2Fbl-4.1.0.tgz",
"integrity": "sha1-RRU1JkGCvsL7vIOmKrmM8R2fezo=",
"resolved": "https://registry.npmmirror.com/bl/-/bl-4.1.0.tgz",
"integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
"requires": {
"buffer": "^5.5.0",
"inherits": "^2.0.4",
......@@ -2828,8 +2828,8 @@
"dependencies": {
"buffer": {
"version": "5.7.1",
"resolved": "https://registry.npm.taobao.org/buffer/download/buffer-5.7.1.tgz?cache=0&sync_timestamp=1606098189689&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbuffer%2Fdownload%2Fbuffer-5.7.1.tgz",
"integrity": "sha1-umLnwTEzBTWCGXFghRqPZI6Z7tA=",
"resolved": "https://registry.npmmirror.com/buffer/-/buffer-5.7.1.tgz",
"integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
"requires": {
"base64-js": "^1.3.1",
"ieee754": "^1.1.13"
......@@ -2837,8 +2837,8 @@
},
"readable-stream": {
"version": "3.6.0",
"resolved": "https://registry.npm.taobao.org/readable-stream/download/readable-stream-3.6.0.tgz",
"integrity": "sha1-M3u9o63AcGvT4CRCaihtS0sskZg=",
"resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.0.tgz",
"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
"requires": {
"inherits": "^2.0.3",
"string_decoder": "^1.1.1",
......@@ -3734,8 +3734,8 @@
},
"commist": {
"version": "1.1.0",
"resolved": "https://registry.npm.taobao.org/commist/download/commist-1.1.0.tgz",
"integrity": "sha1-F4EexpePbBXuTegMRcm+t3zuNdU=",
"resolved": "https://registry.npmmirror.com/commist/-/commist-1.1.0.tgz",
"integrity": "sha512-rraC8NXWOEjhADbZe9QBNzLAN5Q3fsTPQtBV+fEVj6xKIgDgNiEVE6ZNfHpZOqfQ21YUzfVNUXLOEZquYvQPPg==",
"requires": {
"leven": "^2.1.0",
"minimist": "^1.1.0"
......@@ -6264,8 +6264,8 @@
},
"help-me": {
"version": "3.0.0",
"resolved": "https://registry.nlark.com/help-me/download/help-me-3.0.0.tgz",
"integrity": "sha1-mAPIG180atK84sagugG4IlfTGeg=",
"resolved": "https://registry.npmmirror.com/help-me/-/help-me-3.0.0.tgz",
"integrity": "sha512-hx73jClhyk910sidBB7ERlnhMlFsJJIBqSVMFDwPN8o2v9nmp5KgLq1Xz1Bf1fCMMZ6mPrX159iG0VLy/fPMtQ==",
"requires": {
"glob": "^7.1.6",
"readable-stream": "^3.6.0"
......@@ -6273,8 +6273,8 @@
"dependencies": {
"readable-stream": {
"version": "3.6.0",
"resolved": "https://registry.npm.taobao.org/readable-stream/download/readable-stream-3.6.0.tgz",
"integrity": "sha1-M3u9o63AcGvT4CRCaihtS0sskZg=",
"resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.0.tgz",
"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
"requires": {
"inherits": "^2.0.3",
"string_decoder": "^1.1.1",
......@@ -7281,6 +7281,11 @@
"easy-stack": "^1.0.1"
}
},
"js-sdsl": {
"version": "2.1.4",
"resolved": "https://registry.npmmirror.com/js-sdsl/-/js-sdsl-2.1.4.tgz",
"integrity": "sha512-/Ew+CJWHNddr7sjwgxaVeIORIH4AMVC9dy0hPf540ZGMVgS9d3ajwuVdyhDt6/QUvT8ATjR3yuYBKsS79F+H4A=="
},
"js-tokens": {
"version": "4.0.0",
"resolved": "https://registry.npm.taobao.org/js-tokens/download/js-tokens-4.0.0.tgz",
......@@ -7426,13 +7431,13 @@
},
"le5le-store": {
"version": "1.0.7",
"resolved": "https://registry.npm.taobao.org/le5le-store/download/le5le-store-1.0.7.tgz",
"integrity": "sha1-c0F+AMvT2KEBCzF5VJYyOt/HvEc="
"resolved": "https://registry.npmmirror.com/le5le-store/-/le5le-store-1.0.7.tgz",
"integrity": "sha512-8XnDf8RUoHsKXUQHSw2vHEbEw4UbDHGulw/r/YRXf2NA1EUvMD/UUjGvbMAB1vz3UN8smvOxR6CTyjpK/Zhn2w=="
},
"leven": {
"version": "2.1.0",
"resolved": "https://registry.npm.taobao.org/leven/download/leven-2.1.0.tgz",
"integrity": "sha1-wuep93IJTe6dNCAq6KzORoeHVYA="
"resolved": "https://registry.npmmirror.com/leven/-/leven-2.1.0.tgz",
"integrity": "sha512-nvVPLpIHUxCUoRLrFqTgSxXJ614d8AgQoWl7zPe/2VadE8+1dpU3LBhowRuBAcuwruWtOdD8oYC9jDNJjXDPyA=="
},
"levn": {
"version": "0.3.0",
......@@ -7971,8 +7976,8 @@
},
"mitt": {
"version": "2.1.0",
"resolved": "https://registry.npm.taobao.org/mitt/download/mitt-2.1.0.tgz",
"integrity": "sha1-90BXfCMXbGIFsSGylzUU6t4bIjA="
"resolved": "https://registry.npmmirror.com/mitt/-/mitt-2.1.0.tgz",
"integrity": "sha512-ILj2TpLiysu2wkBbWjAmww7TkZb65aiQO+DkVdUTBpBXq+MHYiETENkKFMtsJZX1Lf4pe4QOrTSjIfUwN5lRdg=="
},
"mixin-deep": {
"version": "1.3.2",
......@@ -8021,9 +8026,9 @@
}
},
"mqtt": {
"version": "4.2.8",
"resolved": "https://registry.nlark.com/mqtt/download/mqtt-4.2.8.tgz",
"integrity": "sha1-8OVLE4vNrvbFXFR7Ok3pz5B0IIw=",
"version": "4.3.7",
"resolved": "https://registry.npmmirror.com/mqtt/-/mqtt-4.3.7.tgz",
"integrity": "sha512-ew3qwG/TJRorTz47eW46vZ5oBw5MEYbQZVaEji44j5lAUSQSqIEoul7Kua/BatBW0H0kKQcC9kwUHa1qzaWHSw==",
"requires": {
"commist": "^1.0.0",
"concat-stream": "^2.0.0",
......@@ -8031,20 +8036,23 @@
"duplexify": "^4.1.1",
"help-me": "^3.0.0",
"inherits": "^2.0.3",
"lru-cache": "^6.0.0",
"minimist": "^1.2.5",
"mqtt-packet": "^6.8.0",
"number-allocator": "^1.0.9",
"pump": "^3.0.0",
"readable-stream": "^3.6.0",
"reinterval": "^1.1.0",
"rfdc": "^1.3.0",
"split2": "^3.1.0",
"ws": "^7.5.0",
"ws": "^7.5.5",
"xtend": "^4.0.2"
},
"dependencies": {
"concat-stream": {
"version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/concat-stream/download/concat-stream-2.0.0.tgz",
"integrity": "sha1-QUz1r3kKSMYKub5FJ9VtXkETPLE=",
"resolved": "https://registry.npmmirror.com/concat-stream/-/concat-stream-2.0.0.tgz",
"integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==",
"requires": {
"buffer-from": "^1.0.0",
"inherits": "^2.0.3",
......@@ -8054,8 +8062,8 @@
},
"duplexify": {
"version": "4.1.2",
"resolved": "https://registry.nlark.com/duplexify/download/duplexify-4.1.2.tgz?cache=0&sync_timestamp=1626860849590&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fduplexify%2Fdownload%2Fduplexify-4.1.2.tgz",
"integrity": "sha1-GLT40oKJEy+guVc8iY2fkD+Bx7A=",
"resolved": "https://registry.npmmirror.com/duplexify/-/duplexify-4.1.2.tgz",
"integrity": "sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw==",
"requires": {
"end-of-stream": "^1.4.1",
"inherits": "^2.0.3",
......@@ -8063,10 +8071,18 @@
"stream-shift": "^1.0.0"
}
},
"lru-cache": {
"version": "6.0.0",
"resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz",
"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
"requires": {
"yallist": "^4.0.0"
}
},
"readable-stream": {
"version": "3.6.0",
"resolved": "https://registry.npm.taobao.org/readable-stream/download/readable-stream-3.6.0.tgz",
"integrity": "sha1-M3u9o63AcGvT4CRCaihtS0sskZg=",
"resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.0.tgz",
"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
"requires": {
"inherits": "^2.0.3",
"string_decoder": "^1.1.1",
......@@ -8074,16 +8090,21 @@
}
},
"ws": {
"version": "7.5.6",
"resolved": "https://registry.npmmirror.com/ws/download/ws-7.5.6.tgz",
"integrity": "sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA=="
"version": "7.5.7",
"resolved": "https://registry.npmmirror.com/ws/-/ws-7.5.7.tgz",
"integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A=="
},
"yallist": {
"version": "4.0.0",
"resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
}
}
},
"mqtt-packet": {
"version": "6.10.0",
"resolved": "https://registry.nlark.com/mqtt-packet/download/mqtt-packet-6.10.0.tgz",
"integrity": "sha1-yLUHgyxBUuPlEcDvoQSuSmTNQY8=",
"resolved": "https://registry.npmmirror.com/mqtt-packet/-/mqtt-packet-6.10.0.tgz",
"integrity": "sha512-ja8+mFKIHdB1Tpl6vac+sktqy3gA8t9Mduom1BA75cI+R9AHnZOiaBQwpGiWnaVJLDGRdNhQmFaAqd7tkKSMGA==",
"requires": {
"bl": "^4.0.2",
"debug": "^4.1.1",
......@@ -8443,6 +8464,15 @@
"integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
"dev": true
},
"number-allocator": {
"version": "1.0.10",
"resolved": "https://registry.npmmirror.com/number-allocator/-/number-allocator-1.0.10.tgz",
"integrity": "sha512-K4AvNGKo9lP6HqsZyfSr9KDaqnwFzW203inhQEOwFrmFaYevpdX4VNwdOLk197aHujzbT//z6pCBrCOUYSM5iw==",
"requires": {
"debug": "^4.3.1",
"js-sdsl": "^2.1.2"
}
},
"number-is-nan": {
"version": "1.0.1",
"resolved": "https://registry.npm.taobao.org/number-is-nan/download/number-is-nan-1.0.1.tgz",
......@@ -10129,8 +10159,8 @@
},
"reinterval": {
"version": "1.1.0",
"resolved": "https://registry.npm.taobao.org/reinterval/download/reinterval-1.1.0.tgz",
"integrity": "sha1-M2Hs+jymwYKDOA3Qu5VG85D17Oc="
"resolved": "https://registry.npmmirror.com/reinterval/-/reinterval-1.1.0.tgz",
"integrity": "sha512-QIRet3SYrGp0HUHO88jVskiG6seqUGC5iAG7AwI/BV4ypGcuqk9Du6YQBUOUqm9c8pw1eyLoIaONifRua1lsEQ=="
},
"relateurl": {
"version": "0.2.7",
......@@ -10291,6 +10321,11 @@
"integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
"dev": true
},
"rfdc": {
"version": "1.3.0",
"resolved": "https://registry.npmmirror.com/rfdc/-/rfdc-1.3.0.tgz",
"integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA=="
},
"rgb-regex": {
"version": "1.0.1",
"resolved": "https://registry.npm.taobao.org/rgb-regex/download/rgb-regex-1.0.1.tgz",
......@@ -11045,16 +11080,16 @@
},
"split2": {
"version": "3.2.2",
"resolved": "https://registry.npm.taobao.org/split2/download/split2-3.2.2.tgz",
"integrity": "sha1-vyzyo32DgxLCSciSBv16F90SNl8=",
"resolved": "https://registry.npmmirror.com/split2/-/split2-3.2.2.tgz",
"integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
"requires": {
"readable-stream": "^3.0.0"
},
"dependencies": {
"readable-stream": {
"version": "3.6.0",
"resolved": "https://registry.npm.taobao.org/readable-stream/download/readable-stream-3.6.0.tgz",
"integrity": "sha1-M3u9o63AcGvT4CRCaihtS0sskZg=",
"resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.0.tgz",
"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
"requires": {
"inherits": "^2.0.3",
"string_decoder": "^1.1.1",
......
src/utils/ruoyi.js
浏览文件 @ 5ee6b811
......@@ -58,7 +58,7 @@ export function addDateRange(params, dateRange, propName) {
var search = params;
search.params = {};
if (null != dateRange && '' != dateRange) {
if (typeof(propName) === "undefined") {
if (typeof (propName) === "undefined") {
search.params["beginTime"] = dateRange[0];
search.params["endTime"] = dateRange[1];
} else {
......@@ -68,7 +68,32 @@ export function addDateRange(params, dateRange, propName) {
}
return search;
}
/**
* 获取url上的token
* @returns
*/
export function urlParse() {
let url = window.location.search;
let obj = {};
let reg = /[?&][^?&]+=[^?&]+/g;
let arr = url.match(reg);
// ['?id=12345', '&a=b']
let token = '';
if (arr) {
arr.forEach((item) => {
let tempArr = item.substring(1).split('=');
let key = decodeURIComponent(tempArr[0]);
let val = decodeURIComponent(tempArr[1]);
console.log(key)
if (key === 'token') {
token = val;
return;
}
obj[key] = val;
});
}
return token;
};
// 回显数据字典
export function selectDictLabel(datas, value) {
var actions = [];
......
src/views/topology/Preview.vue
浏览文件 @ 5ee6b811
<template>
<div style="overflow: hidden">
<div id="topology-hrhx" style="width: 100%; height: 100vh;overflow: hidden"></div>
<div
id="topology-hrhx"
style="width: 100%; height: 100vh; overflow: hidden"
></div>
<div class="tools">
<a-button type="primary" @click="onBack">
<a-icon type="left" /> 返回
......@@ -21,15 +24,16 @@
import { Topology } from "@topology/core";
export const Data = "";
import { encryption, decrypt } from "@/utils/rsautils.js";
import {getTopologyId} from "@/api/topology.js"
import { getTopologyId } from "@/api/topology.js";
import { urlParse } from "@/utils/ruoyi";
export default {
name:"Preview",
name: "Preview",
data() {
return {
canvas: {},
locked: 0,
showTools: true,
topologyData:null
topologyData: null,
};
},
created() {},
......@@ -76,24 +80,31 @@ export default {
this.topologyData = {};
});
if (this.topologyData) {
let data = JSON.parse(this.topologyData);
data.websocket = data.websocket + "/" + urlParse()===''?null:urlParse();
this.topologyData=JSON.stringify(data)
}
this.canvas.open(this.topologyData);
this.canvas.data.locked = 1;
// 或 用window.topology对象 === 上面的canvas
// topology.open(json);
// 4. 如果json发送变化，重绘
this.canvas.render();
this.onSizeWindow();
topology.data.socketEvent = true;
topology.on("websocket", (e) => {
let msg = JSON.parse(e);
if (msg.code) {
if (msg.code === 200) {
this.$message.success(msg.msg);
} else {
this.$message.error(msg.msg);
}
}
});
this.$nextTick(()=>{
this.onSizeWindow();
})
// topology.data.socketEvent = true;
// topology.on("websocket", (e) => {
// let msg = JSON.parse(e);
// if (msg.code) {
// if (msg.code === 200) {
// this.$message.success(msg.msg);
// } else {
// this.$message.error(msg.msg);
// }
// }
// });
},
},
};
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论