@bit-sun/business-component 3.2.4 → 3.2.5

package/dist/utils/TreeUtils.d.ts

@@ -0,0 +1 @@
+export declare const coverToParallel: (treeData: any, result: any[], chilKey: string) => any[];

package/dist/utils/index.d.ts

@@ -4,6 +4,7 @@ import './LocalstorageUtils';
 import './utils';
 import './auth';
 import './xlsxUtil';
+import './TreeUtils';
 export * from './requestUtils';
 export * from './checkUtils';
 export * from './LocalstorageUtils';
@@ -14,3 +15,4 @@ export * from './TableUtils';
 export * from './businessUtils';
 export * from './utils';
 export * from './xlsxUtil';
+export * from './TreeUtils';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "3.2.4",
+  "version": "3.2.5",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

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

@@ -54,7 +54,7 @@ export default class GuideWrapper extends Component {
     return (
       <div {...props} className={classNames('guide-wrapper', props?.className)}>
         {children}
-        <div
+        {/* <div
           className='form-guide'
         >
           <div className='form-guide-top'>
@@ -87,7 +87,7 @@ export default class GuideWrapper extends Component {
           <div className='form-guide-bottom'>
             <img width={24} src={label_icon_bottom} />
           </div>
-        </div>
+        </div> */}
       </div>
     )
   }

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

@@ -1477,6 +1477,23 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
     needModalTable = false
   }
 
+  // 新-法人公司选择器（无弹窗）
+  if(type === 'platCompany') {
+    requestConfig = {
+      url: `${prefixUrl.selectPrefix}/platCompany`,
+      filter: 'qp-name,socialCreditCode-orGroup,like', // 过滤参数
+      mappingTextField: 'name',
+      mappingTextShowKeyField: 'socialCreditCode',
+      mappingValueField: 'socialCreditCode',
+      otherParams: {
+        sorter: 'desc-id'
+      }, // 默认参数
+      sourceName: 'platCompany',
+      ...requestConfigProp,
+    }
+    needModalTable = false
+  }
+
   // 员工选择器
   if(type === 'employee') {
     requestConfig = {

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

@@ -76,7 +76,7 @@ const loadSelectSource = (url: string, params?: any) => {
 const handleDefaultPrefixUrl = (type: string) => {
   let result;
   switch (type){
-    case 'supplier2': case 'customer2': case 'shopFile2':
+    case 'supplier2': case 'customer2': case 'shopFile2': case 'platCompany':
       result =  '/channel-manage';
       break;
     case 'skuCommodity': case 'skuPropertyValue': case 'spuCommodity': case 'skcCommodity': case 'brand':

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

@@ -374,7 +374,14 @@ const AddSelect = (props: any) => {
         }
       }
 
-      return item
+      return {
+        ...item,
+        ...(item?.render?{
+          render: (text, record, index) => {
+            return item?.render(text, record, index, popvalue,editRecord)
+          }
+        }:{})
+      }
     }), {
       title: '操作',
       width: 50,

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

@@ -44,6 +44,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     extralHeaders = {},// 额外请求头参数
     specialBracket = false,// 是否使用特殊括弧显示选项 【value】text
     noNeedSplit = false,// label显示不需要任何特殊化
+    method = 'get'
   } = requestConfig || {};
   const resultSourceKey = handleSourceName(sourceName || requestConfig?.sourceName || ctx?.name || 'supplierCode')
 
@@ -288,13 +289,17 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     if (isNil(queryParams[selectParamsKey])) {
       queryParams[selectParamsKey] = searchValue;
     }
-    request
-      .get(
-        `${url}?${stringify(queryParams)}`,
-        {
-          headers: { ...extralHeaders }
-        })
-      .then((result: any) => {
+
+    let getRequest
+    const methodName = method?.toLocaleLowerCase();
+    if(['post','patch','put'].includes(methodName)) {
+      getRequest = request[methodName](`${url}`,{ ...queryParams })
+    } else {
+      getRequest = request.get( `${url}?${stringify(queryParams)}`,{headers: { ...extralHeaders }})
+    }
+    if (!getRequest) return;
+
+    getRequest.then((result: any) => {
         setFetching(false)
         result = result.data;
         if (judgeIsRequestError(result)) {

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

@@ -1,7 +1,7 @@
 // @ts-nocheck
 import { BsCascader } from '@/components/Functional/BsAntdSula';
 import { BusinessSearchSelect, BusinessTreeSearchSelect } from '@/index';
-import { getDictionarySource, uuid } from '../../../utils/utils';
+import { getDictionarySource, judgeIsEmpty, uuid } from '../../../utils/utils';
 import { useRequest } from 'ahooks';
 import { Input, InputNumber, DatePicker, Switch, Select } from 'antd';
 import React, { useEffect, useState } from 'react'
@@ -81,8 +81,10 @@ export default function RenderCompItem(props:any){
           (ites?.valueType === 23 || ites?.valueType === 22) && (
             <InputNumber
               disabled={disabled}
-              max={Number.MAX_SAFE_INTEGER}
-              min={ites?.valueType === 23 ? 0 : Number.MIN_SAFE_INTEGER}
+              // max={Number.MAX_SAFE_INTEGER}
+              max={judgeIsEmpty(ites?.maxValue) ? Number.MAX_SAFE_INTEGER : ites.maxValue}
+              // min={ites?.valueType === 23 ? 0 : Number.MIN_SAFE_INTEGER}
+              min={judgeIsEmpty(ites?.minValue) ? (ites?.valueType === 23 ? 0 : Number.MIN_SAFE_INTEGER) : ites.minValue}
               precision={ites?.valueType === 23 ? 0 : 2}
               defaultValue={ites.defaultValue}
               style={style2}

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

@@ -34,6 +34,7 @@ import {
   isObj,
 } from './util';
 import { getDictionarySource, uuid } from '../../../utils/utils';
+import { coverToParallel } from '../../../utils/TreeUtils';
 import {
   BusinessSearchSelect,
   BusinessTreeSearchSelect,
@@ -321,6 +322,9 @@ class RuleObjectComponent extends Component {
       handleOperatingAction,
       ruleGroupInfo,
       needShowAction = true,
+      extraConfig,
+      customTitleSubStyle,
+      customTitlePreStyle,
     } = this.props;
     const isRuleInstance = ruleGroupInfo?.type?.indexOf('instance') > -1;   // 业务调用规则实例设计器
     const ruleGroupName = ruleGroupInfo?.ruleGroupList?.[0]?.name || '规则分组';
@@ -334,6 +338,7 @@ class RuleObjectComponent extends Component {
       background: '#fff',
       width: '160px',
       textAlign: 'center',
+      ...(customTitlePreStyle || {}),
     }; // height：22
     const titleSubCommon = {
       display: 'flex',
@@ -345,6 +350,7 @@ class RuleObjectComponent extends Component {
       width: '166px',
       top: '-32px', // titlePre(height + top)
       left: '200px', // titlePre(2 * left + width)  左右间距为titlePre的left: 20px
+      ...(customTitleSubStyle || {}),
     }; // height: 24
     const titleSubPre2 = {
       ...titlePre,
@@ -353,7 +359,7 @@ class RuleObjectComponent extends Component {
       top: '-56px', // titleSubPre(top + height)
       left: '386px', // titlePre(left + width + 20)
     }
-    const ruleListBox = (!onlyOneRule || ruleGroupInfo) ? { border: '1px dashed #d9d9d9', marginBottom: 10, overflowX: 'clip' } : {};
+    const ruleListBox = (!onlyOneRule || ruleGroupInfo) ? { border: '1px dashed #d9d9d9', marginBottom: 10, overflowX: 'clip', position: 'relative' } : {};
     const isRuleActionConfig =
       ruleTypeData?.length || ruleReturnConfig?.length;
     return (
@@ -382,7 +388,8 @@ class RuleObjectComponent extends Component {
             disabled,
           };
           return (
-            <div style={ruleListBox}>
+            // rule-line-class方便开发自定义样式，勿删
+            <div className={'rule-line-class'} style={ruleListBox}>
               {!onlyOneRule && !ruleGroupInfo && (
                 <div style={titlePre}>规则{classDataIndex + 1}</div>
               )}
@@ -397,7 +404,18 @@ class RuleObjectComponent extends Component {
                   </div>
                   {isRuleInstance && (
                     <div style={titleSubPre}>
-                      <span style={{ marginRight: 10, display: 'block' }}>优先级</span>
+                      <span 
+                        style={{ 
+                          marginRight: 10, 
+                          display: 'block',  
+                          width: '100px', 
+                          textAlign: 'right', 
+                          overflow: 'hidden', 
+                          textOverflow:'ellipsis', 
+                          whiteSpace: 'nowrap' 
+                        }}>
+                          优先级
+                        </span>
                       <Select
                         size='small'
                         disabled={canChangePriority ? !canChangePriority : disabled}
@@ -437,13 +455,57 @@ class RuleObjectComponent extends Component {
                       />
                    </div>
                   )}
+                  {/* 规则组额外extStrField */}
+                  {
+                    extraConfig && extraConfig.map((extraItem, index) => (
+                      <div style={titleSubPre}>
+                      <span 
+                        style={{ 
+                          marginRight: 10, 
+                          display: 'block', 
+                          width: '100px', 
+                          textAlign: 'right',
+                          overflow: 'hidden', 
+                          textOverflow:'ellipsis', 
+                          whiteSpace: 'nowrap'
+                        }}
+                      >
+                          {extraItem?.label}
+                        </span>
+                      <Select
+                        size='small'
+                        style={{ width: 100 }}
+                        mode={extraItem?.mode || null}
+                        disabled={disabled}
+                        value={ extraItem?.mode === 'multiple' ? (item[extraItem?.code] ? item[extraItem?.code].split(',') : []) : item[extraItem?.code] }
+                        onChange={(v) => {
+                          item[extraItem?.code] = Array.isArray(v) ? v.join(',') : v;
+                          this.setState(
+                            {
+                              ruleClassData,
+                            },
+                            () => {
+                              callBack(ruleClassData);
+                            },
+                          );
+                        }}
+                      >
+                        {extraItem?.optionList?.map((s,sindex) => (
+                          <Option value={s?.value}>{s?.text}</Option>
+                        ))}
+                      </Select>
+                    </div>
+                    ))
+                  }
                 </>
               )}
               <div
                 style={{
                   textAlign: 'right',
-                  marginTop: '-24px',
                   display: canDelete ? 'block' : 'none',
+                  position: 'absolute',
+                  right: '5px',
+                  top: '5px',
                 }}
               >
                 <Button
@@ -613,18 +675,6 @@ class RuleObjectComponent extends Component {
     );
   };
 
-  // 树结构 转化成 平行树 (递归函数)
-  coverToParallel = (treeData, result) => {
-    treeData.forEach((el) => {
-      result.push(el);
-      if (el.children && el.children.length > 0) {
-        // 子级递归
-        this.coverToParallel(el.children, result);
-      }
-    });
-    return result;
-  };
-
   renderRuleItem = (
     itemDetail,
     parentDetail,
@@ -687,7 +737,7 @@ class RuleObjectComponent extends Component {
       queryIdentifyType = 'dynamicDictCodeIdentify';
     }
 
-    const parallelTreeData = this.coverToParallel(ruleTreeData, []) || [];
+    const parallelTreeData = coverToParallel(ruleTreeData, []) || [];
     const currentTreeItem =
       itemDetail?.elementId &&
       parallelTreeData.find((i) => (i?.key?.indexOf('.') > -1 ? i.id : i.key) === itemDetail?.elementId);
@@ -1487,7 +1537,6 @@ class RuleObjectComponent extends Component {
         classDataIndex
         ].extraInfo.response.map((i) => {
         if (i.code && keys.some((r) => r === i.code) && !i.enable) {
-          console.log('i', i);
           return { ...i, enable: true };
         }
         return i;

package/src/components/Solution/RuleSetter/baseRule.tsx

@@ -28,6 +28,8 @@ export default forwardRef((props: any, ref) => {
     baseRuleDetailList = [],
     systemVariableList = [],
     defRuleDetail = {},
+    customerValidator,
+    saveUrl = '',
   } = props;
   const sceneId = scenceParams?.sceneId;
   const sceneName = scenceParams?.sceneName;
@@ -258,6 +260,12 @@ export default forwardRef((props: any, ref) => {
 
   const handleSave = (needCheckOnlyOne: boolean = false) => {
     const ruleResultList = handleRuleResultList(callbackData, ruleTypeData);
+
+    // 自定义规则数据保存校验
+    if (customerValidator && !customerValidator(ruleResultList, ruleTypeData)) {
+      return Promise.reject();
+    }
+
     if (needCheckOnlyOne && ruleResultList?.length === 0) {
       message.warning('请至少配置一个规则！');
       return Promise.reject();
@@ -265,7 +273,9 @@ export default forwardRef((props: any, ref) => {
     const actionRequiredCheckObject = handleRuleRequireCheck(
       ruleResultList,
       ruleTypeData,
-      ruleReturnConfig
+      ruleReturnConfig,
+      type == 'instance',
+      regularDataList
     );
     if (actionRequiredCheckObject?.checkResult) {
       const modal = Modal.warning({
@@ -277,11 +287,19 @@ export default forwardRef((props: any, ref) => {
       setTimeout(() => {
         modal.destroy();
       }, 10000);
-      return;
+      return Promise.reject();
     }
 
     // setLoading(true);
 
+    // 退货协议特殊处理逻辑，拼接业务类型值extStrField02
+    let extStrField02List: any[] = [];
+    ruleResultList.forEach((item: any) => {
+      const itemList = item?.extStrField02 ? item?.extStrField02.split(',') : [];
+      extStrField02List = [...extStrField02List, ...itemList];
+    })
+    let extStrField02 = Array.from(new Set(extStrField02List)).join(',');
+
     // 兼容没有规则组的情况
     const params = ruleGroupList?.length
       ? ruleGroupList.map((groupItem: any) => ({
@@ -296,6 +314,7 @@ export default forwardRef((props: any, ref) => {
             ...(instanceName ? { name: instanceName || i?.name } : {}),
           })),
           ...(extStrField01 ? { extStrField01 } : {}),
+          ...(extStrField02 ? { extStrField02 } : {}),
           ruleId: groupItem.id,
           templateId: sceneId,
         }))
@@ -308,6 +327,7 @@ export default forwardRef((props: any, ref) => {
               ...(extStrField01
                 ? { extStrField01: extStrField01 || i?.extStrField01 }
                 : {}),
+              ...(extStrField02 ? { extStrField02 } : {}),
               ...(instanceName ? { name: instanceName || i?.name } : {}),
             })),
             ...(extStrField01 ? { extStrField01 } : {}),
@@ -315,7 +335,7 @@ export default forwardRef((props: any, ref) => {
           },
         ];
 
-    const handleUrl = `/basic/ruleDetail/addAndUpdate`;
+    const handleUrl = saveUrl || `/basic/ruleDetail/addAndUpdate`;
     const handleMethod = 'POST';
 
     return request({

package/src/components/Solution/RuleSetter/function.ts

@@ -48,6 +48,7 @@
 //         }
 //     ]
 // }
+import { coverToParallel } from '@/utils/TreeUtils';
 export const formatOperationList = (data: any) => {
   let result = data||[];
   result = result.concat([{
@@ -164,6 +165,7 @@ export const handleRuleShowBack = (data: any, functionRuleList: any, ruleReturnL
       priority: item.priority,
       status: item.status,
       extStrField01: item?.extStrField01,
+      extStrField02: item?.extStrField02,
       name: item?.name,
     };
     if (item?.expression) {
@@ -194,12 +196,39 @@ const isNoEmpty = (data: any) =>
   !(data == null || data == undefined || String(data).trim() == '');
 
 // 校验必填数据
-export const handleRuleRequireCheck = (saveData: any, ruleActionData: any, ruleReturnConfig: any) => {
+export const handleRuleRequireCheck = (saveData: any, ruleActionData: any, ruleReturnConfig: any, isInstance?: boolean, regularDataList?: any) => {
   let checkResult = false; // 默认通过校验
-  let checkInfo: any = []; // 没有选必填执行动作(暂不考虑)；执行动作下的对象未选
+  const checkInfo: any = []; // 没有选必填执行动作(暂不考虑)；执行动作下的对象未选
+
+  // 处理对象-设置了必填-规则实例保存时数据必填校验
+  if (isInstance && regularDataList?.length && saveData?.length) {
+    const list = coverToParallel(regularDataList,[],'propertyList'); // 平铺对象树
+    const requiredList = list.filter((c: any) => c.required == 1)||[]; // 获取对象属性为true的集合
+    requiredList?.length &&
+    saveData.forEach((s: any, index: number) => {
+      const coverExpressionTree = s?.expression?.subExpression?.length ? coverToParallel(s?.expression?.subExpression,[],'subExpression') : (s?.expression && [s?.expression]);
+      coverExpressionTree?.length &&
+      coverExpressionTree?.forEach?.((e: any) => {
+          if (requiredList.some((r: any) => r.id === e.elementId)) {
+            const isComplete = !!e?.params?.length && isNoEmpty(e?.params?.[0]);
+            if (!isComplete) {
+              checkResult = true;
+              // 如果 e.elementName 不存在于 checkInfo 中，则添加
+              if (Array.isArray(checkInfo) && e && typeof e.elementName === 'string') {
+                const checkText = `规则${index + 1}: 存在对象【${e.elementName}】信息填写不完整`
+                const checkInfoSet = new Set(checkInfo);
+                if (!checkInfoSet.has(checkText)) {
+                  checkInfo.push(checkText);
+                }
+              }
+            }
+          }
+        });
+    });
+  }
 
   // 校验返回值必填数据(兼容新/老数据: 配置对象为新数据/旧数据、规则返回值配置为老/新数据。组合一共是四种情况)
-  if((ruleReturnConfig?.required || (Array.isArray(ruleReturnConfig) && ruleReturnConfig?.length)) && saveData.length) {
+  if ((ruleReturnConfig?.required || (Array.isArray(ruleReturnConfig) && ruleReturnConfig?.length)) && saveData.length) {
     const checkKey = 'code'
 
     saveData.forEach((s: any, index: number) => {
@@ -381,6 +410,7 @@ export const handleRuleResultList = (data: any, ruleTypeData: any) => {
         priority: i.priority,
         status: i.status,
         extStrField01: i?.extStrField01,
+        extStrField02: i?.extStrField02,
         name: i?.name,
       };
     });

package/src/components/Solution/RuleSetter/index.tsx

@@ -182,6 +182,8 @@ export default forwardRef((props: any, ref) => {
       <Card bordered={false} bodyStyle={{ paddingTop: 0 }}>
         <BaseRule
           ref={baseRuleRef}
+          customerValidator={props?.customerValidator}
+          saveUrl={props?.saveUrl}
           scenceParams={{
             sceneId: currentSceneId,
             sceneName: currentSceneName,

package/src/index.ts

@@ -34,6 +34,7 @@ export { default as MoreTreeTable } from './components/Business/moreTreeTable';;
 export { default as JsonQueryTable } from './components/Business/JsonQueryTable';
 export { default as TableColumnSetting} from './plugin/TableColumnSetting';
 export { default as AuthButton } from './components/Functional/AuthButton';
+export { default as CustomSelector } from './components/Solution/RuleComponent/CustomPlugin/CustomSelector';
 
 export { default as EllipsisTooltip} from './components/Functional/EllipsisTooltip';
 export * from './components/Functional/BsAntdSula/index';

package/src/utils/TreeUtils.ts

@@ -0,0 +1,12 @@
+// 获取树平行结构
+export const coverToParallel = (treeData: any, result: any[],chilKey: string) =>{
+  let childrenKey = chilKey || 'children';
+  treeData.forEach((el: any)=>{
+    result.push(el);
+    if(el?.[childrenKey] && el?.[childrenKey]?.length>0) {
+      // 子级递归
+      coverToParallel(el?.[childrenKey],result,chilKey)
+    }
+  });
+  return result
+};

package/src/utils/index.ts

@@ -4,6 +4,7 @@ import './LocalstorageUtils';
 import './utils';
 import './auth'
 import './xlsxUtil';
+import './TreeUtils';
 
 // 导出所有工具函数
 export * from './requestUtils';
@@ -16,4 +17,5 @@ export * from './TableUtils';
 export * from './businessUtils';
 export * from './utils';
 export * from './xlsxUtil';
+export * from './TreeUtils';