@bit-sun/business-component 4.0.13-alpha.3 → 4.0.13-alpha.31

package/src/components/Business/SearchSelect/BusinessUtils.tsx

@@ -342,6 +342,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
             specialBracket: true,
             otherParams: {
               'ownOrgSign': getCurrentTargetBgId(),
+              'ctl-count': true
             }, // 默认参数
           },
         }
@@ -360,15 +361,19 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
             mappingValueField: 'itemCode',
             sourceName: 'qp-itemCode-in',
             specialBracket: true,
+            otherParams: {
+              'ownOrgSign': getCurrentTargetBgId(),
+              'ctl-count': true
+            }, // 默认参数
           },
         }
       } },
-      { name: 'qp-eancode-in', label: '商品条码', field: {
-        type: 'multipleQueryInput',
-        props: {
-          ...(requestConfigProp?.itemEancodeValueRequestConfig || {}),
-        },
-      }},
+      // { name: 'qp-eancode-in', label: '商品条码', field: {
+      //   type: 'multipleQueryInput',
+      //   props: {
+      //     ...(requestConfigProp?.itemEancodeValueRequestConfig || {}),
+      //   },
+      // }},
       { name: 'qp-brandId-in', type: 'select', label: '品牌', field: {
           type: 'select',
           props: {
@@ -416,8 +421,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
         currentPage: 1,
       }),
     ]).then((x: any)=>{
-      formatSource(x,0, 4, tableSearchForm,['id','name'])
-      formatTreeDataSource(x,1, 5, tableSearchForm)
+      formatSource(x,0, 3, tableSearchForm,['id','name'])
+      formatTreeDataSource(x,1, 4, tableSearchForm)
     })
     modalTableProps = {
       modalTableTitle: '选择SKU',
@@ -489,6 +494,142 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
 
   // 商品选择器spu
   if(type === 'spuCommodity') {
+    selectProps = {
+      placeholder: '输入商品(SPU)编码或名称',
+      renderTableColumns: [
+        {
+          title: '商品编码(SPU)',
+          dataIndex: 'itemCode',
+        },
+        {
+          title: '商品名称(SPU)',
+          dataIndex: 'name',
+        },
+      ],
+      ...selectConfigProps,
+    }
+    requestConfig = {
+      url: `${prefixUrl.selectPrefix}/item`,
+      filter: 'qp-itemCode,name-orGroup,like', // 过滤参数
+      mappingTextField: 'name',
+      mappingValueField: 'itemCode',
+      otherParams: {
+        'qp-approveStatus-eq': 1, // 审核状态(0.待审批;1.审批通过;2.驳回;3.审批未通过)
+        sorter: 'desc-id',
+        ...(requestConfigProp?.addOtherParams || {}),
+      }, // 默认参数
+      sourceName: 'itemCode',
+      ...requestConfigProp,
+    }
+    tableSearchForm = [
+      { name: 'qp-itemCode-like', label: '商品编码(SPU)' },
+      { name: 'qp-name-like', label: '商品名称(SPU)' },
+      { name: 'qp-brandId-in', type: 'select', label: '品牌', field: {
+          type: 'select',
+          props: {
+            mode: 'multiple',
+            notFoundContent: '暂无数据',
+            allowClear: true,
+            showSearch: true,
+            showArrow: true,
+            maxTagCount: 1,
+            optionFilterProp: 'children',
+            filterOption: (input: string, option: { props: { children: string } }) =>
+              option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
+          },
+        } },
+      { name: 'qp-categoryId-in', type: 'treeSelect', label: '类目', field: {
+          type: 'treeSelect',
+          props: {
+            treeData: [],
+            treeCheckable: true,
+            showSearch: true,
+            allowClear: true,
+            showArrow: true,
+            treeNodeFilterProp: 'title',
+            treeDefaultExpandAll: true,
+            maxTagCount: 1,
+            placeholder: '请选择',
+            style: {
+              width: '100%',
+            },
+            dropdownStyle: { maxHeight: 400, maxWidth: 100, overflow: 'auto' }
+          },
+        } },
+      { name: 'qp-classId-in', type: 'select', label: '品类', field: {
+          type: 'select',
+          props: {
+            mode: 'multiple',
+            notFoundContent: '暂无数据',
+            allowClear: true,
+            showSearch: true,
+            showArrow: true,
+            maxTagCount: 1,
+            optionFilterProp: 'children',
+            filterOption: (input: string, option: { props: { children: string } }) =>
+              option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
+          },
+        } },
+    ]
+    Promise.all([
+      loadSelectSource(`${prefixUrl.formSelectFix}/brand/queryBrandList`, {
+        pageSize: 5000,
+        currentPage: 1,
+        'ctl-withAuth': true
+      }),
+      loadSelectSource(`${prefixUrl.formSelectFix}/category/queryCategoryTree`, {
+        pageSize: 5000,
+        currentPage: 1,
+      }),
+      loadSelectSource(`${prefixUrl.formSelectFix}/class/withProperty`, {
+        pageSize: 5000,
+        currentPage: 1,
+      }),
+    ]).then((x: any)=>{
+      formatSource(x,0, 2, tableSearchForm,['id','name']);
+      formatTreeDataSource(x,1, 3, tableSearchForm);
+      formatSource(x,2, 4, tableSearchForm,['id','name']);
+    })
+    modalTableProps = {
+      modalTableTitle: '选择商品(SPU) ',
+      tableSearchForm,
+      tableColumns: [
+        {
+          title: '序号',
+          dataIndex: 'keyIndex',
+          defaultSort: 0,
+        },
+        {
+          title: '商品编码(SPU)',
+          dataIndex: 'itemCode',
+          defaultSort: 1,
+        },
+        {
+          title: '商品名称(SPU) ',
+          dataIndex: 'name',
+          defaultSort: 2,
+        },
+        {
+          title: '品牌',
+          dataIndex: 'brandName',
+          defaultSort: 3,
+        },
+        {
+          title: '类目',
+          dataIndex: 'categoryText',
+          defaultSort: 4,
+        },
+        {
+          title: '品类',
+          dataIndex: 'className',
+        },
+      ],
+      ...modalTableBusProps
+    }
+  }
+
+  // 新库存商品选择器spu
+  if(type === 'spuCommodityWithProperty') {
     selectProps = {
       placeholder: '输入spu编码或名称',
       renderTableColumns: [
@@ -504,12 +645,13 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...selectConfigProps,
     }
     requestConfig = {
-      url: `${prefixUrl.selectPrefix}/item`,
+      url: `/stock/item/doItemPageAll`,
+      method: 'POST',
       filter: 'qp-itemCode,name-orGroup,like', // 过滤参数
       mappingTextField: 'name',
       mappingValueField: 'itemCode',
       otherParams: {
-        'qp-approveStatus-eq': 1, // 审核状态(0.待审批;1.审批通过;2.驳回;3.审批未通过)
+        // 'qp-approveStatus-eq': 1, // 审核状态(0.待审批;1.审批通过;2.驳回;3.审批未通过)
         sorter: 'desc-id',
         ...(requestConfigProp?.addOtherParams || {}),
       }, // 默认参数
@@ -565,6 +707,61 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
               option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
           },
         } },
+        { 
+          name: 'qp-year-in', 
+          label: '年份', 
+          field: {
+            type: 'itemPropertySelector',
+            props: {
+              propertyCode: 'SX0000114',
+              mode: 'multiple',
+            }
+          }
+        },
+        { 
+          name: 'qp-season-in', 
+          label: '季节', 
+          field: {
+            type: 'itemPropertySelector',
+            props: {
+              propertyCode: 'SX0000070',
+              mode: 'multiple',
+            }
+          }
+        },
+        { 
+          name: 'qp-zzdlbm-in', 
+          label: '大类', 
+          field: {
+            type: 'itemPropertySelector',
+            props: {
+              propertyCode: 'SX0000071',
+              mode: 'multiple',
+            }
+          }
+        },
+        { 
+          name: 'qp-zzzlbm-in', 
+          label: '中类', 
+          field: {
+            type: 'itemPropertySelector',
+            props: {
+              propertyCode: 'SX0000072',
+              mode: 'multiple',
+            }
+          }
+        },
+        { 
+          name: 'qp-zzxlbm-in', 
+          label: '小类', 
+          field: {
+            type: 'itemPropertySelector',
+            props: {
+              propertyCode: 'SX0000110',
+              mode: 'multiple',
+            }
+          }
+        },
     ]
     Promise.all([
       loadSelectSource(`${prefixUrl.formSelectFix}/brand/queryBrandList`, {
@@ -619,6 +816,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           dataIndex: 'className',
         },
       ],
+      noEmptySearchField: true,
       ...modalTableBusProps
     }
   }
@@ -1618,8 +1816,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...requestConfigProp,
     }
     tableSearchForm = [
-      { name: 'qp-name-like', label: '商店名称' },
-      { name: 'qp-code-like', label: '商店编码' },
+      { name: 'qp-name-like', label: '商店名称', type: 'multipleQueryInput' },
+      { name: 'qp-code-like', label: '商店编码', type: 'multipleQueryInput' },
       { name: 'qp-type-in', type: 'select', label: '商店类型', initialSource: shopFile2Type },
       { name: 'qp-status-in', type: 'select', label: '商店状态', initialSource: shopFile2Status },
       { name: 'qp-orgCode-in', type: 'select', label: '所属销售组织', field: {

package/src/components/Business/SearchSelect/index.md

@@ -54,7 +54,7 @@ export default () => {
       setValue(value)
     },
     selectBusinessType: 'supplier',
-    disabled: true,
+    // disabled: true,
   };
   
   const props2 = {
@@ -150,7 +150,7 @@ export default () => {
     // },
     // prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
     selectProps,
-    selectBusinessType: 'skuCommodity',
+    selectBusinessType: 'shopFile2',
   };
 
   const onTabChange = (key) => {
@@ -297,7 +297,7 @@ import {BusinessSearchSelect} from '../../../index.ts';
 const { TabPane } = Tabs;
 export default () => {
   const selectProps = {
-    // mode: 'multiple',
+    mode: 'multiple',
     // maxTagCount: 1,
     // disabled: true
   }
@@ -317,7 +317,7 @@ export default () => {
     },
     // prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
     selectProps,
-    selectBusinessType: 'spuCommodity',
+    selectBusinessType: 'spuCommodityWithProperty',
   };
 
   const onTabChange = (key) => {

package/src/components/Business/SearchSelect/utils.ts

@@ -79,7 +79,7 @@ const handleDefaultPrefixUrl = (type: string) => {
     case 'supplier2': case 'customer2': case 'shopFile2': case 'platCompany': case 'market-channel':
       result =  '/channel-manage';
       break;
-    case 'skuCommodity': case 'skuPropertyValue': case 'spuCommodity': case 'skcCommodity': case 'brand':
+    case 'skuCommodity': case 'skuPropertyValue': case 'spuCommodity': case 'skcCommodity': case 'brand': case 'spuCommodityWithProperty':
       result =  '/items';
       break;
     case 'physicalWarehouse': case 'realWarehouse': case 'virtualWarehouse': case 'channelWarehouse': case 'ownerWarehouse':

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

@@ -89,7 +89,7 @@ const AddSelect = (props: any) => {
     isAllowRepeatedSelect = false,
     clearTitle
   } = props;
-  const { url, otherParams, isMap, mappingValueField = 'code' } = requestConfig || {};
+  const { url, sourceKey, otherParams, isMap, mappingValueField = 'code' } = requestConfig || {};
   const realButtonProps = {type: "primary", ...buttonProps};
   const selectRowKey = isAllowRepeatedSelect ? 'uuid' : mappingValueField
 
@@ -537,7 +537,7 @@ const AddSelect = (props: any) => {
             };
           });
         } else {
-          const keys = res.list ? 'list' : 'items';
+          const keys = sourceKey ? sourceKey :res.list ? 'list' : 'items';
           source = res
             ? res[keys]
               ? res[keys].map((item: any) => {
@@ -940,7 +940,7 @@ const AddSelect = (props: any) => {
       </div>
       {isModalVisible && (
         <Modal
-          width='1200px'
+          width={`calc(100% - 320px)`}
           style={{ top: 20 }}
           bodyStyle={{ padding: '0px' }}
           visible={isModalVisible}

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

@@ -43,6 +43,7 @@ export default () => {
         onRef={(ref) => {
           dataValidationRef = ref;
         }}
+        getTemplate={() => {}}
       />
     </div>
   );

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

@@ -653,7 +653,7 @@ class DataValidation extends React.Component {
 
   render() {
     const { errorListCheck } = this.state;
-    const { title, notValid, notExcelImport, excelImportConfig } = this.props;
+    const { title, notValid, notExcelImport, excelImportConfig, getTemplate } = this.props;
     const { size, accept, suffixRule } = excelImportConfig || {}
 
     let totalSummary = this.getCount();
@@ -745,9 +745,16 @@ class DataValidation extends React.Component {
           </Space>
           <Space>
             {!notExcelImport && (
-              <Upload {...uploadProps}>
-                <Button>导入</Button>
-              </Upload>
+              <>
+                {
+                  getTemplate && (
+                    <Button onClick={getTemplate}>下载模板</Button>
+                  )
+                }
+                <Upload {...uploadProps}>
+                  <Button>导入</Button>
+                </Upload>
+              </>
             )}
             <Dropdown
               trigger={['click']}

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

@@ -9,7 +9,7 @@ title: 批量搜索查询组件
 order: 2
 ---
 
-## QueryMutipleInput
+## QueryMutipleSearchSelect
 
 Demo:
 
@@ -20,8 +20,7 @@ import { QueryMutipleSearchSelect } from '../../../index';
 export default () => {
   const requestConfig = {
     url: '/items/item/listNoPage/Simple',
-    filter: 'qp-name-like', // qp-itemCode-like
-    // filter: 'qp-skuCode,name-orGroup,like',
+    filter: 'qp-itemCode,name-orGroup,like',
     mappingTextField: 'name',
     mappingValueField: 'itemCode',
     sourceName: 'qp-itemCode-in'

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

@@ -91,6 +91,7 @@ const QueryMutipleSearchSelect = ({ onValueChange, requestConfig={}, selectProps
    const getData = (params: any = {}, callback?: any) => {
     if (!requestConfig) return;
     if (!url) return;
+    if(!searchValue?.length) return; // 空值默认不查询
 
     setFetching(true)
 
@@ -167,7 +168,7 @@ const QueryMutipleSearchSelect = ({ onValueChange, requestConfig={}, selectProps
               <Spin size="small" className='searchSelectSpin' />
             ) : (
               <div style={{ textAlign: 'center' }}>
-                <div>{searchValue?'无匹配结果,请更换其他内容再试':`请录入内容模糊查询`}</div>
+                <div>{searchValue?'无匹配结果,请更换其他内容再试': (selectProps?.notFoundText||`请录入编码/名称模糊查询`)}</div>
               </div>
             )
           }

package/src/components/Functional/SearchSelect/index.less

@@ -73,11 +73,6 @@
   &_dropdown_table {
     // padding: 4px 10px 6px;
 
-    // 下拉table 复选框为单选时候隐藏
-    .ant-table-cell .ant-table-selection-column .ant-radio,table tr td.ant-table-selection-column .ant-radio-wrapper {
-      display: none;
-    }
-
     // 下拉table 表头表体样式
     .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table {
       font-family: MiSans-Regular;
@@ -103,7 +98,18 @@
     .ant-table.ant-table-bordered > .ant-table-container {
       .ant-table-body > table > tbody > tr > td.ant-table-selection-column,
       .ant-table-header > table > thead > tr > th.ant-table-selection-column {
-        display: none;
+        visibility: hidden; // 不使用 display: none; 是因为此设置不占位，会导致表格scroll.x: 'max-content' 计算不准确
+        padding: 0;
+        margin: 0;
+        width: 0;
+        height: 0;
+        min-width: 0;
+        min-height: 0;
+        border: none;
+
+        .ant-radio-wrapper {
+          display: none;
+        }
       }
     }
   }
@@ -243,6 +249,10 @@
       &_wrapLeft1, &_wrapLeft2, &_wrapRight{
         background: #fff;
         width: calc(50% - 5px);
+        // 解决全选按钮位置偏左问题
+        .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table .ant-table-thead .ant-table-selection .ant-checkbox-wrapper {
+          justify-content: center;
+        }
       }
       &_wrapLeft1 {
         width: 100%;