From fee83fc57f553595cc3a4891b8a692fa66cd77fe Mon Sep 17 00:00:00 2001 From: Ben Lin <maobin001@msn.com> Date: 星期二, 25 二月 2025 10:43:52 +0800 Subject: [PATCH] 一些更新 --- src/views/tigerprojects/system/lowcode/data.ts | 38 ++++++++++++++++++++++++-------------- 1 files changed, 24 insertions(+), 14 deletions(-) diff --git a/src/views/tigerprojects/system/lowcode/data.ts b/src/views/tigerprojects/system/lowcode/data.ts index dca6657..ee752f4 100644 --- a/src/views/tigerprojects/system/lowcode/data.ts +++ b/src/views/tigerprojects/system/lowcode/data.ts @@ -259,8 +259,13 @@ * @param {*} params * @return {*} */ -export function GenerateActionButton(params: any, buttons: Ref<[]>, openDrawer: Fn, reload: Fn) { - const actionItem = [] as ActionItem[]; +export function GenerateActionButton( + params: any, + buttons: Ref<[]>, + openDrawer: Fn, + reload: Fn, + actionItem: ActionItem[], +) { buttons.value.map((x) => { if (x['BUTTON_TYPE'] == 1) { let url = ''; @@ -285,14 +290,16 @@ }; } } - actionItem.push({ - icon: isNullOrEmpty(x['ICON_URL']) ? url : x['ICON_URL'], - tooltip: _tooltip, - onClick: _click, - color: color, - popConfirm: _popConfirm, - name: x['DO_METHOD'], - }); + if (x['DO_METHOD'] != 'ToPrint') { + actionItem.push({ + icon: isNullOrEmpty(x['ICON_URL']) ? url : x['ICON_URL'], + tooltip: _tooltip, + onClick: _click, + color: color, + popConfirm: _popConfirm, + name: x['DO_METHOD'], + }); + } } }); return actionItem; @@ -332,7 +339,7 @@ export function goByParams(path: string, params: {}, go) { if (path.split('/').length > 2 && path.split('/')[2] == 'LC') { getEntity({ - sqlcmd: `ASSEMBLY_NAME ='${path.split('/')[1]}'`, + sqlcmd: `CODE_NAME ='${path.split('/')[1]}'`, entityName: 'SYS_LOW_CODE', order: '', }).then((data) => { @@ -428,12 +435,15 @@ const params = cloneDeep(curSearchInfo[0].searchInfo); const Keys = Object.getOwnPropertyNames(params); for (const k in Keys) { - if (!isNullOrEmpty(params[Keys[k]].length) && isArray(params[Keys[k]])) { + if (!isNullOrEmpty(params[Keys[k]]?.length) && isArray(params[Keys[k]])) { if (isTimeViaRegExp8601(params[Keys[k]][0])) { - params[Keys[k]][0] = dateUtil(params[Keys[k]][0]) - params[Keys[k]][1] = dateUtil(params[Keys[k]][1]) + params[Keys[k]][0] = dateUtil(params[Keys[k]][0]); + params[Keys[k]][1] = dateUtil(params[Keys[k]][1]); } } + if (!isNullOrEmpty(params[Keys[k]]) && isTimeViaRegExp8601(params[Keys[k]])) { + params[Keys[k]] = dateUtil(params[Keys[k]]); + } } f.setFieldsValue(params); } -- Gitblit v1.9.3