@zgfe/business-lib 1.2.31 → 1.2.33

package/es/AUMFormulaTarget/components/formula/index.js

@@ -28,13 +28,17 @@ var FormulaContainer = /*#__PURE__*/React.forwardRef(function (props, ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     fieldValue = _useState6[0],
     setFieldValue = _useState6[1];
+  var _useState7 = useState(),
+    _useState8 = _slicedToArray(_useState7, 2),
+    fieldMaxValue = _useState8[0],
+    setFieldMaxValue = _useState8[1];
   useEffect(function () {
     init();
   }, []);
   useEffect(function () {
     var item = formatTarget(targetList, 1);
-    props.onChange && props.onChange(item.formulaList, item.formula, operator === null || operator === void 0 ? void 0 : operator.value, fieldValue);
-  }, [targetList, operator, fieldValue]);
+    props.onChange && props.onChange(item.formulaList, item.formula, operator === null || operator === void 0 ? void 0 : operator.value, fieldValue, fieldMaxValue);
+  }, [targetList, operator, fieldValue, fieldMaxValue]);
   useImperativeHandle(ref, function () {
     return {
       reset: init
@@ -45,6 +49,7 @@ var FormulaContainer = /*#__PURE__*/React.forwardRef(function (props, ref) {
       value: props.operator
     });
     setFieldValue(props.fieldValue);
+    setFieldMaxValue(props.fieldMaxValue);
     setTargetList(targetsFormat(props.formula, props.value, 1));
   };
   var _onChange = function onChange(index, data) {
@@ -138,14 +143,18 @@ var FormulaContainer = /*#__PURE__*/React.forwardRef(function (props, ref) {
     overlayWidth: 96,
     value: operator,
     onChange: onOperateChange
-  }), /*#__PURE__*/React.createElement(Input, {
+  }), operator && operator.value === 'between' ? /*#__PURE__*/React.createElement("span", {
+    style: {
+      display: 'flex'
+    }
+  }, /*#__PURE__*/React.createElement(Input, {
     style: {
       marginLeft: 16,
       borderWidth: 0
     },
     type: "number",
     value: fieldValue,
-    placeholder: "\u8BF7\u8F93\u5165",
+    placeholder: "\u8BF7\u8F93\u5165\u6700\u5C0F\u503C",
     onChange: function onChange(e) {
       var _e$target$value;
       e.persist();
@@ -154,6 +163,38 @@ var FormulaContainer = /*#__PURE__*/React.forwardRef(function (props, ref) {
       var dealStr = xsStr ? str.split('.')[0] + '.' + xsStr : str;
       setFieldValue(dealStr);
     }
+  }), /*#__PURE__*/React.createElement(Input, {
+    style: {
+      marginLeft: 16,
+      borderWidth: 0
+    },
+    type: "number",
+    value: fieldMaxValue,
+    placeholder: "\u8BF7\u8F93\u5165\u6700\u5927\u503C",
+    onChange: function onChange(e) {
+      var _e$target$value2;
+      e.persist();
+      var str = (_e$target$value2 = e.target.value) === null || _e$target$value2 === void 0 ? void 0 : _e$target$value2.slice(0, 20);
+      var xsStr = str.split('.')[1] ? str.split('.')[1].slice(0, 2) : '';
+      var dealStr = xsStr ? str.split('.')[0] + '.' + xsStr : str;
+      setFieldMaxValue(dealStr);
+    }
+  })) : /*#__PURE__*/React.createElement(Input, {
+    style: {
+      marginLeft: 16,
+      borderWidth: 0
+    },
+    type: "number",
+    value: fieldValue,
+    placeholder: "\u8BF7\u8F93\u5165",
+    onChange: function onChange(e) {
+      var _e$target$value3;
+      e.persist();
+      var str = (_e$target$value3 = e.target.value) === null || _e$target$value3 === void 0 ? void 0 : _e$target$value3.slice(0, 20);
+      var xsStr = str.split('.')[1] ? str.split('.')[1].slice(0, 2) : '';
+      var dealStr = xsStr ? str.split('.')[0] + '.' + xsStr : str;
+      setFieldValue(dealStr);
+    }
   }), /*#__PURE__*/React.createElement(IconFont, {
     style: {
       marginLeft: 16

package/es/AUMFormulaTarget/components/formula/types.d.ts

@@ -6,7 +6,8 @@ export declare namespace FormulaContainerTypes {
         resultFormat?: string;
         operator?: string;
         fieldValue?: string;
-        onChange?: (formulaList: TargetConditionTypes.Value[], formula: string, operator?: string, fieldValue?: string) => void;
+        fieldMaxValue?: string;
+        onChange?: (formulaList: TargetConditionTypes.Value[], formula: string, operator?: string, fieldValue?: string, fieldMaxValue?: string) => void;
     }
     type Value = null | string | TargetConditionTypes.Value;
     interface FormulaItemValue {

package/es/AUMFormulaTarget/index.js

@@ -19,21 +19,23 @@ var BizFormulaTarget = function BizFormulaTarget(props) {
     _useState2 = _slicedToArray(_useState, 2),
     condition = _useState2[0],
     setCondition = _useState2[1];
-  var onChange = function onChange(customCondition, formula, operator, fieldValue) {
+  var onChange = function onChange(customCondition, formula, operator, fieldValue, fieldMaxValue) {
     setCondition(function (value) {
       props.onChange && props.onChange(_objectSpread(_objectSpread({}, value), {}, {
         alias: (value || {}).eventName,
         customCondition: customCondition,
         formula: formula,
         operator: operator,
-        fieldValue: fieldValue
+        fieldValue: fieldValue,
+        fieldMaxValue: fieldMaxValue
       }));
       return _objectSpread(_objectSpread({}, value), {}, {
         alias: (value || {}).eventName,
         customCondition: customCondition,
         formula: formula,
         operator: operator,
-        fieldValue: fieldValue
+        fieldValue: fieldValue,
+        fieldMaxValue: fieldMaxValue
       });
     });
   };
@@ -44,6 +46,7 @@ var BizFormulaTarget = function BizFormulaTarget(props) {
     formula: (condition || {}).formula,
     operator: (condition || {}).operator,
     fieldValue: (condition || {}).fieldValue,
+    fieldMaxValue: (condition || {}).fieldMaxValue,
     onChange: onChange
   }));
 };

package/es/AUMFormulaTarget/types.d.ts

@@ -14,6 +14,7 @@ export declare namespace BizFormulaTargetTypes {
         formula?: string;
         operator?: string;
         fieldValue?: string;
+        fieldMaxValue?: string;
         customCondition?: TargetConditionTypes.Value[];
     }
 }

package/es/attrConditions/utils/operates.js

@@ -61,6 +61,9 @@ export var numberOperate = [{
 }, {
   name: '≠',
   value: 'not equal'
+}, {
+  name: '区间',
+  value: 'between'
 }];
 export var numberOperateCsh = [{
   name: '>',

package/es/chart/util/chartOptionConfig.js

@@ -166,7 +166,6 @@ export var getChartOption = function getChartOption(chartType, data) {
   }
   if (!reverseXAxis) {
     series = data.series.map(function (item) {
-      console.log('item', item);
       return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, item), seriesItem), {}, {
         type: chartType === 'line_bar' || chartType === 'muit_y' ? item.type : chartType
       }, chartType === 'line_bar' ? {
@@ -176,7 +175,6 @@ export var getChartOption = function getChartOption(chartType, data) {
       } : {});
     });
   } else {
-    console.log('seriesItem', seriesItem);
     series = [_objectSpread(_objectSpread(_objectSpread({
       name: seriesName || '',
       data: data.series
@@ -214,7 +212,6 @@ export var getChartOption = function getChartOption(chartType, data) {
   }
   legend.formatter = legendFormatter ? legendFormatter : legendFormatterDefault;
   var dealyAxis = chartType === 'line_bar' ? [yAxis, yAxis] : yAxis;
-  console.log('yAxis', yAxis, grid);
   if (chartType === 'muit_y' && muit_yAxis) {
     dealyAxis = muit_yAxis === null || muit_yAxis === void 0 ? void 0 : muit_yAxis.map(function (item) {
       if (item && item.name) {

package/es/select/handle.js

@@ -103,7 +103,7 @@ var SelectHandle = /*#__PURE__*/React.forwardRef(function (props, ref) {
   if (props.multiple) {
     return /*#__PURE__*/React.createElement("div", {
       ref: handleRef,
-      className: "".concat(classPrefix, "-input ").concat(classPrefix, "-input-multiple\n        ").concat(props.theme ? props.theme : '', " ").concat(props.disable ? 'disable' : '', " \n        ").concat(mergedStatus ? "".concat(classPrefix, "-status-").concat(mergedStatus) : '', "\n        ").concat(focus ? 'active' : '', " ").concat(border ? '' : 'borderless', " ").concat(props.size ? props.size : '')
+      className: "".concat(classPrefix, "-input ").concat(classPrefix, "-input-multiple\n        ").concat(props.theme ? props.theme : '', " ").concat(props.disable ? 'disable' : '', "\n        ").concat(mergedStatus ? "".concat(classPrefix, "-status-").concat(mergedStatus) : '', "\n        ").concat(focus ? 'active' : '', " ").concat(border ? '' : 'borderless', " ").concat(props.size ? props.size : '')
     }, /*#__PURE__*/React.createElement("div", {
       className: "".concat(classPrefix, "-multiple-content")
     }, props.value && props.value.length > 0 ? props.value.map(function (item, index) {
@@ -146,7 +146,7 @@ var SelectHandle = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var optionData = props.value && props.value;
   return /*#__PURE__*/React.createElement("div", {
     ref: handleRef,
-    className: "".concat(classPrefix, "-input ").concat(props.theme ? props.theme : '', "\n      ").concat(props.disable ? 'disable' : '', " ").concat(focus ? 'active' : '', " \n      ").concat(mergedStatus ? "".concat(classPrefix, "-status-").concat(mergedStatus) : '', "\n      ").concat(border ? '' : 'borderless', " ").concat(props.size ? props.size : 'middle'),
+    className: "".concat(classPrefix, "-input ").concat(props.theme ? props.theme : '', "\n      ").concat(props.disable ? 'disable' : '', " ").concat(focus ? 'active' : '', "\n      ").concat(mergedStatus ? "".concat(classPrefix, "-status-").concat(mergedStatus) : '', "\n      ").concat(border ? '' : 'borderless', " ").concat(props.size ? props.size : 'middle'),
     title: "".concat(props.label || (optionData === null || optionData === void 0 ? void 0 : optionData[aliasField || '']) || (optionData === null || optionData === void 0 ? void 0 : optionData[labelField]) || '').concat(extraLabel)
   }, /*#__PURE__*/React.createElement("span", {
     className: "".concat(classPrefix, "-content")

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zgfe/business-lib",
-    "version": "1.2.31",
+    "version": "1.2.33",
     "module": "es/index.js",
     "typings": "es/index.d.ts",
     "files": [
@@ -55,7 +55,7 @@
         "react": "^16.12.0 || ^17.0.0",
         "yorkie": "^2.0.0"
     },
-    "gitHead": "633baf122e8b6be641cc5d49360ba49845fbd7aa",
+    "gitHead": "729268b7d3dd7d2ff8573d9a6f5c764b70e010f6",
     "gitHooks": {
         "pre-commit": "lint-staged"
     }