Merge branch 'main' of github.com:hainatravel/GHHub

package.json

@@ -1,7 +1,7 @@
 {
   "name": "global-highlights-hub",
   "private": true,
-  "version": "2.0.0-rc.5",
+  "version": "2.0.0-rc.6",
   "type": "module",
   "scripts": {
     "dev": "vite",

src/views/App.jsx

@@ -102,7 +102,7 @@ function App() {
 										isPermitted(PERM_OVERSEA) ? { key: 'feedback', label: <Link to='/feedback'>{t('menu.Feedback')}</Link> } : null,
 										isPermitted(PERM_OVERSEA) ? { key: 'report', label: <Link to='/report'>{t('menu.Report')}</Link> } : null,
 										isPermitted(PERM_AIR_TICKET) ? { key: 'airticket', label: <Link to='/airticket'>{t('menu.Airticket')}</Link> } : null,
-										isPermitted(PERM_PRODUCTS_MANAGEMENT) ? { key: 'products', label: <Link to='/products'>{t('menu.Products')}</Link> } : { key: 'products', label: <Link to='/products/edit'>{t('menu.Products')}</Link> },
+										isPermitted(PERM_PRODUCTS_MANAGEMENT) ? { key: 'products', label: <Link to='/products'>{t('menu.Products')}</Link> } : null,
 										{
 											key: 'notice',
 											label: (

src/views/products/Detail/ProductInfo.jsx

@@ -45,9 +45,28 @@ const ProductInfo = ({ ...props }) => {
 
     const showExtras = topPerm && hasHT; // !isEmpty(editingProduct) &&
     setExtrasVisible(showExtras);
+
+    setLgcEdits({});
+    setInfoEditStatus('');
     return () => {};
   }, [activeAgency, editingProduct]);
 
+  const [infoEditStatus, setInfoEditStatus] = useState('');
+  const [lgcEdits, setLgcEdits] = useState({});
+  const onValuesChange = (changedValues, forms) => {
+    // console.log('onValuesChange', changedValues);
+    if ('product_title' in changedValues) {
+      setInfoEditStatus('2');
+      setLgcEdits({...lgcEdits, '2': {'edit_status': '2'}});
+    }
+    if ('lgc_details_mapped' in changedValues) {
+      const lgc = Object.keys(changedValues.lgc_details_mapped)[0];
+      setLgcEdits({...lgcEdits, [lgc]: {'edit_status': '2'}});
+    } else {
+      setInfoEditStatus('2');
+    }
+  };
+
   const onSave = async (err, values, forms) => {
     values.travel_agency_id = activeAgency.travel_agency_id;
     const copyNewProduct = structuredClone(newProductRecord);
@@ -58,6 +77,7 @@ const ProductInfo = ({ ...props }) => {
       'travel_agency_id': activeAgency.travel_agency_id,
       // "travel_agency_name": "",
       // "lastedit_changed": "",
+      "edit_status": infoEditStatus,
     };
     const copyFields = pick(editingProduct.info, ['product_type_id']); // 'title',
     const readyToSubInfo = { ...copyNewProduct.info, ...editingProduct.info, title: editingProduct.info.product_title, ...values.info, ...copyFields, ...poster };
@@ -65,9 +85,15 @@ const ProductInfo = ({ ...props }) => {
 
     /** lgc_details */
     const prevLgcDetailsMapped = editingProduct.lgc_details.reduce((r, c) => ({ ...r, [c.lgc]: c }), {});
-    const mergedLgc = { ...prevLgcDetailsMapped, ...values.lgc_details_mapped };
+    const mergedLgc = { ...prevLgcDetailsMapped, ...values.lgc_details_mapped, };
+    for (const lgcKey in lgcEdits) {
+      if (Object.prototype.hasOwnProperty.call(lgcEdits, lgcKey)) {
+        const element = lgcEdits[lgcKey];
+        mergedLgc[lgcKey].edit_status = element?.edit_status || '';
+      }
+    }
 
-    // console.log(values);
+    // console.log(readyToSubInfo, "\n", mergedLgc);
     // return false; // debug: 0
     /** 提交保存 */
     setLoading(true);
@@ -111,7 +137,7 @@ const ProductInfo = ({ ...props }) => {
       ) : (
         <>
           <h2>{t('products:EditComponents.info')}</h2>
-          <ProductInfoForm {...{ editablePerm, infoEditable, priceEditable }} initialValues={editingProduct?.info} onSubmit={onSave} />
+          <ProductInfoForm {...{ editablePerm, infoEditable, priceEditable, onValuesChange }} initialValues={editingProduct?.info} onSubmit={onSave} />
           <Divider className='my-1' />
           {extrasVisible && <Extras productId={editingProduct?.info?.id} />}
         </>

src/views/products/Detail/ProductInfoForm.jsx

@@ -86,7 +86,7 @@ const InfoForm = ({ onSubmit, onReset, onValuesChange, editablePerm, infoEditabl
       setPickEditedInfo({ ...pickEditedInfo, product_title: editTitle });
     }
     if (typeof onValuesChange === 'function') {
-      onValuesChange(dest);
+      onValuesChange(changedValues, dest);
     }
   };
   const onFieldsChange = (hangedFields, allFields) => {

src/views/products/Detail/ProductInfoQuotation.jsx

@@ -215,7 +215,7 @@ const ProductInfoQuotation = ({ editable, ...props }) => {
     {
       title: t('products:group_size'),
       dataIndex: 'group_size',
-      width: '4rem',
+      width: '6rem',
       render: (_, record) => `${record.group_size_min}-${record.group_size_max}`,
     },
 
@@ -247,7 +247,7 @@ const ProductInfoQuotation = ({ editable, ...props }) => {
   return (
     <>
       <h2>{t('products:EditComponents.Quotation')}</h2>
-      <Table
+      <Table size='small'
         bordered
         dataSource={quotationList}
         columns={quotationColumns}