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

package/es/select/index.js

@@ -85,10 +85,12 @@ var BizSelect = function BizSelect(props) {
     }
   };
   var getCheckedData = function getCheckedData(data) {
+    var _props$options;
     var result = data;
-    props.options.forEach(function (option) {
+    (_props$options = props.options) === null || _props$options === void 0 ? void 0 : _props$options.forEach(function (option) {
       if (props.type === 'group') {
-        option.children.forEach(function (child) {
+        var _option$children;
+        (_option$children = option.children) === null || _option$children === void 0 ? void 0 : _option$children.forEach(function (child) {
           if (data[keyField] === child[keyField]) {
             result = child;
           }

package/es/select/overlay.js

@@ -65,7 +65,7 @@ var SelectOverlay = /*#__PURE__*/React.forwardRef(function (props, ref) {
     setShowList(function () {
       var list = [];
       if (props.type === 'group') {
-        list = options.map(function (group) {
+        list = options === null || options === void 0 ? void 0 : options.map(function (group) {
           var groupDom = /*#__PURE__*/React.createElement(SelectOption, {
             group: group,
             key: group.name || String(Math.random())
@@ -175,7 +175,8 @@ var SelectOverlay = /*#__PURE__*/React.forwardRef(function (props, ref) {
     var selectOptions = [];
     if (checked) {
       if (props.type === 'group') {
-        props.options.forEach(function (item) {
+        var _props$options;
+        (_props$options = props.options) === null || _props$options === void 0 ? void 0 : _props$options.forEach(function (item) {
           selectOptions = selectOptions.concat(item.children || []);
         });
       } else {

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

@@ -5,6 +5,7 @@ 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,10 +19,11 @@ 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, _condition$paramsList;
+  var _condition$attrs$inde, _condition$attrs$inde2, _conParamsList$index;
   var condition = props.condition,
     index = props.index,
     stringOperateList = props.stringOperateList,
+    conParamsList = props.conParamsList,
     queryValueObj = props.queryValueObj,
     onChange = props.onChange;
   var _useState = useState([]),
@@ -84,15 +85,15 @@ var OperatorCondition = function OperatorCondition(props) {
               value: !isString(item) ? JSON.stringify(item) : item
             };
           });
-          condition.paramsList[index].paramsList = list;
+          conParamsList[index].paramsList = list;
           setParamsList(list);
         } else {
           setParamsList([]);
-          condition.paramsList[index].paramsList = [];
+          conParamsList[index].paramsList = [];
         }
       }).catch(function () {
         setParamsList([]);
-        condition.paramsList[index].paramsList = [];
+        conParamsList[index].paramsList = [];
       });
     };
     if (timer) clearTimeout(timer);
@@ -170,7 +171,7 @@ var OperatorCondition = function OperatorCondition(props) {
     size: "middle",
     labelField: "name",
     keyField: "value",
-    options: paramsList.length > 0 ? paramsList : condition === null || condition === void 0 ? void 0 : (_condition$paramsList = condition.paramsList[index]) === null || _condition$paramsList === void 0 ? void 0 : _condition$paramsList.paramsList,
+    options: paramsList.length > 0 ? paramsList : (_conParamsList$index = conParamsList[index]) === null || _conParamsList$index === void 0 ? void 0 : _conParamsList$index.paramsList,
     value: current,
     onChange: onParamsChange,
     onSearch: setSearchValue,

package/es/userCondition/conditions/businessCondition.js

@@ -68,6 +68,10 @@ 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'
@@ -130,7 +134,8 @@ var BusinessCondition = function BusinessCondition(props) {
       };
       if (condition.attrs.length < 6) {
         condition.attrs.push(_obj);
-        condition.paramsList.push(params);
+        conParamsList.push(params);
+        setConParamsList(conParamsList);
       } else {
         notification.info({
           message: '事件属性最多增加6条'
@@ -145,6 +150,8 @@ 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) {
@@ -221,6 +228,7 @@ 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,6 +2,7 @@ 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,9 +22,10 @@ import ParamsCondition from './business/paramsCondition';
 import OperatorCondition from './business/operatorCondition';
 import Apis from '../../constants/apis';
 var DataAttribute = function DataAttribute(props) {
-  var _condition$paramsList, _condition$paramsList2;
+  var _conParamsList$index, _conParamsList$index2;
   var condition = props.condition,
     index = props.index,
+    conParamsList = props.conParamsList,
     onChange = props.onChange;
   var list = [];
   var operateList = [];
@@ -84,14 +85,35 @@ var DataAttribute = function DataAttribute(props) {
           });
         });
         setMasterList(_list);
-        condition.paramsList[index].masterList = _list;
+        conParamsList[index].masterList = _list;
       } else {
-        condition.paramsList[index].masterList = [];
+        conParamsList[index].masterList = [];
         setMasterList([]);
       }
     }).catch(function () {
-      setMasterList([]);
-      condition.paramsList[index].masterList = [];
+      setMasterList([{
+        id: 93,
+        value: 93,
+        appId: 501313,
+        name: '订单',
+        propType: 1,
+        required: 1,
+        isOrderShow: 1,
+        isUserShow: 1,
+        columnName: 'cus5',
+        isDelete: null,
+        isUniqueOrder: 'Y',
+        isUniqueUser: '',
+        isUniqueCreatedate: '',
+        isUniquePaydate: '',
+        orderRelationSon: 'Y',
+        createDate: 1681924645000,
+        updateDateTime: 1681925795000,
+        hidden: null,
+        attrOrder: 151,
+        requestHide: null
+      }]);
+      conParamsList[index].masterList = [];
     });
     onChange(_objectSpread({}, condition));
   }
@@ -109,14 +131,14 @@ var DataAttribute = function DataAttribute(props) {
             value: item.id
           });
         });
-        condition.paramsList[index].bizDataAttrList = _list2;
+        conParamsList[index].bizDataAttrList = _list2;
         setBizDataAttrList(_list2);
       } else {
-        condition.paramsList[index].bizDataAttrList = [];
+        conParamsList[index].bizDataAttrList = [];
         setBizDataAttrList([]);
       }
     }).catch(function () {
-      condition.paramsList[index].bizDataAttrList = [];
+      conParamsList[index].bizDataAttrList = [];
       setBizDataAttrList([]);
     });
     onChange(_objectSpread({}, condition));
@@ -215,7 +237,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 : condition === null || condition === void 0 ? void 0 : (_condition$paramsList = condition.paramsList[index]) === null || _condition$paramsList === void 0 ? void 0 : _condition$paramsList.bizDataAttrList,
+    options: bizDataAttrList.length > 0 ? bizDataAttrList : (_conParamsList$index = conParamsList[index]) === null || _conParamsList$index === void 0 ? void 0 : _conParamsList$index.bizDataAttrList,
     labelField: "name",
     keyField: "value",
     value: {
@@ -228,7 +250,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 : condition === null || condition === void 0 ? void 0 : (_condition$paramsList2 = condition.paramsList[index]) === null || _condition$paramsList2 === void 0 ? void 0 : _condition$paramsList2.masterList,
+    options: masterList.length > 0 ? masterList : (_conParamsList$index2 = conParamsList[index]) === null || _conParamsList$index2 === void 0 ? void 0 : _conParamsList$index2.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
@@ -238,6 +260,7 @@ 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.36",
+  "version": "1.1.37-beta.1",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",