Merge branch 'master' of https://github.com/xinnian999/vue-form-craft

xinnian999 · Dec 19, 2024 · 60a4868 · 60a4868
2 parents 1625235 + c4969b7
commit 60a4868
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/packages/config/template/__test__/satisfaction.test.ts b/packages/config/template/__test__/satisfaction.test.ts
@@ -14,7 +14,7 @@ describe('template satisfaction', async () => {
       }
     })
 
-    await wait()
+    await wait(100)
 
     const satisfactionEl = wrapper.findAll('.Radio-satisfaction .el-radio__original')
 

diff --git a/packages/form-design/Left/index.vue b/packages/form-design/Left/index.vue
@@ -88,9 +88,9 @@ const onClone = (source: FormElement) => {
     name: `form-${getRandomId(4)}`
   }
 
-  // if (source.type === 'layout' || source.attrSchema.initialValues?.children) {
-  //   parse.children = []
-  // }
+  if (source.type === 'layout') {
+    parse.children = []
+  }
 
   return parse
 }

diff --git a/packages/form-design/Right/AttrEdit/LinkageConfig/Config.vue b/packages/form-design/Right/AttrEdit/LinkageConfig/Config.vue
@@ -8,7 +8,7 @@
     center
   >
     <div class="config-linkages">
-      <div class="quick">
+      <!-- <div class="quick">
         <FormRender v-model="quickValues" :schema="quickSchema(designInstance.schema)" />
         <el-button
           v-if="quickValues.quick?.length"
@@ -17,7 +17,7 @@
           type="primary"
           >应用快速配置</el-button
         >
-      </div>
+      </div> -->
       <FormRender v-model="designInstance.current!" :schema="editSchema" class="edit" />
     </div>
   </el-dialog>
@@ -87,11 +87,12 @@ const handleUseQuick = () => {
 .config-linkages {
   display: flex;
   gap: 20px;
-  .quick {
-    width: 50%;
-  }
-  .edit {
-    width: 50%;
-  }
+  flex-direction: column
+  // .quick {
+  //   width: 50%;
+  // }
+  // .edit {
+  //   width: 50%;
+  // }
 }
 </style>
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,7 @@ describe('template satisfaction', async () => { @@
           }
         })
-        await wait()
+        await wait(100)
         const satisfactionEl = wrapper.findAll('.Radio-satisfaction .el-radio__original')
@@ Expand Down @@