Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/refactor/develop' into refacto…
Browse files Browse the repository at this point in the history
…r-extra-canvas-api-2
  • Loading branch information
rhlin committed Jun 28, 2024
2 parents 4722d1a + c25fbac commit 54d168c
Show file tree
Hide file tree
Showing 119 changed files with 1,223 additions and 1,923 deletions.
112 changes: 56 additions & 56 deletions designer-demo/public/mock/bundle.json

Large diffs are not rendered by default.

72 changes: 36 additions & 36 deletions mockServer/assets/json/bundle.json
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@
"cols": 12,
"bindState": false,
"widget": {
"component": "MetaContainer",
"component": "ContainerConfigurator",
"props": {}
},
"description": {
Expand Down Expand Up @@ -1914,7 +1914,7 @@
"disabled": false,
"cols": 12,
"widget": {
"component": "MetaCodeEditor",
"component": "CodeConfigurator",
"props": {}
},
"description": {
Expand Down Expand Up @@ -2067,7 +2067,7 @@
},
"cols": 12,
"widget": {
"component": "MetaLayoutGrid",
"component": "LayoutGridConfigurator",
"props": {}
},
"description": {
Expand Down Expand Up @@ -2359,7 +2359,7 @@
"disabled": false,
"cols": 12,
"widget": {
"component": "MetaCodeEditor",
"component": "CodeConfigurator",
"props": {}
},
"description": {
Expand All @@ -2379,7 +2379,7 @@
"disabled": false,
"cols": 12,
"widget": {
"component": "MetaCodeEditor",
"component": "CodeConfigurator",
"props": {}
},
"description": {
Expand Down Expand Up @@ -2993,7 +2993,7 @@
"readOnly": false,
"disabled": false,
"widget": {
"component": "MetaBindI18n",
"component": "I18nConfigurator",
"props": {}
},
"description": {
Expand Down Expand Up @@ -3330,7 +3330,7 @@
"disabled": false,
"cols": 12,
"widget": {
"component": "MetaBindI18n",
"component": "I18nConfigurator",
"props": {}
},
"description": {
Expand Down Expand Up @@ -3394,7 +3394,7 @@
"disabled": false,
"cols": 12,
"widget": {
"component": "MetaBindI18n",
"component": "I18nConfigurator",
"props": {}
},
"description": {
Expand Down Expand Up @@ -4083,7 +4083,7 @@
"disabled": false,
"cols": 12,
"widget": {
"component": "MetaCodeEditor",
"component": "CodeConfigurator",
"props": {
"language": "json"
}
Expand Down Expand Up @@ -5372,7 +5372,7 @@
"disabled": false,
"cols": 12,
"widget": {
"component": "MetaCodeEditor",
"component": "CodeConfigurator",
"props": {}
},
"description": {
Expand Down Expand Up @@ -5836,7 +5836,7 @@
"cols": 12,
"bindState": false,
"widget": {
"component": "MetaContainer",
"component": "ContainerConfigurator",
"props": {}
},
"description": {
Expand Down Expand Up @@ -6232,7 +6232,7 @@
"disabled": false,
"cols": 12,
"widget": {
"component": "MetaCodeEditor",
"component": "CodeConfigurator",
"props": {}
},
"description": {
Expand Down Expand Up @@ -6688,7 +6688,7 @@
"disabled": false,
"cols": 12,
"widget": {
"component": "MetaCodeEditor",
"component": "CodeConfigurator",
"props": {
"language": "json"
}
Expand Down Expand Up @@ -6725,7 +6725,7 @@
}
},
"widget": {
"component": "MetaBindI18n",
"component": "I18nConfigurator",
"props": {}
}
},
Expand Down Expand Up @@ -6834,7 +6834,7 @@
}
},
"widget": {
"component": "MetaCodeEditor",
"component": "CodeConfigurator",
"props": {
"dataType": "JSFunction"
}
Expand Down Expand Up @@ -6909,7 +6909,7 @@
"disabled": false,
"cols": 12,
"widget": {
"component": "MetaCodeEditor",
"component": "CodeConfigurator",
"props": {
"language": "json"
}
Expand All @@ -6931,7 +6931,7 @@
"disabled": false,
"cols": 12,
"widget": {
"component": "MetaCodeEditor",
"component": "CodeConfigurator",
"props": {
"language": "json"
}
Expand Down Expand Up @@ -6980,7 +6980,7 @@
}
],
"widget": {
"component": "MetaArrayItem",
"component": "ArrayItemConfigurator",
"props": {
"type": "object",
"textField": "title",
Expand Down Expand Up @@ -7008,7 +7008,7 @@
"onChange": "this.delProp('data')",
"cols": 12,
"widget": {
"component": "MetaCodeEditor",
"component": "CodeConfigurator",
"props": {
"name": "fetchData",
"dataType": "JSExpression"
Expand All @@ -7035,7 +7035,7 @@
}
},
"widget": {
"component": "MetaCodeEditor",
"component": "CodeConfigurator",
"props": {
"name": "pager",
"dataType": "JSExpression"
Expand Down Expand Up @@ -7099,7 +7099,7 @@
"disabled": false,
"cols": 12,
"widget": {
"component": "MetaCodeEditor",
"component": "CodeConfigurator",
"props": {
"dataType": "JSExpression"
}
Expand All @@ -7121,7 +7121,7 @@
"disabled": false,
"cols": 12,
"widget": {
"component": "MetaCodeEditor",
"component": "CodeConfigurator",
"props": {}
},
"description": {
Expand All @@ -7141,7 +7141,7 @@
"disabled": false,
"cols": 12,
"widget": {
"component": "MetaCodeEditor",
"component": "CodeConfigurator",
"props": {}
},
"description": {
Expand All @@ -7160,7 +7160,7 @@
"disabled": false,
"cols": 12,
"widget": {
"component": "MetaCodeEditor",
"component": "CodeConfigurator",
"props": {}
},
"description": {
Expand Down Expand Up @@ -7316,7 +7316,7 @@
"disabled": false,
"cols": 12,
"widget": {
"component": "MetaCodeEditor",
"component": "CodeConfigurator",
"props": {}
},
"description": {
Expand Down Expand Up @@ -7356,7 +7356,7 @@
"disabled": false,
"cols": 12,
"widget": {
"component": "MetaCodeEditor",
"component": "CodeConfigurator",
"props": {}
},
"description": {
Expand Down Expand Up @@ -7650,7 +7650,7 @@
"disabled": false,
"cols": 12,
"widget": {
"component": "MetaCodeEditor",
"component": "CodeConfigurator",
"props": {}
},
"description": {
Expand Down Expand Up @@ -7954,7 +7954,7 @@
"disabled": false,
"cols": 12,
"widget": {
"component": "MetaCodeEditor",
"component": "CodeConfigurator",
"props": {}
},
"description": {
Expand All @@ -7974,7 +7974,7 @@
"disabled": false,
"cols": 12,
"widget": {
"component": "MetaCodeEditor",
"component": "CodeConfigurator",
"props": {}
},
"description": {
Expand All @@ -7994,7 +7994,7 @@
"disabled": false,
"cols": 12,
"widget": {
"component": "MetaCodeEditor",
"component": "CodeConfigurator",
"props": {}
},
"description": {
Expand Down Expand Up @@ -8243,7 +8243,7 @@
],
"cols": 12,
"widget": {
"component": "MetaCodeEditor",
"component": "CodeConfigurator",
"props": {}
},
"description": {
Expand Down Expand Up @@ -8302,7 +8302,7 @@
"disabled": false,
"cols": 12,
"widget": {
"component": "MetaCodeEditor",
"component": "CodeConfigurator",
"props": {}
},
"description": {
Expand All @@ -8322,7 +8322,7 @@
"disabled": false,
"cols": 12,
"widget": {
"component": "MetaCodeEditor",
"component": "CodeConfigurator",
"props": {}
},
"description": {
Expand Down Expand Up @@ -8370,7 +8370,7 @@
"disabled": false,
"cols": 12,
"widget": {
"component": "MetaCodeEditor",
"component": "CodeConfigurator",
"props": {}
},
"description": {
Expand Down Expand Up @@ -8619,7 +8619,7 @@
],
"cols": 12,
"widget": {
"component": "MetaCodeEditor",
"component": "CodeConfigurator",
"props": {}
},
"description": {
Expand Down Expand Up @@ -9237,7 +9237,7 @@
"disabled": false,
"cols": 12,
"widget": {
"component": "MetaCodeEditor",
"component": "CodeConfigurator",
"props": {}
},
"description": {
Expand Down
Loading

0 comments on commit 54d168c

Please sign in to comment.