@bit-sun/business-component 4.2.0-alpha.2 → 4.2.0-alpha.4

package/dist/utils/TableUtils.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 import moment from 'moment';
 type mediaListType = {
     type: number;
@@ -49,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;
@@ -82,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;
@@ -90,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/package.json

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

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

@@ -20,7 +20,6 @@ import { arrayMoveImmutable } from 'array-move';
 import close from '../../../assets/close.svg';
 import drag from '../../../assets/drag.svg';
 import shezhi from '../../../assets/icon-shezhi.svg';
-import shezhi from '../../../assets/icon-shezhi.svg';
 import './index.less';
 import ENUM from '@/utils/enumConfig';
 import { handleRequestUrl, judgeIsRequestSuccess } from '@/utils/requestUtils';

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

@@ -42,8 +42,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
   }
 
   // 格式化树选择器数据源
-  const mapSearchTree = (treeDataItem: any, resKeyValue: any, disabledJudge?: any) => {
-    const haveChildren = Array.isArray(treeDataItem.children) && treeDataItem.children.length > 0;
+  const mapSearchTree = (treeDataItem: any, resKeyValue: any, disabledJudge?: any, childrenKey?: any) => {
+    const haveChildren = Array.isArray(treeDataItem[childrenKey]) && treeDataItem[childrenKey].length > 0;
     return {
       title: treeDataItem[resKeyValue[1]],
       value: treeDataItem[resKeyValue[0]],
@@ -51,10 +51,10 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       data: { ...treeDataItem },
       isLeaf: !haveChildren,
       disabled: disabledJudge!==undefined? disabledJudge : haveChildren,
-      children: haveChildren ? treeDataItem.children.map((i: any) => mapSearchTree(i, resKeyValue, disabledJudge)) : [],
+      children: haveChildren ? treeDataItem[childrenKey].map((i: any) => mapSearchTree(i, resKeyValue, disabledJudge, childrenKey)) : [],
     };
   };
-  const formatTreeDataSource = (reData: any, position: number, changePosition: number,changeSearchForm: any,resKeyValue=['id', 'name']) => {
+  const formatTreeDataSource = (reData: any, position: number, changePosition: number,changeSearchForm: any,resKeyValue=['id', 'name'], childrenKey = 'children') => {
     let data = reData && reData[position]?.data;
     let disabledJudge;
     if(data && typeof data === 'object' && !Array.isArray(data) && Object.keys(data).length > 0) {
@@ -64,7 +64,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
     const formatData = (data &&
       Array.isArray(data) &&
       data.length &&
-      data.map((ites: any) => mapSearchTree(ites, resKeyValue, disabledJudge))) ||
+      data.map((ites: any) => mapSearchTree(ites, resKeyValue, disabledJudge, childrenKey))) ||
     []
     changeSearchForm[changePosition].field.props.treeData = formatData;
   }
@@ -1836,6 +1836,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       mappingValueField: 'code',
       otherParams: {
         sorter: 'desc-id',
+        'qp-status-in': 10,
         ...(requestConfigProp?.addOtherParams || {}),
       }, // 默认参数
       sourceName: 'code',
@@ -1845,7 +1846,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       { name: 'name*multiInput', label: '商店名称', type: 'multipleQueryInput' },
       { name: 'code*multiInput', label: '商店编码', type: 'multipleQueryInput' },
       { name: 'qp-type-in', type: 'select', label: '商店类型', initialSource: shopFile2Type },
-      { name: 'qp-status-in', type: 'select', label: '商店状态', initialSource: shopFile2Status },
+      // { name: 'qp-status-in', type: 'select', label: '商店状态', initialSource: shopFile2Status },
       { name: 'qp-orgCode-in', type: 'select', label: '所属销售组织', field: {
           type: 'select',
           props: {
@@ -1860,6 +1861,58 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
               option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
           },
         } },
+      { 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,
+          disabledJude: (data: any) => data['parentCode'] === '0',
+          showCheckedStrategy: 'TreeSelect.SHOW_ALL',
+        },
+      } },
+      { name: 'qp-commonRelationAreaCode-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,
+          disabledJude: (data: any) => data['parent'] === '0',
+          showCheckedStrategy: 'TreeSelect.SHOW_ALL',
+        },
+      } },
+      { name: 'qp-businessType-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') 
+    },
     ]
     const queryHeaderParams  = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
     Promise.all([
@@ -1868,8 +1921,18 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
         'qp-realOrg-eq': true,
         'qp-status-eq': 10
       },getQueryHeadersItem(queryHeaderParams,'qp-orgCode-in')),
+      loadSelectSource(`${prefixUrl.formSelectFix}/channelInfo/tree`, {
+        'qp-status-eq': 10,
+        'qp-isMain-eq': 1,
+        'qp-type-in': '1,2',
+      },getQueryHeadersItem(queryHeaderParams,'qp-orgCode-in')),
+      loadSelectSource(`${prefixUrl.formSelectFix}/tagNode/getTree/10`, {
+        'qp-status-eq': 1,
+      },getQueryHeadersItem(queryHeaderParams,'qp-orgCode-in')),
     ]).then((x: any)=>{
-      formatSource(x,0, 4, tableSearchForm);
+      formatSource(x,0, 3, tableSearchForm);
+      formatTreeDataSource(x, 1, 4, tableSearchForm, ['id','name'], 'channelInfoSon')
+      formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children')
     })
     modalTableProps = {
       modalTableTitle: '选择商店',
@@ -1879,34 +1942,60 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           title: '序号',
           dataIndex: 'keyIndex',
           defaultSort: 0,
+          width: 60,
         },
         {
           title: '商店编码',
           dataIndex: 'code',
           defaultSort: 1,
+          width: 100,
         },
         {
           title: '商店名称',
           dataIndex: 'name',
           defaultSort: 2,
+          width: 120,
         },
         {
           title: '商店类型',
           dataIndex: 'type',
           defaultSort: 3,
+          width: 100,
           render: (text: number) => shopFile2Type.find((i: any) => i.value === text)?.text,
         },
         {
           title: '启用状态',
           dataIndex: 'status',
+          width: 80,
           render: (text: number) => shopFile2Status.find((i: any) => i.value === text)?.text,
         },
         {
           title: '所属销售组织',
           dataIndex: 'orgName',
           defaultSort: 4,
+          width: 95,
+        },
+        {
+          title: '所属销售渠道',
+          dataIndex: 'channelName',
+          defaultSort: 5,
+          width: 100,
+        },
+        {
+          title: '营销区域',
+          dataIndex: 'commonRelationAreaName',
+          defaultSort: 6,
+          width: 100,
+        },
+        {
+          title: '店铺性质',
+          dataIndex: 'businessType',
+          defaultSort: 7,
+          render: (text: any) => getDictionaryTextByValue('BUSINESS_StoreType', text),
+          width: 80,
         },
       ],
+      noEmptySearchField: true,
       ...modalTableBusProps
     }
   }

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

@@ -83,7 +83,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   const isFormPage = pathname.match(pattern)?.length > 0;
 
   const initPagination = { showQuickJumper: true, showSizeChanger: true, showTotal: (total: any) => `共 ${total} 条`, pageSize: tableInitPageSize }
-  const tableInitPagination = { ...initPagination, total: 0, current: 1 }
+  const tableInitPagination = { ...initPagination, total: 0, current: 1, pageSizeOptions: [10, 20, 50, 100, 500, 1000] }
   const disabled = !!noOperate || selectProps?.disabled || props?.disabled;
   const isHaveDependency = fixedparameter && fieldValToParam && ctx;
   const isHaveDValue = () => {

package/src/components/Functional/SearchSelect/utils.tsx

@@ -403,7 +403,10 @@ export const maxTagPlaceholder = (selectedValues: any, { selectProps, onChange,
 // 弹窗数据表头处理
 export const handleTableColumns = (tableColumns: any) => {
   // 按照默认设置排序 > 没有排序字段的展示所有列表头 > 没有表头列不展示
-  const showTableColumns = tableColumns?.filter((s: any) => typeof s.defaultSort == 'number')||tableColumns||[];
+  let showTableColumns = tableColumns?.filter((s: any) => typeof s.defaultSort == 'number') || tableColumns || [];
+
+  showTableColumns = showTableColumns?.length ? showTableColumns : tableColumns; 
+
   return showTableColumns?.sort((a: any,b: any)=> a.defaultSort-b.defaultSort)||[]
 };