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/api/tigerapi/system.ts | 131 +++++++++++++++++++++++++++++++------------
1 files changed, 95 insertions(+), 36 deletions(-)
diff --git a/src/api/tigerapi/system.ts b/src/api/tigerapi/system.ts
index 7711f3b..a3fb7df 100644
--- a/src/api/tigerapi/system.ts
+++ b/src/api/tigerapi/system.ts
@@ -1,4 +1,3 @@
-import { UserConfigFn } from 'vite';
import { useGlobSetting } from '/@/hooks/setting';
import { buildUUID } from '../../utils/uuid';
import { DateFormat } from '../../utils/dataformat';
@@ -31,8 +30,7 @@
iSYS_ROLE_PROD,
} from './model/systemModel';
import { defHttp } from '/@/utils/http/axios';
-import { isArray, isDate, isNullOrEmpty, isTimeType } from '/@/utils/is';
-import { MES_ROUTE_EDGE, MES_ROUTE_NODE } from './model/router';
+import { isArray, isNullOrEmpty, isTimeViaRegExp8601 } from '/@/utils/is';
export enum Api {
QueryUrl = '/Base/Query',
@@ -40,6 +38,7 @@
EntitySqlList = '/Base/QuerySQL',
EntityPageList = '/Base/QueryCustomPage',
IsAccountExist = '/Base/IsExist',
+ AddAfterDelete = '/Base/AddAfterDelete',
setRoleStatus = '/system/setRoleStatus',
MenuList = '/SYS/getMenuListAll',
SaveMenu = '/SYS/SaveMenu',
@@ -281,15 +280,23 @@
return result;
}
-export function convertToTree(data: [], parentId: string, id: string, pid?: string) {
- const result: any[] = [];
- let temp: any[] = [];
+/**
+ * @description: 鏍戝舰琛ㄧ粨鏋勮浆鏍戝舰Json
+ * @param {T} data
+ * @param {string} parentField 鐖跺瓧娈靛悕
+ * @param {string} idField 鍞竴key瀛楁鍚�
+ * @param {string} pid_val 鐖秈d鍊�
+ * @return {*}
+ */
+export function convertToTree<T>(data: T[], parentField: string, idField: string, pid?: string) {
+ const result: T[] = [];
+ let temp: T[] = [];
const _pid = isNullOrEmpty(pid) ? '' : pid;
for (let i = 0; i < data.length; i++) {
- const currPid = data[i][parentId] == null ? '' : data[i][parentId];
+ const currPid = data[i][parentField] == null ? '' : data[i][parentField];
if (currPid === _pid) {
- const obj = data[i] as {};
- temp = convertToTree(data, parentId, id, data[i][id]);
+ const obj = data[i] as T;
+ temp = convertToTree(data, parentField, idField, data[i][idField]);
if (temp.length > 0) {
obj['children'] = temp;
}
@@ -697,29 +704,8 @@
* @return {*}
*/
export async function getListByPage<T>(params: T) {
- const Keys = Object.getOwnPropertyNames(params);
- let sqlcmd = '1=1 ';
+ const sqlcmd = ReturnSqlcmd(params);
let order = '';
- for (const k in Keys) {
- console.log(`${k}:${Keys[k]}`);
- if (
- !isNullOrEmpty(params[Keys[k]]) &&
- Keys[k] != 'page' &&
- Keys[k] != 'pageSize' &&
- Keys[k] != 'TABLE_NAME' &&
- Keys[k] != 'order' &&
- Keys[k] != 'field' &&
- Keys[k] != '0' &&
- !Keys[k].toString().endsWith('PSelect_0')
- ) {
- if (!isNullOrEmpty(params[Keys[k]].length) && isDate(params[Keys[k]][0])) {
- sqlcmd += ` And ${Keys[k]} > '${params[Keys[k]][0]}'`;
- sqlcmd += ` And ${Keys[k]} < '${params[Keys[k]][1]}'`;
- } else {
- sqlcmd += `And ${Keys[k]} like '%${params[Keys[k]]}%'`;
- }
- }
- }
if (!isNullOrEmpty(params['order'])) {
order = params['order'] == 'descend' ? params['field'] + ' desc' : params['field'];
}
@@ -738,7 +724,7 @@
}
async function getListByPageAsync(params: any) {
const data = await defHttp.post(
- { url: Api.QueryUrl, params },
+ { url: Api.QueryUrl, params, timeout: 50000 },
{
isTransformResponse: false,
},
@@ -750,7 +736,38 @@
return model;
}
-export async function SaveEntity<T>(params: T, isUpdate: boolean, entityName: string) {
+/**
+ * @description: 鏍规嵁鏌ヨ鏉′欢鍙傛暟鎷兼帴鏌ヨ鏉′欢
+ * @param {T} params
+ * @return {*}
+ */
+export function ReturnSqlcmd<T>(params: T) {
+ const Keys = Object.getOwnPropertyNames(params);
+ let sqlcmd = '1=1 ';
+ for (const k in Keys) {
+ console.log(`${k}:${Keys[k]}`);
+ if (
+ !isNullOrEmpty(params[Keys[k]]) &&
+ Keys[k] != 'page' &&
+ Keys[k] != 'pageSize' &&
+ Keys[k] != 'TABLE_NAME' &&
+ Keys[k] != 'order' &&
+ Keys[k] != 'field' &&
+ Keys[k] != '0' &&
+ !Keys[k].toString().endsWith('PSelect_0')
+ ) {
+ if (!isNullOrEmpty(params[Keys[k]].length) && isTimeViaRegExp8601(params[Keys[k]][0])) {
+ sqlcmd += ` And ${Keys[k]} > '${params[Keys[k]][0]}'`;
+ sqlcmd += ` And ${Keys[k]} < '${params[Keys[k]][1]}'`;
+ } else {
+ sqlcmd += `And ${Keys[k]} like '%${params[Keys[k]]}%'`;
+ }
+ }
+ }
+ return sqlcmd;
+}
+
+export async function SaveEntity<T>(params: T, isUpdate: boolean, entityName: string, ...args) {
let data;
if (isUpdate) {
data = await defHttp.post(
@@ -761,6 +778,12 @@
},
);
} else {
+ var check = await isExist(genAction(entityName, args[0]));
+ if (check.Data) {
+ check.IsSuccessed = false;
+ check.Message = '璁板綍宸茬粡瀛樺湪锛屼笉鑳芥柊澧烇紒';
+ return check;
+ }
params.ID = buildUUID(); //鐢熸垚GUID
data = await defHttp.post(
{ url: Api.AddEntity, params: genAction(entityName, params) },
@@ -773,6 +796,17 @@
return data;
}
+export async function AddListEntity<T>(params: T, entityName: string) {
+ let data = await defHttp.post(
+ { url: Api.AddListEntity, params: genAction(entityName, params) },
+ {
+ errorMessageMode: 'none',
+ isTransformResponse: false,
+ },
+ );
+ return data;
+}
+
export async function DeleteEntity<T>(params: T, entityName: string) {
const usParams = genAction(entityName, [params]);
return await defHttp.post(
@@ -782,6 +816,31 @@
isTransformResponse: false,
},
);
+}
+
+/**
+ * @description: 鍏堝垹闄ゅ悗娣诲姞Api
+ * @param {T} params
+ * @param {string} entityName
+ * @param {*} items
+ * @return {*}
+ */
+export async function AddAfterDelete(entityName: string, items: [], where: string) {
+ let data = await defHttp.post(
+ {
+ url: Api.AddAfterDelete,
+ params: genAction(entityName, {
+ QueryAble_T: '',
+ where: where,
+ Items: items,
+ }),
+ },
+ {
+ errorMessageMode: 'none',
+ isTransformResponse: false,
+ },
+ );
+ return data;
}
/**
@@ -860,11 +919,11 @@
}
/* 閫氱敤鑾峰彇瀹炰綋璁板綍 */
-export const getEntity = async (params: { sqlcmd: string; entityName: string }) => {
+export const getEntity = async (params: { sqlcmd: string; entityName: string, order: string }) => {
const usParams = genAction(params.entityName, {
QueryAble_T: '',
where: params.sqlcmd,
- order: '',
+ order: params.order,
});
return await defHttp.post(
{ url: Api.QueryUrl, params: usParams },
@@ -883,7 +942,7 @@
export function formatValues(values: any) {
const Keys = Object.getOwnPropertyNames(values);
for (const k in Keys) {
- if(isArray(values[Keys[k]])){
+ if (isArray(values[Keys[k]])) {
values[Keys[k]] = values[Keys[k]][0];
}
}
--
Gitblit v1.9.3