@bit-sun/business-component 2.3.24 → 2.3.25

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

@@ -572,33 +572,35 @@ export const renderFixed2 = (text: any) => text;
 //设置queryTable默认列宽
 export const getItemDefaultWidth = (item: any) => {
   let defaultWidth = 200;
-  let lowerCaseKey = (item.key || item.dataIndex).toLowerCase();
-  switch (true) {
-    case item?.title === '操作' || lowerCaseKey === 'operate':
-      defaultWidth = 60;
-      break;
-    case lowerCaseKey.indexOf('number') > -1:
-    case lowerCaseKey.indexOf('quantity') > -1:
-    case lowerCaseKey.indexOf('amount') > -1:
-      defaultWidth = 90;
-      break;
-    case (lowerCaseKey.indexOf('no') > -1):
-      defaultWidth = 200;
-      break;
-    case lowerCaseKey.indexOf('code') > -1:
-      defaultWidth = 170;
-      break;
-    case lowerCaseKey.indexOf('time') > -1:
-      defaultWidth = 130;
-      break;
-    case lowerCaseKey.indexOf('status') > -1:
-      defaultWidth = 100;
-      break;
-    case lowerCaseKey.indexOf('user') > -1:
-      defaultWidth = 130;
-      break;
-    default:
-      break;
+  let lowerCaseKey = (item.key || item.dataIndex)?.toLowerCase();
+  if (lowerCaseKey) {
+    switch (true) {
+      case item?.title === '操作' || lowerCaseKey === 'operate':
+        defaultWidth = 60;
+        break;
+      case lowerCaseKey.indexOf('number') > -1:
+      case lowerCaseKey.indexOf('quantity') > -1:
+      case lowerCaseKey.indexOf('amount') > -1:
+        defaultWidth = 90;
+        break;
+      case (lowerCaseKey.indexOf('no') > -1):
+        defaultWidth = 200;
+        break;
+      case lowerCaseKey.indexOf('code') > -1:
+        defaultWidth = 170;
+        break;
+      case lowerCaseKey.indexOf('time') > -1:
+        defaultWidth = 130;
+        break;
+      case lowerCaseKey.indexOf('status') > -1:
+        defaultWidth = 100;
+        break;
+      case lowerCaseKey.indexOf('user') > -1:
+        defaultWidth = 130;
+        break;
+      default:
+        break;
+    }
   }
   return defaultWidth;
 };
@@ -608,7 +610,7 @@ export const getItemDefaultWidth = (item: any) => {
  * @param params 要应用于查询的参数
  * @returns 返回处理后的查询参数
  */
- export function queryParams(params: any, flag?: any) {
+export function queryParams(params: any, flag?: any) {
   for (const key in params) {
     if (Object.prototype.hasOwnProperty.call(params, key)) {
       const element = params[key];
@@ -678,7 +680,7 @@ export const getItemDefaultWidth = (item: any) => {
  * @param code 对应权限值
  * @returns boolean
  */
- export const authFn = (code?: any) => {
+export const authFn = (code?: any) => {
   const authButton = localStorage.getItem(ENUM.BROWSER_CACHE.MAIN_AUTH_CODES)
     ? JSON.parse(localStorage.getItem(ENUM.BROWSER_CACHE.MAIN_AUTH_CODES) as string)
     : [];

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

@@ -212,7 +212,6 @@ const DetailWrapper = React.memo(
       <Anchor
         key={`${pathname}_anchor`}
         offsetTop={window.top == window ? 78 : 0}
-        getContainer={() => window.document.body}
       >
         <div>
           <div className={'detail_page_head'}>

package/src/components/Business/JsonQueryTable/static.ts

@@ -13,7 +13,7 @@ const normalMultipleSelectProps = {
   },
 };
 // inputType显示类型 10输入框 20单选 30多选 40公式 |||||  valueType字段类型
-export const inputTypes:any = {
+export const inputTypes: any = {
   20: {
     10: {
       type: 'select',
@@ -128,7 +128,7 @@ export const inputTypes:any = {
       type: 'bs-employeeSearchSelect',
       props: {
         ...normalSingleSelectProps,
-        requestConfig: { mappingValueField: 'employeeNumber' },
+        requestConfig: { mappingValueField: 'employeeNumber', filterInit: 'qp-employeeNumber-like', },
       },
     },
     280: {
@@ -291,7 +291,7 @@ export const inputTypes:any = {
       type: 'bs-employeeSearchSelect',
       props: {
         ...normalMultipleSelectProps,
-        requestConfig: { mappingValueField: 'employeeNumber' },
+        requestConfig: { mappingValueField: 'employeeNumber', filterInit: 'qp-employeeNumber-like', },
       },
     },
     280: {
@@ -368,13 +368,13 @@ export const choiceType = Object.freeze({
   340: '规则模板选择器',
   350: '营销区域选择器',
 });
-export const inputType:any ={
+export const inputType: any = {
   10: '输入',
   20: '单选',
   30: '多选',
   40: '公式',
 };
-export const valueType:any = {
+export const valueType: any = {
   10: '文本',
   20: '短整数',
   21: '长整数',

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

@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import { Table as SulaTable, request } from 'bssula';
 import { Resizable } from 'react-resizable';
 import ColumnSetting from './columnSetting';
-import { getItemDefaultWidth, handleTextOverflow } from './utils';
+import { getItemDefaultWidth } from './utils';
 import { noEmptyArray } from './utils';
 import {
   Table,

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

@@ -14,32 +14,34 @@ import {
 export const getItemDefaultWidth = (item: any) => {
   let defaultWidth = 200;
   let lowerCaseKey = (item.key || item.dataIndex)?.toLowerCase();
-  switch (true) {
-    case item?.title === '操作' || lowerCaseKey === 'operate':
-      defaultWidth = 60;
-      break;
-    case lowerCaseKey?.indexOf('number') > -1:
-    case lowerCaseKey?.indexOf('quantity') > -1:
-    case lowerCaseKey?.indexOf('amount') > -1:
-      defaultWidth = 90;
-      break;
-    case (lowerCaseKey?.indexOf('no') > -1):
-      defaultWidth = 200;
-      break;
-    case lowerCaseKey?.indexOf('code') > -1:
-      defaultWidth = 170;
-      break;
-    case lowerCaseKey?.indexOf('time') > -1:
-      defaultWidth = 130;
-      break;
-    case lowerCaseKey?.indexOf('status') > -1:
-      defaultWidth = 100;
-      break;
-    case lowerCaseKey?.indexOf('user') > -1:
-      defaultWidth = 130;
-      break;
-    default:
-      break;
+  if (lowerCaseKey) {
+    switch (true) {
+      case item?.title === '操作' || lowerCaseKey === 'operate':
+        defaultWidth = 60;
+        break;
+      case lowerCaseKey.indexOf('number') > -1:
+      case lowerCaseKey.indexOf('quantity') > -1:
+      case lowerCaseKey.indexOf('amount') > -1:
+        defaultWidth = 90;
+        break;
+      case (lowerCaseKey.indexOf('no') > -1):
+        defaultWidth = 200;
+        break;
+      case lowerCaseKey.indexOf('code') > -1:
+        defaultWidth = 170;
+        break;
+      case lowerCaseKey.indexOf('time') > -1:
+        defaultWidth = 130;
+        break;
+      case lowerCaseKey.indexOf('status') > -1:
+        defaultWidth = 100;
+        break;
+      case lowerCaseKey.indexOf('user') > -1:
+        defaultWidth = 130;
+        break;
+      default:
+        break;
+    }
   }
   return defaultWidth;
 };

package/src/components/Functional/AddSelect/helps.ts

@@ -1,3 +1,7 @@
+import axios from 'axios';
+import { stringify } from 'querystring';
+import { message } from 'antd';
+
 // 下拉框数据源
 // 情况①：每条记录下拉框数据不同----查询接口每条记录返回字段，前后端约定好，用dataSourceCode记录
 // 情况②：所有查询记录共有一个数据源---选择器加载查询记录渲染给到dataSource
@@ -12,3 +16,64 @@ export const getSelectDataList = (record: any,item: any, selectKey: string) => {
   }
   return result;
 }
+
+export const loadSelectSource = (url: string, params?: any) => {
+  return new Promise((resolve, reject) => {
+    axios
+      .get(`${url}?${stringify(params)}`)
+      .then((result: any) => {
+        result = result.data;
+        if ((result?.status && result.status !== '0') || (result?.code && result.code !== '000000')) {
+          message.error(result.msg);
+          resolve(result);
+          return;
+        }
+        resolve(result);
+      })
+      .catch((err) => {
+        reject(err);
+      });
+  })
+};
+
+export 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 || data?.children || []);
+  const formatData = list?.length ? list.map((v: any) => ({ text: v[resKeyValue[1]], value: v[resKeyValue[0]] })) : [];
+  changeSearchForm[changePosition] = {...changeSearchForm[changePosition], initialSource: formatData}
+}
+// 格式化树选择器数据源
+export const mapSearchTree = (treeDataItem: any, resKeyValue: any) => {
+  const haveChildren = Array.isArray(treeDataItem.children) && treeDataItem.children.length > 0;
+  return {
+    title: treeDataItem[resKeyValue[1]],
+    value: treeDataItem[resKeyValue[0]],
+    parentId: treeDataItem.parent,
+    data: { ...treeDataItem },
+    isLeaf: !haveChildren,
+    disabled: haveChildren,
+    children: haveChildren ? treeDataItem.children.map((i: any) => mapSearchTree(i, resKeyValue)) : [],
+  };
+};
+export const formatTreeDataSource = (reData: any, position: number, changePosition: number,changeSearchForm: any,resKeyValue=['id', 'name']) => {
+  const data = reData && reData[position]?.data;
+  const formatData = (data &&
+    Array.isArray(data) &&
+    data.length &&
+    data.map((ites: any) => mapSearchTree(ites, resKeyValue))) ||
+    []
+  changeSearchForm[changePosition].field.props.treeData = formatData;
+}
+
+export const formatFormSourceList = (x: any,loadList: any, tableSearchForm: any)=> {
+  loadList.forEach((i: any,index: any) => {
+    if(i.resType == 'list') {
+      const resKeyValue = i.resKeyValue || ['code', 'name']
+      formatSource(x,index, i.resPosition, tableSearchForm,resKeyValue)
+    }
+    if(i.resType == 'treeList') {
+      const resKeyValue = i.resKeyValue || ['id', 'name']
+      formatTreeDataSource(x,index, i.resPosition, tableSearchForm,resKeyValue)
+    }
+  })
+}

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

@@ -15,25 +15,7 @@ import { setInitialShowColumn } from '@/plugin/TableColumnSetting/utils';
 import { handleAntdColumnsSpecialParams, uuid } from '@/utils/utils';
 import { getItemDefaultWidth, noEmptyArray } from '@/components/Business/columnSettingTable/utils';
 import { getEmployeeId } from '@/utils/LocalstorageUtils';
-import { getSelectDataList } from './helps';
-
-const loadSelectSource = (url: string, params?: any) => {
-  return new Promise((resolve, reject) => {
-    axios
-      .get(`${url}?${stringify(params)}`)
-      .then((result: any) => {
-        result = result.data;
-        if ((result?.status && result.status !== '0') || (result?.code && result.code !== '000000')) {
-          message.error(result.msg);
-          return;
-        }
-        resolve(result);
-      })
-      .catch((err) => {
-        reject(err);
-      });
-  })
-};
+import { getSelectDataList, loadSelectSource, formatFormSourceList } from './helps';
 
 const checkSpuMatchCode = (data: any) => {
   return new Promise((resolve, reject) => {
@@ -71,36 +53,6 @@ const ResizeableTitle = (props) => {
   );
 };
 
-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 || data?.children || []);
-  const formatData = list?.length ? list.map((v: any) => ({ text: v[resKeyValue[1]], value: v[resKeyValue[0]] })) : [];
-  changeSearchForm[changePosition] = {...changeSearchForm[changePosition], initialSource: formatData}
-}
-
-// 格式化树选择器数据源
-const mapSearchTree = (treeDataItem: any, resKeyValue: any) => {
-  const haveChildren = Array.isArray(treeDataItem.children) && treeDataItem.children.length > 0;
-  return {
-    title: treeDataItem[resKeyValue[1]],
-    value: treeDataItem[resKeyValue[0]],
-    parentId: treeDataItem.parent,
-    data: { ...treeDataItem },
-    isLeaf: !haveChildren,
-    disabled: haveChildren,
-    children: haveChildren ? treeDataItem.children.map((i: any) => mapSearchTree(i, resKeyValue)) : [],
-  };
-};
-const formatTreeDataSource = (reData: any, position: number, changePosition: number,changeSearchForm: any,resKeyValue=['id', 'name']) => {
-  const data = reData && reData[position]?.data;
-  const formatData = (data &&
-    Array.isArray(data) &&
-    data.length &&
-    data.map((ites: any) => mapSearchTree(ites, resKeyValue))) ||
-  []
-  changeSearchForm[changePosition].field.props.treeData = formatData;
-}
-
 const initTableCode = {
   'sku': ['skuSelect-tableOptionsToChoosePartCode','skuSelect-tableSelectedItemPartCode'],
   'skc': ['skcSelect-tableOptionsToChoosePartCode','skcSelect-tableSelectedItemPartCode'],
@@ -128,7 +80,7 @@ const AddSelect = (props: any) => {
     tableCodeList = [], // 非必填 默认取组件定义code,如需自定义----数组第一位为供选择商品的table的code,第二位为已选择商品的table的code
     businessType = 'sku',
     isAllowRepeatedSelect = false,
-    noUseItemEancode = true
+
   } = props;
   const { url, otherParams, isMap, fixedparameter, fieldValToParam, mappingTextField = 'name', mappingTextShowKeyField, mappingValueField = 'code', mappingTextShowTextField } = requestConfig || {};
   const resultSourceKey = sourceName || requestConfig?.sourceName || 'supplierCode'
@@ -666,78 +618,14 @@ const AddSelect = (props: any) => {
   }
 
   useEffect(() => {
-    if(businessType == 'sku') {
-      Promise.all([
-        loadSelectSource(`/items/brand/queryBrandList`, {
-          pageSize: 5000,
-          currentPage: 1,
-          'ctl-withAuth': true
-        }),
-        loadSelectSource(`/items/category/queryCategoryTree`, {
-          pageSize: 5000,
-          currentPage: 1,
-        }),
-      ]).then((x: any)=>{
-        const searchPosition1 = noUseItemEancode ? 3 : 2;
-        const searchPosition2 = noUseItemEancode ? 4 : 3;
-        formatSource(x,0, searchPosition1, tableSearchForm,['id','name'])
-        formatTreeDataSource(x,1, searchPosition2, tableSearchForm)
-      })
-    }
-    if(businessType == 'skc') {
-      Promise.all([
-        loadSelectSource(`/items/item/propertyValue/sizeBySkcConfig`, {
-          pageSize: 10000,
-          currentPage: 1,
-          type: 2, // 类型：1尺码；2颜色
-        }),
-        loadSelectSource(`/items/category/queryCategoryTree`, {
-          pageSize: 5000,
-          currentPage: 1,
-        }),
-        loadSelectSource(`/items/class/withProperty`, {
-          pageSize: 5000,
-          currentPage: 1,
-        }),
-        loadSelectSource(`/items/brand/queryBrandList`, {
-          pageSize: 5000,
-          currentPage: 1,
-          'ctl-withAuth': true
-        }),
-      ]).then((x: any)=>{
-        formatSource(x,0, 3, tableSearchForm,['value','value'])
-        formatTreeDataSource(x,1, 4, tableSearchForm)
-        formatSource(x,2, 5, tableSearchForm,['id','name'])
-        formatSource(x,3, 6, tableSearchForm,['id','name'])
-      })
-    }
-    if(businessType == 'spu') {
-      Promise.all([
-        loadSelectSource(`/user/orgViewNode/listNoPage`, {
-          'qp-employeeId-eq': getEmployeeId(),
-          'qp-orgViewCode-eq': 'business-organizational-view',
-          'ctl-withDefaultOrg': true,
-        }),
-        loadSelectSource(`/items/brand/queryBrandList`, {
-          pageSize: 5000,
-          currentPage: 1,
-          'ctl-withAuth': true
-        }),
-        loadSelectSource(`/items/category/queryCategoryTree`, {
-          pageSize: 5000,
-          currentPage: 1,
-        }),
-        loadSelectSource(`/items/class/withProperty`, {
-          pageSize: 5000,
-          currentPage: 1,
-        }),
-      ]).then((x: any)=>{
-        formatSource(x,0, 2, tableSearchForm,['targetId','name'])
-        formatSource(x,1, 3, tableSearchForm,['id','name'])
-        formatTreeDataSource(x,2, 4, tableSearchForm)
-        formatSource(x,3, 5, tableSearchForm,['id','name'])
-      })
-    }
+    const pList = modalTableProps?.promiseLoadList || []
+    if(!pList?.length) return;
+    const list = pList.map((i: any) => {
+      return loadSelectSource(i.url, i.params)
+    });
+    Promise.all(list).then((x: any)=>{
+      formatFormSourceList(x,pList,tableSearchForm)
+    })
   }, [businessType])
 
   useEffect(() => {
@@ -1051,8 +939,8 @@ const AddSelect = (props: any) => {
       setPopValue(popvalue.filter(item => item.uuid !== record.uuid))
       setSelectedRowKeys([])
     } else {
-      setPopValue(popvalue.filter(item => item.skuCode !== record.skuCode))
-      setSelectedRowKeys([...selectedRowKeys.filter(item => item !== record.skuCode)])
+      setPopValue(popvalue.filter(item => item[selectRowKey] !== record[selectRowKey]))
+      setSelectedRowKeys([...selectedRowKeys.filter(item => item !== record[selectRowKey])])
     }
   }
 

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

@@ -789,6 +789,9 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
             maxTagPlaceholder={maxTagPlaceholder}
             {...currentSelectProps}
             getPopupContainer={(triggerNode) => (getPopupContainer && getPopupContainer(triggerNode)) || triggerNode.parentElement}
+            onClear={() => { 
+              run();
+            }}
           >
             {items.map(item => (
               <Option key={item.value} label={item.text}>