@zgfe/business-lib 1.1.34-alpha.10 → 1.1.34-alpha.11
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.
|
@@ -235,8 +235,14 @@ var BusinessCondition = function BusinessCondition(props) {
|
|
|
235
235
|
attrType: '',
|
|
236
236
|
category: ''
|
|
237
237
|
};
|
|
238
|
+
var params = {
|
|
239
|
+
masterList: [],
|
|
240
|
+
bizDataAttrList: [],
|
|
241
|
+
paramsList: []
|
|
242
|
+
};
|
|
238
243
|
if (condition.attrs.length < 6) {
|
|
239
244
|
condition.attrs.push(_obj);
|
|
245
|
+
condition.paramsList.push(params);
|
|
240
246
|
} else {
|
|
241
247
|
notification.info({
|
|
242
248
|
message: '事件属性最多增加6条'
|
|
@@ -308,7 +308,7 @@ var DataAttribute = function DataAttribute(props) {
|
|
|
308
308
|
className: "".concat(classPrefix, "-period-condition-operator")
|
|
309
309
|
}, /*#__PURE__*/React.createElement(BizSelect, {
|
|
310
310
|
className: "".concat(classPrefix, "-select-condition"),
|
|
311
|
-
options:
|
|
311
|
+
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,
|
|
312
312
|
labelField: "name",
|
|
313
313
|
keyField: "value",
|
|
314
314
|
value: {
|
|
@@ -321,7 +321,7 @@ var DataAttribute = function DataAttribute(props) {
|
|
|
321
321
|
className: "".concat(classPrefix, "-period-condition-operator")
|
|
322
322
|
}, /*#__PURE__*/React.createElement(BizSelect, {
|
|
323
323
|
className: "".concat(classPrefix, "-select-condition"),
|
|
324
|
-
options:
|
|
324
|
+
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,
|
|
325
325
|
value: {
|
|
326
326
|
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,
|
|
327
327
|
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
|
|
@@ -365,7 +365,7 @@ var DataAttribute = function DataAttribute(props) {
|
|
|
365
365
|
multiple: true,
|
|
366
366
|
size: "middle",
|
|
367
367
|
labelField: "name",
|
|
368
|
-
options:
|
|
368
|
+
options: paramsList.length > 0 ? paramsList : condition === null || condition === void 0 ? void 0 : (_condition$paramsList3 = condition.paramsList[index]) === null || _condition$paramsList3 === void 0 ? void 0 : _condition$paramsList3.paramsList,
|
|
369
369
|
keyField: "value",
|
|
370
370
|
value: current,
|
|
371
371
|
onChange: onParamsChange,
|
package/es/userCondition/util.js
CHANGED
|
@@ -77,11 +77,7 @@ export function buildCondition(type) {
|
|
|
77
77
|
values: [1]
|
|
78
78
|
},
|
|
79
79
|
attrs: [],
|
|
80
|
-
paramsList: [
|
|
81
|
-
masterList: [],
|
|
82
|
-
bizDataAttrList: [],
|
|
83
|
-
paramsList: []
|
|
84
|
-
}],
|
|
80
|
+
paramsList: [],
|
|
85
81
|
timeDimensions: [],
|
|
86
82
|
runPeriod: {
|
|
87
83
|
operator: 'relative',
|
|
@@ -96,11 +92,7 @@ export function buildCondition(type) {
|
|
|
96
92
|
values: [1]
|
|
97
93
|
},
|
|
98
94
|
attrs: [],
|
|
99
|
-
paramsList: [
|
|
100
|
-
masterList: [],
|
|
101
|
-
bizDataAttrList: [],
|
|
102
|
-
paramsList: []
|
|
103
|
-
}],
|
|
95
|
+
paramsList: [],
|
|
104
96
|
timeDimensions: [],
|
|
105
97
|
runPeriod: {
|
|
106
98
|
operator: 'relative',
|