@zgfe/business-lib 1.2.66-hxd.2 → 1.2.70-hxd.1

package/es/attributeSelector/index.js

@@ -23,6 +23,7 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
     placeholder = props.placeholder,
     theme = props.theme,
     extra = props.extra,
+    extraUser = props.extraUser,
     isNumber = props.isNumber,
     overlayClassName = props.overlayClassName,
     isStrNum = props.isStrNum,
@@ -73,7 +74,8 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
       });
       if (res && param.step !== undefined) res.step = param.step;
     } else if ((param === null || param === void 0 ? void 0 : param.propCategory) === 'userProp') {
-      userPropList === null || userPropList === void 0 ? void 0 : userPropList.forEach(function (attr) {
+      var _concat;
+      (_concat = (extraUser ? extraUser : []).concat(userPropList ? userPropList : [])) === null || _concat === void 0 ? void 0 : _concat.forEach(function (attr) {
         if (attr.id === param.id && attr.category === param.category && attr.name === (param.name || param.value)) res = attr;
       });
     } else {

package/es/attributeSelector/listPanel.js

@@ -24,6 +24,7 @@ var AttrListPanel = function AttrListPanel(props) {
     eventIdList = props.eventIdList,
     funnelEventIdList = props.funnelEventIdList,
     extra = props.extra,
+    extraUser = props.extraUser,
     isNumber = props.isNumber,
     isStrNum = props.isStrNum,
     isString = props.isString,
@@ -195,7 +196,7 @@ var AttrListPanel = function AttrListPanel(props) {
         groupName: "".concat((currentApp === null || currentApp === void 0 ? void 0 : currentApp.type) === 'user' ? '用户' : '主体', "\u5C5E\u6027"),
         key: 'userProps',
         anchor: anchor.user,
-        children: userPropList
+        children: (extraUser ? extraUser : []).concat(userPropList)
       });
     }
     if (enableEnvProp) {
@@ -210,7 +211,6 @@ var AttrListPanel = function AttrListPanel(props) {
     setOptionList(list);
   }, [anchor, eventIdMap, userPropList, eventEnvList, eventIdList, props.showCommonProp]);
   useEffect(function () {
-    console.log('currentAttr', props.value);
     setCurrentAttr(props.value);
   }, [props.value]);
   function onClick(option) {

package/es/attributeSelector/styles/index.less

@@ -1,141 +1,141 @@
-@import '../../assets/styles/inner.less';
-
-.biz-attr-select {
-  &-handle {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    width: fit-content;
-    min-width: 208px;
-    .__select-handle();
-    &.error {
-      border-color: @error-color;
-      &.focus {
-        box-shadow: 0 0 0 2px rgba(251, 85, 71, 0.2);
-      }
-    }
-
-    &:hover {
-      .biz-target-select-option-icon {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-      }
-    }
-
-    .biz-select-handle-input {
-      border: none;
-      &.middle {
-        height: 32px;
-        line-height: 32px;
-      }
-    }
-    .biz-select-handle-content-label {
-      max-width: 450px;
-    }
-  }
-
-  &-drowdown {
-    .__select-panel();
-
-    &.nodata {
-      .__select-nodata();
-    }
-  }
-
-  &-anchor-panel {
-    max-width: 496px;
-    padding: 12px 0;
-
-    .ant-anchor {
-      display: flex;
-      flex-direction: row;
-
-      .ant-anchor-ink::before {
-        width: 0;
-      }
-
-      .ant-anchor-link {
-        padding: 0;
-
-        &:last-of-type .ant-btn {
-          margin-right: 0;
-        }
-      }
-
-      .ant-btn {
-        margin-right: 8px;
-      }
-
-      .ant-anchor-link-active .ant-btn {
-        &,
-        &:focus {
-          .__default-hover();
-        }
-      }
-
-      .ant-btn:focus {
-        color: @text-color;
-        border-color: @border-color-base;
-      }
-    }
-  }
-
-  &-container {
-    max-height: 224px;
-    overflow-x: hidden;
-    overflow-y: auto;
-  }
-
-  &-nodata {
-    .__select-nodata();
-  }
-
-  &-group {
-    position: relative;
-    height: 32px;
-    padding: 0 @padding-sm;
-    color: @text-color-secondary;
-    line-height: 32px;
-
-    &::before {
-      position: absolute;
-      top: 9px;
-      left: 5px;
-      width: 3px;
-      height: 14px;
-      background-color: @primary-color;
-      border-radius: 10px;
-      content: '';
-    }
-
-    & > span {
-      position: relative;
-      display: inline-block;
-      max-width: 225px;
-      padding-right: @padding-xss;
-      background: #fff;
-      .__default-overflow();
-    }
-  }
-
-  &-split {
-    position: absolute;
-    top: 18px;
-    width: 100%;
-    height: 0;
-    border-bottom: 1px solid @border-color-base;
-  }
-
-  &-option {
-    .__select-option();
-
-    &:not(.active, :hover, .disabled) .biz-attr-select-highlight {
-      color: @primary-color;
-    }
-  }
-
-  &-option-icon {
-    margin-right: @margin-xs;
-  }
-}
+@import '../../assets/styles/inner.less';
+
+.biz-attr-select {
+  &-handle {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    width: fit-content;
+    min-width: 208px;
+    .__select-handle();
+    &.error {
+      border-color: @error-color;
+      &.focus {
+        box-shadow: 0 0 0 2px rgba(251, 85, 71, 0.2);
+      }
+    }
+
+    &:hover {
+      .biz-target-select-option-icon {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
+    }
+
+    .biz-select-handle-input {
+      border: none;
+      &.middle {
+        height: 32px;
+        line-height: 32px;
+      }
+    }
+    .biz-select-handle-content-label {
+      max-width: 450px;
+    }
+  }
+
+  &-drowdown {
+    .__select-panel();
+
+    &.nodata {
+      .__select-nodata();
+    }
+  }
+
+  &-anchor-panel {
+    max-width: 496px;
+    padding: 12px 0;
+
+    .ant-anchor {
+      display: flex;
+      flex-direction: row;
+
+      .ant-anchor-ink::before {
+        width: 0;
+      }
+
+      .ant-anchor-link {
+        padding: 0;
+
+        &:last-of-type .ant-btn {
+          margin-right: 0;
+        }
+      }
+
+      .ant-btn {
+        margin-right: 8px;
+      }
+
+      .ant-anchor-link-active .ant-btn {
+        &,
+        &:focus {
+          .__default-hover();
+        }
+      }
+
+      .ant-btn:focus {
+        color: @text-color;
+        border-color: @border-color-base;
+      }
+    }
+  }
+
+  &-container {
+    max-height: 224px;
+    overflow-x: hidden;
+    overflow-y: auto;
+  }
+
+  &-nodata {
+    .__select-nodata();
+  }
+
+  &-group {
+    position: relative;
+    height: 32px;
+    padding: 0 @padding-sm;
+    color: @text-color-secondary;
+    line-height: 32px;
+
+    &::before {
+      position: absolute;
+      top: 9px;
+      left: 5px;
+      width: 3px;
+      height: 14px;
+      background-color: @primary-color;
+      border-radius: 10px;
+      content: '';
+    }
+
+    & > span {
+      position: relative;
+      display: inline-block;
+      max-width: 225px;
+      padding-right: @padding-xss;
+      background: #fff;
+      .__default-overflow();
+    }
+  }
+
+  &-split {
+    position: absolute;
+    top: 18px;
+    width: 100%;
+    height: 0;
+    border-bottom: 1px solid @border-color-base;
+  }
+
+  &-option {
+    .__select-option();
+
+    &:not(.active, :hover, .disabled) .biz-attr-select-highlight {
+      color: @primary-color;
+    }
+  }
+
+  &-option-icon {
+    margin-right: @margin-xs;
+  }
+}

package/es/attributeSelector/types.d.ts

@@ -96,6 +96,7 @@ export declare namespace AttributeSelect {
         size?: SizeType;
         status?: string;
         extra?: AttributeExtra[];
+        extraUser?: ExtraProp[];
         isNumber?: Boolean;
         isStrNum?: Boolean;
         isString?: Boolean;

package/es/attributeSelector/util.js

@@ -115,6 +115,7 @@ export function getIcon(name) {
     device_brand: 'overall',
     device_model: 'overall',
     event_duration: 'time',
+    userCount: 'web',
     first_visit_time: 'time',
     last_visit_time: 'time',
     visit_times: 'time',

package/es/chart/demo/data/data7.d.ts

@@ -0,0 +1,54 @@
+declare const _default: {
+    delEventName: null;
+    huanbi: never[];
+    md5: string;
+    numberCard: number;
+    series: {
+        diyTarget: boolean;
+        duration: never[];
+        groupId: number;
+        index: string;
+        names: string[];
+        orderNum: null;
+        originalNames: never[];
+        pNext: never[];
+        pTotal: never[];
+        proMd5: null;
+        resultFormat: null;
+        sum: null;
+        total: never[];
+        values: number[];
+    }[];
+    table: string;
+    tongbi: never[];
+    total: never[];
+    updateTime: string;
+    xAxis: string[];
+    yesterDay: never[];
+    seriesOriginal: {
+        diyTarget: boolean;
+        duration: never[];
+        groupId: number;
+        index: string;
+        names: string[];
+        orderNum: null;
+        originalNames: never[];
+        pNext: never[];
+        pTotal: never[];
+        proMd5: null;
+        resultFormat: null;
+        sum: null;
+        total: never[];
+        values: number[];
+    }[];
+};
+export default _default;
+export declare const barData: {
+    xAxis: string[];
+    series: {
+        names: string[];
+        values: number[];
+        orderNum: number;
+    }[];
+};
+export declare const showCharts: string[];