@bit-sun/business-component 4.2.0-alpha.21 → 4.2.0-alpha.22

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

@@ -35,12 +35,10 @@ import {
 } from './util';
 import { getDictionarySource, judgeIsEmpty, uuid } from '../../../utils/utils';
 import { coverToParallel } from '../../../utils/TreeUtils';
-import {
-  BusinessSearchSelect,
-  BusinessTreeSearchSelect,
-  EllipsisTooltip,
-  BsCascader,
-} from '../../../index';
+import BusinessSearchSelect from '../../Business/SearchSelect';
+import BusinessTreeSearchSelect from '../../Business/TreeSearchSelect';
+import EllipsisTooltip from '../../Functional/EllipsisTooltip';
+import { BsCascader } from '../../Functional/BsAntdSula/index';
 import { request } from 'bssula';
 import Formula from './Formula';
 import RenderSpecificAction from './renderSpecificAction';
@@ -48,6 +46,19 @@ import RenderCompItem from './RenderCompItem';
 
 const { RangePicker } = DatePicker;
 
+const FIXED_DATA_TYPES = {
+  10: '字符串',
+  20: '短整数',
+  21: '长整数',
+  22: '小数',
+  40: '数组',
+  41: '布尔值',
+  12: '富文本',
+  30: '日期',
+  31: '时间',
+  32: '日期时间',
+};
+
 class RuleObjectComponent extends Component {
   constructor(props) {
     super(props);
@@ -151,6 +162,8 @@ class RuleObjectComponent extends Component {
                   value: element.id,
                   id: element.id,
                   dataTypeCode: element.valueType,
+                  entityValueType: element.entityValueType,
+                  entityInputType: element.entityInputType,
                   dataChoiceBusinessType: element.choiceType,
                   dataInputBusinessType: element.inputType,
                   info: element.info,
@@ -178,6 +191,8 @@ class RuleObjectComponent extends Component {
             metaObjectCode: this.props.metaObjectCode || item.code,
             ...item,
             dataTypeCode: item.valueType,
+            entityValueType: item.entityValueType,
+            entityInputType: item.entityInputType,
             dataChoiceBusinessType: item.choiceType,
             dataInputBusinessType: item.inputType,
           }),
@@ -225,6 +240,8 @@ class RuleObjectComponent extends Component {
         value: element.id,
         id: element.id,
         dataTypeCode: element.valueType,
+        entityValueType: element.entityValueType,
+        entityInputType: element.entityInputType,
         dataChoiceBusinessType: element.choiceType,
         dataInputBusinessType: element.inputType,
         info: element.info,
@@ -689,6 +706,7 @@ class RuleObjectComponent extends Component {
       disabled,
       systemVariableList,
       needShowInsertSQL,
+      needShowReqCondition,
     } = this.props;
     let thresholdQuery = {
       ...initialThresholdQuery,
@@ -824,6 +842,8 @@ class RuleObjectComponent extends Component {
                   itemDetail.elementName = nodeInfo.triggerNode.props.title;
                   itemDetail.dataTypeCode =
                     nodeInfo.triggerNode.props.dataTypeCode;
+                  itemDetail.entityValueType = nodeInfo.triggerNode.props.entityValueType;
+                  itemDetail.entityInputType = nodeInfo.triggerNode.props.entityInputType;
                   itemDetail.metaObjectCode =
                     nodeInfo.triggerNode.props.metaObjectCode;
                   itemDetail.isInsertParam = false;
@@ -1049,13 +1069,21 @@ class RuleObjectComponent extends Component {
           <div
             style={{
               display:
-                itemDetail.operationType == 'logic' && !disabled
+                itemDetail.operationType == 'logic' &&
+                (!disabled ||
+                  (itemDetail.reqConditionData &&
+                    itemDetail.reqConditionData.reqParamName &&
+                    itemDetail.reqConditionData.params?.length))
                   ? 'block'
                   : 'none',
             }}
           >
             <span
-              style={{ color: '#008fe0', cursor: 'pointer' }}
+              style={{
+                color: '#008fe0',
+                cursor: 'pointer',
+                display: disabled ? 'none' : 'inline',
+              }}
               type="link"
               onClick={() => {
                 this.addPeerRule(itemDetail);
@@ -1070,6 +1098,123 @@ class RuleObjectComponent extends Component {
               />
               添加条件
             </span>
+            {needShowReqCondition && (
+              <span
+                style={{
+                  marginLeft: 10,
+                  display: disabled ? 'none' : 'inline',
+                }}
+              >
+                <Button
+                  type="link"
+                  disabled={
+                    disabled &&
+                    (!itemDetail.reqConditionData ||
+                      !itemDetail.reqConditionData.reqParamName ||
+                      !itemDetail.reqConditionData.params?.length)
+                  }
+                  style={{ padding: 0, height: 'auto' }}
+                  onClick={() => this.handleReqConditionToggle(itemDetail)}
+                >
+                  {itemDetail.isReqCondition
+                    ? '取消参数条件控制'
+                    : '参数条件控制'}
+                </Button>
+              </span>
+            )}
+            {(itemDetail.isReqCondition ||
+              (disabled &&
+                itemDetail.reqConditionData &&
+                itemDetail.reqConditionData.reqParamName &&
+                itemDetail.reqConditionData.params?.length)) &&
+              itemDetail.reqConditionData && (
+                <div
+                  style={{
+                    marginTop: 10,
+                    display:
+                      disabled &&
+                      (!itemDetail.reqConditionData.reqParamName ||
+                        !itemDetail.reqConditionData.params?.length)
+                        ? 'none'
+                        : 'flex',
+                    alignItems: 'center',
+                    background: '#f5f5f5',
+                    padding: '10px',
+                    borderRadius: '4px',
+                  }}
+                >
+                <span style={{ marginRight: 8, flexShrink: 0 }}>
+                  请求参数名称:
+                </span>
+                <Input
+                  disabled={disabled}
+                  style={{ width: 150, marginRight: 10 }}
+                  value={itemDetail.reqConditionData.reqParamName}
+                  onChange={(e) =>
+                    this.handleReqDataChange(
+                      itemDetail,
+                      'reqParamName',
+                      e.target.value,
+                    )
+                  }
+                />
+
+                <span style={{ marginRight: 8, flexShrink: 0 }}>类型:</span>
+                <Select
+                  disabled={disabled}
+                  style={{ width: 120, marginRight: 10 }}
+                  value={itemDetail.reqConditionData.dataTypeCode}
+                  onChange={(val) =>
+                    this.handleReqDataChange(itemDetail, 'dataTypeCode', val)
+                  }
+                >
+                  {Object.keys(FIXED_DATA_TYPES).map((code) => (
+                    <Select.Option key={code} value={code}>
+                      {FIXED_DATA_TYPES[code]}
+                    </Select.Option>
+                  ))}
+                </Select>
+
+                <Select
+                  disabled={disabled}
+                  style={{ width: 120, marginRight: 10 }}
+                  value={itemDetail.reqConditionData.operationCode}
+                  onChange={(val) =>
+                    this.handleReqDataChange(itemDetail, 'operationCode', val)
+                  }
+                >
+                  {[
+        { 'code': '1', 'name': '在集合' },
+        { 'code': '2', 'name': '不等于' },
+        { code: '3', name: '小于' },
+        { code: '4', name: '大于' },
+        { code: '5', name: '等于' },
+      ].map((op) => (
+                    <Select.Option key={op.code} value={op.code}>
+                      {op.name}
+                    </Select.Option>
+                  ))}
+                </Select>
+
+                <RuleField
+                  customerWidth={'180px'}
+                  isQueryParams={true}
+                  selectOperation={itemDetail.reqConditionData.operationCode}
+                  dataTypeCode={itemDetail.reqConditionData.dataTypeCode}
+                  values={itemDetail.reqConditionData.params || []}
+                  valueNames={itemDetail.reqConditionData.paramNames || []}
+                  callback={(newValues, newValueNames) =>
+                    this.handleReqDataChange(
+                      itemDetail,
+                      'params',
+                      newValues,
+                      newValueNames,
+                    )
+                  }
+                  disabled={disabled}
+                />
+              </div>
+            )}
           </div>
         </div>
       </div>
@@ -1497,6 +1642,8 @@ class RuleObjectComponent extends Component {
     delete itemDetail.params;
     delete itemDetail.paramNames;
     delete itemDetail.dataTypeCode;
+    delete itemDetail.entityValueType;
+    delete itemDetail.entityInputType;
     delete itemDetail.elementId;
     delete itemDetail.elementName;
     delete itemDetail.metaObjectCode;
@@ -1562,6 +1709,8 @@ class RuleObjectComponent extends Component {
           parentDetail.elementName = parentDetail.subExpression[0].elementName;
           parentDetail.dataTypeCode =
             parentDetail.subExpression[0].dataTypeCode;
+          parentDetail.entityValueType = parentDetail.subExpression[0].entityValueType;
+          parentDetail.entityInputType = parentDetail.subExpression[0].entityInputType;
           delete parentDetail.subExpression;
         }
       }
@@ -1647,6 +1796,65 @@ class RuleObjectComponent extends Component {
     );
   };
 
+  handleReqConditionToggle = (itemDetail) => {
+    const { ruleClassData } = this.state;
+    const { callBack } = this.props;
+    itemDetail.isReqCondition = !itemDetail.isReqCondition;
+    if (itemDetail.isReqCondition && !itemDetail.reqConditionData) {
+      itemDetail.reqConditionData = {
+        operationType: 'relation',
+        dataTypeCode: '10',
+        entityInputType: '10',
+        entityValueType: '10',
+        operationCode: '',
+        reqParamName: '',
+        params: [],
+        paramNames: [],
+      };
+    }
+    this.setState(
+      {
+        ruleClassData,
+      },
+      () => {
+        callBack(ruleClassData);
+      },
+    );
+  };
+
+  handleReqDataChange = (itemDetail, field, value, valueNames) => {
+    const { ruleClassData } = this.state;
+    const { callBack } = this.props;
+    if (!itemDetail.reqConditionData) return;
+
+    if (field === 'dataTypeCode') {
+      itemDetail.reqConditionData.dataTypeCode = value;
+      itemDetail.reqConditionData.entityInputType = value;
+      itemDetail.reqConditionData.entityValueType = value;
+      itemDetail.reqConditionData.operationCode = '';
+      itemDetail.reqConditionData.params = [];
+      itemDetail.reqConditionData.paramNames = [];
+    } else if (field === 'operationCode') {
+      itemDetail.reqConditionData.operationCode = value;
+    } else if (field === 'reqParamName') {
+      itemDetail.reqConditionData.reqParamName = value;
+    } else if (field === 'params') {
+      itemDetail.reqConditionData.params = value;
+      if (valueNames) {
+        itemDetail.reqConditionData.paramNames = valueNames;
+      }
+    }
+
+    this.setState(
+      {
+        ruleClassData,
+      },
+      () => {
+        callBack(ruleClassData);
+      },
+    );
+  };
+
   render() {
     const { onlyOneRule, callBack, disabled, headerButtonComponentFun } = this.props;
     const { ruleClassData, modalParams } = this.state;

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

@@ -8,11 +8,9 @@ import { handleError } from '../../../utils/requestUtils';
 import { queryIdentityInfo, findChangedThresholdQuery, setParams, dateFormat, fullDateFormat } from './util';
 import { request as SulaRequest } from 'bssula';
 import { stringify } from 'querystring';
-import {
-  BusinessSearchSelect,
-  BusinessTreeSearchSelect,
-  BsCascader
-} from '../../../index';
+import BusinessSearchSelect from '../../Business/SearchSelect';
+import BusinessTreeSearchSelect from '../../Business/TreeSearchSelect';
+import { BsCascader } from '../../Functional/BsAntdSula/index';
 import CustomSelector from './CustomPlugin/CustomSelector';
 const { RangePicker } = DatePicker;
 
@@ -29,6 +27,7 @@ export default class RuleField extends Component {
       thresholdQuery: {},
       thresholdList: [],
       options: [],
+      isQueryParams: false
     };
   }
 
@@ -45,6 +44,7 @@ export default class RuleField extends Component {
       queryIdentify,
       propertyCode,
       queryIdentifyType,
+      isQueryParams
     } = this.props;
     this.setState(
       {
@@ -57,6 +57,7 @@ export default class RuleField extends Component {
         dataTypeCode,
         dataChoiceBusinessType,
         dataInputBusinessType,
+        isQueryParams,
         others,
         fieldValues: [...values],
         options,
@@ -283,11 +284,26 @@ export default class RuleField extends Component {
       itemDetail={},
       others={}, 
       propertyCode,
+      isQueryParams
     } = this.props;
     const { thresholdList } = this.state;
     const styleCommon = {
       width: customerWidth || '180px',
     };
+
+    if(isQueryParams) {
+      return <Input
+              defaultValue={values.join(',')}
+              disabled={disabled}
+              style={styleCommon}
+              onBlur={(e) => {
+                values = e.target.value.split(',');
+                valueNames = e.target.value.split(',');
+                callback(values, valueNames);
+              }}
+            />
+    }
+
     if (!selectOperation) return <Input disabled style={styleCommon}></Input>;
     const SET_TYPE = ['in', 'nin', 'cn', 'ncn','5']; //集合类型 （数字为 兼容用户管理子应用使用规则组件）
     const INTERVAL_TYPE = ['be', 'bed', 'nbe', 'nbed', 'ber', 'bel']; //区间类型