From 2cbb851948a843dbdd393c4dff85a8635455b945 Mon Sep 17 00:00:00 2001 From: Nuro <1617285096@qq.com> Date: Tue, 21 Mar 2023 20:18:41 +0800 Subject: [PATCH 01/16] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E7=BC=93=E5=AD=98=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/LayoutMain/index.vue | 4 ++-- src/router/modules/project.router.ts | 7 +++++++ .../project/layout/components/ProjectLayoutSider/index.vue | 3 +-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/layout/components/LayoutMain/index.vue b/src/layout/components/LayoutMain/index.vue index 9c9d9a2a..62737471 100644 --- a/src/layout/components/LayoutMain/index.vue +++ b/src/layout/components/LayoutMain/index.vue @@ -2,12 +2,12 @@ diff --git a/src/router/modules/project.router.ts b/src/router/modules/project.router.ts index 45f51f15..5d0b8e0b 100644 --- a/src/router/modules/project.router.ts +++ b/src/router/modules/project.router.ts @@ -46,4 +46,11 @@ const projectRoutes: RouteRecordRaw = { ] } +projectRoutes.children?.forEach(child => { + child.meta = { + ...child.meta, + key: 'reuse-project' + } +}) + export default projectRoutes diff --git a/src/views/project/layout/components/ProjectLayoutSider/index.vue b/src/views/project/layout/components/ProjectLayoutSider/index.vue index c7b963e0..e84a00f8 100644 --- a/src/views/project/layout/components/ProjectLayoutSider/index.vue +++ b/src/views/project/layout/components/ProjectLayoutSider/index.vue @@ -45,8 +45,7 @@ const collapsed = ref(false) const { getAsideCollapsedWidth } = toRefs(useSettingStore()) const route = useRoute() -const routeRame = computed(() => route.name) -const menuValue = ref(routeRame) +const menuValue = computed(() => route.name) const menuOptions = menuOptionsInit() From 4bb3c34bc29468a0f2f7e147fdc4294b065cf1bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Czxzsxf=E2=80=9D?= <187384130@qq.com> Date: Sun, 26 Mar 2023 16:09:55 +0800 Subject: [PATCH 02/16] =?UTF-8?q?fix:=20dock=E6=A8=A1=E5=BC=8F=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E6=A0=8F=E4=BC=9A=E9=81=AE=E6=8C=A1=E6=BB=9A=E5=8A=A8?= =?UTF-8?q?=E6=9D=A1=E9=97=AE=E9=A2=98=EF=BC=8C=E5=B7=A5=E5=85=B7=E6=A0=8F?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=9A=90=E8=97=8F=E6=97=B6=EF=BC=8C=E9=BC=A0?= =?UTF-8?q?=E6=A0=87=E6=82=AC=E5=81=9C=E5=9C=A8=E4=B8=8B=E6=96=B9=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E6=A0=8F=E9=97=AA=E7=83=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/EditTools/index.vue | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/views/chart/ContentEdit/components/EditTools/index.vue b/src/views/chart/ContentEdit/components/EditTools/index.vue index 0d2dd895..197a82c5 100644 --- a/src/views/chart/ContentEdit/components/EditTools/index.vue +++ b/src/views/chart/ContentEdit/components/EditTools/index.vue @@ -322,6 +322,15 @@ $asideBottom: 70px; border-radius: 25px; } } + &::after { + content: ''; + position: absolute; + left: 0; + width: 100%; + height: 10px; + bottom: -10px; + cursor: pointer; + } } /* 最小化 */ &.isMini { @@ -348,6 +357,7 @@ $asideBottom: 70px; 50% { opacity: 0; bottom: calc(#{$dockMiniBottom} - 10px); + pointer-events: none; } 100% { opacity: 1; @@ -362,15 +372,6 @@ $asideBottom: 70px; display: none; } } - &::after { - content: ''; - position: absolute; - left: 0; - width: 100%; - height: 20px; - bottom: -20px; - cursor: pointer; - } } } From 55221ff756b6c24db90463701e3225b7540164c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?= <1262327911@qq.com> Date: Mon, 27 Mar 2023 10:32:52 +0800 Subject: [PATCH 03/16] =?UTF-8?q?perf:=20=E5=A4=84=E7=90=86=20alive?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/LayoutMain/index.vue | 8 ++---- .../components/LayoutTransitionMain/index.vue | 28 +++++++++---------- src/router/modules/project.router.ts | 7 ----- 3 files changed, 16 insertions(+), 27 deletions(-) diff --git a/src/layout/components/LayoutMain/index.vue b/src/layout/components/LayoutMain/index.vue index 62737471..11cc3bbc 100644 --- a/src/layout/components/LayoutMain/index.vue +++ b/src/layout/components/LayoutMain/index.vue @@ -1,13 +1,9 @@ + + diff --git a/src/packages/components/Charts/Mores/Graph/data.json b/src/packages/components/Charts/Mores/Graph/data.json new file mode 100644 index 00000000..4d8470ac --- /dev/null +++ b/src/packages/components/Charts/Mores/Graph/data.json @@ -0,0 +1,1744 @@ +{ + "nodes": [ + { + "id": "0", + "name": "Myriel", + "symbolSize": 19.12381, + "x": -266.82776, + "y": 299.6904, + "value": 28.685715, + "category": 0 + }, + { + "id": "1", + "name": "Napoleon", + "symbolSize": 2.6666666666666665, + "x": -418.08344, + "y": 446.8853, + "value": 4, + "category": 0 + }, + { + "id": "2", + "name": "MlleBaptistine", + "symbolSize": 6.323809333333333, + "x": -212.76357, + "y": 245.29176, + "value": 9.485714, + "category": 1 + }, + { + "id": "3", + "name": "MmeMagloire", + "symbolSize": 6.323809333333333, + "x": -242.82404, + "y": 235.26283, + "value": 9.485714, + "category": 1 + }, + { + "id": "4", + "name": "CountessDeLo", + "symbolSize": 2.6666666666666665, + "x": -379.30386, + "y": 429.06424, + "value": 4, + "category": 0 + }, + { + "id": "5", + "name": "Geborand", + "symbolSize": 2.6666666666666665, + "x": -417.26337, + "y": 406.03506, + "value": 4, + "category": 0 + }, + { + "id": "6", + "name": "Champtercier", + "symbolSize": 2.6666666666666665, + "x": -332.6012, + "y": 485.16974, + "value": 4, + "category": 0 + }, + { + "id": "7", + "name": "Cravatte", + "symbolSize": 2.6666666666666665, + "x": -382.69568, + "y": 475.09113, + "value": 4, + "category": 0 + }, + { + "id": "8", + "name": "Count", + "symbolSize": 2.6666666666666665, + "x": -320.384, + "y": 387.17325, + "value": 4, + "category": 0 + }, + { + "id": "9", + "name": "OldMan", + "symbolSize": 2.6666666666666665, + "x": -344.39832, + "y": 451.16772, + "value": 4, + "category": 0 + }, + { + "id": "10", + "name": "Labarre", + "symbolSize": 2.6666666666666665, + "x": -89.34107, + "y": 234.56128, + "value": 4, + "category": 1 + }, + { + "id": "11", + "name": "Valjean", + "symbolSize": 66.66666666666667, + "x": -87.93029, + "y": -6.8120565, + "value": 100, + "category": 1 + }, + { + "id": "12", + "name": "Marguerite", + "symbolSize": 4.495239333333333, + "x": -339.77908, + "y": -184.69139, + "value": 6.742859, + "category": 1 + }, + { + "id": "13", + "name": "MmeDeR", + "symbolSize": 2.6666666666666665, + "x": -194.31313, + "y": 178.55301, + "value": 4, + "category": 1 + }, + { + "id": "14", + "name": "Isabeau", + "symbolSize": 2.6666666666666665, + "x": -158.05168, + "y": 201.99768, + "value": 4, + "category": 1 + }, + { + "id": "15", + "name": "Gervais", + "symbolSize": 2.6666666666666665, + "x": -127.701546, + "y": 242.55057, + "value": 4, + "category": 1 + }, + { + "id": "16", + "name": "Tholomyes", + "symbolSize": 17.295237333333333, + "x": -385.2226, + "y": -393.5572, + "value": 25.942856, + "category": 2 + }, + { + "id": "17", + "name": "Listolier", + "symbolSize": 13.638097333333334, + "x": -516.55884, + "y": -393.98975, + "value": 20.457146, + "category": 2 + }, + { + "id": "18", + "name": "Fameuil", + "symbolSize": 13.638097333333334, + "x": -464.79382, + "y": -493.57944, + "value": 20.457146, + "category": 2 + }, + { + "id": "19", + "name": "Blacheville", + "symbolSize": 13.638097333333334, + "x": -515.1624, + "y": -456.9891, + "value": 20.457146, + "category": 2 + }, + { + "id": "20", + "name": "Favourite", + "symbolSize": 13.638097333333334, + "x": -408.12122, + "y": -464.5048, + "value": 20.457146, + "category": 2 + }, + { + "id": "21", + "name": "Dahlia", + "symbolSize": 13.638097333333334, + "x": -456.44113, + "y": -425.13303, + "value": 20.457146, + "category": 2 + }, + { + "id": "22", + "name": "Zephine", + "symbolSize": 13.638097333333334, + "x": -459.1107, + "y": -362.5133, + "value": 20.457146, + "category": 2 + }, + { + "id": "23", + "name": "Fantine", + "symbolSize": 28.266666666666666, + "x": -313.42786, + "y": -289.44803, + "value": 42.4, + "category": 2 + }, + { + "id": "24", + "name": "MmeThenardier", + "symbolSize": 20.95238266666667, + "x": 4.6313396, + "y": -273.8517, + "value": 31.428574, + "category": 7 + }, + { + "id": "25", + "name": "Thenardier", + "symbolSize": 30.095235333333335, + "x": 82.80825, + "y": -203.1144, + "value": 45.142853, + "category": 7 + }, + { + "id": "26", + "name": "Cosette", + "symbolSize": 20.95238266666667, + "x": 78.64646, + "y": -31.512747, + "value": 31.428574, + "category": 6 + }, + { + "id": "27", + "name": "Javert", + "symbolSize": 31.923806666666668, + "x": -81.46074, + "y": -204.20204, + "value": 47.88571, + "category": 7 + }, + { + "id": "28", + "name": "Fauchelevent", + "symbolSize": 8.152382000000001, + "x": -225.73984, + "y": 82.41631, + "value": 12.228573, + "category": 4 + }, + { + "id": "29", + "name": "Bamatabois", + "symbolSize": 15.466666666666667, + "x": -385.6842, + "y": -20.206686, + "value": 23.2, + "category": 3 + }, + { + "id": "30", + "name": "Perpetue", + "symbolSize": 4.495239333333333, + "x": -403.92447, + "y": -197.69823, + "value": 6.742859, + "category": 2 + }, + { + "id": "31", + "name": "Simplice", + "symbolSize": 8.152382000000001, + "x": -281.4253, + "y": -158.45137, + "value": 12.228573, + "category": 2 + }, + { + "id": "32", + "name": "Scaufflaire", + "symbolSize": 2.6666666666666665, + "x": -122.41348, + "y": 210.37503, + "value": 4, + "category": 1 + }, + { + "id": "33", + "name": "Woman1", + "symbolSize": 4.495239333333333, + "x": -234.6001, + "y": -113.15067, + "value": 6.742859, + "category": 1 + }, + { + "id": "34", + "name": "Judge", + "symbolSize": 11.809524666666666, + "x": -387.84915, + "y": 58.7059, + "value": 17.714287, + "category": 3 + }, + { + "id": "35", + "name": "Champmathieu", + "symbolSize": 11.809524666666666, + "x": -338.2307, + "y": 87.48405, + "value": 17.714287, + "category": 3 + }, + { + "id": "36", + "name": "Brevet", + "symbolSize": 11.809524666666666, + "x": -453.26874, + "y": 58.94648, + "value": 17.714287, + "category": 3 + }, + { + "id": "37", + "name": "Chenildieu", + "symbolSize": 11.809524666666666, + "x": -386.44904, + "y": 140.05937, + "value": 17.714287, + "category": 3 + }, + { + "id": "38", + "name": "Cochepaille", + "symbolSize": 11.809524666666666, + "x": -446.7876, + "y": 123.38005, + "value": 17.714287, + "category": 3 + }, + { + "id": "39", + "name": "Pontmercy", + "symbolSize": 6.323809333333333, + "x": 336.49738, + "y": -269.55914, + "value": 9.485714, + "category": 6 + }, + { + "id": "40", + "name": "Boulatruelle", + "symbolSize": 2.6666666666666665, + "x": 29.187843, + "y": -460.13132, + "value": 4, + "category": 7 + }, + { + "id": "41", + "name": "Eponine", + "symbolSize": 20.95238266666667, + "x": 238.36697, + "y": -210.00926, + "value": 31.428574, + "category": 7 + }, + { + "id": "42", + "name": "Anzelma", + "symbolSize": 6.323809333333333, + "x": 189.69513, + "y": -346.50662, + "value": 9.485714, + "category": 7 + }, + { + "id": "43", + "name": "Woman2", + "symbolSize": 6.323809333333333, + "x": -187.00418, + "y": -145.02663, + "value": 9.485714, + "category": 6 + }, + { + "id": "44", + "name": "MotherInnocent", + "symbolSize": 4.495239333333333, + "x": -252.99521, + "y": 129.87549, + "value": 6.742859, + "category": 4 + }, + { + "id": "45", + "name": "Gribier", + "symbolSize": 2.6666666666666665, + "x": -296.07935, + "y": 163.11964, + "value": 4, + "category": 4 + }, + { + "id": "46", + "name": "Jondrette", + "symbolSize": 2.6666666666666665, + "x": 550.3201, + "y": 522.4031, + "value": 4, + "category": 5 + }, + { + "id": "47", + "name": "MmeBurgon", + "symbolSize": 4.495239333333333, + "x": 488.13535, + "y": 356.8573, + "value": 6.742859, + "category": 5 + }, + { + "id": "48", + "name": "Gavroche", + "symbolSize": 41.06667066666667, + "x": 387.89572, + "y": 110.462326, + "value": 61.600006, + "category": 8 + }, + { + "id": "49", + "name": "Gillenormand", + "symbolSize": 13.638097333333334, + "x": 126.4831, + "y": 68.10622, + "value": 20.457146, + "category": 6 + }, + { + "id": "50", + "name": "Magnon", + "symbolSize": 4.495239333333333, + "x": 127.07365, + "y": -113.05923, + "value": 6.742859, + "category": 6 + }, + { + "id": "51", + "name": "MlleGillenormand", + "symbolSize": 13.638097333333334, + "x": 162.63559, + "y": 117.6565, + "value": 20.457146, + "category": 6 + }, + { + "id": "52", + "name": "MmePontmercy", + "symbolSize": 4.495239333333333, + "x": 353.66415, + "y": -205.89165, + "value": 6.742859, + "category": 6 + }, + { + "id": "53", + "name": "MlleVaubois", + "symbolSize": 2.6666666666666665, + "x": 165.43939, + "y": 339.7736, + "value": 4, + "category": 6 + }, + { + "id": "54", + "name": "LtGillenormand", + "symbolSize": 8.152382000000001, + "x": 137.69348, + "y": 196.1069, + "value": 12.228573, + "category": 6 + }, + { + "id": "55", + "name": "Marius", + "symbolSize": 35.58095333333333, + "x": 206.44687, + "y": -13.805411, + "value": 53.37143, + "category": 6 + }, + { + "id": "56", + "name": "BaronessT", + "symbolSize": 4.495239333333333, + "x": 194.82993, + "y": 224.78036, + "value": 6.742859, + "category": 6 + }, + { + "id": "57", + "name": "Mabeuf", + "symbolSize": 20.95238266666667, + "x": 597.6618, + "y": 135.18481, + "value": 31.428574, + "category": 8 + }, + { + "id": "58", + "name": "Enjolras", + "symbolSize": 28.266666666666666, + "x": 355.78366, + "y": -74.882454, + "value": 42.4, + "category": 8 + }, + { + "id": "59", + "name": "Combeferre", + "symbolSize": 20.95238266666667, + "x": 515.2961, + "y": -46.167564, + "value": 31.428574, + "category": 8 + }, + { + "id": "60", + "name": "Prouvaire", + "symbolSize": 17.295237333333333, + "x": 614.29285, + "y": -69.3104, + "value": 25.942856, + "category": 8 + }, + { + "id": "61", + "name": "Feuilly", + "symbolSize": 20.95238266666667, + "x": 550.1917, + "y": -128.17537, + "value": 31.428574, + "category": 8 + }, + { + "id": "62", + "name": "Courfeyrac", + "symbolSize": 24.609526666666667, + "x": 436.17184, + "y": -12.7286825, + "value": 36.91429, + "category": 8 + }, + { + "id": "63", + "name": "Bahorel", + "symbolSize": 22.780953333333333, + "x": 602.55225, + "y": 16.421427, + "value": 34.17143, + "category": 8 + }, + { + "id": "64", + "name": "Bossuet", + "symbolSize": 24.609526666666667, + "x": 455.81955, + "y": -115.45826, + "value": 36.91429, + "category": 8 + }, + { + "id": "65", + "name": "Joly", + "symbolSize": 22.780953333333333, + "x": 516.40784, + "y": 47.242233, + "value": 34.17143, + "category": 8 + }, + { + "id": "66", + "name": "Grantaire", + "symbolSize": 19.12381, + "x": 646.4313, + "y": -151.06331, + "value": 28.685715, + "category": 8 + }, + { + "id": "67", + "name": "MotherPlutarch", + "symbolSize": 2.6666666666666665, + "x": 668.9568, + "y": 204.65488, + "value": 4, + "category": 8 + }, + { + "id": "68", + "name": "Gueulemer", + "symbolSize": 19.12381, + "x": 78.4799, + "y": -347.15146, + "value": 28.685715, + "category": 7 + }, + { + "id": "69", + "name": "Babet", + "symbolSize": 19.12381, + "x": 150.35959, + "y": -298.50797, + "value": 28.685715, + "category": 7 + }, + { + "id": "70", + "name": "Claquesous", + "symbolSize": 19.12381, + "x": 137.3717, + "y": -410.2809, + "value": 28.685715, + "category": 7 + }, + { + "id": "71", + "name": "Montparnasse", + "symbolSize": 17.295237333333333, + "x": 234.87747, + "y": -400.85983, + "value": 25.942856, + "category": 7 + }, + { + "id": "72", + "name": "Toussaint", + "symbolSize": 6.323809333333333, + "x": 40.942253, + "y": 113.78272, + "value": 9.485714, + "category": 1 + }, + { + "id": "73", + "name": "Child1", + "symbolSize": 4.495239333333333, + "x": 437.939, + "y": 291.58234, + "value": 6.742859, + "category": 8 + }, + { + "id": "74", + "name": "Child2", + "symbolSize": 4.495239333333333, + "x": 466.04922, + "y": 283.3606, + "value": 6.742859, + "category": 8 + }, + { + "id": "75", + "name": "Brujon", + "symbolSize": 13.638097333333334, + "x": 238.79364, + "y": -314.06345, + "value": 20.457146, + "category": 7 + }, + { + "id": "76", + "name": "MmeHucheloup", + "symbolSize": 13.638097333333334, + "x": 712.18353, + "y": 4.8131495, + "value": 20.457146, + "category": 8 + } + ], + "links": [ + { + "source": "1", + "target": "0" + }, + { + "source": "2", + "target": "0" + }, + { + "source": "3", + "target": "0" + }, + { + "source": "3", + "target": "2" + }, + { + "source": "4", + "target": "0" + }, + { + "source": "5", + "target": "0" + }, + { + "source": "6", + "target": "0" + }, + { + "source": "7", + "target": "0" + }, + { + "source": "8", + "target": "0" + }, + { + "source": "9", + "target": "0" + }, + { + "source": "11", + "target": "0" + }, + { + "source": "11", + "target": "2" + }, + { + "source": "11", + "target": "3" + }, + { + "source": "11", + "target": "10" + }, + { + "source": "12", + "target": "11" + }, + { + "source": "13", + "target": "11" + }, + { + "source": "14", + "target": "11" + }, + { + "source": "15", + "target": "11" + }, + { + "source": "17", + "target": "16" + }, + { + "source": "18", + "target": "16" + }, + { + "source": "18", + "target": "17" + }, + { + "source": "19", + "target": "16" + }, + { + "source": "19", + "target": "17" + }, + { + "source": "19", + "target": "18" + }, + { + "source": "20", + "target": "16" + }, + { + "source": "20", + "target": "17" + }, + { + "source": "20", + "target": "18" + }, + { + "source": "20", + "target": "19" + }, + { + "source": "21", + "target": "16" + }, + { + "source": "21", + "target": "17" + }, + { + "source": "21", + "target": "18" + }, + { + "source": "21", + "target": "19" + }, + { + "source": "21", + "target": "20" + }, + { + "source": "22", + "target": "16" + }, + { + "source": "22", + "target": "17" + }, + { + "source": "22", + "target": "18" + }, + { + "source": "22", + "target": "19" + }, + { + "source": "22", + "target": "20" + }, + { + "source": "22", + "target": "21" + }, + { + "source": "23", + "target": "11" + }, + { + "source": "23", + "target": "12" + }, + { + "source": "23", + "target": "16" + }, + { + "source": "23", + "target": "17" + }, + { + "source": "23", + "target": "18" + }, + { + "source": "23", + "target": "19" + }, + { + "source": "23", + "target": "20" + }, + { + "source": "23", + "target": "21" + }, + { + "source": "23", + "target": "22" + }, + { + "source": "24", + "target": "11" + }, + { + "source": "24", + "target": "23" + }, + { + "source": "25", + "target": "11" + }, + { + "source": "25", + "target": "23" + }, + { + "source": "25", + "target": "24" + }, + { + "source": "26", + "target": "11" + }, + { + "source": "26", + "target": "16" + }, + { + "source": "26", + "target": "24" + }, + { + "source": "26", + "target": "25" + }, + { + "source": "27", + "target": "11" + }, + { + "source": "27", + "target": "23" + }, + { + "source": "27", + "target": "24" + }, + { + "source": "27", + "target": "25" + }, + { + "source": "27", + "target": "26" + }, + { + "source": "28", + "target": "11" + }, + { + "source": "28", + "target": "27" + }, + { + "source": "29", + "target": "11" + }, + { + "source": "29", + "target": "23" + }, + { + "source": "29", + "target": "27" + }, + { + "source": "30", + "target": "23" + }, + { + "source": "31", + "target": "11" + }, + { + "source": "31", + "target": "23" + }, + { + "source": "31", + "target": "27" + }, + { + "source": "31", + "target": "30" + }, + { + "source": "32", + "target": "11" + }, + { + "source": "33", + "target": "11" + }, + { + "source": "33", + "target": "27" + }, + { + "source": "34", + "target": "11" + }, + { + "source": "34", + "target": "29" + }, + { + "source": "35", + "target": "11" + }, + { + "source": "35", + "target": "29" + }, + { + "source": "35", + "target": "34" + }, + { + "source": "36", + "target": "11" + }, + { + "source": "36", + "target": "29" + }, + { + "source": "36", + "target": "34" + }, + { + "source": "36", + "target": "35" + }, + { + "source": "37", + "target": "11" + }, + { + "source": "37", + "target": "29" + }, + { + "source": "37", + "target": "34" + }, + { + "source": "37", + "target": "35" + }, + { + "source": "37", + "target": "36" + }, + { + "source": "38", + "target": "11" + }, + { + "source": "38", + "target": "29" + }, + { + "source": "38", + "target": "34" + }, + { + "source": "38", + "target": "35" + }, + { + "source": "38", + "target": "36" + }, + { + "source": "38", + "target": "37" + }, + { + "source": "39", + "target": "25" + }, + { + "source": "40", + "target": "25" + }, + { + "source": "41", + "target": "24" + }, + { + "source": "41", + "target": "25" + }, + { + "source": "42", + "target": "24" + }, + { + "source": "42", + "target": "25" + }, + { + "source": "42", + "target": "41" + }, + { + "source": "43", + "target": "11" + }, + { + "source": "43", + "target": "26" + }, + { + "source": "43", + "target": "27" + }, + { + "source": "44", + "target": "11" + }, + { + "source": "44", + "target": "28" + }, + { + "source": "45", + "target": "28" + }, + { + "source": "47", + "target": "46" + }, + { + "source": "48", + "target": "11" + }, + { + "source": "48", + "target": "25" + }, + { + "source": "48", + "target": "27" + }, + { + "source": "48", + "target": "47" + }, + { + "source": "49", + "target": "11" + }, + { + "source": "49", + "target": "26" + }, + { + "source": "50", + "target": "24" + }, + { + "source": "50", + "target": "49" + }, + { + "source": "51", + "target": "11" + }, + { + "source": "51", + "target": "26" + }, + { + "source": "51", + "target": "49" + }, + { + "source": "52", + "target": "39" + }, + { + "source": "52", + "target": "51" + }, + { + "source": "53", + "target": "51" + }, + { + "source": "54", + "target": "26" + }, + { + "source": "54", + "target": "49" + }, + { + "source": "54", + "target": "51" + }, + { + "source": "55", + "target": "11" + }, + { + "source": "55", + "target": "16" + }, + { + "source": "55", + "target": "25" + }, + { + "source": "55", + "target": "26" + }, + { + "source": "55", + "target": "39" + }, + { + "source": "55", + "target": "41" + }, + { + "source": "55", + "target": "48" + }, + { + "source": "55", + "target": "49" + }, + { + "source": "55", + "target": "51" + }, + { + "source": "55", + "target": "54" + }, + { + "source": "56", + "target": "49" + }, + { + "source": "56", + "target": "55" + }, + { + "source": "57", + "target": "41" + }, + { + "source": "57", + "target": "48" + }, + { + "source": "57", + "target": "55" + }, + { + "source": "58", + "target": "11" + }, + { + "source": "58", + "target": "27" + }, + { + "source": "58", + "target": "48" + }, + { + "source": "58", + "target": "55" + }, + { + "source": "58", + "target": "57" + }, + { + "source": "59", + "target": "48" + }, + { + "source": "59", + "target": "55" + }, + { + "source": "59", + "target": "57" + }, + { + "source": "59", + "target": "58" + }, + { + "source": "60", + "target": "48" + }, + { + "source": "60", + "target": "58" + }, + { + "source": "60", + "target": "59" + }, + { + "source": "61", + "target": "48" + }, + { + "source": "61", + "target": "55" + }, + { + "source": "61", + "target": "57" + }, + { + "source": "61", + "target": "58" + }, + { + "source": "61", + "target": "59" + }, + { + "source": "61", + "target": "60" + }, + { + "source": "62", + "target": "41" + }, + { + "source": "62", + "target": "48" + }, + { + "source": "62", + "target": "55" + }, + { + "source": "62", + "target": "57" + }, + { + "source": "62", + "target": "58" + }, + { + "source": "62", + "target": "59" + }, + { + "source": "62", + "target": "60" + }, + { + "source": "62", + "target": "61" + }, + { + "source": "63", + "target": "48" + }, + { + "source": "63", + "target": "55" + }, + { + "source": "63", + "target": "57" + }, + { + "source": "63", + "target": "58" + }, + { + "source": "63", + "target": "59" + }, + { + "source": "63", + "target": "60" + }, + { + "source": "63", + "target": "61" + }, + { + "source": "63", + "target": "62" + }, + { + "source": "64", + "target": "11" + }, + { + "source": "64", + "target": "48" + }, + { + "source": "64", + "target": "55" + }, + { + "source": "64", + "target": "57" + }, + { + "source": "64", + "target": "58" + }, + { + "source": "64", + "target": "59" + }, + { + "source": "64", + "target": "60" + }, + { + "source": "64", + "target": "61" + }, + { + "source": "64", + "target": "62" + }, + { + "source": "64", + "target": "63" + }, + { + "source": "65", + "target": "48" + }, + { + "source": "65", + "target": "55" + }, + { + "source": "65", + "target": "57" + }, + { + "source": "65", + "target": "58" + }, + { + "source": "65", + "target": "59" + }, + { + "source": "65", + "target": "60" + }, + { + "source": "65", + "target": "61" + }, + { + "source": "65", + "target": "62" + }, + { + "source": "65", + "target": "63" + }, + { + "source": "65", + "target": "64" + }, + { + "source": "66", + "target": "48" + }, + { + "source": "66", + "target": "58" + }, + { + "source": "66", + "target": "59" + }, + { + "source": "66", + "target": "60" + }, + { + "source": "66", + "target": "61" + }, + { + "source": "66", + "target": "62" + }, + { + "source": "66", + "target": "63" + }, + { + "source": "66", + "target": "64" + }, + { + "source": "66", + "target": "65" + }, + { + "source": "67", + "target": "57" + }, + { + "source": "68", + "target": "11" + }, + { + "source": "68", + "target": "24" + }, + { + "source": "68", + "target": "25" + }, + { + "source": "68", + "target": "27" + }, + { + "source": "68", + "target": "41" + }, + { + "source": "68", + "target": "48" + }, + { + "source": "69", + "target": "11" + }, + { + "source": "69", + "target": "24" + }, + { + "source": "69", + "target": "25" + }, + { + "source": "69", + "target": "27" + }, + { + "source": "69", + "target": "41" + }, + { + "source": "69", + "target": "48" + }, + { + "source": "69", + "target": "68" + }, + { + "source": "70", + "target": "11" + }, + { + "source": "70", + "target": "24" + }, + { + "source": "70", + "target": "25" + }, + { + "source": "70", + "target": "27" + }, + { + "source": "70", + "target": "41" + }, + { + "source": "70", + "target": "58" + }, + { + "source": "70", + "target": "68" + }, + { + "source": "70", + "target": "69" + }, + { + "source": "71", + "target": "11" + }, + { + "source": "71", + "target": "25" + }, + { + "source": "71", + "target": "27" + }, + { + "source": "71", + "target": "41" + }, + { + "source": "71", + "target": "48" + }, + { + "source": "71", + "target": "68" + }, + { + "source": "71", + "target": "69" + }, + { + "source": "71", + "target": "70" + }, + { + "source": "72", + "target": "11" + }, + { + "source": "72", + "target": "26" + }, + { + "source": "72", + "target": "27" + }, + { + "source": "73", + "target": "48" + }, + { + "source": "74", + "target": "48" + }, + { + "source": "74", + "target": "73" + }, + { + "source": "75", + "target": "25" + }, + { + "source": "75", + "target": "41" + }, + { + "source": "75", + "target": "48" + }, + { + "source": "75", + "target": "68" + }, + { + "source": "75", + "target": "69" + }, + { + "source": "75", + "target": "70" + }, + { + "source": "75", + "target": "71" + }, + { + "source": "76", + "target": "48" + }, + { + "source": "76", + "target": "58" + }, + { + "source": "76", + "target": "62" + }, + { + "source": "76", + "target": "63" + }, + { + "source": "76", + "target": "64" + }, + { + "source": "76", + "target": "65" + }, + { + "source": "76", + "target": "66" + } + ], + "categories": [ + { + "name": "A" + }, + { + "name": "B" + }, + { + "name": "C" + }, + { + "name": "D" + }, + { + "name": "E" + }, + { + "name": "F" + }, + { + "name": "G" + }, + { + "name": "H" + }, + { + "name": "I" + } + ] + } \ No newline at end of file diff --git a/src/packages/components/Charts/Mores/Graph/index.ts b/src/packages/components/Charts/Mores/Graph/index.ts new file mode 100644 index 00000000..832a24bc --- /dev/null +++ b/src/packages/components/Charts/Mores/Graph/index.ts @@ -0,0 +1,14 @@ +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' + +export const GraphConfig: ConfigType = { + key: 'Graph', + chartKey: 'VGraph', + conKey: 'VCGraph', + title: '关系图', + category: ChatCategoryEnum.MORE, + categoryName: ChatCategoryEnumName.MORE, + package: PackagesCategoryEnum.CHARTS, + chartFrame: ChartFrameEnum.COMMON, + image: 'graph.png' +} diff --git a/src/packages/components/Charts/Mores/Graph/index.vue b/src/packages/components/Charts/Mores/Graph/index.vue new file mode 100644 index 00000000..40c2b0e1 --- /dev/null +++ b/src/packages/components/Charts/Mores/Graph/index.vue @@ -0,0 +1,80 @@ + + + diff --git a/src/packages/components/Charts/Mores/index.ts b/src/packages/components/Charts/Mores/index.ts index 7539cf21..6a2ec675 100644 --- a/src/packages/components/Charts/Mores/index.ts +++ b/src/packages/components/Charts/Mores/index.ts @@ -4,5 +4,6 @@ import { FunnelConfig } from './Funnel/index' import { HeatmapConfig } from './Heatmap/index' import { WaterPoloConfig } from './WaterPolo/index' import { TreeMapConfig } from './TreeMap/index' +import { GraphConfig } from './Graph/index' -export default [ProcessConfig, RadarConfig, FunnelConfig, HeatmapConfig, WaterPoloConfig, TreeMapConfig] +export default [ProcessConfig, RadarConfig, FunnelConfig, HeatmapConfig, WaterPoloConfig, TreeMapConfig, GraphConfig] diff --git a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataRequest/components/RequestTargetConfig/index.vue b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataRequest/components/RequestTargetConfig/index.vue index 3b9f92d4..c980385a 100644 --- a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataRequest/components/RequestTargetConfig/index.vue +++ b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataRequest/components/RequestTargetConfig/index.vue @@ -65,6 +65,7 @@ import { RequestHeader } from '../RequestHeader' import { isDev } from '@/utils' import { icon } from '@/plugins' import { + graphUrl, chartDataUrl, chartSingleDataUrl, rankListUrl, @@ -142,6 +143,9 @@ const apiList = [ }, { value: `【三维地球】${threeEarth01Url}` + }, + { + value: `【关系图】${graphUrl}` } ] From ab52fcaaf90de5468546027238a12fe5d82f179e Mon Sep 17 00:00:00 2001 From: headmasterZhao <635733318@qq.com> Date: Thu, 30 Mar 2023 19:37:18 +0800 Subject: [PATCH 11/16] =?UTF-8?q?fix:=20=E6=9F=B1=E7=8A=B6=E5=9B=BE?= =?UTF-8?q?=E5=AF=BC=E5=85=A5json=E6=95=B0=E6=8D=AE=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=B6=E4=B8=AD=E4=B8=80=E4=B8=AA=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=89=80=E6=9C=89?= =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E9=83=BD=E4=BC=9A=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/components/Charts/Bars/BarCommon/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/packages/components/Charts/Bars/BarCommon/index.vue b/src/packages/components/Charts/Bars/BarCommon/index.vue index 6c8bcd2d..b83b9524 100644 --- a/src/packages/components/Charts/Bars/BarCommon/index.vue +++ b/src/packages/components/Charts/Bars/BarCommon/index.vue @@ -27,6 +27,7 @@ import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore import { isPreview } from '@/utils' import { DatasetComponent, GridComponent, TooltipComponent, LegendComponent } from 'echarts/components' import isObject from 'lodash/isObject' +import cloneDeep from 'lodash/cloneDeep' const props = defineProps({ themeSetting: { @@ -62,7 +63,7 @@ watch( if (Array.isArray(newData?.dimensions)) { const seriesArr = [] for (let i = 0; i < newData.dimensions.length - 1; i++) { - seriesArr.push(seriesItem) + seriesArr.push(cloneDeep(seriesItem)) } replaceMergeArr.value = ['series'] props.chartConfig.option.series = seriesArr From 233f3210c6588fdaa43ca8fc5e58300b8567db4f Mon Sep 17 00:00:00 2001 From: headmasterZhao <635733318@qq.com> Date: Thu, 30 Mar 2023 19:40:00 +0800 Subject: [PATCH 12/16] =?UTF-8?q?fix:=20=E6=A8=AA=E5=90=91=E6=9F=B1?= =?UTF-8?q?=E7=8A=B6=E5=9B=BE=E5=AF=BC=E5=85=A5json=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=85=B6=E4=B8=AD=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E5=9B=BE=E8=A1=A8=E7=9A=84=E5=8A=9F=E8=83=BD=EF=BC=8C?= =?UTF-8?q?=E6=89=80=E6=9C=89=E5=9B=BE=E8=A1=A8=E9=83=BD=E4=BC=9A=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E5=92=8C=E6=9F=B1=E7=8A=B6=E5=9B=BE=E7=9B=B8?= =?UTF-8?q?=E5=90=8C=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/components/Charts/Bars/BarCrossrange/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/packages/components/Charts/Bars/BarCrossrange/index.vue b/src/packages/components/Charts/Bars/BarCrossrange/index.vue index 683d777b..8f85f5f2 100644 --- a/src/packages/components/Charts/Bars/BarCrossrange/index.vue +++ b/src/packages/components/Charts/Bars/BarCrossrange/index.vue @@ -26,6 +26,7 @@ import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore import { isPreview } from '@/utils' import { DatasetComponent, GridComponent, TooltipComponent, LegendComponent } from 'echarts/components' import isObject from 'lodash/isObject' +import cloneDeep from 'lodash/cloneDeep' const props = defineProps({ themeSetting: { @@ -61,7 +62,7 @@ watch( if (Array.isArray(newData?.dimensions)) { const seriesArr = [] for (let i = 0; i < newData.dimensions.length - 1; i++) { - seriesArr.push(seriesItem) + seriesArr.push(cloneDeep(seriesItem)) } replaceMergeArr.value = ['series'] props.chartConfig.option.series = seriesArr From 4915f9e0778889d4c3c6cd3f5d90f4b6668187a0 Mon Sep 17 00:00:00 2001 From: headmasterZhao <635733318@qq.com> Date: Sat, 1 Apr 2023 19:18:15 +0800 Subject: [PATCH 13/16] =?UTF-8?q?fix:=20=E6=9F=B1=E7=8A=B6=E5=9B=BE?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E9=85=8D=E7=BD=AE=E4=BC=9A=E8=A2=AB=E8=A6=86?= =?UTF-8?q?=E7=9B=96=E6=88=90=E9=BB=98=E8=AE=A4=E9=85=8D=E7=BD=AE=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Charts/Bars/BarCommon/index.vue | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/packages/components/Charts/Bars/BarCommon/index.vue b/src/packages/components/Charts/Bars/BarCommon/index.vue index b83b9524..a982beed 100644 --- a/src/packages/components/Charts/Bars/BarCommon/index.vue +++ b/src/packages/components/Charts/Bars/BarCommon/index.vue @@ -1,15 +1,8 @@ + + +