产品管理: 调整提交保存的字段

perf/export-docx
Lei OT 11 months ago
parent ea3c468feb
commit 96ae28e947

@ -141,11 +141,10 @@ export const useNewProductRecord = () => {
'duration_unit': 'h',
'open_weekdays': ['1', '2', '3', '4', '5', '6', '7'],
'recommends_rate': 0,
'dept': '',
'dept_id': 0,
'dept_name': '',
'display_to_c': 0,
'km': undefined,
'km': 0,
'city_id': 0,
'city_name': '',
'open_hours': '',
@ -156,7 +155,7 @@ export const useNewProductRecord = () => {
lgc_details: [
{
'title': '',
'description': '',
'descriptions': '',
'lgc': 1,
'id': '',
},

@ -59,11 +59,11 @@ const ProductInfo = ({ ...props }) => {
// "lastedit_changed": "",
};
const copyFields = pick(editingProduct.info, ['product_type_id']); // 'title',
const readyToSubInfo = { ...copyNewProduct.info, ...editingProduct.info, ...values.info, ...copyFields, type: copyFields.product_type_id, ...poster };
readyToSubInfo.dept = Number(readyToSubInfo.dept);
const readyToSubInfo = { ...copyNewProduct.info, ...editingProduct.info, title: editingProduct.info.product_title, ...values.info, ...copyFields, ...poster };
// console.log('onSave', editingProduct.info, readyToSubInfo);
/** lgc_details */
const prevLgcDetailsMapped = editingProduct.lgc_details.reduce((r, c) => ({ ...r, [c.lgc]: { ...c, description: c.descriptions } }), {});
const prevLgcDetailsMapped = editingProduct.lgc_details.reduce((r, c) => ({ ...r, [c.lgc]: c }), {});
const mergedLgc = { ...prevLgcDetailsMapped, ...values.lgc_details_mapped };
// console.log(values);

@ -367,7 +367,7 @@ const formValuesMapper = (values) => {
{ key: 'city_id', transform: (value) => value?.value || value?.key || '' },
{ key: 'city_name', transform: (value) => value?.label || '' },
],
'dept': { key: 'dept', transform: (value) => (typeof value === 'string' ? value : value?.value || value?.key || '') },
'dept': { key: 'dept_id', transform: (value) => (typeof value === 'string' ? value : value?.value || value?.key || '') },
'open_weekdays': { key: 'open_weekdays', transform: (value) => (Array.isArray(value) ? value.join(',') : value) },
'recommends_rate': { key: 'recommends_rate', transform: (value) => (typeof value === 'string' ? value : value?.value || value?.key || '') },
// 'lgc_details': [
@ -392,7 +392,7 @@ const formValuesMapper = (values) => {
transform: (value) => {
const valueArr = Object.values(value)
.filter((_v) => !isEmpty(_v))
.map((e) => ({ title: '', ...e, description: e.description || '' }));
.map((e) => ({ title: '', ...e, descriptions: e.descriptions || '' }));
return valueArr;
},
},
@ -401,7 +401,7 @@ const formValuesMapper = (values) => {
transform: (value) => {
const valueArr = Object.values(value)
.filter((_v) => !isEmpty(_v))
.map((e) => ({ title: '', ...e, description: e.description || '' }));
.map((e) => ({ title: '', ...e, descriptions: e.descriptions || '' }));
return valueArr.reduce((r, c) => ({ ...r, [c.lgc]: c }), {});
},
},
@ -409,7 +409,7 @@ const formValuesMapper = (values) => {
'product_title': { key: 'title' },
};
let dest = {};
const { city, product_title, ...omittedValue } = values;
const { city, dept, product_title, ...omittedValue } = values;
dest = { ...omittedValue, ...objectMapper(values, destinationObject) };
for (const key in dest) {
if (Object.prototype.hasOwnProperty.call(dest, key)) {

@ -36,7 +36,7 @@ const ProductInfoLgc = ({ editable, formInstance, ...props }) => {
disabled={!editable}
/>
</Form.Item>
<Form.Item name={['lgc_details_mapped', `${ele.lgc}`, 'description']} label={t('products:Description')} initialValue={ele.descriptions} tooltip={t('FormTooltip.Description')}>
<Form.Item name={['lgc_details_mapped', `${ele.lgc}`, 'descriptions']} label={t('products:Description')} initialValue={ele.descriptions} tooltip={t('FormTooltip.Description')}>
<Input.TextArea
className={'!text-slate-600'}
rows={3}
@ -90,7 +90,7 @@ const ProductInfoLgc = ({ editable, formInstance, ...props }) => {
<Form.Item name={['lgc_details_mapped', `${lgcItem.value}`, 'title']} preserve={false} label={t('products:Title')} rules={[{ required: true }]} tooltip={t(`FormTooltip.NewTitle.${editingProduct?.info?.product_type_id}`)}>
<Input allowClear placeholder={t(`FormTooltip.NewTitle.${editingProduct?.info?.product_type_id}`)} />
</Form.Item>
<Form.Item name={['lgc_details_mapped', `${lgcItem.value}`, 'description']} preserve={false} label={t('products:Description')} tooltip={t('FormTooltip.Description')}>
<Form.Item name={['lgc_details_mapped', `${lgcItem.value}`, 'descriptions']} preserve={false} label={t('products:Description')} tooltip={t('FormTooltip.Description')}>
<Input.TextArea rows={3} allowClear />
</Form.Item>
<Form.Item hidden name={['lgc_details_mapped', `${lgcItem.value}`, 'lgc']} preserve={false} initialValue={lgcItem.value}>

Loading…
Cancel
Save