From e23fdf87e6c3bc6d42198b9309617195f2efd6c0 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期六, 06 七月 2024 23:40:08 +0800
Subject: [PATCH] 高级表单优化
---
src/views/tigerprojects/system/lowcode/high/baseForm.vue | 6 +++++-
src/views/tigerprojects/system/lowcode/high/dtl.vue | 12 +++++++++---
src/views/tigerprojects/system/lowcode/high/index.vue | 13 ++++++++-----
src/views/tigerprojects/system/lowcode/entityts/BAS_PKG_RULE.ts | 6 +++---
src/api/tigerapi/system.ts | 4 ++--
src/views/tigerprojects/system/lowcode/entityts/BAS_PKG_DTL.ts | 8 ++++++--
6 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/src/api/tigerapi/system.ts b/src/api/tigerapi/system.ts
index a3fb7df..ca7dd52 100644
--- a/src/api/tigerapi/system.ts
+++ b/src/api/tigerapi/system.ts
@@ -784,7 +784,7 @@
check.Message = '璁板綍宸茬粡瀛樺湪锛屼笉鑳芥柊澧烇紒';
return check;
}
- params.ID = buildUUID(); //鐢熸垚GUID
+ params['ID'] = args[1] == true ? params['ID'] : buildUUID(); //鐢熸垚GUID
data = await defHttp.post(
{ url: Api.AddEntity, params: genAction(entityName, params) },
{
@@ -919,7 +919,7 @@
}
/* 閫氱敤鑾峰彇瀹炰綋璁板綍 */
-export const getEntity = async (params: { sqlcmd: string; entityName: string, order: string }) => {
+export const getEntity = async (params: { sqlcmd: string; entityName: string; order: string }) => {
const usParams = genAction(params.entityName, {
QueryAble_T: '',
where: params.sqlcmd,
diff --git a/src/views/tigerprojects/system/lowcode/entityts/BAS_PKG_DTL.ts b/src/views/tigerprojects/system/lowcode/entityts/BAS_PKG_DTL.ts
index a216ba7..768dc26 100644
--- a/src/views/tigerprojects/system/lowcode/entityts/BAS_PKG_DTL.ts
+++ b/src/views/tigerprojects/system/lowcode/entityts/BAS_PKG_DTL.ts
@@ -4,7 +4,7 @@
* @version:
* @Date: 2024-06-19 20:34:27
* @LastEditors: Ben Lin
- * @LastEditTime: 2024-07-05 09:53:32
+ * @LastEditTime: 2024-07-06 23:15:08
*/
import { Ref, ref } from 'vue';
@@ -413,7 +413,11 @@
if (!isNullOrEmpty(record) && record['PKG_LEVEL'] == 1) {
sqlcmd += ` And IS_MIN_PKG = 'Y'`;
} else {
- sqlcmd += ` And IS_MIN_PKG != 'Y'`;
+ if (formModel.PKG_LEVEL == 1) {
+ sqlcmd += ` And IS_MIN_PKG = 'Y'`;
+ } else {
+ sqlcmd += ` And IS_MIN_PKG != 'Y'`;
+ }
}
return {
api: getEntity,
diff --git a/src/views/tigerprojects/system/lowcode/entityts/BAS_PKG_RULE.ts b/src/views/tigerprojects/system/lowcode/entityts/BAS_PKG_RULE.ts
index c4e4eb8..0f6ff02 100644
--- a/src/views/tigerprojects/system/lowcode/entityts/BAS_PKG_RULE.ts
+++ b/src/views/tigerprojects/system/lowcode/entityts/BAS_PKG_RULE.ts
@@ -4,7 +4,7 @@
* @version:
* @Date: 2024-06-19 20:34:27
* @LastEditors: Ben Lin
- * @LastEditTime: 2024-07-05 00:15:04
+ * @LastEditTime: 2024-07-06 23:26:47
*/
import { ActionItem, BasicColumn } from '/@/components/Table';
@@ -38,7 +38,7 @@
ID: buildUUID(),
Name: 'BAS_PKG_DTL',
Title: '鏂板鍖呰瑙勫垯',
- pCode: 'PKG_RULE_ID',
+ IsExist: 'RULE_CODE',
IsID: true,
drawers: [
{
@@ -80,7 +80,7 @@
Name: 'BAS_PKG_DTL',
SessionName: 'BAS_PKG_DTL_update',
Title: `缂栬緫鍖呰瑙勫垯锛�${params['record']['RULE_CODE']}`,
- pCode: 'PKG_RULE_ID',
+ IsExist: 'RULE_CODE',
IsID: true,
drawers: [
{
diff --git a/src/views/tigerprojects/system/lowcode/high/baseForm.vue b/src/views/tigerprojects/system/lowcode/high/baseForm.vue
index c44a330..738c49f 100644
--- a/src/views/tigerprojects/system/lowcode/high/baseForm.vue
+++ b/src/views/tigerprojects/system/lowcode/high/baseForm.vue
@@ -4,7 +4,7 @@
* @version:
* @Date: 2024-06-23 17:21:29
* @LastEditors: Ben Lin
- * @LastEditTime: 2024-07-03 21:57:32
+ * @LastEditTime: 2024-07-06 22:25:35
-->
<template>
<a-card
@@ -63,6 +63,10 @@
}).then((res) => {
if (!isNullOrEmpty(res.Data.Items)) {
useFormData.value[_baseCards.value[0]['name']][1].setFieldsValue(res.Data.Items[0]);
+ }else{
+ useFormData.value[_baseCards.value[0]['name']][1].setFieldsValue({
+ ID: objParams.value['ID'],
+ });
}
});
});
diff --git a/src/views/tigerprojects/system/lowcode/high/dtl.vue b/src/views/tigerprojects/system/lowcode/high/dtl.vue
index cca9b51..7cab36d 100644
--- a/src/views/tigerprojects/system/lowcode/high/dtl.vue
+++ b/src/views/tigerprojects/system/lowcode/high/dtl.vue
@@ -134,12 +134,18 @@
sqlcmd += ` And ${drawers.value[i].code} = '${keyFieldValues.value[drawers.value[i].code]}'`;
}
/* type: all-琛ㄧず闇�瑕乧ode鐨勬墍鏈夌殑鍊� */
- if (drawers.value[i]['type'] == 'all' && data.value[drawers.value[i]['keyName']].length > 0) {
- sqlcmd += ` And ${drawers.value[i]['code']} in (${data.value[drawers.value[i]['keyName']].map((value) => `'${value[drawers.value[i]['code']]}'`).join(',')})`;
+ if (drawers.value[i]['type'] == 'all') {
+ if (data.value[drawers.value[i]['keyName']].length > 0) {
+ sqlcmd += ` And ${drawers.value[i]['code']} in (${data.value[drawers.value[i]['keyName']].map((value) => `'${value[drawers.value[i]['code']]}'`).join(',')})`;
+ } else {
+ sqlcmd = ' 1!=1 '; //鏂板鐨勬椂鍊欎笉鏌ユ暟鎹紝鏌ヤ篃娌℃湁
+ }
}
const list = await getEntity({
sqlcmd: sqlcmd,
- entityName: isNullOrEmpty(drawers.value[i].dataType)? drawers.value[i].name: drawers.value[i].dataType,
+ entityName: isNullOrEmpty(drawers.value[i].dataType)
+ ? drawers.value[i].name
+ : drawers.value[i].dataType,
order: drawers.value[i].order,
});
if (!isNullOrEmpty(list.Data) && !isNullOrEmpty(list.Data.Items)) {
diff --git a/src/views/tigerprojects/system/lowcode/high/index.vue b/src/views/tigerprojects/system/lowcode/high/index.vue
index 7209fc6..875ea1f 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-07-06 23:35:38
-->
<!--
* _oo0oo_
@@ -203,7 +203,7 @@
let p = [] as Promise<any>[];
for (i = 0; i < Keys.length; i++) {
p.push(
- SaveEntity(validates[Keys[i]], unref(isAllUpdate), baseCards.value[i]['entityName']),
+ SaveEntity(validates[Keys[i]], unref(isAllUpdate), baseCards.value[i]['entityName'], `${objParams.value['IsExist']}='${validates[Keys[i]][objParams.value['IsExist']]}'`, true),
);
}
await Promise.all(p);
@@ -218,9 +218,12 @@
if (d['type'] == 'all' && data.value[d['keyName']].length > 0) {
where = `${d['code']} in (${data.value[d['keyName']].map((value) => `'${value[d['code']]}'`).join(',')})`;
}
- data.value[d['name']].map((item) => {
- item.ID = buildUUID();
- });
+ /* 濡傛灉楂樼骇琛ㄥ崟涓叧鑱旂殑鏄疘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();
--
Gitblit v1.9.3