@zgfe/business-lib 1.0.15-user.2 → 1.0.15

package/es/userCondition/orConditions.js

@@ -29,26 +29,27 @@ import { buildCondition } from './util';
 import ConditionWrap from './conditionWrap';
 import PropCondition from './conditions/propCondition';
 import EventCondition from './conditions/eventCondition';
-import TagsCondition from './conditions/tagsCondition';
 import { classPrefix } from '.';
-import Text from './conditions/textDesc';
 
 var OrConditions = function OrConditions(props) {
   var _useContext = useContext(BizUserConditionContext),
-      orConditionNum = _useContext.orConditionNum,
-      textMode = _useContext.textMode,
-      openTagCondition = _useContext.openTagCondition;
+      orConditionNum = _useContext.orConditionNum;
 
-  var orConditions = props.orConditions,
-      showAndDesc = props.showAndDesc;
+  var orConditions = props.orConditions;
 
   var _useState = useState([]),
       _useState2 = _slicedToArray(_useState, 2),
       showList = _useState2[0],
       setShowList = _useState2[1];
 
+  var _useState3 = useState(orConditions),
+      _useState4 = _slicedToArray(_useState3, 2),
+      value = _useState4[0],
+      setValue = _useState4[1];
+
   useEffect(function () {
     if (orConditions) {
+      setValue(orConditions);
       initShowList();
     }
   }, [orConditions]);
@@ -71,9 +72,8 @@ var OrConditions = function OrConditions(props) {
       id: Math.random(),
       condition: condition
     };
-    var newValue = showList.map(function (item) {
-      return item.condition;
-    }).concat([condition]);
+    var newValue = [].concat(_toConsumableArray(value), [condition]);
+    setValue(newValue);
     setShowList([].concat(_toConsumableArray(showList), [newData]));
     props.onChange(newValue);
   }
@@ -117,32 +117,6 @@ var OrConditions = function OrConditions(props) {
     props.onChange(newValue);
   }
 
-  function onChangeTags(id, newTags) {
-    changeData('tag', id, newTags);
-  }
-
-  function changeData(type, id, newData) {
-    var newValue = [];
-    console.log(type, id, newData);
-    showList.forEach(function (data) {
-      if (id === data.id) {
-        if (type === 'period') {
-          data.condition.runPeriod = newData;
-        } else if (type === 'attr') {
-          data.condition.attrs = newData;
-        } else if (type === 'event') {
-          data.condition = newData;
-        } else if (type === 'tag') {
-          data.condition.labels = newData;
-        }
-      }
-
-      newValue.push(data.condition);
-    });
-    setShowList(_toConsumableArray(showList));
-    props.onChange(newValue);
-  }
-
   function onDelete(id) {
     var index = showList.findIndex(function (item) {
       return item.id === id;
@@ -155,52 +129,34 @@ var OrConditions = function OrConditions(props) {
     var newValue = newList.map(function (item) {
       return item.condition;
     });
+    setValue(newValue);
     props.onChange(newValue);
   }
 
-  if (textMode) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, textMode && showAndDesc ? /*#__PURE__*/React.createElement("span", {
-      className: "".concat(classPrefix, "-and-desc")
-    }, "\u4E14") : null, /*#__PURE__*/React.createElement("span", null, "("), showList.map(function (item, i) {
-      return renderCondition(item, i);
-    }), /*#__PURE__*/React.createElement("span", null, ")"));
-  }
-
-  function renderCondition(data, i) {
+  function renderCondition(data) {
     var condition = data.condition,
         id = data.id;
     var conditionDom = null;
 
-    if (textMode) {
-      return /*#__PURE__*/React.createElement(Text, {
-        showOrDesc: i > 0,
-        key: i,
-        condition: condition
-      });
-    }
-
-    if (condition.labels) {
-      if (!openTagCondition) return null;
-      conditionDom = /*#__PURE__*/React.createElement(TagsCondition, {
-        labels: condition.labels,
-        dataId: id,
-        onChange: onChangeTags
-      });
-    } else if (condition.eventId === undefined) {
+    if (condition.eventId === undefined) {
       conditionDom = /*#__PURE__*/React.createElement(PropCondition, {
         label: "\u5C5E\u6027",
         attrs: condition.attrs,
         dataId: id,
         onChange: onChangeAttrs
       });
-    } else if (condition.eventId === '-3') {
+    }
+
+    if (condition.eventId === '-3') {
       conditionDom = /*#__PURE__*/React.createElement(PeriodCondition, {
         label: "\u65B0\u589E\u4E8E",
         dataId: id,
         onChange: onChangeRunPeriod,
         runPeriod: condition.runPeriod
       });
-    } else if (condition.eventId === '-4') {
+    }
+
+    if (condition.eventId === '-4') {
       conditionDom = /*#__PURE__*/React.createElement(PeriodCondition, {
         label: "\u6D3B\u8DC3\u4E8E",
         isRealTime: true,
@@ -208,12 +164,14 @@ var OrConditions = function OrConditions(props) {
         onChange: onChangeRunPeriod,
         runPeriod: condition.runPeriod
       });
-    } else if (util.isNumber(condition.eventId)) {
-      conditionDom = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(EventCondition, {
+    }
+
+    if (util.isNumber(condition.eventId)) {
+      conditionDom = /*#__PURE__*/React.createElement(EventCondition, {
         dataId: id,
         onChange: onChangeEvent,
         condition: condition
-      }));
+      });
     }
 
     return /*#__PURE__*/React.createElement(ConditionWrap, {
@@ -225,15 +183,15 @@ var OrConditions = function OrConditions(props) {
   }
 
   return /*#__PURE__*/React.createElement("div", {
-    className: ["".concat(classPrefix, "-or"),, textMode ? 'text-mode' : ''].join(' ')
+    className: "".concat(classPrefix, "-or")
   }, /*#__PURE__*/React.createElement("div", {
-    className: ["".concat(classPrefix, "-or-content")].join(' ')
+    className: "".concat(classPrefix, "-or-content")
   }, /*#__PURE__*/React.createElement(RelationLabel, {
     show: showList.length >= 2
   }, "\u6216"), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-conditions")
-  }, showList.map(function (item, i) {
-    return renderCondition(item, i);
+  }, showList.map(function (item) {
+    return renderCondition(item);
   }))), /*#__PURE__*/React.createElement(ConditionTypeList, {
     label: "\u6216",
     onAdd: onAdd,

package/es/userCondition/relationLabel.js

@@ -1,12 +1,7 @@
-import React, { useContext } from 'react';
-import { BizUserConditionContext } from '.';
+import React from 'react';
 import './styles/relationLabel.less';
 
 var RelationLabel = function RelationLabel(props) {
-  var _useContext = useContext(BizUserConditionContext),
-      textMode = _useContext.textMode;
-
-  if (textMode) return null;
   return /*#__PURE__*/React.createElement("div", {
     className: "biz-user-condition-relation"
   }, props.show ? /*#__PURE__*/React.createElement("div", {

package/es/userCondition/styles/conditionTypeList.less

@@ -13,7 +13,7 @@
     list-style: none;
     .condition-type {
       padding: @padding-xss 12px;
-      background-color: @background-color-base;
+      border: 1px solid @border-color-base;
       border-radius: @border-radius-large;
       cursor: pointer;
       &:nth-child(n + 2) {

package/es/userCondition/styles/conditionWrap.less

@@ -8,9 +8,6 @@
     flex: 1;
   }
   .biz-user-condition-item-delete {
-    display: flex;
-    align-items: center;
-    height: 40px;
     margin-left: @margin-lg;
     cursor: pointer;
   }

package/es/userCondition/styles/index.less

@@ -1,32 +1,13 @@
 @import '../../assets/styles/variable.less';
 .biz-user-condition {
-  width: 100%;
-  min-width: 0;
   &-conditions-content {
     display: flex;
     .biz-user-condition-and-conditions-wrap {
       flex: 1;
-      margin-bottom: @margin-lg;
-      &.text-mode {
-        display: flex;
-        flex-wrap: wrap;
-        min-width: 0;
-        margin-bottom: 0;
-        border: none;
-        .biz-user-condition-and-desc {
-          margin: 0 @margin-xs;
-        }
-      }
+      margin-bottom: @margin-md;
     }
     .biz-user-condition-and-conditions-empty {
       margin-bottom: 0;
     }
-    .biz-select-handle-input-multiple {
-      min-height: 40px;
-      padding: calc(@margin-xs - 2px) @margin-xs calc(@margin-xs - 2px) @margin-sm;
-      .biz-select-handle-holder {
-        line-height: 28px;
-      }
-    }
   }
 }

package/es/userCondition/styles/orConditions.less

@@ -1,31 +1,13 @@
 @import '../../assets/styles/variable.less';
 .biz-user-condition-or {
-  &:not(:last-child) {
-    margin-bottom: @margin-md;
-  }
-  &.text-mode {
-    display: flex;
-    min-width: 0;
-    // align-items: center;
-    margin-bottom: 0;
-    .biz-user-condition-or-content {
-      margin-bottom: 0;
-      border: none;
-      .biz-user-condition-conditions {
-        padding: 0;
-      }
-    }
-  }
+  margin-bottom: @margin-md;
   &-content {
     display: flex;
     width: 100%;
-
+    margin-bottom: @margin-md;
     background: #ffffff;
     border: 1px solid @border-color-base;
     border-radius: @border-radius-small;
-    &:not(:last-child) {
-      margin-bottom: @margin-md;
-    }
     .biz-user-condition-conditions {
       flex: 1;
       padding: @padding-xs @padding-md 0 0;

package/es/userCondition/styles/relationLabel.less

@@ -1,9 +1,9 @@
-@import '../../assets/styles/inner.less';
+@import '../../commonStyle/variable.less';
 .biz-user-condition-relation {
   position: relative;
   width: 2px;
   margin-right: 30px;
-  background-color: @border-color-split;
+  background-color: @hoverBgColor;
   &-label {
     position: absolute;
     top: 50%;
@@ -12,8 +12,7 @@
     height: 24px;
     line-height: 24px;
     text-align: center;
-    background-color: @border-color-split;
-    border-radius: @border-radius-small;
+    background-color: @hoverBgColor;
     transform: translate(-50%, -50%);
   }
 }

package/es/userCondition/types.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="react" />
-import { TagI } from './../userTagsSelector/types';
 export declare type Unpacked<T, U extends keyof T> = Required<T> extends {
     [key in U]: infer R;
 } ? R : never;
@@ -16,21 +15,13 @@ export interface AllConditionBasePropsI<T> {
     onChange: (dataId: number, newData: T) => void;
 }
 export declare namespace BizUserConditionT {
-    type ConditionType = 'add' | 'active' | 'event' | 'prop' | 'tag';
+    type ConditionType = 'add' | 'active' | 'event' | 'prop';
     interface PropsI {
         defaultValue: BizUserConditionT.Conditions;
         onChange: (value: any[]) => void;
         andConditionNum?: number;
         orConditionNum?: number;
         eventAttrNum?: number;
-        textMode?: boolean;
-        openTagCondition?: boolean;
-        userTagsData?: UserTagsDataI[];
-        isRealTime?: boolean;
-    }
-    interface UserTagsDataI {
-        labelGroup: string;
-        children: TagI[];
     }
     interface AttrCondition {
         attrId: number;
@@ -59,20 +50,11 @@ export declare namespace BizUserConditionT {
         runPeriod: RunPeriodI;
         runTimes: RunTimesI;
     }
-    interface Labels {
-        operator: 'not equal' | 'equal';
-        values: number[];
-    }
-    interface TagsCondition {
-        attrs: [];
-        labels: Labels;
-        eventId: undefined;
-    }
     interface PropCondition {
         attrs: AttrCondition[];
         eventId: undefined;
     }
-    type Condition = EventCondition | AddCondition | ActiveCondition | PropCondition | TagsCondition;
+    type Condition = EventCondition | AddCondition | ActiveCondition | PropCondition;
     type Conditions = Condition[][];
     interface ShowItemI {
         id: number;
@@ -84,7 +66,6 @@ export declare namespace OrConditionsT {
     interface PropI {
         onChange: (value: any[]) => void;
         orConditions: BizUserConditionT.Conditions[number];
-        showAndDesc: boolean;
     }
     interface ShowItemI {
         id: number;

package/es/userCondition/util.d.ts

@@ -1,7 +1,3 @@
-import type { GlobalContextProps } from '../context';
-import type { BizUserConditionT, Unpacked } from './types';
+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;
-export declare function findEvent(eventId: number, eventGroupList: Unpacked<GlobalContextProps, 'eventGroupList'>): import("../attributeSelector/types").AnalysisEvent | null;
-export declare function findPropAndEnv(name: string, list: Unpacked<GlobalContextProps, 'userPropList' | 'eventEnvList'>): import("../attributeSelector/types").UserProp | import("../attributeSelector/types").EnvProp | null;
-export declare function findTagFactory(data: BizUserConditionT.UserTagsDataI[]): (id: number) => import("../userTagsSelector/types").TagI | null;

package/es/userCondition/util.js

@@ -50,16 +50,6 @@ export function buildCondition(type) {
           attrId: 0
         }]
       };
-
-    case 'tag':
-      return {
-        attrs: [],
-        labels: {
-          operator: 'equal',
-          values: []
-        },
-        eventId: undefined
-      };
   }
 }
 export function transformNumberOperate(key) {
@@ -80,36 +70,4 @@ export function transformNumberOperate(key) {
   };
   if (output) return outputMap[key] || key;
   return inputMap[key] || key;
-}
-export function findEvent(eventId, eventGroupList) {
-  for (var i = 0; i < eventGroupList.length; i++) {
-    var eventList = eventGroupList[i].eventList;
-
-    for (var j = 0; j < eventList.length; j++) {
-      if (eventList[j].id === eventId) return eventList[j];
-    }
-  }
-
-  return null;
-}
-export function findPropAndEnv(name, list) {
-  for (var i = 0; i < list.length; i++) {
-    if (list[i].name === name) return list[i];
-  }
-
-  return null;
-}
-export function findTagFactory(data) {
-  return function (id) {
-    var i = -1;
-    var j = data.findIndex(function (item) {
-      i = item.children.findIndex(function (tag) {
-        return tag.labelId === id;
-      });
-      if (i < 0) return false;
-      return true;
-    });
-    if (j < 0) return null;
-    return data[j].children[i];
-  };
 }

package/es/utils/type.d.ts

@@ -1,5 +1,5 @@
-import { PropType, ShowStatus } from '../attributeSelector/types';
 import { RequestOptionsInit } from 'umi-request';
+import { PropType } from '../attributeSelector/types';
 export interface Event {
     value?: string | number;
     label?: string | number;
@@ -21,7 +21,7 @@ export declare namespace OldSystem {
         alias_name?: string;
         click_analysis: boolean;
         event_attrs: EventProp[];
-        event_hidden: ShowStatus;
+        event_hidden: boolean;
         event_type: number;
         insert_time: string;
         is_delete: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.0.15-user.2",
+  "version": "1.0.15",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -36,7 +36,6 @@
     "echarts": "^5.3.2",
     "echarts-for-react": "^3.0.2",
     "lerna": "^4.0.0",
-    "rc-virtual-list": "^3.4.8",
     "react-infinite-scroll-component": "^6.1.0",
     "umi-request": "^1.4.0"
   },
@@ -49,11 +48,9 @@
     "@testing-library/jest-dom": "^5.15.1",
     "@testing-library/react": "^12.1.2",
     "@types/jest": "^27.0.3",
-    "@types/lodash": "^4.14.182",
     "@types/qs": "^6.9.7",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "^1.0.15-user.2",
     "antd": "^4.19.2",
     "dumi": "^1.1.0",
     "father-build": "^1.17.2",
@@ -62,5 +59,5 @@
     "prettier": "^2.2.1",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "a81065a7d384c18f20773ec155efad1ed01c61c5"
+  "gitHead": "0a48d3a8065d6f69ea294686714e65a4ca51a507"
 }

package/es/assets/theme.d.ts

@@ -1,15 +0,0 @@
-declare const _default: {
-    'primary-color': string;
-    'border-color-base': string;
-    'background-color-base': string;
-    'text-color': string;
-    'text-color-secondary': string;
-    'tooltip-bg': string;
-    'error-color': string;
-    'shadow-color': string;
-    'box-shadow-base': string;
-    'btn-text-hover-bg': string;
-    'warning-color': string;
-    'border-color-split': string;
-};
-export default _default;

package/es/select/demo/children.d.ts

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

package/es/select/demo/children.js

@@ -1,81 +0,0 @@
-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 { BizSelect } from '@zgfe/business-lib';
-import { Button } from 'antd';
-var stringOperate = [{
-  name: '是',
-  value: 'equal'
-}, {
-  name: '包含',
-  value: 'contains'
-}, {
-  name: '不是',
-  value: 'not equal'
-}, {
-  name: '不包含',
-  value: 'not contains'
-}, {
-  name: '开头是',
-  value: 'begin with'
-}, {
-  name: '结尾是',
-  value: 'end with'
-}, {
-  name: '开头不是',
-  value: 'not begin with'
-}, {
-  name: '结尾不是',
-  value: 'not end with'
-}, {
-  name: '是空值',
-  value: 'is null'
-}, {
-  name: '不是空值',
-  value: 'is not null'
-}];
-var disabledList = [{
-  value: 'not equal'
-}, {
-  value: 'not begin with'
-}];
-export default (function () {
-  var _useState = useState([{
-    name: '不是',
-    value: 'not equal'
-  }]),
-      _useState2 = _slicedToArray(_useState, 2),
-      data = _useState2[0],
-      setData = _useState2[1];
-
-  var onChange = function onChange(value) {
-    console.log(value);
-    setData(function () {
-      return value;
-    });
-  };
-
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BizSelect, {
-    options: stringOperate,
-    value: data,
-    labelField: "name",
-    keyField: "value",
-    theme: "secondary",
-    popupContainer: true,
-    onChange: onChange,
-    disableItemList: disabledList,
-    multiple: true
-  }, /*#__PURE__*/React.createElement(Button, {
-    type: "primary"
-  }, "\u70B9\u51FB\u6253\u5F00\u4E0B\u62C9")));
-});

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

@@ -1,21 +0,0 @@
-export declare const operatorMap: {
-    relative: string;
-    absolute: string;
-    unlimited_time: string;
-    join_time: string;
-    'is not null': string;
-    'is null': string;
-    'not contains': string;
-    contains: string;
-    equal: string;
-    'not equal': string;
-    'begin with': string;
-    'not begin with': string;
-    'end with': string;
-    'not end with': string;
-    '=': string;
-    '<': string;
-    '>': string;
-    '>=': string;
-    '<=': string;
-};

package/es/userCondition/conditions/constants.js

@@ -1,21 +0,0 @@
-export var operatorMap = {
-  relative: '最近',
-  absolute: '固定时段',
-  unlimited_time: '任意时间',
-  join_time: '新增后',
-  'is not null': '不是空值',
-  'is null': '是空值',
-  'not contains': '不包含',
-  contains: '包含',
-  equal: '是',
-  'not equal': '不是',
-  'begin with': '开头是',
-  'not begin with': '开头不是',
-  'end with': '结尾是',
-  'not end with': '结尾不是',
-  '=': '',
-  '<': '',
-  '>': '',
-  '>=': '',
-  '<=': ''
-};

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

@@ -1,18 +0,0 @@
-@import '../../../assets/styles/variable.less';
-.biz-user-condition-tags-condition {
-  display: flex;
-  &-label,
-  &-value {
-    margin-right: @margin-xs;
-  }
-  &-label {
-    line-height: 40px;
-  }
-  &-value {
-    flex: 1;
-    min-width: 0;
-  }
-  &-operator {
-    width: 96px;
-  }
-}

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

@@ -1,17 +0,0 @@
-@import '../../../assets/styles/variable.less';
-.biz-user-condition {
-  &-text-desc {
-    color: @text-color-secondary;
-    font-size: 14px;
-    &-or {
-      margin: 0 @margin-xs;
-    }
-    &-label {
-    }
-    &-operator {
-    }
-    &-value {
-      color: @text-color;
-    }
-  }
-}

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

@@ -1,9 +0,0 @@
-import React from 'react';
-import { AllConditionBasePropsI, BizUserConditionT } from '../types';
-import './styles/tagsCondition.less';
-declare type Labels = BizUserConditionT.Labels;
-export interface TagsConditionPropI extends AllConditionBasePropsI<Labels> {
-    labels: Labels;
-}
-declare const TagsCondition: React.FC<TagsConditionPropI>;
-export default TagsCondition;