#1339: Merge branch 'dev'

This commit is contained in:
奔跑的面条 2023-03-04 17:05:46 +08:00
commit 728e12d40a
2 changed files with 145 additions and 34 deletions

@ -1 +1 @@
Subproject commit 22924eb36f352bb41fb676412bb4f8cb5b4cb41b
Subproject commit b94b44090b1ec3b4673c98f90ac8b56c62428f93

View File

@ -3,48 +3,159 @@ branches: {
}
fileChange:
/src:
newFile: !uuid 'a4a503c3c69f1226d761e03a9391e2c0b7e10d8f'
oldFile: !uuid 'f1f59a4fa35256b3b7b367f0546c20726a22ae99'
newFile: !uuid '2ce5d140fc27689ff0bc469122bf7116e28c3336'
oldFile: !uuid 'a4a503c3c69f1226d761e03a9391e2c0b7e10d8f'
/src/api:
newFile: !uuid '11fccfd1200d07323de878b9073e9617c77fd7d9'
oldFile: !uuid 'da760c25dc97a9164283ecfa9b0a1556c777dba3'
/src/api/http.ts:
newFile: !uuid '0588049d592263a473950d47cf2cb8f762e7c34b'
oldFile: !uuid 'a7d8a130b30a311dc36efdbac22994ded12ee88b'
/src/assets:
newFile: !uuid '26f5c94cdfff578bd9cd5b7221959a702875c1be'
oldFile: !uuid '844ffbfa5e143af851fc91ec2879b2ba6110d7ff'
/src/assets/images:
newFile: !uuid '481b4a117ef858c29ac6350e6c02ac197b86d1fa'
oldFile: !uuid 'de8e214abffb735d4f20439bbe624de9b9e5496f'
/src/assets/images/chart:
newFile: !uuid 'e1f57abd263c4cd7a8abe880c53cf5c922e547ab'
oldFile: !uuid '2e62736947e7d541683a9f4e4ff69af13af9e4db'
/src/assets/images/chart/informations:
newFile: !uuid '75b7e2f77c110d5a32a17ded129cd177d5a4acee'
oldFile: !uuid '9007ce33d3d5e04d10d86045f303c5aa2b4aaaf0'
/src/assets/images/chart/informations/photo_carousel.png:
newFile: !uuid '55cde6266bbfe7d5775e00a6f3c7c181949fb989'
oldFile: null
/src/enums:
newFile: !uuid '0dec20e6e1be2891dbfc9969b43fdfb92f78095e'
oldFile: !uuid 'fabbeaf5debd4dbf522ff6c4f6241776c85311e6'
/src/enums/editPageEnum.ts:
newFile: !uuid '518b6f70cc9eafafefbb92426f497abb85cf1fff'
oldFile: !uuid '07d51e70887f2348315087911fec5d4cd7548566'
/src/enums/eventEnum.ts:
newFile: !uuid '9f05aa5708b851d7ff31f1071f851753fa4234f9'
oldFile: !uuid 'a8110a7173b84940e9e912dbfd125a91d4819574'
/src/layout:
newFile: !uuid '0169a8cfa5b45b1bf6a915cef2b20d2d466bf684'
oldFile: !uuid '2bcfca75da0be6d2e27e000c3d7358a185dafe32'
/src/layout/components:
newFile: !uuid '5ae1c3242b09cf8da1a77d3654da9b1a488e1eea'
oldFile: !uuid '75a62790d9057a11c79559f6aa12924a39f47a80'
/src/layout/components/LayoutHeader:
newFile: !uuid '78512144b3bd6e93d3e29d5fc096cdd2b200d113'
oldFile: !uuid '9d96c6616f732e11581c17b1e5c830b317805b6f'
/src/layout/components/LayoutHeader/index.vue:
newFile: !uuid '718a92824323d6cddbe5691615c92f025154b5f7'
oldFile: !uuid '91c808234bc4d0d39b694e47755ef90645b84f5b'
/src/packages:
newFile: !uuid '60df8dbd5c8edbc4026bcc117f8005a9e62554c2'
oldFile: !uuid '3f01193b008b2ec0a13a65de782ab5bfff352e5b'
newFile: !uuid '8e20db438f298c2867b35d62a3a5230302971292'
oldFile: !uuid '60df8dbd5c8edbc4026bcc117f8005a9e62554c2'
/src/packages/components:
newFile: !uuid '25d616cacc3f90efcb5bb141b631da0cec205f68'
oldFile: !uuid '0443a6f7b32b1099e9f196c8e25ecca0304fd63c'
newFile: !uuid '259f2ab0936610e62be32320ea32be570303e3af'
oldFile: !uuid '25d616cacc3f90efcb5bb141b631da0cec205f68'
/src/packages/components/Charts:
newFile: !uuid 'abf217018f413494fade676e0ffc1293d47678a7'
oldFile: !uuid '65e82555f1d334e1e23aaf4cb635329136079d26'
/src/packages/components/Charts/Maps:
newFile: !uuid '1654f5ac69fa65ab975d475625b57b9ec9b02656'
oldFile: !uuid '34a03b3e3ce1b1ad6ff52c7cc1a02a772131f63f'
/src/packages/components/Charts/Maps/MapBase:
newFile: !uuid '2bb21dbc04bd561086a0915353b55698e62195d1'
oldFile: !uuid '772ff9525f55e421990e3da2f5dd79afaec95132'
/src/packages/components/Charts/Maps/MapBase/index.vue:
newFile: !uuid '0b3baee4c430d5d08b5b94e6491ae0b6d82b871f'
oldFile: !uuid '7a66753d0e20869b73d912fb8ee0ac2dadc4d5b2'
/src/packages/components/Informations:
newFile: !uuid '06af23e13d199e6e9164fc2ff096ecdc00a2b274'
oldFile: !uuid '713eb1ff006bef03068f055de0bbfe492b31251a'
newFile: !uuid '6ec03d41dec935431f5ae88c9b8f25f5467db20e'
oldFile: !uuid '06af23e13d199e6e9164fc2ff096ecdc00a2b274'
/src/packages/components/Informations/Mores:
newFile: !uuid 'ec3df9e18f0c50180a636ed019b1cc1e7ad634ec'
oldFile: !uuid '95afc29e198108f63a3099b72010d0041b93f3d9'
/src/packages/components/Informations/Mores/Carousel:
newFile: !uuid 'e961e693b1ffc6a1ea6c8bef5117ba758188be40'
newFile: !uuid '114f6e0dda69520539da260d5568225fafc8a2cd'
oldFile: !uuid 'ec3df9e18f0c50180a636ed019b1cc1e7ad634ec'
/src/packages/components/Informations/Mores/ImageCarousel:
newFile: !uuid 'af01705a39a25aa7b1549498ab909b15f3dd1765'
oldFile: null
/src/packages/components/Informations/Mores/Carousel/config.ts:
newFile: !uuid '78a6f2849a0bc9777dc64872460f7d348fef5dca'
/src/packages/components/Informations/Mores/ImageCarousel/config.ts:
newFile: !uuid 'c49fb619212d6a0118a526c1fe1e81d9bc76db05'
oldFile: null
/src/packages/components/Informations/Mores/Carousel/config.vue:
newFile: !uuid 'da3f7492c24542a19c6b0bcc6a037ff8a780f411'
/src/packages/components/Informations/Mores/ImageCarousel/config.vue:
newFile: !uuid '17c39805dbdfeea7709f4fb4e508a53e51a475a7'
oldFile: null
/src/packages/components/Informations/Mores/Carousel/images:
newFile: !uuid '8bed609009a9835c19bb4032ea98699afd602904'
/src/packages/components/Informations/Mores/ImageCarousel/index.ts:
newFile: !uuid '8ef116560346a98cf05dafe3e7cc4a226b98d675'
oldFile: null
/src/packages/components/Informations/Mores/Carousel/images/carousel.png:
newFile: !uuid '95f366b1ca29657df8a28c3494093c7ed2ce415b'
oldFile: null
/src/packages/components/Informations/Mores/Carousel/images/carousel2.png:
newFile: !uuid 'd8a6859fb678774df90133db43d778b87b4b5882'
oldFile: null
/src/packages/components/Informations/Mores/Carousel/index.ts:
newFile: !uuid 'fbb8d35cda3d9d9411cad5441aba56e81f3141dd'
oldFile: null
/src/packages/components/Informations/Mores/Carousel/index.vue:
newFile: !uuid '3018fbc209b960f62fc6dc084751c1be22923fb8'
/src/packages/components/Informations/Mores/ImageCarousel/index.vue:
newFile: !uuid '42dc1a73cb1039cfa567e93dda3b6e6ef1721b78'
oldFile: null
/src/packages/components/Informations/Mores/index.ts:
newFile: !uuid '0e842ce09929f985aa5fb1ba7e2f6070c543b514'
oldFile: !uuid '8fadc44153aceb462180bffac2b0fd63b1f6e93f'
gitCommitId: !uuid '22924eb36f352bb41fb676412bb4f8cb5b4cb41b'
newFile: !uuid '778f89a9370759039476e4fa7b0c4331680b3c48'
oldFile: !uuid '0e842ce09929f985aa5fb1ba7e2f6070c543b514'
/src/plugins:
newFile: !uuid 'a1c2de9481140f332baa596b271ae666f48facb7'
oldFile: !uuid 'e3156cc92f38e9ec9f834bc5f312a4d73061aba3'
/src/plugins/icon.ts:
newFile: !uuid 'e8979e07da65b07c4a32d362bc98ec476b02b09a'
oldFile: !uuid 'b195e340c63483a9066942897edb1ab318585e16'
/src/store:
newFile: !uuid 'b0d9acc8b130465621ee7deda3b4ecdb00039812'
oldFile: !uuid '056efd29dc6c67d82f7d46835d155ff13a151d7e'
/src/store/modules:
newFile: !uuid '03dbb868a5ee354b3405f4a3b5f5f81847142110'
oldFile: !uuid 'b42b30d93e95d226cb8a340598f043fd4e130f20'
/src/store/modules/chartEditStore:
newFile: !uuid 'cf0652aad1b4cdff589f93046b4042dc07fbca60'
oldFile: !uuid 'a1cd9e890584a602bd273a3b0af873e89ba7d0ae'
/src/store/modules/chartEditStore/chartEditStore.d.ts:
newFile: !uuid '5b986821aee42b2a3d24ad61989318d700cd1c42'
oldFile: !uuid 'f06bccbcec4500a21ab0530d0fd4a333b61dee61'
/src/store/modules/chartEditStore/chartEditStore.ts:
newFile: !uuid 'ec9c3be950346516a5cc0d6d26d582dc4e396714'
oldFile: !uuid '4469369e54386f7863d82fa5be49b0d97ae4480e'
/src/utils:
newFile: !uuid '408c7cddfb997826bd599efe600e9e5f74b21615'
oldFile: !uuid '9c94b556c1bc47f761b7d7d2079c53cb50d2ae69'
/src/utils/utils.ts:
newFile: !uuid '9d0302ba6c4f2c2858cd17f1b963f5f783953a91'
oldFile: !uuid '34161e04dde86e78e90127f7a15caa4fd18d6afd'
/src/views:
newFile: !uuid '3795aa3545ffcda8ca29ef50461cd7ae1fb74752'
oldFile: !uuid 'ca45903db9c045b36d1192699e662c1e29ccccc6'
/src/views/chart:
newFile: !uuid 'd7016556710b68194ec652c529ee38d446a2ac0d'
oldFile: !uuid 'a33dbee16c08a7ff1c26062255147ae2862196f4'
/src/views/chart/ContentEdit:
newFile: !uuid '3a0130eea6ff5aaa6184e8b2c72f5e7aa4eabb29'
oldFile: !uuid 'dd74eefc0c74b02b0e57b4f22316bb836f6bb908'
/src/views/chart/ContentEdit/components:
newFile: !uuid '703a799413ae41d173cacd2699161934f37e876a'
oldFile: !uuid '972bc952eb99913006726de4cd7f2fdfcd6dfbb4'
/src/views/chart/ContentEdit/components/EditTools:
newFile: !uuid 'fa1ecba309357727392bc976a82f84cee782e6a4'
oldFile: !uuid '86ae9e55ca614357301e7017d5f514ff284a758d'
/src/views/chart/ContentEdit/components/EditTools/hooks:
newFile: !uuid '08fcd2c58b99655f70e3a7cbedbfb2d0863e0a46'
oldFile: !uuid '70bfd0da0da01f49250c1a0e3a381c3dd98665b4'
/src/views/chart/ContentEdit/components/EditTools/hooks/useSyncUpdate.hook.ts:
newFile: !uuid 'b4c971dd807556b25af00094aad69a6fa47fd97d'
oldFile: !uuid '6b39b36edb154c508a9f5c04663dfbd5a376d962'
/src/views/chart/ContentEdit/components/EditTools/index.vue:
newFile: !uuid '0d2dd89599ac9838589e4ecc255a3a3e243bb092'
oldFile: !uuid '79d2eb6c3ce161402b0342b348b74b8bf768d8aa'
/src/views/chart/ContentHeader:
newFile: !uuid 'e02bfaf5bc283ec560ec582060d21c16edad8805'
oldFile: !uuid 'ee3e05f65a0893dad5cd1a9caab75bff6ebd5f64'
/src/views/chart/ContentHeader/headerRightBtn:
newFile: !uuid '6119b4da2aea167b700d25677cfdea235cfdbbe1'
oldFile: !uuid '504266e1bc814d0ef4fdbd2eb10a4f940a291e73'
/src/views/chart/ContentHeader/headerRightBtn/index.vue:
newFile: !uuid 'cc6df2d341e32c175223b10dff5d9ed30469e1af'
oldFile: !uuid '7d6da71f882f7908dde7a7ca9830a919c9a204d9'
/src/views/edit:
newFile: !uuid '8fa3d7b0d26d85bb89baa0daa9695c96c4993342'
oldFile: !uuid 'd18127e2074adc8d91507ac4bb8c45ec5d99323f'
/src/views/edit/index.vue:
newFile: !uuid 'ca2b6996cf439cf8b5fd23165458478700ad86d5'
oldFile: !uuid '6240570d3d9a07cd4be6b3d33b9d7ce818503227'
gitCommitId: !uuid 'b94b44090b1ec3b4673c98f90ac8b56c62428f93'
renames: {
}
revisionId: 1338
revisionId: 1339