#598: Merge branch 'master-fetch-dev' into master-fetch

This commit is contained in:
奔跑的面条 2023-04-02 18:20:01 +08:00
commit f01450e63d
2 changed files with 257 additions and 5 deletions

@ -1 +1 @@
Subproject commit 7836332a97b57eb2a3e2ffac520342cff9c41420
Subproject commit 2acf1f4351ad22434590a6c4ce41ffe143ac1334

View File

@ -3,9 +3,261 @@ branches: {
}
fileChange:
/package.json:
newFile: !uuid 'e6b791d818f013b0bec5341dddda7e11fc02a635'
oldFile: !uuid 'af4087b541430f36e72b2bd8b18c93af116fb4ea'
gitCommitId: !uuid '7836332a97b57eb2a3e2ffac520342cff9c41420'
newFile: !uuid 'c5590b5a2dded32a4afb4c4f57d03d139ff6a5e8'
oldFile: !uuid 'e6b791d818f013b0bec5341dddda7e11fc02a635'
/pnpm-lock.yaml:
newFile: !uuid 'ec89572e91b5a317bd5e2b86e3b2465c2dba0c1d'
oldFile: !uuid 'b57b0e703c6b4d5a4317002a0edfa78c43b146b0'
/src:
newFile: !uuid '7cd1b8b739fff0f9066deaf992e1ece150c5d6d3'
oldFile: !uuid 'e67768a26b385da2b1fa6b4d7da65cd427112c1d'
/src/api:
newFile: !uuid '174e23464ff3dbaf3ef46acf0662b6f605b12992'
oldFile: !uuid 'ee1e7b1c8fb76597af2b37fa64d84f8bb37d33f5'
/src/api/mock:
newFile: !uuid '4dd5a57781a6970a5b0d048eb49b36c46ac2a8bb'
oldFile: !uuid 'effd79937dcc1d1bbeaf0aab5a764158c335b108'
/src/api/mock/graph.json:
newFile: !uuid '48f71dc465b94ad638516598a88058d00e8436ca'
oldFile: null
/src/api/mock/index.ts:
newFile: !uuid '9f6395130bca7a93aca6ac3d7e91bab091859554'
oldFile: !uuid 'eea66104065a5fe73a32ba45b5cd4f8cad8496ef'
/src/api/mock/sankey.json:
newFile: !uuid '269c6b3961241f7bdfbcc4017c304b3a7210f3e2'
oldFile: null
/src/api/mock/test.mock.ts:
newFile: !uuid 'f5c56004971c42e8a7d759e0f9981799117d8c1f'
oldFile: !uuid '9db8cc789b9a01543fc793e6407c7bd6ddac83d4'
/src/assets:
newFile: !uuid '71b3b07484a399f9eed123bbb34359dce4aea1ff'
oldFile: !uuid 'bd14ba512db00cdbf1c3d0fd1326ad37ebe92bc8'
/src/assets/images:
newFile: !uuid '63b844a8b933c33b78942a14d1e652715e75b39a'
oldFile: !uuid '3adfd1311496bcccdb5f47bf9710d84b234e5b5b'
/src/assets/images/chart:
newFile: !uuid 'f9c703bfd4979aedc36958d1372f5a241363aadb'
oldFile: !uuid '787e0af4462820c1ec4593077ceffcd3fe68a57e'
/src/assets/images/chart/charts:
newFile: !uuid '0f0c0c10dd7e47471aafb6f48d95581c3fd91ed6'
oldFile: !uuid '1eb8699e14885188d872a59248f681ab19fa8dcb'
/src/assets/images/chart/charts/dial.png:
newFile: !uuid '778a8a616c349c03309f085bf42316de6697a16a'
oldFile: null
/src/assets/images/chart/charts/graph.png:
newFile: !uuid '6dbbf0390c228e2b23168c6cc4110798c24e7a26'
oldFile: null
/src/assets/images/chart/charts/sankey.png:
newFile: !uuid '1ab374e9b4198033ff9253efbec9ff87a3f249df'
oldFile: null
/src/enums:
newFile: !uuid '48dc6116f006a34edda647d74d0019ac515003dd'
oldFile: !uuid '14d39f7a3eff4839f89769c4fecb79830b9c3f3f'
/src/enums/editPageEnum.ts:
newFile: !uuid '9d0cf5bc81446506dd2ebb3d48f5fea99d823ae1'
oldFile: !uuid '10e57ca6b5ca8c5a753626bfbb8205e0486fb9ab'
/src/layout:
newFile: !uuid '981a55fd4ccd96269cbde836124fcfd5467623a9'
oldFile: !uuid 'ee022793ded9fa0ef2816525691fc055bd5fd1cb'
/src/layout/components:
newFile: !uuid 'c6bd90ddcefaf29f672d34d7836d6e4f42d0429a'
oldFile: !uuid 'b9d72a42f109e7ed9efb6bfeeb39a92c142d88ff'
/src/layout/components/LayoutMain:
newFile: !uuid '5351deb2ed84059c9efcdc6a3943c34dd418499d'
oldFile: !uuid '98f55ce12c14bf35800a9991b855eb82eb6580ab'
/src/layout/components/LayoutMain/index.vue:
newFile: !uuid '11cc3bbcf897fc9cf6ecc7f1fb25a1c163ebd908'
oldFile: !uuid '9c9d9a2ac5383cd68bd47a385cfacf3ca96a9349'
/src/layout/components/LayoutTransitionMain:
newFile: !uuid '0eba6bcf32eeaf9a18dc079d7fa4807544bc9bcb'
oldFile: !uuid '5965b64ae069cbd7f9a2183ecd653d9edd1cac7c'
/src/layout/components/LayoutTransitionMain/index.vue:
newFile: !uuid 'ca152fdfd3297379f48215a7241e612ee0d7d724'
oldFile: !uuid '41f67ccd1cd9f2a1dc3a2fbc37498016660999d3'
/src/packages:
newFile: !uuid '8183bb4d4171ad158e0c29bf29850a6149695f93'
oldFile: !uuid 'b6ecc028210cc8bb3c375eee0fcfb5c12da48c35'
/src/packages/components:
newFile: !uuid '43029b7e9433cf78158b7337727c554d3f1b235b'
oldFile: !uuid 'ac8279ff6d1b69d41a2928539cd1c327fd0c805f'
/src/packages/components/Charts:
newFile: !uuid '8e28a68b199f719f3d335979b918c3b1c4fa3151'
oldFile: !uuid '55ac5955fc5b027ee8850d54121d2c61fde04fe5'
/src/packages/components/Charts/Bars:
newFile: !uuid '8bed4c900e8bab087c9bf0072915bff96db702b1'
oldFile: !uuid '2ab4decef99b9b0c0d7de413d7f13f3e474a5b01'
/src/packages/components/Charts/Bars/BarCommon:
newFile: !uuid '8887c178eb69fef2b05f2d7ac4e8853b8bd6ac42'
oldFile: !uuid '5d48fe17cac8cc74627025d52dcbb0812b82a651'
/src/packages/components/Charts/Bars/BarCommon/index.vue:
newFile: !uuid 'e154ac4f753b10c2247234eaec009af6aef8f749'
oldFile: !uuid '6c8bcd2dd16af79bda28a223d47745a572c5f289'
/src/packages/components/Charts/Bars/BarCrossrange:
newFile: !uuid '19e1eb896bdb90be94a74448f01119d82ca680f5'
oldFile: !uuid '3436a725eb227c7921ef1b5cee825627914fcea4'
/src/packages/components/Charts/Bars/BarCrossrange/index.vue:
newFile: !uuid '8f85f5f2785b97bf28d7b5d40491e5e6ebcdc69f'
oldFile: !uuid '683d777b4b54bd864efd3548766fd3918c41af90'
/src/packages/components/Charts/Mores:
newFile: !uuid '66694a2869a3054209d4d03f05f6cca93ea0019a'
oldFile: !uuid 'e17e5e67309aa710de808025a4a080997a0a2f68'
/src/packages/components/Charts/Mores/Dial:
newFile: !uuid '719ebfdbc3a22444e3abd6d98b9d9d9372a42f01'
oldFile: null
/src/packages/components/Charts/Mores/Dial/config.ts:
newFile: !uuid '19a771b45c060bef7b2cfdf2700d3ba811d7a063'
oldFile: null
/src/packages/components/Charts/Mores/Dial/config.vue:
newFile: !uuid '151a2f1d2aba2b4c648a2c91fccf7eb56e61213f'
oldFile: null
/src/packages/components/Charts/Mores/Dial/index.ts:
newFile: !uuid '3b9b2923971d8f68b693e63069818d17db2f9595'
oldFile: null
/src/packages/components/Charts/Mores/Dial/index.vue:
newFile: !uuid 'cdd7c6d3fadfd3190b1ee2645e11b548932b5d84'
oldFile: null
/src/packages/components/Charts/Mores/Graph:
newFile: !uuid '245ef82e4742b10ee0531ece0c041af31efe7823'
oldFile: null
/src/packages/components/Charts/Mores/Graph/config.ts:
newFile: !uuid '0dfb0dc889356cfe0cfa575502dc9ffd00b4590e'
oldFile: null
/src/packages/components/Charts/Mores/Graph/config.vue:
newFile: !uuid '07319fde5facf894fccc346058c562f0164b59cc'
oldFile: null
/src/packages/components/Charts/Mores/Graph/data.json:
newFile: !uuid '4d8470accd6f477a36fb844edcd7d17e20f36dbf'
oldFile: null
/src/packages/components/Charts/Mores/Graph/index.ts:
newFile: !uuid '832a24bc59a9d32ae0b55944421aafb484be66fd'
oldFile: null
/src/packages/components/Charts/Mores/Graph/index.vue:
newFile: !uuid '40c2b0e183dd62686df5235d7edb91026f05ce79'
oldFile: null
/src/packages/components/Charts/Mores/Sankey:
newFile: !uuid 'a035d615911e3c8543f4b68bccea4ed09ace7709'
oldFile: null
/src/packages/components/Charts/Mores/Sankey/config.ts:
newFile: !uuid 'cab0ff7d5535cfc6c156bbf0c1c3de9a094267cd'
oldFile: null
/src/packages/components/Charts/Mores/Sankey/config.vue:
newFile: !uuid 'fcb23e7e59b749437c4adc610d20a127796b711a'
oldFile: null
/src/packages/components/Charts/Mores/Sankey/data.json:
newFile: !uuid 'e1f81b7905a22bb8324310cca54ae0a789fa02b2'
oldFile: null
/src/packages/components/Charts/Mores/Sankey/index.ts:
newFile: !uuid '719929443838bc8c3005a7aa81238177d1c985b6'
oldFile: null
/src/packages/components/Charts/Mores/Sankey/index.vue:
newFile: !uuid 'a8cdb09b24dd9a6c166a4b3f0787a7a612bb3826'
oldFile: null
/src/packages/components/Charts/Mores/index.ts:
newFile: !uuid '84b74f785af181c18ec94eed426b049e6255a732'
oldFile: !uuid '7539cf21a5bbf2e219b06e5848f147a24a78d055'
/src/packages/components/Decorates:
newFile: !uuid '56c925c1102c2f8fa5ef0c229c6489d3a46a6b2d'
oldFile: !uuid '9c3a4acf35a322adbe6701fe82c45f8f4bf424ad'
/src/packages/components/Decorates/Three:
newFile: !uuid '866f8eee98b0fb8298e117b1fc309b155e3a16a8'
oldFile: !uuid 'a1a9b1c548c2f7627354124260bad7436f6291fe'
/src/packages/components/Decorates/Three/ThreeEarth01:
newFile: !uuid '301761469cf4ee54d13151f4a275501e9ff2a33d'
oldFile: !uuid '03f61ce7853c105f186ce665fd3ed94e218a1e1c'
/src/packages/components/Decorates/Three/ThreeEarth01/code:
newFile: !uuid '70ab4edaa81b5cbd4bab3a8da9b6e9838f7bc777'
oldFile: !uuid 'fac04f46ffcac70f2c29dc7ad8d53a5650c45d23'
/src/packages/components/Decorates/Three/ThreeEarth01/code/world:
newFile: !uuid 'a45ef607b594eadf5077ba9bf964f4cd9f829409'
oldFile: !uuid '765d20ac42c28d13d35d761d315f2b9c0330399f'
/src/packages/components/Decorates/Three/ThreeEarth01/code/world/Assets.ts:
newFile: !uuid 'ef17ebcb556ec36dafa0890b6e783f7764c3867d'
oldFile: !uuid 'bd8df6c48bf6a52653e993450e6e30b22ab11a30'
/src/packages/index.ts:
newFile: !uuid '131fad80bfada8ad9c86f12d15ab30c6a57e7861'
oldFile: !uuid '4f530faa8626a2ca9a6c6fa5352352a76dce91b3'
/src/views:
newFile: !uuid 'f089289c864a4c4b734b639112b95859d781f743'
oldFile: !uuid '7e8ce35962df360cfa487e7e99784ad40166c434'
/src/views/chart:
newFile: !uuid '7d9871421f731c4cddd5a71102dcba07ab030fb1'
oldFile: !uuid '99a2a26166a6a29ff27dccce335c53f333008d5b'
/src/views/chart/ContentConfigurations:
newFile: !uuid '7bd515e79f9e5fb74c4da2927fa9b745c7edad13'
oldFile: !uuid 'e8cf376734d3f7141c5612453d6be1ceea741abb'
/src/views/chart/ContentConfigurations/components:
newFile: !uuid '2fb07bafd19d423e0238680a5344db261d59afeb'
oldFile: !uuid '85cd0a7c14040e87d1c71be313316345beb4a980'
/src/views/chart/ContentConfigurations/components/ChartData:
newFile: !uuid '21f549c7cabce284ee05f7262551f5122b290480'
oldFile: !uuid 'db160f93135d46b2f3c789b1b14c208b7333c3d1'
/src/views/chart/ContentConfigurations/components/ChartData/components:
newFile: !uuid 'ffe9ea568cc05a9576d9b1099ae58d24e5fc1862'
oldFile: !uuid '1405744a0b9097d02975acc452091317206b5b46'
/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataRequest:
newFile: !uuid '064c9542d9918e02f269b08203ef38c7c6863795'
oldFile: !uuid '4cdf03751d3d881dbace8e7911223923ca021159'
/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataRequest/components:
newFile: !uuid '92ce385212fdee5734a8a55f60bd163ede664ca4'
oldFile: !uuid '0e5695248be3d0e631ab69b9c70f6787bed8e420'
/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataRequest/components/RequestTargetConfig:
newFile: !uuid '72155e4ab1091a27443ccc754b7a713af57e156c'
oldFile: !uuid '5e123f42389ed34e6693351765442bce3f6df804'
? /src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataRequest/components/RequestTargetConfig/index.vue
: newFile: !uuid 'd7d582732db10cc5de48d587836eb90ab8961f7e'
oldFile: !uuid '3b9f92d452b14bedcd29abd87835fe31d75c244d'
/src/views/chart/ContentEdit:
newFile: !uuid 'de0599d93bdd657bf1e989c025b7923f7cf13b92'
oldFile: !uuid '614fe9b5bd890334857f9c70e4aa96f4635d263b'
/src/views/chart/ContentEdit/components:
newFile: !uuid '505d128a096d6606871e465f830e13e2c6f4f58f'
oldFile: !uuid '6c5752cb8ac1df61eb12fc825f0c5eb529b5438a'
/src/views/chart/ContentEdit/components/EditTools:
newFile: !uuid 'f1e59cbce3b87416c752af3937d4b0315ea56fe3'
oldFile: !uuid 'ae3585fa5dfd6eee40f712fb0c2fb7b9f796dfd7'
/src/views/chart/ContentEdit/components/EditTools/hooks:
newFile: !uuid '4caa9067097b08f8b9ea754f1368f9b39c57f976'
oldFile: !uuid '171942e985a38c0d7761c979b08e5dc598008d3b'
/src/views/chart/ContentEdit/components/EditTools/hooks/useSyncUpdate.hook.ts:
newFile: !uuid 'f2ae3126943d18175952b550ef75e0edb7875f41'
oldFile: !uuid 'bd9c92c78ffb15dfdf180fa0da1c6b525b5dd9fd'
/src/views/chart/ContentEdit/components/EditTools/index.vue:
newFile: !uuid '197a82c57638d1ca57da6f87e6f0de9d82b93649'
oldFile: !uuid '0d2dd89599ac9838589e4ecc255a3a3e243bb092'
/src/views/chart/ContentHeader:
newFile: !uuid 'd1a8c31a6850377f81bd6a182f58e3ebffd77d13'
oldFile: !uuid '6e7122d833c9a51714df2764da142a341dcfe754'
/src/views/chart/ContentHeader/headerLeftBtn:
newFile: !uuid '70ffe20ed3d8f71ee8c67cc68b2f2592d1ae2c86'
oldFile: !uuid '1f683b662db4e5fd5fe7eaac4377c4d7741d61e9'
/src/views/chart/ContentHeader/headerLeftBtn/index.vue:
newFile: !uuid '433d83aa6077bcacdc7ba6420f8c50b066e1809f'
oldFile: !uuid 'e29a59a0430752f305639e7de7c6e5affdbfa150'
/src/views/preview:
newFile: !uuid '96d3ca0119d8d06243e70d4a985a58af51406e3a'
oldFile: !uuid '47047679666179ed38d5dda4f3df7f263ebf4ca6'
/src/views/preview/suspenseIndex.vue:
newFile: !uuid 'fdc3fdf66c477c4e6258b189090ab1518d4d658b'
oldFile: !uuid '29d0349607ddf94864ff77d1149f706f2e27a604'
/src/views/preview/wrapper.vue:
newFile: !uuid 'c119a6615813691108b3fce41ebcfd491ba554f8'
oldFile: !uuid '86abc6b395b595352caa59e6940e479c59ae5889'
/src/views/project:
newFile: !uuid 'fced4f826c6d895e7a9e046e53f1dd1619205e8d'
oldFile: !uuid '50098a8aa7be7582f836ef84aad65347dcb1ecbc'
/src/views/project/layout:
newFile: !uuid '4e7f09528323303d017b0172eefd49c4a6e86cc2'
oldFile: !uuid 'bcb442bab3c9b3113150b9dea1cd6463dc90bd7d'
/src/views/project/layout/components:
newFile: !uuid '381691e227424c1f5c660a890bc5b9cb98b118dc'
oldFile: !uuid '7f8f2d0873879ea65a4c7f2d996378bf27fc94c7'
/src/views/project/layout/components/ProjectLayoutSider:
newFile: !uuid '47e3e81e48fdb8f0e4bca565c3b4c86c98049e36'
oldFile: !uuid 'c1bc58e6d252e19f7897002ebda60844a7cc80e1'
/src/views/project/layout/components/ProjectLayoutSider/index.vue:
newFile: !uuid 'e84a00f89fa898d65fb0ef39edebf158f302102e'
oldFile: !uuid 'c7b963e0e8888389aaeecaede64298bfac522cbc'
gitCommitId: !uuid '2acf1f4351ad22434590a6c4ce41ffe143ac1334'
renames: {
}
revisionId: 597
revisionId: 598