#1334: Merge branch 'dev'

This commit is contained in:
奔跑的面条 2023-02-27 18:59:18 +08:00
commit 302250ccb6
2 changed files with 258 additions and 6 deletions

@ -1 +1 @@
Subproject commit bcf0417624b8f3a2428ea59db53141ea89ee9e5a
Subproject commit 1b2b319467663364bce47e92327dd79668efe02c

View File

@ -2,10 +2,262 @@
branches: {
}
fileChange:
/README.md:
newFile: !uuid '850bc2cac41a712b14a36f88885d965be12e1057'
oldFile: !uuid '67c2e5b2b993a07025cb7b9167041074f1fbaf8e'
gitCommitId: !uuid 'bcf0417624b8f3a2428ea59db53141ea89ee9e5a'
/src:
newFile: !uuid 'f1f59a4fa35256b3b7b367f0546c20726a22ae99'
oldFile: !uuid '29c43de087109dde1d9f9b27a67a04bd1fe139d8'
/src/packages:
newFile: !uuid '3f01193b008b2ec0a13a65de782ab5bfff352e5b'
oldFile: !uuid '1eda4d9136b962b329a833c89c9f67fe312434f0'
/src/packages/components:
newFile: !uuid '0443a6f7b32b1099e9f196c8e25ecca0304fd63c'
oldFile: !uuid 'f807c7e798308f499d1493e24a622dc834d64597'
/src/packages/components/Charts:
newFile: !uuid '65e82555f1d334e1e23aaf4cb635329136079d26'
oldFile: !uuid '0f835c3a5dcc195dae42cd1df6fdc8142a2ce8c2'
/src/packages/components/Charts/Lines:
newFile: !uuid '40a565af8fc94c8f7a06e843caf14ad4bba3f97b'
oldFile: !uuid '0ea378830fbdee30b595bc0ad62ae8ea14024ea8'
/src/packages/components/Charts/Lines/LineCommon:
newFile: !uuid 'f204dfa258f03a9d03175d3c63b2153b158a6552'
oldFile: !uuid '8a5f18c88208f46b8c2c7e6429bbea33e33de492'
/src/packages/components/Charts/Lines/LineCommon/config.ts:
newFile: !uuid 'c6c0761062ca28e5d38ecdb5b12619ecaabe97a7'
oldFile: !uuid '917a506469d3b4a9458457cfc2852a33f5d424df'
/src/packages/components/Charts/Lines/LineGradientSingle:
newFile: !uuid '00fbca1499eaf6de1fca4c17d89e775505094c1a'
oldFile: !uuid 'bf7cf6e81c7f6f426040ebe42ff346d5b739bd7f'
/src/packages/components/Charts/Lines/LineGradientSingle/index.vue:
newFile: !uuid '0bd33cfe5092f1c782c4e29434180fee1706f0ba'
oldFile: !uuid 'e0d9fb7e349cc1e02ed2994d9a4607b76f2b2dd6'
/src/packages/components/Charts/Lines/LineGradients:
newFile: !uuid '4ef22203e5c4a25e1022d6fd7735ae7ad65f396e'
oldFile: !uuid '75f1d2e4864446766d3918e20a9d537c0b2bda99'
/src/packages/components/Charts/Lines/LineGradients/index.vue:
newFile: !uuid '67ed6437777faa1b711e4835aff67a3addb565df'
oldFile: !uuid '8643426fdb5a50478421984afda52eea19c84ee4'
/src/packages/components/Charts/Lines/LineLinearSingle:
newFile: !uuid '94d227812c8711d262ef8a82ba42eda53e3f8c90'
oldFile: !uuid 'fcba406a7c04156e37e9fa4f48f84ac1d156d84a'
/src/packages/components/Charts/Lines/LineLinearSingle/index.vue:
newFile: !uuid 'b2863a2371c2251f4117659ee3a95c542bc90328'
oldFile: !uuid '19f4ef70bbd8a356159bbdf4d4a9d7a7c74b043d'
/src/packages/components/Charts/Mores:
newFile: !uuid '912cf592ec0eb060724a25a25667ee2c98469569'
oldFile: !uuid '8b442a8917604f81210daa0d199233e6c769cee3'
/src/packages/components/Charts/Mores/WaterPolo:
newFile: !uuid '480727f3918025f4b2a9ce75affc3a6e3c20311f'
oldFile: !uuid '8aad11cbbe8117054459dc905b3e20d050a0d158'
/src/packages/components/Charts/Mores/WaterPolo/index.vue:
newFile: !uuid 'e1fefed972f55f22f033ceeb0a2bf50edd29a3c2'
oldFile: !uuid 'f5aa4f74212f2edf2b2fc1603a2bfc188a19dba2'
/src/plugins:
newFile: !uuid 'e3156cc92f38e9ec9f834bc5f312a4d73061aba3'
oldFile: !uuid 'de8f4ef6907a839e75923f603eb66e9848114636'
/src/plugins/icon.ts:
newFile: !uuid 'b195e340c63483a9066942897edb1ab318585e16'
oldFile: !uuid '1f4853710ea8bffe1d4f6e9c2b3d27a59ca455a9'
/src/plugins/naive.ts:
newFile: !uuid '0d004df74ac536172c1f798c5d96f52acc98dde2'
oldFile: !uuid 'ab4dbb1f19d847b15545f4d9be35ab0ed49bc19a'
/src/settings:
newFile: !uuid '41769a66572772b21f2604d8ca00cc2445af8da6'
oldFile: !uuid '9fbf3ada2a41ceda1cbdff142ec7d59d90010e14'
/src/settings/chartThemes:
newFile: !uuid '46f11c0a217d640f58f39281c0f76e0d21297a16'
oldFile: !uuid '25dfe6e68671142485fedd682d3a3375d9424b47'
/src/settings/chartThemes/index.ts:
newFile: !uuid '75e79e5c000b687b674e559cbe0d06da111588f9'
oldFile: !uuid 'd066d858c63378a4b66f3b5a87d8f90ff9c0b25f'
/src/settings/chartThemes/themes:
newFile: !uuid 'ea0e506cefc643761aeae29d34e07b77d327c7e2'
oldFile: !uuid '77b41257d0d08a0fd18ec237e9be83f450212492'
/src/settings/chartThemes/themes/chalk.json:
newFile: !uuid '62f4b9ea84440bc66f1f586eb444440a829aacfa'
oldFile: !uuid '09ac92680b6d5d1f3ca04613a53623d0489e9966'
/src/settings/chartThemes/themes/customed.json:
newFile: !uuid '2a0ffa2c53ae38db844888fb92a60ed7d98df330'
oldFile: !uuid 'd29733a669813d0c89ed59db50f065692bc39bf3'
/src/settings/chartThemes/themes/dark.json:
newFile: !uuid '887a6469804a35dd858cc358d59cc5d31f7e1803'
oldFile: !uuid '59126d9b1a88c39f4cd9f6e013fccec33bbeb9e5'
/src/settings/chartThemes/themes/essos.json:
newFile: !uuid '27d57201ea74a0dbed8f3c32c6ba88ca6b5f0a69'
oldFile: !uuid '18823d4679975e0dca3e01ef645dfe6876089d64'
/src/settings/chartThemes/themes/macarons.json:
newFile: !uuid '14a4aa0f2c607d8b855b4550fde7f32b6c63e317'
oldFile: !uuid 'a800789ada44eada8a2e8b628978a1ec4e900f83'
/src/settings/chartThemes/themes/purple-passion.json:
newFile: !uuid '915504993a98a71ac80b72428da07539b34a409d'
oldFile: !uuid 'd96e4104e2b5ebd8709e056c2b3cad5bfb1088e3'
/src/settings/chartThemes/themes/roma.json:
newFile: !uuid 'be5af4df5c84779ce8a83f572cc2919d1b3ba492'
oldFile: !uuid '2b527f5316c5bbb51e1ee1f255fb26247d2e9ee3'
/src/settings/chartThemes/themes/shine.json:
newFile: !uuid '1b2d8529037ef69b925ae0567c9ff2ee35d21ea3'
oldFile: !uuid '4c4e0f8825153ff3a81655eddd5f3d3c974add60'
/src/settings/chartThemes/themes/vintage.json:
newFile: !uuid '72957825ad7f5522ac30bc184e50f87badadfa62'
oldFile: !uuid '28190dd7d4cdbb2436ec475e7225cdfe2a362bb5'
/src/settings/chartThemes/themes/walden.json:
newFile: !uuid '37127fba53bb9d4d4eee92a148dbc1819f2953ad'
oldFile: !uuid '2cf15ab99ddea1d71b574de394f6f51db99914f8'
/src/settings/chartThemes/themes/westeros.json:
newFile: !uuid '6dc5d0b6ad3248a01e71819c15a63a0f28ccc16a'
oldFile: !uuid '257891debdb98a875536fbb9c0f10e18b74edaa2'
/src/settings/chartThemes/themes/wonderland.json:
newFile: !uuid 'c37390218eaed1351af461706bf4b62e7c62ca18'
oldFile: !uuid '06c33113d0a57aebded92b7f847feb9e703cec94'
/src/store:
newFile: !uuid '056efd29dc6c67d82f7d46835d155ff13a151d7e'
oldFile: !uuid 'c73be75df11098ea794cf97b0d2494f80daca3bf'
/src/store/modules:
newFile: !uuid 'b42b30d93e95d226cb8a340598f043fd4e130f20'
oldFile: !uuid 'bf0c6ba10d9fffc99c7ad327ed301afd6966a2a1'
/src/store/modules/chartEditStore:
newFile: !uuid 'a1cd9e890584a602bd273a3b0af873e89ba7d0ae'
oldFile: !uuid '82dc108af08b41076c87418b5cd06ebce482a24b'
/src/store/modules/chartEditStore/chartEditStore.d.ts:
newFile: !uuid 'f06bccbcec4500a21ab0530d0fd4a333b61dee61'
oldFile: !uuid '0084f6733580f2dd15e4cc9d1fd51995951f535b'
/src/store/modules/chartEditStore/chartEditStore.ts:
newFile: !uuid '4469369e54386f7863d82fa5be49b0d97ae4480e'
oldFile: !uuid '81d7a3b5e90a0d2544aa8f5f669127e600f7f1fc'
/src/styles:
newFile: !uuid '1c2bea0a6eda9115139d6145227c3244e16d90f2'
oldFile: !uuid 'f13bb1de3c9770ff61f77d6d8b0b6f20f15b6566'
/src/styles/common:
newFile: !uuid '0e112eb75c532701462d2d79a4d4fd542c926692'
oldFile: !uuid '0398e2dc6e014dc209f377eeb486109db6df082c'
/src/styles/common/mixins:
newFile: !uuid '87e1ffba2916de6fdf4f8413edb853706e0744d1'
oldFile: !uuid 'b900cdb319f0ff8483287b5fd6e52e50b5b12cd5'
/src/styles/common/mixins/mixins.scss:
newFile: !uuid 'ec6f2ccda38572da5b6529ff203406490995621b'
oldFile: !uuid '5cb85f5f4e40ba4e2a6f4c7e28f8b4c961b2782b'
/src/utils:
newFile: !uuid '9c94b556c1bc47f761b7d7d2079c53cb50d2ae69'
oldFile: !uuid '3e42baf014712165bf42373c5af57e013b8292cd'
/src/utils/style.ts:
newFile: !uuid '34dce3fed68d589c73d585c5767ce773a1882401'
oldFile: !uuid '8e8605d31a4f844021ac92c8e3119dd0ba7c8817'
/src/views:
newFile: !uuid 'ca45903db9c045b36d1192699e662c1e29ccccc6'
oldFile: !uuid '82bf111408abb0c4b077f63daed7afd041a45e00'
/src/views/chart:
newFile: !uuid 'a33dbee16c08a7ff1c26062255147ae2862196f4'
oldFile: !uuid 'a33ff46b91983f42306c572192de4676d708fe16'
/src/views/chart/ContentConfigurations:
newFile: !uuid '291d96f139980768085bf88c58ad439358513978'
oldFile: !uuid '721860b9f841604fb1aae6801b5a9b27542a40f0'
/src/views/chart/ContentConfigurations/components:
newFile: !uuid '0590b24457748cabe93e5aa6cf96e3e757e0c894'
oldFile: !uuid '16ba5fa10a2510f2af44b521f1a4100fae951874'
/src/views/chart/ContentConfigurations/components/CanvasPage:
newFile: !uuid '5d303199e49fdce246e68feff120ee766fa20e93'
oldFile: !uuid 'b49a85165b1898e4c8143ebc45e501f0e91c0761'
/src/views/chart/ContentConfigurations/components/CanvasPage/components:
newFile: !uuid 'b3e7808ea5894c614008480f0089f2e8ba2bee65'
oldFile: !uuid 'f80b49e13baf402fe261afdbd37542b3091ed077'
/src/views/chart/ContentConfigurations/components/CanvasPage/components/ChartThemeColor:
newFile: !uuid '87f6d790743f312b00051cb6647d7e9a8ad31cd2'
oldFile: !uuid 'edd8bbbbf25330c89736bd2a8f168b0e2983226a'
/src/views/chart/ContentConfigurations/components/CanvasPage/components/ChartThemeColor/index.vue:
newFile: !uuid '9891ad884e87b2f04c0b3c9aab666c145211ab24'
oldFile: !uuid '8313bda282730decc5f01a68d01e68b30f0cb9d3'
/src/views/chart/ContentConfigurations/components/CanvasPage/components/CreateColor:
newFile: !uuid '9b08093776197ee9f6d9dde7fc3cf3054e101177'
oldFile: null
/src/views/chart/ContentConfigurations/components/CanvasPage/components/CreateColor/index.vue:
newFile: !uuid 'e73eba550682b0c7eaec828a31afe7e74710cf38'
oldFile: null
/src/views/chart/ContentConfigurations/components/CanvasPage/components/CreateColorRender:
newFile: !uuid '7b718f31532be3729112af125729ed9202a07b01'
oldFile: null
/src/views/chart/ContentConfigurations/components/CanvasPage/components/CreateColorRender/index.ts:
newFile: !uuid '0008d2993ed580b8acd9d3249fe50fc107da33d4'
oldFile: null
/src/views/chart/ContentConfigurations/components/CanvasPage/components/CreateColorRender/index.vue:
newFile: !uuid 'a3f6c4412fffbe119c185ef8204eaa36211f1610'
oldFile: null
/src/views/chart/ContentConfigurations/components/CanvasPage/components/CreateColorRenderChart:
newFile: !uuid '81077c368811e3a20885f0238052e7460c96d529'
oldFile: null
/src/views/chart/ContentConfigurations/components/CanvasPage/components/CreateColorRenderChart/barOptions.ts:
newFile: !uuid '20fe41a0e335bde6ed751b4fa31e8566dd21e62e'
oldFile: null
/src/views/chart/ContentConfigurations/components/CanvasPage/components/CreateColorRenderChart/index.ts:
newFile: !uuid 'cf82cfcc8cf4fc55dcc215daa503520cb79dae7d'
oldFile: null
/src/views/chart/ContentConfigurations/components/CanvasPage/components/CreateColorRenderChart/index.vue:
newFile: !uuid 'fba33a6da1ba8fec7377d04b45ac7471a49a528e'
oldFile: null
/src/views/chart/ContentConfigurations/components/CanvasPage/components/CreateColorRenderChart/lineOptions.ts:
newFile: !uuid '2a41700dccde5f2a61c7decf560a6cc3a927aa58'
oldFile: null
/src/views/chart/ContentConfigurations/components/CanvasPage/index.vue:
newFile: !uuid 'f4ac2d24d4b0d69ab4eede46566df6e6156e6cb3'
oldFile: !uuid 'f024a4c279378a249c575a34c75a6d973634e606'
/src/views/chart/ContentConfigurations/components/ChartData:
newFile: !uuid 'c5f9c4c822006105193aa21dcbc22032cfd0aea7'
oldFile: !uuid '4c574c163e933df781560b7a4a3e62eeac866f7f'
/src/views/chart/ContentConfigurations/components/ChartData/components:
newFile: !uuid '1aa45d2ccfb97a2eadec0905f1bf2fc2a82ef1aa'
oldFile: !uuid 'bad610ed144dd92411a809c42ede62e9361c7798'
/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataPond:
newFile: !uuid '0f18f1bb18249651be70f50c7d8569b10d0f3ae2'
oldFile: !uuid '54842085a895bdea5cabf8ceb24cdd8986ce6df8'
/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataPond/components:
newFile: !uuid 'd26a641d05ff9bb9fca77e0154b1097f32cc8d52'
oldFile: !uuid '2c9e8180e846c90547246fc35d8d9b7521b87e8b'
/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataPond/components/ChartDataPondList:
newFile: !uuid 'f57117e522b10ce02297efbfba7c4441ce2c803d'
oldFile: !uuid '2e20fecc2e15af301ae0457df74b6ccbd0bf3b9a'
? /src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataPond/components/ChartDataPondList/index.vue
: newFile: !uuid '696fcff86765e57d0a9455de624eb4a194a61840'
oldFile: !uuid 'a19c90e4c984484657697df2a10681eeeb496cad'
/src/views/chart/ContentEdit:
newFile: !uuid 'dd74eefc0c74b02b0e57b4f22316bb836f6bb908'
oldFile: !uuid '3efbd5cc98ee61a173be3cb29493f7a5cec4ca1c'
/src/views/chart/ContentEdit/components:
newFile: !uuid '972bc952eb99913006726de4cd7f2fdfcd6dfbb4'
oldFile: !uuid '6ae7dcd0a66bbaa698960af360b7ecf4e2d10377'
/src/views/chart/ContentEdit/components/EditGroup:
newFile: !uuid '75203b9f5caa8f775349711e85a3072261b122ed'
oldFile: !uuid '58378bd5af6e4b24769362c569acd8f4d1d84bb6'
/src/views/chart/ContentEdit/components/EditGroup/index.vue:
newFile: !uuid '03cced49bcc366965c3ba68053471e02bce57666'
oldFile: !uuid '5d7f146277cd3f6413281d521bbcee56c67a5ed1'
/src/views/chart/ContentEdit/components/EditRange:
newFile: !uuid 'bfad61e5617cedb6306d7b943960a4a4d2149d17'
oldFile: !uuid 'faa9d8be08c6c65da41eabf970e37ea1bfb6489b'
/src/views/chart/ContentEdit/components/EditRange/index.vue:
newFile: !uuid 'd3be9d95cdb70c449086144b7e1b091270e90ff7'
oldFile: !uuid 'd9a7bcc919b4d48789b3d3c7ad08ea937608a199'
/src/views/chart/ContentEdit/index.vue:
newFile: !uuid '1ea44997860184570aeebf62aede36d43ef35de9'
oldFile: !uuid '2598f65f398f304f4a7b709e6f6e81c7f049cdc8'
/src/views/chart/ContentHeader:
newFile: !uuid 'ee3e05f65a0893dad5cd1a9caab75bff6ebd5f64'
oldFile: !uuid '561026322124c3afdba9209eeae9f2798d876a74'
/src/views/chart/ContentHeader/headerTitle:
newFile: !uuid 'b74fb15ac685a7363f1083160f0a2838b8866570'
oldFile: !uuid '7229d869e25860e8598aadd00ae64038a84d36fa'
/src/views/chart/ContentHeader/headerTitle/index.vue:
newFile: !uuid 'd41541ce799ef6c07d67cbca760e6d0d6f401273'
oldFile: !uuid '3b8efb71fc4f042757450397c7d49f28ac512864'
/src/views/preview:
newFile: !uuid 'ce3a54d4f860015efdb4e3de3e3f256e84615c9a'
oldFile: !uuid '63f16168adc744054d6e5b12555d77d384306a48'
/src/views/preview/components:
newFile: !uuid 'ca40aed9aaa5dfe22583bb67be8d799b47d6aca6'
oldFile: !uuid '49ff366a14a0a54e4504a13a4554c5a9ca089f46'
/src/views/preview/components/PreviewRenderList:
newFile: !uuid '0045695d6b15ccd9ca903544a3f0641876c5c35a'
oldFile: !uuid 'a8c51f76ccc8d127a0929bedf0c0bf1699538b01'
/src/views/preview/components/PreviewRenderList/index.vue:
newFile: !uuid '800214cf92b14f2dee03384086d3e219d9d97eb0'
oldFile: !uuid 'eca587aab1d8a1e1980f6c6f86f7be8247441e77'
gitCommitId: !uuid '1b2b319467663364bce47e92327dd79668efe02c'
renames: {
}
revisionId: 1333
revisionId: 1334