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

package/es/assets/iconfont/iconfont.json

@@ -5,6 +5,111 @@
   "css_prefix_text": "",
   "description": "诸葛业务平台",
   "glyphs": [
+    {
+      "icon_id": "42855475",
+      "name": "quxiaoquanping 1",
+      "font_class": "a-quxiaoquanping1",
+      "unicode": "e658",
+      "unicode_decimal": 58968
+    },
+    {
+      "icon_id": "42827457",
+      "name": "二维码",
+      "font_class": "erweima",
+      "unicode": "e7dd",
+      "unicode_decimal": 59357
+    },
+    {
+      "icon_id": "42825294",
+      "name": "手机",
+      "font_class": "shouji",
+      "unicode": "e7db",
+      "unicode_decimal": 59355
+    },
+    {
+      "icon_id": "42825293",
+      "name": "切换横屏",
+      "font_class": "qiehuanhengping",
+      "unicode": "e7dc",
+      "unicode_decimal": 59356
+    },
+    {
+      "icon_id": "42735941",
+      "name": "用户人数刷新",
+      "font_class": "yonghurenshushuaxin",
+      "unicode": "e657",
+      "unicode_decimal": 58967
+    },
+    {
+      "icon_id": "42421332",
+      "name": "分享",
+      "font_class": "fenxiang",
+      "unicode": "e656",
+      "unicode_decimal": 58966
+    },
+    {
+      "icon_id": "42402282",
+      "name": "icon 注意",
+      "font_class": "a-iconzhuyi",
+      "unicode": "e655",
+      "unicode_decimal": 58965
+    },
+    {
+      "icon_id": "42390038",
+      "name": "姓名排序A-Z",
+      "font_class": "xingmingpaixuA-Z",
+      "unicode": "e7d9",
+      "unicode_decimal": 59353
+    },
+    {
+      "icon_id": "42390037",
+      "name": "姓名排序Z-A",
+      "font_class": "xingmingpaixuZ-A",
+      "unicode": "e7da",
+      "unicode_decimal": 59354
+    },
+    {
+      "icon_id": "42372608",
+      "name": "属性分析",
+      "font_class": "shuxingfenxi",
+      "unicode": "e654",
+      "unicode_decimal": 58964
+    },
+    {
+      "icon_id": "42169337",
+      "name": "放大镜",
+      "font_class": "fangdajing",
+      "unicode": "e652",
+      "unicode_decimal": 58962
+    },
+    {
+      "icon_id": "42169336",
+      "name": "缩小",
+      "font_class": "suoxiao1",
+      "unicode": "e653",
+      "unicode_decimal": 58963
+    },
+    {
+      "icon_id": "42132750",
+      "name": "关系图",
+      "font_class": "a-node-tree2",
+      "unicode": "e650",
+      "unicode_decimal": 58960
+    },
+    {
+      "icon_id": "42132749",
+      "name": "表格模式",
+      "font_class": "a-table-view1",
+      "unicode": "e651",
+      "unicode_decimal": 58961
+    },
+    {
+      "icon_id": "41866164",
+      "name": "提交",
+      "font_class": "tijiao",
+      "unicode": "e7d8",
+      "unicode_decimal": 59352
+    },
     {
       "icon_id": "41736285",
       "name": "更多",

package/es/assets/styles/resetAntd.less

@@ -12,6 +12,14 @@
     background-color: @background-color-base!important;
   }
 
+  > .ant-input:hover {
+    border-color: #165dff00 !important;
+  }
+
+  > .ant-input:focus {
+    border-color: #165dff00 !important;
+  }
+
   &:hover {
     border-color: @primary-color!important;
   }
@@ -46,15 +54,16 @@
 // 输入框
 .ant-input {
   background-color: @background-color-base!important;
+  border: 1px solid #ecedf000 !important;
   // border-color: @background-color-base!important;
   border-radius: @border-radius-small!important;
   &:hover {
-    border-color: @primary-color;
+    border-color: @primary-color !important;
   }
   &:focus,
   &-focused {
     background-color: #fff !important;
-    border-color: @primary-color;
+    border-color: @primary-color !important;
     box-shadow: 0 0 0 4px @custom-focus !important;
   }
   &.ant-input-status-error {
@@ -62,11 +71,16 @@
     &:focus,
     &-focused {
       &:not(.ant-input-disable):not(.ant-input-borderless) {
-        box-shadow: 0 0 0 4px rgba(#ff8170, 0.2) !important;
+        box-shadow: 0 0 0 4px rgba(#ff8170, 0) !important;
       }
     }
   }
 }
+.ant-input[disabled] {
+  color: rgba(2, 20, 41, 1) !important;
+  background-color: #f2f3f4 !important;
+  border-color: #ecedf000 !important;
+}
 
 .ant-input-group-addon {
   color: @text-color-secondary!important;
@@ -519,24 +533,23 @@
 }
 
 .ant-btn-text {
-  background-color: @background-color-gray!important;
+  background-color: none !important;
   border: none !important;
 
   &:hover {
     color: @text-color!important;
-    background-color: @btn-text-hover-bg!important;
+    background-color: none !important;
   }
 
   &:focus {
     color: @text-color!important;
-    background-color: #94a6ce !important;
+    background-color: none !important;
   }
 }
 .ant-form-item-explain-error {
   color: @error-color!important;
 }
 
-//dropdown
 .ant-dropdown,
 .ant-picker-dropdown,
 .ant-dropdown-menu-submenu-popup {

package/es/attrCondition/useAttrCondition.js

@@ -37,6 +37,7 @@ var useAttrCondition = function useAttrCondition(props) {
           attrData = {
             id: data.attrId,
             propCategory: data.propCategory,
+            encryptionType: data.encryptionType,
             type: data.type,
             key: "".concat(data.propCategory, "-").concat(data.attrId),
             label: data.attrNameStr || data.label,
@@ -52,6 +53,7 @@ var useAttrCondition = function useAttrCondition(props) {
             propCategory: data.propCategory,
             type: data.type,
             category: data.category,
+            encryptionType: data.encryptionType,
             key: "".concat(data.propCategory, "-").concat(data.attrName, "-").concat(aId),
             subtype: data.subtype,
             label: data.attrNameStr || data.label,
@@ -66,7 +68,8 @@ var useAttrCondition = function useAttrCondition(props) {
             type: data.type,
             key: "".concat(data.propCategory, "-").concat(data.attrId),
             label: data.attrNameStr || data.label,
-            subtype: data.subtype
+            subtype: data.subtype,
+            encryptionType: data.encryptionType
           };
         }
       }

package/es/attrConditions/components/operateList.js

@@ -35,9 +35,9 @@ var BizOperateList = function BizOperateList(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     ready = _useState8[0],
     setReady = _useState8[1];
-  var specialOperateHandle = function specialOperateHandle(label) {
-    var _special = ['平台', '网络', '运营商', '设备型号'];
-    return label && _special.indexOf(label) !== -1 ? true : false;
+  var specialOperateHandle = function specialOperateHandle(name) {
+    var _special = ['platform', 'network', 'mccmnc', 'device_model'];
+    return name && _special.indexOf(name) !== -1 ? true : false;
   };
   useEffect(function () {
     if (/place/.test(props.defaultValue || '')) {
@@ -63,7 +63,7 @@ var BizOperateList = function BizOperateList(props) {
       var _props$attr2, _props$attr3;
       if (((_props$attr2 = props.attr) === null || _props$attr2 === void 0 ? void 0 : _props$attr2.id) == 31415926) {
         optionData = stringBusinessOperate;
-      } else if (specialOperateHandle((_props$attr3 = props.attr) === null || _props$attr3 === void 0 ? void 0 : _props$attr3.label)) {
+      } else if (specialOperateHandle((_props$attr3 = props.attr) === null || _props$attr3 === void 0 ? void 0 : _props$attr3.name)) {
         optionData = specialOperate;
       } else {
         optionData = stringOperate;

package/es/attrConditions/components/valuesList.js

@@ -170,7 +170,7 @@ var ValuesList = function ValuesList(props) {
     } else {
       return /*#__PURE__*/React.createElement(Input, {
         className: "".concat(classPrefix, "-input"),
-        value: current && current[0] ? current[0] : 30,
+        value: current && current[0] ? current[0] : '',
         placeholder: "\u8BF7\u8F93\u5165\u5C5E\u6027\u503C",
         type: "number",
         suffix: "\u5929",

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;

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) {
@@ -228,7 +228,7 @@ var AttrListPanel = function AttrListPanel(props) {
       });
       var childList = [];
       group.children.forEach(function (option) {
-        if (searchValue && !new RegExp(_.escapeRegExp(searchValue), 'i').test((option === null || option === void 0 ? void 0 : option.alias) || (option === null || option === void 0 ? void 0 : option.label))) return;
+        if (searchValue && !(new RegExp(_.escapeRegExp(searchValue), 'i').test(" ".concat(option === null || option === void 0 ? void 0 : option.alias)) || new RegExp(_.escapeRegExp(searchValue), 'i').test(" ".concat(option === null || option === void 0 ? void 0 : option.label)))) return;
         var disabled = false;
         disableItemlist === null || disableItemlist === void 0 ? void 0 : disableItemlist.forEach(function (item) {
           if (item.key === option.key) disabled = true;

package/es/attributeSelector/types.d.ts

@@ -40,6 +40,7 @@ export interface EventGroup {
 export interface BasicProp {
     id?: number;
     label?: string;
+    encryptionType: number;
     alias?: string;
     type?: PropType;
     realTime?: boolean;
@@ -96,6 +97,7 @@ export declare namespace AttributeSelect {
         size?: SizeType;
         status?: string;
         extra?: AttributeExtra[];
+        extraUser?: ExtraProp[];
         isNumber?: Boolean;
         isStrNum?: Boolean;
         isString?: Boolean;

package/es/attributeSelector/util.js

@@ -31,6 +31,7 @@ export default function convertAttributeData(store) {
             propCategory: 'eventProp',
             type: item.prop_type,
             realTime: true,
+            encryptionType: item.encryption_type,
             dimensionSub: item.dimension_sub || 'event_attr'
           };
         }),
@@ -64,6 +65,7 @@ export default function convertAttributeData(store) {
       label: prop.text,
       name: prop.name,
       propCategory: 'envProp',
+      encryptionType: prop.encryption_type,
       type: prop.type,
       realTime: true,
       dimensionSub: prop.dimension_sub || prop.name
@@ -77,6 +79,7 @@ export default function convertAttributeData(store) {
       category: prop.category,
       key: "userProp-".concat(prop.name, "-").concat(prop.id || 0),
       label: prop.text || prop.name,
+      encryptionType: prop.encryption_type,
       name: prop.name,
       propCategory: 'userProp',
       type: prop.type,
@@ -115,6 +118,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[];