@zgfe/business-lib 1.1.34-alpha.8 → 1.1.34-alpha.9

package/es/userCondition/conditions/dataAttribute.js

@@ -21,7 +21,7 @@ import BizGlobalDataContext from '../../context';
 import { DatePicker, Input } from 'antd';
 var RangePicker = DatePicker.RangePicker;
 var DataAttribute = function DataAttribute(props) {
-  var _condition$attrs$inde;
+  var _condition$attrs$inde, _condition$paramsList, _condition$paramsList2, _condition$paramsList3;
   var condition = props.condition,
     index = props.index,
     onChange = props.onChange;
@@ -102,12 +102,16 @@ var DataAttribute = function DataAttribute(props) {
           });
         });
         setMasterList(_list);
+        condition.paramsList[index].masterList = _list;
       } else {
+        condition.paramsList[index].masterList = [];
         setMasterList([]);
       }
     }).catch(function () {
       setMasterList([]);
+      condition.paramsList[index].masterList = [];
     });
+    onChange(_objectSpread({}, condition));
   }
   function queryValueList(keyword, operate) {
     request('/cep-console/api/v1/es/data/attr/value', {
@@ -133,13 +137,17 @@ var DataAttribute = function DataAttribute(props) {
             value: operate.bizDataTypeId ? item : item.id
           };
         });
+        condition.paramsList[index].paramsList = _list2;
         setParamsList(_list2);
       } else {
         setParamsList([]);
+        condition.paramsList[index].paramsList = [];
       }
     }).catch(function () {
       setParamsList([]);
+      condition.paramsList[index].paramsList = [];
     });
+    onChange(_objectSpread({}, condition));
   }
   function queryBizDataAttrList(bizDataTypeId) {
     request('/cep-console/api/v1/bizdata/attr/list', {
@@ -157,13 +165,17 @@ var DataAttribute = function DataAttribute(props) {
             value: item.id
           });
         });
+        condition.paramsList[index].bizDataAttrList = _list3;
         setBizDataAttrList(_list3);
       } else {
+        condition.paramsList[index].bizDataAttrList = [];
         setBizDataAttrList([]);
       }
     }).catch(function () {
+      condition.paramsList[index].bizDataAttrList = [];
       setBizDataAttrList([]);
     });
+    onChange(_objectSpread({}, condition));
   }
   var onOrderTypeListChange = function onOrderTypeListChange(operate) {
     if (condition === null || condition === void 0 ? void 0 : condition.typeId) {
@@ -262,21 +274,23 @@ var DataAttribute = function DataAttribute(props) {
     onChange(_objectSpread({}, condition));
   };
   var onParamsChange = function onParamsChange(operate) {
-    var obj = operate.map(function (item) {
-      return {
-        name: item.name,
-        value: item.value
-      };
-    });
-    var params = operate.map(function (item) {
-      return item.value;
-    });
-    if (!(condition === null || condition === void 0 ? void 0 : condition.typeId)) {
-      queryValueList(searchValue, {});
+    if (operate.length > 0) {
+      var _obj = operate.map(function (item) {
+        return {
+          name: item.name,
+          value: item.value
+        };
+      });
+      var params = operate.map(function (item) {
+        return item.value;
+      });
+      if (!(condition === null || condition === void 0 ? void 0 : condition.typeId)) {
+        queryValueList(searchValue, {});
+      }
+      setCurrent(_obj);
+      condition.attrs[index].params = params;
+      onChange(_objectSpread({}, condition));
     }
-    setCurrent(obj);
-    condition.attrs[index].params = params;
-    onChange(_objectSpread({}, condition));
   };
   function onDateChange(newData) {
     if (condition.attrs[index].operator === 'absolute') {
@@ -294,7 +308,7 @@ var DataAttribute = function DataAttribute(props) {
     className: "".concat(classPrefix, "-period-condition-operator")
   }, /*#__PURE__*/React.createElement(BizSelect, {
     className: "".concat(classPrefix, "-select-condition"),
-    options: bizDataAttrList,
+    options: bizDataAttrList.length > 0 ? bizDataAttrList : (_condition$paramsList = condition.paramsList[index]) === null || _condition$paramsList === void 0 ? void 0 : _condition$paramsList.bizDataAttrList,
     labelField: "name",
     keyField: "value",
     value: {
@@ -307,7 +321,7 @@ var DataAttribute = function DataAttribute(props) {
     className: "".concat(classPrefix, "-period-condition-operator")
   }, /*#__PURE__*/React.createElement(BizSelect, {
     className: "".concat(classPrefix, "-select-condition"),
-    options: masterList,
+    options: masterList.length > 0 ? masterList : (_condition$paramsList2 = condition.paramsList[index]) === null || _condition$paramsList2 === void 0 ? void 0 : _condition$paramsList2.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
@@ -351,9 +365,9 @@ var DataAttribute = function DataAttribute(props) {
     multiple: true,
     size: "middle",
     labelField: "name",
+    options: paramsList.length > 0 ? paramsList : (_condition$paramsList3 = condition.paramsList[index]) === null || _condition$paramsList3 === void 0 ? void 0 : _condition$paramsList3.paramsList,
     keyField: "value",
     value: current,
-    options: paramsList,
     onChange: onParamsChange,
     onSearch: setSearchValue,
     enableCreate: true

package/es/userCondition/types.d.ts

@@ -88,6 +88,11 @@ export declare namespace BizUserConditionT {
         category: 'fixed' | 'custom';
         computeType: string;
     }
+    interface paramsListCondition {
+        masterList: [];
+        bizDataAttrList: [];
+        paramsList: [];
+    }
     interface TimeDimensionsCondition {
         timeDimension: number;
         timeOperator: string;
@@ -111,6 +116,7 @@ export declare namespace BizUserConditionT {
     interface BusinessCondition {
         typeId: undefined;
         typeName: undefined;
+        paramsList: paramsListCondition[];
         attrs: AttrsCondition[];
         timeDimensions: TimeDimensionsCondition[];
         runTimes: RunTimesII;
@@ -120,6 +126,7 @@ export declare namespace BizUserConditionT {
     interface OrderCondition {
         attrs: AttrsCondition[];
         timeDimensions: TimeDimensionsCondition[];
+        paramsList: paramsListCondition[];
         runTimes: RunTimesII;
         runPeriod: RunPeriodII;
         eventId: -13;

package/es/userCondition/util.js

@@ -77,6 +77,11 @@ export function buildCondition(type) {
           values: [1]
         },
         attrs: [],
+        paramsList: [{
+          masterList: [],
+          bizDataAttrList: [],
+          paramsList: []
+        }],
         timeDimensions: [],
         runPeriod: {
           operator: 'relative',
@@ -91,6 +96,11 @@ export function buildCondition(type) {
           values: [1]
         },
         attrs: [],
+        paramsList: [{
+          masterList: [],
+          bizDataAttrList: [],
+          paramsList: []
+        }],
         timeDimensions: [],
         runPeriod: {
           operator: 'relative',

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zgfe/business-lib",
-    "version": "1.1.34-alpha.8",
+    "version": "1.1.34-alpha.9",
     "scripts": {
         "start": "dumi dev",
         "docs:build": "dumi build",