@bit-sun/business-component 4.0.5 → 4.0.7

package/package.json

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

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

@@ -322,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 || '规则分组';
@@ -335,6 +338,7 @@ class RuleObjectComponent extends Component {
       background: '#fff',
       width: '160px',
       textAlign: 'center',
+      ...(customTitlePreStyle || {}),
     }; // height：22
     const titleSubCommon = {
       display: 'flex',
@@ -346,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,
@@ -354,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 (
@@ -383,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>
               )}
@@ -398,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}
@@ -438,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
@@ -1476,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,9 @@ export default forwardRef((props: any, ref) => {
     baseRuleDetailList = [],
     systemVariableList = [],
     defRuleDetail = {},
+    customerValidator,
+    parseCustomParams,
+    saveUrl = '',
   } = props;
   const sceneId = scenceParams?.sceneId;
   const sceneName = scenceParams?.sceneName;
@@ -258,6 +261,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();
@@ -284,6 +293,14 @@ export default forwardRef((props: any, ref) => {
 
     // 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) => ({
@@ -298,6 +315,7 @@ export default forwardRef((props: any, ref) => {
             ...(instanceName ? { name: instanceName || i?.name } : {}),
           })),
           ...(extStrField01 ? { extStrField01 } : {}),
+          ...(extStrField02 ? { extStrField02 } : {}),
           ruleId: groupItem.id,
           templateId: sceneId,
         }))
@@ -310,6 +328,7 @@ export default forwardRef((props: any, ref) => {
               ...(extStrField01
                 ? { extStrField01: extStrField01 || i?.extStrField01 }
                 : {}),
+              ...(extStrField02 ? { extStrField02 } : {}),
               ...(instanceName ? { name: instanceName || i?.name } : {}),
             })),
             ...(extStrField01 ? { extStrField01 } : {}),
@@ -317,14 +336,19 @@ export default forwardRef((props: any, ref) => {
           },
         ];
 
-    const handleUrl = `/basic/ruleDetail/addAndUpdate`;
+    const handleUrl = saveUrl || `/basic/ruleDetail/addAndUpdate`;
     const handleMethod = 'POST';
 
+    let finalParams: any;
+    if (parseCustomParams) {
+      finalParams = parseCustomParams(params);
+    }
+
     return request({
       url: handleUrl,
       method: handleMethod,
       convertParams: () => {
-        return params;
+        return finalParams || params;
       },
       converter: (res: any) => {
         return res;

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

@@ -165,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) {
@@ -409,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,9 @@ export default forwardRef((props: any, ref) => {
       <Card bordered={false} bodyStyle={{ paddingTop: 0 }}>
         <BaseRule
           ref={baseRuleRef}
+          customerValidator={props?.customerValidator}
+          parseCustomParams={props?.parseCustomParams}
+          saveUrl={props?.saveUrl}
           scenceParams={{
             sceneId: currentSceneId,
             sceneName: currentSceneName,