@bit-sun/business-component 4.2.0-alpha.6.8 → 4.2.0-alpha.7

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

@@ -523,11 +523,11 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       placeholder: '输入商品(SPU)编码或名称',
       renderTableColumns: [
         {
-          title: '商品编码(SPU)',
+          title: 'SPU编码',
           dataIndex: 'itemCode',
         },
         {
-          title: '商品名称(SPU)',
+          title: 'SPU名称',
           dataIndex: 'name',
         },
       ],
@@ -547,8 +547,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...requestConfigProp,
     }
     tableSearchForm = [
-      { name: 'itemCode*multiInput', label: '商品编码(SPU)', type: 'multipleQueryInput' },
-      { name: 'name*multiInput', label: '商品名称(SPU)', type: 'multipleQueryInput' },
+      { name: 'itemCode*multiInput', label: 'SPU编码', type: 'multipleQueryInput' },
+      { name: 'name*multiInput', label: 'SPU名称', type: 'multipleQueryInput' },
       { name: 'qp-brandId-in', type: 'select', label: '品牌', field: {
           type: 'select',
           props: {
@@ -626,12 +626,12 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           defaultSort: 0,
         },
         {
-          title: '商品编码(SPU)',
+          title: 'SPU编码',
           dataIndex: 'itemCode',
           defaultSort: 1,
         },
         {
-          title: '商品名称(SPU) ',
+          title: 'SPU名称',
           dataIndex: 'name',
           defaultSort: 2,
         },
@@ -970,7 +970,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ['colorName', 'categoryId', 'classId', 'brandId'],
       hiddenFields,
     );
-    const fieldLoadSource = fieldsRequest.map((i: any) => loadSelectSource(i.url, i.params,options));
+    const fieldLoadSource = fieldsRequest.map((i: any) => loadSelectSource(i.url, i.params, i.options));
     requestConfig = {
       url: `${prefixUrl.selectPrefix}/skc/skcSelect`,
       filter: 'qp-code,name-orGroup,like', // 过滤参数
@@ -1302,6 +1302,13 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           defaultSort: 3,
           render: (text: number) => getDictionaryTextByValue('SC00004', text),
         },
+        {
+          title: '运营组名称',
+          dataIndex: 'groupCode',
+          defaultSort: 7,
+          render: (text: any, record) => record?.groupName ? `【${text}】${record?.groupName}` : "",
+          width: 100,
+        },
         {
           title: '所属销售渠道',
           dataIndex: 'channelName',
@@ -1324,7 +1331,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
         ...(modalTableBusProps?.needStatusSearch?[{
           title: '状态',
           dataIndex: 'isEnable',
-          defaultSort: 7,
+          defaultSort: 8,
           render: (text: number) => getDictionaryTextByValue('SC00001', text),
         }]:[]),
       ],
@@ -1860,8 +1867,10 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...requestConfigProp,
     }
     tableSearchForm = [
-      { name: 'qp-name-like', label: '店铺名称' },
-      { name: 'qp-code-like', label: '店铺编码' },
+      { name: 'name*multiInput', label: '店铺名称', type: 'multipleQueryInput' },
+      { name: 'code*multiInput', label: '店铺编码', type: 'multipleQueryInput' },
+      // { name: 'qp-name-like', label: '店铺名称' },
+      // { name: 'qp-code-like', label: '店铺编码' },
       { name: 'qp-conglomerateCode-in', type: 'select', label: '归属集团', field: {
           type: 'select',
           props: {
@@ -2111,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([
@@ -2127,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: '选择商店',
@@ -2488,7 +2521,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
         } },
       ...(modalTableBusProps?.needTypeSearch?[{ name: 'qp-employmentType-eq', type: 'select', label: '员工类型', initialSource: employeeType  }]:[]),
       { name: 'qp-email-like', label: '邮箱' },
-      { name: 'qp-officeTelephone-like', label: '手机号' },
+      { name: 'qp-phone-like', label: '手机号' },
     ]
     const queryHeaderParams  = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
     Promise.all([
@@ -2541,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/AddSelect/index.tsx

@@ -222,6 +222,98 @@ const AddSelect = (props: any) => {
               acc[key] = typeof value === 'function' ? value?.(record) : value;
               return acc;
             }, {});
+
+            // 可输入非数字字符
+            if(item.canInputString) {
+              return (
+                <InputNumber
+                  min={0}
+                  precision={0}
+                  controls={false}
+                  {...inputProps}
+                  value={text || ''}
+                  keyboard={false}
+                  onPressEnter={(e: any) => {
+                    e.target.blur();
+                  }}
+                  onBlur={async (e: any) => {
+                    const {
+                      target: { value },
+                    } = e;
+                    record[item.dataIndex] = value
+                    editRecord(record)
+                  }}
+                  onKeyDown={(e) => {
+                    if(e.keyCode === 13 && e.ctrlKey) {
+                      handleOk(true)
+                      document.getElementById("first-query")?.focus()
+                    }
+                    if(e.keyCode === 8 && e.ctrlKey) {
+                      message.success('删除当前行')
+                      e.stopPropagation();
+                      e.preventDefault();
+                      let dom = e.nativeEvent.path[5].children[index + 2]?.getElementsByTagName('input')[currentIndex]
+                      if (dom) {
+                        dom.select();
+                        dom.focus();
+                        dom.scrollIntoView(false)
+                      }
+                      dom = null
+                      deleteRecord(record, popvalue);
+                    }
+                    if (e.keyCode === 37 && e.shiftKey) {   // 左滑动
+                      e.stopPropagation();
+                      e.preventDefault();
+                      let dom = e.nativeEvent.path[5].children[index + 1]?.getElementsByTagName('input')[currentIndex - 1]
+                      if (dom) {
+                        dom.select();
+                        dom.focus();
+                        dom.scrollIntoView(false)
+                      }
+                      dom = null
+                    }
+                    if (e.keyCode === 39 && e.shiftKey) {  //  右滑
+                      e.stopPropagation();
+                      e.preventDefault();
+                      let dom = e.nativeEvent.path[5].children[index + 1]?.getElementsByTagName('input')[currentIndex + 1]
+                      if (dom) {
+                        dom.select();
+                        dom.focus();
+                        dom.scrollIntoView(false)
+                      }
+                      dom = null
+                    }
+                    if (e.keyCode === 40) {
+                      e.stopPropagation();
+                      e.preventDefault();
+                      let dom = e.nativeEvent.path[5].children[index + 2]?.getElementsByTagName('input')[currentIndex]
+                      if (dom) {
+                        dom.select();
+                        dom.focus();
+                        dom.scrollIntoView(false)
+                      }
+                      dom = null
+                    } else if (e.keyCode === 38) {
+                      e.stopPropagation();
+                      e.preventDefault();
+                      let dom1 = e.nativeEvent.path[5].children[index]?.getElementsByTagName('input')[currentIndex]
+                      if (dom1) {
+                        // dom1.value=""
+                        // dom1.setSelectionRange(100, 0);
+                        dom1.select();
+                        dom1.focus();
+                        dom1.scrollIntoViewIfNeeded(false)
+                        // dom1.value=record['count']
+                      }
+                      dom1 = null
+                    } else if (e.keyCode === 9 && index === selectedRowKeys.length - 1 && currentIndex === inputLength - 1) {
+                      e.stopPropagation();
+                      e.preventDefault();
+                    }
+                  }}
+                />
+              );
+            }
             
             return (
               <InputNumber

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,

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

@@ -32,6 +32,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     highestPopContainer = undefined,
     fieldComponent,
     onSaveCallback,
+    returnFormat = [],
     selectBusinessType,
   } = props;
   const {
@@ -66,6 +67,8 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   const selectParamsKey = requestConfig?.filter || 'qp-codeAndName-like'
   const selectParamsInitKey = requestConfig?.filterInit || selectParamsKey
   const currentSelectProps = {
+    // 回显字段可自定义
+    optionLabelProp: "label",
     ...selectProps,
     // 以下属性不可更改----设计配置项
     showArrow: true,
@@ -73,7 +76,6 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     filterOption: false,
     allowClear: true,
     listHeight: 160,
-    optionLabelProp: "label",
     autoClearSearchValue: false,
     placement: 'bottomRight'
   }
@@ -431,7 +433,8 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
 
   const formaData = (value: any, source: any) => {
     if (labelInValue) {
-      const formatResult = value.map((i: any) => ({ key: i[mappingValueField] || i.key, label: i[mappingTextField] || i.label, value: i[mappingValueField] || i.value }))
+      const getFromat = (format, val) => format.map(({key,value})=> ({[key]:val[value]}))
+      const formatResult = value.map((i: any) => (Object.assign({ key: i[mappingValueField] || i.key, label: i[mappingTextField] || i.label, value: i[mappingValueField] || i.value }, ...getFromat(returnFormat, i))))
       onChange(selectMode ? formatResult : formatResult[0], value,source)
     } else {
       const formatResult = selectMode ? value.map((i: any) => i.value) : _.get(value[0], 'value')

package/src/components/Solution/RuleComponent/RenderCompItem.tsx

@@ -589,7 +589,7 @@ export default function RenderCompItem(props:any){
           null}
         {/* 单选/多选  配送方式选择器  */}
         {((ites?.inputType === 20 || ites?.inputType === 30) &&
-          ites?.choiceType === 310 && (
+          (ites?.choiceType === 310 || ites?.choiceType === 311)&& (
             <BusinessSearchSelect
               selectBusinessType="deliveryMode"
               selectProps={{
@@ -606,6 +606,14 @@ export default function RenderCompItem(props:any){
               labelInValue={true}
               value={showValue(ites.code)}
               requestConfig={{
+                ...(ites?.choiceType === 311
+                  ? {
+                      otherParams: {
+                        // 配送方式只选择标准配送方式
+                        'qp-recordChannnelCode-eq': 80,
+                      },
+                    }
+                  : {}),
                 filterInit: 'qp-code-in',
               }}
               onChange={(value) => {

package/src/components/Solution/RuleComponent/index.js

@@ -748,6 +748,7 @@ class RuleObjectComponent extends Component {
       <div
         className={'rule_line_content'}
         style={{ display: 'flex', marginBottom: '0px', padding: '10px 0px' }}
+        key={itemDetail.elementId}
       >
         <div
           className={'logical_operate_content'}

package/src/components/Solution/RuleComponent/ruleFiled.js

@@ -1932,7 +1932,7 @@ export default class RuleField extends Component {
         }
       }
       // 配送方式选择器
-      if (dataChoiceBusinessType == 310) {
+      if (dataChoiceBusinessType == 310 || dataChoiceBusinessType == 311) {
         if (INTERVAL_TYPE.indexOf(selectOperation) > -1) {
           return (
             <>
@@ -1952,6 +1952,14 @@ export default class RuleField extends Component {
                 labelInValue={true}
                 value={values[0]}
                 requestConfig={{
+                  ...(dataChoiceBusinessType === 311
+                  ? {
+                      otherParams: {
+                        // 配送方式只选择标准配送方式
+                        'qp-recordChannnelCode-eq': 80,
+                      },
+                    }
+                  : {}),
                   filterInit: 'qp-code-in',
                 }}
                 onChange={(value) => {
@@ -1983,6 +1991,14 @@ export default class RuleField extends Component {
                 labelInValue={true}
                 value={values[1]}
                 requestConfig={{
+                  ...(dataChoiceBusinessType === 311
+                  ? {
+                      otherParams: {
+                        // 配送方式只选择标准配送方式
+                        'qp-recordChannnelCode-eq': 80,
+                      },
+                    }
+                  : {}),
                   filterInit: 'qp-code-in',
                 }}
                 onChange={(value) => {
@@ -2020,6 +2036,14 @@ export default class RuleField extends Component {
               labelInValue={true}
               value={currentValue}
               requestConfig={{
+                ...(dataChoiceBusinessType === 311
+                ? {
+                    otherParams: {
+                      // 配送方式只选择标准配送方式
+                      'qp-recordChannnelCode-eq': 80,
+                    },
+                  }
+                : {}),
                 filterInit: 'qp-code-in',
               }}
               onChange={(value) => {

package/src/index.ts

@@ -44,6 +44,10 @@ export * from './components/Functional/BsAntdSula/index';
 export { default as RuleComponent} from './components/Solution/RuleComponent';
 export { default as RuleSetter} from './components/Solution/RuleSetter';
 
+export { processDetailButtonsVisible as processDetailButtonsVisible } from './components/Business/DetailPageWrapper';
+
+
+
 // 通用组件
 export { default as ExtendedCollapse } from './components/Common/ExtendedCollapse';
 export { default as Section } from './components/Common/Section';