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

This commit is contained in:
奔跑的面条 2022-08-05 08:42:22 +08:00
commit 9da4f3db1f
2 changed files with 16 additions and 43 deletions

@ -1 +1 @@
Subproject commit f379f7652cb443b01af0e05f651c24f91a73ed19 Subproject commit f506ccd2e4a9f600cd526c8560ca23e57d808805

View File

@ -3,48 +3,21 @@ branches: {
} }
fileChange: fileChange:
/src: /src:
newFile: !uuid 'e70f697081f48b63b66c1ee432eebf0aae5ec6b6' newFile: !uuid '83da0e116cc79af629489a933e1e35d81db7e93a'
oldFile: !uuid '4ade63ee7c990b88a4e5785529e7a4d57e54827c' oldFile: !uuid 'e70f697081f48b63b66c1ee432eebf0aae5ec6b6'
/src/store:
newFile: !uuid '2c373c201e346ff9e1eebb4737d83311408faec5'
oldFile: !uuid '37b73e2be0e564c412fdc8e7c158249e97493dbb'
/src/store/modules:
newFile: !uuid '71c94a54f433d2dda2f714957ef5c9019e7a7a4a'
oldFile: !uuid '1ec20d0c5a2889549bbd5ca45684c1fe2f6ef3f4'
/src/store/modules/chartEditStore:
newFile: !uuid '3e448c1ffeea77f275a73d050f8c86f06b132fe5'
oldFile: !uuid 'fbc4ed1e663c04e6ddcaa512658c8970c798da10'
/src/store/modules/chartEditStore/chartEditStore.ts:
newFile: !uuid '3bdb8a21b85f1d21a3f2b128804bbc677d615000'
oldFile: !uuid '5fa3f56de510ca70fbd829bdf960d0f4dd7bec8b'
/src/store/modules/chartHistoryStore:
newFile: !uuid '72406909a34f5326e5f0be391dafbaa467832b55'
oldFile: !uuid 'd4e81226e20606c85b8792d5bacc078f6a0ce725'
/src/store/modules/chartHistoryStore/chartHistoryStore.ts:
newFile: !uuid '31b0425d034b0ca2ba77703e72125d276271b4e4'
oldFile: !uuid '9d29fbbebbb9635b7a40d51330c939a7c2fde689'
/src/views: /src/views:
newFile: !uuid '722df601f5d0fbc0067c24b11e6aa0d909a8a748' newFile: !uuid '096ad09d3bca194b44fed0aa09fb93aa56883831'
oldFile: !uuid '0ceab72b0c8df1c2737cc8b149482d06527e2e82' oldFile: !uuid '722df601f5d0fbc0067c24b11e6aa0d909a8a748'
/src/views/chart: /src/views/preview:
newFile: !uuid '09f2f2e3a7721bb48861ee32913ccad90524dbca' newFile: !uuid '5b6c02b8a00877cd9b75f893f69e51788a71cb66'
oldFile: !uuid 'ba4e4a907299c106a959f5df9dbd6ab447c7b4ad' oldFile: !uuid 'c2c8d27beda336894e43186794cc168e719ad7fd'
/src/views/chart/ContentEdit: /src/views/preview/utils:
newFile: !uuid '19dab156f033b0f822a3d1efb2a2261d8fb55c21' newFile: !uuid 'e6cb9a41b491aeab4333ef1bf0fa7862d76b40f0'
oldFile: !uuid 'b5537ea9d5502440c151462bedc2e195b6315c4c' oldFile: !uuid 'e039eb209f2eec8309ac756f29e019dd310152f7'
/src/views/chart/ContentEdit/components: /src/views/preview/utils/style.ts:
newFile: !uuid 'c4bfe7c45aaf13d7069b8f1de381a30c63386b0d' newFile: !uuid '8392c3482937c59ffeef8e0faebefc4bd96d53e2'
oldFile: !uuid '174b65d40d0fa928e65a0dbb28b24d5a588ea8ce' oldFile: !uuid '1ae54448fd893d94e8240c1490bca654d2e91e1d'
/src/views/chart/ContentEdit/components/EditRange: gitCommitId: !uuid 'f506ccd2e4a9f600cd526c8560ca23e57d808805'
newFile: !uuid 'cd5f2f20be6418a1158d54e5c517ad63bb13aef9'
oldFile: !uuid 'bc45dcd470ca9a30971dc7db0420fa1a1e88a29c'
/src/views/chart/ContentEdit/components/EditRange/index.vue:
newFile: !uuid '72a0167217274350d1440158e31480dd64677c9f'
oldFile: !uuid '7cff8e94bc5c51f91ec8b5a278c01ef8eaa549cd'
/src/views/chart/ContentEdit/index.vue:
newFile: !uuid '7f181129bcca15b08ee1f5139b822a588d119cb9'
oldFile: !uuid '129a55a1146a890cd9604d2ed53dbcf86ec4359e'
gitCommitId: !uuid 'f379f7652cb443b01af0e05f651c24f91a73ed19'
renames: { renames: {
} }
revisionId: 524 revisionId: 525