@zgfe/modules-dm 1.0.57-zhongyuan.41 → 1.0.57-zhongyuan.42
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.
|
@@ -336,8 +336,8 @@ var AddRule = function AddRule(_ref) {
|
|
|
336
336
|
if ((bizAttributeSelectorValue === null || bizAttributeSelectorValue === void 0 ? void 0 : bizAttributeSelectorValue.type) == 3 && (btnItem.value == 2 || btnItem.value == 5 || btnItem.value == 1)) {
|
|
337
337
|
result = false;
|
|
338
338
|
}
|
|
339
|
-
// 字符串类型 正则 /枚举 / 非空/属性类型
|
|
340
|
-
if ((bizAttributeSelectorValue === null || bizAttributeSelectorValue === void 0 ? void 0 : bizAttributeSelectorValue.type) == 1 && (btnItem.value == 2 || btnItem.value == 5 || btnItem.value == 4 || btnItem.value == 1)) {
|
|
339
|
+
// 字符串类型 正则 /枚举 / 非空/属性类型 / 字典
|
|
340
|
+
if ((bizAttributeSelectorValue === null || bizAttributeSelectorValue === void 0 ? void 0 : bizAttributeSelectorValue.type) == 1 && (btnItem.value == 2 || btnItem.value == 5 || btnItem.value == 4 || btnItem.value == 1 || btnItem.value == 6)) {
|
|
341
341
|
result = false;
|
|
342
342
|
}
|
|
343
343
|
// 类型只能添加一个
|
|
@@ -41,11 +41,12 @@ var AddFormulate = function AddFormulate(_ref) {
|
|
|
41
41
|
}, 300);
|
|
42
42
|
};
|
|
43
43
|
var onFinish = function onFinish(values) {
|
|
44
|
+
console.log(values, 'values');
|
|
44
45
|
var arr = dataSource.map(function (o) {
|
|
45
46
|
return {
|
|
46
47
|
ruleType: o.currentType,
|
|
47
|
-
sourceValue: o.
|
|
48
|
-
targetValue: o.
|
|
48
|
+
sourceValue: o.sourceValueId,
|
|
49
|
+
targetValue: o.targetValueId
|
|
49
50
|
};
|
|
50
51
|
});
|
|
51
52
|
var api = detailData ? apis.clearRule.modifyRule : apis.clearRule.addRule;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zgfe/modules-dm",
|
|
3
|
-
"version": "1.0.57-zhongyuan.
|
|
3
|
+
"version": "1.0.57-zhongyuan.42",
|
|
4
4
|
"license": "ISC",
|
|
5
5
|
"module": "es/index.js",
|
|
6
6
|
"typings": "es/index.d.ts",
|
|
@@ -57,7 +57,7 @@
|
|
|
57
57
|
"umi-request": "^1.4.0",
|
|
58
58
|
"yorkie": "^2.0.0"
|
|
59
59
|
},
|
|
60
|
-
"gitHead": "
|
|
60
|
+
"gitHead": "a93bb5c2042f1cef44036df63f14a7e282cd7b4d",
|
|
61
61
|
"gitHooks": {
|
|
62
62
|
"pre-commit": "lint-staged"
|
|
63
63
|
}
|