From 8099042b51891d1e58d6066f0247ba423f4457bd Mon Sep 17 00:00:00 2001
From: yyg1378265336 <1378265336@qq.com>
Date: 星期四, 27 二月 2025 09:27:17 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/BS/TigerAdmin_2024
---
src/views/tigerprojects/system/lowcode/high/index.vue | 102 +++++++++++++++++++++++++++++++-------------------
1 files changed, 63 insertions(+), 39 deletions(-)
diff --git a/src/views/tigerprojects/system/lowcode/high/index.vue b/src/views/tigerprojects/system/lowcode/high/index.vue
index 7209fc6..9bcab98 100644
--- a/src/views/tigerprojects/system/lowcode/high/index.vue
+++ b/src/views/tigerprojects/system/lowcode/high/index.vue
@@ -4,7 +4,7 @@
* @version:
* @Date: 2024-06-18 15:09:48
* @LastEditors: Ben Lin
- * @LastEditTime: 2024-07-04 23:59:15
+ * @LastEditTime: 2024-09-11 20:39:49
-->
<!--
* _oo0oo_
@@ -70,32 +70,35 @@
<a-button class="mr-4" type="info" @click="cancel"> 鍙栨秷 </a-button>
<a-button type="primary" @click="submitAll"> 鎻愪氦 </a-button>
</template>
- <CustModal
- @register="registerCust"
- @success="custSuccess"
- :type="cType"
- :detailSlots="dtlSlots"
- >
- <!-- 鐢ㄦ彃妲借嚜瀹氫箟澶氳〃鍗� -->
- <template #[item.name] v-for="item in dtlSlots" :key="item.name">
- <BasicForm @register="useFormData[item.name][0]" v-if="useFormData[item.name]">
- <!-- 鐢ㄦ彃妲借嚜瀹氫箟寮瑰嚭閫夋嫨妗� -->
- <template #[name]="{ field }" v-for="name in item.slots" :key="name">
- <a-button
- class="mt-1 ml-1"
- size="small"
- @click="handleCustClick(field)"
- :preIcon="item.preIcons[name]"
- />
- <GeneralModal
- @register="useModalData[name][0]"
- @success="(d, u) => handleEntSuccess(d, u, item.name)"
- />
- </template>
- </BasicForm>
- <!-- 鑷畾涔夊唴瀹� -->
- </template>
- </CustModal>
+ <Suspense>
+ <CustModal
+ @register="registerCust"
+ @success="custSuccess"
+ :type="cType"
+ :detailSlots="dtlSlots"
+ :entityName="entityName"
+ >
+ <!-- 鐢ㄦ彃妲借嚜瀹氫箟澶氳〃鍗� -->
+ <template #[item.name] v-for="item in dtlSlots" :key="item.name">
+ <BasicForm @register="useFormData[item.name][0]" v-if="useFormData[item.name]">
+ <!-- 鐢ㄦ彃妲借嚜瀹氫箟寮瑰嚭閫夋嫨妗� -->
+ <template #[name]="{ field }" v-for="name in item.slots" :key="name">
+ <a-button
+ class="mt-1 ml-1"
+ size="small"
+ @click="handleCustClick(field)"
+ :preIcon="item.preIcons[name]"
+ />
+ <GeneralModal
+ @register="useModalData[name][0]"
+ @success="(d, u) => handleEntSuccess(d, u, item.name)"
+ />
+ </template>
+ </BasicForm>
+ <!-- 鑷畾涔夊唴瀹� -->
+ </template>
+ </CustModal>
+ </Suspense>
</PageWrapper>
</template>
<script lang="ts" setup>
@@ -105,7 +108,7 @@
import dtl from './dtl.vue';
import baseForm from './baseForm.vue';
import GeneralModal from '/@/views/components/GeneralModal.vue';
- import { AddAfterDelete, SaveEntity } from '/@/api/tigerapi/system';
+ import { AddAfterDelete, isExist, SaveEntity } from '/@/api/tigerapi/system';
import { useGlobSetting } from '/@/hooks/setting';
import { useRoute, useRouter } from 'vue-router';
import CustModal from '/@/views/components/CustModal.vue';
@@ -136,10 +139,10 @@
}
const currentTab = getCurrentTab();
const routeParams = ref(JSON.parse(decodeURI(route.params?.id as string)));
- const entityName = ref(routeParams.value.Name);
// 浠巗essionStorage涓鍙栧弬鏁板苟杞崲鍥炲璞�
const savedParams = sessionStorage.getItem(`${routeParams.value.sName}_params`);
const objParams = savedParams ? ref(JSON.parse(decodeURI(savedParams))) : ref({});
+ const entityName = ref(routeParams.value.Name);
const titleInfo = ref({}); //getTitle(objParams.value.Name);
const isAllUpdate = ref(objParams.value.CODE != '0');
const globSetting = useGlobSetting();
@@ -179,6 +182,9 @@
}
}
+ /**
+ * @desc 鎸傝浇缁勪欢
+ */
onMounted(async () => {
isMounted.value = false;
await nextTick();
@@ -199,28 +205,38 @@
try {
const validates = await validate();
const Keys = Object.getOwnPropertyNames(useFormData.value);
- let i;
- let p = [] as Promise<any>[];
- for (i = 0; i < Keys.length; i++) {
- p.push(
- SaveEntity(validates[Keys[i]], unref(isAllUpdate), baseCards.value[i]['entityName']),
- );
- }
- await Promise.all(p);
+
if (
!custImport.value['default']()[0].SubmitAll &&
!isFunction(custImport.value['default']()[0].SubmitAll)
) {
/* 榛樿鎻愪氦 */
+ let i;
+ let p = [] as Promise<any>[];
+ for (i = 0; i < Keys.length; i++) {
+ p.push(
+ SaveEntity(
+ validates[Keys[i]],
+ unref(isAllUpdate),
+ baseCards.value[i]['entityName'],
+ `${objParams.value['IsExist']}='${validates[Keys[i]][objParams.value['IsExist']]}'`,
+ true,
+ ),
+ );
+ }
+ await Promise.all(p);
objParams.value['drawers'].forEach((d) => {
let where = `${d['code']} = '${keyFieldValues.value[d['code']]}'`;
/* type: all-琛ㄧず闇�瑕乧ode鐨勬墍鏈夌殑鍊� */
if (d['type'] == 'all' && data.value[d['keyName']].length > 0) {
where = `${d['code']} in (${data.value[d['keyName']].map((value) => `'${value[d['code']]}'`).join(',')})`;
}
+ /* 濡傛灉楂樼骇琛ㄥ崟涓叧鑱旂殑鏄疘D(IsID == true)锛屽垯涓嶇敤鍒濆鍖朓D */
+ //if (!objParams.value['IsID']) {
data.value[d['name']].map((item) => {
item.ID = buildUUID();
});
+ //}
AddAfterDelete(d['name'], data.value[d['name']], where).then((action) => {
if (action.IsSuccessed) {
cancel();
@@ -229,7 +245,13 @@
});
} else {
/* 濡傛灉鑷畾涔夋彁浜ゆ柟娉曞瓨鍦ㄥ氨鐢ㄨ嚜瀹氫箟鎻愪氦 */
- custImport.value['default']()[0].SubmitAll(data, keyFieldValues, cancel);
+ custImport.value['default']()[0].SubmitAll(data, keyFieldValues, cancel, {
+ validates,
+ isAllUpdate: unref(isAllUpdate),
+ baseCards,
+ isExist: objParams.value['IsExist'],
+ Keys,
+ });
}
} catch (error) {}
}
@@ -314,7 +336,9 @@
var values = GetSelectSuccess(d, u);
selectVals.value = values; //淇濆瓨寮瑰嚭妗嗛�夋嫨鐨勭粨鏋�
let _val = {};
- _val[d.returnFieldName] = values[d.returnFieldName];
+ d.returnFieldName.map((x) => {
+ _val[x] = values[x];
+ });
useFormData.value[item][1].setFieldsValue(_val);
});
} catch (e) {}
--
Gitblit v1.9.3