Merge branch 'fix/DEFECT-1646' into 'main_dev'

fix: 修改看板组件，新增过后编辑不能拖拽问题

See merge request yunteng/thingskit-front!920

@@ -169,8 +169,6 @@
     }
     }
   );
   );
 
 
-  const { containerEl } = useSort(emit, getFormValues);
-
   const handleSettingOk = (data: DataSourceType) => {
   const handleSettingOk = (data: DataSourceType) => {
     const { uuid } = data;
     const { uuid } = data;
     const _dataSource = cloneDeep(getFormValues());
     const _dataSource = cloneDeep(getFormValues());
@@ -182,6 +180,8 @@
     emit('update:dataSource', _dataSource);
     emit('update:dataSource', _dataSource);
   };
   };
 
 
+  const { containerEl } = useSort(emit, getFormValues);
+
   defineExpose({
   defineExpose({
     getFormValues,
     getFormValues,
     validate,
     validate,

@@ -267,6 +267,7 @@
   <BasicModal
   <BasicModal
     title="自定义组件"
     title="自定义组件"
     width="70%"
     width="70%"
+    :destroy-on-close="true"
     @register="registerModal"
     @register="registerModal"
     @ok="handleSubmit"
     @ok="handleSubmit"
     :ok-button-props="{ loading }"
     :ok-button-props="{ loading }"