@bit-sun/business-component 4.2.0-alpha.6.9 → 4.2.0-alpha.jw-1

package/package.json

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

package/src/components/Business/BsLayouts/Components/CustomerMenu/index.tsx

@@ -89,7 +89,7 @@ const CustomerMenu = forwardRef(({isCollapse, handleClose, actionRef, originRout
 
   return (
     <div className={'customer_menu_content'}>
-      <div 
+      {/* <div 
       style={{cursor: 'pointer'}} 
         onClick={(e) => {
           handleClose();
@@ -106,7 +106,7 @@ const CustomerMenu = forwardRef(({isCollapse, handleClose, actionRef, originRout
         >
           自定义菜单
         </Button>
-      </div>
+      </div> */}
       {!isCollapse && (
         <Drawer
           style={{ left: isDrawer ? 140 : 0 }}

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

@@ -87,7 +87,7 @@ const getAuthMenuPathAndDocsId = (pathToRegexp) => {
       if (item.children && item.children.length > 0) {
         getLimitedMenuKeys(item.children);
       } else {
-        const originPath = item.path.replace(/^\/\w+\//, '/');
+        const originPath = (item.path || item.frontendPath).replace(/^\/\w+\//, '/');
         menuKeys.push(originPath);
         if (pathToRegexp('/operation-and-maintenance-center/configuration-management/all-general-documents-specific/:id').test(originPath)) {
          getId(originPath) && docsId.push(getId(originPath))
@@ -647,7 +647,7 @@ class BasicLayout extends React.PureComponent {
           return;
         }
         // todo:暂时处理非wujie环境不做404管控
-        if (!window.__POWERED_BY_WUJIE__) {
+        if (!window.__POWERED_BY_WUJIE__ && !this.props.isSingleSystem) {
           treeList.push({
             tab: node.locale,
             key: node.path,

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

@@ -2120,6 +2120,24 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       } ,
       initialSource: getDictionarySource('BUSINESS_StoreType')
     },
+      {
+        name: "qp-brandCode-in",
+        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,
+          },
+        },
+      },
     ]
     const queryHeaderParams  = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
     Promise.all([
@@ -2136,12 +2154,18 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       loadSelectSource(`${prefixUrl.formSelectFix}/tagNode/getTree/10`, {
         'qp-status-eq': 1,
       },getQueryHeadersItem(queryHeaderParams,'qp-orgCode-in')),
+      loadSelectSource(`${prefixUrl.formSelectFix}/brand/queryBrandList`, {
+        pageSize: 5000,
+        currentPage: 1,
+        'ctl-withAuth': true,
+      },getQueryHeadersItem(queryHeaderParams,'ctl-withAuth'))
     ]).then((x: any)=>{
       const channelDisabledJude = (data: any) => data['parentCode'] === '0'; // 所属销售渠道 树节点不能点判断
       const areaDisabledJude = (data: any) => data['parent'] === '0'; // 所属营销区域 树节点不能点判断
       formatSource(x,0, 3, tableSearchForm);
       formatTreeDataSource(x, 1, 4, tableSearchForm, ['code','name'], 'channelInfoSon', channelDisabledJude)
       formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude)
+      formatSource(x,3, 7, tableSearchForm, ['brandCode', 'name']);
     })
     modalTableProps = {
       modalTableTitle: '选择商店',
@@ -2389,7 +2413,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           },
         } },
       { name: 'qp-email-like', label: '邮箱' },
-      { name: 'qp-phone-like', label: '手机号' },
+      { name: 'qp-officeTelephone-like', label: '手机号' },
     ]
     const queryHeaderParams  = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
     Promise.all([
@@ -2550,7 +2574,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
         },
         {
           title: '手机号',
-          dataIndex: 'officeTelephone',
+          dataIndex: 'phone',
           defaultSort: 4,
           render: (text: any, record: any) => handleTextOverflow(text||record?.phone),
         },

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

@@ -477,9 +477,10 @@ customSort = (a, b) => {
     });
   }
 
-  resetData = () => {
-    const { validDataUrl, validDataParams, updateData, columns, isBrandAuth, isCheckStockNum = true, customerColumnsMapping } = this.props;
-    const resultData = this.getData().filter(d => {
+  resetData = async () => {
+    const { validDataUrl, validDataParams, updateData, columns, isBrandAuth, isCheckStockNum = true, customerColumnsMapping, checkSharedValue, beforeCheckCallback } = this.props;
+   
+    let resultData = this.getData().filter(d => {
       return _.compact(Object.values(d)).length
     })
 
@@ -491,6 +492,24 @@ customSort = (a, b) => {
       otherParams = { brandAuth: 'ctl-withAuth' }
     }
 
+    // 处理校验参数，隐藏校验参数（公用的部分）
+    if(checkSharedValue){
+      resultData = resultData.map(d => {
+        return {
+          ...d,
+          ...checkSharedValue,
+        }
+      })
+    }
+
+    // 调用回调函数
+     if(beforeCheckCallback){
+      resultData = await beforeCheckCallback(resultData);
+      if(!resultData){
+        return;
+      }
+    }
+
     request
       .post(validDataUrl, {
         ...otherParams,