@zgfe/business-lib 1.0.15-user.8 → 1.0.15-user.9

package/es/assets/styles/resetAntd.less

@@ -306,14 +306,14 @@
 
   .ant-modal-body {
     max-height: 400px;
-    // &:not(:last-child) {
-    //   padding-bottom: 0;
-    // }
     max-height: 400px !important;
     padding-top: @padding-xs !important;
-    padding-bottom: 0 !important;
+    // padding-bottom: 0 !important;
     overflow: auto;
     overflow: auto !important;
+    &:not(:last-child) {
+      padding-bottom: 0 !important;
+    }
   }
 }
 
@@ -383,10 +383,6 @@
       &::before {
         width: 0 !important;
       }
-
-      &.ant-table-cell-fix-left-last {
-        border-right: 1px solid @border-color-base!important;
-      }
     }
 
     .ant-table-tbody {

package/es/attrConditions/demo/index.js

@@ -23,13 +23,15 @@ export default (function () {
 
   var _useState = useState({
     condition: {
-      attrId: 30183431,
-      propCategory: 'eventProp',
-      type: 1,
-      operator: 'equal',
-      values: ['Microsoft Edge', 'Safari', 'Apple WebKit'],
-      dimensionSub: 'event_attr',
-      attrName: '用户open_id'
+      attrId: 0,
+      propCategory: 'userProp',
+      type: 2,
+      operator: 'gt',
+      values: ['72000', '1'],
+      dimensionSub: 'duration',
+      attrName: 'duration',
+      category: 'fixed',
+      subtype: 2
     }
   }),
       _useState2 = _slicedToArray(_useState, 2),

package/es/attrConditions/styles/index.less

@@ -61,15 +61,15 @@
   }
 
   &-input {
+    flex: 1;
     .ant-input-group-addon {
-      background-color: @background-color-gray !important;
+      // background-color: @background-color-gray !important;
       border: none;
     }
 
     &-select {
       width: 60px;
       border: none;
-      border-left: 1px solid @border-color-split;
     }
   }
 

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

@@ -19,3 +19,6 @@ export declare const operatorMap: {
     '>=': string;
     '<=': string;
 };
+export declare const durationHandler: {
+    [key: string]: any;
+};

package/es/userCondition/conditions/constants.js

@@ -13,9 +13,29 @@ export var operatorMap = {
   'not begin with': '开头不是',
   'end with': '结尾是',
   'not end with': '结尾不是',
-  '=': '',
-  '<': '',
-  '>': '',
-  '>=': '',
-  '<=': ''
+  '=': '=',
+  '<': '<',
+  '>': '>',
+  '>=': '≥',
+  '<=': '≤'
+};
+export var durationHandler = {
+  1: {
+    unit: '时',
+    format: function format(s) {
+      return Number(s) / 3600;
+    }
+  },
+  2: {
+    unit: '分',
+    format: function format(s) {
+      return Number(s) / 60;
+    }
+  },
+  3: {
+    unit: '秒',
+    format: function format(s) {
+      return s;
+    }
+  }
 };

package/es/userCondition/conditions/eventCondition.js

@@ -26,7 +26,6 @@ var EventCondition = function EventCondition(props) {
 
   function onEventChange(data) {
     var event = data.event;
-    console.log(condition);
     onChange(_objectSpread(_objectSpread({}, condition), {}, {
       eventId: event.id
     }));

package/es/userCondition/conditions/propCondition.js

@@ -24,7 +24,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { PlusOutlined } from '@ant-design/icons';
 import BizConditionItem from '../../attrConditions';
 import './styles/propCondition.less';
@@ -32,7 +32,6 @@ import { useContext } from 'react';
 import { BizUserConditionContext, classPrefix } from '..';
 import { transformNumberOperate } from '../util';
 import { PropType } from '../../attributeSelector/types';
-import BizGlobalDataContext from '../../context';
 var numAttrTypeMap = {
   1: 'cont-string',
   2: 'cont-num',
@@ -45,8 +44,9 @@ var attrNumTypeMap = {
 };
 
 var PropCondition = function PropCondition(props) {
-  var _useContext = useContext(BizGlobalDataContext),
-      eventEnvList = _useContext.eventEnvList;
+  var _useContext = useContext(BizUserConditionContext),
+      envNameList = _useContext.envNameList,
+      userPropsMap = _useContext.userPropsMap;
 
   var _useContext2 = useContext(BizUserConditionContext),
       eventAttrNum = _useContext2.eventAttrNum;
@@ -62,11 +62,6 @@ var PropCondition = function PropCondition(props) {
       showList = _useState2[0],
       setShowList = _useState2[1];
 
-  var envNames = useMemo(function () {
-    return eventEnvList ? eventEnvList.map(function (env) {
-      return env.name;
-    }) : [];
-  }, [eventEnvList]);
   useEffect(function () {
     buildDefault();
   }, []);
@@ -142,7 +137,7 @@ var PropCondition = function PropCondition(props) {
   function getPropCategory(attrName) {
     if (!isEvent) return 'userProp';
     if (attrName === undefined) return 'eventProp';
-    if (envNames.includes(attrName)) return 'envProp';
+    if (envNameList.includes(attrName)) return 'envProp';
     return 'eventProp';
   }
 
@@ -167,6 +162,10 @@ var PropCondition = function PropCondition(props) {
         type: attrNumTypeMap[attrType]
       };
       attrId && (props.defaultValue.attrId = attrId);
+
+      if (userPropsMap[attrName] && userPropsMap[attrName].subtype) {
+        props.defaultValue.subtype = userPropsMap[attrName].subtype;
+      }
     }
 
     if (isEvent) {

package/es/userCondition/conditions/styles/eventCondition.less

@@ -8,7 +8,7 @@
     flex: 1;
   }
   .biz-user-condition-event {
-    width: 255px;
+    width: 200px;
     .biz-event-select-handle {
       border-top-right-radius: 0;
       border-bottom-right-radius: 0;

package/es/userCondition/conditions/styles/periodCondition.less

@@ -14,4 +14,12 @@
   &-operator {
     width: 129px;
   }
+  &-values {
+    .ant-picker-range.ant-picker-larg {
+      min-width: 255px;
+    }
+  }
+  &-today {
+    white-space: nowrap;
+  }
 }

package/es/userCondition/conditions/styles/propCondition.less

@@ -33,4 +33,12 @@
       cursor: pointer;
     }
   }
+  .biz-condition-item-panel {
+    .biz-condition-item-input {
+      .ant-input {
+        height: 40px;
+        border: none;
+      }
+    }
+  }
 }

package/es/userCondition/conditions/textDesc.js

@@ -2,20 +2,23 @@ import React, { useContext, useMemo } from 'react';
 import { BizUserConditionContext, classPrefix } from '..';
 import BizGlobalDataContext from '../../context';
 import { findEvent, findPropAndEnv, findTagFactory } from '../util';
-import { operatorMap } from './constants';
+import { durationHandler, operatorMap } from './constants';
 import './styles/textDesc.less';
 
 var Text = function Text(props) {
+  var _useContext = useContext(BizUserConditionContext),
+      userPropsMap = _useContext.userPropsMap;
+
   var condition = props.condition,
       showOrDesc = props.showOrDesc;
 
-  var _useContext = useContext(BizGlobalDataContext),
-      eventGroupList = _useContext.eventGroupList,
-      userPropList = _useContext.userPropList,
-      eventEnvList = _useContext.eventEnvList;
+  var _useContext2 = useContext(BizGlobalDataContext),
+      eventGroupList = _useContext2.eventGroupList,
+      userPropList = _useContext2.userPropList,
+      eventEnvList = _useContext2.eventEnvList;
 
-  var _useContext2 = useContext(BizUserConditionContext),
-      userTagsData = _useContext2.userTagsData;
+  var _useContext3 = useContext(BizUserConditionContext),
+      userTagsData = _useContext3.userTagsData;
 
   function render() {
     if (condition.labels) {
@@ -67,7 +70,7 @@ var Text = function Text(props) {
       } : {}
     }, /*#__PURE__*/React.createElement("span", {
       className: "label"
-    }, label.before), /*#__PURE__*/React.createElement("span", null, operatorMap[period.operator]), valuesDom);
+    }, label.before), period.operator === 'relative' ? /*#__PURE__*/React.createElement("span", null, "\u6700\u8FD1") : null, valuesDom);
   }
 
   function renderProps(attr, type) {
@@ -84,13 +87,7 @@ var Text = function Text(props) {
         }
       }, /*#__PURE__*/React.createElement("span", {
         className: "".concat(classPrefix, "-text-desc-label")
-      }, (_data = data) === null || _data === void 0 ? void 0 : _data.label), /*#__PURE__*/React.createElement("span", {
-        className: "".concat(classPrefix, "-text-desc-operator")
-      }, operatorMap[attr.operator]), /*#__PURE__*/React.createElement("span", {
-        className: "".concat(classPrefix, "-text-desc-value")
-      }, attr.params.map(function (param, i) {
-        return /*#__PURE__*/React.createElement(React.Fragment, null, i > 0 ? /*#__PURE__*/React.createElement("span", null, "\u6216") : null, /*#__PURE__*/React.createElement("span", null, param));
-      })));
+      }, (_data = data) === null || _data === void 0 ? void 0 : _data.label), renderPropValues(attr));
     }
   }
 
@@ -139,11 +136,7 @@ var Text = function Text(props) {
       if (label) {
         var dom = /*#__PURE__*/React.createElement("span", {
           key: i
-        }, /*#__PURE__*/React.createElement("span", null, label), /*#__PURE__*/React.createElement("span", null, operatorMap[attr.operator]), /*#__PURE__*/React.createElement("span", null, attr.params.map(function (param, i) {
-          return /*#__PURE__*/React.createElement("span", {
-            key: i
-          }, i > 0 ? '或' : '', param);
-        })), /*#__PURE__*/React.createElement("span", null, i !== attrs.length - 1 ? '，' : ''));
+        }, /*#__PURE__*/React.createElement("span", null, label), /*#__PURE__*/React.createElement("span", null, renderPropValues(attr)), i !== attrs.length - 1 ? '，' : '');
         attrsDom.push(dom);
       }
     });
@@ -184,6 +177,47 @@ var Text = function Text(props) {
     }), /*#__PURE__*/React.createElement("span", null, ")")));
   }
 
+  function renderPropValues(attr) {
+    if (attr.attrType === 'cont-date') {
+      return renderDateValues(attr.operator, attr.params);
+    } else if (attr.attrType === 'cont-num') {
+      return renderNumValues(attr);
+    } else if (attr.attrType === 'cont-string') {
+      return renderStringValues(attr);
+    }
+  }
+
+  function renderStringValues(attr) {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
+      className: "".concat(classPrefix, "-text-desc-operator")
+    }, operatorMap[attr.operator]), /*#__PURE__*/React.createElement("span", {
+      className: "".concat(classPrefix, "-text-desc-value")
+    }, attr.params.map(function (param, i) {
+      return /*#__PURE__*/React.createElement(React.Fragment, {
+        key: param
+      }, i > 0 ? /*#__PURE__*/React.createElement("span", null, "\u6216") : null, /*#__PURE__*/React.createElement("span", null, param));
+    })));
+  }
+
+  function renderNumValues(attr) {
+    if (userPropsMap[attr.attrName] && userPropsMap[attr.attrName].subtype === 2) {
+      var handler = durationHandler[attr.params[1]];
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", null, operatorMap[attr.operator]), /*#__PURE__*/React.createElement("span", null, handler.format(attr.params[0])), /*#__PURE__*/React.createElement("span", null, handler.unit));
+    }
+
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", null, operatorMap[attr.operator]), /*#__PURE__*/React.createElement("span", null, attr.params[0]));
+  }
+
+  function renderDateValues(operator, params) {
+    if (operator === 'relative') {
+      return /*#__PURE__*/React.createElement("span", null, "\u4E3A\u6700\u8FD1".concat(params[0], "\u5929"));
+    }
+
+    if (operator === 'absolute') {
+      return /*#__PURE__*/React.createElement("span", null, "\u4E3A".concat(params[0], "\u5230").concat(params[1]));
+    }
+  }
+
   var findTag = useMemo(function () {
     return findTagFactory(userTagsData);
   }, [userTagsData]);

package/es/userCondition/demo/index.js

@@ -150,54 +150,79 @@ var getTagList = Promise.resolve([{
 }]);
 var data = {
   json: [[{
+    eventId: '-4',
+    attrs: [],
+    runPeriod: {
+      operator: 'relative',
+      values: ['30', '1']
+    },
+    runTimes: {
+      operator: '>=',
+      values: ['1']
+    }
+  }, {
+    eventId: '-3',
+    attrs: [],
+    runPeriod: {
+      operator: 'absolute',
+      values: ['2022-07-13', '2022-07-19']
+    },
+    runTimes: {
+      operator: '>=',
+      values: ['1']
+    }
+  }], [{
     attrs: [{
-      attrId: 114,
-      attrName: 'name',
-      category: 'custom',
+      attrId: 0,
+      attrName: 'zg_id',
+      operator: '>',
+      params: ['20'],
+      attrType: 'cont-num',
+      category: 'fixed'
+    }]
+  }, {
+    attrs: [{
+      attrId: 0,
+      attrName: 'app_user_id',
       operator: 'equal',
-      params: ['Safari', 'Microsoft Edge', 'Apple WebKit'],
-      attrType: 'cont-string'
+      params: ['20'],
+      attrType: 'cont-string',
+      category: 'fixed'
+    }]
+  }], [{
+    attrs: [{
+      attrId: 0,
+      attrName: 'duration',
+      operator: '>',
+      params: [1198800, '1'],
+      attrType: 'cont-num',
+      category: 'fixed'
     }]
   }, {
-    eventId: 24143016,
+    eventId: 24143017,
     runTimes: {
       operator: '>=',
       values: ['1']
     },
     attrs: [{
-      attrId: 30183431,
-      attrName: '用户open_id',
+      attrId: 0,
+      attrName: 'resolution_l',
+      category: 'fixed',
+      operator: '>',
+      params: ['10'],
+      attrType: 'cont-num'
+    }, {
+      attrId: 30183430,
+      attrName: '扫码场景描述',
       category: 'custom',
       operator: 'equal',
-      params: ['Apple WebKit', 'Safari', 'Microsoft Edge', 'Unknown'],
+      params: ['Microsoft Edge', 'Safari', 'Apple WebKit'],
       attrType: 'cont-string'
     }],
     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: []
   }]]
 };
 export default (function () {
@@ -251,6 +276,7 @@ export default (function () {
   }
 
   var descDom = /*#__PURE__*/React.createElement(BizUserCondition, {
+    textMode: true,
     defaultValue: defaultValue,
     onChange: onChange,
     eventAttrNum: 3,

package/es/userCondition/index.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import { BizUserConditionT } from './types';
 import './styles/index.less';
-export declare const BizUserConditionContext: React.Context<Pick<BizUserConditionT.PropsI, "textMode" | "openTagCondition" | "orConditionNum" | "eventAttrNum" | "userTagsData" | "isRealTime">>;
+export declare const BizUserConditionContext: React.Context<BizUserConditionT.GlobalContext>;
 export declare const classPrefix = "biz-user-condition";
 declare const BizUserCondition: React.FC<BizUserConditionT.PropsI>;
 export default BizUserCondition;

package/es/userCondition/index.js

@@ -18,23 +18,30 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { createContext, useEffect, useState } from 'react';
+import React, { createContext, useContext, useEffect, useMemo, useState } from 'react';
 import ConditionTypeList from './conditionTypeList';
 import RelationLabel from './relationLabel';
 import OrConditions from './orConditions';
 import './styles/index.less';
 import { buildCondition } from './util';
 import _ from 'lodash';
+import BizGlobalDataContext from '../context';
 export var BizUserConditionContext = /*#__PURE__*/createContext({
   orConditionNum: 2,
   eventAttrNum: 1,
   textMode: false,
   openTagCondition: false,
-  userTagsData: []
+  userTagsData: [],
+  envNameList: [],
+  userPropsMap: {}
 });
 export var classPrefix = 'biz-user-condition';
 
 var BizUserCondition = function BizUserCondition(props) {
+  var _useContext = useContext(BizGlobalDataContext),
+      eventEnvList = _useContext.eventEnvList,
+      userPropList = _useContext.userPropList;
+
   var andConditionNum = props.andConditionNum,
       defaultValue = props.defaultValue,
       openTagCondition = props.openTagCondition,
@@ -61,6 +68,18 @@ var BizUserCondition = function BizUserCondition(props) {
       value = _useState6[0],
       setValue = _useState6[1];
 
+  var envNameList = useMemo(function () {
+    return eventEnvList ? eventEnvList.map(function (env) {
+      return env.name;
+    }) : [];
+  }, [eventEnvList]);
+  var userPropsMap = useMemo(function () {
+    if (!userPropList) return {};
+    return userPropList.reduce(function (pre, curr) {
+      pre[curr.name] = curr;
+      return pre;
+    }, {});
+  }, [userPropList]);
   useEffect(function () {
     initShowList();
   }, []);
@@ -128,7 +147,9 @@ var BizUserCondition = function BizUserCondition(props) {
       textMode: props.textMode,
       openTagCondition: openTagCondition,
       userTagsData: userTagsData !== null && userTagsData !== void 0 ? userTagsData : [],
-      isRealTime: props.isRealTime
+      isRealTime: props.isRealTime,
+      envNameList: envNameList,
+      userPropsMap: userPropsMap
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: classPrefix

package/es/userCondition/orConditions.js

@@ -123,7 +123,6 @@ var OrConditions = function OrConditions(props) {
 
   function changeData(type, id, newData) {
     var newValue = [];
-    console.log(type, id, newData);
     showList.forEach(function (data) {
       if (id === data.id) {
         if (type === 'period') {
@@ -174,7 +173,7 @@ var OrConditions = function OrConditions(props) {
     if (textMode) {
       return /*#__PURE__*/React.createElement(Text, {
         showOrDesc: i > 0,
-        key: i,
+        key: id,
         condition: condition
       });
     }

package/es/userCondition/styles/orConditions.less

@@ -1,7 +1,7 @@
 @import '../../assets/styles/variable.less';
 .biz-user-condition-or {
   &:not(:last-child) {
-    margin-bottom: @margin-md;
+    margin-bottom: @margin-lg;
   }
   &.text-mode {
     display: flex;

package/es/userCondition/styles/relationLabel.less

@@ -2,7 +2,7 @@
 .biz-user-condition-relation {
   position: relative;
   width: 2px;
-  margin-right: 30px;
+  margin-right: @margin-lg;
   background-color: @border-color-split;
   &-label {
     position: absolute;

package/es/userCondition/types.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="react" />
+import { UserProp } from '../attributeSelector/types';
 import { TagI } from './../userTagsSelector/types';
 export declare type Unpacked<T, U extends keyof T> = Required<T> extends {
     [key in U]: infer R;
@@ -79,6 +80,12 @@ export declare namespace BizUserConditionT {
         orConditions: Conditions[number];
     }
     type ShowListT = ShowItemI[];
+    type GlobalContext = Pick<BizUserConditionT.PropsI, 'orConditionNum' | 'eventAttrNum' | 'openTagCondition' | 'userTagsData' | 'textMode' | 'isRealTime'> & {
+        envNameList: string[];
+        userPropsMap: {
+            [key: string]: UserProp;
+        };
+    };
 }
 export declare namespace OrConditionsT {
     interface PropI {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.0.15-user.8",
+  "version": "1.0.15-user.9",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -53,7 +53,7 @@
     "@types/qs": "^6.9.7",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "^1.0.15-user.8",
+    "@zgfe/business-lib": "^1.0.15-user.9",
     "antd": "^4.19.2",
     "dumi": "^1.1.0",
     "father-build": "^1.17.2",
@@ -62,5 +62,5 @@
     "prettier": "^2.2.1",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "f21aa4ac4ee034799a5565bbb002dddc77e71066"
+  "gitHead": "397deba111c31b3f71818d47a8f8e2431944d2d5"
 }