@zgfe/business-lib 1.0.6 → 1.0.9

package/es/analysisLayout/demo/index.js

@@ -19,12 +19,17 @@ var RightContent = function RightContent() {
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("h1", null, "right"));
 };
 
+var onCollapse = function onCollapse(flag) {
+  console.log('是否收起', flag);
+};
+
 var LayoutDemo = function LayoutDemo() {
   return /*#__PURE__*/React.createElement("div", {
     className: "root"
   }, /*#__PURE__*/React.createElement(BizAnalysisLayout, {
     leftPanel: /*#__PURE__*/React.createElement(LeftContent, null),
-    leftHandle: /*#__PURE__*/React.createElement(Footer, null)
+    leftHandle: /*#__PURE__*/React.createElement(Footer, null),
+    onCollapse: onCollapse
   }, /*#__PURE__*/React.createElement(RightContent, null)));
 };
 

package/es/analysisLayout/index.d.ts

@@ -9,6 +9,7 @@ declare type AnalysisLayoutProps = {
     defaultLeftWidth?: number;
     minWidthOfLeft?: number;
     maxWidthOfLeft?: number;
+    onCollapse?: (flag: boolean) => void;
 };
 declare const BizAnalysisLayout: React.FC<AnalysisLayoutProps>;
 export default BizAnalysisLayout;

package/es/analysisLayout/index.js

@@ -77,6 +77,7 @@ var BizAnalysisLayout = function BizAnalysisLayout(props) {
   };
 
   function onCollapse() {
+    if (props.onCollapse) props.onCollapse(showLeft);
     setShowLeft(function (show) {
       setWidth(show ? 56 : minWidthOfLeft);
       return !show;

package/es/assets/styles/chunks.less

@@ -42,7 +42,7 @@
   border-radius: @border-radius-normal;
   .__default-overflow();
 
-  &:hover {
+  &:not(.disabled, .active):hover {
     .__default-hover();
   }
 
@@ -51,7 +51,7 @@
     background: @primary-color;
   }
 
-  &.disabled {
+  &:not(.active).disabled {
     color: @disabled-color;
     cursor: not-allowed;
 

package/es/attrConditions/components/stringList.js

@@ -84,7 +84,8 @@ var StringList = function StringList(props) {
                 platform: currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform,
                 limit: 10000,
                 attr: (attrData === null || attrData === void 0 ? void 0 : attrData.propCategory) === PropCategory.EventProp ? attrData.id : 0,
-                dimension_sub: (attrData === null || attrData === void 0 ? void 0 : attrData.propCategory) === PropCategory.EventProp ? 'event_attr' : attrData === null || attrData === void 0 ? void 0 : attrData.name
+                dimension_sub: (attrData === null || attrData === void 0 ? void 0 : attrData.propCategory) === PropCategory.EventProp ? 'event_attr' : attrData === null || attrData === void 0 ? void 0 : attrData.name,
+                v: ''
               };
 
               transformRequest = function transformRequest(params) {

package/es/attrConditions/demo/group.js

@@ -19,7 +19,7 @@ import { Button } from 'antd';
 var conditions = [{
   propCategory: 'userProp',
   type: 2,
-  operation: 'gt',
+  operator: 'gt',
   values: ['25200', '1'],
   attrName: 'duration',
   category: 'fixed',
@@ -27,7 +27,7 @@ var conditions = [{
 }, {
   propCategory: 'eventProp',
   type: 1,
-  operation: 'equal',
+  operator: 'equal',
   values: ['Safari', 'Apple WebKit'],
   attrId: 30183426
 }];

package/es/attrConditions/demo/index.js

@@ -25,7 +25,7 @@ export default (function () {
     condition: {
       propCategory: 'userProp',
       type: 2,
-      operation: 'lt',
+      operator: 'lt',
       values: ['25200', '1'],
       subtype: 2,
       attrName: 'duration',

package/es/attrConditions/index.js

@@ -35,7 +35,7 @@ var BizConditionItem = function BizConditionItem(props) {
       attr = _useState2[0],
       setAttr = _useState2[1];
 
-  var _useState3 = useState(((_props$defaultValue = props.defaultValue) === null || _props$defaultValue === void 0 ? void 0 : _props$defaultValue.operation) || ((_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.operation)),
+  var _useState3 = useState(((_props$defaultValue = props.defaultValue) === null || _props$defaultValue === void 0 ? void 0 : _props$defaultValue.operator) || ((_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.operator)),
       _useState4 = _slicedToArray(_useState3, 2),
       operate = _useState4[0],
       setOperate = _useState4[1];
@@ -94,7 +94,7 @@ var BizConditionItem = function BizConditionItem(props) {
       var responseData = {
         propCategory: attr.propCategory,
         type: attr.type,
-        operation: operate,
+        operator: operate,
         values: values || []
       };
 

package/es/attrConditions/types.d.ts

@@ -15,7 +15,7 @@ export declare namespace AttrConditionTypes {
         type?: PropType;
         propCategory?: 'userProp' | 'eventProp' | 'envProp';
         category?: 'fixed' | 'custom';
-        operation?: string;
+        operator?: string;
         values?: string[];
     }
     interface GroupValue {

package/es/attributeSelector/demo/index.js

@@ -51,7 +51,7 @@ export default (function () {
     enableDelete: true,
     disableItemList: [{
       propCategory: 'eventProp',
-      id: 30183424
+      id: 30183426
     }, {
       name: 'is_anonymous',
       propCategory: 'userProp'

package/es/attributeSelector/index.js

@@ -16,7 +16,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { useContext, useEffect, useState } from 'react';
+import React, { useContext, useEffect, useRef, useState } from 'react';
 import './styles/index.less';
 import { Dropdown, Tooltip } from 'antd';
 import AttrListPanel from './listPanel';
@@ -49,7 +49,15 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
       userPropList = _useContext.userPropList,
       eventEnvList = _useContext.eventEnvList;
 
+  var boxRef = useRef(null);
+
+  var _useState7 = useState(200),
+      _useState8 = _slicedToArray(_useState7, 2),
+      width = _useState8[0],
+      setWidth = _useState8[1];
+
   useEffect(function () {
+    setWidth(boxRef.current.width || 284);
     if (!props.defaultValue) return;
     setCurrentAttr(getValue(props.defaultValue));
   }, []);
@@ -108,7 +116,8 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
     })),
     trigger: ['click'],
     overlayStyle: {
-      minWidth: 0
+      minWidth: 284,
+      width: width
     },
     visible: visible,
     onVisibleChange: onVisibleChange
@@ -117,6 +126,7 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
       width: '100%'
     }
   }, /*#__PURE__*/React.createElement(SelectHandle, {
+    ref: boxRef,
     theme: "secondary",
     border: false,
     label: currentAttr === null || currentAttr === void 0 ? void 0 : currentAttr.label,

package/es/attributeSelector/styles/index.less

@@ -20,7 +20,6 @@
     }
   }
   &-drowdown {
-    width: 284px;
     .__select-panel();
     &.nodata {
       .__select-nodata();

package/es/chart/demo/index.js

@@ -1,10 +1,42 @@
-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 React, { useRef, useState } from 'react';
 import { BizChart } from '@zgfe/business-lib';
 import chartData from './data/data';
+import { Button, Image } from 'antd';
 export default (function () {
-  return /*#__PURE__*/React.createElement(BizChart, {
+  var chartRef = useRef();
+
+  var _useState = useState(),
+      _useState2 = _slicedToArray(_useState, 2),
+      chartImg = _useState2[0],
+      setChartImg = _useState2[1];
+
+  var onClick = function onClick() {
+    var url = chartRef.current.instance.getDataURL();
+    setChartImg(url);
+  };
+
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BizChart, {
     data: chartData,
     type: "line",
-    legendPosition: "bottom"
-  });
+    legendPosition: "bottom",
+    ref: chartRef
+  }), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(Button, {
+    onClick: onClick
+  }, "\u83B7\u53D6\u56FE\u8868\u56FE\u7247"), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(Image, {
+    src: chartImg,
+    width: "100%",
+    height: 300
+  }));
 });

package/es/chart/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
 import './util/data/china.js';
 import { ChartTypes } from './types';
-declare const BizChart: React.FC<ChartTypes.Props>;
+declare const BizChart: React.ForwardRefExoticComponent<ChartTypes.Props & React.RefAttributes<any>>;
 export default BizChart;

package/es/chart/index.js

@@ -16,15 +16,14 @@ 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, { useEffect, useImperativeHandle, useState } from 'react';
 import ReactEChartsCore from 'echarts-for-react/lib/core';
 import * as echarts from 'echarts';
 import { getChartOption, getPieOption, getMapOption } from './util/chartOptionConfig';
 import { provinceSeries, citySeries, maxMinValue } from './util/mapUtil';
 import { formatPieData, formatChartData } from './util/formatData';
 import './util/data/china.js';
-
-var BizChart = function BizChart(props) {
+var BizChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var type = props.type,
       data = props.data,
       showList = props.showList,
@@ -50,6 +49,11 @@ var BizChart = function BizChart(props) {
       chartOption = _useState2[0],
       setChartOption = _useState2[1];
 
+  var _useState3 = useState(),
+      _useState4 = _slicedToArray(_useState3, 2),
+      instance = _useState4[0],
+      setInstance = _useState4[1];
+
   useEffect(function () {
     if (option) {
       setChartOption(function () {
@@ -82,7 +86,15 @@ var BizChart = function BizChart(props) {
       return _objectSpread({}, eOption);
     });
   }, [data, showAll, showList, reverseXAxis]);
+  useImperativeHandle(ref, function () {
+    return {
+      instance: instance
+    };
+  });
   return /*#__PURE__*/React.createElement(ReactEChartsCore, {
+    ref: function ref(e) {
+      setInstance(e === null || e === void 0 ? void 0 : e.getEchartsInstance());
+    },
     echarts: echarts,
     option: chartOption,
     notMerge: true,
@@ -92,8 +104,7 @@ var BizChart = function BizChart(props) {
       width: '100%'
     }
   });
-};
-
+});
 BizChart.defaultProps = {
   showAll: false,
   reverseXAxis: false,

package/es/dialog/components/tab.js

@@ -35,6 +35,7 @@ var BizTab = function BizTab(props) {
     }, /*#__PURE__*/React.createElement(Space, null, (_data$children = data.children) === null || _data$children === void 0 ? void 0 : _data$children.map(function (item) {
       return /*#__PURE__*/React.createElement(Radio, {
         key: item.value,
+        disabled: item.disabled,
         value: item.value,
         onClick: function onClick() {
           return onChange(data, item);

package/es/dialog/demo/index.d.ts

@@ -14,11 +14,17 @@ export declare const chartTypes: ({
     label: string;
     value: string;
     icon: string;
-    children: {
+    children: ({
         label: string;
         value: string;
         icon: string;
-    }[];
+        disabled?: undefined;
+    } | {
+        label: string;
+        value: string;
+        icon: string;
+        disabled: boolean;
+    })[];
     disabled?: undefined;
 })[];
 declare const _default: () => JSX.Element;

package/es/dialog/demo/index.js

@@ -53,7 +53,8 @@ export var chartTypes = [{
   }, {
     label: '汇总图',
     value: 'bar',
-    icon: 'huizongtu'
+    icon: 'huizongtu',
+    disabled: true
   }]
 }, {
   label: '分数',

package/es/select/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["overlayWidth", "labelField", "keyField"];
+var _excluded = ["overlayWidth", "minDropdownWidth", "labelField", "keyField"];
 
 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; }
 
@@ -32,6 +32,7 @@ export var classPrefix = 'biz-select';
 
 var BizSelect = function BizSelect(props) {
   var overlayWidth = props.overlayWidth,
+      minDropdownWidth = props.minDropdownWidth,
       labelField = props.labelField,
       keyField = props.keyField,
       res = _objectWithoutProperties(props, _excluded);
@@ -175,7 +176,7 @@ var BizSelect = function BizSelect(props) {
     disabled: props.disable,
     destroyPopupOnHide: true,
     overlayStyle: {
-      minWidth: 0,
+      minWidth: minDropdownWidth || 0,
       width: overlayWidth || width
     },
     trigger: ['click'],

package/es/select/overlay.js

@@ -82,7 +82,7 @@ var SelectOverlay = function SelectOverlay(props) {
         list = getOptionDom(options, ids);
       }
 
-      if (!list.flat().length) {
+      if (options.length && !list.flat().length) {
         var dom = /*#__PURE__*/React.createElement("div", {
           className: "".concat(classPrefix, "-notfound"),
           key: "notfound"

package/es/select/types.d.ts

@@ -18,6 +18,7 @@ export declare namespace BizSelectTypes {
         size?: 'lg' | 'base' | 'sm';
         border?: boolean;
         multiple?: boolean;
+        minDropdownWidth?: number;
         options: Group[] | Option[];
         extra?: (option: Option) => ReactNode;
         dropdownExtra?: ReactNode;

package/es/targetConditionGroup/demo/index.js

@@ -26,7 +26,7 @@ var defaultValue = {
     conditions: [{
       propCategory: 'eventProp',
       type: 1,
-      operation: 'equal',
+      operator: 'equal',
       values: ['Safari'],
       attrId: 30183430
     }]

package/es/userCondition/conditions/propCondition.js

@@ -89,7 +89,7 @@ var PropCondition = function PropCondition(props) {
         attrId = data.attrId,
         category = data.category,
         type = data.type,
-        operation = data.operation,
+        operator = data.operator,
         values = data.values;
 
     var newAttrs = _toConsumableArray(attrs);
@@ -98,7 +98,7 @@ var PropCondition = function PropCondition(props) {
       attrName: attrName,
       attrId: attrId,
       category: category,
-      operator: transformNumberOperate(operation),
+      operator: transformNumberOperate(operator),
       params: values,
       attrType: numAttrTypeMap[type]
     };
@@ -148,7 +148,7 @@ var PropCondition = function PropCondition(props) {
       props.defaultValue = {
         attrName: attrName,
         category: category || 'custom',
-        operation: operator,
+        operator: operator,
         values: params || [],
         propCategory: getPropCategory(attrName),
         type: attrNumTypeMap[attrType]

package/es/userGroup/demo/index.js

@@ -44,7 +44,10 @@ var UserGroupDemo = function UserGroupDemo() {
   };
 
   return /*#__PURE__*/React.createElement("div", {
-    className: "biz-user-group-demo"
+    className: "biz-user-group-demo",
+    style: {
+      width: '200px'
+    }
   }, /*#__PURE__*/React.createElement(BizUserGroup, {
     options: groupOptions,
     onChange: handleChange,

package/es/userGroup/index.js

@@ -68,7 +68,7 @@ var BizUserGroup = function BizUserGroup(props) {
     border: false,
     disableItemList: props.disableItemList,
     onChange: onChange,
-    overlayWidth: 284
+    minDropdownWidth: 284
   }), /*#__PURE__*/React.createElement(BizTargetOptionIcon, {
     name: "delete",
     icon: "qingchu",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.0.6",
+  "version": "1.0.9",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -58,5 +58,5 @@
     "prettier": "^2.2.1",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "8d58fc9b49900c5dd30764910afe0846a0866a9e"
+  "gitHead": "745412d17d39bb923c36a927fe6735afbd77b384"
 }