diff --git a/nezha-fronted/package-lock.json b/nezha-fronted/package-lock.json index 733cf7072..7a474cab9 100644 --- a/nezha-fronted/package-lock.json +++ b/nezha-fronted/package-lock.json @@ -1433,44 +1433,43 @@ } }, "@topology/activity-diagram": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@topology/activity-diagram/-/activity-diagram-0.3.0.tgz", - "integrity": "sha512-9uceHdbT1MY++/2crNlZmFMVmz6sI4OqH7aUQuBT8q9RDXA7t2prFd7lx4UfaIyQqDYtYtpeCHLPlhRLsEooZg==" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@topology/activity-diagram/-/activity-diagram-1.1.0.tgz", + "integrity": "sha512-T4o/baMiTjnRgs7pPu/V2zTIMzBuBLZd8m78/dTzRkcf9CxuBrqgeh0EYDb9xgQ0DZDjdnZpZNJKLVpmCon18A==" }, "@topology/chart-diagram": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@topology/chart-diagram/-/chart-diagram-0.3.0.tgz", - "integrity": "sha512-WUfb62Op0QxS976cNqrJ1Xaq+pfURwpo67H3TENWb+OhoNfiBl9IDANxTr1UIPLYfsjqgN3Y/8lxkL33jEl/aQ==" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@topology/chart-diagram/-/chart-diagram-1.1.0.tgz", + "integrity": "sha512-9b4s91FiIhv9DPm54c1cktW7PHDmL/TcREgij4Vdz/mGBtt+qg9DNjLosBcwshXDgD1/oQ8qTd24uRUcMOhWMw==" }, "@topology/class-diagram": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@topology/class-diagram/-/class-diagram-0.3.0.tgz", - "integrity": "sha512-J+qKEg/+3EyyZotP2TbZtM+NcOeRh2PIEwzBZGS6KOU5RvBi4NMRO2DQNN++q8Zpb7RG7WYGAaTB2H4+YcXJzA==" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@topology/class-diagram/-/class-diagram-1.1.0.tgz", + "integrity": "sha512-pFCGC7pBorMA8kPiAPKLeBp9VjHXs8FRMujTjFAUpJxQGRAZzjnuVq0pB32me9Vc/Ckp1/pH6S0JgD+poVA5CA==" }, "@topology/core": { - "version": "0.5.33", - "resolved": "https://registry.npmmirror.com/@topology/core/download/@topology/core-0.5.33.tgz", - "integrity": "sha1-aS5eoCUEDbrh/TGxl2rCXmdu8ww=", + "version": "1.1.32", + "resolved": "https://registry.npmjs.org/@topology/core/-/core-1.1.32.tgz", + "integrity": "sha512-ZpRzW0ERxBMFcdujT7VpZVY8t7B+OEMXVhuY+vQ8a++LTG/SIWT3ib8EhYw4cJM4BaIUtOOyDPYHpFk4SOl0KA==", "requires": { - "le5le-store": "^1.0.7", "mitt": "^2.1.0", "mqtt": "^4.2.6" } }, "@topology/flow-diagram": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@topology/flow-diagram/-/flow-diagram-0.3.0.tgz", - "integrity": "sha512-GPV+CIbclzYgCO/lMePDfLY0OzAr1+7nyzMOVdABXezvlIw/zm59+2/KYQu5XGUqBoqjvjdrd4hbN8eYAKWZQw==" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@topology/flow-diagram/-/flow-diagram-1.1.1.tgz", + "integrity": "sha512-hvlEDQ97DLTII0XIB8V3SQ55ywN+n3GqSkM8Fp9oImKXFSFYf9WYtiaMihB3fqnHJnR9EYDx57ehRFF5k5+gxA==" }, - "@topology/layout": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@topology/layout/-/layout-0.3.0.tgz", - "integrity": "sha512-t9SSU7RroRfnKO3K5cfsB7eIfE2jW/t7O+79nVGgNqQljxaCSG8wQPWw6BqnmYJ072uHf85z1QUIjjboSEHupg==" + "@topology/form-diagram": { + "version": "1.1.32", + "resolved": "https://registry.npmjs.org/@topology/form-diagram/-/form-diagram-1.1.32.tgz", + "integrity": "sha512-omPPIyZmibjpe/cv+yB+3quSStW+4Pi43M4TO7ExV2lb7FlWJpXC8aPch+PSo6iQi06nAM9HOILSIaog7Hofug==" }, "@topology/sequence-diagram": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@topology/sequence-diagram/-/sequence-diagram-0.3.0.tgz", - "integrity": "sha512-qSLXKd//lW5jb/e7nMRwxRWz/bXmkourVHBmZ2cRulZPe0KTeLiE/LkYJ+ffDFNDdCIYedHBC+CeQc3PULCqRQ==" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@topology/sequence-diagram/-/sequence-diagram-1.1.0.tgz", + "integrity": "sha512-/DUqVXS1mCLpDJbfRQbMfduYy65OEq4QQjsqvMB6xGYD+L1+4CMRPI8lHsUyQcjOmBJrCfro5oJC0g6PWjGJDg==" }, "@types/babel__core": { "version": "7.1.19", @@ -3988,7 +3987,7 @@ }, "clipboard": { "version": "2.0.11", - "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.11.tgz", + "resolved": "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.11.tgz", "integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==", "requires": { "good-listener": "^1.2.2", @@ -6133,7 +6132,7 @@ }, "delegate": { "version": "3.2.0", - "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz", + "resolved": "https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz", "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==" }, "delegates": { @@ -8445,7 +8444,7 @@ }, "good-listener": { "version": "1.2.2", - "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz", + "resolved": "https://registry.npmmirror.com/good-listener/-/good-listener-1.2.2.tgz", "integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==", "requires": { "delegate": "^3.1.2" @@ -10993,8 +10992,8 @@ }, "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.npmjs.org/le5le-store/-/le5le-store-1.0.7.tgz", + "integrity": "sha512-8XnDf8RUoHsKXUQHSw2vHEbEw4UbDHGulw/r/YRXf2NA1EUvMD/UUjGvbMAB1vz3UN8smvOxR6CTyjpK/Zhn2w==" }, "leaflet": { "version": "1.7.1", @@ -11591,8 +11590,8 @@ }, "mitt": { "version": "2.1.0", - "resolved": "https://registry.nlark.com/mitt/download/mitt-2.1.0.tgz?cache=0&sync_timestamp=1624483449786&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fmitt%2Fdownload%2Fmitt-2.1.0.tgz", - "integrity": "sha1-90BXfCMXbGIFsSGylzUU6t4bIjA=" + "resolved": "https://registry.npmjs.org/mitt/-/mitt-2.1.0.tgz", + "integrity": "sha512-ILj2TpLiysu2wkBbWjAmww7TkZb65aiQO+DkVdUTBpBXq+MHYiETENkKFMtsJZX1Lf4pe4QOrTSjIfUwN5lRdg==" }, "mixin-deep": { "version": "1.3.2", @@ -16361,7 +16360,7 @@ }, "select": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz", + "resolved": "https://registry.npmmirror.com/select/-/select-1.1.2.tgz", "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==" }, "select-hose": { @@ -17837,7 +17836,7 @@ }, "tiny-emitter": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz", + "resolved": "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz", "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==" }, "tinycolor2": { @@ -18521,7 +18520,7 @@ }, "vue-clipboard2": { "version": "0.3.3", - "resolved": "https://registry.npmjs.org/vue-clipboard2/-/vue-clipboard2-0.3.3.tgz", + "resolved": "https://registry.npmmirror.com/vue-clipboard2/-/vue-clipboard2-0.3.3.tgz", "integrity": "sha512-aNWXIL2DKgJyY/1OOeITwAQz1fHaCIGvUFHf9h8UcoQBG5a74MkdhS/xqoYe7DNZdQmZRL+TAdIbtUs9OyVjbw==", "requires": { "clipboard": "^2.0.0" diff --git a/nezha-fronted/package.json b/nezha-fronted/package.json index dce217c72..fa2e1a22e 100644 --- a/nezha-fronted/package.json +++ b/nezha-fronted/package.json @@ -25,13 +25,13 @@ "@riophae/vue-treeselect": "^0.4.0", "@svgdotjs/svg.js": "^3.0.16", "@svgdotjs/svg.panzoom.js": "^2.1.1", - "@topology/activity-diagram": "^0.3.0", - "@topology/chart-diagram": "^0.3.0", - "@topology/class-diagram": "^0.3.0", - "@topology/core": "0.5.33", - "@topology/flow-diagram": "^0.3.0", - "@topology/layout": "^0.3.0", - "@topology/sequence-diagram": "^0.3.0", + "@topology/activity-diagram": "^1.1.0", + "@topology/chart-diagram": "^1.1.0", + "@topology/class-diagram": "^1.1.0", + "@topology/core": "^1.1.32", + "@topology/flow-diagram": "^1.1.1", + "@topology/form-diagram": "^1.1.32", + "@topology/sequence-diagram": "^1.1.0", "axios": "^0.19.0", "codemirror-promql": "^0.19.0", "cytoscape": "^3.15.2", @@ -46,6 +46,7 @@ "intro.js": "^5.1.0", "jspdf": "^2.5.1", "jszip": "^3.9.1", + "le5le-store": "^1.0.7", "leaflet": "^1.7.1", "moment-timezone": "^0.5.33", "mqtt": "4.2.6", diff --git a/nezha-fronted/src/assets/css/common/checkbox.scss b/nezha-fronted/src/assets/css/common/checkbox.scss index 01eab0c60..274660ad9 100644 --- a/nezha-fronted/src/assets/css/common/checkbox.scss +++ b/nezha-fronted/src/assets/css/common/checkbox.scss @@ -8,8 +8,8 @@ background-color: $--color-primary !important; } .el-checkbox__input.is-checked.is-disabled .el-checkbox__inner{ - background-color: $--background-color-empty !important; - border-color: $--border-color-base !important; + //background-color: $--background-color-empty !important; + //border-color: $--border-color-base !important; } .el-checkbox__input.is-disabled .el-checkbox__inner{ background-color: $--background-color-empty !important; @@ -19,7 +19,7 @@ border-color: $--border-color-base !important; } .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after { - display: none !important; + //display: none !important; } .el-checkbox__input.is-disabled{ width: 16px !important; diff --git a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue index c5f1c68bd..40b0ce567 100644 --- a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue +++ b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue @@ -312,21 +312,20 @@ diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue index c978b2b50..252744398 100644 --- a/nezha-fronted/src/components/common/project/topologyL5.vue +++ b/nezha-fronted/src/components/common/project/topologyL5.vue @@ -336,22 +336,37 @@