@zgfe/business-lib 1.2.70-hxd.9 → 1.2.71-hxd.1

package/es/attrConditions/styles/index.less

@@ -1,151 +1,151 @@
-@import '../../assets/styles/inner.less';
-
-/* 筛选条件 */
-.biz-condition-item {
-  &-panel {
-    display: flex;
-    width: 100%;
-    > :nth-child(1) {
-      margin-right: 8px;
-    }
-
-    .biz-condition-item-multi-select {
-      width: calc(100% - 108px);
-      min-width: 100px;
-    }
-
-    .biz-condition-item-multi-select-empty {
-      // width: calc(100% - 108px);
-      flex: 1;
-
-      .biz-condition-item-multi-select {
-        width: 100%;
-      }
-    }
-  }
-
-  &:not(:last-child) {
-    margin-bottom: 8px;
-  }
-
-  /* 覆盖属性组件样式 */
-  /* --- start --- */
-  .biz-attr-select-handle {
-    width: 100%;
-    max-width: 100%;
-    margin-bottom: 2px;
-    padding: 0;
-  }
-
-  .biz-attr-select-del-icon {
-    background-color: #fff;
-
-    &:hover {
-      .__error-hover();
-    }
-  }
-
-  // 自定义下拉框样式
-  .biz-select-handle-input {
-    background-color: @background-color-base;
-    // border: none;
-  }
-
-  /* --- end --- */
-
-  &-multi-select {
-    flex: 1;
-  }
-  &-nplace {
-    .ant-space-item:nth-of-type(3) {
-      min-width: 60px !important;
-      .ant-input-number {
-        width: 60px;
-        background-color: #fafafb;
-        border-radius: 4px;
-      }
-    }
-    &-text {
-      white-space: nowrap;
-    }
-  }
-
-  &-single-select {
-    width: 100px;
-    &.gray {
-      color: @text-color-secondary;
-
-      &:hover {
-        color: @primary-color;
-      }
-    }
-  }
-
-  &-value-content {
-    display: flex;
-    flex: 1;
-
-    .biz-select-handle {
-      margin-left: @margin-xs;
-    }
-  }
-
-  &-input {
-    &.ant-input {
-      background-color: @background-color-base;
-      border-color: @background-color-base;
-    }
-
-    &.ant-input-affix-wrapper {
-      background-color: @background-color-base !important;
-
-      input {
-        background-color: @background-color-base !important;
-      }
-
-      &.ant-input-affix-wrapper-focused {
-        background-color: #fff !important;
-        border: 1px solid @primary-color;
-
-        input {
-          background-color: #fff !important;
-        }
-      }
-    }
-
-    &:focus {
-      border: 1px solid @primary-color;
-    }
-
-    .ant-input-group-addon {
-      // background-color: @background-color-gray !important;
-      border: none;
-    }
-
-    &-select {
-      width: 60px;
-      border: none;
-      // border-left: 1px solid @border-color-split;
-    }
-  }
-
-  &-date.ant-picker {
-    flex: 1;
-    border-color: transparent;
-
-    &.ant-picker {
-      background-color: @background-color-base;
-
-      &:hover {
-        background-color: @background-color-base;
-        border-color: @primary-color;
-      }
-
-      &.ant-picker-focused {
-        background-color: @background-color-base;
-        border-color: @primary-color;
-        box-shadow: @box-shadow-base;
-      }
-    }
-  }
-}
+@import '../../assets/styles/inner.less';
+
+/* 筛选条件 */
+.biz-condition-item {
+  &-panel {
+    display: flex;
+    width: 100%;
+    > :nth-child(1) {
+      margin-right: 8px;
+    }
+
+    .biz-condition-item-multi-select {
+      width: calc(100% - 108px);
+      min-width: 100px;
+    }
+
+    .biz-condition-item-multi-select-empty {
+      // width: calc(100% - 108px);
+      flex: 1;
+
+      .biz-condition-item-multi-select {
+        width: 100%;
+      }
+    }
+  }
+
+  &:not(:last-child) {
+    margin-bottom: 8px;
+  }
+
+  /* 覆盖属性组件样式 */
+  /* --- start --- */
+  .biz-attr-select-handle {
+    width: 100%;
+    max-width: 100%;
+    margin-bottom: 2px;
+    padding: 0;
+  }
+
+  .biz-attr-select-del-icon {
+    background-color: #fff;
+
+    &:hover {
+      .__error-hover();
+    }
+  }
+
+  // 自定义下拉框样式
+  .biz-select-handle-input {
+    background-color: @background-color-base;
+    // border: none;
+  }
+
+  /* --- end --- */
+
+  &-multi-select {
+    flex: 1;
+  }
+  &-nplace {
+    .ant-space-item:nth-of-type(3) {
+      min-width: 60px !important;
+      .ant-input-number {
+        width: 60px;
+        background-color: #fafafb;
+        border-radius: 4px;
+      }
+    }
+    &-text {
+      white-space: nowrap;
+    }
+  }
+
+  &-single-select {
+    width: 100px;
+    &.gray {
+      color: @text-color-secondary;
+
+      &:hover {
+        color: @primary-color;
+      }
+    }
+  }
+
+  &-value-content {
+    display: flex;
+    flex: 1;
+
+    .biz-select-handle {
+      margin-left: @margin-xs;
+    }
+  }
+
+  &-input {
+    &.ant-input {
+      background-color: @background-color-base;
+      border-color: @background-color-base;
+    }
+
+    &.ant-input-affix-wrapper {
+      background-color: @background-color-base !important;
+
+      input {
+        background-color: @background-color-base !important;
+      }
+
+      &.ant-input-affix-wrapper-focused {
+        background-color: #fff !important;
+        border: 1px solid @primary-color;
+
+        input {
+          background-color: #fff !important;
+        }
+      }
+    }
+
+    &:focus {
+      border: 1px solid @primary-color;
+    }
+
+    .ant-input-group-addon {
+      // background-color: @background-color-gray !important;
+      border: none;
+    }
+
+    &-select {
+      width: 60px;
+      border: none;
+      // border-left: 1px solid @border-color-split;
+    }
+  }
+
+  &-date.ant-picker {
+    flex: 1;
+    border-color: transparent;
+
+    &.ant-picker {
+      background-color: @background-color-base;
+
+      &:hover {
+        background-color: @background-color-base;
+        border-color: @primary-color;
+      }
+
+      &.ant-picker-focused {
+        background-color: @background-color-base;
+        border-color: @primary-color;
+        box-shadow: @box-shadow-base;
+      }
+    }
+  }
+}

package/es/attrConditions/types.d.ts

@@ -19,6 +19,7 @@ export declare namespace AttrConditionTypes {
         attrNameStr?: string;
         type?: PropType;
         propCategory?: 'userProp' | 'eventProp' | 'envProp' | string;
+        encryptionType?: number;
         category?: 'fixed' | 'custom';
         dimensionSub?: string;
         operator?: OperateTypes;
@@ -47,6 +48,7 @@ export declare namespace AttrConditionTypes {
             eventAttrIdSub: number;
             eventAttrNameSub: string;
         }[];
+        realTimeTags?: Boolean;
     }
     interface GroupProp extends BasicAttrTypes {
         defaultValue?: GroupValue;
@@ -64,6 +66,8 @@ export declare namespace AttrConditionTypes {
             eventAttrIdSub: number;
             eventAttrNameSub: string;
         }[];
+        realTimeTags?: Boolean;
+        supportNPlace?: boolean;
     }
     interface Option {
         name: string;

package/es/attrConditions/utils/operates.d.ts

@@ -10,6 +10,10 @@ export declare const stringOperate: {
     name: string;
     value: string;
 }[];
+export declare const stringOperate1: {
+    name: string;
+    value: string;
+}[];
 export declare const numberAUMOperate: {
     name: string;
     value: string;

package/es/attrConditions/utils/operates.js

@@ -44,6 +44,43 @@ export var stringOperate = [{
   name: '不是空值',
   value: 'is not null'
 }];
+export var stringOperate1 = [{
+  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'
+}, {
+  name: '正则匹配',
+  value: 'regexp'
+}, {
+  name: '正则不匹配',
+  value: 'not regexp'
+}];
 export var numberAUMOperate = [{
   name: '>',
   value: 'gt'

package/es/attributeSelector/index.js

@@ -28,7 +28,8 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
     overlayClassName = props.overlayClassName,
     isStrNum = props.isStrNum,
     isString = props.isString,
-    isHideYeWu = props.isHideYeWu;
+    isHideYeWu = props.isHideYeWu,
+    realTimeTags = props.realTimeTags;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     currentAttr = _useState2[0],
@@ -42,7 +43,6 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
     _useState6 = _slicedToArray(_useState5, 1),
     id = _useState6[0];
   var _useContext = useContext(BizGlobalDataContext),
-    eventGroupList = _useContext.eventGroupList,
     userPropList = _useContext.userPropList,
     eventEnvList = _useContext.eventEnvList;
   var boxRef = useRef(null);
@@ -56,6 +56,7 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
     setCurrentAttr(getValue(props.defaultValue));
   }, []);
   useEffect(function () {
+    if (props.value && !getValue(props.value)) return;
     setCurrentAttr(getValue(props.value));
   }, [props.value, props.extra]);
   function getValue(param) {
@@ -65,14 +66,12 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
         if (attr.id === param.id && attr.name === (param.name || param.value)) res = attr;
       });
     } else if ((param === null || param === void 0 ? void 0 : param.propCategory) === 'eventProp') {
-      eventGroupList === null || eventGroupList === void 0 ? void 0 : eventGroupList.forEach(function (group) {
-        group.eventList.forEach(function (event) {
-          event.attrList.forEach(function (attr) {
-            if (attr.id === param.id) res = _.cloneDeep(attr);
-          });
-        });
-      });
-      if (res && param.step !== undefined) res.step = param.step;
+      if (param.id && (param.label || param.alias)) {
+        res = _.cloneDeep(param);
+      }
+      if (res && param.step !== undefined) {
+        res.step = param.step;
+      }
     } else if ((param === null || param === void 0 ? void 0 : param.propCategory) === 'userProp') {
       var _concat;
       (_concat = (extraUser ? extraUser : []).concat(userPropList ? userPropList : [])) === null || _concat === void 0 ? void 0 : _concat.forEach(function (attr) {
@@ -113,7 +112,8 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
         isNumber: isNumber,
         isStrNum: isStrNum,
         isString: isString,
-        isHideYeWu: isHideYeWu
+        isHideYeWu: isHideYeWu,
+        realTimeTags: realTimeTags
       }));
     },
     trigger: ['click'],