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

package/es/attributeSelector/index.d.ts

@@ -12,6 +12,8 @@ export interface AttrsListProps extends BasicOption {
     value_dict?: boolean;
     hidden?: boolean | number;
     dimension_sub?: string | number;
+    id?: number;
+    label?: string;
     [prop: string]: any;
 }
 interface BasicOption {
@@ -29,8 +31,8 @@ export interface AttributeProps {
      */
     value?: string | number | AttrsListProps | null;
     /**
-     * @description       默认选项
-     * @description.zh-CN
+     * @description       默认选项,
+     * @description.zh-CN  可以是属性，也可以是事件属性的attr_name，其他属性的name -> value
      * @default           -
      */
     defaultValue?: string | number | AttrsListProps | null;

package/es/attributeSelector/index.js

@@ -141,12 +141,17 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
       var eList = group.eventList || [];
       eList.forEach(function (event) {
         event.event_attrs.forEach(function (prop) {
+          // prop.attrId = Math.random().toString();
           prop.id = prop.attr_id;
-          prop.name = prop.alias_name || prop.attr_name || '';
+          prop.label = prop.alias_name || prop.attr_name;
           prop.value = prop.attr_name;
+          prop.type = prop.prop_type;
           prop.dimensionId = [prop.dimension_sub, prop.value].join(','); // 增加属性细分唯一字段，区分同名自定义属性
 
-          prop.attrId = Math.random().toString();
+          prop.isEventProp = true;
+          prop.realTime = true;
+          prop.custom = true;
+          prop.attrType = 'EVENT_PROP';
         });
         var randomId = Math.random().toString(); // 事件（分组）添加锚点id
 
@@ -267,12 +272,21 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
       var userOptions = JSON.parse(JSON.stringify(options && options.user || userProps)); // 添加属性
 
       var userList = userOptions.map(function (prop) {
-        prop.name = prop.alias_name || prop.text;
+        prop.attrId = Math.random().toString();
+        prop.label = prop.alias_name || prop.text;
         prop.value = prop.name;
+        prop.isUserProp = true;
         prop.custom = prop.category === 'custom';
+        prop.attrType = 'USER_PROP'; // 内置属性（名称、类型、诸葛ID 、用户ID）： 实时
+
+        if (prop.name === 'name' || prop.name === 'is_anonymous' || prop.name === 'zg_id' || prop.name === 'app_user_id') {
+          prop.realTime = true;
+        } else {
+          prop.realTime = false;
+        }
+
         prop.dimensionId = [prop.dimension_sub, prop.value].join(','); // 增加属性细分唯一字段，区分同名自定义属性
 
-        prop.attrId = Math.random().toString();
         return prop;
       });
       anchors = _objectSpread(_objectSpread({}, anchors), {}, {
@@ -293,11 +307,15 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
       };
       var envOptions = JSON.parse(JSON.stringify(options && options.env || eventEnv));
       var envList = envOptions.map(function (prop) {
+        prop.attrId = Math.random().toString();
+        prop.label = prop.text;
         prop.value = prop.name;
-        prop.name = prop.text;
         prop.dimensionId = [prop.dimension_sub, prop.value].join(','); // 增加属性细分唯一字段，区分同名自定义属性
 
-        prop.attrId = Math.random().toString();
+        prop.isEnvProp = true;
+        prop.realTime = true;
+        prop.custom = false;
+        prop.attrType = 'ENV_PROP';
         return prop;
       });
       anchors = _objectSpread(_objectSpread({}, anchors), {}, {
@@ -345,11 +363,7 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
       var defaultData;
 
       if (_typeof(intoValue) === 'object') {
-        if (intoValue.attr_id) {
-          defaultData = intoValue.attr_name || '';
-        } else {
-          defaultData = intoValue.name || '';
-        }
+        defaultData = intoValue.value || intoValue.attr_name || intoValue.name || '';
       } else {
         defaultData = intoValue || '';
       }
@@ -427,7 +441,7 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
             res = _objectWithoutProperties(attr, _excluded);
 
         var child = _children.filter(function (item) {
-          return item.name && item.name.indexOf(searchValue) > -1;
+          return item.label && item.label.indexOf(searchValue) > -1;
         });
 
         searchOptions.push(_objectSpread(_objectSpread({}, res), {}, {
@@ -456,7 +470,7 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: "biz-input ".concat(children && 'biz-bg-gray')
-  }, attrs.name ? attrs.name : /*#__PURE__*/React.createElement("span", {
+  }, attrs.label ? attrs.label : /*#__PURE__*/React.createElement("span", {
     className: "biz-placeholder"
   }, placeholder)), /*#__PURE__*/React.createElement(IconFont, {
     className: "biz-select-zhankai",
@@ -537,7 +551,8 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
       var _item$name;
 
       return /*#__PURE__*/React.createElement("div", {
-        key: child.attrId,
+        // key={child.attrId}
+        key: child.dimensionId,
         className: "biz-drop-option biz-drop-index boxBg\n                    ".concat(child.value === attrs.value && 'box-active', "\n                    ").concat(child.value && attrs.value !== child.value && disabled.indexOf(child.value) > -1 && 'box-disabled'),
         onClick: function onClick(e) {
           e.stopPropagation();
@@ -567,7 +582,7 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
         type: "".concat(item.name && item.name.indexOf('用户') > -1 ? 'icon-yonghushuxing' : item.name && ((_item$name = item.name) === null || _item$name === void 0 ? void 0 : _item$name.indexOf('事件')) > -1 ? 'icon-shijianshuxing1' : 'icon-chufahuanjing')
       }), /*#__PURE__*/React.createElement("span", {
         dangerouslySetInnerHTML: {
-          __html: util.setHighLight(child.name || '', searchValue)
+          __html: util.setHighLight(child.label || '', searchValue)
         }
       }));
     });

package/es/chart/demo/bar.js

@@ -9,6 +9,7 @@ export default (function () {
     showList: ['付款成功', '搜索商品', '查看商品详情']
   }), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(BizChart, {
     data: chartData,
-    type: "bar"
+    type: "bar",
+    xRotate: -45
   }));
 });

package/es/chart/index.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { EChartsOption } from 'echarts/types/dist/shared';
 import './util/data/china.js';
 import { DataProps } from './type';
 interface BizChartProps {
@@ -12,6 +13,11 @@ interface BizChartProps {
      * @default         -
      */
     data: DataProps;
+    /**
+     * @description     自定义图表配置
+     * @default         -
+     */
+    option?: EChartsOption;
     /**
      * @description     柱图是同色还是一柱一色（仅对柱图单一系列作用）
      * @default         true
@@ -47,6 +53,16 @@ interface BizChartProps {
      * @default         -
      */
     valueUnit?: string;
+    /**
+     * @description     x轴刻度标签旋转的角度
+     * @default         -
+     */
+    xRotate?: number;
+    /**
+     * @description     y轴刻度标签旋转的角度
+     * @default         -
+     */
+    yRotate?: number;
     /**
      * @description     图例位置
      * @default         -

package/es/chart/index.js

@@ -29,6 +29,7 @@ var BizChart = function BizChart(props) {
   var type = props.type,
       data = props.data,
       showList = props.showList,
+      option = props.option,
       userGroup = props.userGroup,
       _props$showAll = props.showAll,
       showAll = _props$showAll === void 0 ? true : _props$showAll,
@@ -38,6 +39,10 @@ var BizChart = function BizChart(props) {
       reverseXAxis = _props$reverseXAxis === void 0 ? false : _props$reverseXAxis,
       _props$isCity = props.isCity,
       isCity = _props$isCity === void 0 ? true : _props$isCity,
+      _props$xRotate = props.xRotate,
+      xRotate = _props$xRotate === void 0 ? 0 : _props$xRotate,
+      _props$yRotate = props.yRotate,
+      yRotate = _props$yRotate === void 0 ? 0 : _props$yRotate,
       seriesName = props.seriesName,
       tooltipFormatter = props.tooltipFormatter,
       xAxisFormatter = props.xAxisFormatter,
@@ -67,6 +72,13 @@ var BizChart = function BizChart(props) {
     return data;
   }, [showList]);
   useEffect(function () {
+    if (option) {
+      setChartOption(function () {
+        return _objectSpread({}, option);
+      });
+      return;
+    }
+
     var eOption = {};
 
     if (type === 'pie') {
@@ -75,7 +87,7 @@ var BizChart = function BizChart(props) {
     } else if (type === 'line' || type === 'bar') {
       var _rData = formatChartData(data, reverseXAxis, showMap, showList);
 
-      eOption = getChartOption(type, reverseXAxis && showList ? showList : _rData.x_axis, _rData.series, sameColor, legendPosition, legendOrient, valueUnit, tooltipFormatter, xAxisFormatter, yAxisFormatter, reverseXAxis, seriesName);
+      eOption = getChartOption(type, reverseXAxis && showList ? showList : _rData.x_axis, _rData.series, sameColor, legendPosition, legendOrient, valueUnit, xRotate, yRotate, tooltipFormatter, xAxisFormatter, yAxisFormatter, reverseXAxis, seriesName);
     } else if (type === 'map') {
       var series = isCity ? citySeries(data, !!userGroup) : provinceSeries(data, !!userGroup);
       var maxMin = maxMinValue(series[0]);
@@ -86,7 +98,7 @@ var BizChart = function BizChart(props) {
     setChartOption(function () {
       return _objectSpread({}, eOption);
     });
-  }, [data, type, reverseXAxis]);
+  }, [option, data, type, reverseXAxis]);
   return /*#__PURE__*/React.createElement(ReactEChartsCore, {
     echarts: echarts,
     option: chartOption,

package/es/chart/util/chartConfig.d.ts

@@ -31,7 +31,7 @@ export declare const tooltipConfig: TooltipComponentOption;
  * @param seriesName  系列名称
  *
  */
-export declare const getChartOption: (chartType: string, xData?: string[] | undefined, seriesData?: object[], sameColor?: boolean, legendPosition?: 'top' | 'bottom' | 'middle', legendOrient?: 'horizontal' | 'vertical', unit?: string | undefined, tooltipFormatter?: ((value: any) => string) | undefined, xAxisFormatter?: ((value: any) => string) | undefined, yAxisFormatter?: ((value: any) => string) | undefined, reverseXAxis?: boolean | undefined, seriesName?: string | undefined) => EChartsOption;
+export declare const getChartOption: (chartType: string, xData?: string[] | undefined, seriesData?: object[], sameColor?: boolean, legendPosition?: 'top' | 'bottom' | 'middle', legendOrient?: 'horizontal' | 'vertical', unit?: string | undefined, xRotate?: number, yRotate?: number, tooltipFormatter?: ((value: any) => string) | undefined, xAxisFormatter?: ((value: any) => string) | undefined, yAxisFormatter?: ((value: any) => string) | undefined, reverseXAxis?: boolean | undefined, seriesName?: string | undefined) => EChartsOption;
 /**
  * 饼图配置
  * @param seriesData 数据  [{name:'',value:''}]

package/es/chart/util/chartConfig.js

@@ -132,11 +132,13 @@ export var getChartOption = function getChartOption(chartType, xData) {
   var legendPosition = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'top';
   var legendOrient = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 'horizontal';
   var unit = arguments.length > 6 ? arguments[6] : undefined;
-  var tooltipFormatter = arguments.length > 7 ? arguments[7] : undefined;
-  var xAxisFormatter = arguments.length > 8 ? arguments[8] : undefined;
-  var yAxisFormatter = arguments.length > 9 ? arguments[9] : undefined;
-  var reverseXAxis = arguments.length > 10 ? arguments[10] : undefined;
-  var seriesName = arguments.length > 11 ? arguments[11] : undefined;
+  var xRotate = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : 0;
+  var yRotate = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : 0;
+  var tooltipFormatter = arguments.length > 9 ? arguments[9] : undefined;
+  var xAxisFormatter = arguments.length > 10 ? arguments[10] : undefined;
+  var yAxisFormatter = arguments.length > 11 ? arguments[11] : undefined;
+  var reverseXAxis = arguments.length > 12 ? arguments[12] : undefined;
+  var seriesName = arguments.length > 13 ? arguments[13] : undefined;
 
   var xAxis = JSON.parse(JSON.stringify(xAxisConfig)),
       tooltip = JSON.parse(JSON.stringify(tooltipConfig)),
@@ -154,7 +156,7 @@ export var getChartOption = function getChartOption(chartType, xData) {
   xAxis.axisLabel = xAxis.axisLabel || {
     rotate: 0
   };
-  xAxis.axisLabel.rotate = chartType === 'bar' ? 45 : 0;
+  xAxis.axisLabel.rotate = xRotate;
 
   if (xAxisFormatter) {
     xAxis.axisLabel.formatter = xAxisFormatter;
@@ -164,6 +166,7 @@ export var getChartOption = function getChartOption(chartType, xData) {
 
 
   yAxis.axisLabel = yAxis.axisLabel || {};
+  yAxis.axisLabel.rotate = yRotate;
 
   if (yAxisFormatter) {
     yAxis.axisLabel.formatter = yAxisFormatter;
@@ -225,9 +228,9 @@ export var getChartOption = function getChartOption(chartType, xData) {
 
 
   if (legendPosition === 'top') {
-    grid.top = series.length > 1 || series[0].name ? 45 : 10;
+    grid.top = series.length > 1 || series.length > 0 && series[0].name ? 45 : 10;
   } else if (legendPosition === 'bottom') {
-    grid.bottom = series.length > 1 || series[0].name ? 45 : 0;
+    grid.bottom = series.length > 1 || series.length > 0 && series[0].name ? 45 : 0;
   } // 图例配置
 
 

package/es/commonStyle/icon.less

@@ -9,7 +9,7 @@
   line-height: 20px;
   cursor: pointer;
 
-  &:hover {
+  &:not(.biz-disabled):hover {
     color: @hoverColor;
     background: @hoverBgColor;
     border-radius: 3px;
@@ -22,6 +22,15 @@
   .biz-icon-text {
     margin-left: 6px;
   }
+
+  &.biz-disabled {
+    color: @disableColor;
+    cursor: not-allowed;
+
+    span {
+      color: @disableColor;
+    }
+  }
 }
 
 .biz-icon {
@@ -51,15 +60,20 @@
   border-radius: 4px;
   cursor: pointer;
 
-  &:hover {
+  &:not(.biz-disabled):hover {
     color: @hoverColor;
     background-color: @hoverBgColor;
   }
 
-  &.biz-option-icon-delete:hover {
+  &.biz-option-icon-delete:not(.biz-disabled):hover {
     color: @deleteHoverColor;
     background-color: @deleteHoverBgColor;
   }
+
+  &.biz-disabled {
+    color: @disableColor;
+    cursor: not-allowed;
+  }
 }
 
 .biz-btn,
@@ -71,6 +85,7 @@
   line-height: 20px;
   border-radius: 4px;
   cursor: pointer;
+
   .anticon {
     margin-right: 8px;
     font-size: 24px;
@@ -87,6 +102,7 @@
   &:active {
     background: #85adfc;
   }
+
   &:focus {
     background: #1451db;
   }

package/es/commonStyle/theme.less

@@ -240,11 +240,11 @@
 }
 
 .ant-dropdown-menu-item {
-  &:not(.box-active):hover {
+  &:not(.box-active, .ant-dropdown-menu-item-disabled, .ant-dropdown-menu-submenu-title-disabled):hover {
     .box-hover();
   }
 
-  &.box-active:hover {
+  &.box-active:not(.ant-dropdown-menu-item-disabled, .ant-dropdown-menu-submenu-title-disabled):hover {
     .box-active();
   }
 
@@ -252,6 +252,9 @@
     margin-right: 15px;
     font-size: @iconSize;
   }
+  &.ant-dropdown-menu-item-disabled {
+    color: @disableColor;
+  }
 }
 
 /* input-search/clear */

package/es/dialog/index.js

@@ -1,7 +1,13 @@
-var _excluded = ["width", "title", "initialValues", "fields", "visible", "showMark", "layout", "onOk", "onCancel"];
+var _excluded = ["width", "initialValues", "fields", "visible", "showMark", "layout", "onOk", "onCancel"];
 
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
+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 _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."); }
@@ -36,8 +42,6 @@ import BizList from './components/list';
 var BizDialog = function BizDialog(props) {
   var _props$width = props.width,
       width = _props$width === void 0 ? 520 : _props$width,
-      _props$title = props.title,
-      title = _props$title === void 0 ? 'Title' : _props$title,
       initialValues = props.initialValues,
       fields = props.fields,
       _props$visible = props.visible,
@@ -141,11 +145,10 @@ var BizDialog = function BizDialog(props) {
       return _toConsumableArray(fields);
     });
   }, [fields]);
-  return /*#__PURE__*/React.createElement(Modal, {
+  return /*#__PURE__*/React.createElement(Modal, _objectSpread(_objectSpread({
     width: width,
     centered: true,
     visible: visible,
-    title: title,
     maskStyle: {
       background: '#021429',
       opacity: 0.8
@@ -155,7 +158,8 @@ var BizDialog = function BizDialog(props) {
     },
     cancelText: "\u53D6\u6D88",
     okText: "\u786E\u5B9A",
-    closable: false,
+    closable: false
+  }, res), {}, {
     onCancel: function onCancel() {
       return _onCancel && _onCancel();
     },
@@ -166,7 +170,7 @@ var BizDialog = function BizDialog(props) {
         console.log('Validate Failed:', info);
       });
     }
-  }, /*#__PURE__*/React.createElement(Form, {
+  }), /*#__PURE__*/React.createElement(Form, {
     className: "biz-dialog",
     form: form,
     name: "form_in_modal",

package/es/dialog/style/index.less

@@ -52,7 +52,7 @@
 }
 
 .ant-modal-footer {
-  padding-bottom: 32px;
+  padding: 0 24px 24px 24px;
   border-top: none;
 
   .ant-btn + .ant-btn:not(.ant-dropdown-trigger) {
@@ -68,11 +68,13 @@
     color: #000;
     font-weight: 500;
     font-size: 24px;
+    line-height: 24px;
   }
 }
 
 .ant-modal-body {
   max-height: 400px;
+  padding-bottom: 0;
   overflow: auto;
 }
 

package/es/eventSelector/index.d.ts

@@ -17,6 +17,11 @@ interface EventBoxProps extends FormProps {
      * @default         -
      */
     aliasName?: string;
+    /**
+     * @description 是否展示事件概览
+     * @default   true
+     */
+    showAll?: boolean;
     /**
      * @description     选择完成后的回调
      * @default         -