@bit-sun/business-component 2.0.39-alpha.6 → 2.0.40

package/src/components/Business/columnSettingTable/index.tsx

@@ -72,23 +72,25 @@ export default class ColumnSettingTable extends React.Component {
     const { showColumns }: any = this.state;
     let summaryRow = rowSelection ? [{}, ...showColumns] : [...showColumns];
     let summaryInitial = summary().cont;
-    let summaryDom: any = <Table.Summary.Row>
-    {
-     [...summaryRow].map((item: any, index: number) => {
-      return (
-        <Table.Summary.Cell index={index}>
-          <Text type="danger">
-            {
-              summaryInitial.filter((inner:any) => inner.key === item.dataIndex || inner.key === item.key).length ?
-              `${item.title}: ${summaryInitial.filter((inner:any) => inner.key === item.dataIndex || inner.key === item.key)[0].value}` : '' 
-              
-            }
-          </Text>
-        </Table.Summary.Cell>
-      )
-     })
-    }
-  </Table.Summary.Row >;
+    let summaryDom: any = <Table.Summary fixed>
+      <Table.Summary.Row>
+        {
+          [...summaryRow].map((item: any, index: number) => {
+            return (
+              <Table.Summary.Cell index={rowSelection ? index : index - 1}>
+                <Text type="danger">
+                  {
+                    summaryInitial.filter((inner: any) => inner.key === item.dataIndex || inner.key === item.key).length ?
+                      `${item.title}: ${summaryInitial.filter((inner: any) => inner.key === item.dataIndex || inner.key === item.key)[0].value}` : ''
+
+                  }
+                </Text>
+              </Table.Summary.Cell>
+            )
+          })
+        }
+      </Table.Summary.Row >
+    </Table.Summary>
   return () => summaryDom
   };
 
@@ -153,7 +155,7 @@ export default class ColumnSettingTable extends React.Component {
   };
 
   render() {
-    const { columns, tableCode, summary = undefined, dynamicColumns = [], ...restProps }: any = this.props;
+    const { columns, tableCode, summary = undefined, dynamicColumns = [], scroll={}, ...restProps }: any = this.props;
     let otherTableInfo = {
       ...restProps,
     };
@@ -194,7 +196,11 @@ export default class ColumnSettingTable extends React.Component {
 
     otherTableInfo = {
       ...otherTableInfo,
-      scroll: { x: restProps.overScrollX || this.getTableScrollXWidth(showCol) },
+      scroll: {
+        y: 400,
+        ...scroll,
+        x: restProps.overScrollX || this.getTableScrollXWidth(showCol)
+      },
       summary: showSummary,
     }
     return (

package/src/components/Business/columnSettingTable/sulaSettingTable.tsx

@@ -78,23 +78,25 @@ export default class ColumnSettingSulaTable extends React.Component {
     const { showColumns }: any = this.state;
     let summaryRow = rowSelection ? [{}, ...showColumns] : [...showColumns];
     let summaryInitial = summary().cont;
-    let summaryDom: any = <Table.Summary.Row>
-    {
-     [...summaryRow].map((item: any, index: number) => {
-      return (
-        <Table.Summary.Cell index={rowSelection ? index : index-1}>
-          <Text type="danger">
-            {
-              summaryInitial.filter((inner:any) => inner.key === item.dataIndex || inner.key === item.key).length ?
-              `${item.title}: ${summaryInitial.filter((inner:any) => inner.key === item.dataIndex || inner.key === item.key)[0].value}` : '' 
-              
-            }
-          </Text>
-        </Table.Summary.Cell>
-      )
-     })
-    }
-  </Table.Summary.Row >;
+    let summaryDom: any = <Table.Summary fixed>
+      <Table.Summary.Row>
+        {
+          [...summaryRow].map((item: any, index: number) => {
+            return (
+              <Table.Summary.Cell index={rowSelection ? index : index - 1}>
+                <Text type="danger">
+                  {
+                    summaryInitial.filter((inner: any) => inner.key === item.dataIndex || inner.key === item.key).length ?
+                      `${item.title}: ${summaryInitial.filter((inner: any) => inner.key === item.dataIndex || inner.key === item.key)[0].value}` : ''
+
+                  }
+                </Text>
+              </Table.Summary.Cell>
+            )
+          })
+        }
+      </Table.Summary.Row >
+    </Table.Summary>
   return () => summaryDom
   };
 
@@ -159,7 +161,7 @@ export default class ColumnSettingSulaTable extends React.Component {
   };
 
   render() {
-    const { style=null, columns, tableCode, summary = undefined, dynamicColumns = [], ...restProps }: any = this.props;
+    const { style=null, columns, tableCode, summary = undefined, dynamicColumns = [], scroll={}, ...restProps }: any = this.props;
     let otherTableInfo = {
       ...restProps,
     };
@@ -200,7 +202,11 @@ export default class ColumnSettingSulaTable extends React.Component {
 
     otherTableInfo = {
       ...otherTableInfo,
-      scroll: { x: restProps.overScrollX || this.getTableScrollXWidth(showCol) },
+      scroll: {
+        y: 400,
+        ...scroll,
+        x: restProps.overScrollX || this.getTableScrollXWidth(showCol)
+      },
       summary: showSummary,
     }
     return (

package/src/components/Functional/DataImport/index.tsx

@@ -58,6 +58,12 @@ const mapping = new Map([
   ['newUniqueCode', '新唯一码'],
   ['relationRecordCode', '单据编码'],
   ['remark', '备注'],
+  ['externalCode', 'JDE商品编码'],
+  ['realWarehouseCode', '仓库编码'],
+  ['syncRate', '按百分比'],
+  ['assignQuantity', '按指定数量'],
+  ['retainQuantity', ' 按保留数量'],
+  ['priority', ' 优先级'],
 ]);
 
 // for dnd

package/src/components/Functional/DataValidation/index.md

@@ -26,6 +26,7 @@ export default () => {
         // columns={['skuCode', 'quantity', 'price']}
         columns={["skuCode", "quantity", "price"]}  // 需要哪些列展示，以及展示的顺序
         validDataUrl="/wms-ops/recordDetailImport/check" // 校验的接口url
+        validDataParams={{ recordCode: '111' }}
         onRef={(ref) => {
           dataValidationRef = ref;
         }}

package/src/components/Functional/DataValidation/index.tsx

@@ -58,7 +58,12 @@ const mapping = new Map([
   ['newUniqueCode', '新唯一码'],
   ['relationRecordCode', '单据编码'],
   ['remark', '备注'],
-  ['externalCode', 'JDE商品编码']
+  ['externalCode', 'JDE商品编码'],
+  ['realWarehouseCode', '仓库编码'],
+  ['syncRate', '按百分比'],
+  ['assignQuantity', '按指定数量'],
+  ['retainQuantity', ' 按保留数量'],
+  ['priority', ' 优先级'],
 ]);
 
 // for dnd
@@ -401,7 +406,7 @@ class DataValidation extends React.Component {
   };
 
   resetData = () => {
-    const { validDataUrl, updateData, columns, isBrandAuth, isCheckStockNum = true } = this.props;
+    const { validDataUrl, validDataParams, updateData, columns, isBrandAuth, isCheckStockNum = true } = this.props;
     const resultData = this.getData().filter(d => {
       return _.compact(Object.values(d)).length
     })
@@ -415,6 +420,7 @@ class DataValidation extends React.Component {
     axios
       .post(validDataUrl, {
         ...otherParams,
+        ...validDataParams,
         columns: columns,
         data: resultData,
         checkStockNum: isCheckStockNum

package/src/index.ts

@@ -29,5 +29,3 @@ export { default as DetailPageWrapper } from './components/Business/DetailPageWr
 export { default as HomePageWrapper } from './components/Business/HomePageWrapper';
 export { default as BsSulaQueryTable } from './components/Business/BsSulaQueryTable';
 export { default as BsLayout } from './components/Business/BsLayouts';
-export { default as JsonQueryTable } from './components/Business/JsonQueryTable';
-

package/src/styles/bsDefault.less

@@ -1431,6 +1431,9 @@ body .ant-table .ant-table-container .ant-table-thead > tr > th {
 
 .clomnsImg {
   :global {
+    .ant-image {
+      margin: 8px;
+    }
     .ant-image-mask-info {
       font-size: 12px !important;
       padding: 0;
@@ -1438,6 +1441,14 @@ body .ant-table .ant-table-container .ant-table-thead > tr > th {
     }
   }
 }
+.clomnsImg2 {
+  margin: 8px;
+  img {
+    width: 28px;
+    height: 28px;
+  }
+}
+
 
 .ant-table-wrapper {
   padding: 0 8px;

package/dist/components/Business/JsonQueryTable/drawer/index.d.ts

@@ -1,2 +0,0 @@
-declare const _default: (props: any) => JSX.Element;
-export default _default;

package/dist/components/Business/JsonQueryTable/index.d.ts

@@ -1,3 +0,0 @@
-import React from 'react';
-declare const JsonQueryTable: React.NamedExoticComponent<object>;
-export default JsonQueryTable;