@bit-sun/business-component 4.0.13-alpha.2 → 4.0.13-alpha.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "4.0.13-alpha.2",
+  "version": "4.0.13-alpha.21",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -53,6 +53,7 @@
     "querystring": "^0.2.1",
     "react": "^16.12.0",
     "react-beautiful-dnd": "10.0.0",
+    "react-dom": "^16.12.0",
     "react-resizable": "^3.0.4",
     "react-sortable-hoc": "^2.0.0",
     "serialize-javascript": "^6.0.0",

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

@@ -370,7 +370,7 @@ export default (props: any) => {
             }
           });
         }
-        handleBssulaColumnsSpecialParams(d);
+        // handleBssulaColumnsSpecialParams(d);
       });
       setCommonRenderFn(props.columns);
       const authButton = localStorage.getItem(getMenuAuthDataKey())
@@ -405,7 +405,7 @@ export default (props: any) => {
 
     showColumns.forEach((item, index) => {
       item.width = item.width || getItemDefaultWidth(item);
-      handleBssulaColumnsSpecialParams(item);
+      // handleBssulaColumnsSpecialParams(item);
       item.onHeaderCell = (column) => ({
         ...item,
         width:
@@ -429,7 +429,7 @@ export default (props: any) => {
 
     showExportColumns.forEach((item, index) => {
       item.width = item.width || getItemDefaultWidth(item);
-      handleBssulaColumnsSpecialParams(item);
+      // handleBssulaColumnsSpecialParams(item);
       item.onHeaderCell = (column) => ({
         ...item,
         width:
@@ -715,9 +715,9 @@ export default (props: any) => {
           ...newColumns[index],
           width: size.width,
         };
-        newColumns.forEach((d: any) => {
-          handleBssulaColumnsSpecialParams(d);
-        });
+        // newColumns.forEach((d: any) => {
+        //   handleBssulaColumnsSpecialParams(d);
+        // });
         return [...newColumns];
       });
     };

package/src/components/Business/BsSulaQueryTable/setting.tsx

@@ -711,7 +711,7 @@ class SortableTable extends React.Component {
       <div className={'sort_table_wrapper'}>
         {visible && (
           <Modal
-            title="筛选条件设置"
+            title="展示列设置"
             wrapClassName={'sort_table_wrapper'}
             width={810}
             visible={visible}
@@ -748,7 +748,7 @@ class SortableTable extends React.Component {
             <div className={'sort_table'}>
               <div className={'sort_table_column_wrapper'}>
                 <span className={'sort_table_column_count'}>
-                  <span>勾选你想使用的筛选条件</span>
+                  <span>勾选你想展示的表格列</span>
                 </span>
                 <div className={'sort_table_column'}>
                   <Input
@@ -882,7 +882,7 @@ class SortableTable extends React.Component {
               </div>
               <div className={'sort_table_content_wrapper'}>
                 <span className={'sort_table_content_count'}>
-                  <span>已选择的搜索条件排序</span>
+                  <span>已选择的展示列排序</span>
                 </span>
                 <div className={'sort_table_content'}>
                   <span style={{ paddingLeft: '10px' }}>

package/src/components/Business/BsSulaQueryTable/utils.tsx

@@ -1,5 +1,6 @@
 // @ts-nocheck
 import React, { useState } from 'react';
+import * as ReactDOMServer from 'react-dom/server';
 import {
   Tooltip,
   Badge,
@@ -30,7 +31,6 @@ import { getMenuAuthDataKey } from '@/utils/LocalstorageUtils';
 import noImg from '../../../assets/list-no-img.svg';
 import qs from 'qs';
 import { shouldUseAuth } from '@/utils';
-import * as ReactDOMServer from 'react-dom/server';
 
 
 export const handleStatusBadge = (text: any, color: any) => {
@@ -723,6 +723,7 @@ export const authFn = (code?: any) => {
 export const renderToString = (
   render: ReactElement<any, string | JSXElementConstructor<any>> | string,
 ) => {
+  // return render;
   return typeof render === 'string'
     ? render
     : ReactDOMServer.renderToString(render);

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

@@ -34,16 +34,18 @@ const CommodityEntry = (props: any) => {
 
   const handleOk = () => {
     // 方法获取当前组件内部的数据，然后进行自身的业务操作
-    const resultData = dataValidationRef.current?.getValidateData();
+    let resultData = props?.notValid ? dataValidationRef.current?.getData() : dataValidationRef.current?.getValidateData();
 
-    if (!resultData.successData.length) {
-      message.error("无校验通过数据，请校验数据");
-      return;
-    }
-
-    if (resultData.failData.length) {
-      message.error(`有${resultData.failData.length}条校验失败数据`);
-      return;
+    if(!(!!props?.notValid)) {
+      if (!resultData.successData.length) {
+        message.error("无校验通过数据，请校验数据");
+        return;
+      }
+  
+      if (resultData.failData.length) {
+        message.error(`有${resultData.failData.length}条校验失败数据`);
+        return;
+      }
     }
 
     callbackHandleOk(resultData, () => {

package/src/components/Business/DetailPageWrapper/utils.tsx

@@ -100,7 +100,9 @@ export const getMainCrumbNameMap = (menuData) => {
       };
     });
   };
-  flattenMenuData(menuData, {});
+  const newList = (window.top||window)?.applicationList?.filter?.((app: any) => app.code === menuData?.[0]?.belongAppCode) || [];
+  const appChannelParent = newList.length > 0 ? { nameMap: [newList[0].name]} : {};
+  flattenMenuData(menuData,appChannelParent);
   return routerMap;
 }
 

package/src/components/Business/HomePageWrapper/index.less

@@ -1,5 +1,5 @@
 .bs_home_page_head_wrapper{
-  height: 32px;
+  // 如果设置高度 需要考虑列表页引用有传提示参数alertProps情况，写死固定高度会导致提示遮挡筛选条件
   position: sticky;
   background: #fff;
   width: 100%;

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

@@ -0,0 +1,88 @@
+// @ts-nocheck
+
+import React, { useState, useEffect } from 'react';
+import { Input, Select } from 'antd';
+import { request } from 'bssula';
+
+const ItemPropertySelector = ({
+    onChange,
+    value,
+    propertyCode,
+    name,
+    ...restProps
+}: any) => {
+
+    const [source, setSource] = useState([]);
+
+    useEffect(() => {
+        // FIXME: 目前只能通过固定属性编码先获取属性id，再通过属性id去查属性值 @林军
+        if (propertyCode) {
+            request({
+                url: `/items/item/propertyValue/getPropertyValueNoPagerByCode?qp-propertyCode-eq=${propertyCode}&pageSize=5000`,
+                method: 'GET',
+                converter: ({ data }: any) => {
+                    const source = (data?.items || []).map(item => ({
+                        text: item.value,
+                        value: item.value
+                    }))
+                    setSource(source);
+                }
+            })
+            return;
+            request({
+                url: `/items/item/property?qp-propertyCode-eq=${propertyCode}`,
+                metod: 'GET',
+                converter: ({ data }: any) => {
+                    let propInfo = data?.items?.[0] || {};
+                    if (propInfo?.dictIs) {
+                        request({
+                            url: `/items/bscDict/detailAndFilter/${propInfo?.dictCode}`,
+                            method: 'GET',
+                            converter: ({ data }: any) => {
+                                const source = (data?.dictItemResVoList || []).map(item => ({
+                                    text: item.dictItemName,
+                                    value: item.dictItemName
+                                }))
+                                setSource(source);
+                            }
+                        })
+                        return;
+                    }
+
+                    if (propInfo?.id) {
+                        request({
+                            url: `/items/item/propertyValue?qp-propertyId-eq=${propInfo?.id}`,
+                            method: 'GET',
+                            converter: ({ data }: any) => {
+                                const source = (data?.items || []).map(item => ({
+                                    text: item.value,
+                                    value: item.value
+                                }))
+                                setSource(source);
+                            }
+                        })
+                    }
+                }
+            })
+        }
+    }, [propertyCode]);
+
+
+    return (
+        <Select
+            {...restProps}
+            value={value}
+            allowClear
+            style={{width: '100%'}}
+            onChange={(v: any) => {
+                onChange(v);
+            }}
+        >
+            {source.map((res) => {
+                return <Select.Option value={res.value}>{res.text}</Select.Option>;
+            })}
+        </Select>
+    );
+};
+
+export default ItemPropertySelector;

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,6 +361,10 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
             mappingValueField: 'itemCode',
             sourceName: 'qp-itemCode-in',
             specialBracket: true,
+            otherParams: {
+              'ownOrgSign': getCurrentTargetBgId(),
+              'ctl-count': true
+            }, // 默认参数
           },
         }
       } },
@@ -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-name-like', label: '商品名称(SPU)' },
+      { name: 'qp-itemCode-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
     }
   }

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

@@ -54,7 +54,7 @@ export default () => {
       setValue(value)
     },
     selectBusinessType: 'supplier',
-    disabled: true,
+    // disabled: true,
   };
   
   const props2 = {
@@ -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

@@ -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/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%;