@zgfe/business-lib 1.1.72-alpha.2 → 1.1.72-alpha.4

package/es/userCondition/conditions/cdpCshCondition.js

@@ -174,7 +174,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
       fieldType: field === null || field === void 0 ? void 0 : field.type,
       webType: field === null || field === void 0 ? void 0 : field.webType,
       paramType: getType(field === null || field === void 0 ? void 0 : field.webType),
-      calculate: calculate === null || calculate === void 0 ? void 0 : calculate.value,
+      calculate: (field === null || field === void 0 ? void 0 : field.webType) === 'number' ? calculate === null || calculate === void 0 ? void 0 : calculate.value : '',
       operator: operator === null || operator === void 0 ? void 0 : operator.value
     };
     if (['add', 'subtraction', 'multiplication', 'division'].includes((operator === null || operator === void 0 ? void 0 : operator.value) || '')) {
@@ -257,6 +257,8 @@ var CdpConditionItem = function CdpConditionItem(props) {
     setOperator(getOptions(data.webType)[0]);
     if (data.webType === PropType.NUMBER2) {
       setCalculate(numberTypeCsh[0]);
+    } else {
+      setCalculate({});
     }
     setFieldValue([]);
   };
@@ -366,7 +368,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
                 type: "number",
                 className: "".concat(classPrefix, "-value"),
                 value: fieldValue && fieldValue[0],
-                placeholder: "\u8BF7\u8F93\u5165",
+                placeholder: "\u8BF7\u8F93\u5165\u6700\u5C0F\u503C",
                 onChange: function onChange(e) {
                   e.persist();
                   setFieldValue([e.target.value, fieldValue && fieldValue[1] || '']);
@@ -375,7 +377,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
                 type: "number",
                 className: "".concat(classPrefix, "-value"),
                 value: fieldValue && fieldValue[1],
-                placeholder: "\u8BF7\u8F93\u5165",
+                placeholder: "\u8BF7\u8F93\u5165\u6700\u5927\u503C",
                 onChange: function onChange(e) {
                   e.persist();
                   setFieldValue([fieldValue && fieldValue[0] || '', e.target.value]);
@@ -442,7 +444,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
       type: "number",
       className: "".concat(classPrefix, "-value"),
       value: fieldValue && fieldValue[0],
-      placeholder: "\u8BF7\u8F93\u5165",
+      placeholder: (subOperator === null || subOperator === void 0 ? void 0 : subOperator.value) === 'between' ? '请输入最小值' : '请输入',
       onChange: function onChange(e) {
         e.persist();
         setFieldValue([e.target.value, fieldValue && fieldValue[1] || '']);
@@ -451,7 +453,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
       type: "number",
       className: "".concat(classPrefix, "-value"),
       value: fieldValue && fieldValue[1],
-      placeholder: "\u8BF7\u8F93\u5165",
+      placeholder: "\u8BF7\u8F93\u5165\u6700\u5927\u503C",
       onChange: function onChange(e) {
         e.persist();
         setFieldValue([fieldValue && fieldValue[0] || '', e.target.value]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.72-alpha.2",
+  "version": "1.1.72-alpha.4",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -58,5 +58,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "a9b46e3101e90a7ebc4cd527f5e8ae7b46747aa2"
+  "gitHead": "c9084c55fe12fad7bf9de3f5e3a6a4c59640a54d"
 }