@zgfe/business-lib 1.0.3 → 1.0.5

package/es/components/iconFont.d.ts

@@ -1,5 +1,8 @@
 import React from 'react';
 import { IconFontProps } from '@ant-design/icons/lib/components/IconFont';
 import '../assets/iconfont/iconfont.css';
-declare const IconFont: React.FC<IconFontProps>;
+interface Props extends IconFontProps {
+    family?: string;
+}
+declare const IconFont: React.FC<Props>;
 export default IconFont;

package/es/components/iconFont.js

@@ -1,4 +1,4 @@
-var _excluded = ["className", "type"];
+var _excluded = ["className", "type", "family"];
 
 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; }
 
@@ -16,10 +16,11 @@ import '../assets/iconfont/iconfont.css';
 var IconFont = function IconFont(props) {
   var className = props.className,
       type = props.type,
+      family = props.family,
       rest = _objectWithoutProperties(props, _excluded);
 
   var iconClassName = useMemo(function () {
-    return "bsicon ".concat(className, " bs").concat(type);
+    return "".concat(family, " ").concat(className, " bs").concat(type);
   }, [className, type]);
   return /*#__PURE__*/React.createElement("span", _objectSpread({
     className: iconClassName
@@ -27,6 +28,7 @@ var IconFont = function IconFont(props) {
 };
 
 IconFont.defaultProps = {
-  className: ''
+  className: '',
+  family: 'bsicon'
 };
 export default IconFont;

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

@@ -1,11 +1,5 @@
 import React from 'react';
-import { AllConditionBasePropsI, BizUserConditionT } from '../types';
+import { PropConditionType } from '../types';
 import './styles/propCondition.less';
-export interface PropConditionPropsI extends AllConditionBasePropsI<any> {
-    isEvent?: boolean;
-    label?: string | React.ReactDOM;
-    eventId?: number;
-    attrs: BizUserConditionT.AttrCondition[];
-}
-declare const PropCondition: React.FC<PropConditionPropsI>;
+declare const PropCondition: React.FC<PropConditionType.PropsI>;
 export default PropCondition;

package/es/userCondition/conditions/propCondition.js

@@ -8,20 +8,29 @@ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableTo
 
 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."); }
 
-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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 
+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; }
 
-import React from 'react';
+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, { useEffect, useState } from 'react';
 import { PlusOutlined } from '@ant-design/icons';
 import BizConditionItem from '../../attrConditions';
 import './styles/propCondition.less';
 import { useContext } from 'react';
 import { BizUserConditionContext, classPrefix } from '..';
+import { transformNumberOperate } from '../util';
 var numAttrTypeMap = {
   1: 'cont-string',
   2: 'cont-num',
@@ -42,6 +51,40 @@ var PropCondition = function PropCondition(props) {
       attrs = props.attrs,
       dataId = props.dataId;
 
+  var _useState = useState([]),
+      _useState2 = _slicedToArray(_useState, 2),
+      showList = _useState2[0],
+      setShowList = _useState2[1];
+
+  JSON.stringify(showList);
+  useEffect(function () {
+    buildDefault();
+  }, []);
+
+  function buildDefault() {
+    var list = [];
+    attrs.forEach(function (attr) {
+      var attrId = attr.attrId,
+          attrName = attr.attrName,
+          operator = attr.operator;
+
+      if ((attrName || attrId) && operator) {
+        attr.operator = transformNumberOperate(operator, false);
+        list.push({
+          attr: attr,
+          default: attr,
+          id: Math.random()
+        });
+      } else {
+        list.push({
+          attr: attr,
+          id: Math.random()
+        });
+      }
+    });
+    setShowList(list);
+  }
+
   function _onChange(data, i) {
     var attrName = data.attrName,
         attrId = data.attrId,
@@ -56,24 +99,33 @@ var PropCondition = function PropCondition(props) {
       attrName: attrName,
       attrId: attrId,
       category: category,
-      operator: operation,
+      operator: transformNumberOperate(operation),
       params: values,
       attrType: numAttrTypeMap[type]
     };
-    newAttrs[i] = newAttr;
+    Object.assign(newAttrs[i], newAttr);
     props.onChange(dataId, newAttrs);
   }
 
   function onAddAttr() {
-    props.onChange(dataId, [].concat(_toConsumableArray(attrs), [{
+    var attr = {
       attrId: 0
+    };
+    setShowList([].concat(_toConsumableArray(showList), [{
+      id: Math.random(),
+      attr: attr
     }]));
+    props.onChange(dataId, [].concat(_toConsumableArray(attrs), [attr]));
   }
 
   function onRemoveAttr(i) {
     var newAttrs = _toConsumableArray(attrs);
 
+    var newList = _toConsumableArray(showList);
+
+    newList.splice(i, 1);
     newAttrs.splice(i, 1);
+    setShowList(newList);
     props.onChange(dataId, newAttrs);
   }
 
@@ -82,18 +134,19 @@ var PropCondition = function PropCondition(props) {
     return attrName === undefined ? 'eventProp' : 'envProp';
   }
 
-  function renderAttr(attr, i) {
-    var attrId = attr.attrId,
-        attrName = attr.attrName,
-        category = attr.category,
-        operator = attr.operator,
-        params = attr.params,
-        attrType = attr.attrType;
-    console.log(attrType);
+  function renderAttr(item, i) {
     var props = {};
-
-    if ((attrName || attrId) && operator) {
-      props.value = {
+    var id = item.id;
+
+    if (item.default) {
+      var _item$default = item.default,
+          attrId = _item$default.attrId,
+          attrName = _item$default.attrName,
+          category = _item$default.category,
+          operator = _item$default.operator,
+          params = _item$default.params,
+          attrType = _item$default.attrType;
+      props.defaultValue = {
         attrName: attrName,
         category: category || 'custom',
         operation: operator,
@@ -101,14 +154,12 @@ var PropCondition = function PropCondition(props) {
         propCategory: getPropCategory(attrName),
         type: attrNumTypeMap[attrType]
       };
-      props.key = attrName || attrId;
-      attrId && (props.value.attrId = attrId);
+      attrId && (props.defaultValue.attrId = attrId);
     }
 
-    console.log(props);
     return /*#__PURE__*/React.createElement("div", {
       className: "".concat(classPrefix, "-prop-condition-attr"),
-      key: attrName || attrId || Math.random()
+      key: id
     }, /*#__PURE__*/React.createElement("div", {
       className: "".concat(classPrefix, "-prop-condition-item-wrap")
     }, /*#__PURE__*/React.createElement(BizConditionItem, _objectSpread({
@@ -131,8 +182,8 @@ var PropCondition = function PropCondition(props) {
     className: "".concat(classPrefix, "-prop-condition-label")
   }, label) : null, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-prop-condition-attrs")
-  }, attrs.map(function (attr, i) {
-    return renderAttr(attr, i);
+  }, showList && showList.map(function (item, i) {
+    return renderAttr(item, i);
   })), attrs.length < eventAttrNum && isEvent ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-prop-condition-add")
   }, /*#__PURE__*/React.createElement("div", {

package/es/userCondition/demo/index.js

@@ -38,51 +38,26 @@ export default (function () {
   }
 
   var defaultValue = [[{
-    attrs: [{
-      attrName: 'is_anonymous',
-      category: 'fixed',
-      operator: 'equal',
-      params: ['Safari', 'Apple WebKit', 'Unknown', 'Mobile Safari', 'BlackBerry', 'Microsoft Edge Mobile'],
-      attrType: 'cont-string'
-    }]
-  }, {
-    eventId: 24143017,
+    eventId: 7086293,
     runTimes: {
       operator: '>=',
       values: ['1']
     },
     attrs: [{
-      attrId: 30183430,
-      operator: 'equal',
-      params: ['Safari', 'Mobile Safari', 'BlackBerry', 'Unknown'],
+      attrId: 30183425,
+      operator: '=',
+      params: ['Apple WebKit', 'Unknown'],
       attrType: 'cont-string'
+    }, {
+      attrId: 5461057,
+      operator: '>',
+      params: ['123'],
+      attrType: 'cont-num'
     }],
     runPeriod: {
       operator: 'relative',
       values: ['30', '0']
     }
-  }], [{
-    eventId: '-3',
-    runPeriod: {
-      operator: 'relative',
-      values: ['30', '0']
-    },
-    runTimes: {
-      operator: '>=',
-      values: ['1']
-    },
-    attrs: []
-  }, {
-    eventId: '-4',
-    runPeriod: {
-      operator: 'relative',
-      values: ['30', '1']
-    },
-    runTimes: {
-      operator: '>=',
-      values: ['1']
-    },
-    attrs: []
   }]];
   return /*#__PURE__*/React.createElement(BizGlobalDataContext.Provider, {
     value: {
@@ -92,6 +67,7 @@ export default (function () {
     }
   }, /*#__PURE__*/React.createElement(BizUserCondition, {
     defaultValue: defaultValue,
-    onChange: onChange
+    onChange: onChange,
+    eventAttrNum: 3
   }));
 });

package/es/userCondition/index.js

@@ -50,11 +50,8 @@ var BizUserCondition = function BizUserCondition(props) {
       setValue = _useState6[1];
 
   useEffect(function () {
-    if (props.defaultValue) {
-      setValue(props.defaultValue);
-      initShowList();
-    }
-  }, [props.defaultValue]);
+    initShowList();
+  }, []);
 
   function initShowList() {
     var showList = [];

package/es/userCondition/types.d.ts

@@ -1,3 +1,7 @@
+/// <reference types="react" />
+export declare type Unpacked<T, U extends keyof T> = Required<T> extends {
+    [key in U]: infer R;
+} ? R : never;
 export interface RunPeriodI {
     operator: 'relative' | 'unlimited_time' | 'join_time' | 'absolute';
     values: string[];
@@ -22,7 +26,7 @@ export declare namespace BizUserConditionT {
     interface AttrCondition {
         attrId: number;
         attrName: string;
-        operator: 'is not null' | 'is null' | 'not contains' | 'contains' | 'equal' | 'not equal' | 'begin with' | 'not begin with' | 'end with' | 'not end with';
+        operator: 'is not null' | 'is null' | 'not contains' | 'contains' | 'equal' | 'not equal' | 'begin with' | 'not begin with' | 'end with' | 'not end with' | Unpacked<RunTimesI, 'operator'>;
         params: string[];
         attrType: 'cont-string' | 'cont-num' | 'cont-date';
         category: 'fixed' | 'custom';
@@ -77,3 +81,16 @@ export declare namespace RunTimesConditionTypes {
         } ? U : never;
     }[];
 }
+export declare namespace PropConditionType {
+    type ShowListI = {
+        attr: BizUserConditionT.AttrCondition;
+        id: number;
+        default?: BizUserConditionT.AttrCondition;
+    }[];
+    interface PropsI extends AllConditionBasePropsI<any> {
+        isEvent?: boolean;
+        label?: string | React.ReactDOM;
+        eventId?: number;
+        attrs: BizUserConditionT.AttrCondition[];
+    }
+}

package/es/userCondition/util.d.ts

@@ -1,2 +1,3 @@
 import { BizUserConditionT } from './types';
 export declare function buildCondition(type: BizUserConditionT.ConditionType): BizUserConditionT.EventCondition | BizUserConditionT.AddCondition | BizUserConditionT.ActiveCondition | BizUserConditionT.PropCondition;
+export declare function transformNumberOperate(key: string, output?: boolean): string;

package/es/userCondition/util.js

@@ -51,4 +51,23 @@ export function buildCondition(type) {
         }]
       };
   }
+}
+export function transformNumberOperate(key) {
+  var output = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+  var outputMap = {
+    gt: '>',
+    equal: '=',
+    lt: '<',
+    ge: '>=',
+    le: '<='
+  };
+  var inputMap = {
+    '>': 'gt',
+    '=': 'equal',
+    '<': 'lt',
+    '>=': 'ge',
+    '<=': 'le'
+  };
+  if (output) return outputMap[key] || key;
+  return inputMap[key] || key;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -58,5 +58,5 @@
     "prettier": "^2.2.1",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "81e9003818182ca6aa3755ba71f55cf8964d7d09"
+  "gitHead": "d01bb3a8b365c50b8c99c2a63a6501d87fba27e9"
 }