@zgfe/business-lib 1.0.23-alpha.0 → 1.0.23-alpha.3

package/es/attrConditions/styles/index.less

@@ -73,7 +73,6 @@
     border: none;
 
     &.ant-input-affix-wrapper {
-      height: @height-base !important;
       background-color: @background-color-gray !important;
 
       input {

package/es/attributeSelector/demo/index.js

@@ -15,7 +15,7 @@ import { BizAttributeSelector, BizGlobalDataContext } from '@zgfe/business-lib';
 import '@zgfe/business-lib/es/assets/styles/resetAntd.less';
 import eventData from '../../mock/event';
 import envData from '../../mock/env';
-import userData from '../../mock/user';
+import userData from './userData.js';
 import convertAttributeData from '../util';
 export default (function () {
   var _useState = useState({

package/es/attributeSelector/demo/userData.js

@@ -0,0 +1,290 @@
+export default [{
+  dimension_sub: 'name',
+  value_dict: false,
+  name: 'name',
+  isMultiple: 0,
+  id: 23,
+  text: '名称',
+  category: 'fixed',
+  type: 1,
+  alias_name: null
+}, {
+  dimension_sub: 'is_anonymous',
+  value_dict: false,
+  name: 'is_anonymous',
+  isMultiple: 0,
+  id: 0,
+  text: '实名/匿名',
+  category: 'fixed',
+  type: 1,
+  alias_name: null
+}, {
+  dimension_sub: 'app_user_id',
+  value_dict: false,
+  name: 'app_user_id',
+  isMultiple: 0,
+  id: -1,
+  text: '用户ID',
+  category: 'fixed',
+  type: 1,
+  alias_name: null
+}, {
+  dimension_sub: 'zg_id',
+  value_dict: false,
+  name: 'zg_id',
+  isMultiple: 0,
+  id: 0,
+  text: '系统ID',
+  category: 'fixed',
+  type: 2,
+  alias_name: null
+}, {
+  dimension_sub: 'first_visit_time',
+  value_dict: false,
+  name: 'first_visit_time',
+  isMultiple: 0,
+  id: 0,
+  text: '首次访问时间',
+  category: 'fixed',
+  type: 3,
+  alias_name: null
+}, {
+  dimension_sub: 'last_visit_time',
+  value_dict: false,
+  name: 'last_visit_time',
+  isMultiple: 0,
+  id: 0,
+  text: '最后一次访问时间',
+  category: 'fixed',
+  type: 3,
+  alias_name: null
+}, {
+  dimension_sub: 'visit_times',
+  value_dict: false,
+  name: 'visit_times',
+  isMultiple: 0,
+  id: 0,
+  text: '近30天访问次数',
+  category: 'fixed',
+  type: 2,
+  alias_name: null
+}, {
+  dimension_sub: 'duration',
+  subtype: 2,
+  value_dict: false,
+  name: 'duration',
+  isMultiple: 0,
+  id: 0,
+  text: '近30天访问时长',
+  category: 'fixed',
+  type: 2,
+  alias_name: null
+}, {
+  dimension_sub: 'current_country',
+  value_dict: false,
+  name: 'current_country',
+  isMultiple: 0,
+  id: 0,
+  text: '国家',
+  category: 'fixed',
+  type: 1,
+  alias_name: null
+}, {
+  dimension_sub: 'current_area',
+  value_dict: false,
+  name: 'current_area',
+  isMultiple: 0,
+  id: 0,
+  text: '省份',
+  category: 'fixed',
+  type: 1,
+  alias_name: null
+}, {
+  dimension_sub: 'current_city',
+  value_dict: false,
+  name: 'current_city',
+  isMultiple: 0,
+  id: 0,
+  text: '城市',
+  category: 'fixed',
+  type: 1,
+  alias_name: null
+}, {
+  dimension_sub: 'user_referer_url',
+  value_dict: false,
+  name: 'user_referer_url',
+  isMultiple: 0,
+  id: 0,
+  text: '首次来源URL',
+  category: 'fixed',
+  type: 1,
+  alias_name: null
+}, {
+  dimension_sub: 'first_website',
+  value_dict: false,
+  name: 'first_website',
+  isMultiple: 0,
+  id: 0,
+  text: '首次来源域名',
+  category: 'fixed',
+  type: 1,
+  alias_name: null
+}, {
+  dimension_sub: 'first_utm_source',
+  value_dict: false,
+  name: 'first_utm_source',
+  isMultiple: 0,
+  id: 0,
+  text: '首次utm_source',
+  category: 'fixed',
+  type: 1,
+  alias_name: null
+}, {
+  dimension_sub: 'first_utm_medium',
+  value_dict: false,
+  name: 'first_utm_medium',
+  isMultiple: 0,
+  id: 0,
+  text: '首次utm_medium',
+  category: 'fixed',
+  type: 1,
+  alias_name: null
+}, {
+  dimension_sub: 'first_utm_campaign',
+  value_dict: false,
+  name: 'first_utm_campaign',
+  isMultiple: 0,
+  id: 0,
+  text: '首次utm_campaign',
+  category: 'fixed',
+  type: 1,
+  alias_name: null
+}, {
+  dimension_sub: 'first_utm_content',
+  value_dict: false,
+  name: 'first_utm_content',
+  isMultiple: 0,
+  id: 0,
+  text: '首次utm_content',
+  category: 'fixed',
+  type: 1,
+  alias_name: null
+}, {
+  dimension_sub: 'first_utm_term',
+  value_dict: false,
+  name: 'first_utm_term',
+  isMultiple: 0,
+  id: 0,
+  text: '首次utm_term',
+  category: 'fixed',
+  type: 1,
+  alias_name: null
+}, {
+  dimension_sub: 'current_browser_brand',
+  value_dict: false,
+  name: 'current_browser_brand',
+  isMultiple: 0,
+  id: 0,
+  text: '浏览器品牌',
+  category: 'fixed',
+  type: 1,
+  alias_name: null
+}, {
+  dimension_sub: 'current_browser_version',
+  value_dict: false,
+  name: 'current_browser_version',
+  isMultiple: 0,
+  id: 0,
+  text: '浏览器版本',
+  category: 'fixed',
+  type: 2,
+  alias_name: null
+}, {
+  dimension_sub: 'current_os',
+  value_dict: false,
+  name: 'current_os',
+  isMultiple: 0,
+  id: 0,
+  text: '操作系统',
+  category: 'fixed',
+  type: 1,
+  alias_name: null
+}, {
+  dimension_sub: 'current_ov',
+  value_dict: false,
+  name: 'current_ov',
+  isMultiple: 0,
+  id: 0,
+  text: '系统版本',
+  category: 'fixed',
+  type: 2,
+  alias_name: null
+}, {
+  dimension_sub: 'current_resolution_h',
+  value_dict: false,
+  name: 'current_resolution_h',
+  isMultiple: 0,
+  id: 0,
+  text: '屏幕高度',
+  category: 'fixed',
+  type: 2,
+  alias_name: null
+}, {
+  dimension_sub: 'current_resolution_l',
+  value_dict: false,
+  name: 'current_resolution_l',
+  isMultiple: 0,
+  id: 0,
+  text: '屏幕宽度',
+  category: 'fixed',
+  type: 2,
+  alias_name: null
+}, {
+  dimension_sub: 'user_attr',
+  encryption_type: 0,
+  hidden: 0,
+  value_dict: false,
+  name: '电话',
+  isMultiple: 0,
+  id: 22,
+  text: '电话',
+  category: 'custom',
+  type: 1,
+  alias_name: ''
+}, {
+  dimension_sub: 'user_attr',
+  encryption_type: 0,
+  hidden: 0,
+  value_dict: false,
+  name: '性别',
+  isMultiple: 0,
+  id: 24,
+  text: '性别',
+  category: 'custom',
+  type: 1,
+  alias_name: ''
+}, {
+  dimension_sub: 'user_attr',
+  encryption_type: 0,
+  hidden: 0,
+  value_dict: false,
+  name: '年龄',
+  isMultiple: 0,
+  id: 25,
+  text: '年龄',
+  category: 'custom',
+  type: 2,
+  alias_name: ''
+}, {
+  dimension_sub: 'user_attr',
+  encryption_type: 0,
+  hidden: 0,
+  value_dict: false,
+  name: '地址',
+  isMultiple: 0,
+  id: 21,
+  text: '地址',
+  category: 'custom',
+  type: 1,
+  alias_name: ''
+}];

package/es/attributeSelector/listPanel.js

@@ -149,6 +149,7 @@ var AttrListPanel = function AttrListPanel(props) {
         disableItemlist === null || disableItemlist === void 0 ? void 0 : disableItemlist.forEach(function (item) {
           if (item.key === option.key) disabled = true;
         });
+        console.log('>>>>>>>>>', option === null || option === void 0 ? void 0 : option.key);
         childList.push( /*#__PURE__*/React.createElement(Option, {
           option: option,
           key: option === null || option === void 0 ? void 0 : option.key,

package/es/attributeSelector/util.js

@@ -61,7 +61,7 @@ export default function convertAttributeData(store) {
       id: prop.id || 0,
       alias: prop.alias_name,
       category: prop.category,
-      key: "userProp-".concat(prop.dimension_sub),
+      key: "userProp-".concat(prop.name),
       label: prop.text || prop.name,
       name: prop.name,
       propCategory: 'userProp',

package/es/icon/iconFont.js

@@ -24,14 +24,13 @@ var IconFont = function IconFont(props) {
   return /*#__PURE__*/React.createElement("span", _objectSpread({
     className: iconClassName,
     style: {
-      fontSize: "".concat(props.size, "px")
+      fontSize: props.size ? "".concat(props.size, "px") : 'inherit'
     }
   }, rest));
 };
 
 IconFont.defaultProps = {
   className: '',
-  family: 'bsicon',
-  size: 16
+  family: 'bsicon'
 };
 export default IconFont;

package/es/mock/user.d.ts

@@ -8,6 +8,9 @@ declare const _default: ({
     type: number;
     alias_name: null;
     subtype?: undefined;
+    encryption_type?: undefined;
+    hidden?: undefined;
+    isMultiple?: undefined;
 } | {
     dimension_sub: string;
     subtype: number;
@@ -18,5 +21,21 @@ declare const _default: ({
     category: string;
     type: number;
     alias_name: null;
+    encryption_type?: undefined;
+    hidden?: undefined;
+    isMultiple?: undefined;
+} | {
+    dimension_sub: string;
+    encryption_type: number;
+    hidden: number;
+    value_dict: boolean;
+    name: string;
+    isMultiple: number;
+    id: number;
+    text: string;
+    category: string;
+    type: number;
+    alias_name: string;
+    subtype?: undefined;
 })[];
 export default _default;

package/es/mock/user.js

@@ -215,4 +215,52 @@ export default [{
   category: 'fixed',
   type: 2,
   alias_name: null
+}, {
+  dimension_sub: 'user_attr',
+  encryption_type: 0,
+  hidden: 0,
+  value_dict: false,
+  name: '电话',
+  isMultiple: 0,
+  id: 22,
+  text: '电话',
+  category: 'custom',
+  type: 1,
+  alias_name: ''
+}, {
+  dimension_sub: 'user_attr',
+  encryption_type: 0,
+  hidden: 0,
+  value_dict: false,
+  name: '性别',
+  isMultiple: 0,
+  id: 24,
+  text: '性别',
+  category: 'custom',
+  type: 1,
+  alias_name: ''
+}, {
+  dimension_sub: 'user_attr',
+  encryption_type: 0,
+  hidden: 0,
+  value_dict: false,
+  name: '年龄',
+  isMultiple: 0,
+  id: 25,
+  text: '年龄',
+  category: 'custom',
+  type: 2,
+  alias_name: ''
+}, {
+  dimension_sub: 'user_attr',
+  encryption_type: 0,
+  hidden: 0,
+  value_dict: false,
+  name: '地址',
+  isMultiple: 0,
+  id: 21,
+  text: '地址',
+  category: 'custom',
+  type: 1,
+  alias_name: ''
 }];

package/es/select/handle.js

@@ -105,7 +105,7 @@ var SelectHandle = /*#__PURE__*/React.forwardRef(function (props, ref) {
 
   return /*#__PURE__*/React.createElement("div", {
     ref: handleRef,
-    className: "".concat(classPrefix, "-input ").concat(classPrefix, "-single-input ").concat(props.theme ? props.theme : '', "\n      ").concat(props.disable ? 'disable' : '', " ").concat(focus ? 'active' : '', " \n      ").concat(border ? '' : 'borderless', " ").concat(props.size ? props.size : ''),
+    className: "".concat(classPrefix, "-input ").concat(classPrefix, "-single-input ").concat(props.theme ? props.theme : '', "\n      ").concat(props.disable ? 'disable' : '', " ").concat(focus ? 'active' : '', " \n      ").concat(border ? '' : 'borderless', " ").concat(props.size ? props.size : 'middle'),
     title: props.label || props.value && props.value[labelField]
   }, props.label || props.value && props.value[labelField] || /*#__PURE__*/React.createElement("span", {
     className: "".concat(classPrefix, "-holder")

package/es/targetConditionGroup/demo/group.js

@@ -112,7 +112,8 @@ export default (function () {
           }
         }
       }, /*#__PURE__*/React.createElement(BizEventSelector, {
-        showAllEvent: showOverview
+        showAllEvent: showOverview,
+        border: false
       })));
     }), fields.length < 5 && /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement("div", {
       className: "biz-add-btn ".concat(enableAdd ? '' : 'disabled'),

package/es/targetConditionGroup/demo/index.js

@@ -58,6 +58,7 @@ export default (function () {
     onChange: onChange,
     max: 3
   }, /*#__PURE__*/React.createElement(BizEventSelector, {
-    showAllEvent: true
+    showAllEvent: true,
+    border: false
   }))), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("p", null, "\u5F53\u524D\u503C\uFF1A", JSON.stringify(target)));
 });

package/es/targetSelector/styles/index.less

@@ -26,11 +26,11 @@
   }
 
   &-option-icon {
-    display: none;
+    // display: none;
     flex: none;
     width: @icon-width;
     color: @text-color-secondary;
-    line-height: 2em;
+    line-height: @height-base;
     text-align: center;
     border-radius: @border-radius-small;
 

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

@@ -36,7 +36,6 @@
   .biz-condition-item-panel {
     .biz-condition-item-input {
       .ant-input {
-        height: 40px;
         border: none;
       }
     }

package/es/userCondition/conditions/textDesc.js

@@ -123,7 +123,7 @@ var Text = function Text(props) {
       }
     }, period, /*#__PURE__*/React.createElement("span", {
       className: "".concat(classPrefix, "-text-desc-value")
-    }, event.name), attrs, runtimes);
+    }, event.alias || event.name), attrs, runtimes);
   }
 
   function renderAttrs(event, attrs) {

package/es/userCondition/demo/index.js

@@ -276,7 +276,6 @@ export default (function () {
   }
 
   var descDom = /*#__PURE__*/React.createElement(BizUserCondition, {
-    textMode: true,
     defaultValue: defaultValue,
     onChange: onChange,
     eventAttrNum: 3,

package/es/userTagsSelector/index.js

@@ -99,6 +99,7 @@ var UserTagsSelect = function UserTagsSelect(props) {
     value: handleValue,
     labelField: labelFields[labelFields.length - 1],
     multiple: true,
+    size: "middle",
     placeholder: "\u9009\u62E9\u6807\u7B7E",
     onDelete: onDelete
   }))));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.0.23-alpha.0",
+  "version": "1.0.23-alpha.3",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -58,5 +58,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "0d63dcffad7ca36d53427e53dd5743ef8531c1ad"
+  "gitHead": "73491f0a04a7a45fdb770126900fb2c1ac662a60"
 }