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 | 60 ++++++++++++++++++++++++++++++++++++------------------------
1 files changed, 36 insertions(+), 24 deletions(-)
diff --git a/src/views/tigerprojects/system/lowcode/high/index.vue b/src/views/tigerprojects/system/lowcode/high/index.vue
index 689ef07..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-15 22:23:12
+ * @LastEditTime: 2024-09-11 20:39:49
-->
<!--
* _oo0oo_
@@ -108,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';
@@ -139,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();
@@ -182,6 +182,9 @@
}
}
+ /**
+ * @desc 鎸傝浇缁勪欢
+ */
onMounted(async () => {
isMounted.value = false;
await nextTick();
@@ -202,25 +205,26 @@
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'],
- `${objParams.value['IsExist']}='${validates[Keys[i]][objParams.value['IsExist']]}'`,
- true,
- ),
- );
- }
- 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鐨勬墍鏈夌殑鍊� */
@@ -228,11 +232,11 @@
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();
- });
- }
+ //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();
@@ -241,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) {}
}
@@ -326,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