Merge branch 'ww' into 'main'

fix: 开发环境下报错BasicForm before initialization BasicTable

See merge request yunteng/thingskit-front!512

-import BasicForm from './src/BasicForm.vue';
+export { default as BasicForm } from './src/BasicForm.vue';
 
 
 export * from './src/types/form';
 export * from './src/types/form';
 export * from './src/types/formItem';
 export * from './src/types/formItem';
@@ -22,4 +22,4 @@ export {
 } from '/@/components/Form/src/externalCompns/components/JEasyCron';
 } from '/@/components/Form/src/externalCompns/components/JEasyCron';
 // Jeecg自定义校验
 // Jeecg自定义校验
 export { JCronValidator } from '/@/components/Form/src/externalCompns/components/JEasyCron';
 export { JCronValidator } from '/@/components/Form/src/externalCompns/components/JEasyCron';
-export { BasicForm };
+// export { BasicForm };

@@ -38,9 +38,6 @@ import ApiSearchSelect from './components/ApiSearchSelect.vue';
 import CustomMinMaxInput from './externalCompns/components/CustomMinMaxInput.vue';
 import CustomMinMaxInput from './externalCompns/components/CustomMinMaxInput.vue';
 import StructForm from './externalCompns/components/StructForm/StructForm.vue';
 import StructForm from './externalCompns/components/StructForm/StructForm.vue';
 import ApiSelectScrollLoad from './components/ApiSelectScrollLoad.vue';
 import ApiSelectScrollLoad from './components/ApiSelectScrollLoad.vue';
-import TransferModal from './components/TransferModal.vue';
-import TransferTableModal from './components/TransferTableModal.vue';
-import ObjectModelValidateForm from './externalCompns/components/ObjectModelValidateForm/ObjectModelValidateForm.vue';
 
 
 const componentMap = new Map<ComponentType, Component>();
 const componentMap = new Map<ComponentType, Component>();
 
 
@@ -86,9 +83,6 @@ componentMap.set('ApiSearchSelect', ApiSearchSelect);
 componentMap.set('CustomMinMaxInput', CustomMinMaxInput);
 componentMap.set('CustomMinMaxInput', CustomMinMaxInput);
 componentMap.set('StructForm', StructForm);
 componentMap.set('StructForm', StructForm);
 componentMap.set('ApiSelectScrollLoad', ApiSelectScrollLoad);
 componentMap.set('ApiSelectScrollLoad', ApiSelectScrollLoad);
-componentMap.set('TransferModal', TransferModal);
-componentMap.set('TransferTableModal', TransferTableModal);
-componentMap.set('ObjectModelValidateForm', ObjectModelValidateForm);
 
 
 export function add(compName: ComponentType, component: Component) {
 export function add(compName: ComponentType, component: Component) {
   componentMap.set(compName, component);
   componentMap.set(compName, component);

@@ -50,6 +50,12 @@
   import { postAddConvertApi } from '/@/api/datamanager/dataManagerApi';
   import { postAddConvertApi } from '/@/api/datamanager/dataManagerApi';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { Button } from '/@/components/Button';
   import { Button } from '/@/components/Button';
+  import { add } from '/@/components/Form/src/componentMap';
+  import TransferModal from '/@/components/Form/src/components/TransferModal.vue';
+  import TransferTableModal from '/@/components/Form/src/components/TransferTableModal.vue';
+
+  add('TransferModal', TransferModal);
+  add('TransferTableModal', TransferTableModal);
 
 
   export default defineComponent({
   export default defineComponent({
     name: 'ConfigDrawer',
     name: 'ConfigDrawer',

@@ -127,6 +127,10 @@
   import Action from './cpns/Action.vue';
   import Action from './cpns/Action.vue';
   import { findOperation } from './config/formatData';
   import { findOperation } from './config/formatData';
   import { formatToDateTime } from '/@/utils/dateUtil';
   import { formatToDateTime } from '/@/utils/dateUtil';
+  import ObjectModelValidateForm from '/@/components/Form/src/externalCompns/components/ObjectModelValidateForm/ObjectModelValidateForm.vue';
+  import { add } from '/@/components/Form/src/componentMap';
+
+  add('ObjectModelValidateForm', ObjectModelValidateForm);
 
 
   const emit = defineEmits(['register', 'success']);
   const emit = defineEmits(['register', 'success']);
   const provideOrgid = ref('');
   const provideOrgid = ref('');