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

package/es/userCondition/conditionTypeList.js

@@ -13,10 +13,13 @@ var ConditionTypeList = function ConditionTypeList(props) {
     textMode = _useContext.textMode,
     openTagCondition = _useContext.openTagCondition,
     openCdpCondition = _useContext.openCdpCondition,
+    openBusinessDataCondition = _useContext.openBusinessDataCondition,
+    openOrderDataCondition = _useContext.openOrderDataCondition,
     openCondition = _useContext.openCondition,
     cdpTip = _useContext.cdpTip;
   var _useContext2 = useContext(BizGlobalDataContext),
-    menuNameMap = _useContext2.menuNameMap;
+    menuNameMap = _useContext2.menuNameMap,
+    currentUser = _useContext2.currentUser;
   if (!show || textMode) return null;
   return /*#__PURE__*/React.createElement("div", {
     className: "biz-user-condition-type-list"
@@ -70,7 +73,7 @@ var ConditionTypeList = function ConditionTypeList(props) {
     title: cdpTip
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "tishiicon"
-  })) : null)) : null, /*#__PURE__*/React.createElement("li", {
+  })) : null)) : null, openBusinessDataCondition || (currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType) === 0 || (currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType) === 2 ? /*#__PURE__*/React.createElement("li", {
     className: "condition-type",
     key: "business",
     onClick: function onClick() {
@@ -78,7 +81,7 @@ var ConditionTypeList = function ConditionTypeList(props) {
     }
   }, /*#__PURE__*/React.createElement(Space, {
     key: "business"
-  }, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u4E1A\u52A1\u6570\u636E"))), /*#__PURE__*/React.createElement("li", {
+  }, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u4E1A\u52A1\u6570\u636E"))) : null, openOrderDataCondition || (currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType) === 0 || (currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType) === 2 ? /*#__PURE__*/React.createElement("li", {
     className: "condition-type",
     key: "order",
     onClick: function onClick() {
@@ -86,7 +89,7 @@ var ConditionTypeList = function ConditionTypeList(props) {
     }
   }, /*#__PURE__*/React.createElement(Space, {
     key: "order"
-  }, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u8BA2\u5355\u6570\u636E")))));
+  }, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u8BA2\u5355\u6570\u636E"))) : null));
 };
 ConditionTypeList.defaultProps = {
   show: true

package/es/userCondition/conditions/textDesc.js

@@ -234,12 +234,15 @@ var Text = function Text(props) {
     }, runTimes.values[0]));
   }
   function renderFrequencyValues(frequencyValues, frequencyOperator, frequency) {
-    var _frequencyOperatorLis;
+    var _frequencyValues, _frequencyOperatorLis;
     var frequencyValuesDom = [];
     var frequencyOperatorList = typeList['cont-num'].filter(function (v) {
       return v.value === frequencyOperator;
     });
-    frequencyValues === null || frequencyValues === void 0 ? void 0 : frequencyValues.forEach(function (item, i) {
+    if (['relative', 'relativeExceed', 'future', 'futureExceed'].includes(frequencyOperator)) {
+      frequencyValues = [frequencyValues[0]];
+    }
+    (_frequencyValues = frequencyValues) === null || _frequencyValues === void 0 ? void 0 : _frequencyValues.forEach(function (item, i) {
       var dom = /*#__PURE__*/React.createElement("span", {
         key: i
       }, /*#__PURE__*/React.createElement("span", null, item, i !== frequencyValues.length - 1 ? '到' : ''));

package/es/userCondition/index.js

@@ -74,6 +74,13 @@ var BizUserCondition = function BizUserCondition(props) {
               }
             });
           }
+          item.map(function (v) {
+            if ((v.attrs || []).length) {
+              v.attrs.map(function (attrItem) {
+                attrItem.operator = attrItem.operator === 'relativeInterval' && attrItem.params[1] === '99999' ? 'relativeExceed' : attrItem.operator === 'futureInterval' && attrItem.params[1] === '99999' ? 'futureExceed' : attrItem.operator;
+              });
+            }
+          });
           if (showItem.length > 0) {
             list.push(showItem);
           }

package/package.json

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