@bit-sun/business-component 4.2.1-alpha.18-aiwei → 4.2.1-alpha.20-aiwei

package/dist/index.esm.js

@@ -34585,11 +34585,24 @@ var RuleField = /*#__PURE__*/function (_Component) {
         itemDetail = _this$props2$itemDeta === void 0 ? {} : _this$props2$itemDeta,
         _this$props2$others = _this$props2.others,
         others = _this$props2$others === void 0 ? {} : _this$props2$others,
-        propertyCode = _this$props2.propertyCode;
+        propertyCode = _this$props2.propertyCode,
+        isQueryParams = _this$props2.isQueryParams;
       var thresholdList = _this.state.thresholdList;
       var styleCommon = {
         width: customerWidth || '180px'
       };
+      if (isQueryParams) {
+        return /*#__PURE__*/React$1.createElement(Input, {
+          defaultValue: values.join(','),
+          disabled: disabled,
+          style: styleCommon,
+          onBlur: function onBlur(e) {
+            values = e.target.value.split(',');
+            valueNames = e.target.value.split(',');
+            callback(values, valueNames);
+          }
+        });
+      }
       if (!selectOperation) return /*#__PURE__*/React$1.createElement(Input, {
         disabled: true,
         style: styleCommon
@@ -37115,7 +37128,8 @@ var RuleField = /*#__PURE__*/function (_Component) {
       fieldValues: [],
       thresholdQuery: {},
       thresholdList: [],
-      options: []
+      options: [],
+      isQueryParams: false
     };
     return _this;
   }
@@ -37135,13 +37149,15 @@ var RuleField = /*#__PURE__*/function (_Component) {
         initialThresholdQuery = _this$props3.initialThresholdQuery,
         queryIdentify = _this$props3.queryIdentify,
         propertyCode = _this$props3.propertyCode,
-        queryIdentifyType = _this$props3.queryIdentifyType;
+        queryIdentifyType = _this$props3.queryIdentifyType,
+        isQueryParams = _this$props3.isQueryParams;
       this.setState({
         selectOperation: selectOperation,
         thresholdQuery: initialThresholdQuery ? _objectSpread2({}, initialThresholdQuery) : {},
         dataTypeCode: dataTypeCode,
         dataChoiceBusinessType: dataChoiceBusinessType,
         dataInputBusinessType: dataInputBusinessType,
+        isQueryParams: isQueryParams,
         others: others,
         fieldValues: _toConsumableArray(values),
         options: options
@@ -39195,6 +39211,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         }, op.name);
       })), /*#__PURE__*/React$1.createElement(RuleField, {
         customerWidth: '180px',
+        isQueryParams: true,
         selectOperation: itemDetail.reqConditionData.operationCode,
         dataTypeCode: itemDetail.reqConditionData.dataTypeCode,
         values: itemDetail.reqConditionData.params || [],
@@ -39654,6 +39671,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         itemDetail.reqConditionData = {
           operationType: 'relation',
           dataTypeCode: '21',
+          entityInputType: '21',
+          entityValueType: '21',
           operationCode: '',
           reqParamName: '',
           params: [],
@@ -39672,6 +39691,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
       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 = [];

package/dist/index.js

@@ -34608,11 +34608,24 @@ var RuleField = /*#__PURE__*/function (_Component) {
         itemDetail = _this$props2$itemDeta === void 0 ? {} : _this$props2$itemDeta,
         _this$props2$others = _this$props2.others,
         others = _this$props2$others === void 0 ? {} : _this$props2$others,
-        propertyCode = _this$props2.propertyCode;
+        propertyCode = _this$props2.propertyCode,
+        isQueryParams = _this$props2.isQueryParams;
       var thresholdList = _this.state.thresholdList;
       var styleCommon = {
         width: customerWidth || '180px'
       };
+      if (isQueryParams) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+          defaultValue: values.join(','),
+          disabled: disabled,
+          style: styleCommon,
+          onBlur: function onBlur(e) {
+            values = e.target.value.split(',');
+            valueNames = e.target.value.split(',');
+            callback(values, valueNames);
+          }
+        });
+      }
       if (!selectOperation) return /*#__PURE__*/React__default['default'].createElement(antd.Input, {
         disabled: true,
         style: styleCommon
@@ -37138,7 +37151,8 @@ var RuleField = /*#__PURE__*/function (_Component) {
       fieldValues: [],
       thresholdQuery: {},
       thresholdList: [],
-      options: []
+      options: [],
+      isQueryParams: false
     };
     return _this;
   }
@@ -37158,13 +37172,15 @@ var RuleField = /*#__PURE__*/function (_Component) {
         initialThresholdQuery = _this$props3.initialThresholdQuery,
         queryIdentify = _this$props3.queryIdentify,
         propertyCode = _this$props3.propertyCode,
-        queryIdentifyType = _this$props3.queryIdentifyType;
+        queryIdentifyType = _this$props3.queryIdentifyType,
+        isQueryParams = _this$props3.isQueryParams;
       this.setState({
         selectOperation: selectOperation,
         thresholdQuery: initialThresholdQuery ? _objectSpread2({}, initialThresholdQuery) : {},
         dataTypeCode: dataTypeCode,
         dataChoiceBusinessType: dataChoiceBusinessType,
         dataInputBusinessType: dataInputBusinessType,
+        isQueryParams: isQueryParams,
         others: others,
         fieldValues: _toConsumableArray(values),
         options: options
@@ -39218,6 +39234,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         }, op.name);
       })), /*#__PURE__*/React__default['default'].createElement(RuleField, {
         customerWidth: '180px',
+        isQueryParams: true,
         selectOperation: itemDetail.reqConditionData.operationCode,
         dataTypeCode: itemDetail.reqConditionData.dataTypeCode,
         values: itemDetail.reqConditionData.params || [],
@@ -39677,6 +39694,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         itemDetail.reqConditionData = {
           operationType: 'relation',
           dataTypeCode: '21',
+          entityInputType: '21',
+          entityValueType: '21',
           operationCode: '',
           reqParamName: '',
           params: [],
@@ -39695,6 +39714,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
       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 = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "4.2.1-alpha.18-aiwei",
+  "version": "4.2.1-alpha.20-aiwei",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/components/Solution/RuleComponent/README.md

@@ -87,8 +87,8 @@ export default () => {
       code: 'user',
       valueType: 'object',
       propertyList: [
-        { id: 'age', name: '年龄', code: 'age', valueType: '22', inputType: 11, choiceType: 10, entityValueType: '20', entityInputType: 11 },
-        { id: 'name', name: '姓名', code: 'name', valueType: '21', inputType: 11, choiceType: 10, entityValueType: '10', entityInputType: 11 },
+        { id: 'age', name: '年龄', code: 'age', valueType: '22', inputType: 11, choiceType: 10,  },
+        { id: 'name', name: '姓名', code: 'name', valueType: '21', inputType: 11, choiceType: 10,  },
       ]
     },
     {
@@ -97,7 +97,7 @@ export default () => {
       code: 'order',
       valueType: 'object',
       propertyList: [
-        { id: 'amount', name: '金额', code: 'amount', valueType: '22', inputType: 11, choiceType: 10, entityValueType: '22', entityInputType: 11 },
+        { id: 'amount', name: '金额', code: 'amount', valueType: '22', inputType: 11, choiceType: 10,  },
       ]
     }
   ];

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

@@ -1165,6 +1165,7 @@ class RuleObjectComponent extends Component {
 
                 <RuleField
                   customerWidth={'180px'}
+                  isQueryParams={true}
                   selectOperation={itemDetail.reqConditionData.operationCode}
                   dataTypeCode={itemDetail.reqConditionData.dataTypeCode}
                   values={itemDetail.reqConditionData.params || []}
@@ -1770,6 +1771,8 @@ class RuleObjectComponent extends Component {
       itemDetail.reqConditionData = {
         operationType: 'relation',
         dataTypeCode: '21',
+        entityInputType: '21',
+        entityValueType: '21',
         operationCode: '',
         reqParamName: '',
         params: [],
@@ -1793,6 +1796,8 @@ class RuleObjectComponent extends Component {
 
     if (field === 'dataTypeCode') {
       itemDetail.reqConditionData.dataTypeCode = value;
+      itemDetail.reqConditionData.entityInputType = value;
+      itemDetail.reqConditionData.entityValueType = value;
       itemDetail.reqConditionData.operationCode = '';
       itemDetail.reqConditionData.params = [];
       itemDetail.reqConditionData.paramNames = [];

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

@@ -27,6 +27,7 @@ export default class RuleField extends Component {
       thresholdQuery: {},
       thresholdList: [],
       options: [],
+      isQueryParams: false
     };
   }
 
@@ -43,6 +44,7 @@ export default class RuleField extends Component {
       queryIdentify,
       propertyCode,
       queryIdentifyType,
+      isQueryParams
     } = this.props;
     this.setState(
       {
@@ -55,6 +57,7 @@ export default class RuleField extends Component {
         dataTypeCode,
         dataChoiceBusinessType,
         dataInputBusinessType,
+        isQueryParams,
         others,
         fieldValues: [...values],
         options,
@@ -281,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']; //区间类型