From 4a857680d0dd86368273cf4b110038623cc587a6 Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Fri, 23 Feb 2024 09:59:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=9F=E7=94=9F=E8=A1=A8=E5=8D=95=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=90=BA=E5=B8=A6=20createTime=20=E7=AD=89=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E5=AD=97=E6=AE=B5=20#1033?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vue3Native/components/${entityName}Form.vuei | 8 +++++++- .../vue3Native/components/${entityName}Form.vuei | 10 ++++++++-- .../vue3Native/components/${entityName}Form.vuei | 8 +++++++- .../vue3Native/components/[1-n]Form.vuei | 8 +++++++- .../vue3Native/components/${entityName}Form.vuei | 11 ++++++++--- .../vue3Native/components/[1-n]Form.vuei | 9 +++++++-- 6 files changed, 44 insertions(+), 10 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei index 9d8b1112..d2c97c20 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei @@ -132,8 +132,14 @@ function edit(record) { nextTick(() => { resetFields(); + const tmpData = {}; + Object.keys(formData).forEach((key) => { + if(record.hasOwnProperty(key)){ + tmpData[key] = record[key] + } + }) //赋值 - Object.assign(formData, record); + Object.assign(formData, tmpData); }); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei index 4130b6e7..2ea447fd 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei @@ -157,9 +157,15 @@ resetFields(); expandedRowKeys.value = []; treeData.value = await loadTreeData({ async: false, pcode: '' }); + const tmpData = {}; + Object.keys(formData).forEach((key) => { + if(record.hasOwnProperty(key)){ + tmpData[key] = record[key] + } + }) //赋值 - Object.assign(formData, record); - model = record + Object.assign(formData,tmpData); + model = tmpData }); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei index e6d2002e..c3c38c0b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei @@ -131,8 +131,14 @@ function edit(record) { nextTick(() => { resetFields(); + const tmpData = {}; + Object.keys(formData).forEach((key) => { + if(record.hasOwnProperty(key)){ + tmpData[key] = record[key] + } + }) //赋值 - Object.assign(formData, record); + Object.assign(formData,tmpData); }); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Form.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Form.vuei index ff23da0c..12f711b6 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Form.vuei +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Form.vuei @@ -100,8 +100,14 @@ function edit(record) { nextTick(() => { resetFields(); + const tmpData = {}; + Object.keys(formData).forEach((key) => { + if(record.hasOwnProperty(key)){ + tmpData[key] = record[key] + } + }) //赋值 - Object.assign(formData, record); + Object.assign(formData,tmpData); }); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei index ad91e8f3..87bb1a78 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei @@ -241,9 +241,14 @@ async function queryMainData(id) { const row = await queryDataById(id); - Object.keys(row).map(k => { - formData[k] = row[k]; - }); + const tmpData = {}; + Object.keys(formData).forEach((key) => { + if(row.hasOwnProperty(key)){ + tmpData[key] = row[key] + } + }) + //赋值 + Object.assign(formData,tmpData); } const {getSubFormAndTableData, transformData} = useValidateAntFormAndTable(activeKey, { diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Form.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Form.vuei index b93289dd..c44c5555 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Form.vuei +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Form.vuei @@ -93,15 +93,20 @@ async function initFormData(mainId) { resetFields(); + let tmpData = {} if(mainId){ let list = await query${sub.entityName}ListByMainId(mainId); if(list && list.length>0){ let temp = list[0]; - Object.keys(temp).map(k=>{ - formData[k] = temp[k]; + Object.keys(formData).forEach((key) => { + if(temp.hasOwnProperty(key)){ + tmpData[key] = temp[key] + } }) } } + //赋值 + Object.assign(formData,tmpData); } async function getFormData() {