From 68d75a540ec8b3168c3af956ea00b898036d92cd Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期四, 04 七月 2024 00:17:17 +0800
Subject: [PATCH] 包装规则更新

---
 src/views/tigerprojects/system/lowcode/high/dtl.vue |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/views/tigerprojects/system/lowcode/high/dtl.vue b/src/views/tigerprojects/system/lowcode/high/dtl.vue
index 1b3f4e3..39fe51c 100644
--- a/src/views/tigerprojects/system/lowcode/high/dtl.vue
+++ b/src/views/tigerprojects/system/lowcode/high/dtl.vue
@@ -131,9 +131,14 @@
       if (!isNullOrEmpty(keyFieldValues.value[drawers.value[i].code])) {
         sqlcmd += ` And ${drawers.value[i].code} = '${keyFieldValues.value[drawers.value[i].code]}'`;
       }
+      /* type: all-琛ㄧず闇�瑕乧ode鐨勬墍鏈夌殑鍊� */
+      if (drawers.value[i]['type'] == 'all') {
+        sqlcmd += ` And ${drawers.value[i]['code']} in (${data.value[drawers.value[i]['keyName']].map((value) => `'${value[drawers.value[i]['code']]}'`).join(',')})`;
+      }
       const list = await getEntity({
         sqlcmd: sqlcmd,
         entityName: drawers.value[i].name,
+        order: drawers.value[i].order,
       });
       if (!isNullOrEmpty(list.Data) && !isNullOrEmpty(list.Data.Items)) {
         data.value[drawers.value[i].name] = list.Data.Items;
@@ -159,7 +164,7 @@
       isUpdate: true,
       ifSave: true,
       entityName: props.entityName,
-      formJson: GetCrudForm(item, data), //getFormSchema(`${entityName.value}_Crud`),
+      formJson: [], //getFormSchema(`${entityName.value}_Crud`),
       cType,
       dtlSlots,
       useModalData,
@@ -258,9 +263,11 @@
           isUpdate: false,
           ifSave: true,
           entityName: drawers.value[t]['name'], //props.entityName,
-          formJson: GetCrudForm(item, data), //鑾峰彇澧炲垹鏀硅〃鍗曞瓧娈�
+          // formJson: GetCrudForm(item, data), //鑾峰彇澧炲垹鏀硅〃鍗曞瓧娈�
           crudColSlots: props.crudColSlots,
           keyFieldValues: keyFieldValues.value,
+          data,
+          name: item, //drawers鍒楄〃閲岄潰鐨刵ame锛岃〃绀烘槸鍝竴涓疄浣擄紝涔熷氨鏄珮绾ц〃鍗曚腑琛ㄦ牸鐨勫悕瀛�
         });
       }
     });

--
Gitblit v1.9.3