From 44ef538691b8be0fd925ca80c49157bad14962e8 Mon Sep 17 00:00:00 2001 From: Ben Lin <maobin001@msn.com> Date: 星期六, 06 七月 2024 22:01:26 +0800 Subject: [PATCH] 一些优化 --- src/views/tigerprojects/system/lowcode/high/dtl.vue | 44 +++++++++++++++++++++++++------------------- 1 files changed, 25 insertions(+), 19 deletions(-) diff --git a/src/views/tigerprojects/system/lowcode/high/dtl.vue b/src/views/tigerprojects/system/lowcode/high/dtl.vue index 4f29314..cca9b51 100644 --- a/src/views/tigerprojects/system/lowcode/high/dtl.vue +++ b/src/views/tigerprojects/system/lowcode/high/dtl.vue @@ -42,7 +42,7 @@ import { useForm } from '/@/components/Form/index'; import GeneralModal from '/@/views/components/GeneralModal.vue'; import normalDrawer from '../normalDrawer.vue'; - import { isNullOrEmpty, isNullOrUnDef } from '/@/utils/is'; + import { isFunction, isNullOrEmpty, isNullOrUnDef } from '/@/utils/is'; import { useModal } from '/@/components/Modal'; import { useGo } from '/@/hooks/web/usePage'; import { DeleteEntity, getEntity } from '/@/api/tigerapi/system'; @@ -81,6 +81,7 @@ GetTitle(type: string | undefined) {}, GetUseTables(data: Ref<Recordable[]>, ...args) {}, GetUseDrawers() {}, + CustInitData(data: Ref<any[]>, keyFieldValues: Ref<{}>, type: string) {}, } as EntityCustFunctionType, ]); /* 鍔ㄦ�乮mport瀹炰綋鍚�.ts鐨勮嚜瀹氫箟鏂规硶 */ @@ -96,6 +97,7 @@ GetTitle, GetUseTables, GetUseDrawers, + CustInitData, }, ] = isNullOrUnDef(custImport.value['default']) ? EntityCustFunction.value @@ -132,16 +134,20 @@ sqlcmd += ` And ${drawers.value[i].code} = '${keyFieldValues.value[drawers.value[i].code]}'`; } /* type: all-琛ㄧず闇�瑕乧ode鐨勬墍鏈夌殑鍊� */ - if (drawers.value[i]['type'] == 'all') { + 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(',')})`; } const list = await getEntity({ sqlcmd: sqlcmd, - entityName: drawers.value[i].name, + 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)) { data.value[drawers.value[i].name] = list.Data.Items; + // 鑷畾涔夊垵濮嬪寲鏁版嵁 + if (CustInitData && isFunction(CustInitData)) { + CustInitData(data, keyFieldValues, drawers.value[i].name); + } useTables[drawers.value[i].name][1].setProps({ dataSource: [], }); @@ -172,7 +178,7 @@ crudColSlots: props.crudColSlots, data, name: item.name, //drawers鍒楄〃閲岄潰鐨刵ame锛岃〃绀烘槸鍝竴涓疄浣擄紝涔熷氨鏄珮绾ц〃鍗曚腑琛ㄦ牸鐨勫悕瀛� - keyName: item.keyName, + keyName: item.keyName, }; const actionItem = [ { @@ -254,21 +260,21 @@ validate().then((res) => { const Keys = Object.getOwnPropertyNames(useFormData.value); for (const i in Keys) { - keyFieldValues.value[item['code']] = objParams.value['IsID'] - ? res[Keys[i]]['ID'] - : res[Keys[i]][item['code']]; - } - useDrawers[index][item['name']][1].openDrawer(true, { - isUpdate: false, - ifSave: true, - entityName: item['name'], //props.entityName, - // formJson: GetCrudForm(item, data), //鑾峰彇澧炲垹鏀硅〃鍗曞瓧娈� - crudColSlots: props.crudColSlots, - keyFieldValues: keyFieldValues.value, - data, - name: item['name'], //drawers鍒楄〃閲岄潰鐨刵ame锛岃〃绀烘槸鍝竴涓疄浣擄紝涔熷氨鏄珮绾ц〃鍗曚腑琛ㄦ牸鐨勫悕瀛� - keyName: item['keyName'], - }); + keyFieldValues.value[item['code']] = objParams.value['IsID'] + ? res[Keys[i]]['ID'] + : res[Keys[i]][item['code']]; + } + useDrawers[index][item['name']][1].openDrawer(true, { + isUpdate: false, + ifSave: true, + entityName: item['name'], //props.entityName, + // formJson: GetCrudForm(item, data), //鑾峰彇澧炲垹鏀硅〃鍗曞瓧娈� + crudColSlots: props.crudColSlots, + keyFieldValues: keyFieldValues.value, + data, + name: item['name'], //drawers鍒楄〃閲岄潰鐨刵ame锛岃〃绀烘槸鍝竴涓疄浣擄紝涔熷氨鏄珮绾ц〃鍗曚腑琛ㄦ牸鐨勫悕瀛� + keyName: item['keyName'], + }); }); } -- Gitblit v1.9.3