fix: 修改商品区块新功能的翻译

src/locales/en-US/commodity.ts

@@ -183,6 +183,7 @@ export default {
   'commodity.products.menuMore.4':'Batch delete',
   'commodity.products.controllerBtns.button.1':'New',
   'commodity.products.controllerBtns.button.2':'More',
+  'commodity.products.controllerBtns.button.3' : 'Import data',
   'commodity.products.modal.button.1':'Upload',
   'commodity.products.modal.button.2':'Export error log',
   'commodity.products.modal.title.1':'Delete import batch',
@@ -209,6 +210,10 @@ export default {
   'commodity.products.addDirectChannel.tab.3':'Logistics information',
   'commodity.products.addDirectChannel.tab.4':'Applicable channels',
 
+  'commodity.products.products.button.draft' : 'Draft',
+  'commodity.products.products.button.draft.option1' : 'Modify',
+  'commodity.products.products.button.draft.option2' : 'Delete',
+
   'commodity.products.addProducts.onSave.error.draft.1' : 'Please upload at least one product picture for each item to save the draft!',
   'commodity.products.addProducts.onSave.error.draft.2' : 'Please re-upload the product picture to save the draft!',
   'commodity.products.addProducts.onSave.error.draft.3' : 'Please upload the product picture to save the draft!',
@@ -223,6 +228,7 @@ export default {
   'commodity.products.addProducts.title.2':'New product',
   'commodity.products.addProducts.extra.button.1':'Submit directly for review',
   'commodity.products.addProducts.extra.button.2':'Save',
+  'commodity.products.addProducts.extra.button.3' : 'Save drafts',
   'commodity.products.addProducts.tab.1':'Basic information',
   'commodity.products.addProducts.tab.2':'Select product',
   'commodity.products.addProducts.tab.2.1' : 'Select material',
@@ -796,6 +802,14 @@ export default {
   'commodity.products.addProductsItem.productAttributeForm.placeholder.1':'Please select',
   'commodity.products.addProductsItem.productAttributeForm.placeholder.2':'Enter up to 60 characters and 30 Chinese characters',
   'commodity.products.addProductsItem.productAttributeForm.none':'No data! ',
+  'commodity.products.addProductsItem.productAttributeForm.addAttribute.placeholder': 'Please enter the property value',
+  'commodity.products.addProductsItem.productAttributeForm.addAttribute.addButton': 'Add attribute values',
+  'commodity.products.addProductsItem.productAttributeForm.circleCheckbox.addButton': 'New',
+  'commodity.products.addProductsItem.productAttributeForm.modal.title': 'Add attribute values',
+  'commodity.products.addProductsItem.productAttributeForm.modal.formItem.label1': 'Attribute ID',
+  'commodity.products.addProductsItem.productAttributeForm.modal.formItem.label2': 'Attribute name',
+  'commodity.products.addProductsItem.productAttributeForm.modal.formItem.label3': 'Attribute value name',
+  'commodity.products.addProductsItem.productAttributeForm.modal.formItem.label3.placeholder': 'Please enter the property value',
 
   'commodity.products.addProductsItem.productDescFormCloud.iFeaturePlaceholder.1':'Description of Origin',
   'commodity.products.addProductsItem.productDescFormCloud.iFeaturePlaceholder.2':'Raw material variety name (line) and description',

src/locales/ko-KR/commodity.ts

@@ -185,6 +185,7 @@ export default {
   'commodity.products.menuMore.4' : '대량 삭제',
   'commodity.products.controllerBtns.button.1' : '새로 만들다',
   'commodity.products.controllerBtns.button.2' : '더.',
+  'commodity.products.controllerBtns.button.3' : '데이터 가져오기',
   'commodity.products.modal.button.1' : '업로드',
   'commodity.products.modal.button.2' : '오류 로그 내보내기',
   'commodity.products.modal.title.1' : '가져오기 일괄 삭제',
@@ -211,6 +212,10 @@ export default {
   'commodity.products.addDirectChannel.tab.3' : '물류 정보',
   'commodity.products.addDirectChannel.tab.4' : '적용 경로',
 
+  'commodity.products.products.button.draft' : '원고',
+  'commodity.products.products.button.draft.option1' : '고치다',
+  'commodity.products.products.button.draft.option2' : '지우다',
+
   'commodity.products.addProducts.onSave.error.draft.1' : '품목별로 상품 사진을 한 장씩 올려주셔야 초고를 저장할 수 있습니다!',
   'commodity.products.addProducts.onSave.error.draft.2' : '상품 사진 다시 올려주세요!',
   'commodity.products.addProducts.onSave.error.draft.3' : '상품 사진 올려주셔야 초고 저장 가능합니다!',
@@ -225,6 +230,7 @@ export default {
   'commodity.products.addProducts.title.2' : '신제품',
   'commodity.products.addProducts.extra.button.1' : '감사 직접 제출',
   'commodity.products.addProducts.extra.button.2' : '보존',
+  'commodity.products.addProducts.extra.button.3' : '초안 저장',
   'commodity.products.addProducts.tab.1' : '기본 정보',
   'commodity.products.addProducts.tab.2' : '상품을 고르다',
   'commodity.products.addProducts.tab.2.1' : '재료 선택',
@@ -798,6 +804,14 @@ export default {
   'commodity.products.addProductsItem.productAttributeForm.placeholder.1' : '선택하십시오.',
   'commodity.products.addProductsItem.productAttributeForm.placeholder.2' : '최대 60자, 30자 입력',
   'commodity.products.addProductsItem.productAttributeForm.none' : '데이터 없음!',
+  'commodity.products.addProductsItem.productAttributeForm.addAttribute.placeholder': '속성 값을 입력하십시오',
+  'commodity.products.addProductsItem.productAttributeForm.addAttribute.addButton': '속성 값 추가',
+  'commodity.products.addProductsItem.productAttributeForm.circleCheckbox.addButton': '신규 증가',
+  'commodity.products.addProductsItem.productAttributeForm.modal.title': '속성값 증가',
+  'commodity.products.addProductsItem.productAttributeForm.modal.formItem.label1': '속성 ID입니다',
+  'commodity.products.addProductsItem.productAttributeForm.modal.formItem.label2': '속성 이름',
+  'commodity.products.addProductsItem.productAttributeForm.modal.formItem.label3': '속성 값 이름',
+  'commodity.products.addProductsItem.productAttributeForm.modal.formItem.label3.placeholder': '속성 값을 입력하십시오',
 
   'commodity.products.addProductsItem.productDescFormCloud.iFeaturePlaceholder.1' : '원산지 설명',
   'commodity.products.addProductsItem.productDescFormCloud.iFeaturePlaceholder.2' : '원료 품종명(품계) 및 설명',

src/locales/zh-CN/commodity.ts

@@ -183,6 +183,7 @@ export default {
   'commodity.products.menuMore.4' : '批量删除',
   'commodity.products.controllerBtns.button.1' : '新建',
   'commodity.products.controllerBtns.button.2' : '更多',
+  'commodity.products.controllerBtns.button.3' : '导入数据',
   'commodity.products.modal.button.1' : '上传',
   'commodity.products.modal.button.2' : '导出错误日志',
   'commodity.products.modal.title.1' : '删除导入批次',
@@ -209,6 +210,12 @@ export default {
   'commodity.products.addDirectChannel.tab.3': '物流信息',
   'commodity.products.addDirectChannel.tab.4': '适用渠道',
 
+  'commodity.products.products.button.draft' : '草稿',
+  'commodity.products.products.button.draft.option1' : '修改',
+  'commodity.products.products.button.draft.option2' : '删除',
+  'commodity.products.products.tab.tabpan1' : '全部',
+  'commodity.products.products.tab.tabpan2' : '草稿',
+
   'commodity.products.addProducts.onSave.error.draft.1' : '每项请至少上传一张商品图片才能保存草稿！',
   'commodity.products.addProducts.onSave.error.draft.2' : '请重新上传商品图片才能保存草稿！',
   'commodity.products.addProducts.onSave.error.draft.3' : '请上传商品图片才能保存草稿！',
@@ -223,6 +230,7 @@ export default {
   'commodity.products.addProducts.title.2' : '新建商品',
   'commodity.products.addProducts.extra.button.1' : '直接提交审核',
   'commodity.products.addProducts.extra.button.2' : '保存',
+  'commodity.products.addProducts.extra.button.3' : '保存草稿',
   'commodity.products.addProducts.tab.1' : '基本信息',
   'commodity.products.addProducts.tab.2' : '选择货品',
   'commodity.products.addProducts.tab.2.1' : '选择物料',
@@ -801,6 +809,14 @@ export default {
   'commodity.products.addProductsItem.productAttributeForm.placeholder.1': '请选择',
   'commodity.products.addProductsItem.productAttributeForm.placeholder.2': '最多输入60个字符，30个汉字',
   'commodity.products.addProductsItem.productAttributeForm.none': '暂无数据！',
+  'commodity.products.addProductsItem.productAttributeForm.addAttribute.placeholder': '请输入属性值',
+  'commodity.products.addProductsItem.productAttributeForm.addAttribute.addButton': '添加属性值',
+  'commodity.products.addProductsItem.productAttributeForm.circleCheckbox.addButton': '新增',
+  'commodity.products.addProductsItem.productAttributeForm.modal.title': '增加属性值',
+  'commodity.products.addProductsItem.productAttributeForm.modal.formItem.label1': '属性ID',
+  'commodity.products.addProductsItem.productAttributeForm.modal.formItem.label2': '属性名称',
+  'commodity.products.addProductsItem.productAttributeForm.modal.formItem.label3': '属性值名称',
+  'commodity.products.addProductsItem.productAttributeForm.modal.formItem.label3.placeholder': '请输入属性值',
 
   'commodity.products.addProductsItem.productDescFormCloud.iFeaturePlaceholder.1': '原产地描述',
   'commodity.products.addProductsItem.productDescFormCloud.iFeaturePlaceholder.2': '原料品种名(品系)及描述',
@@ -1186,4 +1202,6 @@ export default {
   'commodity.products.zhuangtai': '状态',
   'commodity.products.xuanzeshangyougongyingshangpin': '选择上游供应商品',
   'commodity.products.xuanzexiayouxiaoshoushangpin': '选择下游销售商品',
+
+
 }

src/pages/commodity/products/addProducts.tsx

@@ -597,7 +597,7 @@ const AddProducts: React.FC<{}> = (props) => {
         {intl.formatMessage({ id: 'commodity.products.addProducts.extra.button.2' })}
       </Button>,
       <Button key="3" onClick={onSaveDraft} disabled={isDisableSaveDraft}>
-        保存草稿
+        {intl.formatMessage({ id: 'commodity.products.addProducts.extra.button.3' })}
       </Button>,
     ]}
   >

src/pages/commodity/products/addProductsItem/productAttributeForm.tsx

@@ -263,9 +263,9 @@ const ProductAttributeForm: React.FC<Iprops> = (props) => {
                       {menu}
                       <Divider style={{ margin: '8px 0' }} />
                       <Space align="center" style={{ padding: '0 8px 4px' }}>
-                        <Input placeholder="请输入属性值" value={newValue} onChange={onNameChange} />
+                        <Input placeholder={intl.formatMessage({ id: 'commodity.products.addProductsItem.productAttributeForm.addAttribute.placeholder' })} value={newValue} onChange={onNameChange} />
                         <Typography.Link onClick={(e) => addItem(e, attrItem)} style={{ whiteSpace: 'nowrap' }}>
-                          <PlusOutlined /> 添加属性值
+                          <PlusOutlined /> {intl.formatMessage({ id: 'commodity.products.addProductsItem.productAttributeForm.addAttribute.addButton' })}
                         </Typography.Link>
                       </Space>
                     </>
@@ -309,7 +309,7 @@ const ProductAttributeForm: React.FC<Iprops> = (props) => {
               <CircleCheckbox
                 onChange={(v) => onChange(v, attrItem)}
                 options={attrItem.customerAttributeValueList}
-                expandOperation={<Button style={{marginLeft: 8}} type="dashed" icon={<PlusOutlined />} onClick={() => addAtttributeValue(attrItem)}>新增</Button>}
+                expandOperation={<Button style={{marginLeft: 8}} type="dashed" icon={<PlusOutlined />} onClick={() => addAtttributeValue(attrItem)}>{intl.formatMessage({ id: 'commodity.products.addProductsItem.productAttributeForm.circleCheckbox.addButton' })}</Button>}
               />
             </Form.Item>
           )
@@ -364,7 +364,7 @@ const ProductAttributeForm: React.FC<Iprops> = (props) => {
     </Form>
     {dataSource?.length === 0 && <span style={{ opacity: 0.6 }}>{intl.formatMessage({ id: 'commodity.products.addProductsItem.productAttributeForm.none' })}</span>}
     <Modal
-      title="增加属性值"
+      title={intl.formatMessage({ id: 'commodity.products.addProductsItem.productAttributeForm.modal.title' })}
       visible={addVisible}
       onOk={handleAdd}
       forceRender={true}
@@ -381,22 +381,22 @@ const ProductAttributeForm: React.FC<Iprops> = (props) => {
       >
         <Form.Item
           name='id'
-          label='属性ID'
+          label={intl.formatMessage({ id: 'commodity.products.addProductsItem.productAttributeForm.modal.formItem.label1' })}
           style={{display:'none'}}
         >
           <Input disabled={true} />
         </Form.Item>
         <Form.Item
           name='name'
-          label='属性名称'
+          label={intl.formatMessage({ id: 'commodity.products.addProductsItem.productAttributeForm.modal.formItem.label2' })}
         >
           <Input disabled={true} />
         </Form.Item>
         <Form.Item
           name='value'
-          label='属性值名称'
+          label={intl.formatMessage({ id: 'commodity.products.addProductsItem.productAttributeForm.modal.formItem.label3' })}
         >
-          <Input placeholder="请输入属性值" />
+          <Input placeholder={intl.formatMessage({ id: 'commodity.products.addProductsItem.productAttributeForm.modal.formItem.label3.placeholder' })} />
         </Form.Item>
       </Form>
     </Modal>

src/pages/commodity/products/index.tsx

@@ -150,9 +150,9 @@ const Products: React.FC<{}> = () => {
       render: t => t ? t : intl.formatMessage({ id: 'commodity.products.columns.upperMemberName.1' })
     },
     {
-      title: '商品类型',
-      dataIndex: 'CommodityType',
-      key: 'CommodityType',
+      title: intl.formatMessage({ id: 'commodity.products.columns.type' }),
+      dataIndex: 'type',
+      key: 'type',
       render: t => {
         const text_arr = [
           '',
@@ -289,15 +289,15 @@ const Products: React.FC<{}> = () => {
       title: intl.formatMessage({ id: 'commodity.products.columns.status' }),
       dataIndex: ['draft', 'status'],
       key: 'status',
-      render: () => <Tag>草稿</Tag>
+      render: () => <Tag>{intl.formatMessage({ id: 'commodity.products.products.button.draft' })}</Tag>
     },
     {
       title: intl.formatMessage({ id: 'commodity.products.columns.option' }),
       dataIndex: 'option',
       width: 160,
       render: (text, record) => (<>
-        <Button type='link' onClick={()=>clickDraftModify(record)}>修改</Button>
-        <Button type='link' onClick={()=>clickDraftDelete(record)}>删除</Button>
+        <Button type='link' onClick={()=>clickDraftModify(record)}>{intl.formatMessage({ id: 'commodity.products.products.button.draft.option1' })}</Button>
+        <Button type='link' onClick={()=>clickDraftDelete(record)}>{intl.formatMessage({ id: 'commodity.products.products.button.draft.option2' })}</Button>
       </>)
     }
   ];
@@ -416,7 +416,6 @@ const Products: React.FC<{}> = () => {
   }
 
   const modalLoadTemplate = () => {
-    console.log('模板下载！')
     let a: any = document.createElement("a")
     document.body.appendChild(a)
     a.style = "display: none"
@@ -954,7 +953,7 @@ const Products: React.FC<{}> = () => {
           <PlusOutlined />{intl.formatMessage({ id: 'commodity.products.controllerBtns.button.1' })}
         </Button>
       </AuthButton>
-      <Button style={{margin:'0 16px'}} onClick={()=>setImportModal(true)}>导入数据</Button>
+      <Button style={{margin:'0 16px'}} onClick={()=>setImportModal(true)}>{intl.formatMessage({ id: 'commodity.products.controllerBtns.button.3' })}</Button>
       <AuthButton btnCode='products.batch' >
         <Dropdown overlay={menuMore} trigger={['click']}>
           <Button>
@@ -973,7 +972,7 @@ const Products: React.FC<{}> = () => {
     <PageHeaderWrapper>
       <Card>
         <Tabs defaultActiveKey="1" onChange={changeTabs}>
-          <Tabs.TabPane tab="全部" key="1">
+          <Tabs.TabPane tab={intl.formatMessage({ id: 'commodity.products.products.tab.tabpan1' })} key="1">
             <StandardTable
               columns={columns}
               currentRef={ref}
@@ -1012,7 +1011,7 @@ const Products: React.FC<{}> = () => {
               }
             />
           </Tabs.TabPane>
-          <Tabs.TabPane tab="草稿" key="2">
+          <Tabs.TabPane tab={intl.formatMessage({ id: 'commodity.products.products.tab.tabpan2' })} key="2">
             <StandardTable
               columns={draftColumns}
               currentRef={refDraft}