@zgfe/business-lib 1.0.0-beta.3 → 1.0.0-beta.6

package/es/targetConditionGroup/components/conditionItem.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import './style/index.less';
-import { AttrItemType } from '../type';
+import { AttrItem } from '../type';
 import { EventMetaProps } from '../../utils/type';
 interface ConditionItemProps {
     /**
@@ -8,7 +8,7 @@ interface ConditionItemProps {
      * @description.zh-CN
      * @default           -
      */
-    defaultValue?: AttrItemType;
+    defaultValue?: AttrItem;
     /**
      * @description      属性的配置项
      * @description.zh-CN
@@ -19,7 +19,7 @@ interface ConditionItemProps {
      * @description     如果是事件属性，则传事件id,多个用逗号隔开
      * @default           -
      */
-    eventIds?: string | number;
+    eventId?: string | number;
     /**
      * @description     软件id
      * @default           -
@@ -35,7 +35,7 @@ interface ConditionItemProps {
      * @description.zh-CN
      * @default
      */
-    onChange?: (data: object) => void;
+    onChange?: (data: AttrItem) => void;
     /**
      * @description       删除属性
      * @description.zh-CN

package/es/targetConditionGroup/components/conditionItem.js

@@ -1,7 +1,13 @@
-var _excluded = ["defaultValue", "eventIds", "appId", "platform", "options", "onChange", "onDelete"];
+var _excluded = ["defaultValue", "eventId", "appId", "platform", "options", "onChange", "onDelete"];
 
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -10,14 +16,6 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -40,16 +38,16 @@ import { stringOperate } from '../data/operates';
 import './style/index.less';
 import { BizAttributeSelector, BizGlobalDataContext, BizMultipleSelector } from '../..';
 import IconFont from '../../components/iconFont';
-import { ajax, util } from '../../utils';
+import { ajax } from '../../utils';
 
 var BizConditionItem = function BizConditionItem(props) {
   var _props$defaultValue = props.defaultValue,
       defaultValue = _props$defaultValue === void 0 ? {} : _props$defaultValue,
-      eventIds = props.eventIds,
+      eventId = props.eventId,
       appId = props.appId,
       platform = props.platform,
       options = props.options,
-      _onChange = props.onChange,
+      onChange = props.onChange,
       onDelete = props.onDelete,
       res = _objectWithoutProperties(props, _excluded); // 筛选值下拉框内容
 
@@ -66,13 +64,13 @@ var BizConditionItem = function BizConditionItem(props) {
       setAttr = _useState4[1]; // 属性值
 
 
-  var _useState5 = useState(defaultValue.params || []),
+  var _useState5 = useState([]),
       _useState6 = _slicedToArray(_useState5, 2),
       condition = _useState6[0],
       setCondition = _useState6[1]; // 条件式
 
 
-  var _useState7 = useState(defaultValue.operator || stringOperate[0].value),
+  var _useState7 = useState(stringOperate[0].value),
       _useState8 = _slicedToArray(_useState7, 2),
       operator = _useState8[0],
       setOperator = _useState8[1]; // 软件信息
@@ -86,76 +84,35 @@ var BizConditionItem = function BizConditionItem(props) {
 
 
   useEffect(function () {
-    var attrOption = options || {
-      event: eventMeta,
-      user: userProps,
-      env: eventEnv
-    };
-    var eventOption = [];
-    var eventData = attrOption.event || []; // 取event中的attr列表
-
-    var _iterator = _createForOfIteratorHelper(eventData),
-        _step;
-
-    try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var data = _step.value;
-        var eList = (data === null || data === void 0 ? void 0 : data.eventList) || [];
-
-        var _iterator2 = _createForOfIteratorHelper(eList),
-            _step2;
-
-        try {
-          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-            var _event = _step2.value;
-
-            if (_event.event_id == eventIds) {
-              eventOption = eventOption.concat(_event.event_attrs);
-              break;
-            }
-
-            if (!eventIds) {
-              eventOption = eventOption.concat(_event.event_attrs);
-            }
-          }
-        } catch (err) {
-          _iterator2.e(err);
-        } finally {
-          _iterator2.f();
-        }
-      }
-    } catch (err) {
-      _iterator.e(err);
-    } finally {
-      _iterator.f();
+    if (defaultValue.attrId !== attr.id) {
+      var data = {
+        id: defaultValue.attrId,
+        value: defaultValue.attrName,
+        type: defaultValue.attrType,
+        attrType: defaultValue.type,
+        dimensionId: defaultValue.dimensionId,
+        dimension_sub: defaultValue.dimension_sub
+      };
+      setAttr(function () {
+        return data;
+      });
     }
 
-    var event = eventOption.find(function (item) {
-      return item.attr_id == defaultValue.attr_id;
-    });
-    var user = attrOption.user && attrOption.user.find(function (item) {
-      return item.alias_name === defaultValue.attr_name || item.text === defaultValue.attr_name;
-    });
-    var env = attrOption.env && attrOption.env.find(function (item) {
-      return item.text === defaultValue.attr_name;
-    });
-    var attrObj = event || user || env || {};
-
-    if (attrObj.operator) {
-      delete attrObj.operator;
+    if (JSON.stringify(defaultValue.values) !== JSON.stringify(condition)) {
+      setCondition(function () {
+        return defaultValue.values || [];
+      });
     }
 
-    if (attrObj.params) {
-      delete attrObj.params;
+    if (operator !== defaultValue.operation) {
+      setOperator(function () {
+        return defaultValue.operation || stringOperate[0].value;
+      });
     }
-
-    if (util.equal(attr, attrObj)) return;
-    setAttr(function () {
-      return _objectSpread({}, attrObj);
-    });
   }, [defaultValue]); // 属性更改回调
 
   useEffect(function () {
+    if (!attr.id) return;
     var requestData = {
       app_id: (appInfo === null || appInfo === void 0 ? void 0 : appInfo.appId) || appId,
       platform: (appInfo === null || appInfo === void 0 ? void 0 : appInfo.platform) || platform,
@@ -176,37 +133,63 @@ var BizConditionItem = function BizConditionItem(props) {
       setConditionOptions(function () {
         return [];
       });
-    }); // 清空条件值
-
-    setCondition(function () {
-      return [];
     });
   }, [attr]);
+
+  var _onChange = function _onChange(data, operation, values) {
+    var result = {
+      attrType: data.type,
+      type: data.attrType,
+      attrId: data.id,
+      attrName: data.value,
+      dimensionId: data.dimensionId,
+      dimension_sub: data.dimension_sub,
+      operation: operation,
+      values: values
+    };
+    onChange && onChange(result);
+  };
+
   return /*#__PURE__*/React.createElement(BizAttributeSelector, _objectSpread(_objectSpread({}, res), {}, {
     defaultValue: attr,
-    eventIds: String(eventIds),
+    eventIds: String(eventId),
     options: options,
-    onChange: function onChange(attr, attr2) {
+    onChange: function onChange(attr1, attr2) {
       var data = {};
 
-      if (_typeof(attr) === 'object') {
-        data = _objectSpread({}, attr);
+      if (_typeof(attr1) === 'object') {
+        data = _objectSpread({}, attr1);
       }
 
       if (_typeof(attr2) === 'object') {
         data = _objectSpread({}, attr2);
       }
 
-      setAttr(function () {
-        return _objectSpread({}, data);
-      });
-
-      var data2 = _objectSpread(_objectSpread({}, data), {}, {
-        operator: operator,
-        params: _toConsumableArray(condition)
-      });
-
-      _onChange && _onChange(data2);
+      var _data = data,
+          id = _data.id,
+          value = _data.value,
+          type = _data.type,
+          attrType = _data.attrType,
+          dimension_sub = _data.dimension_sub,
+          dimensionId = _data.dimensionId;
+      var result = {
+        id: id,
+        value: value,
+        type: type,
+        attrType: attrType,
+        dimension_sub: dimension_sub,
+        dimensionId: dimensionId
+      };
+
+      if (dimensionId && dimensionId !== attr.id) {
+        // 清空条件值
+        setCondition([]);
+        setAttr(function () {
+          return _objectSpread({}, result);
+        });
+
+        _onChange(result, operator, []);
+      }
     },
     onDelete: onDelete,
     showDeleteIcon: true,
@@ -231,27 +214,17 @@ var BizConditionItem = function BizConditionItem(props) {
         return operate;
       });
 
-      var data = _objectSpread(_objectSpread({}, attr), {}, {
-        operator: operate,
-        params: _toConsumableArray(condition)
-      });
-
-      _onChange && _onChange(data);
+      _onChange(attr, operate, condition);
     }
   }), /*#__PURE__*/React.createElement(BizMultipleSelector, {
     options: conditionOptions,
     defaultValue: condition,
-    onChange: function onChange(condition) {
+    onChange: function onChange(values) {
       setCondition(function () {
-        return _toConsumableArray(condition);
-      });
-
-      var data = _objectSpread(_objectSpread({}, attr), {}, {
-        operator: operator,
-        params: _toConsumableArray(condition)
+        return _toConsumableArray(values);
       });
 
-      _onChange && _onChange(data);
+      _onChange(attr, operator, values);
     }
   })));
 };

package/es/targetConditionGroup/data/operates.js

@@ -72,13 +72,13 @@ export var dimensionOperate = [{
   value: 'number'
 }, {
   name: '次数',
-  value: 'count'
+  value: 'times'
 }, {
   name: '活跃比',
-  value: 'ratio'
+  value: 'active_ratio'
 }, {
   name: '人均次数',
-  value: 'perTimes'
+  value: 'per'
 }, {
   name: '金额',
   value: 'money',
@@ -87,10 +87,10 @@ export var dimensionOperate = [{
     value: 'sum'
   }, {
     name: '均值',
-    value: 'mean'
+    value: 'avg'
   }, {
     name: '分布',
-    value: 'distribution'
+    value: 'duration_times'
   }, {
     name: '中位数',
     value: 'median'

package/es/targetConditionGroup/demo/group.d.ts

@@ -0,0 +1,2 @@
+declare const _default: () => JSX.Element;
+export default _default;

package/es/targetConditionGroup/demo/group.js

@@ -0,0 +1,42 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+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 = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+import React, { useState } from 'react';
+import { BizTargetConditionGroup } from '@zgfe/business-lib';
+import eventData from './data/event';
+import envData from './data/env';
+import userData from './data/user';
+var attrOption = {
+  event: eventData,
+  user: userData,
+  env: envData
+};
+export default (function () {
+  var _useState = useState([]),
+      _useState2 = _slicedToArray(_useState, 2),
+      group = _useState2[0],
+      setGroup = _useState2[1];
+
+  var handleChange = function handleChange(data) {
+    setGroup(function () {
+      return data;
+    });
+  };
+
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BizTargetConditionGroup, {
+    options: {
+      eventOption: eventData,
+      attrOption: attrOption
+    },
+    onChange: handleChange
+  }), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("p", null, "\u503C\uFF1A", JSON.stringify(group)));
+});

package/es/targetConditionGroup/demo/index.js

@@ -21,16 +21,20 @@ import { BizTargetCondition } from '@zgfe/business-lib';
 import eventData from './data/event';
 import envData from './data/env';
 import userData from './data/user';
-var attrsData = {
-  operator: 'and',
-  attrs: [{
-    attr_id: 5461056,
-    attr_name: '支付方式',
-    operator: 'equal',
-    params: ['BlackBerry'],
-    attrType: 'cont-string',
-    category: 'custom'
-  }]
+var initData = {
+  alias: 'test',
+  eventId: 7086289,
+  type: 'event',
+  filters: {
+    relation: 'or',
+    conditions: [{
+      type: 'EVENT_PROP',
+      operation: 'equal',
+      attrId: 5461056,
+      attrName: '支付方式',
+      values: ['BlackBerry']
+    }]
+  }
 };
 var attrOption = {
   event: eventData,
@@ -38,10 +42,7 @@ var attrOption = {
   env: envData
 };
 export default (function () {
-  var _useState = useState(_objectSpread({
-    aliasName: '',
-    eventId: 7086289
-  }, attrsData)),
+  var _useState = useState({}),
       _useState2 = _slicedToArray(_useState, 2),
       target = _useState2[0],
       setTarget = _useState2[1];
@@ -53,21 +54,10 @@ export default (function () {
   };
 
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BizTargetCondition, {
-    defaultValue: _objectSpread({
-      aliasName: '4444',
-      eventId: 7086289
-    }, attrsData),
     options: {
       eventOption: eventData,
       attrOption: attrOption
     },
-    fieldNames: {
-      label: 'event_name',
-      value: 'event_id',
-      groupLabel: 'groupName',
-      groupValue: 'groupId',
-      children: 'eventList'
-    },
     onChange: handleChange
   }), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("p", null, "\u5F53\u524D\u503C\uFF1A", JSON.stringify(target)));
 });

package/es/targetConditionGroup/group.d.ts

@@ -0,0 +1,56 @@
+import React from 'react';
+import { OptionType, TargetCondition } from './type';
+interface BizTargetConditionGrouppProps {
+    /**
+     * @description     默认值
+     * @default            -
+     */
+    defaultValue?: Array<TargetCondition>;
+    /**
+     * @description     值
+     * @default            -
+     */
+    value?: Array<TargetCondition>;
+    /**
+     * @description     最多几个指标
+     * @default            10
+     */
+    max?: number;
+    /**
+     * @description     指标下最多几个属性
+     * @default            10
+     */
+    attrMax?: number;
+    /**
+     * @description       数据化配置选项内容
+     * @description.zh-CN
+     * @default         -
+     */
+    options?: OptionType;
+    /**
+     * @description       自定义指标下拉框 label、value 的字段
+     * @description.zh-CN
+     * @default           { label: 'name', value: 'id', groupLabel: 'name', groupValue: 'id' }
+     */
+    fieldNames?: {
+        label: string;
+        value: string;
+        groupLabel: string;
+        groupValue: string;
+        children: string;
+    };
+    /**
+     * @description       指标删除回调
+     * @description.zh-CN
+     * @default
+     */
+    onDelete?: () => void;
+    /**
+     * @description       改变回调
+     * @description.zh-CN
+     * @default
+     */
+    onChange?: (data: Array<TargetCondition>) => void;
+}
+declare const BizTargetConditionGroup: React.FC<BizTargetConditionGrouppProps>;
+export default BizTargetConditionGroup;