From a9a6a096e66495e5fd95f4b6bb652136b608dd72 Mon Sep 17 00:00:00 2001 From: qiaochuLei <124648559+qiaochuLei@users.noreply.github.com> Date: Thu, 11 Apr 2024 11:11:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E7=99=BB=E5=BD=95ui=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=9B=E4=BF=AE=E5=A4=8D=E3=80=90=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=91=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=8B=BE=E9=80=89=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=A2=AB=E5=88=A0=E9=99=A4=E4=BA=86=EF=BC=8C=E4=B8=8A=E9=9D=A2?= =?UTF-8?q?=E7=9A=84=E2=80=9C=E5=B7=B2=E9=80=89=E6=8B=A9X=E9=A1=B6?= =?UTF-8?q?=E2=80=9D=E6=B2=A1=E6=9C=89=E6=9B=B4=E6=96=B0=EF=BC=9B=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E7=89=A9=E8=81=94=E7=BD=91=E5=8D=A1=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 设备根据标签进行搜索功能 * fix: bug#23370 * fix: bug#17573 * fix: bug#23378 * fix: bug#20292 * fix: bug#23158 * fix: bug#23057 * fix: bug#23583 * fix: bug#23576 * fix: bug#23597、告警等级过长组件优化 * fix: 物联网卡导入逻辑 * fix: 物联网卡导入 * fix: 更多登录ui修改；修复【全局优化】批量删除时，勾选的数据被删除了，上面的“已选择X顶”没有更新；修复物联网卡导入逻辑修改 * fix: 更多登录ui修改 * fix:【全局优化】批量删除时，勾选的数据被删除了，上面的“已选择X顶”没有更新 * fix: 物联网卡导入逻辑修改 * fix: 组织新增排序修改； * fix: 组织新增排序修改 * fix: bug#23669、 23517、23758、23752、23744 * fix: 组件库更新 * fix: bug#23758、23752、23744 * feat: 新增设备根据标签进行搜索功能 * feat: 场景联动条件编辑 * feat: 新增设备根据标签进行搜索功能 * fix: 修改编辑条件名称 --- package-lock.json | 353 +++- package.json | 2 +- src/api/device/instance.ts | 4 +- .../BadgeStatus/CustomBadgeStatus.vue | 53 + src/components/CardBox/index.vue | 12 + src/store/scene.ts | 3 +- src/utils/request.ts | 9 +- .../Collector/Point/Save/SaveBACNet.vue | 22 +- .../Instance/Detail/ChildDevice/index.vue | 172 +- .../Detail/Function/components/Advance.vue | 2 +- .../Detail/Function/components/Simple.vue | 2 +- .../device/Instance/Detail/Info/index.vue | 2 +- .../Instance/Detail/Running/Event/index.vue | 97 +- src/views/device/Instance/Export/index.vue | 30 +- src/views/device/Instance/Import/file.vue | 10 +- src/views/device/Instance/Import/modal.vue | 12 +- src/views/device/Instance/index.vue | 1 + .../Detail/DeviceAccess/accessModal.vue | 2 +- .../device/components/InklingDevice/index.vue | 2 +- .../device/components/Metadata/metadata.ts | 25 +- src/views/edge/Device/index.vue | 1 + .../iot-card/CardManagement/UploadFile.vue | 98 +- src/views/iot-card/CardManagement/index.vue | 53 +- src/views/link/Type/index.vue | 62 +- src/views/media/Device/index.vue | 5 + .../Alarm/Configuration/Save/Base/index.vue | 4 +- .../rule-engine/Alarm/Configuration/index.vue | 110 +- .../Alarm/Log/TabComponent/index.vue | 10 + .../DashBoard/components/NewAlarm.vue | 25 +- .../Scene/Save/components/Terms/Terms.vue | 39 +- .../system/Apply/Save/components/EditForm.vue | 13 + src/views/system/Apply/index.vue | 67 +- .../components/EditDepartmentDialog.vue | 18 +- .../system/Department/components/LeftTree.vue | 14 +- src/views/user/Login/index.vue | 332 ++-- vite.config.ts | 4 +- yarn.lock | 1756 ++++++++++------- 37 files changed, 2248 insertions(+), 1178 deletions(-) create mode 100644 src/components/BadgeStatus/CustomBadgeStatus.vue diff --git a/package-lock.json b/package-lock.json index 7e9e4070..bd0c8c2a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,7 @@ "name": "jetlinks-vue", "version": "0.0.0", "dependencies": { + "@ant-design/icons-vue": "^7.0.1", "@liveqing/liveplayer-v3": "^3.7.10", "@types/marked": "^4.0.8", "@vitejs/plugin-vue-jsx": "^3.0.0", @@ -31,6 +32,7 @@ "nrm": "^1.2.5", "pinia": "^2.0.28", "rollup-plugin-copy": "^3.4.0", + "rxjs": "^7.8.1", "unplugin-auto-import": "^0.12.1", "unplugin-vue-components": "^0.22.12", "v-clipboard3": "^0.1.4", @@ -130,9 +132,9 @@ "integrity": "sha512-EB0iwlKDGpG93hW8f85CTJTs4SvMX7tt5ceupvhALp1IF44SeUFOMhKUOYqpsoYWQKAOuTRDMqn75rEaKDp0Xw==" }, "node_modules/@ant-design/icons-vue": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/@ant-design/icons-vue/-/icons-vue-6.1.0.tgz", - "integrity": "sha512-EX6bYm56V+ZrKN7+3MT/ubDkvJ5rK/O2t380WFRflDcVFgsvl3NLH7Wxeau6R8DbrO5jWR6DSTC3B6gYFp77AA==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/@ant-design/icons-vue/-/icons-vue-7.0.1.tgz", + "integrity": "sha512-eCqY2unfZK6Fe02AwFlDHLfoyEFreP6rBwAZMIJ1LugmfMiVgwWDYlp1YsRugaPtICYOabV1iWxXdP12u9U43Q==", "dependencies": { "@ant-design/colors": "^6.0.0", "@ant-design/icons-svg": "^4.2.1" @@ -1944,6 +1946,32 @@ "resolved": "https://registry.npmmirror.com/@vueuse/metadata/-/metadata-9.12.0.tgz", "integrity": "sha512-9oJ9MM9lFLlmvxXUqsR1wLt1uF7EVbP5iYaHJYqk+G2PbMjY6EXvZeTjbdO89HgoF5cI6z49o2zT/jD9SVoNpQ==" }, + "node_modules/@vueuse/router": { + "version": "9.13.0", + "resolved": "https://registry.npmjs.org/@vueuse/router/-/router-9.13.0.tgz", + "integrity": "sha512-lcL6auSUGMGZMdDzZJb02QDe909AChzMXoxqFS3gL2E8mHmIx0SrNor+33UkqvvBPi18vXpDq/R7tPd9fxWwTg==", + "dependencies": { + "@vueuse/shared": "9.13.0", + "vue-demi": "*" + }, + "funding": { + "url": "https://github.com/sponsors/antfu" + }, + "peerDependencies": { + "vue-router": ">=4.0.0-rc.1" + } + }, + "node_modules/@vueuse/router/node_modules/@vueuse/shared": { + "version": "9.13.0", + "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-9.13.0.tgz", + "integrity": "sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==", + "dependencies": { + "vue-demi": "*" + }, + "funding": { + "url": "https://github.com/sponsors/antfu" + } + }, "node_modules/@vueuse/shared": { "version": "9.12.0", "resolved": "https://registry.npmmirror.com/@vueuse/shared/-/shared-9.12.0.tgz", @@ -2273,6 +2301,18 @@ "vue": ">=3.2.0" } }, + "node_modules/ant-design-vue/node_modules/@ant-design/icons-vue": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@ant-design/icons-vue/-/icons-vue-6.1.0.tgz", + "integrity": "sha512-EX6bYm56V+ZrKN7+3MT/ubDkvJ5rK/O2t380WFRflDcVFgsvl3NLH7Wxeau6R8DbrO5jWR6DSTC3B6gYFp77AA==", + "dependencies": { + "@ant-design/colors": "^6.0.0", + "@ant-design/icons-svg": "^4.2.1" + }, + "peerDependencies": { + "vue": ">=3.0.3" + } + }, "node_modules/anymatch": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", @@ -3015,6 +3055,62 @@ "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==", "dev": true }, + "node_modules/colorpicker-v3": { + "version": "2.10.2", + "resolved": "https://registry.npmjs.org/colorpicker-v3/-/colorpicker-v3-2.10.2.tgz", + "integrity": "sha512-ZWPq5wcugS3NcL7DwYqVSP5mE/x45FK31olGpig+Tko5jUXk0danfEYi1Aei3lgYs+Z0zAfhbhqVuDgOdUs5Mw==", + "dependencies": { + "@vueuse/core": "^7.5.5", + "vue": "^3.2.25" + } + }, + "node_modules/colorpicker-v3/node_modules/@vueuse/core": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-7.7.1.tgz", + "integrity": "sha512-PRRgbATMpoeUmkCEBtUeJgOwtew8s+4UsEd+Pm7MhkjL2ihCNrSqxNVtM6NFE4uP2sWnkGcZpCjPuNSxowJ1Ow==", + "dependencies": { + "@vueuse/shared": "7.7.1", + "vue-demi": "*" + }, + "funding": { + "url": "https://github.com/sponsors/antfu" + }, + "peerDependencies": { + "@vue/composition-api": "^1.1.0", + "vue": "^2.6.0 || ^3.2.0" + }, + "peerDependenciesMeta": { + "@vue/composition-api": { + "optional": true + }, + "vue": { + "optional": true + } + } + }, + "node_modules/colorpicker-v3/node_modules/@vueuse/core/node_modules/@vueuse/shared": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-7.7.1.tgz", + "integrity": "sha512-rN2qd22AUl7VdBxihagWyhUNHCyVk9IpvBTTfHoLH9G7rGE552X1f+zeCfehuno0zXif13jPw+icW/wn2a0rnQ==", + "dependencies": { + "vue-demi": "*" + }, + "funding": { + "url": "https://github.com/sponsors/antfu" + }, + "peerDependencies": { + "@vue/composition-api": "^1.1.0", + "vue": "^2.6.0 || ^3.2.0" + }, + "peerDependenciesMeta": { + "@vue/composition-api": { + "optional": true + }, + "vue": { + "optional": true + } + } + }, "node_modules/combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -7825,11 +7921,15 @@ }, "node_modules/npm/node_modules/ansicolors": { "version": "0.3.2", + "resolved": "http://registry.jetlinks.cn/ansicolors/-/ansicolors-0.3.2.tgz", + "integrity": "sha512-QXu7BPrP29VllRxH8GwB7x5iX5qWKAAMLqKQGWTeLWVlNHNOpVMJ91dsxQAIWXpjuW5wqvxu3Jd/nRjrJ+0pqg==", "inBundle": true, "license": "MIT" }, "node_modules/npm/node_modules/ansistyles": { "version": "0.1.3", + "resolved": "http://registry.jetlinks.cn/ansistyles/-/ansistyles-0.1.3.tgz", + "integrity": "sha512-6QWEyvMgIXX0eO972y7YPBLSBsq7UWKFAoNNTLGaOJ9bstcEL9sCbcjf96dVfNDdUsRoGOK82vWFJlKApXds7g==", "inBundle": true, "license": "MIT" }, @@ -7842,6 +7942,8 @@ }, "node_modules/npm/node_modules/archy": { "version": "1.0.0", + "resolved": "http://registry.jetlinks.cn/archy/-/archy-1.0.0.tgz", + "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==", "inBundle": true, "license": "MIT" }, @@ -8054,6 +8156,8 @@ }, "node_modules/npm/node_modules/cli-columns": { "version": "3.1.2", + "resolved": "http://registry.jetlinks.cn/cli-columns/-/cli-columns-3.1.2.tgz", + "integrity": "sha512-iQYpDgpPPmCjn534ikQOhi+ydP6uMar+DtJ6a0In4aGL/PKqWfao75s6eF81quQQaz7isGz+goNECLARRZswdg==", "inBundle": true, "license": "MIT", "dependencies": { @@ -8195,6 +8299,8 @@ }, "node_modules/npm/node_modules/columnify": { "version": "1.5.4", + "resolved": "http://registry.jetlinks.cn/columnify/-/columnify-1.5.4.tgz", + "integrity": "sha512-rFl+iXVT1nhLQPfGDw+3WcS8rmm7XsLKUmhsGE3ihzzpIikeGrTaZPIRKYWeLsLBypsHzjXIvYEltVUZS84XxQ==", "inBundle": true, "license": "MIT", "dependencies": { @@ -8715,6 +8821,10 @@ }, "node_modules/npm/node_modules/init-package-json": { "version": "2.0.5", + "resolved": "http://registry.jetlinks.cn/init-package-json/-/init-package-json-2.0.5.tgz", + "integrity": "sha512-u1uGAtEFu3VA6HNl/yUWw57jmKEMx8SKOxHhxjGnOFUiIlFnohKDFg4ZrPpv9wWqk44nDxGJAtqjdQFm+9XXQA==", + "resolved": "http://registry.jetlinks.cn/init-package-json/-/init-package-json-2.0.5.tgz", + "integrity": "sha512-u1uGAtEFu3VA6HNl/yUWw57jmKEMx8SKOxHhxjGnOFUiIlFnohKDFg4ZrPpv9wWqk44nDxGJAtqjdQFm+9XXQA==", "inBundle": true, "license": "ISC", "dependencies": { @@ -8747,6 +8857,8 @@ }, "node_modules/npm/node_modules/is-cidr": { "version": "4.0.2", + "resolved": "http://registry.jetlinks.cn/is-cidr/-/is-cidr-4.0.2.tgz", + "integrity": "sha512-z4a1ENUajDbEl/Q6/pVBpTR1nBjjEE1X7qb7bmWYanNnPoKAvUCPFKeXV6Fe4mgTkWKBqiHIcwsI3SndiO5FeA==", "inBundle": true, "license": "BSD-2-Clause", "dependencies": { @@ -8885,6 +8997,8 @@ }, "node_modules/npm/node_modules/libnpmaccess": { "version": "4.0.3", + "resolved": "http://registry.jetlinks.cn/libnpmaccess/-/libnpmaccess-4.0.3.tgz", + "integrity": "sha512-sPeTSNImksm8O2b6/pf3ikv4N567ERYEpeKRPSmqlNt1dTZbvgpJIzg5vAhXHpw2ISBsELFRelk0jEahj1c6nQ==", "inBundle": true, "license": "ISC", "dependencies": { @@ -8899,6 +9013,8 @@ }, "node_modules/npm/node_modules/libnpmdiff": { "version": "2.0.4", + "resolved": "http://registry.jetlinks.cn/libnpmdiff/-/libnpmdiff-2.0.4.tgz", + "integrity": "sha512-q3zWePOJLHwsLEUjZw3Kyu/MJMYfl4tWCg78Vl6QGSfm4aXBUSVzMzjJ6jGiyarsT4d+1NH4B1gxfs62/+y9iQ==", "inBundle": true, "license": "ISC", "dependencies": { @@ -8917,6 +9033,8 @@ }, "node_modules/npm/node_modules/libnpmexec": { "version": "2.0.1", + "resolved": "http://registry.jetlinks.cn/libnpmexec/-/libnpmexec-2.0.1.tgz", + "integrity": "sha512-4SqBB7eJvJWmUKNF42Q5qTOn20DRjEE4TgvEh2yneKlAiRlwlhuS9MNR45juWwmoURJlf2K43bozlVt7OZiIOw==", "inBundle": true, "license": "ISC", "dependencies": { @@ -8938,6 +9056,8 @@ }, "node_modules/npm/node_modules/libnpmfund": { "version": "1.1.0", + "resolved": "http://registry.jetlinks.cn/libnpmfund/-/libnpmfund-1.1.0.tgz", + "integrity": "sha512-Kfmh3pLS5/RGKG5WXEig8mjahPVOxkik6lsbH4iX0si1xxNi6eeUh/+nF1MD+2cgalsQif3O5qyr6mNz2ryJrQ==", "inBundle": true, "license": "ISC", "dependencies": { @@ -8946,6 +9066,8 @@ }, "node_modules/npm/node_modules/libnpmhook": { "version": "6.0.3", + "resolved": "http://registry.jetlinks.cn/libnpmhook/-/libnpmhook-6.0.3.tgz", + "integrity": "sha512-3fmkZJibIybzmAvxJ65PeV3NzRc0m4xmYt6scui5msocThbEp4sKFT80FhgrCERYDjlUuFahU6zFNbJDHbQ++g==", "inBundle": true, "license": "ISC", "dependencies": { @@ -8958,6 +9080,8 @@ }, "node_modules/npm/node_modules/libnpmorg": { "version": "2.0.3", + "resolved": "http://registry.jetlinks.cn/libnpmorg/-/libnpmorg-2.0.3.tgz", + "integrity": "sha512-JSGl3HFeiRFUZOUlGdiNcUZOsUqkSYrg6KMzvPZ1WVZ478i47OnKSS0vkPmX45Pai5mTKuwIqBMcGWG7O8HfdA==", "inBundle": true, "license": "ISC", "dependencies": { @@ -8970,6 +9094,8 @@ }, "node_modules/npm/node_modules/libnpmpack": { "version": "2.0.1", + "resolved": "http://registry.jetlinks.cn/libnpmpack/-/libnpmpack-2.0.1.tgz", + "integrity": "sha512-He4/jxOwlaQ7YG7sIC1+yNeXeUDQt8RLBvpI68R3RzPMZPa4/VpxhlDo8GtBOBDYoU8eq6v1wKL38sq58u4ibQ==", "inBundle": true, "license": "ISC", "dependencies": { @@ -8983,6 +9109,8 @@ }, "node_modules/npm/node_modules/libnpmpublish": { "version": "4.0.2", + "resolved": "http://registry.jetlinks.cn/libnpmpublish/-/libnpmpublish-4.0.2.tgz", + "integrity": "sha512-+AD7A2zbVeGRCFI2aO//oUmapCwy7GHqPXFJh3qpToSRNU+tXKJ2YFUgjt04LPPAf2dlEH95s6EhIHM1J7bmOw==", "inBundle": true, "license": "ISC", "dependencies": { @@ -8998,6 +9126,8 @@ }, "node_modules/npm/node_modules/libnpmsearch": { "version": "3.1.2", + "resolved": "http://registry.jetlinks.cn/libnpmsearch/-/libnpmsearch-3.1.2.tgz", + "integrity": "sha512-BaQHBjMNnsPYk3Bl6AiOeVuFgp72jviShNBw5aHaHNKWqZxNi38iVNoXbo6bG/Ccc/m1To8s0GtMdtn6xZ1HAw==", "inBundle": true, "license": "ISC", "dependencies": { @@ -9009,6 +9139,8 @@ }, "node_modules/npm/node_modules/libnpmteam": { "version": "2.0.4", + "resolved": "http://registry.jetlinks.cn/libnpmteam/-/libnpmteam-2.0.4.tgz", + "integrity": "sha512-FPrVJWv820FZFXaflAEVTLRWZrerCvfe7ZHSMzJ/62EBlho2KFlYKjyNEsPW3JiV7TLSXi3vo8u0gMwIkXSMTw==", "inBundle": true, "license": "ISC", "dependencies": { @@ -9021,6 +9153,8 @@ }, "node_modules/npm/node_modules/libnpmversion": { "version": "1.2.1", + "resolved": "http://registry.jetlinks.cn/libnpmversion/-/libnpmversion-1.2.1.tgz", + "integrity": "sha512-AA7x5CFgBFN+L4/JWobnY5t4OAHjQuPbAwUYJ7/NtHuyLut5meb+ne/aj0n7PWNiTGCJcRw/W6Zd2LoLT7EZuQ==", "inBundle": true, "license": "ISC", "dependencies": { @@ -9322,6 +9456,8 @@ }, "node_modules/npm/node_modules/node-gyp/node_modules/npmlog": { "version": "4.1.2", + "resolved": "http://registry.jetlinks.cn/npmlog/-/npmlog-4.1.2.tgz", + "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "inBundle": true, "license": "ISC", "dependencies": { @@ -9380,6 +9516,8 @@ }, "node_modules/npm/node_modules/npm-audit-report": { "version": "2.1.5", + "resolved": "http://registry.jetlinks.cn/npm-audit-report/-/npm-audit-report-2.1.5.tgz", + "integrity": "sha512-YB8qOoEmBhUH1UJgh1xFAv7Jg1d+xoNhsDYiFQlEFThEBui0W1vIz2ZK6FVg4WZjwEdl7uBQlm1jy3MUfyHeEw==", "inBundle": true, "license": "ISC", "dependencies": { @@ -9468,6 +9606,8 @@ }, "node_modules/npm/node_modules/npm-profile": { "version": "5.0.4", + "resolved": "http://registry.jetlinks.cn/npm-profile/-/npm-profile-5.0.4.tgz", + "integrity": "sha512-OKtU7yoAEBOnc8zJ+/uo5E4ugPp09sopo+6y1njPp+W99P8DvQon3BJYmpvyK2Bf1+3YV5LN1bvgXRoZ1LUJBA==", "inBundle": true, "license": "ISC", "dependencies": { @@ -9497,11 +9637,15 @@ }, "node_modules/npm/node_modules/npm-user-validate": { "version": "1.0.1", + "resolved": "http://registry.jetlinks.cn/npm-user-validate/-/npm-user-validate-1.0.1.tgz", + "integrity": "sha512-uQwcd/tY+h1jnEaze6cdX/LrhWhoBxfSknxentoqmIuStxUExxjWd3ULMLFPiFUrZKbOVMowH6Jq2FRWfmhcEw==", "inBundle": true, "license": "BSD-2-Clause" }, "node_modules/npm/node_modules/npmlog": { "version": "5.0.1", + "resolved": "http://registry.jetlinks.cn/npmlog/-/npmlog-5.0.1.tgz", + "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==", "inBundle": true, "license": "ISC", "dependencies": { @@ -9513,6 +9657,8 @@ }, "node_modules/npm/node_modules/npmlog/node_modules/are-we-there-yet": { "version": "2.0.0", + "resolved": "http://registry.jetlinks.cn/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz", + "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==", "inBundle": true, "license": "ISC", "dependencies": { @@ -9565,6 +9711,8 @@ }, "node_modules/npm/node_modules/opener": { "version": "1.5.2", + "resolved": "http://registry.jetlinks.cn/opener/-/opener-1.5.2.tgz", + "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==", "inBundle": true, "license": "(WTFPL OR MIT)", "bin": { @@ -9723,6 +9871,8 @@ }, "node_modules/npm/node_modules/qrcode-terminal": { "version": "0.12.0", + "resolved": "http://registry.jetlinks.cn/qrcode-terminal/-/qrcode-terminal-0.12.0.tgz", + "integrity": "sha512-EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ==", "inBundle": true, "bin": { "qrcode-terminal": "bin/qrcode-terminal.js" @@ -10155,11 +10305,15 @@ }, "node_modules/npm/node_modules/text-table": { "version": "0.2.0", + "resolved": "http://registry.jetlinks.cn/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", "inBundle": true, "license": "MIT" }, "node_modules/npm/node_modules/tiny-relative-date": { "version": "1.3.0", + "resolved": "http://registry.jetlinks.cn/tiny-relative-date/-/tiny-relative-date-1.3.0.tgz", + "integrity": "sha512-MOQHpzllWxDCHHaDno30hhLfbouoYlOI8YlMNtvKe1zXbjEVhbcEovQxvZrPvtiYW630GQDoMMarCnjfyfHA+A==", "inBundle": true, "license": "MIT" }, @@ -10427,6 +10581,14 @@ "node": ">=6" } }, + "node_modules/onigasm": { + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/onigasm/-/onigasm-2.2.5.tgz", + "integrity": "sha512-F+th54mPc0l1lp1ZcFMyL/jTs2Tlq4SqIHKIXGZOR/VkHkF9A7Fr5rRr5+ZG/lWeRsyrClLYRq7s/yFQ/XhWCA==", + "dependencies": { + "lru-cache": "^5.1.1" + } + }, "node_modules/only": { "version": "0.0.2", "resolved": "https://registry.jetlinks.cn/only/-/only-0.0.2.tgz", @@ -11447,10 +11609,9 @@ } }, "node_modules/rxjs": { - "version": "7.8.0", - "resolved": "https://registry.npmmirror.com/rxjs/-/rxjs-7.8.0.tgz", - "integrity": "sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==", - "dev": true, + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", "dependencies": { "tslib": "^2.1.0" } @@ -11700,6 +11861,11 @@ "tslib": "^2.0.3" } }, + "node_modules/sortablejs": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.2.tgz", + "integrity": "sha512-FJF5jgdfvoKn1MAKSdGs33bIqLi3LmsgVTliuX6iITj834F+JRQZN90Z93yql8h0K2t0RwDPBmxwlbZfDcxNZA==" + }, "node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -12929,6 +13095,22 @@ "vue": "^3.2.37" } }, + "node_modules/vuedraggable": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-4.1.0.tgz", + "integrity": "sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==", + "dependencies": { + "sortablejs": "1.14.0" + }, + "peerDependencies": { + "vue": "^3.0.1" + } + }, + "node_modules/vuedraggable/node_modules/sortablejs": { + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.14.0.tgz", + "integrity": "sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==" + }, "node_modules/warning": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", @@ -13349,9 +13531,9 @@ "integrity": "sha512-EB0iwlKDGpG93hW8f85CTJTs4SvMX7tt5ceupvhALp1IF44SeUFOMhKUOYqpsoYWQKAOuTRDMqn75rEaKDp0Xw==" }, "@ant-design/icons-vue": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/@ant-design/icons-vue/-/icons-vue-6.1.0.tgz", - "integrity": "sha512-EX6bYm56V+ZrKN7+3MT/ubDkvJ5rK/O2t380WFRflDcVFgsvl3NLH7Wxeau6R8DbrO5jWR6DSTC3B6gYFp77AA==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/@ant-design/icons-vue/-/icons-vue-7.0.1.tgz", + "integrity": "sha512-eCqY2unfZK6Fe02AwFlDHLfoyEFreP6rBwAZMIJ1LugmfMiVgwWDYlp1YsRugaPtICYOabV1iWxXdP12u9U43Q==", "requires": { "@ant-design/colors": "^6.0.0", "@ant-design/icons-svg": "^4.2.1" @@ -14683,6 +14865,25 @@ "resolved": "https://registry.npmmirror.com/@vueuse/metadata/-/metadata-9.12.0.tgz", "integrity": "sha512-9oJ9MM9lFLlmvxXUqsR1wLt1uF7EVbP5iYaHJYqk+G2PbMjY6EXvZeTjbdO89HgoF5cI6z49o2zT/jD9SVoNpQ==" }, + "@vueuse/router": { + "version": "9.13.0", + "resolved": "https://registry.npmjs.org/@vueuse/router/-/router-9.13.0.tgz", + "integrity": "sha512-lcL6auSUGMGZMdDzZJb02QDe909AChzMXoxqFS3gL2E8mHmIx0SrNor+33UkqvvBPi18vXpDq/R7tPd9fxWwTg==", + "requires": { + "@vueuse/shared": "9.13.0", + "vue-demi": "*" + }, + "dependencies": { + "@vueuse/shared": { + "version": "9.13.0", + "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-9.13.0.tgz", + "integrity": "sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==", + "requires": { + "vue-demi": "*" + } + } + } + }, "@vueuse/shared": { "version": "9.12.0", "resolved": "https://registry.npmmirror.com/@vueuse/shared/-/shared-9.12.0.tgz", @@ -14975,6 +15176,17 @@ "shallow-equal": "^1.0.0", "vue-types": "^3.0.0", "warning": "^4.0.0" + }, + "dependencies": { + "@ant-design/icons-vue": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@ant-design/icons-vue/-/icons-vue-6.1.0.tgz", + "integrity": "sha512-EX6bYm56V+ZrKN7+3MT/ubDkvJ5rK/O2t380WFRflDcVFgsvl3NLH7Wxeau6R8DbrO5jWR6DSTC3B6gYFp77AA==", + "requires": { + "@ant-design/colors": "^6.0.0", + "@ant-design/icons-svg": "^4.2.1" + } + } } }, "anymatch": { @@ -15578,6 +15790,36 @@ "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==", "dev": true }, + "colorpicker-v3": { + "version": "2.10.2", + "resolved": "https://registry.npmjs.org/colorpicker-v3/-/colorpicker-v3-2.10.2.tgz", + "integrity": "sha512-ZWPq5wcugS3NcL7DwYqVSP5mE/x45FK31olGpig+Tko5jUXk0danfEYi1Aei3lgYs+Z0zAfhbhqVuDgOdUs5Mw==", + "requires": { + "@vueuse/core": "^7.5.5", + "vue": "^3.2.25" + }, + "dependencies": { + "@vueuse/core": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-7.7.1.tgz", + "integrity": "sha512-PRRgbATMpoeUmkCEBtUeJgOwtew8s+4UsEd+Pm7MhkjL2ihCNrSqxNVtM6NFE4uP2sWnkGcZpCjPuNSxowJ1Ow==", + "requires": { + "@vueuse/shared": "7.7.1", + "vue-demi": "*" + }, + "dependencies": { + "@vueuse/shared": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-7.7.1.tgz", + "integrity": "sha512-rN2qd22AUl7VdBxihagWyhUNHCyVk9IpvBTTfHoLH9G7rGE552X1f+zeCfehuno0zXif13jPw+icW/wn2a0rnQ==", + "requires": { + "vue-demi": "*" + } + } + } + } + } + }, "combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -19297,10 +19539,14 @@ }, "ansicolors": { "version": "0.3.2", + "resolved": "http://registry.jetlinks.cn/ansicolors/-/ansicolors-0.3.2.tgz", + "integrity": "sha512-QXu7BPrP29VllRxH8GwB7x5iX5qWKAAMLqKQGWTeLWVlNHNOpVMJ91dsxQAIWXpjuW5wqvxu3Jd/nRjrJ+0pqg==", "bundled": true }, "ansistyles": { "version": "0.1.3", + "resolved": "http://registry.jetlinks.cn/ansistyles/-/ansistyles-0.1.3.tgz", + "integrity": "sha512-6QWEyvMgIXX0eO972y7YPBLSBsq7UWKFAoNNTLGaOJ9bstcEL9sCbcjf96dVfNDdUsRoGOK82vWFJlKApXds7g==", "bundled": true }, "aproba": { @@ -19311,6 +19557,8 @@ }, "archy": { "version": "1.0.0", + "resolved": "http://registry.jetlinks.cn/archy/-/archy-1.0.0.tgz", + "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==", "bundled": true }, "are-we-there-yet": { @@ -19470,6 +19718,8 @@ }, "cli-columns": { "version": "3.1.2", + "resolved": "http://registry.jetlinks.cn/cli-columns/-/cli-columns-3.1.2.tgz", + "integrity": "sha512-iQYpDgpPPmCjn534ikQOhi+ydP6uMar+DtJ6a0In4aGL/PKqWfao75s6eF81quQQaz7isGz+goNECLARRZswdg==", "bundled": true, "requires": { "string-width": "^2.0.0", @@ -19562,6 +19812,8 @@ }, "columnify": { "version": "1.5.4", + "resolved": "http://registry.jetlinks.cn/columnify/-/columnify-1.5.4.tgz", + "integrity": "sha512-rFl+iXVT1nhLQPfGDw+3WcS8rmm7XsLKUmhsGE3ihzzpIikeGrTaZPIRKYWeLsLBypsHzjXIvYEltVUZS84XxQ==", "bundled": true, "requires": { "strip-ansi": "^3.0.0", @@ -19947,6 +20199,8 @@ }, "init-package-json": { "version": "2.0.5", + "resolved": "http://registry.jetlinks.cn/init-package-json/-/init-package-json-2.0.5.tgz", + "integrity": "sha512-u1uGAtEFu3VA6HNl/yUWw57jmKEMx8SKOxHhxjGnOFUiIlFnohKDFg4ZrPpv9wWqk44nDxGJAtqjdQFm+9XXQA==", "bundled": true, "requires": { "npm-package-arg": "^8.1.5", @@ -19970,6 +20224,8 @@ }, "is-cidr": { "version": "4.0.2", + "resolved": "http://registry.jetlinks.cn/is-cidr/-/is-cidr-4.0.2.tgz", + "integrity": "sha512-z4a1ENUajDbEl/Q6/pVBpTR1nBjjEE1X7qb7bmWYanNnPoKAvUCPFKeXV6Fe4mgTkWKBqiHIcwsI3SndiO5FeA==", "bundled": true, "requires": { "cidr-regex": "^3.1.1" @@ -20074,6 +20330,8 @@ }, "libnpmaccess": { "version": "4.0.3", + "resolved": "http://registry.jetlinks.cn/libnpmaccess/-/libnpmaccess-4.0.3.tgz", + "integrity": "sha512-sPeTSNImksm8O2b6/pf3ikv4N567ERYEpeKRPSmqlNt1dTZbvgpJIzg5vAhXHpw2ISBsELFRelk0jEahj1c6nQ==", "bundled": true, "requires": { "aproba": "^2.0.0", @@ -20084,6 +20342,8 @@ }, "libnpmdiff": { "version": "2.0.4", + "resolved": "http://registry.jetlinks.cn/libnpmdiff/-/libnpmdiff-2.0.4.tgz", + "integrity": "sha512-q3zWePOJLHwsLEUjZw3Kyu/MJMYfl4tWCg78Vl6QGSfm4aXBUSVzMzjJ6jGiyarsT4d+1NH4B1gxfs62/+y9iQ==", "bundled": true, "requires": { "@npmcli/disparity-colors": "^1.0.1", @@ -20098,6 +20358,8 @@ }, "libnpmexec": { "version": "2.0.1", + "resolved": "http://registry.jetlinks.cn/libnpmexec/-/libnpmexec-2.0.1.tgz", + "integrity": "sha512-4SqBB7eJvJWmUKNF42Q5qTOn20DRjEE4TgvEh2yneKlAiRlwlhuS9MNR45juWwmoURJlf2K43bozlVt7OZiIOw==", "bundled": true, "requires": { "@npmcli/arborist": "^2.3.0", @@ -20115,6 +20377,8 @@ }, "libnpmfund": { "version": "1.1.0", + "resolved": "http://registry.jetlinks.cn/libnpmfund/-/libnpmfund-1.1.0.tgz", + "integrity": "sha512-Kfmh3pLS5/RGKG5WXEig8mjahPVOxkik6lsbH4iX0si1xxNi6eeUh/+nF1MD+2cgalsQif3O5qyr6mNz2ryJrQ==", "bundled": true, "requires": { "@npmcli/arborist": "^2.5.0" @@ -20122,6 +20386,8 @@ }, "libnpmhook": { "version": "6.0.3", + "resolved": "http://registry.jetlinks.cn/libnpmhook/-/libnpmhook-6.0.3.tgz", + "integrity": "sha512-3fmkZJibIybzmAvxJ65PeV3NzRc0m4xmYt6scui5msocThbEp4sKFT80FhgrCERYDjlUuFahU6zFNbJDHbQ++g==", "bundled": true, "requires": { "aproba": "^2.0.0", @@ -20130,6 +20396,8 @@ }, "libnpmorg": { "version": "2.0.3", + "resolved": "http://registry.jetlinks.cn/libnpmorg/-/libnpmorg-2.0.3.tgz", + "integrity": "sha512-JSGl3HFeiRFUZOUlGdiNcUZOsUqkSYrg6KMzvPZ1WVZ478i47OnKSS0vkPmX45Pai5mTKuwIqBMcGWG7O8HfdA==", "bundled": true, "requires": { "aproba": "^2.0.0", @@ -20138,6 +20406,8 @@ }, "libnpmpack": { "version": "2.0.1", + "resolved": "http://registry.jetlinks.cn/libnpmpack/-/libnpmpack-2.0.1.tgz", + "integrity": "sha512-He4/jxOwlaQ7YG7sIC1+yNeXeUDQt8RLBvpI68R3RzPMZPa4/VpxhlDo8GtBOBDYoU8eq6v1wKL38sq58u4ibQ==", "bundled": true, "requires": { "@npmcli/run-script": "^1.8.3", @@ -20147,6 +20417,8 @@ }, "libnpmpublish": { "version": "4.0.2", + "resolved": "http://registry.jetlinks.cn/libnpmpublish/-/libnpmpublish-4.0.2.tgz", + "integrity": "sha512-+AD7A2zbVeGRCFI2aO//oUmapCwy7GHqPXFJh3qpToSRNU+tXKJ2YFUgjt04LPPAf2dlEH95s6EhIHM1J7bmOw==", "bundled": true, "requires": { "normalize-package-data": "^3.0.2", @@ -20158,6 +20430,8 @@ }, "libnpmsearch": { "version": "3.1.2", + "resolved": "http://registry.jetlinks.cn/libnpmsearch/-/libnpmsearch-3.1.2.tgz", + "integrity": "sha512-BaQHBjMNnsPYk3Bl6AiOeVuFgp72jviShNBw5aHaHNKWqZxNi38iVNoXbo6bG/Ccc/m1To8s0GtMdtn6xZ1HAw==", "bundled": true, "requires": { "npm-registry-fetch": "^11.0.0" @@ -20165,6 +20439,8 @@ }, "libnpmteam": { "version": "2.0.4", + "resolved": "http://registry.jetlinks.cn/libnpmteam/-/libnpmteam-2.0.4.tgz", + "integrity": "sha512-FPrVJWv820FZFXaflAEVTLRWZrerCvfe7ZHSMzJ/62EBlho2KFlYKjyNEsPW3JiV7TLSXi3vo8u0gMwIkXSMTw==", "bundled": true, "requires": { "aproba": "^2.0.0", @@ -20173,6 +20449,8 @@ }, "libnpmversion": { "version": "1.2.1", + "resolved": "http://registry.jetlinks.cn/libnpmversion/-/libnpmversion-1.2.1.tgz", + "integrity": "sha512-AA7x5CFgBFN+L4/JWobnY5t4OAHjQuPbAwUYJ7/NtHuyLut5meb+ne/aj0n7PWNiTGCJcRw/W6Zd2LoLT7EZuQ==", "bundled": true, "requires": { "@npmcli/git": "^2.0.7", @@ -20392,6 +20670,8 @@ }, "npmlog": { "version": "4.1.2", + "resolved": "http://registry.jetlinks.cn/npmlog/-/npmlog-4.1.2.tgz", + "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "bundled": true, "requires": { "are-we-there-yet": "~1.1.2", @@ -20436,6 +20716,8 @@ }, "npm-audit-report": { "version": "2.1.5", + "resolved": "http://registry.jetlinks.cn/npm-audit-report/-/npm-audit-report-2.1.5.tgz", + "integrity": "sha512-YB8qOoEmBhUH1UJgh1xFAv7Jg1d+xoNhsDYiFQlEFThEBui0W1vIz2ZK6FVg4WZjwEdl7uBQlm1jy3MUfyHeEw==", "bundled": true, "requires": { "chalk": "^4.0.0" @@ -20502,6 +20784,8 @@ }, "npm-profile": { "version": "5.0.4", + "resolved": "http://registry.jetlinks.cn/npm-profile/-/npm-profile-5.0.4.tgz", + "integrity": "sha512-OKtU7yoAEBOnc8zJ+/uo5E4ugPp09sopo+6y1njPp+W99P8DvQon3BJYmpvyK2Bf1+3YV5LN1bvgXRoZ1LUJBA==", "bundled": true, "requires": { "npm-registry-fetch": "^11.0.0" @@ -20523,10 +20807,14 @@ }, "npm-user-validate": { "version": "1.0.1", + "resolved": "http://registry.jetlinks.cn/npm-user-validate/-/npm-user-validate-1.0.1.tgz", + "integrity": "sha512-uQwcd/tY+h1jnEaze6cdX/LrhWhoBxfSknxentoqmIuStxUExxjWd3ULMLFPiFUrZKbOVMowH6Jq2FRWfmhcEw==", "bundled": true }, "npmlog": { "version": "5.0.1", + "resolved": "http://registry.jetlinks.cn/npmlog/-/npmlog-5.0.1.tgz", + "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==", "bundled": true, "requires": { "are-we-there-yet": "^2.0.0", @@ -20537,6 +20825,8 @@ "dependencies": { "are-we-there-yet": { "version": "2.0.0", + "resolved": "http://registry.jetlinks.cn/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz", + "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==", "bundled": true, "requires": { "delegates": "^1.0.0", @@ -20574,6 +20864,8 @@ }, "opener": { "version": "1.5.2", + "resolved": "http://registry.jetlinks.cn/opener/-/opener-1.5.2.tgz", + "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==", "bundled": true }, "p-map": { @@ -20688,6 +20980,8 @@ }, "qrcode-terminal": { "version": "0.12.0", + "resolved": "http://registry.jetlinks.cn/qrcode-terminal/-/qrcode-terminal-0.12.0.tgz", + "integrity": "sha512-EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ==", "bundled": true }, "qs": { @@ -20994,10 +21288,14 @@ }, "text-table": { "version": "0.2.0", + "resolved": "http://registry.jetlinks.cn/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", "bundled": true }, "tiny-relative-date": { "version": "1.3.0", + "resolved": "http://registry.jetlinks.cn/tiny-relative-date/-/tiny-relative-date-1.3.0.tgz", + "integrity": "sha512-MOQHpzllWxDCHHaDno30hhLfbouoYlOI8YlMNtvKe1zXbjEVhbcEovQxvZrPvtiYW630GQDoMMarCnjfyfHA+A==", "bundled": true }, "treeverse": { @@ -21250,6 +21548,14 @@ "mimic-fn": "^2.1.0" } }, + "onigasm": { + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/onigasm/-/onigasm-2.2.5.tgz", + "integrity": "sha512-F+th54mPc0l1lp1ZcFMyL/jTs2Tlq4SqIHKIXGZOR/VkHkF9A7Fr5rRr5+ZG/lWeRsyrClLYRq7s/yFQ/XhWCA==", + "requires": { + "lru-cache": "^5.1.1" + } + }, "only": { "version": "0.0.2", "resolved": "https://registry.jetlinks.cn/only/-/only-0.0.2.tgz", @@ -22037,10 +22343,9 @@ } }, "rxjs": { - "version": "7.8.0", - "resolved": "https://registry.npmmirror.com/rxjs/-/rxjs-7.8.0.tgz", - "integrity": "sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==", - "dev": true, + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", "requires": { "tslib": "^2.1.0" } @@ -22254,6 +22559,11 @@ "tslib": "^2.0.3" } }, + "sortablejs": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.2.tgz", + "integrity": "sha512-FJF5jgdfvoKn1MAKSdGs33bIqLi3LmsgVTliuX6iITj834F+JRQZN90Z93yql8h0K2t0RwDPBmxwlbZfDcxNZA==" + }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -23156,6 +23466,21 @@ "vue": "^3.2.37" } }, + "vuedraggable": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-4.1.0.tgz", + "integrity": "sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==", + "requires": { + "sortablejs": "1.14.0" + }, + "dependencies": { + "sortablejs": { + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.14.0.tgz", + "integrity": "sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==" + } + } + }, "warning": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", diff --git a/package.json b/package.json index bbf571d7..a7d8fd58 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "event-source-polyfill": "^1.0.31", "global": "^4.4.0", "jetlinks-store": "^0.0.3", - "jetlinks-ui-components": "^1.0.34-12", + "jetlinks-ui-components": "^1.0.38", "js-cookie": "^3.0.1", "jsencrypt": "^3.3.2", "less": "^4.1.3", diff --git a/src/api/device/instance.ts b/src/api/device/instance.ts index dbcc52df..a4fad8de 100644 --- a/src/api/device/instance.ts +++ b/src/api/device/instance.ts @@ -115,7 +115,7 @@ export const deviceImport = (productId: string, fileUrl: string, autoDeploy: boo * @returns */ export const deviceExport = (productId: string, type: string, params?: any) => server.get(`/device-instance${!!productId ? `/${productId}` : ''}/export.${type}`, params, {responseType: 'blob'}) - +export const deviceExportPath = (productId: string, type: string) => (`${BASE_API_PATH}/device-instance${!!productId ? `/${productId}` : ''}/export.${type}`) /** * 验证设备ID是否重复 * @param id 设备id @@ -607,7 +607,7 @@ export const metadataMapById = (type: 'device' | 'product', productId: string, d export const getMetadataMapById = (type: 'device' | 'product', productId: string) => server.get(`/device/metadata/mapping/${type}/${productId}`) -export const getInkingDevices = (data: string[],pluginId:any) => server.post(`/plugin/mapping/device/${pluginId}/_all`, data) +export const getInkingDevices = (data: string[],accessId:any) => server.post(`/plugin/mapping/device/${accessId}/_all`, data) export const getProtocolMetadata = (id: string, transport: string) => server.get(`/protocol/${id}/${transport}/metadata`) diff --git a/src/components/BadgeStatus/CustomBadgeStatus.vue b/src/components/BadgeStatus/CustomBadgeStatus.vue new file mode 100644 index 00000000..8bb8cb7c --- /dev/null +++ b/src/components/BadgeStatus/CustomBadgeStatus.vue @@ -0,0 +1,53 @@ + + + + diff --git a/src/components/CardBox/index.vue b/src/components/CardBox/index.vue index acf5955f..f2c5dc3d 100644 --- a/src/components/CardBox/index.vue +++ b/src/components/CardBox/index.vue @@ -52,10 +52,17 @@ >
+ +
@@ -89,6 +96,7 @@ \ No newline at end of file + diff --git a/src/views/rule-engine/Alarm/Log/TabComponent/index.vue b/src/views/rule-engine/Alarm/Log/TabComponent/index.vue index 002fb2b8..83b19e34 100644 --- a/src/views/rule-engine/Alarm/Log/TabComponent/index.vue +++ b/src/views/rule-engine/Alarm/Log/TabComponent/index.vue @@ -33,6 +33,7 @@ 4: 'level4', 5: 'level5', }" + :customBadge="true" > +