@zgfe/business-lib 1.1.11 → 1.1.13-alpha.0

package/es/addToPanel/index.js

@@ -119,6 +119,7 @@ var BizAddToPanel = function BizAddToPanel(props) {
 
     if (props.type === 'edit') {
       data = {
+        name: form.name,
         panel_id: form.panel.id,
         element_id: props.elementId,
         web_data: JSON.stringify(resData)

package/es/chart/styles/index.less

@@ -1,7 +1,9 @@
 @import '../../assets/styles/variable.less';
 
 .biz-chart-tooltip {
+  max-height: 324px;
   padding: @padding-xs;
+  overflow: auto;
   background-color: rgba(250, 251, 253, 0.8);
   border-color: transparent;
   backdrop-filter: blur(4px);
@@ -18,7 +20,7 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
-    height: @height-sm;
+    min-height: @height-sm;
     padding: 0px @padding-xs;
     font-size: @font-size-sm;
     background: @white;
@@ -30,15 +32,22 @@
     }
 
     .biz-chart-tooltip-content {
+      display: flex;
+      align-items: center;
       color: @text-color-secondary;
 
       .biz-tooltip-marker {
-        display: inline-block;
         width: 8px;
         height: 8px;
         margin-right: @margin-xs;
         border-radius: 50%;
       }
+      .biz-tooltip-name {
+        max-width: 300px;
+        white-space: pre-wrap;
+        word-wrap: break-word;
+        word-break: break-all;
+      }
     }
 
     .biz-chart-tooltip-value {

package/es/chart/util/chartOptionConfig.js

@@ -41,7 +41,12 @@ export var legendConfig = {
     color: '#5F6085'
   },
   tooltip: {
-    show: true
+    show: true,
+    formatter: function formatter(param) {
+      var maxLength = 20;
+      var names = param.name.match(new RegExp("\\S{1,".concat(maxLength, "}"), 'g'));
+      return names ? names.join('<br/>') : '';
+    }
   }
 };
 export var gridConfig = {
@@ -87,6 +92,7 @@ export var yAxisConfig = {
 };
 export var tooltipConfig = {
   trigger: 'axis',
+  enterable: true,
   confine: false,
   backgroundColor: 'rgba(250, 251, 253, 0.8)',
   borderColor: 'transparent',

package/es/chart/util/formatData.js

@@ -28,7 +28,7 @@ export var formatPieData = function formatPieData(data, showAll, showList) {
 };
 export var formatChartData = function formatChartData(data, showAll, showList, reverseXAxis, color) {
   var showMap = getShowMap(showList);
-  var x_axis = reverseXAxis ? [] : data.x_axis;
+  var x_axis = reverseXAxis && data.series.length ? [] : data.x_axis;
   var sData = [];
   var colorData = color || chartColors;
   data.series.forEach(function (seriesItem) {

package/es/chart/util/formatOption.js

@@ -27,7 +27,7 @@ var tooltipFormatterDefault = function tooltipFormatterDefault(params) {
     }
 
     var name = (params.length > 1 ? item.seriesName : item.data && item.data.label ? item.data.label : item.name).trim();
-    htmlArray.push("<div class=\"biz-chart-tooltip-item\">\n          <span class=\"biz-chart-tooltip-content\">\n              <span class=\"biz-tooltip-marker\" style=\"background:".concat(item.color, "\"></span>").concat(name, "\n          </span> \n          <span class=\"biz-chart-tooltip-value\">").concat(lineLabel, "</span>\n        </div>"));
+    htmlArray.push("<div class=\"biz-chart-tooltip-item\">\n          <div class=\"biz-chart-tooltip-content\">\n              <span class=\"biz-tooltip-marker\" style=\"background:".concat(item.color, "\"></span>\n              <div class=\"biz-tooltip-name\">").concat(name, "</div>\n          </div> \n          <span class=\"biz-chart-tooltip-value\">").concat(lineLabel, "</span>\n        </div>"));
   });
   return htmlArray.join('');
 };

package/es/select/index.js

@@ -94,7 +94,7 @@ var BizSelect = function BizSelect(props) {
   useEffect(function () {
     if (!props.value) return;
     setCurrent(getValue(props.value));
-  }, [props.value]);
+  }, [props.value, props.options]);
 
   var getValue = function getValue(data) {
     if (props.multiple) {

package/es/select/option.js

@@ -1,4 +1,17 @@
-import React from 'react';
+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."); }
+
+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 _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 _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+import { Tooltip } from 'antd';
+import React, { useEffect, useRef, useState } from 'react';
 import { classPrefix } from '.';
 import IconFont from '../icon/iconFont';
 import { util } from '../utils';
@@ -10,6 +23,20 @@ var SelectOption = function SelectOption(props) {
       disabled = props.disabled,
       multiple = props.multiple,
       customLabel = props.customLabel;
+  var optionRef = useRef(null);
+
+  var _useState = useState(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      isOverflow = _useState2[0],
+      setIsOverflow = _useState2[1];
+
+  useEffect(function () {
+    var _optionRef$current, _optionRef$current2;
+
+    var clientWidth = (_optionRef$current = optionRef.current) === null || _optionRef$current === void 0 ? void 0 : _optionRef$current.clientWidth;
+    var scrollWidth = (_optionRef$current2 = optionRef.current) === null || _optionRef$current2 === void 0 ? void 0 : _optionRef$current2.scrollWidth;
+    setIsOverflow(clientWidth < scrollWidth);
+  }, []);
 
   function onClick() {
     if (disabled) return;
@@ -43,10 +70,13 @@ var SelectOption = function SelectOption(props) {
     }), /*#__PURE__*/React.createElement("span", null, group.name));
   }
 
-  return /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement(Tooltip, {
+    placement: "rightBottom",
+    title: isOverflow ? option[props.labelField] : null,
+    zIndex: 100000
+  }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-option ").concat(multiple ? classPrefix + '-option-multiple' : '', " ").concat(checked ? 'active' : '', " ").concat(disabled ? 'disabled' : ''),
-    onClick: onClick,
-    title: option[props.labelField]
+    onClick: onClick
   }, multiple && (checked ? /*#__PURE__*/React.createElement(IconFont, {
     className: "".concat(classPrefix, "-checkbox ").concat(classPrefix, "-checked"),
     type: 'a-Property1xuanzhong'
@@ -56,10 +86,11 @@ var SelectOption = function SelectOption(props) {
   })), (option === null || option === void 0 ? void 0 : option.icon) && /*#__PURE__*/React.createElement("span", {
     className: "".concat(classPrefix, "-option-icon")
   }, option === null || option === void 0 ? void 0 : option.icon), /*#__PURE__*/React.createElement("span", {
-    className: "".concat(classPrefix, "-option-label")
+    className: "".concat(classPrefix, "-option-label"),
+    ref: optionRef
   }, renderLabel(option)), !disabled && /*#__PURE__*/React.createElement("span", {
     className: "".concat(classPrefix, "-option-btn")
-  }, props.extra && props.extra(option)));
+  }, props.extra && props.extra(option))));
 };
 
 export default SelectOption;

package/es/targetConditionGroup/index.js

@@ -31,7 +31,8 @@ var BizTargetCondition = function BizTargetCondition(props) {
       setTargetData = _useState2[1];
 
   var _useContext = useContext(BizGlobalDataContext),
-      eventGroupList = _useContext.eventGroupList;
+      _useContext$eventGrou = _useContext.eventGroupList,
+      eventGroupList = _useContext$eventGrou === void 0 ? [] : _useContext$eventGrou;
 
   var _useState3 = useState({
     analysisIndex: 'number'

package/es/userGroup/index.js

@@ -10,11 +10,12 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { useEffect, useState } from 'react';
+import React, { useContext, useEffect, useState } from 'react';
 import './styles/index.less';
 import BizSelect from '../select';
 import BizTargetOptionIcon from '../targetSelector/optionIcon';
 import { Skeleton } from 'antd';
+import BizGlobalDataContext from '../context';
 
 var BizUserGroup = function BizUserGroup(props) {
   var enableDelete = props.enableDelete,
@@ -28,10 +29,15 @@ var BizUserGroup = function BizUserGroup(props) {
 
   var _useState3 = useState(true),
       _useState4 = _slicedToArray(_useState3, 2),
-      ready = _useState4[0],
-      setReady = _useState4[1];
+      loading = _useState4[0],
+      setLoading = _useState4[1];
 
   var classPrefix = 'biz-user';
+
+  var _useContext = useContext(BizGlobalDataContext),
+      _useContext$userGroup = _useContext.userGroupList,
+      userGroupList = _useContext$userGroup === void 0 ? [] : _useContext$userGroup;
+
   useEffect(function () {
     var value = props.defaultValue || props.value;
 
@@ -39,7 +45,7 @@ var BizUserGroup = function BizUserGroup(props) {
       setCurrent(value);
     }
 
-    setReady(false);
+    setLoading(false);
   }, []);
 
   var onClickDelete = function onClickDelete() {
@@ -54,14 +60,14 @@ var BizUserGroup = function BizUserGroup(props) {
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement(Skeleton, {
-    loading: ready,
+    loading: loading,
     active: true,
     paragraph: {
       rows: 1
     }
   }, /*#__PURE__*/React.createElement(BizSelect, {
     value: current,
-    options: props.options,
+    options: props.options || userGroupList,
     keyField: keyField,
     labelField: labelField,
     theme: "secondary",

package/es/userGroup/types.d.ts

@@ -4,7 +4,7 @@ export declare namespace UserGroupTypes {
         defaultValue?: BizSelectTypes.Option;
         value?: BizSelectTypes.Option;
         className?: string;
-        options: BizSelectTypes.Option[];
+        options?: BizSelectTypes.Option[];
         labelField?: string;
         keyField?: string;
         enableDelete?: boolean;

package/es/utils/ajax.js

@@ -59,7 +59,7 @@ function responseErrorHandler(url, apiResult, errorTitle, notifyType) {
   }
 
   if (!apiResult.code) {
-    notification[notifyType || 'error']({
+    notification.error({
       message: "\u63A5\u53E3\u54CD\u5E94\u7ED3\u6784\u5F02\u5E38"
     });
     throw new Error('接口响应结构异常，缺少code');
@@ -77,7 +77,7 @@ function responseErrorHandler(url, apiResult, errorTitle, notifyType) {
 
   if (!flag) {
     message = apiResult.msg || message;
-    notification.error({
+    notification[notifyType || 'error']({
       message: errorTitle || "\u8BF7\u6C42\u9519\u8BEF",
       description: message
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.11",
+  "version": "1.1.13-alpha.0",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -60,5 +60,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "cd765a91987b55cbcbb8694e72dcf0cf10fbfeb3"
+  "gitHead": "63fcf4f2e0e0d79129b80b974bae79b15f4cc65c"
 }