@zgfe/business-lib 1.1.37-beta.1 → 1.1.37-beta.3

package/es/userCondition/conditions/business/operatorCondition.d.ts

@@ -5,7 +5,6 @@ export interface OperatorConditionPropsI {
     index: number;
     stringOperateList: any;
     queryValueObj: any;
-    conParamsList: any;
     onChange: (condition: any) => void;
 }
 declare const OperatorCondition: React.FC<OperatorConditionPropsI>;

package/es/userCondition/conditions/business/operatorCondition.js

@@ -19,11 +19,10 @@ import request from '../../../utils/ajax';
 import BizGlobalDataContext from '../../../context';
 import Apis from '../../../constants/apis';
 var OperatorCondition = function OperatorCondition(props) {
-  var _condition$attrs$inde, _condition$attrs$inde2, _conParamsList$index;
+  var _condition$attrs$inde, _condition$attrs$inde2;
   var condition = props.condition,
     index = props.index,
     stringOperateList = props.stringOperateList,
-    conParamsList = props.conParamsList,
     queryValueObj = props.queryValueObj,
     onChange = props.onChange;
   var _useState = useState([]),
@@ -85,15 +84,12 @@ var OperatorCondition = function OperatorCondition(props) {
               value: !isString(item) ? JSON.stringify(item) : item
             };
           });
-          conParamsList[index].paramsList = list;
           setParamsList(list);
         } else {
           setParamsList([]);
-          conParamsList[index].paramsList = [];
         }
       }).catch(function () {
         setParamsList([]);
-        conParamsList[index].paramsList = [];
       });
     };
     if (timer) clearTimeout(timer);
@@ -103,6 +99,7 @@ var OperatorCondition = function OperatorCondition(props) {
     onChange(_objectSpread({}, condition));
   }
   var onStringOperateChange = function onStringOperateChange(operate) {
+    condition.attrs[index].operator = operate.value;
     if (condition.attrs[index].operator !== 'absolute') {
       condition.attrs[index].params = [];
     }
@@ -171,7 +168,7 @@ var OperatorCondition = function OperatorCondition(props) {
     size: "middle",
     labelField: "name",
     keyField: "value",
-    options: paramsList.length > 0 ? paramsList : (_conParamsList$index = conParamsList[index]) === null || _conParamsList$index === void 0 ? void 0 : _conParamsList$index.paramsList,
+    options: paramsList,
     value: current,
     onChange: onParamsChange,
     onSearch: setSearchValue,

package/es/userCondition/conditions/businessCondition.js

@@ -68,10 +68,6 @@ var BusinessCondition = function BusinessCondition(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     serviceAttributeList = _useState6[0],
     setServiceAttributeList = _useState6[1];
-  var _useState7 = useState([]),
-    _useState8 = _slicedToArray(_useState7, 2),
-    conParamsList = _useState8[0],
-    setConParamsList = _useState8[1];
   function queryServiceAttributeList() {
     request(Apis.bizDataTypeList + "/".concat(currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId), {
       method: 'get'
@@ -127,15 +123,8 @@ var BusinessCondition = function BusinessCondition(props) {
         attrType: '',
         category: ''
       };
-      var params = {
-        masterList: [],
-        bizDataAttrList: [],
-        paramsList: []
-      };
       if (condition.attrs.length < 6) {
         condition.attrs.push(_obj);
-        conParamsList.push(params);
-        setConParamsList(conParamsList);
       } else {
         notification.info({
           message: '事件属性最多增加6条'
@@ -150,8 +139,6 @@ var BusinessCondition = function BusinessCondition(props) {
   }
   function onAttrsDelete(index) {
     condition.attrs.splice(index, 1);
-    conParamsList.splice(index, 1);
-    setConParamsList(conParamsList);
     onChange(_objectSpread({}, condition));
   }
   function onServiceAttributeChange(operate) {
@@ -228,7 +215,6 @@ var BusinessCondition = function BusinessCondition(props) {
       className: "".concat(classPrefix, "-period-condition-label")
     }, dataAttributeLabel), /*#__PURE__*/React.createElement(DataAttribute, {
       onChange: onChange,
-      conParamsList: conParamsList,
       condition: condition,
       index: index,
       serviceAttrType: serviceAttribute

package/es/userCondition/conditions/dataAttribute.d.ts

@@ -2,7 +2,6 @@ import React from 'react';
 import './styles/runTimesCondition.less';
 export interface DataAttributePropsI {
     condition: any;
-    conParamsList: any;
     index: number;
     serviceAttrType: any;
     onChange: (condition: any) => void;

package/es/userCondition/conditions/dataAttribute.js

@@ -22,10 +22,8 @@ import ParamsCondition from './business/paramsCondition';
 import OperatorCondition from './business/operatorCondition';
 import Apis from '../../constants/apis';
 var DataAttribute = function DataAttribute(props) {
-  var _conParamsList$index, _conParamsList$index2;
   var condition = props.condition,
     index = props.index,
-    conParamsList = props.conParamsList,
     onChange = props.onChange;
   var list = [];
   var operateList = [];
@@ -85,35 +83,32 @@ var DataAttribute = function DataAttribute(props) {
           });
         });
         setMasterList(_list);
-        conParamsList[index].masterList = _list;
       } else {
-        conParamsList[index].masterList = [];
         setMasterList([]);
       }
     }).catch(function () {
       setMasterList([{
-        id: 93,
-        value: 93,
+        id: 95,
+        value: 95,
         appId: 501313,
-        name: '订单',
-        propType: 1,
+        name: '订单创建时间',
+        propType: 3,
         required: 1,
         isOrderShow: 1,
         isUserShow: 1,
-        columnName: 'cus5',
+        columnName: 'cus7',
         isDelete: null,
-        isUniqueOrder: 'Y',
+        isUniqueOrder: '',
         isUniqueUser: '',
-        isUniqueCreatedate: '',
+        isUniqueCreatedate: 'Y',
         isUniquePaydate: '',
-        orderRelationSon: 'Y',
-        createDate: 1681924645000,
-        updateDateTime: 1681925795000,
+        orderRelationSon: '',
+        createDate: 1681925736000,
+        updateDateTime: 1681925789000,
         hidden: null,
-        attrOrder: 151,
+        attrOrder: 153,
         requestHide: null
       }]);
-      conParamsList[index].masterList = [];
     });
     onChange(_objectSpread({}, condition));
   }
@@ -131,14 +126,11 @@ var DataAttribute = function DataAttribute(props) {
             value: item.id
           });
         });
-        conParamsList[index].bizDataAttrList = _list2;
         setBizDataAttrList(_list2);
       } else {
-        conParamsList[index].bizDataAttrList = [];
         setBizDataAttrList([]);
       }
     }).catch(function () {
-      conParamsList[index].bizDataAttrList = [];
       setBizDataAttrList([]);
     });
     onChange(_objectSpread({}, condition));
@@ -237,7 +229,7 @@ var DataAttribute = function DataAttribute(props) {
     className: "".concat(classPrefix, "-period-condition-operator")
   }, /*#__PURE__*/React.createElement(BizSelect, {
     className: "".concat(classPrefix, "-select-condition"),
-    options: bizDataAttrList.length > 0 ? bizDataAttrList : (_conParamsList$index = conParamsList[index]) === null || _conParamsList$index === void 0 ? void 0 : _conParamsList$index.bizDataAttrList,
+    options: bizDataAttrList,
     labelField: "name",
     keyField: "value",
     value: {
@@ -250,7 +242,7 @@ var DataAttribute = function DataAttribute(props) {
     className: "".concat(classPrefix, "-period-condition-operator")
   }, /*#__PURE__*/React.createElement(BizSelect, {
     className: "".concat(classPrefix, "-select-condition"),
-    options: masterList.length > 0 ? masterList : (_conParamsList$index2 = conParamsList[index]) === null || _conParamsList$index2 === void 0 ? void 0 : _conParamsList$index2.masterList,
+    options: masterList,
     value: {
       name: condition.typeId ? condition.attrs[index].attrType === 'cont-string' || condition.attrs[index].attrType === 'cont-date' ? condition.attrs[index].operator : condition.attrs[index].computeType : condition.attrs[index].attrName,
       value: condition.typeId ? condition.attrs[index].attrType === 'cont-string' || condition.attrs[index].attrType === 'cont-date' ? condition.attrs[index].operator : condition.attrs[index].computeType : condition.attrs[index].attrId
@@ -260,7 +252,6 @@ var DataAttribute = function DataAttribute(props) {
     onChange: onMasterListChange
   })), /*#__PURE__*/React.createElement(OperatorCondition, {
     queryValueObj: queryValueObj,
-    conParamsList: conParamsList,
     stringOperateList: stringOperateList,
     index: index,
     condition: condition,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.37-beta.1",
+  "version": "1.1.37-beta.3",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",