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

package/dist/plugin/TableColumnSetting/index.d.ts

@@ -38,14 +38,14 @@ declare class TableColumnSetting extends React.Component<TableColumnSettingProps
     } | {
         title: string;
         dataIndex: string;
-        render: (text: any, record: any) => JSX.Element;
+        render: (text: any, record: any) => React.JSX.Element;
         className?: undefined;
         width?: undefined;
     } | {
         title: string;
         dataIndex: string;
         className: string;
-        render: () => JSX.Element;
+        render: () => React.JSX.Element;
         width?: undefined;
     })[];
     showModal: () => void;
@@ -53,13 +53,13 @@ declare class TableColumnSetting extends React.Component<TableColumnSettingProps
     handleCancel: (e: React.MouseEvent<HTMLElement>) => void;
     handleTableHeadHidden: (title: string) => void;
     onSortEnd: ({ oldIndex, newIndex }: any) => void;
-    DraggableContainer: (props: any) => JSX.Element;
-    DraggableBodyRow: ({ className, style, ...restProps }: any) => JSX.Element;
+    DraggableContainer: (props: any) => React.JSX.Element;
+    DraggableBodyRow: ({ className, style, ...restProps }: any) => React.JSX.Element;
     onChange: (e: any, title: any) => void;
     handleReset: () => void;
     handleResetSetting: () => Promise<unknown>;
     onSearch: (e: any) => void;
     onSearchSort: (e: any) => void;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }
 export default TableColumnSetting;

package/dist/utils/TableUtils.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import moment from 'moment';
 type mediaListType = {
     type: number;
@@ -48,24 +49,24 @@ declare const updateGuanDate: (requestParams: any, dateKeyParams?: any) => {
     };
     submit: any;
 };
-declare const textIcon: (type: string | number, text?: string) => JSX.Element | undefined;
-declare const handleTextDoubleOrId: (textOne: string | undefined, textTwo: string | undefined) => JSX.Element;
-declare const handleTextDouble: (textOne: string | undefined, textTwo: string | undefined) => JSX.Element;
-declare const handleTextOverflow: (text: string | undefined, width?: number) => JSX.Element;
-declare const handleTextLineFeed: (text: string | undefined, width?: number) => JSX.Element;
-declare const handleTextTooltip: (text: any) => JSX.Element;
-declare const handleTextBreakSpaces: (text: any) => JSX.Element;
-declare const handleStatusBadge: (text: any, color: any) => JSX.Element;
-declare const HandleTotalCount: (totalParams: any) => JSX.Element;
+declare const textIcon: (type: string | number, text?: string) => React.JSX.Element | undefined;
+declare const handleTextDoubleOrId: (textOne: string | undefined, textTwo: string | undefined) => React.JSX.Element;
+declare const handleTextDouble: (textOne: string | undefined, textTwo: string | undefined) => React.JSX.Element;
+declare const handleTextOverflow: (text: string | undefined, width?: number) => React.JSX.Element;
+declare const handleTextLineFeed: (text: string | undefined, width?: number) => React.JSX.Element;
+declare const handleTextTooltip: (text: any) => React.JSX.Element;
+declare const handleTextBreakSpaces: (text: any) => React.JSX.Element;
+declare const handleStatusBadge: (text: any, color: any) => React.JSX.Element;
+declare const HandleTotalCount: (totalParams: any) => React.JSX.Element;
 declare const handleCommonTimeRender: (text: any, format?: any) => any;
-declare const handleTooltip: (text: any, timeTrue?: boolean) => JSX.Element;
-declare const handleTooltipHours: (text: any, timeTrue?: boolean) => JSX.Element;
+declare const handleTooltip: (text: any, timeTrue?: boolean) => React.JSX.Element;
+declare const handleTooltipHours: (text: any, timeTrue?: boolean) => React.JSX.Element;
 type tableColumnsImageType = {
     width?: number | string;
     height?: number | string;
     [key: string]: any;
 };
-declare const tableColumnsImage: (url?: string, paramsObj?: tableColumnsImageType) => JSX.Element;
+declare const tableColumnsImage: (url?: string, paramsObj?: tableColumnsImageType) => React.JSX.Element;
 interface ColumnsEditInterfave {
     text?: string;
     record?: any;
@@ -81,7 +82,7 @@ interface ColumnsEditInterfave {
     };
     [key: string]: any;
 }
-declare const ColumnsEdit: (props: ColumnsEditInterfave) => JSX.Element;
+declare const ColumnsEdit: (props: ColumnsEditInterfave) => React.JSX.Element;
 type UserColumnsType = {
     name: string;
     department?: string;
@@ -89,13 +90,13 @@ type UserColumnsType = {
     company?: string;
     avatar?: string;
 };
-declare const userColumns: (props: UserColumnsType) => JSX.Element;
-declare const userInfoCard: (props: any) => JSX.Element;
+declare const userColumns: (props: UserColumnsType) => React.JSX.Element;
+declare const userInfoCard: (props: any) => React.JSX.Element;
 declare const getItemDefaultWidth: (item: any) => number;
-declare const sulaTableRenderTooltip: ({ text }: any) => JSX.Element;
+declare const sulaTableRenderTooltip: ({ text }: any) => React.JSX.Element;
 declare const renderNumberText: ({ text }: any) => any;
 declare const renderFixed2: (text: any) => any;
-declare const handleTextWarpCustom: (text: any, style?: {}) => JSX.Element;
+declare const handleTextWarpCustom: (text: any, style?: {}) => React.JSX.Element;
 declare const calculateValidPeriod: (start: any, end: any) => string;
-declare const handleTextWarp: (text: any) => JSX.Element;
+declare const handleTextWarp: (text: any) => React.JSX.Element;
 export { getSkuImg, updateGuanDate, textIcon, handleTextDoubleOrId, handleTextDouble, handleTextOverflow, handleTextLineFeed, handleTextTooltip, handleTextBreakSpaces, handleStatusBadge, HandleTotalCount, handleTooltip, handleCommonTimeRender, handleTooltipHours, tableColumnsImage, ColumnsEdit, userColumns, userInfoCard, getItemDefaultWidth, renderNumberText, sulaTableRenderTooltip, renderFixed2, handleTextWarpCustom, handleTextWarp, calculateValidPeriod };

package/dist/utils/utils.d.ts

@@ -31,44 +31,3 @@ export declare const randomString: (len?: any) => string;
 export declare const createUniqID: (length: any) => string;
 export declare const handleConvertResponse: (items: any, total: number) => object;
 export declare const noEmptyArray: (targetObj: any) => boolean;
-export declare const formContainerAndItemLayout: (type: string, title: any, name: string) => {
-    container: {
-        type: string;
-        props: {
-            title: any;
-            id: number;
-            level: number;
-            name: string;
-            bordered?: undefined;
-            isWhiteCard?: undefined;
-        };
-    };
-    itemLayout: {
-        span: number;
-        labelCol: {
-            span: number;
-        };
-        wrapperCol: {
-            span: number;
-        };
-    };
-} | {
-    container: {
-        type: string;
-        props: {
-            title: any;
-            id: number;
-            level: number;
-            bordered: null;
-            isWhiteCard: boolean;
-            name: string;
-        };
-    };
-    itemLayout: {
-        wrapperCol: {
-            span: number;
-        };
-        span?: undefined;
-        labelCol?: undefined;
-    };
-};

package/package.json

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

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

@@ -1198,12 +1198,84 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       sourceName: 'warehouseIds',
       ...requestConfigProp,
     }
+    const queryHeaderParams  = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
+    Promise.all([
+      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 channelDisabledJude = (data: any) => data['parentCode'] === '0'; // 所属销售渠道 树节点不能点判断
+      const areaDisabledJude = (data: any) => data['parent'] === '0'; // 所属营销区域 树节点不能点判断
+      formatTreeDataSource(x, 0, 4, tableSearchForm, ['code','name'], 'channelInfoSon', channelDisabledJude)
+      formatTreeDataSource(x, 1, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude)
+    })
     tableSearchForm = [
       { name: 'realWarehouseName*multiInput', label: '逻辑仓名称', type: 'multipleQueryInput' },
       { name: 'realWarehouseCode*multiInput', label: '逻辑仓编码', type: 'multipleQueryInput' },
       { name: 'qp-realWarehouseType-eq', type: 'select', label: '逻辑仓类型', initialSource: getDictionarySource('SC00004')  },
       { name: 'belongArea', field: {type: 'select', props: {mode: 'multiple',}}, label: '管理大区', initialSource: getDictionarySource('BUSINESS_belongArea'),   },
-      ...(modalTableBusProps?.needStatusSearch?[{ name: 'qp-isEnable-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',
+          },
+        }
+      },
+      {
+        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',
+          },
+        }
+      },
+      {
+        name: 'qp-type-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,
+          },
+        },
+        initialSource: getDictionarySource('BUSINESS_StoreType')
+      },
+      ...(modalTableBusProps?.needStatusSearch?[{ name: 'qp-isEnable-eq', type: 'select', label: '逻辑仓状态', initialSource: getDictionarySource('SC00001')  }]:[]),
     ]
     modalTableProps = {
       modalTableTitle: '选择逻辑仓',
@@ -1230,10 +1302,29 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           defaultSort: 3,
           render: (text: number) => getDictionaryTextByValue('SC00004', text),
         },
+        {
+          title: '所属销售渠道',
+          dataIndex: 'channelName',
+          defaultSort: 4,
+          width: 100,
+        },
+        {
+          title: '营销区域',
+          dataIndex: 'commonRelationAreaName',
+          defaultSort: 5,
+          width: 100,
+        },
+        {
+          title: '店铺性质',
+          dataIndex: 'type',
+          defaultSort: 6,
+          render: (text: any) => getDictionaryTextByValue('BUSINESS_StoreType', text),
+          width: 80,
+        },
         ...(modalTableBusProps?.needStatusSearch?[{
           title: '状态',
           dataIndex: 'isEnable',
-          defaultSort: 4,
+          defaultSort: 7,
           render: (text: number) => getDictionaryTextByValue('SC00001', text),
         }]:[]),
       ],

package/src/index.ts

@@ -48,5 +48,3 @@ export { default as RuleSetter} from './components/Solution/RuleSetter';
 export { default as ExtendedCollapse } from './components/Common/ExtendedCollapse';
 export { default as Section } from './components/Common/Section';
 export { default as ParagraphCopier } from './components/Common/ParagraphCopier';
-
-export { default as SystemLog } from './components/Business/SystemLog';

package/src/utils/utils.ts

@@ -267,44 +267,4 @@ export const handleConvertResponse = (items: any, total: number): object => {
 
 export const noEmptyArray = (targetObj: any) => {
   return Array.isArray(targetObj) && targetObj.length !== 0;
-};
-
-export const formContainerAndItemLayout = (type: string, title: any, name: string) => {
-  return type === 'form' ? {
-    container: {
-      type: 'card',
-      props: {
-        title,
-        id: Math.random(),
-        level: 1,
-        name
-      },
-    },
-    itemLayout: {
-      span: 8, // span表示每项所占的栅格数
-      labelCol: {
-        span: 8,
-      },
-      wrapperCol: {
-        span: 18,
-      },
-    },
-  } : {
-    container: {
-      type: 'card',
-      props: {
-        title,
-        id: Math.random(),
-        level: 1,
-        bordered: null,
-        isWhiteCard: true,
-        name
-      },
-    },
-    itemLayout: {
-      wrapperCol: {
-        span: 0,
-      },
-    },
-  }
-}
+};

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

@@ -1,78 +0,0 @@
-declare const SystemLog: ({ modeType, code, containerName, renderLogRef, extraParams, }: {
-    modeType: string;
-    code: any;
-    containerName: string;
-    renderLogRef: object;
-    extraParams?: object | undefined;
-}) => {
-    initialVisible: boolean;
-    fields: {
-        name: string;
-        label: boolean;
-        itemLayout: {
-            span: number;
-            labelCol: {
-                span: number;
-            };
-            wrapperCol: {
-                span: number;
-            };
-        };
-        field: (ctx: any) => any;
-    }[];
-    container: {
-        type: string;
-        props: {
-            title: any;
-            id: number;
-            level: number;
-            name: string;
-            bordered?: undefined;
-            isWhiteCard?: undefined;
-        };
-    };
-    itemLayout: {
-        span: number;
-        labelCol: {
-            span: number;
-        };
-        wrapperCol: {
-            span: number;
-        };
-    };
-} | {
-    initialVisible: boolean;
-    fields: {
-        name: string;
-        label: boolean;
-        itemLayout: {
-            span: number;
-            labelCol: {
-                span: number;
-            };
-            wrapperCol: {
-                span: number;
-            };
-        };
-        field: (ctx: any) => any;
-    }[];
-    container: {
-        type: string;
-        props: {
-            title: any;
-            id: number;
-            level: number;
-            bordered: null;
-            isWhiteCard: boolean;
-            name: string;
-        };
-    };
-    itemLayout: {
-        wrapperCol: {
-            span: number;
-        };
-        span?: undefined;
-        labelCol?: undefined;
-    };
-};
-export default SystemLog;

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

@@ -1,37 +0,0 @@
----
-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

@@ -1,87 +0,0 @@
-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