@zgfe/business-lib 1.1.72-alpha.3 → 1.1.72-alpha.4
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.
|
@@ -174,7 +174,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
|
|
|
174
174
|
fieldType: field === null || field === void 0 ? void 0 : field.type,
|
|
175
175
|
webType: field === null || field === void 0 ? void 0 : field.webType,
|
|
176
176
|
paramType: getType(field === null || field === void 0 ? void 0 : field.webType),
|
|
177
|
-
calculate: calculate === null || calculate === void 0 ? void 0 : calculate.value,
|
|
177
|
+
calculate: (field === null || field === void 0 ? void 0 : field.webType) === 'number' ? calculate === null || calculate === void 0 ? void 0 : calculate.value : '',
|
|
178
178
|
operator: operator === null || operator === void 0 ? void 0 : operator.value
|
|
179
179
|
};
|
|
180
180
|
if (['add', 'subtraction', 'multiplication', 'division'].includes((operator === null || operator === void 0 ? void 0 : operator.value) || '')) {
|
|
@@ -368,7 +368,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
|
|
|
368
368
|
type: "number",
|
|
369
369
|
className: "".concat(classPrefix, "-value"),
|
|
370
370
|
value: fieldValue && fieldValue[0],
|
|
371
|
-
placeholder: "\u8BF7\u8F93\u5165",
|
|
371
|
+
placeholder: "\u8BF7\u8F93\u5165\u6700\u5C0F\u503C",
|
|
372
372
|
onChange: function onChange(e) {
|
|
373
373
|
e.persist();
|
|
374
374
|
setFieldValue([e.target.value, fieldValue && fieldValue[1] || '']);
|
|
@@ -377,7 +377,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
|
|
|
377
377
|
type: "number",
|
|
378
378
|
className: "".concat(classPrefix, "-value"),
|
|
379
379
|
value: fieldValue && fieldValue[1],
|
|
380
|
-
placeholder: "\u8BF7\u8F93\u5165",
|
|
380
|
+
placeholder: "\u8BF7\u8F93\u5165\u6700\u5927\u503C",
|
|
381
381
|
onChange: function onChange(e) {
|
|
382
382
|
e.persist();
|
|
383
383
|
setFieldValue([fieldValue && fieldValue[0] || '', e.target.value]);
|
|
@@ -444,7 +444,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
|
|
|
444
444
|
type: "number",
|
|
445
445
|
className: "".concat(classPrefix, "-value"),
|
|
446
446
|
value: fieldValue && fieldValue[0],
|
|
447
|
-
placeholder:
|
|
447
|
+
placeholder: (subOperator === null || subOperator === void 0 ? void 0 : subOperator.value) === 'between' ? '请输入最小值' : '请输入',
|
|
448
448
|
onChange: function onChange(e) {
|
|
449
449
|
e.persist();
|
|
450
450
|
setFieldValue([e.target.value, fieldValue && fieldValue[1] || '']);
|
|
@@ -453,7 +453,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
|
|
|
453
453
|
type: "number",
|
|
454
454
|
className: "".concat(classPrefix, "-value"),
|
|
455
455
|
value: fieldValue && fieldValue[1],
|
|
456
|
-
placeholder: "\u8BF7\u8F93\u5165",
|
|
456
|
+
placeholder: "\u8BF7\u8F93\u5165\u6700\u5927\u503C",
|
|
457
457
|
onChange: function onChange(e) {
|
|
458
458
|
e.persist();
|
|
459
459
|
setFieldValue([fieldValue && fieldValue[0] || '', e.target.value]);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zgfe/business-lib",
|
|
3
|
-
"version": "1.1.72-alpha.
|
|
3
|
+
"version": "1.1.72-alpha.4",
|
|
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": "c9084c55fe12fad7bf9de3f5e3a6a4c59640a54d"
|
|
62
62
|
}
|