@bit-sun/business-component 4.0.13-alpha.8 → 4.2.0-alpha.0

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

@@ -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) => {
@@ -520,7 +520,7 @@ export default () => {
     //   needStatusSearch: true
     // },
     selectProps,
-    selectBusinessType: 'brand',
+    selectBusinessType: 'realWarehouse',
   };
 
   const onTabChange = (key) => {

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

@@ -1,5 +1,6 @@
 import request from '@/utils/request';
 import { message } from 'antd';
+import { uniqBy } from 'lodash';
 import { stringify } from 'querystring';
 import ENUM from '@/utils/enumConfig';
 import { judgeIsRequestError } from '@/utils/requestUtils';
@@ -55,10 +56,11 @@ const getDictionaryTextByValue = (dicCode: string, value: string | number) => {
   return dicItemArray[0].text;
 };
 
-const loadSelectSource = (url: string, params?: any) => {
+const loadSelectSource = (url: string, params?: any,options?:any) => {
+  const realOptions = options || {};
   return new Promise((resolve, reject) => {
     request
-      .get(`${url}?${stringify(params)}`)
+      .get(`${url}?${stringify(params)}`, realOptions)
       .then((result: any) => {
         result = result.data;
         if (judgeIsRequestError(result)) {
@@ -79,7 +81,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':
@@ -125,4 +127,24 @@ const getFieldIndex = (tableSearchForm: any, name: string) =>{
   return tableSearchForm.findIndex((i: any) => i.name.includes(name));
 }
 
-export { getDictionarySource, getDictionaryTextByValue, loadSelectSource, handleDefaultPrefixUrl, handleHiddenFields, handleHiddenFieldsRequest, getFieldIndex }
+// 获取选择器-弹窗中-下拉框查询接口-头部的请求头
+const getQueryHeadersList = (params: any) => {
+  const { defaultQSHL = [], querySelectHeadersList = [], extralHeaders = {} } = params;
+
+  const realQSHL = uniqBy([...querySelectHeadersList, ...defaultQSHL],'queryKey')||[]; // 去重,保留最先出现的元素，故defaultQSHL需要放在后面
+
+
+  let result: any = {};
+  realQSHL.forEach((item: any) => {
+    const { queryKey, isOpen, extralHeaders:QSH } = item;
+    if (isOpen && queryKey) {
+      result[queryKey] = { headers: { ...extralHeaders, ...(QSH || {}) } };
+    }
+  });
+
+  return result;
+}
+
+const getQueryHeadersItem = (queryHeaders: any, queryKey: any) => queryHeaders?.[queryKey] || {};
+
+export { getDictionarySource, getDictionaryTextByValue, loadSelectSource, handleDefaultPrefixUrl, handleHiddenFields, handleHiddenFieldsRequest, getFieldIndex, getQueryHeadersList, getQueryHeadersItem }

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

@@ -67,9 +67,10 @@ class SortableTable extends React.Component<SortTableProps> {
     onSearchSort: false,
   };
 
-  patchUserColumnConfig = (config: any) => {
+  patchUserColumnConfig = (config: any, tableCodes: any) => {
     const { tableCode, appRequestConfig }: any = this.props;
-    if (!tableCode) return;
+    const newTableCode = tableCodes || tableCode;
+    if (!newTableCode) return;
     let configvalue = config ? config.map((item:any) => ({
       key: item.key || item.dataIndex,
       dataIndex: item.dataIndex || item.key,
@@ -82,21 +83,22 @@ class SortableTable extends React.Component<SortTableProps> {
       url: handleRequestUrl('/user','/appConfig/saveUserOrder',appRequestConfig),
       method:'POST',
       data: {
-        "code": tableCode,
+        "code": newTableCode,
         "detail": configvalue ? JSON.stringify(configvalue) : ''
       },
     }).then((res:any) => {
       if (judgeIsRequestSuccess(res?.data)) {
-        this.patchConfigToLocalstorage(configvalue, tableCode)
+        this.patchConfigToLocalstorage(configvalue, newTableCode, config)
       } else {
         message.error('保存表头列自定义失败，请稍后尝试');
       }
     })
   }
 
-  patchConfigToLocalstorage = (configvalue:any, tableCode:string) => {
+  patchConfigToLocalstorage = (configvalue:any, tableCode:string, newDataSource: any) => {
     const { setShowColumns, datasource = [] }: any = this.props;
     const { sortDataSource } = this.state;
+    const sourceList = newDataSource || sortDataSource;
     let config = localStorage.getItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION) || '[]'
     let configArray = JSON.parse(config)
     let currentSetting = configArray.filter((item:any) => item.code === tableCode)
@@ -114,7 +116,7 @@ class SortableTable extends React.Component<SortTableProps> {
       visible: false,
     });
     if (configvalue) {
-      setShowColumns([...sortDataSource]);
+      setShowColumns([...sourceList]);
     } else {
       this.setState({
         dataSource: [
@@ -175,15 +177,28 @@ class SortableTable extends React.Component<SortTableProps> {
     return preKeyStr !== nextKeyStr;
   }
 
+  // 提取逻辑到单独的方法
+  validateLocalStorageConfig = (datasource: any, tableCode: string) => {
+    let config = localStorage.getItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION) || '[]';
+    let configArray = JSON.parse(config);
+    let currentSetting = configArray.filter((item:any) => item.code === tableCode);
+    let configvalue = currentSetting?.[0]?.detail ? JSON.parse(currentSetting[0].detail) : [];
+    if (currentSetting.length === 0 || configvalue.length === 0 ) {
+      this.patchUserColumnConfig(datasource || [], tableCode);
+    }
+  }
+
   componentWillReceiveProps(nextProps: any) {
     if (this.isColumnsChange(this.props?.datasource, nextProps?.datasource)) {
       this.setInitValue(nextProps?.datasource || []);
+      this.validateLocalStorageConfig(nextProps?.datasource, nextProps?.tableCode);
     }
   }
 
   componentDidMount() {
-    const { datasource = [] }: any = this.props;
+    const { datasource = [], tableCode }: any = this.props;
     this.setInitValue(datasource);
+    this.validateLocalStorageConfig(datasource, tableCode);
   }
 
   columns = [
@@ -415,7 +430,7 @@ class SortableTable extends React.Component<SortTableProps> {
       visible: false,
     });
     setShowColumns([...sortDataSource]);
-    this.patchUserColumnConfig(sortDataSource)
+    this.patchUserColumnConfig(sortDataSource, null)
   };
 
   handleCancel = (e: React.MouseEvent<HTMLElement>) => {
@@ -476,7 +491,7 @@ class SortableTable extends React.Component<SortTableProps> {
   DraggableContainer = (props: any) => (
     <SortableBody
       useDragHandle
-      disableAutoscroll
+      lockAxis='y'
       helperClass="row-dragging"
       onSortEnd={this.onSortEnd}
       {...props}
@@ -487,9 +502,9 @@ class SortableTable extends React.Component<SortTableProps> {
     const { sortDataSource } = this.state;
     // function findIndex base on Table rowKey props and should always be a right array index
     const index = sortDataSource.findIndex(
-      (x:any) => x.key === restProps['data-row-key'],
+      (x) => (x.key||x.dataIndex) == restProps['data-row-key'],
     );
-    return <SortableItem index={index} {...restProps} />;
+    return <SortableItem key={restProps['data-row-key']} index={index} {...restProps} />;
   };
 
   onChange = (e: any, title: any) => {
@@ -854,6 +869,7 @@ class SortableTable extends React.Component<SortTableProps> {
                       row: this.DraggableBodyRow,
                     },
                   }}
+                  scroll={{ y: 364 }}
                 />
               </div>
             </div>

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

@@ -151,16 +151,18 @@
     }
   }
 
-  .ant-table-wrapper::-webkit-scrollbar {
+  .ant-table-tbody::-webkit-scrollbar {
     display: none;
   }
 
   .ant-table-wrapper {
     margin-top: 10px;
-    height: 364px;
-    overflow: scroll;
     padding-bottom: 50px;
 
+    tbody tr:first-child {
+      display: none;
+    }
+
     tr {
       height: 30px;
       td {

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

@@ -36,6 +36,7 @@ export default () => {
         ellipsis: {
           showTitle: false,
         },
+        showTotal: true,
       },
       {
         dataIndex: 'spuCode',
@@ -111,7 +112,7 @@ export default () => {
       x: '100%',
     },
     rowKey: 'id',
-    dataSource: [{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{}],
+    dataSource: [{"id": 1},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{}],
     pagination: {
       showTotal: (total: any) => `共 ${total} 条`,
       showQuickJumper: true,
@@ -182,113 +183,182 @@ export default () => {
 ## sula列设置表格
 
 ```tsx
-import React, { useState } from 'react';
+import React, { useState, Fragment, } from 'react';
+import { Segmented } from 'antd';
 import { SulaColumnSettingTable } from '../../../index.ts';
 
 export default () => {
   const settingTableRef = React.useRef(null);
-  const columns = [
-      {
-        dataIndex: 'lineNo',
-        title: '行号',
-        width: 80,
-        fixed: 'left',
-        ellipsis: {
-          showTitle: false,
-        },
-      },
-      {
-        dataIndex: 'skuName',
-        title: '商品名称',
-        fixed: 'left',
-        ellipsis: {
-          showTitle: false,
-        },
-      },
-      {
-        dataIndex: 'spuCode',
-        title: '商品代码',
-        fixed: 'left',
-        ellipsis: {
-          showTitle: true,
-        },
-      },
-      {
-        dataIndex: 'skuCode',
-        title: 'SKU',
-        fixed: 'left',
-        ellipsis: {
-          showTitle: true,
-        },
-      },
-      {
-        dataIndex: 'skuSpec',
-        title: '商品规格',
-        ellipsis: {
-          showTitle: false,
-        },
-      },
-      {
-        dataIndex: 'barCode',
-        title: '条码',
-        ellipsis: {
-          showTitle: false,
-        },
-      },
-      {
-        dataIndex: 'executeAmount',
-        title: '可执行数量',
-      },
-      {
-        dataIndex: 'planAmount',
-        title: '数量',
-        ellipsis: {
-          showTitle: false,
-        },
-      },
-      {
-        dataIndex: 'baseUnitCode',
-        title: '单位',
-        ellipsis: {
-          showTitle: false,
-        },
-      },
-      {
-        dataIndex: 'completeAmount',
-        title: '累计入库数量',
-      },
-      {
-        dataIndex: 'reverseNumber',
-        title: '累计退货数量',
-      },
-      {
-        dataIndex: 'taxRate',
-        title: '税率',
-      },
-      {
-        dataIndex: 'taxAmount',
-        title: '税额',
-      },
-      {
-        dataIndex: 'standardPrice',
-        title: '标准单价',
-      },
-      {
-        key: 'createUserName',
-        title: '操作人',
-      },
-      {
-        key: 'remark',
-        title: '备注',
-        textOverflow: true,
+  const [inputModel, setInputModel] = useState('整款模式'); // 录入模式
+  
+  const skuDetailColumns = [
+    {
+      title: '商品编码',
+      dataIndex: 'itemCode',
+      key: 'itemCode',
+      width: 120,
+    },
+    {
+      title: '商品名称',
+      dataIndex: 'itemName',
+      key: 'itemName',
+      width: 80,
+    },
+    {
+      key: 'skuCode',
+      dataIndex: 'skuCode',
+      title: 'SKU',
+      width: 160,
+      ellipsis: {
+        showTitle: false,
       },
-      {
-        key: 'operator',
-        title: '操作',
-        isPermissionColumn: true,
-        fixed: 'right',
-      }
-    ]
+    },
+    {
+      title: '图片',
+      dataIndex: ['mediaList', '0', 'url'],
+      images: true,
+      width: 60,
+    },
+    { title: '颜色', dataIndex: 'colorName', key: 'colorName', width: 100 },
+    { title: '尺码', dataIndex: 'sizeName', key: 'sizeName', width: 60 },
+    {
+      key: 'unitCode',
+      dataIndex: 'unitCode',
+      title: '单位',
+      width: 60
+    },
+    // ...showPropertyList,
+    {
+      key: 'salemanName',
+      dataIndex: 'salemanName',
+      title: '导购',
+      width: 120,
+    },
+    {
+      key: 'quantity',
+      dataIndex: 'quantity',
+      title: '数量',
+      align: 'right',
+      width: 70,
+    },
+    {
+      key: 'labelPrice',
+      dataIndex: 'labelPrice',
+      title: '吊牌价',
+      align: 'right',
+      width: 70,
+    },
+    {
+      key: 'money',
+      dataIndex: 'money',
+      title: '吊牌金额',
+      align: 'right',
+      width: 70,
+    },
+    {
+      key: 'realUnitPrice',
+      dataIndex: 'realUnitPrice',
+      title: '实际售价',
+      align: 'right',
+      width: 70,
+    },
+    {
+      key: 'discountRate',
+      dataIndex: 'discountRate',
+      title: '折扣率(%)',
+      align: 'right',
+      width: 100,
+    },
+    {
+      key: 'receivableMoney',
+      dataIndex: 'receivableMoney',
+      title: '实收金额',
+      align: 'right',
+      width: 100,
+    },
+    {
+      key: 'discountUnitPrice',
+      dataIndex: 'discountUnitPrice',
+      title: '优惠单价',
+      align: 'right',
+      width: 70,
+    },
+    {
+      key: 'discountMoney',
+      dataIndex: 'discountMoney',
+      title: '优惠金额',
+      align: 'right',
+      width: 100,
+    },
+    {
+      key: 'moneyDiffer',
+      dataIndex: 'moneyDiffer',
+      title: '抹零金额',
+      align: 'right',
+      width: 70,
+    },
+    
+    {
+      key: 'discountType',
+      dataIndex: 'discountType',
+      title: '优惠活动类型',
+      width: 120,
+    },
+    {
+      key: 'activityCode',
+      dataIndex: 'activityCode',
+      title: '活动编号',
+      width: 100,
+    },
+    {
+      key: 'column14',
+      dataIndex: 'column14',
+      title: '已发货数量',
+      align: 'right',
+      width: 70,
+    },
+    {
+      key: 'retQuantity',
+      dataIndex: 'retQuantity',
+      title: '已退数量',
+      align: 'right',
+      width: 70,
+    },
+    {
+      key: 'saleFlg',
+      dataIndex: 'saleFlg',
+      title: '销售方式',
+      width: 70,
+    },
+    {
+      key: 'returnReason',
+      dataIndex: 'returnReason',
+      title: '退货原因',
+      width: 100,
+    },
+  ];
+
+    const summary = () => {
+        return {
+          //diy: true,
+          cont: [
+            {
+              key: 'returnReason',
+              value: 0,
+            },
+          ],
+        };
+      };
+
+  // 表格字段控制
+  const getTableColumns = (inputModel: string, twoDimensions: string) => {
+    if(inputModel == 'SKU模式'){
+      return skuDetailColumns;
+    }else{
+      return [];
+    }
+  };
+
   const config = {
     modeType: 'view',
     rowKey: 'id',
@@ -297,7 +367,7 @@ export default () => {
       url: 'xxxxxx',
       converter: ({ data }: any) => {
         return {
-          list: [{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{}],
+          list: [{"id": 1},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{}],
           total: 40
         };
       },
@@ -313,37 +383,8 @@ export default () => {
     },
     rowSelection: {
     },
-    summary: () => {
-      return {
-        diy: true,
-        cont: [
-          {
-            key: 'spuCode',
-            value: 100,
-          },
-          {
-            key: 'skuSpec',
-            value: 200,
-          },
-          {
-            key: 'executeAmount',
-            value: 300,
-          },
-          {
-            key: 'completeAmount',
-            value: 300,
-          },
-          {
-            key: 'taxAmount',
-            value: 300,
-          },
-          {
-            key: 'standardPrice',
-            value: 300,
-          },
-        ],
-      }
-    },
+    isSpecial: true,
+    summary: summary,
     dynamicColumns: [
       {
         key: 'expectTime',
@@ -355,8 +396,31 @@ export default () => {
         key: 'price',
       },
     ],
-    columns,
+    columns: skuDetailColumns,
+    newUpdateSummary: 1,
+    isSpecial: true,
     tableCode: 'uniquecode-1',
+    actionsRender: [
+      {
+        position: 'right',
+        type: () => {
+          return (
+            <Fragment>
+              <Segmented
+                value={inputModel}
+                style={{ marginRight: 22 }}
+                onChange={(value: any) => {
+                  setInputModel(value)
+                }}
+                options={
+                  ['整款模式', 'SKU模式']
+                }
+              />
+            </Fragment>
+          );
+        },
+      },
+    ]
   }
   return (
     <SulaColumnSettingTable