#520: fix: 合并编辑功能的修改

This commit is contained in:
奔跑的面条 2022-07-07 19:54:53 +08:00
commit 047f85d031
2 changed files with 33 additions and 21 deletions

@ -1 +1 @@
Subproject commit 437ad1bd9fe9818f2c5b81f0a6678009057b0da1 Subproject commit 7322817cb5e448540299e99c670ea9fa77e7517a

View File

@ -3,33 +3,45 @@ branches: {
} }
fileChange: fileChange:
/src: /src:
newFile: !uuid 'e1b81b8dec1b810f662f6bcc4f80e96a8535e663' newFile: !uuid '773cf208ed43ea42a176fb35af96832518869a22'
oldFile: !uuid 'c962bb62da0460ddd05d7dd1604d1c71226d27bf' oldFile: !uuid 'e1b81b8dec1b810f662f6bcc4f80e96a8535e663'
/src/plugins:
newFile: !uuid '777426988f6812b4aed6c3c8a90eb399bb793572'
oldFile: !uuid 'cd6141f9dcd5ac9d1184cd29817fdea58dd94d03'
/src/plugins/icon.ts:
newFile: !uuid '3b39f6bb99eb897b001fceb4e234519aed66577c'
oldFile: !uuid 'bcc7cd19938581add4e6e48f2840a3b306f6363a'
/src/views: /src/views:
newFile: !uuid '3bc37c7a5c5cbb10d87316ac5af744986094e38e' newFile: !uuid 'eb5e9f9f12c0a95ed279182357b5e127af6c64ce'
oldFile: !uuid '3dedeaa87d7ae15410e02237f813be0e29edd97e' oldFile: !uuid '3bc37c7a5c5cbb10d87316ac5af744986094e38e'
/src/views/chart: /src/views/chart:
newFile: !uuid '07c5eb3759fe5be03d60e0c9b1a9d6d2fb7b72ef' newFile: !uuid '8b39761edae82faf17699498c05aaae0aae23f53'
oldFile: !uuid '8871f74b89ef0f92425806e934fe510cf5e4d3d2' oldFile: !uuid '07c5eb3759fe5be03d60e0c9b1a9d6d2fb7b72ef'
/src/views/chart/ContentConfigurations: /src/views/chart/ContentConfigurations:
newFile: !uuid '0624930c972ae0ca7ac549ce6ac7b289ad2cee86' newFile: !uuid 'e4d0170e95a1f736c35e55cc18e8784048966583'
oldFile: !uuid '35a74af862ce7c6eeaafb0ca4c9f5090b8e3ab5b' oldFile: !uuid '0624930c972ae0ca7ac549ce6ac7b289ad2cee86'
/src/views/chart/ContentConfigurations/components: /src/views/chart/ContentConfigurations/components:
newFile: !uuid 'ab825ee83767d69b732e95a63775b88df536577c' newFile: !uuid '2160978f63482308175813b7be7411c1be95fd25'
oldFile: !uuid 'fc9505de58f7c256de61142898164991987a82e4' oldFile: !uuid 'ab825ee83767d69b732e95a63775b88df536577c'
/src/views/chart/ContentConfigurations/components/ChartData: /src/views/chart/ContentConfigurations/components/ChartData:
newFile: !uuid '5996fecc104d95c41a049dcf12b611e9eebe6d80' newFile: !uuid '2a5f2b50913ee001e726a9c957648c3ae4bdb30e'
oldFile: !uuid 'bd06469831ff155952317e36258a54796df65ebd' oldFile: !uuid '5996fecc104d95c41a049dcf12b611e9eebe6d80'
/src/views/chart/ContentConfigurations/components/ChartData/components: /src/views/chart/ContentConfigurations/components/ChartData/components:
newFile: !uuid 'b57921eeb2b3340a8a05ac70d7f854a1633930f7' newFile: !uuid '104e3f39d30d5c23aa8d92e40ef6569cb76c85eb'
oldFile: !uuid 'fa404010d09d7a0c13b2de0eec045787f54b3ae9' oldFile: !uuid 'b57921eeb2b3340a8a05ac70d7f854a1633930f7'
/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow:
newFile: !uuid 'c0640004b2b8cd97945dca3639ea5e2c505e4aa7'
oldFile: !uuid '3e587c94950c78c8df07a178cc451242fbb22914'
/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue:
newFile: !uuid '58f9d0013966e5aac203d015376b337d4800b570'
oldFile: !uuid '39d31cef693b1d6bdc5ed8031af8a03bda6737af'
/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMonacoEditor: /src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMonacoEditor:
newFile: !uuid 'a7de602acf4691c8bf789c2f0defbf07d1424438' newFile: !uuid 'c2d8053cd4b658fac1a0e062e42ef477056f1ca7'
oldFile: !uuid 'ae60bb6d9ef527b4497a18ed7e48145305c657f3' oldFile: !uuid 'a7de602acf4691c8bf789c2f0defbf07d1424438'
/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMonacoEditor/index.vue: /src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMonacoEditor/index.vue:
newFile: !uuid '7cdf09313cbf5edc3509117f7b3f62c158ada4a6' newFile: !uuid 'd92569e1b47e6dcdaab0f5a4b70b1fb9268d01ef'
oldFile: !uuid 'dd07e151faee16c3041f1b6b67949dbb56078043' oldFile: !uuid '7cdf09313cbf5edc3509117f7b3f62c158ada4a6'
gitCommitId: !uuid '437ad1bd9fe9818f2c5b81f0a6678009057b0da1' gitCommitId: !uuid '7322817cb5e448540299e99c670ea9fa77e7517a'
renames: { renames: {
} }
revisionId: 519 revisionId: 520