@bit-sun/business-component 2.4.29 → 2.4.30

package/dist/utils/LocalstorageUtils.d.ts

@@ -15,4 +15,9 @@ export declare function getAccountID(): any;
 export declare function getUserName(): any;
 export declare function handleUserPhone(): any;
 export declare function getCurrentTargetBgId(): string | null;
+/*******      公用localstorage存取 开始      *****/
+export declare const getLastKey: (prefix: any, key: string) => string;
+export declare const getLocalStorageSaveKey: (key: string, channel?: string) => string;
 export declare const getMenuAuthDataKey: (channel?: string) => string;
+export declare const getLimitMenuDataKey: (channel?: string) => string;
+/*******      公用localstorage结束      *****/

package/package.json

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

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

@@ -16,8 +16,7 @@ import deleteIcon from '../../../assets/btn-delete.svg';
 import moreIcon from '../../../assets/btn-more.svg';
 import { useLocation, formatMessage } from 'umi';
 import CommonAlert from '../CommonAlert';
-import ENUM from '@/utils/enumConfig';
-import { getMenuAuthDataKey } from '@/utils/LocalstorageUtils';
+import { getMenuAuthDataKey, getLimitMenuDataKey } from '@/utils/LocalstorageUtils';
 
 interface actionItem {
   type?: string;
@@ -74,7 +73,7 @@ const DetailWrapper = React.memo(
     const menuRoutes =
       window.top == window
         ? routes.find((item) => item.path === '/')?.routes || []
-        : JSON.parse(localStorage.getItem(ENUM.BROWSER_CACHE.LIMIT_MENU_DATA) || '[]');
+        : JSON.parse(localStorage.getItem(getLimitMenuDataKey()) || '[]');
 
     const breadcrumbNameMap = getMainCrumbNameMap(
       memoizeOneFormatter(menuRoutes, ''),

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

@@ -6,7 +6,7 @@ import { Breadcrumb, Space } from 'antd';
 import './index.less';
 import { useLocation, formatMessage } from 'umi';
 import CommonAlert from '../CommonAlert';
-import ENUM from '@/utils/enumConfig';
+import { getLimitMenuDataKey } from '@/utils/LocalstorageUtils'
 
 export default (props: any) => {
   const { pathname } = useLocation();
@@ -15,11 +15,11 @@ export default (props: any) => {
 
   return (
     <div id={id} className={'home_page_wrapper'}>
-      <HeaderWrapper 
+      <HeaderWrapper
         pathname={pathname}
         {
           ...restProps
-        } 
+        }
       />
       {props.children}
     </div>
@@ -27,9 +27,9 @@ export default (props: any) => {
 };
 
 const HeaderWrapper = React.memo(
-  ({ 
-    pathname, 
-    routes=[], 
+  ({
+    pathname,
+    routes=[],
     itemPath,
     alertProps,
     extra,
@@ -41,7 +41,7 @@ const HeaderWrapper = React.memo(
     const menuRoutes =
       window.top == window
         ? routes.find((item) => item.path === '/')?.routes || []
-        : JSON.parse(localStorage.getItem(ENUM.BROWSER_CACHE.LIMIT_MENU_DATA) || '[]');
+        : JSON.parse(localStorage.getItem(getLimitMenuDataKey()) || '[]');
 
     const breadcrumbNameMap = getMainCrumbNameMap(
       memoizeOneFormatter(menuRoutes, ''),
@@ -133,7 +133,7 @@ const HeaderWrapper = React.memo(
             </Breadcrumb>
           </div>
           {
-            extra ? 
+            extra ?
             <Space>
               {
                 extra

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

@@ -113,7 +113,9 @@ class RuleObjectComponent extends Component {
       return {
         title: item.name,
         key: item.id,
-        value: item.code,
+        pValue: item.code, // 后端存path key, children同理
+        value: item.id, // 前端选中唯一key, children同理
+        id: item.id, // 前端选中回显示唯一key, children同理
         ...(item?.propertyList?.length
           ? {
               children: item.propertyList.map((element) => {
@@ -145,7 +147,8 @@ class RuleObjectComponent extends Component {
                 let child = {
                   title: `${item.name}-${element.name}`,
                   key: element.id,
-                  value: `${element.code}`,
+                  pValue: this.props.isRouteProperty ? `${item.code}.${element.code}` : element.code,
+                  value: element.id,
                   id: element.id,
                   dataTypeCode: element.valueType,
                   dataChoiceBusinessType: element.choiceType,
@@ -167,7 +170,14 @@ class RuleObjectComponent extends Component {
                 return child;
               }),
             }
-          : {}),
+          : {
+            isLeaf: this.props.metaObjectCode ? true : false,
+            metaObjectCode: this.props.metaObjectCode || item.code,
+            ...item,
+            dataTypeCode: item.valueType,
+            dataChoiceBusinessType: item.choiceType,
+            dataInputBusinessType: item.inputType,
+          }),
       };
     });
     this.setState({
@@ -207,7 +217,8 @@ class RuleObjectComponent extends Component {
       let child = {
         title: `${parentTitle}-${element.name}`,
         key: `${parentKey}.${element.id}`,
-        value: `${parentKey}.${element.code}`,
+        pValue: `${parentKey}.${element.code}`,
+        value: element.id,
         id: element.id,
         dataTypeCode: element.valueType,
         dataChoiceBusinessType: element.choiceType,
@@ -242,7 +253,7 @@ class RuleObjectComponent extends Component {
     // })
     const list =
       operationList.find((item) => item.code == id)?.operationList || [];
-    return list;
+    return this.props.isShowAllOperationList ? operationList : list;
   };
 
   handleValuesChange = (itemDetail, newValues, newValueNames) => {
@@ -303,6 +314,7 @@ class RuleObjectComponent extends Component {
       onlyAction,
       handleOperatingAction,
       ruleGroupInfo,
+      needShowAction = true,
     } = this.props;
     const isRuleInstance = ruleGroupInfo?.type?.indexOf('instance') > -1;
     const ruleGroupName = ruleGroupInfo?.ruleGroupList?.[0]?.name || '规则分组';
@@ -440,6 +452,7 @@ class RuleObjectComponent extends Component {
                   }}
                 >
                   <Input
+                    disabled={disabled}
                     value={currentRuleName}
                     style={{ width: '200px' }}
                     onChange={(e) => {
@@ -449,6 +462,7 @@ class RuleObjectComponent extends Component {
                     }}
                   />
                   <Button
+                    disabled={disabled}
                     type="link"
                     onClick={() => {
                       const { ruleClassData, currentRuleName } = this.state;
@@ -462,6 +476,7 @@ class RuleObjectComponent extends Component {
                     保存
                   </Button>
                   <Button
+                    disabled={disabled}
                     type="link"
                     onClick={() => {
                       this.setState({
@@ -486,21 +501,23 @@ class RuleObjectComponent extends Component {
                           relateDatas,
                         )}
                     </div>
-                    <div className={'base_rule_item3'}>
-                      {(extraInfo &&
-                        isRuleActionConfig &&
-                        (!onlyCondition || !onlyAction) &&
-                        this.renderRuleTypeItem(
-                          extraInfo,
-                          item,
-                          1,
-                          classDataIndex,
-                          ruleTypeData,
-                          ruleReturnConfig,
-                          isRuleInstance
-                        )) ||
+                    {needShowAction && (
+                      <div className={'base_rule_item3'}>
+                        {(extraInfo &&
+                          isRuleActionConfig &&
+                          (!onlyCondition || !onlyAction) &&
+                          this.renderRuleTypeItem(
+                            extraInfo,
+                            item,
+                            1,
+                            classDataIndex,
+                            ruleTypeData,
+                            ruleReturnConfig,
+                            isRuleInstance
+                          )) ||
                         null}
-                    </div>
+                      </div>
+                    ) || null}
                   </div>
                 )}
               </div>
@@ -513,7 +530,7 @@ class RuleObjectComponent extends Component {
 
   handleAddRule = () => {
     const { ruleClassData } = this.state;
-    const { callBack, ruleTypeData, ruleGroupInfo } = this.props;
+    const { callBack, ruleTypeData=[], ruleGroupInfo } = this.props;
     const isRuleInstance = ruleGroupInfo?.type?.indexOf('instance') > -1;
     const initKongData = {
       ruleName: `规则${ruleClassData?.length + 1}`,
@@ -529,7 +546,7 @@ class RuleObjectComponent extends Component {
           enable: false,
           value: '',
         },
-        execute: ruleTypeData.map((s) => {
+        execute: ruleTypeData?.map((s) => {
           return {
             priority: 1,
             code: s.code,
@@ -537,7 +554,7 @@ class RuleObjectComponent extends Component {
               configPropertyCode: 'configPropertyValue',
             },
           };
-        }),
+        })||[],
       },
     }
     const initTemplateData = ruleGroupInfo?.templateData && Object.keys(ruleGroupInfo?.templateData)?.length ? {
@@ -699,12 +716,12 @@ class RuleObjectComponent extends Component {
           ) : (
             <div style={{ display: 'flex', alignItems: 'center' }}>
               <TreeSelect
-                value={itemDetail.propertyPath}
+                value={itemDetail.elementId}
                 disabled={disabled}
                 onChange={(value, name, nodeInfo) => {
                   if (!nodeInfo.triggerNode.props.isLeaf) return; //只有最末端叶子节点可选中
                   const { ruleClassData } = this.state;
-                  itemDetail.propertyPath = value;
+                  itemDetail.propertyPath = nodeInfo.triggerNode.props.pValue;
                   itemDetail.params = [];
                   itemDetail.paramNames = [];
                   itemDetail.operationCode = '';
@@ -754,6 +771,7 @@ class RuleObjectComponent extends Component {
               </Select>
               {!itemDetail?.isInsertParam ? (
                 <RuleField
+                  customerWidth={this.props.customerWidth}
                   selectOperation={itemDetail?.operationCode || ''}
                   disabled={disabled}
                   initialThresholdQuery={thresholdQuery}
@@ -780,11 +798,11 @@ class RuleObjectComponent extends Component {
               <Select
                 disabled={disabled}
                 value={
-                  itemDetail?.params?.[0]?.replace('{', '').replace('}', '') ||
+                  itemDetail?.systemCode || itemDetail?.params?.[0]?.replace('{', '').replace('}', '') ||
                   ''
-                }
+                } // systemCode兼容用户结算组织那边使用规则
                 style={{
-                  width: '150px',
+                  width: '250px',
                   marginLeft: '10px',
                   display: itemDetail?.isInsertParam ? '' : 'none',
                 }}
@@ -796,6 +814,7 @@ class RuleObjectComponent extends Component {
                     (i) => i.code == value,
                   )?.name;
                   itemDetail.paramNames = [name || ''];
+                  itemDetail.systemCode = value;
                   this.setState(
                     {
                       ruleClassData,
@@ -806,7 +825,7 @@ class RuleObjectComponent extends Component {
                   );
                 }}
               >
-                {systemVariableList
+                {systemVariableList?.length
                   ? systemVariableList.map((item) => (
                       <Select.Option value={item.code} key={item.code}>
                         {item.name}
@@ -842,16 +861,22 @@ class RuleObjectComponent extends Component {
               <Button
                 type="link"
                 disabled={
-                  disabled || itemDetail.operationCode === '' || !itemDetail.operationCode
+                  disabled || (itemDetail.operationCode === '' || !itemDetail.operationCode
                     ? true
-                    : false
+                    : false)
                 }
                 onClick={() => {
                   const { ruleClassData } = this.state;
-                  if (systemVariableList?.length) {
+                  if (systemVariableList && Array.isArray(systemVariableList) && systemVariableList.length && systemVariableList[0].code!== '-1' ) {
                     itemDetail.isInsertParam = !itemDetail.isInsertParam;
-                    delete itemDetail.params;
-                    delete itemDetail.paramNames;
+                    if (itemDetail.isInsertParam) {
+                      itemDetail.type = 10;
+                      itemDetail.paramNames = [];
+                      itemDetail.params = [];
+                    } else {
+                      itemDetail.systemCode = null;
+                    }
+
                     this.setState(
                       {
                         ruleClassData,
@@ -1775,8 +1800,9 @@ class RuleObjectComponent extends Component {
     };
     return (
       <div>
-        <div style={{ textAlign: 'right', display: isRuleInstance ? 'none' : 'flex' }}>
+        <div style={{ textAlign: 'right', display: 'flex' }}>
           <Button
+            disabled={disabled}
             type="link"
             onClick={() => {
               if (isHaveRuleTypeData) {
@@ -1796,6 +1822,7 @@ class RuleObjectComponent extends Component {
             新增动作
           </Button>
           <Button
+            disabled={disabled}
             type="link"
             onClick={() => {
               if (isHaveRuleReturnConfig) {
@@ -1876,6 +1903,7 @@ class RuleObjectComponent extends Component {
       {
         // "expressionType": "relation",
         operationType: 'relation',
+        type: 20,
         operationCode: '',
         propertyPath: '',
         params: [],
@@ -1894,7 +1922,7 @@ class RuleObjectComponent extends Component {
 
   handleDeleteRule = (itemDetail, parentDetail, classDataIndex) => {
     const { ruleClassData } = this.state;
-    const { callBack } = this.props;
+    const { callBack, metaObjectCode } = this.props;
     if (parentDetail.ruleName) {
       //删除根规则层级最后一条时整个规则项删除
       ruleClassData.splice(classDataIndex, 1);
@@ -1924,8 +1952,7 @@ class RuleObjectComponent extends Component {
           parentDetail.paramNames = parentDetail.subExpression[0].paramNames
             ? [...parentDetail.subExpression[0].paramNames]
             : [];
-          parentDetail.metaObjectCode =
-            parentDetail.subExpression[0].metaObjectCode;
+          parentDetail.metaObjectCode = metaObjectCode || parentDetail.subExpression[0].metaObjectCode;
           parentDetail.elementId = parentDetail.subExpression[0].elementId;
           parentDetail.elementName = parentDetail.subExpression[0].elementName;
           parentDetail.dataTypeCode =
@@ -2005,25 +2032,28 @@ class RuleObjectComponent extends Component {
   };
 
   render() {
-    const { onlyOneRule, callBack } = this.props;
+    const { onlyOneRule, callBack, disabled, headerButtonComponentFun } = this.props;
     const { ruleClassData, modalParams } = this.state;
     return (
       <div className={'base_rule'}>
         <div className={'base_rule_content'}>
-          <div
-            style={{
-              display: onlyOneRule ? 'none' : 'block',
-            }}
-            className={'base_rule_line_title'}
-          >
-            <Button
-              onClick={this.handleAddRule}
-              className={'base_rule_btn_style'}
-              type="link"
+          {headerButtonComponentFun?headerButtonComponentFun(this.handleAddRule): (
+            <div
+              disabled={disabled}
+              style={{
+                display: onlyOneRule ? 'none' : 'block',
+              }}
+              className={'base_rule_line_title'}
             >
-              新增规则
-            </Button>
-          </div>
+              <Button
+                onClick={this.handleAddRule}
+                className={'base_rule_btn_style'}
+                type="link"
+              >
+                新增规则
+              </Button>
+            </div>
+          )}
           <div>{this.renderRuleContent()}</div>
         </div>
         {(modalParams.visible && (

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

@@ -47,7 +47,6 @@
 
   .base_rule_line_content {
     display: flex;
-    // border-bottom: 1px solid #d9d9d9;
     padding: 15px;
     overflow-x: auto;
     .base_rule_icon_btn {

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

@@ -277,7 +277,7 @@ export default class RuleField extends Component {
       width: customerWidth || '150px',
     };
     if (!selectOperation) return <Input disabled style={styleCommon}></Input>;
-    const SET_TYPE = ['in', 'nin', 'cn', 'ncn']; //集合类型
+    const SET_TYPE = ['in', 'nin', 'cn', 'ncn','5']; //集合类型 （数字为 兼容用户管理子应用使用规则组件）
     const INTERVAL_TYPE = ['be', 'bed', 'nbe', 'nbed', 'ber', 'bel']; //区间类型
     const IS_KONG = ['en']; // 为空
     if (IS_KONG.indexOf(selectOperation) > -1) {
@@ -1143,8 +1143,9 @@ export default class RuleField extends Component {
                 treeCheckable={dataInputBusinessType === 12}
                 businessType="department"
                 labelInValue={true}
-                value={values[0]}
+                value={dataInputBusinessType === 12 ? values[0] : values[0][0]}
                 style={styleCommon}
+                treeCheckStrictly={true}
                 onChange={(value) => {
                   if (dataInputBusinessType === 12) {
                     values[0] = value.map((i) => i.key);
@@ -1163,8 +1164,9 @@ export default class RuleField extends Component {
                 treeCheckable={dataInputBusinessType === 12}
                 businessType="department"
                 labelInValue={true}
-                value={values[0]}
+                value={dataInputBusinessType === 12 ? values[1] : values[1][0]}
                 style={styleCommon}
+                treeCheckStrictly={true}
                 onChange={(value) => {
                   if (dataInputBusinessType === 12) {
                     values[1] = value.map((i) => i.key);
@@ -1186,8 +1188,9 @@ export default class RuleField extends Component {
               treeCheckable={dataInputBusinessType === 12}
               businessType="department"
               labelInValue={true}
-              value={values[0]}
+              value={dataInputBusinessType === 12 ? values : values[0]}
               style={styleCommon}
+              treeCheckStrictly={true}
               onChange={(value) => {
                 if (dataInputBusinessType === 12) {
                   values = value.map((i) => i.key)||[];
@@ -1213,8 +1216,9 @@ export default class RuleField extends Component {
                 treeCheckable={dataInputBusinessType === 12}
                 businessType="purchase-organization"
                 labelInValue={true}
-                value={values[0]}
+                value={dataInputBusinessType === 12 ? values[0] : values[0][0]}
                 style={styleCommon}
+                treeCheckStrictly={true}
                 onChange={(value) => {
                   if (dataInputBusinessType === 12) {
                     values[0] = value.map((i) => i.key);
@@ -1233,8 +1237,9 @@ export default class RuleField extends Component {
                 treeCheckable={dataInputBusinessType === 12}
                 businessType="purchase-organization"
                 labelInValue={true}
-                value={values[0]}
+                value={dataInputBusinessType === 12 ? values[1] : values[1][0]}
                 style={styleCommon}
+                treeCheckStrictly={true}
                 onChange={(value) => {
                   if (dataInputBusinessType === 12) {
                     values[1] = value.map((i) => i.key);
@@ -1256,8 +1261,9 @@ export default class RuleField extends Component {
               treeCheckable={dataInputBusinessType === 12}
               businessType="purchase-organization"
               labelInValue={true}
-              value={values[0]}
+              value={dataInputBusinessType === 12 ? values : values[0]}
               style={styleCommon}
+              treeCheckStrictly={true}
               onChange={(value) => {
                 if (dataInputBusinessType === 12) {
                   values = value.map((i) => i.key)||[];
@@ -1283,8 +1289,9 @@ export default class RuleField extends Component {
                 treeCheckable={dataInputBusinessType === 12}
                 businessType="sales-organization"
                 labelInValue={true}
-                value={values[0]}
+                value={dataInputBusinessType === 12 ? values[0] : values[0][0]}
                 style={styleCommon}
+                treeCheckStrictly={true}
                 onChange={(value) => {
                   if (dataInputBusinessType === 12) {
                     values[0] = value.map((i) => i.key);
@@ -1303,8 +1310,9 @@ export default class RuleField extends Component {
                 treeCheckable={dataInputBusinessType === 12}
                 businessType="sales-organization"
                 labelInValue={true}
-                value={values[0]}
+                value={dataInputBusinessType === 12 ? values[1] : values[1][0]}
                 style={styleCommon}
+                treeCheckStrictly={true}
                 onChange={(value) => {
                   if (dataInputBusinessType === 12) {
                     values[1] = value.map((i) => i.key);
@@ -1326,8 +1334,9 @@ export default class RuleField extends Component {
               treeCheckable={dataInputBusinessType === 12}
               businessType="sales-organization"
               labelInValue={true}
-              value={values[0]}
+              value={dataInputBusinessType === 12 ? values : values[0]}
               style={styleCommon}
+              treeCheckStrictly={true}
               onChange={(value) => {
                 if (dataInputBusinessType === 12) {
                   values = value.map((i) => i.key)||[];
@@ -1777,8 +1786,9 @@ export default class RuleField extends Component {
                 treeCheckable={dataInputBusinessType === 12}
                 businessType="stock-organization"
                 labelInValue={true}
-                value={values[0]}
+                value={dataInputBusinessType === 12 ? values : values[0]}
                 style={styleCommon}
+                treeCheckStrictly={true}
                 onChange={(value) => {
                   if (dataInputBusinessType === 12) {
                     values[0] = value.map((i) => i.key);
@@ -1797,8 +1807,9 @@ export default class RuleField extends Component {
                 treeCheckable={dataInputBusinessType === 12}
                 businessType="stock-organization"
                 labelInValue={true}
-                value={values[0]}
+                value={dataInputBusinessType === 12 ? values : values[0]}
                 style={styleCommon}
+                treeCheckStrictly={true}
                 onChange={(value) => {
                   if (dataInputBusinessType === 12) {
                     values[1] = value.map((i) => i.key);
@@ -1820,8 +1831,9 @@ export default class RuleField extends Component {
               treeCheckable={dataInputBusinessType === 12}
               businessType="stock-organization"
               labelInValue={true}
-              value={values[0]}
+              value={dataInputBusinessType === 12 ? values : values[0]}
               style={styleCommon}
+              treeCheckStrictly={true}
               onChange={(value) => {
                 if (dataInputBusinessType === 12) {
                   values = value.map((i) => i.key)||[];

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

@@ -0,0 +1,6 @@
+import React from 'react';
+import RuleSetter from './index';
+
+export default (props: any) => {
+  return <RuleSetter {...props} type={'instance'} />;
+};