@zgfe/business-lib 1.1.71-beta.1 → 1.1.71-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.
|
@@ -57,8 +57,9 @@ var BizFormulaTarget = function BizFormulaTarget(props) {
|
|
|
57
57
|
var name = e.target.value;
|
|
58
58
|
setTemporaryName(name);
|
|
59
59
|
if (nameError) {
|
|
60
|
-
var _props$value2;
|
|
61
|
-
|
|
60
|
+
var _props$value2, _props$value3;
|
|
61
|
+
var isOriginName = ((_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2.customCondition) ? ((_props$value3 = props.value) === null || _props$value3 === void 0 ? void 0 : _props$value3.eventName) === name : false;
|
|
62
|
+
if (name && !(props.disableNames && props.disableNames.includes(name) && !isOriginName)) {
|
|
62
63
|
setNameError('');
|
|
63
64
|
}
|
|
64
65
|
}
|
|
@@ -74,13 +75,14 @@ var BizFormulaTarget = function BizFormulaTarget(props) {
|
|
|
74
75
|
setIsEdit(false);
|
|
75
76
|
};
|
|
76
77
|
var validatorName = function validatorName(name) {
|
|
77
|
-
var _props$
|
|
78
|
+
var _props$value4, _props$value5;
|
|
78
79
|
var flag = true;
|
|
79
80
|
var msg = '';
|
|
81
|
+
var isOriginName = ((_props$value4 = props.value) === null || _props$value4 === void 0 ? void 0 : _props$value4.customCondition) ? ((_props$value5 = props.value) === null || _props$value5 === void 0 ? void 0 : _props$value5.eventName) === name : false;
|
|
80
82
|
if (!name) {
|
|
81
83
|
msg = '指标名称不能为空';
|
|
82
84
|
flag = false;
|
|
83
|
-
} else if (props.disableNames && props.disableNames.includes(name) &&
|
|
85
|
+
} else if (props.disableNames && props.disableNames.includes(name) && !isOriginName) {
|
|
84
86
|
msg = '指标名称不能重复';
|
|
85
87
|
flag = false;
|
|
86
88
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zgfe/business-lib",
|
|
3
|
-
"version": "1.1.71-beta.
|
|
3
|
+
"version": "1.1.71-beta.2",
|
|
4
4
|
"scripts": {
|
|
5
5
|
"start": "dumi dev",
|
|
6
6
|
"docs:build": "dumi build",
|
|
@@ -58,5 +58,5 @@
|
|
|
58
58
|
"react": "^16.12.0 || ^17.0.0",
|
|
59
59
|
"yorkie": "^2.0.0"
|
|
60
60
|
},
|
|
61
|
-
"gitHead": "
|
|
61
|
+
"gitHead": "b92aaa076e226c76c000568663abed1adb6cdeb2"
|
|
62
62
|
}
|