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

package/es/context/index.d.ts

@@ -10,6 +10,7 @@ export interface UserInfo {
     username: string;
     email: string;
     companyId: number;
+    serviceType: number;
     companyName: string;
 }
 export interface Menu {

package/es/userCondition/conditionTypeList.js

@@ -16,7 +16,8 @@ var ConditionTypeList = function ConditionTypeList(props) {
     cdpTip = _useContext.cdpTip;
   var _useContext2 = useContext(BizGlobalDataContext),
     menuNameMap = _useContext2.menuNameMap,
-    system = _useContext2.system;
+    currentUser = _useContext2.currentUser;
+  console.log(666636, menuNameMap, useContext(BizGlobalDataContext));
   if (!show || textMode) return null;
   return /*#__PURE__*/React.createElement("div", {
     className: "biz-user-condition-type-list"
@@ -70,7 +71,7 @@ var ConditionTypeList = function ConditionTypeList(props) {
     title: cdpTip
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "tishiicon"
-  })) : null)) : null, system && system === 'CEP' ? /*#__PURE__*/React.createElement("li", {
+  })) : null)) : null, (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 +79,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"))) : null, system && system === 'CEP' ? /*#__PURE__*/React.createElement("li", {
+  }, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u4E1A\u52A1\u6570\u636E"))) : null, (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() {

package/es/userCondition/conditions/businessCondition.js

@@ -58,7 +58,7 @@ var BusinessCondition = function BusinessCondition(props) {
       key: 'service attribute'
     }]);
   }
-  var _useState = useState(),
+  var _useState = useState(condition.typeId ? '业务属性' : '订单属性'),
     _useState2 = _slicedToArray(_useState, 2),
     dataAttributeLabel = _useState2[0],
     setDataAttributeLabel = _useState2[1];
@@ -228,8 +228,8 @@ var BusinessCondition = function BusinessCondition(props) {
         attrId: 0,
         attrName: '',
         operator: '',
-        params: [''],
-        computeType: 'origin',
+        params: [],
+        computeType: '',
         attrType: '',
         category: ''
       };
@@ -258,7 +258,7 @@ var BusinessCondition = function BusinessCondition(props) {
     onChange(_objectSpread({}, condition));
   }
   function onServiceAttributeChange(operate) {
-    condition.typeId = operate === null || operate === void 0 ? void 0 : operate.bizDataTypeId;
+    condition.typeId = operate === null || operate === void 0 ? void 0 : operate.value;
     onChange(_objectSpread({}, condition));
     setServiceAttribute(operate);
   }
@@ -271,6 +271,10 @@ var BusinessCondition = function BusinessCondition(props) {
     options: serviceAttributeList,
     labelField: "name",
     keyField: "value",
+    value: {
+      name: condition.typeId,
+      value: condition.typeId
+    },
     overlayWidth: 120,
     onChange: onServiceAttributeChange
   })) : null, label === '订单数据' ? /*#__PURE__*/React.createElement("div", {
@@ -394,7 +398,7 @@ var BusinessCondition = function BusinessCondition(props) {
     }, /*#__PURE__*/React.createElement(IconFont, {
       type: "qingchu"
     }))));
-  }), condition.timeDimensions.length !== 3 || condition.attrs.length !== 6 ? /*#__PURE__*/React.createElement("div", {
+  }), condition.typeId && label === '业务数据' || label === '订单数据' ? /*#__PURE__*/React.createElement("div", null, condition.timeDimensions.length !== 3 || condition.attrs.length !== 6 ? /*#__PURE__*/React.createElement("div", {
     style: {
       margin: '2px 0 0 65px',
       color: '#4075fd',
@@ -409,7 +413,7 @@ var BusinessCondition = function BusinessCondition(props) {
     onClick: function onClick(e) {
       return e.preventDefault();
     }
-  }, /*#__PURE__*/React.createElement(Space, null, "\u9AD8\u7EA7\u7B5B\u9009", /*#__PURE__*/React.createElement(DownOutlined, null))))) : null);
+  }, /*#__PURE__*/React.createElement(Space, null, "\u9AD8\u7EA7\u7B5B\u9009", /*#__PURE__*/React.createElement(DownOutlined, null))))) : null) : null);
 };
 BusinessCondition.defaultProps = {
   isEvent: false,

package/es/userCondition/conditions/dataAttribute.js

@@ -21,9 +21,9 @@ import BizGlobalDataContext from '../../context';
 import { DatePicker, Input } from 'antd';
 var RangePicker = DatePicker.RangePicker;
 var DataAttribute = function DataAttribute(props) {
+  var _condition$attrs$inde;
   var condition = props.condition,
     index = props.index,
-    serviceAttrType = props.serviceAttrType,
     onChange = props.onChange;
   var list = [];
   var operateList = [];
@@ -38,9 +38,10 @@ var DataAttribute = function DataAttribute(props) {
       break;
     default:
       list = typeList['cont-date'];
+      operateList = typeList['cont-date'];
       break;
   }
-  var _useState = useState((serviceAttrType === null || serviceAttrType === void 0 ? void 0 : serviceAttrType.value) ? list : []),
+  var _useState = useState((condition === null || condition === void 0 ? void 0 : condition.typeId) ? list : []),
     _useState2 = _slicedToArray(_useState, 2),
     masterList = _useState2[0],
     setMasterList = _useState2[1];
@@ -60,22 +61,26 @@ var DataAttribute = function DataAttribute(props) {
     _useState10 = _slicedToArray(_useState9, 2),
     searchValue = _useState10[0],
     setSearchValue = _useState10[1];
-  var _useState11 = useState([]),
+  var obj = (_condition$attrs$inde = condition.attrs[index]) === null || _condition$attrs$inde === void 0 ? void 0 : _condition$attrs$inde.params.map(function (item) {
+    return {
+      name: item,
+      value: item
+    };
+  });
+  var _useState11 = useState(obj ? obj : []),
     _useState12 = _slicedToArray(_useState11, 2),
     current = _useState12[0],
     setCurrent = _useState12[1];
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp;
+  useEffect(function () {}, [searchValue]);
   useEffect(function () {
-    if (serviceAttrType === null || serviceAttrType === void 0 ? void 0 : serviceAttrType.value) {
-      queryBizDataAttrList(serviceAttrType === null || serviceAttrType === void 0 ? void 0 : serviceAttrType.value);
+    if (condition === null || condition === void 0 ? void 0 : condition.typeId) {
+      queryBizDataAttrList(condition === null || condition === void 0 ? void 0 : condition.typeId);
     } else {
       setBizDataAttrList(orderTypeList);
     }
-    if (searchValue) {
-      console.log(66666, searchValue);
-    }
-  }, [searchValue]);
+  }, [condition === null || condition === void 0 ? void 0 : condition.typeId]);
   function queryAppList(type) {
     request(type === 'master' ? '/cep-console/api/v1/cdp/orderAttribute/master' : '/cep-console/api/v1/cdp/orderAttribute/son', {
       headers: {
@@ -101,70 +106,7 @@ var DataAttribute = function DataAttribute(props) {
         setMasterList([]);
       }
     }).catch(function () {
-      setMasterList([{
-        id: 81,
-        value: 81,
-        appId: 99677,
-        name: '手机号',
-        propType: 1,
-        required: 0,
-        isOrderShow: 1,
-        isUserShow: 1,
-        columnName: 'cus4',
-        isDelete: null,
-        isUniqueOrder: '',
-        isUniqueUser: '',
-        isUniqueCreatedate: '',
-        isUniquePaydate: '',
-        orderRelationSon: '',
-        createDate: 1678431608000,
-        updateDateTime: null,
-        hidden: null,
-        attrOrder: 5,
-        requestHide: null
-      }, {
-        id: 82,
-        value: 82,
-        appId: 99677,
-        name: 'ID',
-        propType: 2,
-        required: 1,
-        isOrderShow: 1,
-        isUserShow: 1,
-        columnName: 'cus5',
-        isDelete: null,
-        isUniqueOrder: '',
-        isUniqueUser: '',
-        isUniqueCreatedate: 'Y',
-        isUniquePaydate: '',
-        orderRelationSon: '',
-        createDate: 1678431608000,
-        updateDateTime: 1678433665000,
-        hidden: null,
-        attrOrder: 6,
-        requestHide: null
-      }, {
-        id: 83,
-        value: 83,
-        appId: 99677,
-        name: '订单支付时间',
-        propType: 3,
-        required: 1,
-        isOrderShow: 1,
-        isUserShow: 1,
-        columnName: 'cus6',
-        isDelete: null,
-        isUniqueOrder: '',
-        isUniqueUser: '',
-        isUniqueCreatedate: '',
-        isUniquePaydate: 'Y',
-        orderRelationSon: '',
-        createDate: 1678431608000,
-        updateDateTime: 1678433668000,
-        hidden: null,
-        attrOrder: 7,
-        requestHide: null
-      }]);
+      setMasterList([]);
     });
   }
   function queryValueList(keyword, operate) {
@@ -224,7 +166,7 @@ var DataAttribute = function DataAttribute(props) {
     });
   }
   var onOrderTypeListChange = function onOrderTypeListChange(operate) {
-    if (serviceAttrType === null || serviceAttrType === void 0 ? void 0 : serviceAttrType.value) {
+    if (condition === null || condition === void 0 ? void 0 : condition.typeId) {
       condition.attrs[index].category = 'custom';
       condition.attrs[index].attrId = operate.id;
       condition.attrs[index].attrName = operate.name;
@@ -252,7 +194,7 @@ var DataAttribute = function DataAttribute(props) {
     onChange(_objectSpread({}, condition));
   };
   var onMasterListChange = function onMasterListChange(operate) {
-    if (!(serviceAttrType === null || serviceAttrType === void 0 ? void 0 : serviceAttrType.value)) {
+    if (!(condition === null || condition === void 0 ? void 0 : condition.typeId)) {
       switch (operate.propType) {
         case 1:
           setStringOperateList(typeList['cont-string']);
@@ -274,13 +216,16 @@ var DataAttribute = function DataAttribute(props) {
           break;
       }
       condition.attrs[index].attrId = operate.id;
+      condition.attrs[index].computeType = 'origin';
       condition.attrs[index].attrName = operate.name;
       condition.attrs[index].attrMaping = operate.columnName;
+      condition.attrs[index].operator = '';
     } else {
       switch (condition.attrs[index].attrType) {
         case 'cont-string':
         case 'cont-date':
           condition.attrs[index].operator = operate.value;
+          condition.attrs[index].computeType = 'origin';
           condition.attrs[index].params = [];
           if (condition.attrs[index].operator === 'absolute' && condition.attrs[index].attrType === 'cont-date') {
             var _endDate = moment().format('YYYY-MM-DD');
@@ -326,7 +271,7 @@ var DataAttribute = function DataAttribute(props) {
     var params = operate.map(function (item) {
       return item.value;
     });
-    if (!(serviceAttrType === null || serviceAttrType === void 0 ? void 0 : serviceAttrType.value)) {
+    if (!(condition === null || condition === void 0 ? void 0 : condition.typeId)) {
       queryValueList(searchValue, {});
     }
     setCurrent(obj);
@@ -352,6 +297,10 @@ var DataAttribute = function DataAttribute(props) {
     options: bizDataAttrList,
     labelField: "name",
     keyField: "value",
+    value: {
+      name: condition.typeId ? condition.attrs[index].attrName : condition.attrs[index].orderType,
+      value: condition.typeId ? condition.attrs[index].attrId : condition.attrs[index].orderType
+    },
     overlayWidth: 120,
     onChange: onOrderTypeListChange
   })), /*#__PURE__*/React.createElement("div", {
@@ -359,10 +308,14 @@ var DataAttribute = function DataAttribute(props) {
   }, /*#__PURE__*/React.createElement(BizSelect, {
     className: "".concat(classPrefix, "-select-condition"),
     options: masterList,
+    value: {
+      name: condition.typeId ? condition.attrs[index].attrType === 'cont-string' || condition.attrs[index].attrType === 'cont-date' ? condition.attrs[index].operator : condition.attrs[index].computeType : condition.attrs[index].attrName,
+      value: condition.typeId ? condition.attrs[index].attrType === 'cont-string' || condition.attrs[index].attrType === 'cont-date' ? condition.attrs[index].operator : condition.attrs[index].computeType : condition.attrs[index].attrId
+    },
     labelField: "name",
     keyField: "value",
     onChange: onMasterListChange
-  })), !(serviceAttrType === null || serviceAttrType === void 0 ? void 0 : serviceAttrType.value) && condition.attrs[index].attrType === 'cont-num' ? /*#__PURE__*/React.createElement("div", {
+  })), !(condition === null || condition === void 0 ? void 0 : condition.typeId) && condition.attrs[index].attrType === 'cont-num' ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-period-condition-operator")
   }, /*#__PURE__*/React.createElement(BizSelect, {
     className: "".concat(classPrefix, "-select-condition"),
@@ -375,7 +328,7 @@ var DataAttribute = function DataAttribute(props) {
     },
     overlayWidth: 120,
     onChange: onComputeTypeOperateChange
-  })) : null, (serviceAttrType === null || serviceAttrType === void 0 ? void 0 : serviceAttrType.value) && condition.attrs[index].attrType === 'cont-num' || !(serviceAttrType === null || serviceAttrType === void 0 ? void 0 : serviceAttrType.value) ? /*#__PURE__*/React.createElement("div", {
+  })) : null, (condition === null || condition === void 0 ? void 0 : condition.typeId) && condition.attrs[index].attrType === 'cont-num' || !(condition === null || condition === void 0 ? void 0 : condition.typeId) ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-period-condition-operator")
   }, /*#__PURE__*/React.createElement(BizSelect, {
     className: "".concat(classPrefix, "-select-condition"),
@@ -388,7 +341,7 @@ var DataAttribute = function DataAttribute(props) {
     },
     overlayWidth: 120,
     onChange: onStringOperateChange
-  })) : null, !(serviceAttrType === null || serviceAttrType === void 0 ? void 0 : serviceAttrType.value) && condition.attrs[index].attrType === 'cont-string' || condition.attrs[index].attrType === 'cont-string' && condition.attrs[index].operator !== 'is null' && condition.attrs[index].operator !== 'is not null' ? /*#__PURE__*/React.createElement("div", {
+  })) : null, !(condition === null || condition === void 0 ? void 0 : condition.typeId) && condition.attrs[index].attrType === 'cont-string' || condition.attrs[index].attrType === 'cont-string' && condition.attrs[index].operator !== 'is null' && condition.attrs[index].operator !== 'is not null' ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-period-condition-operator"),
     style: {
       width: '250px'

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zgfe/business-lib",
-    "version": "1.1.34-alpha.2",
+    "version": "1.1.34-alpha.4",
     "scripts": {
         "start": "dumi dev",
         "docs:build": "dumi build",