@zgfe/business-lib 1.0.0-beta.6 → 1.0.3

package/es/userGroup/demo/index.js

@@ -12,8 +12,6 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React, { useState } from 'react';
 import { BizUserGroup } from '@zgfe/business-lib';
-import './index.less';
-import { Button, Form } from 'antd';
 var groupOptions = [{
   id: 1,
   name: '用户群1'
@@ -35,79 +33,24 @@ var groupOptions = [{
 }];
 
 var UserGroupDemo = function UserGroupDemo() {
-  var _Form$useForm = Form.useForm(),
-      _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
-      form = _Form$useForm2[0];
-
   var _useState = useState(),
       _useState2 = _slicedToArray(_useState, 2),
       group = _useState2[0],
       setGroup = _useState2[1];
 
-  var _useState3 = useState(null),
-      _useState4 = _slicedToArray(_useState3, 2),
-      group2 = _useState4[0],
-      setGroup2 = _useState4[1];
-
-  var onFinish = function onFinish(values) {
-    setGroup(JSON.stringify(values));
-  };
-
-  var onFinishFailed = function onFinishFailed(errorInfo) {
-    console.log('Failed:', errorInfo);
-  };
-
   var handleChange = function handleChange(value) {
     console.log('change', value);
-  };
-
-  var handleChange2 = function handleChange2(value) {
-    setGroup2(value.name);
+    setGroup(value);
   };
 
   return /*#__PURE__*/React.createElement("div", {
     className: "biz-user-group-demo"
-  }, /*#__PURE__*/React.createElement(Form, {
-    form: form,
-    onFinish: onFinish,
-    onFinishFailed: onFinishFailed,
-    initialValues: {
-      group: 1,
-      group2: {
-        id: 2,
-        name: '用户群2'
-      }
-    }
-  }, /*#__PURE__*/React.createElement(Form.Item, {
-    label: "\u7528\u6237\u7FA4",
-    name: "group"
   }, /*#__PURE__*/React.createElement(BizUserGroup, {
     options: groupOptions,
-    onChange: handleChange
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    label: "\u7528\u6237\u7FA42",
-    name: "group2"
-  }, /*#__PURE__*/React.createElement(BizUserGroup, {
-    options: groupOptions,
-    responseType: 'object',
-    onChange: handleChange
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    wrapperCol: {
-      offset: 8,
-      span: 16
-    }
-  }, /*#__PURE__*/React.createElement(Button, {
-    type: "primary",
-    htmlType: "submit"
-  }, "Submit"))), /*#__PURE__*/React.createElement("p", null, "\u5DF2\u9009\u7528\u6237\u7FA4\uFF1A", group), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(BizUserGroup, {
-    options: groupOptions,
-    responseType: 'object',
-    defaultValue: {
-      id: 2,
-      name: '用户群2'
-    },
-    onChange: handleChange2
-  }), /*#__PURE__*/React.createElement("p", null, "\u5DF2\u9009\u7528\u6237\u7FA4\uFF1A", group2));
+    onChange: handleChange,
+    defaultValue: groupOptions[0],
+    enableDelete: true
+  }), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("p", null, "\u5DF2\u9009\u7528\u6237\u7FA4\uFF1A", JSON.stringify(group)));
 };
 
 export default (function () {

package/es/userGroup/index.d.ts

@@ -1,79 +1,5 @@
 import React from 'react';
-import './index.less';
-import { Option } from 'antd/lib/mentions';
-interface Option {
-    [prop: string]: any;
-}
-interface UserGroupProps {
-    /**
-     * @description       若组件是表单选项，value就是form的initialValues，也是组件的默认选项
-     * @description.zh-CN
-     * @default           -
-     */
-    value?: string | number | Option | null;
-    /**
-     * @description       默认选项
-     * @description.zh-CN
-     * @default           -
-     */
-    defaultValue?: string | number | Option | null;
-    /**
-     * @description       返回数据类型
-     * @description.zh-CN  id | object
-     * @default          id
-     */
-    responseType?: string;
-    /**
-     * @description       禁选数组
-     * @description.zh-CN  id | object []
-     * @default          -
-     */
-    disabled?: Array<string | number>;
-    /**
-     * @description       自定义节点 label、value 的字段
-     * @description.zh-CN
-     * @default           -
-     */
-    fieldNames?: {
-        label: string;
-        value: string;
-    };
-    /**
-     * @description       数据化配置选项内容
-     * @description.zh-CN
-     * @default           { label: 'name', value: 'id' }
-     */
-    options: Option[];
-    /**
-     * @description       选中 option 时，调用此函数
-     * @description.zh-CN
-     * @default
-     */
-    onChange?: (option: string | number | object, value: string | number | object, index: number) => void;
-    /**
-     * @description       删除选择框
-     * @description.zh-CN
-     * @default           -
-     */
-    onDelete?: () => void;
-    /**
-     * @description       是否展示删除按钮
-     * @description.zh-CN
-     * @default           false
-     */
-    showDeleteIcon?: boolean;
-    /**
-     * @description       选择框是第几个
-     * @description.zh-CN
-     * @default           0
-     */
-    index?: number;
-    /**
-     * @description       选择框默认文本
-     * @description.zh-CN
-     * @default           请选择
-     */
-    placeholder?: string;
-}
-declare const BizUserGroup: React.FC<UserGroupProps>;
+import './styles/index.less';
+import { UserGroupTypes } from './types';
+declare const BizUserGroup: React.FC<UserGroupTypes.Props>;
 export default BizUserGroup;

package/es/userGroup/index.js

@@ -1,17 +1,3 @@
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 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."); }
@@ -24,110 +10,76 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
-import { Select, Tooltip } from 'antd';
 import React, { useEffect, useState } from 'react';
-import IconFont from '../components/iconFont';
-import './index.less'; // 单个用户群
+import './styles/index.less';
+import BizSelect from '../select';
+import BizTargetOptionIcon from '../targetSelector/optionIcon';
+import { Skeleton } from 'antd';
 
 var BizUserGroup = function BizUserGroup(props) {
-  var defaultValue = props.defaultValue,
-      value = props.value,
-      disabled = props.disabled,
-      _props$responseType = props.responseType,
-      responseType = _props$responseType === void 0 ? 'id' : _props$responseType,
-      _props$showDeleteIcon = props.showDeleteIcon,
-      showDeleteIcon = _props$showDeleteIcon === void 0 ? false : _props$showDeleteIcon,
-      _props$fieldNames = props.fieldNames,
-      fieldNames = _props$fieldNames === void 0 ? {
-    label: 'name',
-    value: 'id'
-  } : _props$fieldNames,
-      options = props.options,
-      onDelete = props.onDelete,
-      onChange = props.onChange,
-      _props$index = props.index,
-      index = _props$index === void 0 ? 0 : _props$index,
-      _props$placeholder = props.placeholder,
-      placeholder = _props$placeholder === void 0 ? '请选择' : _props$placeholder;
-  var intoValue = defaultValue || value;
-  var selectValue = intoValue && _typeof(intoValue) === 'object' ? intoValue[fieldNames.value] : intoValue;
-
-  var _useState = useState(selectValue),
+  var enableDelete = props.enableDelete,
+      keyField = props.keyField,
+      labelField = props.labelField;
+
+  var _useState = useState(),
       _useState2 = _slicedToArray(_useState, 2),
-      userId = _useState2[0],
-      setUserId = _useState2[1];
+      current = _useState2[0],
+      setCurrent = _useState2[1];
 
-  var _useState3 = useState(options),
+  var _useState3 = useState(true),
       _useState4 = _slicedToArray(_useState3, 2),
-      userOptions = _useState4[0],
-      setUserOptions = _useState4[1];
-
-  var _onChange = function _onChange(value, option) {
-    setUserId(function () {
-      return value;
-    });
-
-    if (onChange) {
-      if (responseType == 'id') {
-        onChange(value, option, index);
-      } else {
-        onChange(option, value, index);
-      }
+      ready = _useState4[0],
+      setReady = _useState4[1];
+
+  var classPrefix = 'biz-user';
+  useEffect(function () {
+    var value = props.defaultValue || props.value;
+
+    if (value) {
+      setCurrent(value);
     }
+
+    setReady(false);
+  }, []);
+
+  var onClickDelete = function onClickDelete() {
+    if (props.onDelete) props.onDelete(current);
+  };
+
+  var onChange = function onChange(value) {
+    setCurrent(value);
+    if (props.onChange) props.onChange(value);
   };
 
-  useEffect(function () {
-    if (!disabled || !disabled.length) return;
-    var selectOptions = options.map(function (item) {
-      if (disabled.indexOf(item[fieldNames.value]) > -1) {
-        if (userId && item[fieldNames.value] == userId) {
-          delete item.disabled;
-        } else {
-          item.disabled = true;
-        }
-      } else {
-        delete item.disabled;
-      }
-
-      return _objectSpread({}, item);
-    });
-    setUserOptions(function () {
-      return _toConsumableArray(selectOptions);
-    });
-  }, [disabled]);
   return /*#__PURE__*/React.createElement("div", {
-    className: "biz-select-cotainer"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "biz-select-content"
-  }, /*#__PURE__*/React.createElement(Select, {
-    className: "biz-select",
-    bordered: false,
-    showArrow: false,
-    defaultValue: userId,
-    listHeight: 500,
-    listItemHeight: 48,
-    fieldNames: fieldNames,
-    options: userOptions,
-    onChange: _onChange,
-    placeholder: placeholder
-  }), /*#__PURE__*/React.createElement(IconFont, {
-    className: "biz-select-zhankai",
-    type: 'icon-xiangxia'
-  })), showDeleteIcon && /*#__PURE__*/React.createElement("div", {
-    className: "biz-option-icon biz-option-icon-delete",
-    onClick: onDelete
-  }, /*#__PURE__*/React.createElement(Tooltip, {
-    title: function title() {
-      return '删除';
-    },
-    color: "#242541",
-    key: 'delete'
-  }, /*#__PURE__*/React.createElement(IconFont, {
-    className: "biz-icon-delete",
-    type: 'icon-qingchu'
-  }))));
+    className: classPrefix
+  }, /*#__PURE__*/React.createElement(Skeleton, {
+    loading: ready,
+    active: true,
+    paragraph: {
+      rows: 1
+    }
+  }, /*#__PURE__*/React.createElement(BizSelect, {
+    value: current,
+    options: props.options,
+    keyField: keyField,
+    labelField: labelField,
+    theme: "secondary",
+    border: false,
+    disableItemList: props.disableItemList,
+    onChange: onChange,
+    overlayWidth: 284
+  }), /*#__PURE__*/React.createElement(BizTargetOptionIcon, {
+    name: "delete",
+    icon: "icon-qingchu",
+    title: "\u5220\u9664",
+    enabled: enableDelete,
+    onClick: onClickDelete
+  })));
 };
 
+BizUserGroup.defaultProps = {
+  keyField: 'id',
+  labelField: 'name'
+};
 export default BizUserGroup;

package/es/userGroup/styles/index.less

@@ -0,0 +1,20 @@
+@import '../../assets/styles/inner.less';
+
+.biz-user {
+  position: relative;
+  display: flex;
+  .__select-handle();
+
+  .biz-select-handle {
+    flex: 1;
+    width: 100%;
+    padding: 0;
+    border: none;
+    border-radius: 0;
+  }
+  &:hover {
+    .biz-target-select-option-icon {
+      display: inline-block;
+    }
+  }
+}

package/es/userGroup/types.d.ts

@@ -0,0 +1,15 @@
+import { BizSelectTypes } from '../select/types';
+export declare namespace UserGroupTypes {
+    interface Props {
+        defaultValue?: BizSelectTypes.Option;
+        value?: BizSelectTypes.Option;
+        className?: string;
+        options: BizSelectTypes.Option[];
+        labelField?: string;
+        keyField?: string;
+        enableDelete?: boolean;
+        disableItemList?: BizSelectTypes.Option[];
+        onChange?: (val: BizSelectTypes.Option) => void;
+        onDelete?: (val?: BizSelectTypes.Option) => void;
+    }
+}

package/es/userGroup/types.js

@@ -0,0 +1 @@
+export {};

package/es/utils/ajax.js

@@ -6,9 +6,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import axios from 'axios';
 var history = {
-  // ajax历史记录
-  option: [// 等待队列
-  {
+  option: [{
     resolve: null,
     reject: null
   }]
@@ -19,8 +17,7 @@ var timer = {
     cancel: null,
     reject: function reject() {}
   }
-}; // 计时器管理
-
+};
 var CancelToken = axios.CancelToken;
 
 var _request = function _request(ajax) {
@@ -28,30 +25,21 @@ var _request = function _request(ajax) {
     var option = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
       url: '',
       responseOnce: false,
-
-      /**
-       * 指定unique后，代表同一时间内，该url的请求只能存在一个（取消前置请求）
-       * 当值为字符串时，url+unique值共同组成timer的key，以此来作为相同请求的判定
-       */
       unique: false,
-      delay: 0 // 延时请求(unique的配合参数)
-
+      delay: 0
     };
     return new Promise(function (resolve, reject) {
-      // 如果请求返回之前，同样的请求传递过来，则在返回中将后续请求一并resolve，而不再重复发送请求到服务器
       var key = JSON.stringify(option);
       var timerKey = option.url + '_' + (Object.prototype.toString.call(option.unique) === '[object String]' ? option.unique : '');
 
       if (option.unique && timer[timerKey]) {
-        // 如果查询已存在，则取消前一个请求
         clearTimeout(timer[timerKey].id);
 
         if (timer[timerKey].cancel) {
           timer[timerKey].cancel();
         } else {
           var cancel = new Error('cancel: before request');
-          cancel.__CANCEL__ = true; // 兼容axios的判断
-
+          cancel.__CANCEL__ = true;
           timer[timerKey].reject(cancel);
         }
 
@@ -99,14 +87,11 @@ var _request = function _request(ajax) {
           request();
         }
       } else if (option.responseOnce) {
-        // 如果已经有相同请求在进行，且responseOnce，则以cancel形式取消该请求
         var _cancel = new Error('cancel: before request');
 
-        _cancel.__CANCEL__ = true; // 兼容axios的判断
-
+        _cancel.__CANCEL__ = true;
         reject(_cancel);
       } else {
-        // 有相同请求，但是请求需要以正常结果返回，则加入请求队列，第一个请求响应后一并响应
         history[key].push({
           resolve: resolve,
           reject: reject

package/es/utils/type.d.ts

@@ -1,3 +1,4 @@
+import { PropType } from '../attributeSelector/types';
 export interface Event {
     value?: string | number;
     label?: string | number;
@@ -7,48 +8,45 @@ export interface EventType {
     aliasName?: string;
     option?: string | number | Event;
 }
-interface EventProps {
-    attrId?: string;
-    event_id: string | number;
-    event_name: string;
-    event_attrs: Array<AttrsListProps>;
-    dimensionId?: string;
-    [prop: string]: any;
-}
-interface AttrsListProps {
-    value?: string | number;
-    text?: string;
-    attr_id?: string | number;
-    attr_name?: string;
-    alias_name?: string | null;
-    prop_type?: string | number;
-    icon?: string;
-    value_dict?: boolean;
-    hidden?: boolean | number;
-    dimension_sub?: string | number;
-    [prop: string]: any;
-}
-export interface EventGroupProps {
-    groupName: string | null;
-    groupId: string | number;
-    eventList?: Array<EventProps>;
-    [prop: string]: any;
-}
-interface AppInfoProps {
-    appId?: string | number;
-    platform?: string;
-    [prop: string]: any;
-}
-export interface EventMetaProps {
-    event?: Array<EventGroupProps>;
-    user?: Array<object>;
-    env?: Array<object>;
-}
-export interface GlobalContextProps {
-    userGroups?: Array<any>;
-    eventMeta?: Array<EventGroupProps>;
-    userProps?: Array<any>;
-    eventEnv?: Array<any>;
-    appInfo?: AppInfoProps;
+export declare namespace OldSystem {
+    interface EventGroup {
+        groupId: number;
+        groupName?: string;
+        eventList: Event[];
+    }
+    interface Event {
+        event_id: number;
+        event_name: string;
+        alias_name?: string;
+        click_analysis: boolean;
+        event_attrs: EventProp[];
+        event_hidden: boolean;
+        event_type: number;
+        insert_time: string;
+        is_delete: boolean;
+        is_stop: boolean;
+        plats: number[];
+    }
+    interface EventProp {
+        alias_name?: string;
+        attr_id: number;
+        attr_name: string;
+        dimension_sub: 'event_attr';
+        encryption_type: 0 | 1;
+        event_id: number;
+        hidden: boolean;
+        is_stop: boolean;
+        prop_type: PropType;
+    }
+    interface UserProp {
+        alias_name?: string;
+        category: 'fixed' | 'custom';
+        dimension_sub: string;
+        name: string;
+        text: string;
+        type: PropType;
+        subtype?: number;
+    }
+    interface EnvProp extends UserProp {
+    }
 }
-export {};

package/es/utils/util.d.ts

@@ -9,12 +9,6 @@ declare let util: {
     isFunction(obj: any): boolean;
     isEqual(a?: {}, b?: {}): boolean;
     equal(a: any, b: any): boolean;
-    /**
-     * 获取指定范围的随机数
-     * @param min
-     * @param max
-     * @returns {*}
-     */
     random(min: number, max: number): number;
     guid(): string;
     mergeObject(defaults: {
@@ -24,44 +18,16 @@ declare let util: {
     }): {
         [x: string]: any;
     };
-    /**
-     * 将数字转为千分位分割格式
-     * @param num
-     * @returns {string}
-     */
     toThousands(num: number): string;
-    /**
-     * 为单数前补0
-     * @param num
-     * @returns {string}
-     */
     toDoubleNumber(num: number): string;
-    /**
-     * 日期格式化
-     * @param date
-     * @param formatter
-     * @returns {string}
-     */
     dateFormat(date?: any, formatter?: string): string;
-    /**
-     * 日期格式化
-     * @param date
-     * @param formatter
-     * @returns {string}
-     */
     timeFormat(date: any, formatter: string | undefined, autoShort: any): string | undefined;
-    /**
-     * 从中间拆分字符串,长度超出的话，解析为xxx...xxx
-     * @param str
-     * @param config
-     * @returns {string}
-     */
     strMiddleSplit(str: string, config?: {
         maxLength: number;
         beginLength: number;
         endLength: number;
         replaceStr: string;
     }): string;
-    setHighLight(content: string, search: string): string;
+    setHighLight(content: string, search: string, wrapper: (text: string, key: string) => any): any[];
 };
 export default util;