@bit-sun/business-component 4.2.0-alpha.6.2 → 4.2.0-alpha.6.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "4.2.0-alpha.6.2",
+  "version": "4.2.0-alpha.6.4",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

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

@@ -13,7 +13,7 @@ const sharingTypeDataList = hasDictSharingType && getDictionarySource('UC000013'
 
 export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
   const { requestConfig:requestConfigProp={},  selectProps:selectConfigProps={}, modalTableProps:modalTableBusProps={}, hiddenFields=[]} = parentProps || {};
-  
+
   // 默认type === 'supplier' 供应商选择器
   let requestConfig = {
     init: true,
@@ -56,11 +56,11 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
     };
   };
   const formatTreeDataSource = (
-    reData: any, 
-    position: number, 
+    reData: any,
+    position: number,
     changePosition: number,
     changeSearchForm: any,
-    resKeyValue=['id', 'name'], 
+    resKeyValue=['id', 'name'],
     childrenKey = 'children',
     nodeDisabledJudge?: (data: any) => boolean, // 树节点能不能选 函数判断
   ) => {
@@ -344,7 +344,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
     }
     tableSearchForm =  [
       { name: 'qp-skuCode-in', label: 'SKU编码', field: {
-        type:'multipleQuerySearchSelect', 
+        type:'multipleQuerySearchSelect',
         props: {
           selectProps: {
             mode: "multiple",
@@ -366,7 +366,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       } },
       { name: 'qp-skuName-like', label: 'SKU名称' },
       { name: 'qp-itemCode-in', label: 'SPU编码', field: {
-        type:'multipleQuerySearchSelect', 
+        type:'multipleQuerySearchSelect',
         props: {
           selectProps: {
             placeholder: '请输入SPU编码查询'
@@ -733,9 +733,9 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
               option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
           },
         } },
-        { 
-          name: 'qp-year-in', 
-          label: '年份', 
+        {
+          name: 'qp-year-in',
+          label: '年份',
           field: {
             type: 'itemPropertySelector',
             props: {
@@ -744,9 +744,9 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
             }
           }
         },
-        { 
-          name: 'qp-season-in', 
-          label: '季节', 
+        {
+          name: 'qp-season-in',
+          label: '季节',
           field: {
             type: 'itemPropertySelector',
             props: {
@@ -755,9 +755,9 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
             }
           }
         },
-        { 
-          name: 'qp-zzdlbm-in', 
-          label: '大类', 
+        {
+          name: 'qp-zzdlbm-in',
+          label: '大类',
           field: {
             type: 'itemPropertySelector',
             props: {
@@ -766,9 +766,9 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
             }
           }
         },
-        { 
-          name: 'qp-zzzlbm-in', 
-          label: '中类', 
+        {
+          name: 'qp-zzzlbm-in',
+          label: '中类',
           field: {
             type: 'itemPropertySelector',
             props: {
@@ -777,9 +777,9 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
             }
           }
         },
-        { 
-          name: 'qp-zzxlbm-in', 
-          label: '小类', 
+        {
+          name: 'qp-zzxlbm-in',
+          label: '小类',
           field: {
             type: 'itemPropertySelector',
             props: {
@@ -1379,13 +1379,39 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
               option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
           },
         } },
-      ...(modalTableBusProps?.needStatusSearch?[{ name: 'qp-status-eq', type: 'select', label: '运营仓状态', initialSource: getDictionarySource('SC00001')  }]:[])
+        {
+        name: 'qp-channelCode-in', type: 'treeSelect', label: '销售渠道', field: {
+          type: 'treeSelect',
+          props: {
+            multiple: true,
+            treeData: [],
+            treeCheckable: false,
+            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,
+            showCheckedStrategy: 'TreeSelect.SHOW_ALL',
+          },
+        }
+      },
+      ...(modalTableBusProps?.needStatusSearch?[{ name: 'qp-status-eq', type: 'select', label: '运营仓状态', initialSource: getDictionarySource('SC00001')  }]:[]),
     ]
     const queryHeaderParams  = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
     Promise.all([
       loadSelectSource(`${prefixUrl.formSelectFix}/groupInfo/listNoPage`, { 'qp-status-eq': 1 },getQueryHeadersItem(queryHeaderParams,'qp-groupCode-in')),
+      loadSelectSource(`/channel-manage/channelInfo/tree`, {
+        'qp-status-eq': 10,
+        'qp-isMain-eq': 1,
+        'qp-type-in': '1,2',
+      },getQueryHeadersItem(queryHeaderParams,'qp-orgCode-in')),
     ]).then((x: any)=>{
       formatSource(x,0, 2, tableSearchForm,['groupCode','groupName']);
+      const channelDisabledJude = (data: any) => data['parentCode'] === '0'; // 所属销售渠道 树节点不能点判断
+      formatTreeDataSource(x, 1, 3, tableSearchForm, ['code','name'], 'channelInfoSon', channelDisabledJude)
     })
     modalTableProps = {
       modalTableTitle: '选择运营仓',
@@ -1417,6 +1443,12 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           defaultSort: 4,
           render: (text: number) => getDictionaryTextByValue('SC00001', text),
         }]:[]),
+         {
+          title: '所属销售渠道',
+          dataIndex: 'channelName',
+          defaultSort: 5,
+          width: 100,
+        },
       ],
       ...modalTableBusProps,
     }
@@ -1690,15 +1722,66 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
               option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
           },
         } },
-    ]
+        {
+        name: 'qp-saleChannel-in', type: 'treeSelect', label: '销售渠道', field: {
+          type: 'treeSelect',
+          props: {
+            multiple: true,
+            treeData: [],
+            treeCheckable: false,
+            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,
+            showCheckedStrategy: 'TreeSelect.SHOW_ALL',
+          },
+        }
+      },
+      {
+        name: 'qp-refCode-in', type: 'treeSelect', label: '营销区域', field: {
+          type: 'treeSelect',
+          props: {
+            multiple: true,
+            treeData: [],
+            treeCheckable: false,
+            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,
+
+            showCheckedStrategy: 'TreeSelect.SHOW_ALL',
+          },
+        }
+      },
+    ];
     const queryHeaderParams  = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
     Promise.all([
       loadSelectSource(`${prefixUrl.formSelectFix}/org/listNoPage`, {},getQueryHeadersItem(queryHeaderParams,'qp-createOrgCode-eq')),
+      loadSelectSource(`/channel-manage/channelInfo/tree`, {
+        'qp-status-eq': 10,
+        'qp-isMain-eq': 1,
+        'qp-type-in': '1,2',
+      },getQueryHeadersItem(queryHeaderParams,'qp-orgCode-in')),
+      loadSelectSource(`/channel-manage/tagNode/getTree/10`, {
+        'qp-status-eq': 1,
+      },getQueryHeadersItem(queryHeaderParams,'qp-orgCode-in')),
     ]).then((x: any)=>{
       const firstElement = x?.[0];
       const allList = firstElement && [firstElement, firstElement];
       formatSource(allList,0, 2, tableSearchForm);
       formatSource(allList,1, 3, tableSearchForm);
+      const channelDisabledJude = (data: any) => data['parentCode'] === '0'; // 所属销售渠道 树节点不能点判断
+      const areaDisabledJude = (data: any) => data['parent'] === '0'; // 所属营销区域 树节点不能点判断
+      formatTreeDataSource(x, 1, 4, tableSearchForm, ['code','name'], 'channelInfoSon', channelDisabledJude)
+      formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude)
     })
     modalTableProps = {
       modalTableTitle: '选择客户',
@@ -1728,6 +1811,19 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           title: '使用组织',
           dataIndex: 'salesOrgName',
           defaultSort: 4,
+          width: 100,
+        },
+         {
+          title: '所属销售渠道',
+          dataIndex: 'channelName',
+          defaultSort: 5,
+          width: 100,
+        },
+        {
+          title: '营销区域',
+          dataIndex: 'commonRelationAreaName',
+          defaultSort: 6,
+          width: 100,
         },
       ],
       ...modalTableBusProps
@@ -1995,7 +2091,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           optionFilterProp: 'children',
           filterOption: (input: string, option: { props: { children: string } }) =>
             option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
-        
+
           showCheckedStrategy: 'TreeSelect.SHOW_ALL',
         },
       } },
@@ -2013,7 +2109,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
             option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
         },
       } ,
-      initialSource: getDictionarySource('BUSINESS_StoreType') 
+      initialSource: getDictionarySource('BUSINESS_StoreType')
     },
     ]
     const queryHeaderParams  = getQueryHeadersList({ querySelectHeadersList, extralHeaders});

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

@@ -0,0 +1,37 @@
+---
+nav:
+  title: '组件'
+  order: 1
+group:
+  title: 业务组件
+  order: 1
+title: 日志组件
+order: 1
+---
+
+# SystemLog
+
+
+## 日志业务组件
+
+```tsx
+import React, { useState } from 'react';
+import { SystemLog } from '../../../index.ts';
+
+export default () => {
+  const [modeType, setModeType] = useState('view');
+  const renderLogRef = useRef<any>();
+
+  return {
+   fields: [
+      SystemLog({
+        modeType,
+        code: '123',
+        containerName: 'Test_Log_Info',
+        renderLogRef,
+        extraParams: {},
+      })
+    ],
+  };
+};
+```

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

@@ -0,0 +1,87 @@
+import { handleCommonTimeRender } from '@/utils/TableUtils';
+import { formContainerAndItemLayout, handleConvertResponse } from '@/utils/utils';
+import { Table as BsTable } from 'bssula';
+import React from 'react';
+
+//操作日志
+const SystemLog = ({
+  modeType,
+  code,
+  containerName,
+  renderLogRef = {},
+  extraParams = {},
+}: {
+  modeType: string,
+  code: any
+  containerName: string,
+  renderLogRef: object,
+  extraParams?: object,
+}) => {
+  return {
+    ...formContainerAndItemLayout('table', '操作日志', containerName),
+    initialVisible: modeType != 'create',
+    fields: [
+      {
+        name: 'table',
+        label: false,
+        itemLayout: {
+          span: 24,
+          labelCol: {
+            span: 0,
+          },
+          wrapperCol: {
+            span: 24,
+          },
+        },
+        field: (ctx: any) => {
+          return code && <BsTable
+            remoteDataSource={{
+              url: `/oms-ops/logInfo?qp-businessCode-eq=${code}`,
+              convertParams: ({ params }: any) => {
+                return {
+                  pageSize: params.pageSize,
+                  currentPage: params.current,
+                  ...extraParams,
+                };
+              },
+              converter: ({ data }: any) => {
+                return {
+                  ...handleConvertResponse(data.list, data.total || data.totalCount),
+                };
+              },
+            }}
+            columns={[
+              {
+                title: '操作人',
+                dataIndex: 'handlerName',
+              },
+              {
+                title: '操作名称',
+                dataIndex: 'handlerType',
+              },
+              {
+                title: '操作时间',
+                dataIndex: 'handlerTime',
+                render: ({ text }: { text: any }) => handleCommonTimeRender(text)
+              },
+              {
+                title: '操作内容',
+                dataIndex: 'logcontent',
+              },
+            ]}
+            style={{ width: '100%', marginTop: '-16px', padding: '0px' }}
+            rowKey="id"
+            scroll={{ x: 'max-content' }}
+            pagination={{
+              showTotal: (total: any) => `共 ${total} 条`,
+              showQuickJumper: true,
+              hideOnSinglePage: true,
+            }}
+            ref={renderLogRef}
+          />
+        },
+      },
+    ],
+  }
+}
+export default SystemLog

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

@@ -1,3 +1,4 @@
+// @ts-nocheck
 import React, { useState } from 'react';
 import { Table, Tooltip, Typography } from 'antd';
 import { Resizable } from 'react-resizable';
@@ -81,9 +82,9 @@ export default class ColumnSettingTable extends React.Component {
 
   /**
      * 新增函数，用于根据传入的小数位数进行四舍五入
-     * @param number 
-     * @param decimalPlaces 
-     * @returns 
+     * @param number
+     * @param decimalPlaces
+     * @returns
      */
   roundToDecimalPlaces = (number: any, decimalPlaces: number) => {
     const factor = Math.pow(10, (decimalPlaces || 2));
@@ -92,7 +93,7 @@ export default class ColumnSettingTable extends React.Component {
 
   /**
    * 合计行逻辑
-   * @returns 
+   * @returns
    */
   getTableSummaryInfo = () => {
     const { summary = undefined, rowSelection, expandable, modeType, dataSource, isSpecial = false, }: any = this.props;
@@ -232,7 +233,7 @@ export default class ColumnSettingTable extends React.Component {
 
   /**
    * 处理行点击事件
-   * @param record 
+   * @param record
    */
   handleRowClick = (record: any) => {
     const { selectedRowKeys, selectedRows, } = this.state;
@@ -316,7 +317,7 @@ export default class ColumnSettingTable extends React.Component {
         ...propRowSelection,
         selectedRowKeys: this.state.selectedRowKeys,
         onChange: (selectedRowKeys: any, selectedRows: any) => {
-            this.setState({ 
+            this.setState({
                 selectedRowKeys,
                 selectedRows
             });

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

@@ -1,3 +1,4 @@
+// @ts-nocheck
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { Table as SulaTable, request } from 'bssula';
 import { Resizable } from 'react-resizable';
@@ -22,7 +23,7 @@ export default class ColumnSettingSulaTable extends React.Component {
       showColumns: [],
       selectedRowKeys: [], // 新增状态，用于跟踪选中的行的键
       selectedRows: [],
-      showSummary: null 
+      showSummary: null
     }
     this.sulaTableRef = React.createRef<any>();
   }
@@ -79,9 +80,9 @@ export default class ColumnSettingSulaTable extends React.Component {
 
   /**
    * 新增函数，用于根据传入的小数位数进行四舍五入
-   * @param number 
-   * @param decimalPlaces 
-   * @returns 
+   * @param number
+   * @param decimalPlaces
+   * @returns
    */
   roundToDecimalPlaces = (number: any, decimalPlaces: number) => {
     const factor = Math.pow(10, (decimalPlaces || 2));
@@ -90,7 +91,7 @@ export default class ColumnSettingSulaTable extends React.Component {
 
   /**
    * 合计行逻辑
-   * @returns 
+   * @returns
    */
   getTableSummaryInfo = () => {
     const { summary = undefined, rowSelection, expandable, isSpecial = false, modeType }: any = this.props;
@@ -167,10 +168,10 @@ export default class ColumnSettingSulaTable extends React.Component {
         </Table.Summary.Row>
       </Table.Summary>
     );
-    
+
     return () => summaryDom;
-  }; 
-  
+  };
+
   handledynamicColumns = (col: any[]) => {
     let { dynamicColumns, modeType }: any = this.props;
     col = col.map((item: any) => {
@@ -205,7 +206,7 @@ export default class ColumnSettingSulaTable extends React.Component {
 
   ResizeableTitle = (props: any) => {
     const { onResize, width, ...restProps } = props;
-    
+
     const [innerWidth, setInnerWidth] = useState(width);
     const [isResizing, setIsResizing] = useState(false); // 标记是否正在拖拽
     const [isDragging, setIsDragging] = useState(false); // 标记拖拽句柄是否被拖拽
@@ -213,9 +214,9 @@ export default class ColumnSettingSulaTable extends React.Component {
     const markerPosition = useRef({ left: 0, top: 0 });
     const currentStart = useRef(0);
     const uuidref = useRef(uuid());
-    
+
     const prevWidthRef = useRef(width);
-  
+
     const handleMouseDown = (e: any) => {
       currentStart.current = e.clientX;
       markerPosition.current = { left: e.clientX, top: e.clientY }
@@ -223,35 +224,35 @@ export default class ColumnSettingSulaTable extends React.Component {
       document.addEventListener('mousemove', handleMouseMove);
       document.addEventListener('mouseup', handleMouseUp);
     };
-  
+
     const handleMouseMove = (e: any) => {
       e.stopPropagation();
       e.preventDefault();
       // 更新标记位置
       markerPosition.current = { left: e.clientX, top: e.clientY }
       const dom: HTMLElement | null =  document.getElementById('text1');
-  
+
       if (dom && dom.style) {
         dom.style.left = `${e.clientX}px`;
         dom.style.top = `${e.clientY - 20}px`;
       }
     };
-  
+
     const handleMouseUp = (e: any) => {
       document.removeEventListener('mousemove', handleMouseMove);
       document.removeEventListener('mouseup', handleMouseUp);
       setIsResizing(false);
     };
-    
+
     const handleresize = (e: any, data: any, title: string) => {
       const newWidth = data?.size?.width || 0;
       setInnerWidth(newWidth); // 更新内部分宽度
     };
-  
+
     const handleResizeStart = () => {
       setIsResizing(true);
     };
-  
+
     const handleResizeStop = (e: any, data: any) => {
       setIsResizing(false);
       if (onResize) {
@@ -265,11 +266,11 @@ export default class ColumnSettingSulaTable extends React.Component {
         setInnerWidth(width);
       }
     }, [width]);
-  
+
     const thStyle = {
       boxShadow: isResizing ? '2px 2px 10px rgba(0, 0, 0, 0.3)' : 'none',
     };
-  
+
     return (
       <Resizable
         width={innerWidth}
@@ -333,7 +334,7 @@ export default class ColumnSettingSulaTable extends React.Component {
 
   /**
    * 处理行点击事件
-   * @param record 
+   * @param record
    */
   handleRowClick = (record: any) => {
     const { selectedRowKeys, selectedRows, } = this.state;
@@ -420,7 +421,7 @@ export default class ColumnSettingSulaTable extends React.Component {
         ...propRowSelection,
         selectedRowKeys: this.state.selectedRowKeys,
         onChange: (selectedRowKeys: any, selectedRows: any) => {
-            this.setState({ 
+            this.setState({
                 selectedRowKeys,
                 selectedRows
             });
@@ -436,7 +437,7 @@ export default class ColumnSettingSulaTable extends React.Component {
         };
       },
     }
-    
+
     return (
       <div style={{ position: 'relative' }}>
         <span style={{ position: 'absolute', zIndex: '10', right: '8px', top: '10px' }} className="ant-dropdown-link">

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

@@ -222,6 +222,98 @@ const AddSelect = (props: any) => {
               acc[key] = typeof value === 'function' ? value?.(record) : value;
               return acc;
             }, {});
+
+            // 可输入非数字字符
+            if(item.canInputString) {
+              return (
+                <InputNumber
+                  min={0}
+                  precision={0}
+                  controls={false}
+                  {...inputProps}
+                  value={text || ''}
+                  keyboard={false}
+                  onPressEnter={(e: any) => {
+                    e.target.blur();
+                  }}
+                  onBlur={async (e: any) => {
+                    const {
+                      target: { value },
+                    } = e;
+                    record[item.dataIndex] = value
+                    editRecord(record)
+                  }}
+                  onKeyDown={(e) => {
+                    if(e.keyCode === 13 && e.ctrlKey) {
+                      handleOk(true)
+                      document.getElementById("first-query")?.focus()
+                    }
+                    if(e.keyCode === 8 && e.ctrlKey) {
+                      message.success('删除当前行')
+                      e.stopPropagation();
+                      e.preventDefault();
+                      let dom = e.nativeEvent.path[5].children[index + 2]?.getElementsByTagName('input')[currentIndex]
+                      if (dom) {
+                        dom.select();
+                        dom.focus();
+                        dom.scrollIntoView(false)
+                      }
+                      dom = null
+                      deleteRecord(record, popvalue);
+                    }
+                    if (e.keyCode === 37 && e.shiftKey) {   // 左滑动
+                      e.stopPropagation();
+                      e.preventDefault();
+                      let dom = e.nativeEvent.path[5].children[index + 1]?.getElementsByTagName('input')[currentIndex - 1]
+                      if (dom) {
+                        dom.select();
+                        dom.focus();
+                        dom.scrollIntoView(false)
+                      }
+                      dom = null
+                    }
+                    if (e.keyCode === 39 && e.shiftKey) {  //  右滑
+                      e.stopPropagation();
+                      e.preventDefault();
+                      let dom = e.nativeEvent.path[5].children[index + 1]?.getElementsByTagName('input')[currentIndex + 1]
+                      if (dom) {
+                        dom.select();
+                        dom.focus();
+                        dom.scrollIntoView(false)
+                      }
+                      dom = null
+                    }
+                    if (e.keyCode === 40) {
+                      e.stopPropagation();
+                      e.preventDefault();
+                      let dom = e.nativeEvent.path[5].children[index + 2]?.getElementsByTagName('input')[currentIndex]
+                      if (dom) {
+                        dom.select();
+                        dom.focus();
+                        dom.scrollIntoView(false)
+                      }
+                      dom = null
+                    } else if (e.keyCode === 38) {
+                      e.stopPropagation();
+                      e.preventDefault();
+                      let dom1 = e.nativeEvent.path[5].children[index]?.getElementsByTagName('input')[currentIndex]
+                      if (dom1) {
+                        // dom1.value=""
+                        // dom1.setSelectionRange(100, 0);
+                        dom1.select();
+                        dom1.focus();
+                        dom1.scrollIntoViewIfNeeded(false)
+                        // dom1.value=record['count']
+                      }
+                      dom1 = null
+                    } else if (e.keyCode === 9 && index === selectedRowKeys.length - 1 && currentIndex === inputLength - 1) {
+                      e.stopPropagation();
+                      e.preventDefault();
+                    }
+                  }}
+                />
+              );
+            }
             
             return (
               <InputNumber