feat:恢复冲突的代码

2 years ago · ca6f30e7c3
parent d27b0591fe
commit ca6f30e7c3
36 changed files with 36 additions and 36 deletions
--- a/data-room-ui/packages/BasicComponents/CurrentTime/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/CurrentTime/settingConfig.js
@ -15,7 +15,7 @@ const customConfig = {
  type: 'currentTime',
  root: {
-    version : '0.0.1',
+    version: '2023071001',
    dateFormat: 'YYYY-MM-DD HH:mm:ss'
  },
  customize: {
--- a/data-room-ui/packages/BasicComponents/DigitalFlop/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/DigitalFlop/settingConfig.js
@ -31,7 +31,7 @@ export const settingConfig = {
 const customConfig = {
  type: 'digitalFlop',
  root: {
-    version : '0.0.1',
+    version: '2023071001',
    contribution: false
  },
  customize: {
--- a/data-room-ui/packages/BasicComponents/IframeChart/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/IframeChart/settingConfig.js
@ -18,7 +18,7 @@ export const settingConfig = {
 const customConfig = {
  type: 'iframeChart',
  root: {
-    version : '0.0.1',
+    version: '2023071001',
    url: 'https://www.runoob.com/'
  },
  customize: {
--- a/data-room-ui/packages/BasicComponents/LinkChart/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/LinkChart/settingConfig.js
@ -29,7 +29,7 @@ export const settingConfig = {
 const customConfig = {
  type: 'linkChart',
  root: {
-    version : '0.0.1',
+    version: '2023071001',
    url: 'https://www.runoob.com/'
  },
  customize: {
--- a/data-room-ui/packages/BasicComponents/Map/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/Map/settingConfig.js
@ -37,7 +37,7 @@ export const settingConfig = {
 const customConfig = {
  type: 'map',
  root: {
-    version : '0.0.1',
+    version: '2023071001',
    contribution: false
  },
  customize: {
--- a/data-room-ui/packages/BasicComponents/ScreenScrollBoard/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/ScreenScrollBoard/settingConfig.js
@ -31,7 +31,7 @@ export const settingConfig = {
 const customConfig = {
  type: 'screenScrollBoard',
  root: {
-    version : '0.0.1',
+    version: '2023071001',
    contribution: false
  },
  customize: {
--- a/data-room-ui/packages/BasicComponents/Texts/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/Texts/settingConfig.js
@ -29,7 +29,7 @@ export const settingConfig = {
 const customConfig = {
  type: 'texts',
  root: {
-    version : '0.0.1',
+    version: '2023071001',
    url: 'https://www.runoob.com/'
  },
  customize: {
--- a/data-room-ui/packages/BasicComponents/TimeCountDown/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/TimeCountDown/settingConfig.js
@ -14,7 +14,7 @@ export const settingConfig = {
 const customConfig = {
  type: 'timeCountDown',
  root: {
-    version : '0.0.1',
+    version: '2023071001',
    endTime: ''
  },
  customize: {
--- a/data-room-ui/packages/Borders/Border1/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border1/settingConfig.js
@ -20,7 +20,7 @@ export const settingConfig = {
 const customConfig = {
  type: 'border1',
  root: {
-    version : '0.0.1',
+    version: '2023071001',
    contribution: false
  },
  customize: {
--- a/data-room-ui/packages/Borders/Border10/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border10/settingConfig.js
@ -20,7 +20,7 @@ export const settingConfig = {
 const customConfig = {
  type: 'border10',
  root: {
-    version : '0.0.1',
+    version: '2023071001',
    contribution: false
  },
  customize: {
--- a/data-room-ui/packages/Borders/Border11/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border11/settingConfig.js
@ -20,7 +20,7 @@ export const settingConfig = {
 const customConfig = {
  type: 'border11',
  root: {
-    version : '0.0.1',
+    version: '2023071001',
    contribution: false
  },
  customize: {
--- a/data-room-ui/packages/Borders/Border12/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border12/settingConfig.js
@ -20,7 +20,7 @@ export const settingConfig = {
 const customConfig = {
  type: 'border12',
  root: {
-    version : '0.0.1',
+    version: '2023071001',
    contribution: false
  },
  customize: {
--- a/data-room-ui/packages/Borders/Border13/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border13/settingConfig.js
@ -20,7 +20,7 @@ export const settingConfig = {
 const customConfig = {
  type: 'border13',
  root: {
-    version : '0.0.1',
+    version: '2023071001',
    contribution: false
  },
  customize: {
--- a/data-room-ui/packages/Borders/Border2/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border2/settingConfig.js
@ -20,7 +20,7 @@ export const settingConfig = {
 const customConfig = {
  type: 'border2',
  root: {
-    version : '0.0.1',
+    version: '2023071001',
    contribution: false
  },
  customize: {
--- a/data-room-ui/packages/Borders/Border3/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border3/settingConfig.js
@ -20,7 +20,7 @@ export const settingConfig = {
 const customConfig = {
  type: 'border3',
  root: {
-    version : '0.0.1',
+    version: '2023071001',
    contribution: false
  },
  customize: {
--- a/data-room-ui/packages/Borders/Border4/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border4/settingConfig.js
@ -20,7 +20,7 @@ export const settingConfig = {
 const customConfig = {
  type: 'border4',
  root: {
-    version : '0.0.1',
+    version: '2023071001',
    contribution: false
  },
  customize: {
--- a/data-room-ui/packages/Borders/Border5/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border5/settingConfig.js
@ -20,7 +20,7 @@ export const settingConfig = {
 const customConfig = {
  type: 'border5',
  root: {
-    version : '0.0.1',
+    version: '2023071001',
    contribution: false
  },
  customize: {
--- a/data-room-ui/packages/Borders/Border6/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border6/settingConfig.js
@ -20,7 +20,7 @@ export const settingConfig = {
 const customConfig = {
  type: 'border6',
  root: {
-    version : '0.0.1',
+    version: '2023071001',
    contribution: false
  },
  customize: {
--- a/data-room-ui/packages/Borders/Border7/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border7/settingConfig.js
@ -20,7 +20,7 @@ export const settingConfig = {
 const customConfig = {
  type: 'border7',
  root: {
-    version : '0.0.1',
+    version: '2023071001',
    contribution: false
  },
  customize: {
--- a/data-room-ui/packages/Borders/Border8/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border8/settingConfig.js
@ -20,7 +20,7 @@ export const settingConfig = {
 const customConfig = {
  type: 'border8',
  root: {
-    version : '0.0.1',
+    version: '2023071001',
    contribution: false
  },
  customize: {
--- a/data-room-ui/packages/Borders/Border9/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border9/settingConfig.js
@ -20,7 +20,7 @@ export const settingConfig = {
 const customConfig = {
  type: 'border9',
  root: {
-    version : '0.0.1',
+    version: '2023071001',
    contribution: false
  },
  customize: {
--- a/data-room-ui/packages/Decorations/Decoration1/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration1/settingConfig.js
@ -16,7 +16,7 @@ export const settingConfig = {
 const customConfig = {
  type: 'decoration1',
  root: {
-    version : '0.0.1',
+    version: '2023071001',
    contribution: false
  },
  customize: {
--- a/data-room-ui/packages/Decorations/Decoration10/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration10/settingConfig.js
@ -16,7 +16,7 @@ export const settingConfig = {
 const customConfig = {
  type: 'decoration10',
  root: {
-    version : '0.0.1',
+    version: '2023071001',
    contribution: false
  },
  customize: {
--- a/data-room-ui/packages/Decorations/Decoration11/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration11/settingConfig.js
@ -16,7 +16,7 @@ export const settingConfig = {
 const customConfig = {
  type: 'decoration11',
  root: {
-    version : '0.0.1',
+    version: '2023071001',
    contribution: false
  },
  customize: {
--- a/data-room-ui/packages/Decorations/Decoration12/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration12/settingConfig.js
@ -16,7 +16,7 @@ export const settingConfig = {
 const customConfig = {
  type: 'decoration12',
  root: {
-    version : '0.0.1',
+    version: '2023071001',
    contribution: false
  },
  customize: {
--- a/data-room-ui/packages/Decorations/Decoration2/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration2/settingConfig.js
@ -16,7 +16,7 @@ export const settingConfig = {
 const customConfig = {
  type: 'decoration2',
  root: {
-    version : '0.0.1',
+    version: '2023071001',
    contribution: false
  },
  customize: {
--- a/data-room-ui/packages/Decorations/Decoration2Reverse/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration2Reverse/settingConfig.js
@ -16,7 +16,7 @@ export const settingConfig = {
 const customConfig = {
  type: 'decoration2Reverse',
  root: {
-    version : '0.0.1',
+    version: '2023071001',
    contribution: false
  },
  customize: {
--- a/data-room-ui/packages/Decorations/Decoration3/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration3/settingConfig.js
@ -16,7 +16,7 @@ export const settingConfig = {
 const customConfig = {
  type: 'decoration3',
  root: {
-    version : '0.0.1',
+    version: '2023071001',
    contribution: false
  },
  customize: {
--- a/data-room-ui/packages/Decorations/Decoration4/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration4/settingConfig.js
@ -16,7 +16,7 @@ export const settingConfig = {
 const customConfig = {
  type: 'decoration4',
  root: {
-    version : '0.0.1',
+    version: '2023071001',
    contribution: false
  },
  customize: {
--- a/data-room-ui/packages/Decorations/Decoration4Reverse/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration4Reverse/settingConfig.js
@ -16,7 +16,7 @@ export const settingConfig = {
 const customConfig = {
  type: 'decoration4Reverse',
  root: {
-    version : '0.0.1',
+    version: '2023071001',
    contribution: false
  },
  customize: {
--- a/data-room-ui/packages/Decorations/Decoration5/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration5/settingConfig.js
@ -16,7 +16,7 @@ export const settingConfig = {
 const customConfig = {
  type: 'decoration5',
  root: {
-    version : '0.0.1',
+    version: '2023071001',
    contribution: false
  },
  customize: {
--- a/data-room-ui/packages/Decorations/Decoration6/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration6/settingConfig.js
@ -16,7 +16,7 @@ export const settingConfig = {
 const customConfig = {
  type: 'decoration6',
  root: {
-    version : '0.0.1',
+    version: '2023071001',
    contribution: false
  },
  customize: {
--- a/data-room-ui/packages/Decorations/Decoration8/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration8/settingConfig.js
@ -16,7 +16,7 @@ export const settingConfig = {
 const customConfig = {
  type: 'decoration8',
  root: {
-    version : '0.0.1',
+    version: '2023071001',
    contribution: false
  },
  customize: {
--- a/data-room-ui/packages/Decorations/Decoration8Reverse/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration8Reverse/settingConfig.js
@ -16,7 +16,7 @@ export const settingConfig = {
 const customConfig = {
  type: 'decoration8Reverse',
  root: {
-    version : '0.0.1',
+    version: '2023071001',
    contribution: false
  },
  customize: {
--- a/data-room-ui/packages/Decorations/Decoration9/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration9/settingConfig.js
@ -16,7 +16,7 @@ export const settingConfig = {
 const customConfig = {
  type: 'decoration9',
  root: {
-    version : '0.0.1',
+    version: '2023071001',
    contribution: false
  },
  customize: {
--- a/data-room-ui/packages/RemoteComponents/settingConfig.js
+++ b/data-room-ui/packages/RemoteComponents/settingConfig.js
@ -4,7 +4,7 @@ export const settingConfig = {
 }
 const customConfig = {
  root: {
-    version : '0.0.1',
+    version: '2023071001',
    contribution: false
  },
  customize: {