Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

liu

2 天以前 c6ce881a26895edc9e89aea8317be15572f48b23

 src/packages/effects/layouts/src/hooks/index.ts

@@ -6,7 +6,7 @@

import { computed } from 'vue';

import { preferences, usePreferences } from '..\..\..\..\preferences\src';
import { preferences, usePreferences } from '../../../../preferences/src';

/**
 * 转换组件，自动添加 name