Merge pull request #1331 from chilingling/cherry-pick-2.4.1

Author: hexqi

designer-demo/public/mock/bundle.json

@@ -8020,7 +8020,9 @@
                     "cols": 12,
                     "widget": {
                       "component": "CodeConfigurator",
-                      "props": {}
+                      "props": {
+                        "language": "json"
+                      }
                     },
                     "description": {
                       "zh_CN": "checkbox组件列表"
@@ -13029,7 +13031,7 @@
               "schema": {
                 "componentName": "video",
                 "props": {
-                  "src": "img/webNova.jpg",
+                  "src": "https://tinyengine-assets.obs.myhuaweicloud.com/files/in-action.mp4#t=1.5",
                   "width": "200",
                   "height": "100",
                   "style": "border:1px solid #ccc"

packages/canvas/DesignCanvas/src/api/useCanvas.ts

@@ -573,6 +573,7 @@ const importSchema = (data) => {
 
   // JSON 格式校验
   resetCanvasState({
+    ...pageState,
     pageSchema: importData
   })
 }

packages/configurator/src/html-attributes-configurator/HtmlAttributesConfigurator.vue

@@ -226,10 +226,11 @@ export default {
 }
 
 .attr-form {
-  padding: 0 10px 10px;
+  padding-top: 10px;
   .icon-close {
-    float: right;
-    margin: 10px 0;
+    position: absolute;
+    right: 10px;
+    top: 10px;
   }
   .footer {
     width: 100%;