@bit-sun/business-component 1.2.3 → 1.2.4-alpha.1

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

@@ -0,0 +1,101 @@
+// @ts-nocheck
+import { request } from 'bssula';
+import { Modal } from 'antd';
+import { ExclamationCircleOutlined } from '@ant-design/icons';
+import React from 'react';
+import { history } from 'umi';
+
+interface actionItem {
+  [propName: string]: any;
+}
+
+export const doDetailPageAction = (config: actionItem) => {
+  if (config?.type == 'modal') {
+    const { confirm } = Modal;
+    let requestConfig = {
+      url: config.url,
+      method: config.method,
+      params: config.params || {},
+      successMessage: config?.successMessage,
+    };
+
+
+    const onOk = () => {
+      request(requestConfig).then((res) => {
+        if (config.backPath) {
+          history.push({
+            pathname: config.backPath
+          })
+        }
+        // 是否执行成功之后的回调
+        if (typeof (config.successCb) === 'function') {
+          config.successCb();
+        }
+      });
+    };
+
+    if (config.noConfirm) {
+      onOk();
+    } else {
+      confirm({
+        title: config.title,
+        icon: <ExclamationCircleOutlined />,
+        content: config.content,
+        okText: '确定',
+        okType: 'danger',
+        cancelText: '取消',
+        onOk,
+        onCancel() {
+          console.log('Cancel');
+        },
+      });
+    }
+  }
+}
+
+export const getBreadcrumbNameMap = (menuData) => {
+  const routerMap = {};
+
+  const flattenMenuData = (data) => {
+    data.forEach((menuItem) => {
+      if (menuItem.children) {
+        flattenMenuData(menuItem.children);
+      }
+      // Reduce memory usage
+      routerMap[menuItem.path] = menuItem;
+    });
+  };
+  flattenMenuData(menuData);
+  return routerMap;
+};
+
+export const judgeIsEmpty = (value: any) => {
+  if (value == null || value == undefined || String(value).trim() == '') {
+    return true;
+  }
+  return false;
+};
+
+export const getMainCrumbNameMap = (menuData) => {
+  const routerMap = {};
+
+  const flattenMenuData = (data, parent) => {
+    let pNameMap = parent.nameMap ? [...parent.nameMap] : [];
+    data.forEach((menuItem) => {
+      let newMenuItem = {
+        ...menuItem,
+        nameMap: [...pNameMap, menuItem.name]
+      }
+      if (newMenuItem.children) {
+        flattenMenuData(newMenuItem.children, newMenuItem);
+      }
+      
+      // Reduce memory usage
+      routerMap[menuItem.path] = {
+        ...newMenuItem,
+      };
+    });
+  };
+  flattenMenuData(menuData, {});
+  return routerMap;
+}

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

@@ -0,0 +1,33 @@
+.home_page_head {
+  height: 54px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #FFFFFF;
+  border-bottom: 1px solid #f0f0f0;
+  padding: 0 20px;
+  .home_page_title {
+    height: 20px;
+    font-family: PingFangSC-Medium;
+    font-weight: 600;
+    font-size: 16px;
+    color: #000000;
+    letter-spacing: 0;
+    line-height: 20px;
+    flex-grow: 1;
+    margin-top: 2px;
+  }
+  .ant-breadcrumb {
+    display: block !important;
+    .ant-breadcrumb-separator {
+      margin: 0 2px;
+    }
+    li .bread_name {
+      
+      color: #8A8F8D;
+      font-size: 12px;
+      line-height: 16px;
+      cursor: pointer;
+    }
+  }
+}

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

@@ -0,0 +1,45 @@
+---
+nav:
+  title: '组件'
+  order: 1
+group:
+  title: 业务组件
+  order: 1
+title: 标题组件
+order: 1
+---
+
+# HomePageWrapper
+
+
+## 首页标题组件
+
+```tsx
+import { HomePageWrapper } from '../../../index.ts';
+import React, { useState } from 'react';
+
+export default () => {
+  const routes = [
+    {
+      path: '/',
+      name: 'welcome',
+      routes: [
+        {
+           path: '/components',
+           name: '组件',
+           routes: [
+            {
+              path: '/components/business/home-page-wrapper',
+              name: '标题组件',
+              component: 'aaa'
+            }
+           ]
+        }
+      ]
+    }
+  ]
+  return (
+    <HomePageWrapper routes={routes} />
+  );
+};
+```

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

@@ -0,0 +1,162 @@
+// @ts-nocheck
+import React, { useEffect, useState, useMemo } from 'react';
+import { getMainCrumbNameMap } from '../DetailPageWrapper/utils';
+import { memoizeOneFormatter } from '@/utils/utils';
+import { Breadcrumb, Space } from 'antd';
+import './index.less';
+import { useLocation, formatMessage } from 'umi';
+import CommonAlert from '../CommonAlert';
+import ENUM from '@/utils/enumConfig';
+
+export default (props: any) => {
+  const { pathname } = useLocation();
+  const [id]: any = useState(pathname + 'id');
+  const { children, ...restProps} = props;
+
+  return (
+    <div id={id} className={'home_page_wrapper'}>
+      <HeaderWrapper 
+        pathname={pathname}
+        {
+          ...restProps
+        } 
+      />
+      {props.children}
+    </div>
+  );
+};
+
+const HeaderWrapper = React.memo(
+  ({ 
+    pathname, 
+    routes=[], 
+    itemPath,
+    alertProps,
+    extra,
+    title,
+    pathToRegexp, //改为从项目代码透传该方法
+  }: { pathname: string, routes: any[], itemPath: string, alertProps: any }) => {
+    const [breadcrumbArr, setBreadCrumbArr]: any = useState([]);
+    const basePath = window.top == window ? '' : `/${itemPath}`;
+    const menuRoutes =
+      window.top == window
+        ? routes.find((item) => item.path === '/')?.routes || []
+        : JSON.parse(localStorage.getItem(ENUM.BROWSER_CACHE.LIMIT_MENU_DATA) || '[]');
+
+    const breadcrumbNameMap = getMainCrumbNameMap(
+      memoizeOneFormatter(menuRoutes, ''),
+    );
+
+    const matchParamsPath = (pathname: string, breadcrumbNameMap: object) => {
+      const pathKey: any = Object.keys(breadcrumbNameMap).find((key) =>
+        pathToRegexp ? pathToRegexp(key).test(pathname) : false
+      );
+
+      return pathKey ? breadcrumbNameMap[pathKey] : undefined;
+    };
+
+    const getPageTitle = (pathname: string) => {
+      const currRouterData = matchParamsPath(
+        `${basePath}${pathname}`,
+        breadcrumbNameMap,
+      );
+
+      if (!currRouterData) {
+        return '';
+      }
+
+      let breadcrumbArrs = currRouterData.nameMap || [];
+      if (breadcrumbArrs.length && title) {
+        breadcrumbArrs.pop();
+        breadcrumbArrs.push(title)
+      }
+      setBreadCrumbArr([...breadcrumbArrs])
+
+      const pageName = formatMessage({
+        id: currRouterData.locale || currRouterData.name,
+        defaultMessage: currRouterData.name,
+      });
+      return title ? title : window.top === window ? pageName : `${currRouterData.name}`;
+    };
+
+    const pageTitle = useMemo(() => getPageTitle(pathname), [pathname, title]);
+
+    useEffect(() => {}, [pathname]);
+
+    // const breadcrumbArr = `${basePath}${pathname}`
+    //   .split('/')
+    //   .slice(1)
+    //   .map((_item, index, arr) =>
+    //     matchParamsPath(
+    //       `/${arr.slice(0, index + 1).join('/')}`,
+    //       breadcrumbNameMap,
+    //     ),
+    //   )
+    //   .filter((item) => item);
+
+
+    return (
+      <div>
+        <div className={'home_page_head'}>
+          <div>
+            <div className={'home_page_title'}>{pageTitle}</div>
+            <Breadcrumb>
+              {breadcrumbArr.map((item) => (
+                <Breadcrumb.Item
+                  key={item}
+                  onClick={() => {
+                    // if (
+                    //   item.path &&
+                    //   !item.children &&
+                    //   !pathToRegexp(item.path).test(`${basePath}${pathname}`)
+                    // ) {
+                    //   history.push({
+                    //     pathname: item.path.replace(basePath, ''),
+                    //   });
+                    // }
+                  }}
+                >
+                  <span
+                    style={{
+                      // color: pathToRegexp(item.path).test(
+                      //   `${basePath}${pathname}`,
+                      // )
+                      //   ? '#000000d9'
+                      //   : '',
+                    }}
+                    className="bread_name"
+                  >
+                    {item}
+                  </span>
+                </Breadcrumb.Item>
+              ))}
+            </Breadcrumb>
+          </div>
+          {
+            extra ? 
+            <Space>
+              {
+                extra
+              }
+            </Space> : ''
+          }
+        </div>
+        {
+          alertProps && (
+            <CommonAlert
+              {
+                ...alertProps
+              }
+            />
+          )
+        }
+      </div>
+    );
+  },
+  (prevProps, nextProps) => {
+    if (prevProps.title !== nextProps.title) {
+      return false;
+    }
+    return true;
+  },
+);

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

@@ -1,7 +1,8 @@
 // 此文件用于 处理业务组件 所用到的公共方法
 // @ts-nocheck
-import { shopFileType, arrivalPaySupportList, sharingType } from './common';
+import { shopFileType, arrivalPaySupportList, sharingType, shopFile2Type } from './common';
 import { getDictionarySource, getDictionaryTextByValue, loadSelectSource } from './utils';
+import ENUM from '@/utils/enumConfig';
 
 const hasDictSharingType =  getDictionarySource('UC000013')?.length;
 const sharingTypeDataList = hasDictSharingType && getDictionarySource('UC000013') || sharingType
@@ -27,7 +28,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
   * */
   const formatSource = (reData: any, position: number, changePosition: number,changeSearchForm: any,resKeyValue=['code', 'name']) => {
     const data = reData && reData[position]?.data;
-    const list = Array.isArray(data) ? data :(data?.items || data?.list || []);
+    const list = Array.isArray(data) ? data :(data?.items || data?.list || data?.children || []);
     const formatData = list?.length ? list.map((v: any) => ({ text: v[resKeyValue[1]], value: v[resKeyValue[0]] })) : [];
     changeSearchForm[changePosition] = {...changeSearchForm[changePosition], initialSource: formatData}
   }
@@ -63,7 +64,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
     tableColumns: [],
     ...modalTableBusProps,
   }
-  let needModalTable = true;
+  let needModalTable = modalTableBusProps?.needModalTable !== undefined ? modalTableBusProps?.needModalTable : true;
 
   // 供应商选择器
   if(type === 'supplier') {
@@ -242,8 +243,10 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       mappingValueField: 'skuCode',
       mappingTextShowTextField: ['name', 'propertyNameAndValue'],
       otherParams: {
+        'qp-combination-eq': false,
         'qp-approveStatus-eq': 1,
-        'qp-type-eq': 10, // 查唯一国际条码
+        'qp-status-eq': 1,
+        // 'qp-type-eq': 10, // 查唯一国际条码【有些项目不需要必须要有国际条码，故注释，需要的项目自己定义otherParams补充上这个条件】
         sorter: 'desc-id'
       }, // 默认参数
       sourceName: 'skuCode',
@@ -251,7 +254,12 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
     }
     tableSearchForm = requestConfig.url.includes('v2') ? [
       requestConfig.url.includes('v2') ? { name: 'qp-skuName-like', label: 'SKU名称' } : { name: 'qp-name-like', label: 'SKU名称' },
-      { name: 'qp-skuCode-like', label: 'SKU编码' },
+      { name: 'qp-skuCode-in', label: 'SKU编码', field: {
+          type: 'multipleQueryInput',
+          props: {
+            ...(requestConfigProp?.skuCodeValueRequestConfig || {}),
+          },
+        }},
       requestConfig.url.includes('v2') ? { name: 'qp-code-like', label: '国际条码' } : { name: 'qp-barCode-like', label: '国际条码'},
       { name: 'qp-itemName-like', label: '所属SPU名称' },
       { name: 'qp-itemCode-like', label: '所属SPU编码' },
@@ -316,7 +324,12 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
         } },
     ] : [
       { name: 'qp-name-like', label: 'SKU名称' },
-      { name: 'qp-skuCode-like', label: 'SKU编码' },
+      { name: 'qp-skuCode-in', label: 'SKU编码', field: {
+          type: 'multipleQueryInput',
+          props: {
+            ...(requestConfigProp?.skuCodeValueRequestConfig || {}),
+          },
+        }},
       { name: 'qp-barCode-like', label: '国际条码'},
       { name: 'qp-itemName-like', label: '所属SPU名称' },
       { name: 'qp-itemCode-like', label: '所属SPU编码' },
@@ -371,6 +384,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       loadSelectSource(`${prefixUrl.formSelectFix}/brand/queryBrandList`, {
         pageSize: 5000,
         currentPage: 1,
+        'ctl-withAuth': true
       }),
       loadSelectSource(`${prefixUrl.formSelectFix}/category/queryCategoryTree`, {
         pageSize: 5000,
@@ -539,6 +553,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       loadSelectSource(`${prefixUrl.formSelectFix}/brand/queryBrandList`, {
         pageSize: 5000,
         currentPage: 1,
+        'ctl-withAuth': true
       }),
       loadSelectSource(`${prefixUrl.formSelectFix}/category/queryCategoryTree`, {
         pageSize: 5000,
@@ -750,6 +765,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       mappingTextField: 'name',
       mappingValueField: 'code',
       otherParams: {
+        'qp-status-eq': 10,
         sorter: 'desc-id'
       }, // 默认参数
       sourceName: 'customCode',
@@ -1069,6 +1085,71 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       ...modalTableBusProps
     }
   }
+  if(type === 'shopFile2') {
+    requestConfig = {
+      url: `${prefixUrl.selectPrefix}/store/page`,
+      filter: 'qp-name,code-orGroup,like', // 过滤参数
+      mappingTextField: 'name',
+      mappingValueField: 'code',
+      otherParams: {
+        sorter: 'desc-id'
+      }, // 默认参数
+      sourceName: 'code',
+      ...requestConfigProp,
+    }
+    tableSearchForm = [
+      { name: 'qp-name-like', label: '商店名称' },
+      { name: 'qp-code-like', label: '商店编码' },
+      { name: 'qp-type-in', type: 'select', label: '商店类型', initialSource: shopFile2Type },
+      { name: 'qp-orgCode-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}/orgView/getTree/sales-organizational-view`, {
+        'qp-employeeCode-eq': JSON.parse(localStorage.getItem(ENUM.BROWSER_CACHE.USER_INFO) || '{}')?.employeeResVo?.employeeNumber,
+        'qp-realOrg-eq': true,
+        'qp-status-eq': 10
+      }),
+    ]).then((x: any)=>{
+      formatSource(x,0, 3, tableSearchForm);
+    })
+    modalTableProps = {
+      modalTableTitle: '选择商店',
+      tableSearchForm,
+      tableColumns: [
+        {
+          title: '商店编码',
+          dataIndex: 'code',
+        },
+        {
+          title: '商店名称',
+          dataIndex: 'name',
+        },
+        {
+          title: '商店类型',
+          dataIndex: 'type',
+          render: (text: number) => shopFile2Type.find((i: any) => i.value === text)?.text,
+        },
+        {
+          title: '所属销售组织',
+          dataIndex: 'orgName',
+        },
+      ],
+      ...modalTableBusProps
+    }
+  }
 
   // 核算主体选择器（无弹窗）
   if(type === 'accountingSubject') {
@@ -1102,6 +1183,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
     }
     needModalTable = false
   }
+
   // 法人公司选择器（无弹窗）
   if(type === 'corporationCompany') {
     requestConfig = {
@@ -1129,6 +1211,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       mappingValueField: 'employeeNumber',
       otherParams: {
         'qp-enable-eq': 10, // 启用状态 10-启用，20-禁用
+        'qp-employmentType-eq': 20,
         sorter: 'desc-id'
       }, // 默认参数
       sourceName: 'employeeNumber',
@@ -1195,20 +1278,22 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
     // 版本2
     requestConfig = {
       url: `${prefixUrl.selectPrefix}/employee/pageList/v2`,
-      filter: 'qp-employeeNumber,name-orGroup,like', // 过滤参数
+      filter: 'qp-username,name-orGroup,like', // 过滤参数
       mappingTextField: 'name',
-      mappingTextShowKeyField: 'employeeNumber',
+      mappingTextShowKeyField: 'username',
       mappingValueField: 'id',
       otherParams: {
         'qp-enable-eq': 10, // 启用状态 10-启用，20-禁用
+        'qp-employmentType-eq': 20,
         sorter: 'desc-id'
       }, // 默认参数
       sourceName: 'employeeNumber',
       ...requestConfigProp,
     }
     tableSearchForm = [
-      { name: 'qp-name-like', label: '员工名称' },
-      { name: 'qp-employeeNumber-like', label: '员工编码' },
+      { name: 'qp-username-like', label: '账户名称' },
+      { name: 'qp-name-like', label: '显示名称' },
+        // { name: 'qp-employeeNumber-like', label: '员工编码' },
       { name: 'qp-directOrgCode-in', type: 'select', label: '所属组织机构', field: {
           type: 'select',
           props: {
@@ -1232,17 +1317,25 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       formatSource(x,0, 2, tableSearchForm);
     })
     modalTableProps = {
-      modalTableTitle: '选择员工',
+      modalTableTitle: '添加员工',
       tableSearchForm,
       tableColumns: [
         {
-          title: '员工编码',
-          dataIndex: 'employeeNumber',
+          title: '账户名称',
+          dataIndex: 'username',
         },
         {
-          title: '员工名称',
+          title: '显示名称',
           dataIndex: 'name',
         },
+        // {
+        //   title: '员工编码',
+        //   dataIndex: 'employeeNumber',
+        // },
+        // {
+        //   title: '员工名称',
+        //   dataIndex: 'name',
+        // },
         {
           title: '所属组织机构',
           dataIndex: 'directOrgName',

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

@@ -9,6 +9,25 @@ const shopFileType = [
   }
 ]
 
+const shopFile2Type = [
+  {
+    text: "第三方线上",
+    value: 'online',
+  },
+  {
+    text: "线下",
+    value: 'offline',
+  },
+  {
+    text: "自营B2B",
+    value: 'B2B',
+  },
+  {
+    text: "自营B2C",
+    value: 'B2C',
+  }
+]
+
 const arrivalPaySupportList = [
   {
     text: "支持",
@@ -31,4 +50,4 @@ const sharingType = [
   }
 ]
 
-export { shopFileType, arrivalPaySupportList, sharingType }
+export { shopFileType, arrivalPaySupportList, sharingType, shopFile2Type }