@zgfe/business-lib 1.0.0-beta.3 → 1.0.0-beta.4

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

@@ -0,0 +1,13 @@
+import { DataProps } from '../type';
+export declare const formatPieData: (data: DataProps, showAll: boolean, showMap: {
+    [x: string]: any;
+}, showList?: any[] | undefined) => {
+    name: string;
+    value: number;
+}[];
+export declare const formatChartData: (data: DataProps, reverseXAxis: boolean, showMap: {
+    [x: string]: any;
+}, showList?: any[] | undefined) => {
+    x_axis: string[];
+    series: any;
+};

package/es/chart/util/formatData.js

@@ -0,0 +1,56 @@
+import { chartColors } from './color';
+export var formatPieData = function formatPieData(data, showAll, showMap, showList) {
+  var list = [];
+  var other = {
+    name: '其它',
+    value: 0
+  };
+  data.series.forEach(function (item) {
+    var series = {
+      name: item.names.join('-'),
+      value: item.values[0]
+    };
+
+    if (showAll) {
+      list.push(series);
+    } else {
+      if (showList && showMap[series.name] || !showList && list.length < 10) {
+        // 数据被showList命中，或者没定义showList，但位于前十的记录
+        list.push(series);
+      } else {
+        other.value += item.values[0];
+      }
+    }
+  });
+  if (!showAll && other.value > 0) list.push(other);
+  return list;
+};
+export var formatChartData = function formatChartData(data, reverseXAxis, showMap, showList) {
+  if (reverseXAxis) {
+    var x_axis = [];
+    var sData = [];
+    data.series.forEach(function (seriesItem, index) {
+      x_axis.push(seriesItem.names.join('-'));
+
+      if (reverseXAxis && showList && !showMap[data.series[index].names.join('-')]) {
+        return;
+      }
+
+      sData.push({
+        name: x_axis[index],
+        value: seriesItem.values[0],
+        itemStyle: {
+          normal: {
+            color: chartColors[sData.length]
+          }
+        }
+      });
+    });
+    return {
+      x_axis: x_axis,
+      series: sData
+    };
+  } else {
+    return data;
+  }
+};

package/es/chart/util/{format.d.ts → formatOption.d.ts}

@@ -1,4 +1,5 @@
 declare const tooltipFormatterDefault: (params: any) => string;
 declare const yAxisFormatterDefault: (value: number) => string;
 declare const xAxisFormatterDefault: (value: string) => string;
-export { tooltipFormatterDefault, xAxisFormatterDefault, yAxisFormatterDefault };
+declare const mapTooltipFormatter: (params: any) => string | undefined;
+export { tooltipFormatterDefault, xAxisFormatterDefault, yAxisFormatterDefault, mapTooltipFormatter, };

package/es/chart/util/{format.js → formatOption.js}

@@ -58,4 +58,34 @@ var xAxisFormatterDefault = function xAxisFormatterDefault(value) {
   }
 };
 
-export { tooltipFormatterDefault, xAxisFormatterDefault, yAxisFormatterDefault };
+var mapTooltipFormatter = function mapTooltipFormatter(params) {
+  console.log('t00l>>', params);
+  if (params.data === null || params.data === undefined) return;
+  var data = params.data;
+
+  if (data.childrenOptions && data.childrenOptions.length) {
+    var series = [];
+    var childrenOptions = data.childrenOptions;
+    childrenOptions.forEach(function (option) {
+      var label = option.name || option.names.join('-');
+      var value = option.value || option.values;
+
+      if (util.isArray(value)) {
+        value = value[value.length - 1];
+      }
+
+      series.push("<div class=\"biz-chart-tooltip-item\"><span class=\"biz-chart-tooltip-content\">".concat(label, ": </span><span class=\"biz-chart-tooltip-value\" style=\"color:#66ccff;\">").concat(util.toThousands(value), "</span></div>"));
+    });
+    return "".concat(series.join('<br/>'));
+  }
+
+  var dataValue = data.value || data.values;
+
+  if (util.isArray(dataValue)) {
+    dataValue = dataValue[dataValue.length - 1];
+  }
+
+  return "<div class=\"biz-chart-tooltip-item\"><span class=\"biz-chart-tooltip-content\">".concat(data.name || data.names.join('-'), ": </span><span style=\"color:#66ccff;\">").concat(util.toThousands(dataValue), "</span></div>");
+};
+
+export { tooltipFormatterDefault, xAxisFormatterDefault, yAxisFormatterDefault, mapTooltipFormatter };

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

@@ -0,0 +1,8 @@
+import { DataProps, ItemDataProps } from '../type';
+declare const citySeries: (mapStore: DataProps, haveUserGroup: boolean) => ItemDataProps[];
+declare const provinceSeries: (data: DataProps, haveUserGroup?: boolean | undefined) => any;
+declare const maxMinValue: (series: ItemDataProps) => {
+    max: number;
+    min: number;
+};
+export { provinceSeries, citySeries, maxMinValue };

package/es/chart/util/mapUtil.js

@@ -0,0 +1,195 @@
+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 _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+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 _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+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); }
+
+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; }
+
+import util from '../../utils/util';
+import cityGeoCoord from './data/cityGeoCoord';
+import provinceGeoCoord from './data/provinceGeoCoord';
+
+var citySeries = function citySeries(mapStore, haveUserGroup) {
+  var backGroundMapSeries = {
+    type: 'map',
+    map: 'china',
+    showLegendSymbol: false,
+    top: 20,
+    bottom: 20,
+    data: [] // 省份着色背景地图数据
+
+  };
+  var scatterSeries = {
+    name: '',
+    type: 'scatter',
+    coordinateSystem: 'geo',
+    symbolSize: 8,
+    data: [] // 城市散点图数据
+
+  };
+  var provinceMapData = {};
+  mapStore.x_axis.forEach(function (xItem, i) {
+    scatterSeries.name = xItem;
+    mapStore.series.forEach(function (cityItem) {
+      var cityName = cityItem.names[cityItem.names.length - 1];
+      cityName = cityName.replace(/(市|省|自治区)$/, '');
+      var cityCoordObj = cityGeoCoord[cityName]; // 城市坐标对象
+
+      if (cityCoordObj) {
+        var cityValue = cityItem.values[i];
+        var scatterItem = {
+          name: cityCoordObj.name,
+          isCity: true,
+          value: [cityCoordObj.log, cityCoordObj.lat, cityValue],
+          childrenOptions: cityItem.userGroupCompareData
+        };
+        scatterSeries.data.push(scatterItem); // 计算省份数据，注有用户群对比时，因无法去重，导致省份数据不准，目前省份数据只做颜色区分，不做数据展示，后续产品方案会修改
+
+        var provinceObj = cityCoordObj.province; // 省份坐标对象
+
+        var provinceName = provinceObj ? provinceObj.name.replace(/(省|市)$/, '') : '';
+        var currentMapData = provinceMapData[provinceName];
+        var currentMapOptions = currentMapData ? currentMapData.childrenOptions : [];
+        provinceMapData[provinceName] = {
+          name: provinceName,
+          isProvince: true,
+          value: currentMapData ? currentMapData.value + cityValue : cityValue,
+          childrenOptions: currentMapOptions.concat(haveUserGroup ? cityItem.userGroupCompareData : [cityItem])
+        };
+      }
+    });
+  });
+
+  for (var j in provinceMapData) {
+    backGroundMapSeries.data.push(_objectSpread({
+      itemStyle: {
+        color: '#ccccef',
+        opacity: 0.5
+      }
+    }, provinceMapData[j]));
+  }
+
+  return [scatterSeries, backGroundMapSeries];
+};
+
+var provinceSeries = function provinceSeries(data, haveUserGroup) {
+  var series = [];
+  var mapStore = formatData(data, haveUserGroup);
+  mapStore.x_axis.forEach(function (xItem, i) {
+    var item = {
+      name: xItem,
+      type: 'map',
+      map: 'china',
+      roam: false,
+      top: 20,
+      bottom: 20,
+      label: {
+        show: true,
+        color: '#565656' // formatter: (params: { name: string }) => {
+        //     return params.name.replace(/(市|省|自治区|维吾尔自治区|特别行政区|壮族自治区|回族自治区)$/, '')
+        // }
+
+      },
+      showLegendSymbol: false,
+      data: []
+    };
+    mapStore.series.forEach(function (provinceItem) {
+      var name = provinceItem.name || provinceItem.names;
+      var provinceName = _typeof(name) === 'object' ? name[name.length - 1] : name;
+      provinceName = provinceName.replace(/(市|省|自治区)$/, '');
+      var provinceCoordObj = provinceGeoCoord[provinceName];
+      name = _typeof(name) === 'object' ? name.join('-') : name;
+      name = name.replace(/(市|省|自治区)$/, '');
+
+      if (provinceCoordObj) {
+        // 过滤json库中不存在的省
+        item.data.push({
+          name: name,
+          isProvince: true,
+          value: provinceItem.values[i],
+          childrenOptions: provinceItem.userGroupCompareData
+        });
+      }
+    });
+    series.push(item);
+  });
+  return series;
+};
+
+var maxMinValue = function maxMinValue(series) {
+  var max = 100;
+  var min = 0;
+  var valueArr = [];
+  series.data.forEach(function (item) {
+    var value = item.hasOwnProperty('value') ? item.value : item.values;
+
+    if (util.isArray(value)) {
+      value = value[value.length - 1];
+    }
+
+    valueArr = valueArr.concat([value]);
+  });
+
+  if (valueArr.length) {
+    max = Math.max.apply(Math, _toConsumableArray(valueArr));
+    min = Math.min.apply(Math, _toConsumableArray(valueArr));
+  }
+
+  if (max <= min) {
+    max = min + 1;
+  }
+
+  return {
+    max: max,
+    min: min
+  };
+};
+
+var formatData = function formatData(seriesData, haveUserGroup) {
+  if (haveUserGroup) {
+    // 有用户群时增加userGroupCompareData
+    var store = {
+      x_axis: seriesData.x_axis,
+      series: []
+    };
+    var areaObjMap = {};
+    seriesData.series.forEach(function (item) {
+      var areaName = item.names[item.names.length - 1];
+
+      if (!areaObjMap[areaName]) {
+        areaObjMap[areaName] = {
+          names: [areaName],
+          values: item.values,
+          userGroupCompareData: [item]
+        };
+      } else {
+        // 注：当有用户群对比时，此区域的values粗略计算为各用户群相加之和（此处未去重，因数据不准目前只做颜色展示，后续产品会修改）
+        areaObjMap[areaName].values = [areaObjMap[areaName].values[0] + item.values[0]];
+        areaObjMap[areaName].userGroupCompareData.push(item);
+      }
+    });
+
+    for (var area in areaObjMap) {
+      store.series.push(areaObjMap[area]);
+    }
+
+    return store;
+  } else {
+    return seriesData;
+  }
+};
+
+export { provinceSeries, citySeries, maxMinValue };

package/es/select/demo/index.js

@@ -21,7 +21,8 @@ var options = [{
   value: 'test2'
 }, {
   label: 'test3',
-  value: 'test3'
+  value: 'test3',
+  disabled: true
 }];
 export default (function () {
   var _useState = useState('test2'),

package/es/select/index.js

@@ -146,7 +146,8 @@ var BizSelect = function BizSelect(props) {
   }), currentOption.map(function (item) {
     return /*#__PURE__*/React.createElement(Option, {
       value: item[fieldNames.value] || item,
-      key: item[fieldNames.value] || item
+      key: item[fieldNames.value] || item,
+      disabled: item.disabled
     }, item.icon && /*#__PURE__*/React.createElement(IconFont, {
       style: {
         marginRight: '7px',

package/es/targetConditionGroup/data/operates.js

@@ -72,13 +72,13 @@ export var dimensionOperate = [{
   value: 'number'
 }, {
   name: '次数',
-  value: 'count'
+  value: 'times'
 }, {
   name: '活跃比',
-  value: 'ratio'
+  value: 'active_ratio'
 }, {
   name: '人均次数',
-  value: 'perTimes'
+  value: 'per'
 }, {
   name: '金额',
   value: 'money',
@@ -87,10 +87,10 @@ export var dimensionOperate = [{
     value: 'sum'
   }, {
     name: '均值',
-    value: 'mean'
+    value: 'avg'
   }, {
     name: '分布',
-    value: 'distribution'
+    value: 'duration_times'
   }, {
     name: '中位数',
     value: 'median'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.4",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",