@zgfe/business-lib 1.1.100 → 1.2.0

package/es/assets/iconfont/iconfont.json

@@ -5,69 +5,6 @@
   "css_prefix_text": "",
   "description": "诸葛业务平台",
   "glyphs": [
-    {
-      "icon_id": "37416479",
-      "name": "收起",
-      "font_class": "shouqi1",
-      "unicode": "e797",
-      "unicode_decimal": 59287
-    },
-    {
-      "icon_id": "37416478",
-      "name": "添加",
-      "font_class": "tianjia2",
-      "unicode": "e799",
-      "unicode_decimal": 59289
-    },
-    {
-      "icon_id": "37343412",
-      "name": "盒须图",
-      "font_class": "hexutu",
-      "unicode": "e796",
-      "unicode_decimal": 59286
-    },
-    {
-      "icon_id": "37316029",
-      "name": "全屏展示",
-      "font_class": "quanpingzhanshi",
-      "unicode": "e6a3",
-      "unicode_decimal": 59043
-    },
-    {
-      "icon_id": "37316033",
-      "name": "流向图",
-      "font_class": "liuxiangtu",
-      "unicode": "e78f",
-      "unicode_decimal": 59279
-    },
-    {
-      "icon_id": "37316032",
-      "name": "旭日图",
-      "font_class": "xuritu",
-      "unicode": "e790",
-      "unicode_decimal": 59280
-    },
-    {
-      "icon_id": "37316031",
-      "name": "桑基图",
-      "font_class": "sangjitu",
-      "unicode": "e791",
-      "unicode_decimal": 59281
-    },
-    {
-      "icon_id": "37316030",
-      "name": "树形图",
-      "font_class": "shuxingtu",
-      "unicode": "e792",
-      "unicode_decimal": 59282
-    },
-    {
-      "icon_id": "37316028",
-      "name": "全屏收起",
-      "font_class": "quanpingshouqi",
-      "unicode": "e793",
-      "unicode_decimal": 59283
-    },
     {
       "icon_id": "36957204",
       "name": "对勾",
@@ -719,6 +656,13 @@
       "unicode": "e6a5",
       "unicode_decimal": 59045
     },
+    {
+      "icon_id": "31389407",
+      "name": "全屏展示",
+      "font_class": "quanpingzhanshi",
+      "unicode": "e6a3",
+      "unicode_decimal": 59043
+    },
     {
       "icon_id": "31360676",
       "name": "收藏",
@@ -810,6 +754,13 @@
       "unicode": "e771",
       "unicode_decimal": 59249
     },
+    {
+      "icon_id": "28451990",
+      "name": "添加",
+      "font_class": "tianjia2",
+      "unicode": "e773",
+      "unicode_decimal": 59251
+    },
     {
       "icon_id": "28452283",
       "name": "生成",

package/es/chart/util/color.js

@@ -1 +1 @@
-export var chartColors = ['#457DFF', '#80E1D9', '#65789B', '#F8BC3B', '#6F66ED', '#66AFED', '#9661BC', '#FF7557', '#4DB273', '#F08BB4', '#CDDBFD', '#CDF3F0', '#CED4DE', '#FCE7B9', '#D1CEFD', '#D3E7F9', '#DFCFEA', '#FFD1C7', '#BBDEC8', '#FFE0ED'];
+export var chartColors = ['#165DFF', '#80E1D9', '#65789B', '#F8BC3B', '#6F66ED', '#66AFED', '#9661BC', '#FF7557', '#4DB273', '#F08BB4', '#CDDBFD', '#CDF3F0', '#CED4DE', '#FCE7B9', '#D1CEFD', '#D3E7F9', '#DFCFEA', '#FFD1C7', '#BBDEC8', '#FFE0ED'];

package/es/datePicker/index.js

@@ -142,7 +142,7 @@ var BizDatePicker = function BizDatePicker(_ref) {
   })));
 };
 BizDatePicker.defaultProps = {
-  includeToday: true,
+  includeToday: false,
   mode: 'general',
   dateTypeList: [DatePickerTypes.Unit.hour, DatePickerTypes.Unit.day, DatePickerTypes.Unit.week, DatePickerTypes.Unit.month]
 };

package/es/datePicker/shortcut.js

@@ -72,7 +72,7 @@ var getTypeList = function getTypeList(currentType, mode, includeToday) {
     return item.value === currentType;
   })) === null || _shortcuts$find === void 0 ? void 0 : _shortcuts$find.children) || []).filter(function (item) {
     if (currentType === 'day') {
-      if ((mode === 'general' || !includeToday) && (item.count === 0 || item.count === 1)) return false;
+      if (mode === 'general' && item.count === 1 || item.count === 0 && !includeToday) return false;
       return true;
     }
     return true;
@@ -95,7 +95,7 @@ var PickerShortcut = function PickerShortcut() {
   var list = getTypeList(currentType, mode, includeToday);
   useEffect(function () {
     list = getTypeList(currentType, mode, includeToday);
-    if (!relative && !dateRange) {
+    if (!relative) {
       var _list$;
       var _active = (_list$ = list[0]) === null || _list$ === void 0 ? void 0 : _list$.count;
       setActive(_active);

package/es/dialog/styles/index.less

@@ -11,9 +11,7 @@
 }
 .biz-dialog-wrap {
   .ant-modal-close {
-    top: 5px;
-    right: 5px;
-
+    top: 15px;
     .bsicon {
       color: @text-color;
       font-size: 24px !important;

package/es/eventSelector/demo/index.js

@@ -10,7 +10,7 @@ import InnerDemo from '../../demoWrapper/innerDemo';
 var EventDemo = function EventDemo() {
   var _useState = useState({
       event: {
-        id: -2
+        id: 24292415
       }
     }),
     _useState2 = _slicedToArray(_useState, 2),
@@ -27,18 +27,7 @@ var EventDemo = function EventDemo() {
     defaultSelectAble: false,
     destroyPopupOnHide: true,
     value: value,
-    onChange: onChange,
-    selectList: [24143017, 24256188, 24256187],
-    disableList: [-1],
-    extendEvents: [{
-      id: -1,
-      name: '会话开始',
-      attrList: []
-    }, {
-      id: -2,
-      name: '会话结束',
-      attrList: []
-    }]
+    onChange: onChange
   }));
 };
 export default (function () {

package/es/eventSelector/index.js

@@ -93,18 +93,12 @@ var BizEventSelector = function BizEventSelector(props) {
           attrList: []
         };
       }
-      if (props.extendEvents) {
-        props.extendEvents.forEach(function (item) {
-          var _params$event2;
-          if (item.id === ((_params$event2 = _params.event) === null || _params$event2 === void 0 ? void 0 : _params$event2.id)) res.event = item;
-        });
-      }
       allEvents === null || allEvents === void 0 ? void 0 : allEvents.forEach(function (group) {
         var _params$group2;
         if (group.id === ((_params$group2 = _params.group) === null || _params$group2 === void 0 ? void 0 : _params$group2.id)) res.group = group;
         group.eventList.forEach(function (event) {
-          var _params$event3;
-          if (event.id === ((_params$event3 = _params.event) === null || _params$event3 === void 0 ? void 0 : _params$event3.id)) res.event = event;
+          var _params$event2;
+          if (event.id === ((_params$event2 = _params.event) === null || _params$event2 === void 0 ? void 0 : _params$event2.id)) res.event = event;
         });
       });
       return res;
@@ -153,8 +147,6 @@ var BizEventSelector = function BizEventSelector(props) {
         showBuiltInTarget: props.showBuiltInTarget,
         defaultSelectAble: defaultSelectAble,
         selectList: props.selectList,
-        disableList: props.disableList,
-        extendEvents: props.extendEvents,
         filter: props.filter,
         afterSelect: function afterSelect() {
           setVisible(false);

package/es/eventSelector/listPanel.d.ts

@@ -10,7 +10,6 @@ export declare const InfiniteScrollList: React.FC<{
     currentId?: string | number;
     checkedIdList?: number[];
     selectList?: number[];
-    disableList?: number[];
     multiple?: boolean;
     maxEventCount?: number;
     onClick: (data: AnalysisEvent) => void;

package/es/eventSelector/listPanel.js

@@ -86,9 +86,6 @@ var EventListPanel = function EventListPanel(props) {
           });
         });
         list = props.showBuiltInTarget ? [].concat(_toConsumableArray(BuiltinIndicators.eventList), markList, _toConsumableArray(list)) : [].concat(markList, _toConsumableArray(list));
-        if (props.extendEvents) {
-          list = [].concat(_toConsumableArray(props.extendEvents), _toConsumableArray(list));
-        }
         return list;
       }(),
       name: '所有分组'
@@ -250,7 +247,6 @@ var EventListPanel = function EventListPanel(props) {
     groupId: currentGroup === null || currentGroup === void 0 ? void 0 : currentGroup.id,
     currentId: currentValue === null || currentValue === void 0 ? void 0 : (_currentValue$event2 = currentValue.event) === null || _currentValue$event2 === void 0 ? void 0 : _currentValue$event2.id,
     selectList: props.selectList,
-    disableList: props.disableList,
     multiple: props.multiple,
     maxEventCount: props.maxEventCount,
     checkedIdList: checkedEventList.map(function (e) {
@@ -267,7 +263,6 @@ export var InfiniteScrollList = function InfiniteScrollList(_ref) {
     currentId = _ref.currentId,
     onClick = _ref.onClick,
     selectList = _ref.selectList,
-    disableList = _ref.disableList,
     multiple = _ref.multiple,
     maxEventCount = _ref.maxEventCount,
     checkedIdList = _ref.checkedIdList;
@@ -317,7 +312,7 @@ export var InfiniteScrollList = function InfiniteScrollList(_ref) {
     if (selectList && (selectList === null || selectList === void 0 ? void 0 : selectList.indexOf(e.id)) !== -1 && currentId !== e.id) {
       _disable = true;
     }
-    if ((disableList === null || disableList === void 0 ? void 0 : disableList.includes(e.id)) || multiple && checkedIdList && (checkedIdList === null || checkedIdList === void 0 ? void 0 : checkedIdList.length) >= maxEventCount && !checkedIdList.includes(e.id)) {
+    if (multiple && checkedIdList && (checkedIdList === null || checkedIdList === void 0 ? void 0 : checkedIdList.length) >= maxEventCount && !checkedIdList.includes(e.id)) {
       _disable = true;
     }
     return /*#__PURE__*/React.createElement(EventListOption, {

package/es/eventSelector/types.d.ts

@@ -14,36 +14,38 @@ export declare namespace EventSelectTypes {
             name?: string;
         };
     }
-    interface BaseProps {
+    interface Props {
+        defaultValue?: Value | SimpleValue | AnalysisEvent[];
         value?: Value | AnalysisEvent[];
         multiple?: boolean;
         maxEventCount?: number;
-        showBuiltInTarget?: boolean;
-        defaultSelectAble?: boolean;
-        selectList?: number[];
-        disableList?: number[];
-        extendEvents?: AnalysisEvent[];
-    }
-    interface Props extends BaseProps {
-        defaultValue?: Value | SimpleValue | AnalysisEvent[];
         groupId?: number;
         alias?: string;
         placeholder?: string;
         showAllEvent?: boolean;
+        defaultSelectAble?: boolean;
         popupContainer?: boolean;
+        showBuiltInTarget?: boolean;
         onVisibleChange?: (visible: boolean) => void;
         border?: boolean;
         theme?: string;
         size?: SizeType;
         destroyPopupOnHide?: boolean;
         onChange?: (val: Value | AnalysisEvent[]) => void;
+        selectList?: number[];
         filter?: (evt: AnalysisEvent) => boolean;
         disableVirtualEventShow?: boolean;
     }
-    interface DropdownProps extends BaseProps {
+    interface DropdownProps {
+        value?: Value | AnalysisEvent[];
+        multiple?: boolean;
+        maxEventCount?: number;
         showOverview?: boolean;
+        showBuiltInTarget?: boolean;
+        defaultSelectAble?: boolean;
         onChange?: (value: Value | AnalysisEvent[], isOverview?: boolean) => void;
         afterSelect?: () => void;
+        selectList?: number[];
         filter?: Props['filter'];
         disableVirtualEventShow?: boolean;
     }

package/es/layout/columnLayout/demo/index.js

@@ -19,10 +19,6 @@ export default (function () {
     tableData = _useState4[0],
     setTableData = _useState4[1];
   var formRef = useRef(null);
-  var _useState5 = useState(false),
-    _useState6 = _slicedToArray(_useState5, 2),
-    fullScreen = _useState6[0],
-    setFullScreen = _useState6[1];
   useEffect(function () {
     setColumn(getColumn(chartData.xAxis));
     setTableData(formateTableData(chartData.series));
@@ -92,21 +88,8 @@ export default (function () {
     hasCollapse: true,
     collapseRef: formRef,
     topPanel: topPanel,
-    topRender: topRender,
-    topHide: fullScreen
+    topRender: topRender
   }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
-    style: {
-      display: 'flex',
-      marginBottom: 20,
-      justifyContent: 'flex-end'
-    }
-  }, /*#__PURE__*/React.createElement(Button, {
-    onClick: function onClick() {
-      return setFullScreen(function (flag) {
-        return !flag;
-      });
-    }
-  }, fullScreen ? '还原' : '全屏')), /*#__PURE__*/React.createElement("div", {
     style: {
       border: '1px solid #ECEDF0',
       borderRadius: 8,

package/es/layout/columnLayout/index.js

@@ -31,7 +31,7 @@ var BizLayout = function BizLayout(props) {
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "fanhuiicon"
   }), "\u8FD4\u56DE") : null, /*#__PURE__*/React.createElement("span", null, props.title)) : null, props.toolbar, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-top").concat(props.topHide ? ' hide' : '')
+    className: "".concat(classPrefix, "-top")
   }, props.topRender || null, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-top-container")
   }, /*#__PURE__*/React.createElement("div", {

package/es/layout/columnLayout/index.less

@@ -32,33 +32,27 @@
   &-top {
     padding: 16px 24px;
     background: #fafafb;
-    transition: all 2s;
-
     &-container {
       padding-top: 24px;
       background-color: #fff;
       border: 1px solid #ecedf0;
       border-radius: 8px;
     }
-
-    &.hide {
-      display: none;
-    }
   }
 
   &-collapse-container {
     display: flex;
     justify-content: center;
     width: 100%;
-    height: 24px;
+    height: 32px;
   }
 
   &-collapse-handle {
     display: flex;
-    align-items: flex-start;
+    align-items: center;
     justify-content: center;
     width: 200px;
-    height: 24px;
+    height: 32px;
     color: #9aa1a9;
     cursor: pointer;
 

package/es/layout/columnLayout/types.d.ts

@@ -11,7 +11,6 @@ export declare namespace LayoutTypes {
         children: ReactNode;
         toolbar?: ReactNode;
         topRender?: ReactNode;
-        topHide?: boolean;
         onBack?: () => void;
     }
 }

package/es/select/demo/multiple.js

@@ -72,8 +72,6 @@ export default (function () {
     disableItemList: disabledList,
     multiple: true,
     enableCreate: true,
-    value: data,
-    max: 5,
-    maxTip: "\u6700\u591A\u9009\u62E95\u6761\u9009\u9879"
+    value: data
   }), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("p", null, "\u5F53\u524D\u9009\u62E9\u7684\u503C\u662F\uFF1A", JSON.stringify(data)));
 });

package/es/select/overlay.js

@@ -13,7 +13,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useState } from 'react';
-import { Spin, message } from 'antd';
+import { Spin } from 'antd';
 import BizSearchInput from '../searchInput';
 import { classPrefix } from './index';
 import SelectOption, { SelectAll } from './option';
@@ -151,11 +151,7 @@ var SelectOverlay = /*#__PURE__*/React.forwardRef(function (props, ref) {
         if (flag) {
           currentOption.splice(num, 1);
         } else {
-          if (props.max && props.max <= currentOption.length) {
-            message.warning(props.maxTip || "\u6700\u591A\u53EF\u9009\u62E9".concat(props.max, "\u4E2A"));
-          } else {
-            currentOption.push(option);
-          }
+          currentOption.push(option);
         }
       }
     } else {

package/es/select/styles/handle.less

@@ -85,9 +85,8 @@
             cursor: not-allowed;
           }
         }
-        .biz-select-handle-tag-label,
-        .ant-tag-close-icon {
-          color: #ccd0d4 !important;
+        .biz-select-handle-tag-label {
+          color: @disabled-color !important;
         }
       }
     }

package/es/select/types.d.ts

@@ -21,8 +21,6 @@ export declare namespace BizSelectTypes {
         border?: boolean;
         multiple?: boolean;
         enableSelectAll?: boolean;
-        max?: number;
-        maxTip?: string;
         minDropdownWidth?: number;
         options: Group[] | Option[];
         extra?: (option: Option) => ReactNode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.100",
+  "version": "1.2.0",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [
@@ -55,7 +55,7 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "50c41e2102076fcd95ddc2cf87fc7d8dddb2fe0c",
+  "gitHead": "4156c428c25567093502e878b3a03c799df6b82b",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }