From 5fdea06fbfc49a8ae8f20054db6b27fcf4ade75f Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期四, 04 七月 2024 00:34:19 +0800
Subject: [PATCH] 一些更新

---
 src/views/tigerprojects/system/lowcode/normalDrawer.vue |   46 +++++++++++++++++++++++-----------------------
 1 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/views/tigerprojects/system/lowcode/normalDrawer.vue b/src/views/tigerprojects/system/lowcode/normalDrawer.vue
index d597a63..531123c 100644
--- a/src/views/tigerprojects/system/lowcode/normalDrawer.vue
+++ b/src/views/tigerprojects/system/lowcode/normalDrawer.vue
@@ -67,6 +67,7 @@
   import { isNullOrUnDef } from '/@/utils/is';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useI18n } from '/@/hooks/web/useI18n';
+  import { isFunction } from 'xe-utils';
 
   const emit = defineEmits(['success', 'register']);
   const { t } = useI18n();
@@ -90,31 +91,30 @@
 
   const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
     /* 鍔ㄦ�乮mport瀹炰綋鍚�.ts鐨勮嚜瀹氫箟鏂规硶 */
+    let m = {} as any;
     try {
-      import(`./entityts/${data?.name}.ts`)
-        .then((m) => {
-          const [{ GetCrudForm }] = m.default();
-          isUpdate.value = !!data?.isUpdate;
-          ifSave.value = !!data?.ifSave;
-          entityName.value = data?.entityName;
-          formSchema.value = GetCrudForm(data?.name, data?.data, data.record);
-          crudColSlots.value = data?.crudColSlots;
-          isExistSql.value = data?.isExistSql;
-          resetFields();
-          setDrawerProps({ confirmLoading: false });
-
-          if (unref(isUpdate)) {
-            setFieldsValue({
-              ...data.record,
-            });
-          } else {
-            if (!isNullOrUnDef(data?.keyFieldValues)) {
-              setFieldsValue(data?.keyFieldValues);
-            }
-          }
-        })
-        .catch(() => {});
+      m = await import(`./entityts/${data?.name}.ts`);
     } catch (e) {}
+    isUpdate.value = !!data?.isUpdate;
+    ifSave.value = !!data?.ifSave;
+    entityName.value = data?.entityName;
+    formSchema.value = !isNullOrUnDef(m.default)
+      ? m.default()[0].GetCrudForm(data?.name, data?.data, data.record)
+      : data?.formJson;
+    crudColSlots.value = data?.crudColSlots;
+    isExistSql.value = data?.isExistSql;
+    resetFields();
+    setDrawerProps({ confirmLoading: false });
+
+    if (unref(isUpdate)) {
+      setFieldsValue({
+        ...data.record,
+      });
+    } else {
+      if (!isNullOrUnDef(data?.keyFieldValues)) {
+        setFieldsValue(data?.keyFieldValues);
+      }
+    }
   });
 
   const getTitle = computed(() => (!unref(isUpdate) ? '鏂板' : '缂栬緫'));

--
Gitblit v1.9.3