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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -85,10 +85,12 @@ var BizSelect = function BizSelect(props) {
85
85
  }
86
86
  };
87
87
  var getCheckedData = function getCheckedData(data) {
88
+ var _props$options;
88
89
  var result = data;
89
- props.options.forEach(function (option) {
90
+ (_props$options = props.options) === null || _props$options === void 0 ? void 0 : _props$options.forEach(function (option) {
90
91
  if (props.type === 'group') {
91
- option.children.forEach(function (child) {
92
+ var _option$children;
93
+ (_option$children = option.children) === null || _option$children === void 0 ? void 0 : _option$children.forEach(function (child) {
92
94
  if (data[keyField] === child[keyField]) {
93
95
  result = child;
94
96
  }
@@ -65,7 +65,7 @@ var SelectOverlay = /*#__PURE__*/React.forwardRef(function (props, ref) {
65
65
  setShowList(function () {
66
66
  var list = [];
67
67
  if (props.type === 'group') {
68
- list = options.map(function (group) {
68
+ list = options === null || options === void 0 ? void 0 : options.map(function (group) {
69
69
  var groupDom = /*#__PURE__*/React.createElement(SelectOption, {
70
70
  group: group,
71
71
  key: group.name || String(Math.random())
@@ -175,7 +175,8 @@ var SelectOverlay = /*#__PURE__*/React.forwardRef(function (props, ref) {
175
175
  var selectOptions = [];
176
176
  if (checked) {
177
177
  if (props.type === 'group') {
178
- props.options.forEach(function (item) {
178
+ var _props$options;
179
+ (_props$options = props.options) === null || _props$options === void 0 ? void 0 : _props$options.forEach(function (item) {
179
180
  selectOptions = selectOptions.concat(item.children || []);
180
181
  });
181
182
  } else {
@@ -19,7 +19,7 @@ import request from '../../../utils/ajax';
19
19
  import BizGlobalDataContext from '../../../context';
20
20
  import Apis from '../../../constants/apis';
21
21
  var OperatorCondition = function OperatorCondition(props) {
22
- var _condition$attrs$inde, _condition$attrs$inde2, _condition$paramsList;
22
+ var _condition$attrs$inde, _condition$attrs$inde2;
23
23
  var condition = props.condition,
24
24
  index = props.index,
25
25
  stringOperateList = props.stringOperateList,
@@ -84,15 +84,12 @@ var OperatorCondition = function OperatorCondition(props) {
84
84
  value: !isString(item) ? JSON.stringify(item) : item
85
85
  };
86
86
  });
87
- condition.paramsList[index].paramsList = list;
88
87
  setParamsList(list);
89
88
  } else {
90
89
  setParamsList([]);
91
- condition.paramsList[index].paramsList = [];
92
90
  }
93
91
  }).catch(function () {
94
92
  setParamsList([]);
95
- condition.paramsList[index].paramsList = [];
96
93
  });
97
94
  };
98
95
  if (timer) clearTimeout(timer);
@@ -170,7 +167,7 @@ var OperatorCondition = function OperatorCondition(props) {
170
167
  size: "middle",
171
168
  labelField: "name",
172
169
  keyField: "value",
173
- 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,
170
+ options: paramsList,
174
171
  value: current,
175
172
  onChange: onParamsChange,
176
173
  onSearch: setSearchValue,
@@ -123,14 +123,8 @@ var BusinessCondition = function BusinessCondition(props) {
123
123
  attrType: '',
124
124
  category: ''
125
125
  };
126
- var params = {
127
- masterList: [],
128
- bizDataAttrList: [],
129
- paramsList: []
130
- };
131
126
  if (condition.attrs.length < 6) {
132
127
  condition.attrs.push(_obj);
133
- condition.paramsList.push(params);
134
128
  } else {
135
129
  notification.info({
136
130
  message: '事件属性最多增加6条'
@@ -22,7 +22,6 @@ import ParamsCondition from './business/paramsCondition';
22
22
  import OperatorCondition from './business/operatorCondition';
23
23
  import Apis from '../../constants/apis';
24
24
  var DataAttribute = function DataAttribute(props) {
25
- var _condition$paramsList, _condition$paramsList2;
26
25
  var condition = props.condition,
27
26
  index = props.index,
28
27
  onChange = props.onChange;
@@ -84,14 +83,11 @@ var DataAttribute = function DataAttribute(props) {
84
83
  });
85
84
  });
86
85
  setMasterList(_list);
87
- condition.paramsList[index].masterList = _list;
88
86
  } else {
89
- condition.paramsList[index].masterList = [];
90
87
  setMasterList([]);
91
88
  }
92
89
  }).catch(function () {
93
90
  setMasterList([]);
94
- condition.paramsList[index].masterList = [];
95
91
  });
96
92
  onChange(_objectSpread({}, condition));
97
93
  }
@@ -109,14 +105,11 @@ var DataAttribute = function DataAttribute(props) {
109
105
  value: item.id
110
106
  });
111
107
  });
112
- condition.paramsList[index].bizDataAttrList = _list2;
113
108
  setBizDataAttrList(_list2);
114
109
  } else {
115
- condition.paramsList[index].bizDataAttrList = [];
116
110
  setBizDataAttrList([]);
117
111
  }
118
112
  }).catch(function () {
119
- condition.paramsList[index].bizDataAttrList = [];
120
113
  setBizDataAttrList([]);
121
114
  });
122
115
  onChange(_objectSpread({}, condition));
@@ -215,7 +208,7 @@ var DataAttribute = function DataAttribute(props) {
215
208
  className: "".concat(classPrefix, "-period-condition-operator")
216
209
  }, /*#__PURE__*/React.createElement(BizSelect, {
217
210
  className: "".concat(classPrefix, "-select-condition"),
218
- 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,
211
+ options: bizDataAttrList,
219
212
  labelField: "name",
220
213
  keyField: "value",
221
214
  value: {
@@ -228,7 +221,7 @@ var DataAttribute = function DataAttribute(props) {
228
221
  className: "".concat(classPrefix, "-period-condition-operator")
229
222
  }, /*#__PURE__*/React.createElement(BizSelect, {
230
223
  className: "".concat(classPrefix, "-select-condition"),
231
- 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,
224
+ options: masterList,
232
225
  value: {
233
226
  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,
234
227
  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
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zgfe/business-lib",
3
- "version": "1.1.36",
3
+ "version": "1.1.37-beta.2",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",