@zgfe/business-lib 1.1.31-alpha.1 → 1.1.31-alpha.2

package/es/userCondition/conditions/businessCondition.js

@@ -18,7 +18,7 @@ import moment from 'moment';
 import request from '../../utils/ajax';
 import './styles/periodCondition.less';
 import { classPrefix } from '..';
-import { numberOperate } from '../../attrConditions/utils/operates';
+import { typeList } from '../../attrConditions/utils/operates';
 import { operatorMap } from './constants';
 import TimeDimension from './timeDimension';
 import DataAttribute from './dataAttribute';
@@ -55,25 +55,18 @@ var BusinessCondition = function BusinessCondition(props) {
       key: 'service attribute'
     }]);
   }
-  var _useState = useState({
-      name: '≥',
-      value: 'ge'
-    }),
+  var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
-    operator = _useState2[0],
-    setOperator = _useState2[1];
+    dataAttributeLabel = _useState2[0],
+    setDataAttributeLabel = _useState2[1];
   var _useState3 = useState(),
     _useState4 = _slicedToArray(_useState3, 2),
-    dataAttributeLabel = _useState4[0],
-    setDataAttributeLabel = _useState4[1];
-  var _useState5 = useState(),
+    serviceAttribute = _useState4[0],
+    setServiceAttribute = _useState4[1];
+  var _useState5 = useState([]),
     _useState6 = _slicedToArray(_useState5, 2),
-    serviceAttribute = _useState6[0],
-    setServiceAttribute = _useState6[1];
-  var _useState7 = useState([]),
-    _useState8 = _slicedToArray(_useState7, 2),
-    serviceAttributeList = _useState8[0],
-    setServiceAttributeList = _useState8[1];
+    serviceAttributeList = _useState6[0],
+    setServiceAttributeList = _useState6[1];
   var options = [{
     text: '最近',
     value: 'relative'
@@ -186,20 +179,22 @@ var BusinessCondition = function BusinessCondition(props) {
     }
   }
   var onOperateChange = function onOperateChange(operate) {
-    setOperator(operate);
+    condition.runTimes.values = [condition.runTimes.values[0]];
     onChange(_objectSpread(_objectSpread({}, condition), {}, {
       runTimes: _objectSpread(_objectSpread({}, condition.runTimes), {}, {
-        operator: operate
+        operator: operate.value
       })
     }));
   };
-  var onOperateInputChange = function onOperateInputChange(value) {
+  var onOperateInput0Change = function onOperateInput0Change(value) {
     var newValue = value.target.value;
-    onChange(_objectSpread(_objectSpread({}, condition), {}, {
-      runTimes: _objectSpread(_objectSpread({}, condition.runTimes), {}, {
-        values: [newValue]
-      })
-    }));
+    condition.runTimes.values[0] = newValue;
+    onChange(_objectSpread({}, condition));
+  };
+  var onOperateInput1Change = function onOperateInput1Change(value) {
+    var newValue = value.target.value;
+    condition.runTimes.values[1] = newValue;
+    onChange(_objectSpread({}, condition));
   };
   var onClick = function onClick(_ref) {
     var key = _ref.key;
@@ -301,27 +296,47 @@ var BusinessCondition = function BusinessCondition(props) {
     className: "".concat(classPrefix, "-period-condition-operator")
   }, /*#__PURE__*/React.createElement(BizSelect, {
     className: "".concat(classPrefix, "-select-condition"),
-    options: numberOperate,
+    options: typeList['cont-num'],
     labelField: "name",
     keyField: "value",
     overlayWidth: 80,
-    value: operator,
+    value: {
+      value: condition.runTimes.operator,
+      name: condition.runTimes.operator
+    },
     onChange: onOperateChange
   })), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-period-condition")
   }, /*#__PURE__*/React.createElement(Input, {
     key: "relative-date",
     className: "".concat(classPrefix, "-select-condition"),
-    type: "number",
+    type: condition.runTimes.operator !== 'between' ? 'number' : '',
+    size: "middle",
+    value: condition.runTimes.values[0],
+    placeholder: condition.runTimes.operator !== 'between' ? '请输入' : '输入最小值',
+    style: {
+      width: 100
+    },
+    onChange: onOperateInput0Change,
+    suffix: condition.runTimes.operator !== 'between' ? '次' : null
+  })), condition.runTimes.operator === 'between' ? /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-period-condition"),
+    style: {
+      marginLeft: 10
+    }
+  }, /*#__PURE__*/React.createElement(Input, {
+    key: "relative-date",
+    className: "".concat(classPrefix, "-select-condition"),
+    type: condition.runTimes.operator !== 'between' ? 'number' : '',
     size: "middle",
-    placeholder: "\u8BF7\u8F93\u5165",
-    value: condition.runTimes.values,
+    value: condition.runTimes.values[1],
     style: {
-      width: 80
+      width: 100
     },
-    onChange: onOperateInputChange,
-    suffix: "\u6B21"
-  }))), condition.timeDimensions.map(function (_item, index) {
+    placeholder: condition.runTimes.operator !== 'between' ? '请输入' : '输入最大值',
+    onChange: onOperateInput1Change,
+    suffix: condition.runTimes.operator !== 'between' ? '次' : null
+  })) : null), condition.timeDimensions.map(function (_item, index) {
     return /*#__PURE__*/React.createElement("div", {
       style: {
         margin: '10px 0 0 65px'

package/es/userCondition/conditions/constants.d.ts

@@ -22,6 +22,7 @@ export declare const operatorMap: {
     gt: string;
     ge: string;
     le: string;
+    between: string;
 };
 export declare const durationHandler: {
     [key: string]: any;

package/es/userCondition/conditions/constants.js

@@ -21,7 +21,8 @@ export var operatorMap = {
   lt: '<',
   gt: '>',
   ge: '≥',
-  le: '≤'
+  le: '≤',
+  between: '区间'
 };
 export var durationHandler = {
   1: {

package/es/userCondition/conditions/dataAttribute.js

@@ -25,11 +25,26 @@ var DataAttribute = function DataAttribute(props) {
     index = props.index,
     serviceAttrType = props.serviceAttrType,
     onChange = props.onChange;
-  var _useState = useState([]),
+  var list = [];
+  var operateList = [];
+  switch (condition.attrs[index].attrType) {
+    case 'cont-string':
+      list = typeList['cont-string'];
+      operateList = stringOperate;
+      break;
+    case 'cont-num':
+      list = computeTypeList;
+      operateList = typeList['cont-num'];
+      break;
+    default:
+      list = typeList['cont-date'];
+      break;
+  }
+  var _useState = useState((serviceAttrType === null || serviceAttrType === void 0 ? void 0 : serviceAttrType.value) ? list : []),
     _useState2 = _slicedToArray(_useState, 2),
     masterList = _useState2[0],
     setMasterList = _useState2[1];
-  var _useState3 = useState([]),
+  var _useState3 = useState(operateList),
     _useState4 = _slicedToArray(_useState3, 2),
     stringOperateList = _useState4[0],
     setStringOperateList = _useState4[1];
@@ -61,20 +76,20 @@ var DataAttribute = function DataAttribute(props) {
       },
       method: 'post',
       data: {
-        appId: 1,
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
         pageNum: 1,
         pageSize: 9999
       }
     }).then(function (res) {
       if (res.data) {
-        var list = res.data.map(function (item) {
+        var _list = res.data.map(function (item) {
           return {
             name: item.name,
             value: item.id,
             columnName: item.columnName
           };
         });
-        setMasterList(list);
+        setMasterList(_list);
       } else {
         setMasterList([]);
       }
@@ -100,13 +115,13 @@ var DataAttribute = function DataAttribute(props) {
       }
     }).then(function (res) {
       if (res.data) {
-        var list = res.data.map(function (item) {
+        var _list2 = res.data.map(function (item) {
           return {
             name: operate.bizDataTypeId ? item : item.name,
             value: operate.bizDataTypeId ? item : item.id
           };
         });
-        setParamsList(list);
+        setParamsList(_list2);
       } else {
         setParamsList([]);
       }
@@ -125,12 +140,12 @@ var DataAttribute = function DataAttribute(props) {
       }
     }).then(function (res) {
       if (res.data) {
-        var list = res.data.map(function (item) {
+        var _list3 = res.data.map(function (item) {
           return _objectSpread(_objectSpread({}, item), {}, {
             value: item.id
           });
         });
-        setBizDataAttrList(list);
+        setBizDataAttrList(_list3);
       } else {
         setBizDataAttrList([]);
       }
@@ -168,9 +183,7 @@ var DataAttribute = function DataAttribute(props) {
   };
   var onMasterListChange = function onMasterListChange(operate) {
     if (!(serviceAttrType === null || serviceAttrType === void 0 ? void 0 : serviceAttrType.value)) {
-      condition.attrs[index].attrName = operate.name;
       condition.attrs[index].attrMaping = operate.columnName;
-      condition.attrs[index].attrId = operate.value;
       condition.attrs[index].attrType = 'cont-string';
       setStringOperateList(stringOperate);
     } else {
@@ -252,6 +265,10 @@ var DataAttribute = function DataAttribute(props) {
     options: stringOperateList,
     labelField: "name",
     keyField: "value",
+    value: {
+      name: condition.attrs[index].operator,
+      value: condition.attrs[index].operator
+    },
     overlayWidth: 120,
     onChange: onStringOperateChange
   })) : null, !(serviceAttrType === null || serviceAttrType === void 0 ? void 0 : serviceAttrType.value) || condition.attrs[index].attrType === 'cont-string' && condition.attrs[index].operator !== 'is null' && condition.attrs[index].operator !== 'is not null' ? /*#__PURE__*/React.createElement("div", {
@@ -277,6 +294,7 @@ var DataAttribute = function DataAttribute(props) {
     size: "middle",
     type: condition.attrs[index].attrType === 'cont-date' ? 'number' : '',
     placeholder: condition.attrs[index].operator === 'between' ? '输入最小值' : '请输入',
+    value: condition.attrs[index].params[0],
     style: {
       width: condition.attrs[index].operator === 'between' || condition.attrs[index].attrType === 'cont-date' && condition.attrs[index].operator ? 100 : 200
     },
@@ -293,6 +311,7 @@ var DataAttribute = function DataAttribute(props) {
     size: "middle",
     type: condition.attrs[index].attrType === 'cont-date' ? 'number' : '',
     placeholder: '输入最大值',
+    value: condition.attrs[index].params[1],
     style: {
       width: 100
     },

package/es/userCondition/conditions/timeDimension.js

@@ -11,31 +11,11 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useState } from 'react';
-import { Input, Tooltip, Space } from 'antd';
-import { InfoCircleOutlined } from '@ant-design/icons';
+import { Input } from 'antd';
 import BizSelect from '../../select';
 import './styles/runTimesCondition.less';
 import { classPrefix } from '..';
-import { timeDimensionType, skyTimeOperatorType, weekTimeOperatorType, monthTimeOperatorType, timeValuesType, weekValuesType, monthValuesType } from '../../attrConditions/utils/operates';
-var options = [{
-  value: '>',
-  text: '>'
-}, {
-  value: '=',
-  text: '='
-}, {
-  value: '<',
-  text: '<'
-}, {
-  value: '>=',
-  text: '≥'
-}, {
-  value: '<=',
-  text: '≤'
-}, {
-  value: 'not equal',
-  text: '≠'
-}];
+import { timeDimensionType, skyTimeOperatorType, weekTimeOperatorType, monthTimeOperatorType, timeValuesType, weekValuesType, monthValuesType, typeList } from '../../attrConditions/utils/operates';
 var TimeDimension = function TimeDimension(props) {
   var condition = props.condition,
     index = props.index,
@@ -45,23 +25,44 @@ var TimeDimension = function TimeDimension(props) {
       value: 1
     }),
     _useState2 = _slicedToArray(_useState, 2),
-    timeDimensionTypeList = _useState2[0],
     setTimeDimensionTypeList = _useState2[1];
-  var _useState3 = useState(skyTimeOperatorType),
+  var list = [];
+  var valuesList = [];
+  switch (condition.timeDimensions[index].timeDimension) {
+    case 1:
+      list = skyTimeOperatorType;
+      valuesList = timeValuesType;
+      break;
+    case 2:
+      list = weekTimeOperatorType;
+      valuesList = weekValuesType;
+      break;
+    default:
+      list = monthTimeOperatorType;
+      valuesList = monthValuesType;
+      break;
+  }
+  var _useState3 = useState(list),
     _useState4 = _slicedToArray(_useState3, 2),
     timeOperatorTypeList = _useState4[0],
     setTimeOperatorTypeList = _useState4[1];
-  var _useState5 = useState(timeValuesType),
+  var _useState5 = useState(valuesList),
     _useState6 = _slicedToArray(_useState5, 2),
     timeValuesTypeList = _useState6[0],
     setTimeValuesTypeList = _useState6[1];
   function onOperatorChange(data) {
     condition.timeDimensions[index].frequencyOperator = data.value;
+    condition.timeDimensions[index].frequencyValues = [condition.timeDimensions[index].frequencyValues[0]];
+    onChange(_objectSpread({}, condition));
+  }
+  function onValue0Change(e) {
+    var value = e.target.value;
+    condition.timeDimensions[index].frequencyValues[0] = value;
     onChange(_objectSpread({}, condition));
   }
-  function onValueChange(e) {
+  function onValue1Change(e) {
     var value = e.target.value;
-    condition.timeDimensions[index].frequencyValues = value;
+    condition.timeDimensions[index].frequencyValues[1] = value;
     onChange(_objectSpread({}, condition));
   }
   var onTimeDimensionTypeChange = function onTimeDimensionTypeChange(operate) {
@@ -84,7 +85,7 @@ var TimeDimension = function TimeDimension(props) {
     onChange(_objectSpread({}, condition));
   };
   var onTimeOperatorTypeChange = function onTimeOperatorTypeChange(operate) {
-    condition.timeDimensions[index].timeValues = [];
+    condition.timeDimensions[index].timeValues = [condition.timeDimensions[index].timeValues[0]];
     condition.timeDimensions[index].timeOperator = operate.value;
     onChange(_objectSpread({}, condition));
   };
@@ -106,7 +107,10 @@ var TimeDimension = function TimeDimension(props) {
     labelField: "name",
     keyField: "value",
     overlayWidth: 80,
-    value: timeDimensionTypeList,
+    value: {
+      name: condition.timeDimensions[index].timeDimension,
+      value: condition.timeDimensions[index].timeDimension
+    },
     onChange: onTimeDimensionTypeChange
   })), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-period-condition-operator")
@@ -116,7 +120,10 @@ var TimeDimension = function TimeDimension(props) {
     labelField: "name",
     keyField: "value",
     overlayWidth: 120,
-    value: timeOperatorTypeList[0],
+    value: {
+      name: condition.timeDimensions[index].timeOperator,
+      value: condition.timeDimensions[index].timeOperator
+    },
     onChange: onTimeOperatorTypeChange
   })), condition.timeDimensions[index].timeOperator === 'in' || condition.timeDimensions[index].timeOperator === 'between' ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-period-condition-operator")
@@ -126,6 +133,10 @@ var TimeDimension = function TimeDimension(props) {
     labelField: "name",
     keyField: "value",
     overlayWidth: 120,
+    value: {
+      name: condition.timeDimensions[index].timeValues[0],
+      value: condition.timeDimensions[index].timeValues[0]
+    },
     onChange: onTimeValuesType0Change
   })) : null, condition.timeDimensions[index].timeOperator === 'between' ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-period-condition-operator")
@@ -135,39 +146,55 @@ var TimeDimension = function TimeDimension(props) {
     labelField: "name",
     keyField: "value",
     overlayWidth: 120,
+    value: {
+      name: condition.timeDimensions[index].timeValues[1],
+      value: condition.timeDimensions[index].timeValues[1]
+    },
     onChange: onTimeValuesType1Change
   })) : null, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-runtimes-condition-operator")
+    className: "".concat(classPrefix, "-period-condition-operator")
   }, /*#__PURE__*/React.createElement(BizSelect, {
-    options: options,
-    labelField: "text",
+    options: typeList['cont-num'],
+    labelField: "name",
+    overlayWidth: 100,
     keyField: "value",
     value: {
       value: condition.timeDimensions[index].frequencyOperator,
-      text: condition.timeDimensions[index].frequencyOperator === 'not equal' ? '≠' : condition.timeDimensions[index].frequencyOperator
+      name: condition.timeDimensions[index].frequencyOperator
     },
     size: "middle",
     onChange: onOperatorChange
   })), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-runtimes-condition-value")
+    className: "".concat(classPrefix, "-period-condition")
   }, /*#__PURE__*/React.createElement(Input, {
     key: "relative-date",
     className: "".concat(classPrefix, "-select-condition"),
-    type: "number",
+    type: condition.timeDimensions[index].frequencyOperator !== 'between' ? 'number' : '',
     size: "middle",
-    placeholder: "\u8BF7\u8F93\u5165",
-    value: condition.timeDimensions[index].frequencyValues,
+    value: condition.timeDimensions[index].frequencyValues[0],
+    placeholder: condition.timeDimensions[index].frequencyOperator !== 'between' ? '请输入' : '输入最小值',
     style: {
-      width: 80
+      width: 100
     },
-    onChange: onValueChange,
-    suffix: "\u6B21"
-  })), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-runtimes-condition-unit")
-  }, /*#__PURE__*/React.createElement(Space, null, "\u6B21", /*#__PURE__*/React.createElement(Tooltip, {
-    title: "\u89E6\u53D1\u6B21\u6570\u4E3A0\u7B49\u540C\u4E8E\u6CA1\u6709\u89E6\u53D1"
-  }, /*#__PURE__*/React.createElement("span", {
-    className: "".concat(classPrefix, "-runtimes-tip")
-  }, /*#__PURE__*/React.createElement(InfoCircleOutlined, null)))))));
+    onChange: onValue0Change,
+    suffix: condition.timeDimensions[index].frequencyOperator !== 'between' ? '次' : null
+  })), condition.timeDimensions[index].frequencyOperator === 'between' ? /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-period-condition"),
+    style: {
+      marginLeft: 10
+    }
+  }, /*#__PURE__*/React.createElement(Input, {
+    key: "relative-date",
+    className: "".concat(classPrefix, "-select-condition"),
+    type: condition.timeDimensions[index].frequencyOperator !== 'between' ? 'number' : '',
+    size: "middle",
+    placeholder: condition.timeDimensions[index].frequencyOperator !== 'between' ? '请输入' : '输入最大值',
+    value: condition.timeDimensions[index].frequencyValues[1],
+    style: {
+      width: 100
+    },
+    onChange: onValue1Change,
+    suffix: condition.timeDimensions[index].frequencyOperator !== 'between' ? '次' : null
+  })) : null));
 };
 export default TimeDimension;

package/es/userCondition/types.d.ts

@@ -8,7 +8,7 @@ export interface RunPeriodI {
     values: string[];
 }
 export interface RunTimesI {
-    operator: '>' | '=' | '<' | '>=' | '<=' | '>=' | 'not equal';
+    operator: '>' | '=' | '<' | '>=' | '<=' | '>=' | 'not equal' | 'between';
     values: string[];
 }
 export interface AllConditionBasePropsI<T> {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zgfe/business-lib",
-    "version": "1.1.31-alpha.1",
+    "version": "1.1.31-alpha.2",
     "scripts": {
         "start": "dumi dev",
         "docs:build": "dumi build",
@@ -59,5 +59,5 @@
         "react": "^16.12.0 || ^17.0.0",
         "yorkie": "^2.0.0"
     },
-    "gitHead": "052bb4383bf8d91fc74db8c6285d8d220306e776"
-}
+    "gitHead": "b2e287ebcfeaa841e1f4e10bd9891e58f3223e95"
+}