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

package/es/attrConditions/components/stringList.js

@@ -128,6 +128,7 @@ var StringList = function StringList(props) {
     };
   }();
   var onChange = function onChange(data) {
+    console.log(8888, data);
     var resData = data.map(function (item) {
       return item.value;
     });

package/es/userCondition/conditions/businessCondition.js

@@ -10,7 +10,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 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, { useEffect, useState } from 'react';
+import React, { useContext, useEffect, useState } from 'react';
 import BizSelect from '../../select';
 import { DownOutlined } from '@ant-design/icons';
 import { Input, DatePicker, Dropdown, Space, notification } from 'antd';
@@ -23,12 +23,15 @@ import { operatorMap } from './constants';
 import TimeDimension from './timeDimension';
 import DataAttribute from './dataAttribute';
 import IconFont from '../../icon/iconFont';
+import BizGlobalDataContext from '../../context';
 var RangePicker = DatePicker.RangePicker;
 var BusinessCondition = function BusinessCondition(props) {
   var condition = props.condition,
     dataId = props.dataId,
     isEvent = props.isEvent,
     label = props.label;
+  var _useContext = useContext(BizGlobalDataContext),
+    currentApp = _useContext.currentApp;
   function onChange(data) {
     props.onChange(dataId, data);
   }
@@ -87,7 +90,7 @@ var BusinessCondition = function BusinessCondition(props) {
     }]);
   }
   function queryServiceAttributeList() {
-    request('/cep-console/api/v1/bizdata/type/list', {
+    request("/cep-console/api/v1/bizdata/type/list/".concat(currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId), {
       headers: {
         'Content-Type': 'application/json'
       },

package/es/userCondition/conditions/dataAttribute.js

@@ -60,6 +60,10 @@ var DataAttribute = function DataAttribute(props) {
     _useState10 = _slicedToArray(_useState9, 2),
     searchValue = _useState10[0],
     setSearchValue = _useState10[1];
+  var _useState11 = useState([]),
+    _useState12 = _slicedToArray(_useState11, 2),
+    current = _useState12[0],
+    setCurrent = _useState12[1];
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp;
   useEffect(function () {
@@ -68,6 +72,9 @@ var DataAttribute = function DataAttribute(props) {
     } else {
       setBizDataAttrList(orderTypeList);
     }
+    if (searchValue) {
+      console.log(66666, searchValue);
+    }
   }, [searchValue]);
   function queryAppList(type) {
     request(type === 'master' ? '/cep-console/api/v1/cdp/orderAttribute/master' : '/cep-console/api/v1/cdp/orderAttribute/son', {
@@ -83,18 +90,81 @@ var DataAttribute = function DataAttribute(props) {
     }).then(function (res) {
       if (res.data) {
         var _list = res.data.map(function (item) {
-          return {
+          return _objectSpread(_objectSpread({}, item), {}, {
             name: item.name,
             value: item.id,
             columnName: item.columnName
-          };
+          });
         });
         setMasterList(_list);
       } else {
         setMasterList([]);
       }
     }).catch(function () {
-      setMasterList([]);
+      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
+      }]);
     });
   }
   function queryValueList(keyword, operate) {
@@ -158,6 +228,7 @@ var DataAttribute = function DataAttribute(props) {
       condition.attrs[index].category = 'custom';
       condition.attrs[index].attrId = operate.id;
       condition.attrs[index].attrName = operate.name;
+      condition.typeId = operate === null || operate === void 0 ? void 0 : operate.bizDataTypeId;
       switch (operate.propType) {
         case 1:
           setMasterList(typeList['cont-string']);
@@ -183,9 +254,29 @@ var DataAttribute = function DataAttribute(props) {
   };
   var onMasterListChange = function onMasterListChange(operate) {
     if (!(serviceAttrType === null || serviceAttrType === void 0 ? void 0 : serviceAttrType.value)) {
+      switch (operate.propType) {
+        case 1:
+          setStringOperateList(typeList['cont-string']);
+          condition.attrs[index].attrType = 'cont-string';
+          queryValueList('', operate);
+          break;
+        case 2:
+          setStringOperateList(typeList['cont-num']);
+          condition.attrs[index].attrType = 'cont-num';
+          break;
+        default:
+          setStringOperateList(typeList['cont-date']);
+          condition.attrs[index].attrType = 'cont-date';
+          if (condition.attrs[index].attrType === 'cont-date') {
+            var endDate = moment().format('YYYY-MM-DD');
+            var startDate = moment().subtract(7, 'days').format('YYYY-MM-DD');
+            condition.attrs[index].params = [startDate, endDate];
+          }
+          break;
+      }
+      condition.attrs[index].attrId = operate.id;
+      condition.attrs[index].attrName = operate.name;
       condition.attrs[index].attrMaping = operate.columnName;
-      condition.attrs[index].attrType = 'cont-string';
-      setStringOperateList(stringOperate);
     } else {
       switch (condition.attrs[index].attrType) {
         case 'cont-string':
@@ -193,9 +284,9 @@ var DataAttribute = function DataAttribute(props) {
           condition.attrs[index].operator = operate.value;
           condition.attrs[index].params = [];
           if (condition.attrs[index].operator === 'absolute' && condition.attrs[index].attrType === 'cont-date') {
-            var endDate = moment().format('YYYY-MM-DD');
-            var startDate = moment().subtract(7, 'days').format('YYYY-MM-DD');
-            condition.attrs[index].params = [startDate, endDate];
+            var _endDate = moment().format('YYYY-MM-DD');
+            var _startDate = moment().subtract(7, 'days').format('YYYY-MM-DD');
+            condition.attrs[index].params = [_startDate, _endDate];
           }
           break;
         default:
@@ -206,9 +297,16 @@ var DataAttribute = function DataAttribute(props) {
     onChange(_objectSpread({}, condition));
   };
   var onStringOperateChange = function onStringOperateChange(operate) {
+    if (condition.attrs[index].operator !== 'absolute') {
+      condition.attrs[index].params = [];
+    }
     condition.attrs[index].operator = operate.value;
     onChange(_objectSpread({}, condition));
   };
+  var onComputeTypeOperateChange = function onComputeTypeOperateChange(operate) {
+    condition.attrs[index].computeType = operate.value;
+    onChange(_objectSpread({}, condition));
+  };
   var onValue0Change = function onValue0Change(e) {
     var value = e.target.value;
     condition.attrs[index].params[0] = value;
@@ -221,12 +319,19 @@ var DataAttribute = function DataAttribute(props) {
   };
   var onParamsChange = function onParamsChange(operate) {
     var obj = operate.map(function (item) {
+      return {
+        name: item.name,
+        value: item.value
+      };
+    });
+    var params = operate.map(function (item) {
       return item.value;
     });
     if (!(serviceAttrType === null || serviceAttrType === void 0 ? void 0 : serviceAttrType.value)) {
       queryValueList(searchValue, {});
     }
-    condition.attrs[index].params = obj;
+    setCurrent(obj);
+    condition.attrs[index].params = params;
     onChange(_objectSpread({}, condition));
   };
   function onDateChange(newData) {
@@ -258,7 +363,20 @@ var DataAttribute = function DataAttribute(props) {
     labelField: "name",
     keyField: "value",
     onChange: onMasterListChange
-  })), condition.attrs[index].attrType !== 'cont-string' && condition.attrs[index].attrType !== 'cont-date' ? /*#__PURE__*/React.createElement("div", {
+  })), !(serviceAttrType === null || serviceAttrType === void 0 ? void 0 : serviceAttrType.value) && 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"),
+    options: computeTypeList,
+    labelField: "name",
+    keyField: "value",
+    value: {
+      name: condition.attrs[index].computeType,
+      value: condition.attrs[index].computeType
+    },
+    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", {
     className: "".concat(classPrefix, "-period-condition-operator")
   }, /*#__PURE__*/React.createElement(BizSelect, {
     className: "".concat(classPrefix, "-select-condition"),
@@ -271,7 +389,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].operator !== 'is null' && condition.attrs[index].operator !== 'is not null' ? /*#__PURE__*/React.createElement("div", {
+  })) : 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", {
     className: "".concat(classPrefix, "-period-condition-operator"),
     style: {
       width: '250px'
@@ -279,13 +397,14 @@ var DataAttribute = function DataAttribute(props) {
   }, /*#__PURE__*/React.createElement(BizSelect, {
     className: "".concat(classPrefix, "-multi-select"),
     multiple: true,
-    enableCreate: false,
     size: "middle",
     labelField: "name",
     keyField: "value",
+    value: current,
     options: paramsList,
     onChange: onParamsChange,
-    onSearch: setSearchValue
+    onSearch: setSearchValue,
+    enableCreate: true
   })) : null, condition.attrs[index].attrType === 'cont-num' || condition.attrs[index].attrType === 'cont-date' && condition.attrs[index].operator !== 'absolute' ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-period-condition")
   }, /*#__PURE__*/React.createElement(Input, {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zgfe/business-lib",
-    "version": "1.1.31-alpha.2",
+    "version": "1.1.31-alpha.4",
     "scripts": {
         "start": "dumi dev",
         "docs:build": "dumi build",
@@ -60,4 +60,4 @@
         "yorkie": "^2.0.0"
     },
     "gitHead": "b2e287ebcfeaa841e1f4e10bd9891e58f3223e95"
-}
+}