@zgfe/business-lib 1.0.18 → 1.0.19

package/es/addToPanel/index.js

@@ -208,6 +208,7 @@ var BizAddToPanel = function BizAddToPanel(props) {
     placeholder: "\u9009\u62E9\u770B\u677F",
     keyField: "id",
     labelField: "name",
+    popupContainer: false,
     dropdownExtra: /*#__PURE__*/React.createElement(Button, {
       className: "".concat(classPrefix, "-btn-add"),
       type: "ghost",

package/es/addToScene/index.js

@@ -164,6 +164,7 @@ var BizAddToScene = function BizAddToScene(props) {
     enableSearch: true,
     keyField: "groupId",
     labelField: "groupName",
+    popupContainer: false,
     dropdownExtra: /*#__PURE__*/React.createElement(Button, {
       className: "".concat(classPrefix, "-btn-add"),
       type: "ghost",

package/es/assets/styles/chunks.less

@@ -50,15 +50,14 @@
     .__default-hover();
   }
 
-  &.active {
+  &.active:not(.biz-select-option-multiple) {
     color: #fff;
     background: @primary-color;
   }
 
-  &:not(.active).disabled {
+  &.disabled {
     color: @disabled-color;
     cursor: not-allowed;
-
     &:hover {
       background: none;
     }
@@ -87,7 +86,7 @@
   cursor: not-allowed;
 
   &:hover {
-    background-color: none;
+    background-color: unset;
   }
 }
 

package/es/assets/styles/resetAntd.less

@@ -144,6 +144,14 @@
   .ant-picker-active-bar {
     display: none !important;
   }
+
+  &.ant-picker-range {
+    background-color: @background-color-base;
+    border: none;
+    &.ant-picker-large {
+      height: 40px;
+    }
+  }
 }
 
 /*日历下拉框*/
@@ -297,10 +305,14 @@
   }
 
   .ant-modal-body {
+    max-height: 400px;
     max-height: 400px !important;
     padding-top: @padding-xs !important;
-    padding-bottom: 0 !important;
+    // padding-bottom: 0 !important;
     overflow: auto !important;
+    &:not(:last-child) {
+      padding-bottom: 0 !important;
+    }
   }
 }
 
@@ -370,10 +382,6 @@
       &::before {
         width: 0 !important;
       }
-
-      &.ant-table-cell-fix-left-last {
-        border-right: 1px solid @border-color-base!important;
-      }
     }
 
     .ant-table-tbody {
@@ -386,12 +394,6 @@
 
     .ant-table-tbody > tr > td {
       line-height: 15px !important;
-
-      &.ant-table-cell-fix-left {
-        &.ant-table-cell-fix-left-last {
-          border-right: 1px solid @border-color-base!important;
-        }
-      }
     }
   }
 
@@ -399,8 +401,33 @@
   .ant-table-tbody > tr > td.ant-table-cell-row-hover {
     background: color(~`colorPalette('@{primary-color}', 0.1) `) !important;
   }
+  .ant-table-thead {
+    .ant-table-cell {
+      &.ant-table-column-has-sorters {
+        .ant-table-column-sorters {
+          justify-content: flex-start;
+          .ant-table-column-title {
+            flex: none;
+          }
+          .ant-table-column-sorter {
+            margin-left: @margin-xs;
+          }
+        }
+      }
+    }
+  }
+}
+
+//气泡弹框
+.ant-popover-inner {
+  border-radius: @border-radius-small;
 }
 
+//tooltip
+.ant-tooltip-inner {
+  padding: @margin-sm @margin-md;
+  border-radius: @border-radius-normal;
+}
 /* 提示框 */
 .ant-tooltip-inner {
   padding: @padding-sm @padding-md!important;
@@ -432,3 +459,12 @@
 .ant-form-item-explain-error {
   color: @error-color!important;
 }
+
+//dropdown
+.ant-dropdown {
+  z-index: 6666 !important;
+}
+//message
+.ant-message {
+  z-index: 99999 !important;
+}

package/es/attrConditions/components/operateList.d.ts

@@ -4,5 +4,6 @@ declare const BizOperateList: React.FC<{
     attr?: AttributeSelect.Value;
     defaultValue?: string;
     onChange?: (value: string) => void;
+    theme: string;
 }>;
 export default BizOperateList;

package/es/attrConditions/components/operateList.js

@@ -67,7 +67,7 @@ var BizOperateList = function BizOperateList(props) {
   if (!props.attr || !current || !options.length) {
     return /*#__PURE__*/React.createElement(BizSelect, {
       className: "".concat(classPrefix, "-single-select"),
-      theme: "secondary",
+      theme: props.theme,
       disable: true,
       options: []
     });
@@ -79,7 +79,7 @@ var BizOperateList = function BizOperateList(props) {
     value: current,
     labelField: "name",
     keyField: "value",
-    theme: "secondary",
+    theme: props.theme,
     options: options,
     onChange: onChange
   });

package/es/attrConditions/components/stringList.d.ts

@@ -5,5 +5,6 @@ declare const StringList: React.FC<{
     operate: string;
     value?: string[];
     onChange?: (value: string[]) => void;
+    theme: string;
 }>;
 export default StringList;

package/es/attrConditions/components/stringList.js

@@ -164,7 +164,7 @@ var StringList = function StringList(props) {
     return /*#__PURE__*/React.createElement(BizSelect, {
       multiple: true,
       enableCreate: true,
-      theme: "secondary",
+      theme: props.theme,
       size: "base",
       className: "".concat(classPrefix, "-multi-select"),
       options: [],
@@ -177,7 +177,7 @@ var StringList = function StringList(props) {
     value: current,
     multiple: true,
     enableCreate: true,
-    theme: "secondary",
+    theme: props.theme,
     size: "base",
     disable: props.operate === OperateTypes.IsNull || props.operate === OperateTypes.IsNotNull,
     labelField: "name",

package/es/attrConditions/components/valuesList.d.ts

@@ -4,7 +4,7 @@ declare const ValuesList: React.FC<{
     attr?: AttributeSelect.Value;
     operate?: string;
     defaultValue?: string[];
-    includeToday?: boolean;
     onChange?: (value: string[]) => void;
+    theme: string;
 }>;
 export default ValuesList;

package/es/attrConditions/components/valuesList.js

@@ -27,8 +27,8 @@ var ValuesList = function ValuesList(props) {
   var attr = props.attr,
       defaultValue = props.defaultValue,
       operate = props.operate,
-      includeToday = props.includeToday;
-  var initValue = [moment().subtract(1, 'weeks').format('YYYY-MM-DD'), moment().subtract(includeToday ? 0 : 1, 'days').format('YYYY-MM-DD')];
+      theme = props.theme;
+  var initValue = [moment().subtract(1, 'weeks').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')];
 
   var _useState = useState(),
       _useState2 = _slicedToArray(_useState, 2),
@@ -119,14 +119,14 @@ var ValuesList = function ValuesList(props) {
     return /*#__PURE__*/React.createElement(BizSelect, {
       disable: true,
       className: "".concat(classPrefix, "-multi-select"),
-      theme: "secondary",
-      size: "base",
+      theme: theme,
       options: []
     });
   }
 
   if (attr.type === PropType.STRING) {
     return /*#__PURE__*/React.createElement(StringList, {
+      theme: theme,
       attr: attr,
       operate: operate,
       value: current,
@@ -139,19 +139,21 @@ var ValuesList = function ValuesList(props) {
       },
       keyField: "value",
       labelField: "label",
-      theme: "secondary",
+      theme: props.theme,
       className: "".concat(classPrefix, "-input-select"),
       onChange: onChangeUnit,
       options: propSubtype
     });
-    return /*#__PURE__*/React.createElement(Input, {
+    return /*#__PURE__*/React.createElement("div", {
+      className: "".concat(classPrefix, "-value-content")
+    }, /*#__PURE__*/React.createElement(Input, {
       className: "".concat(classPrefix, "-input"),
       value: current && current.length ? current[0] : '',
       placeholder: "\u8BF7\u8F93\u5165",
       type: "number",
       onChange: onChangeNumber,
-      addonAfter: attr.propCategory === 'userProp' && attr.subtype === 1 ? '%' : attr.propCategory === 'userProp' && attr.subtype === 2 ? numberAfter : null
-    });
+      suffix: attr.propCategory === 'userProp' && attr.subtype === 1 ? '%' : null
+    }), attr.propCategory === 'userProp' && attr.subtype === 2 && numberAfter);
   } else {
     if (operate === OperateTypes.Absolute) {
       return /*#__PURE__*/React.createElement(RangePicker, {
@@ -175,14 +177,11 @@ var ValuesList = function ValuesList(props) {
         value: current && current[0] ? current[0] : 30,
         placeholder: "\u8BF7\u8F93\u5165",
         type: "number",
-        addonAfter: "\u5929",
+        suffix: "\u5929",
         onChange: onChangeDate
       });
     }
   }
 };
 
-ValuesList.defaultProps = {
-  includeToday: false
-};
 export default ValuesList;

package/es/attrConditions/demo/group.js

@@ -62,6 +62,13 @@ export default (function () {
     conditionRef.current.add();
   };
 
+  var onClear = function onClear() {
+    conditionRef.current.setValue();
+    setData({
+      conditions: []
+    });
+  };
+
   return /*#__PURE__*/React.createElement(BizGlobalDataContext.Provider, {
     value: {
       eventGroupList: store.eventGroupList,
@@ -79,5 +86,10 @@ export default (function () {
     onConditionsCount: setCount
   }), /*#__PURE__*/React.createElement("br", null), count < 3 && /*#__PURE__*/React.createElement(Button, {
     onClick: onClick
-  }, "\u6DFB\u52A0"), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("p", null, "\u5F53\u524D\u503C\uFF1A", JSON.stringify(data)));
+  }, "\u6DFB\u52A0"), count > 0 && /*#__PURE__*/React.createElement(Button, {
+    onClick: onClear,
+    style: {
+      marginLeft: '20px'
+    }
+  }, "\u6E05\u7A7A"), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("p", null, "\u5F53\u524D\u503C\uFF1A", JSON.stringify(data)));
 });

package/es/attrConditions/group.js

@@ -74,6 +74,20 @@ var BizConditionGroup = function BizConditionGroup(props, ref) {
           });
           return _toConsumableArray(conditions);
         });
+      },
+      setValue: function setValue(data) {
+        if (data) {
+          if (data.relation) setRelation(data.relation);
+
+          if (data.conditions) {
+            setConditions(function () {
+              return addKeyToGroup(data.conditions);
+            });
+          }
+        } else {
+          setRelation('and');
+          setConditions([]);
+        }
       }
     };
   });

package/es/attrConditions/index.js

@@ -28,7 +28,9 @@ var BizConditionItem = function BizConditionItem(props) {
       enableEventProp = props.enableEventProp,
       enableUserProp = props.enableUserProp,
       enableEnvProp = props.enableEnvProp,
-      disableItemList = props.disableItemList;
+      disableItemList = props.disableItemList,
+      border = props.border,
+      theme = props.theme;
 
   var _useState = useState(),
       _useState2 = _slicedToArray(_useState, 2),
@@ -101,7 +103,8 @@ var BizConditionItem = function BizConditionItem(props) {
         type: attr.type,
         operator: operate,
         values: values || [],
-        dimensionSub: attr.dimensionSub
+        dimensionSub: attr.dimensionSub,
+        label: attr.label
       };
 
       if (attr.propCategory === PropCategory.EventProp) {
@@ -132,7 +135,7 @@ var BizConditionItem = function BizConditionItem(props) {
   };
 
   return /*#__PURE__*/React.createElement("div", {
-    className: classPrefix
+    className: [classPrefix, border ? 'border' : ''].join(' ')
   }, /*#__PURE__*/React.createElement(Skeleton, {
     loading: ready,
     active: true,
@@ -148,10 +151,13 @@ var BizConditionItem = function BizConditionItem(props) {
     enableEnvProp: enableEnvProp,
     disableItemList: disableItemList,
     onChange: onChangeAttr,
-    onDelete: onDelete
+    onDelete: onDelete,
+    theme: theme,
+    destroyPopupOnHide: props.destroyPopupOnHide
   }), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-panel")
   }, /*#__PURE__*/React.createElement(BizOperateList, {
+    theme: theme,
     attr: attr,
     defaultValue: operate,
     onChange: onChangeOperate
@@ -159,8 +165,13 @@ var BizConditionItem = function BizConditionItem(props) {
     attr: attr,
     operate: operate,
     defaultValue: values,
-    onChange: onChangeValues
+    onChange: onChangeValues,
+    theme: theme
   }))));
 };
 
+BizConditionItem.defaultProps = {
+  border: true,
+  theme: 'secondary'
+};
 export default BizConditionItem;

package/es/attrConditions/styles/index.less

@@ -2,8 +2,9 @@
 
 /* 筛选条件 */
 .biz-condition-item {
-  .__select-handle();
-
+  &.border {
+    .__select-handle();
+  }
   &-panel {
     display: flex;
     width: 100%;
@@ -48,7 +49,7 @@
 
   &-single-select {
     width: 100px;
-    margin-right: 8px;
+    margin-right: @margin-xs;
 
     &.gray {
       color: @text-color-secondary;
@@ -59,16 +60,49 @@
     }
   }
 
+  &-value-content {
+    display: flex;
+    flex: 1;
+
+    .biz-select-handle {
+      margin-left: @margin-xs;
+    }
+  }
+
   &-input {
-    .ant-input-group-addon {
+    border: none;
+
+    &.ant-input-affix-wrapper {
+      height: @height-base !important;
       background-color: @background-color-gray !important;
+
+      input {
+        background-color: @background-color-gray !important;
+      }
+
+      &.ant-input-affix-wrapper-focused {
+        background-color: #fff !important;
+        border: 1px solid @primary-color;
+
+        input {
+          background-color: #fff !important;
+        }
+      }
+    }
+
+    &:focus {
+      border: 1px solid @primary-color;
+    }
+
+    .ant-input-group-addon {
+      // background-color: @background-color-gray !important;
       border: none;
     }
 
     &-select {
       width: 60px;
       border: none;
-      border-left: 1px solid @border-color-split;
+      // border-left: 1px solid @border-color-split;
     }
   }
 

package/es/attrConditions/types.d.ts

@@ -6,12 +6,14 @@ interface BasicAttrTypes {
     enableUserProp?: boolean;
     enableEnvProp?: boolean;
     disableItemList?: (EventProp | UserProp | EnvProp)[];
+    theme?: string;
 }
 export declare namespace AttrConditionTypes {
     interface ItemValue {
         subtype?: number;
         attrId?: number;
         attrName?: string;
+        label?: string;
         type?: PropType;
         propCategory?: 'userProp' | 'eventProp' | 'envProp';
         category?: 'fixed' | 'custom';
@@ -28,6 +30,8 @@ export declare namespace AttrConditionTypes {
         value?: ItemValue;
         onChange?: (value: ItemValue) => void;
         onDelete?: (value?: ItemValue) => void;
+        border?: boolean;
+        destroyPopupOnHide?: boolean;
     }
     interface GroupProp extends BasicAttrTypes {
         defaultValue?: GroupValue;

package/es/attrConditions/utils/operates.js

@@ -39,10 +39,10 @@ export var numberOperate = [{
   name: '<',
   value: 'lt'
 }, {
-  name: '>=',
+  name: '≥',
   value: 'ge'
 }, {
-  name: '<=',
+  name: '≤',
   value: 'le'
 }, {
   name: '≠',

package/es/attributeSelector/index.js

@@ -26,7 +26,8 @@ import SelectHandle from '../select/handle';
 
 var BizAttributeSelector = function BizAttributeSelector(props) {
   var enableDelete = props.enableDelete,
-      placeholder = props.placeholder;
+      placeholder = props.placeholder,
+      theme = props.theme;
 
   var _useState = useState(),
       _useState2 = _slicedToArray(_useState, 2),
@@ -120,14 +121,15 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
       width: width
     },
     visible: visible,
-    onVisibleChange: onVisibleChange
+    onVisibleChange: onVisibleChange,
+    destroyPopupOnHide: props.destroyPopupOnHide
   }, /*#__PURE__*/React.createElement("div", {
     style: {
       width: '100%'
     }
   }, /*#__PURE__*/React.createElement(SelectHandle, {
     ref: boxRef,
-    theme: "secondary",
+    theme: theme,
     border: false,
     label: currentAttr === null || currentAttr === void 0 ? void 0 : currentAttr.label,
     placeholder: placeholder
@@ -145,7 +147,9 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
 BizAttributeSelector.defaultProps = {
   enableDelete: false,
   placeholder: '请选择',
+  theme: 'secondary',
   propSymbol: '*',
-  optionsHeaderTip: '带＊的属性每日凌晨更新'
+  optionsHeaderTip: '带＊的属性每日凌晨更新',
+  destroyPopupOnHide: false
 };
 export default BizAttributeSelector;

package/es/attributeSelector/listPanel.js

@@ -1,3 +1,11 @@
+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 _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 _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."); }
@@ -11,7 +19,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { Anchor, Button } from 'antd';
-import React, { useContext, useEffect, useState } from 'react';
+import React, { useContext, useEffect, useMemo, useState } from 'react';
 import { BizGlobalDataContext } from '..';
 import BizSearchInput from '../searchInput';
 import Option from './option';
@@ -46,6 +54,17 @@ var AttrListPanel = function AttrListPanel(props) {
       currentAttr = _useState6[0],
       setCurrentAttr = _useState6[1];
 
+  var eventIdMap = useMemo(function () {
+    var eventIdMap = {};
+    var eventList = (eventGroupList || []).reduce(function (pre, group) {
+      return [].concat(_toConsumableArray(pre), _toConsumableArray(group.eventList));
+    }, []);
+    eventList.forEach(function (event) {
+      if (eventIdMap[event.id]) return;
+      eventIdMap[event.id] = event;
+    });
+    return eventIdMap;
+  }, [eventGroupList]);
   var disableItemlist = (_props$disableItemLis = props.disableItemList) === null || _props$disableItemLis === void 0 ? void 0 : _props$disableItemLis.map(function (item) {
     if (item.propCategory === 'envProp') {
       item.key = "envProp-".concat(item.name);
@@ -69,23 +88,17 @@ var AttrListPanel = function AttrListPanel(props) {
 
     if (enableEventProp) {
       var hasAnchor = false;
-      eventGroupList === null || eventGroupList === void 0 ? void 0 : eventGroupList.forEach(function (group) {
-        group.eventList.forEach(function (event) {
-          if (event.isDelete || event.isStop) return;
-          if (eventIdList && eventIdList.length && !eventIdList.includes(event.id)) return;
-          var group = {
-            isEvent: true,
-            groupName: event.alias || event.name,
-            anchor: hasAnchor ? String(Math.random()) : anchor.event,
-            key: "event-".concat(event.id),
-            children: []
-          };
-          hasAnchor = true;
-          event.attrList.forEach(function (attr) {
-            group.children.push(attr);
-          });
-          list.push(group);
-        });
+      eventIdList === null || eventIdList === void 0 ? void 0 : eventIdList.forEach(function (id) {
+        var event = eventIdMap[id];
+        if (!event) return;
+        var group = {
+          isEvent: true,
+          groupName: event.alias || event.name,
+          anchor: hasAnchor ? String(Math.random()) : anchor.event,
+          key: "event-".concat(event.id),
+          children: event.attrList.slice()
+        };
+        list.push(group);
       });
     }
 
@@ -110,7 +123,7 @@ var AttrListPanel = function AttrListPanel(props) {
     }
 
     setOptionList(list);
-  }, [eventGroupList, userPropList, eventEnvList, eventIdList]);
+  }, [eventIdMap, userPropList, eventEnvList, eventIdList]);
   useEffect(function () {
     setCurrentAttr(props.value);
   }, [props.value]);

package/es/attributeSelector/styles/index.less

@@ -5,7 +5,9 @@
     flex-direction: row;
     .__select-handle();
     &:hover .biz-attr-select-del-icon {
-      display: inline-block;
+      display: flex;
+      align-items: center;
+      justify-content: center;
     }
   }
   &-del-icon {
@@ -13,8 +15,6 @@
     flex: none;
     width: @icon-width;
     color: @text-color-secondary;
-    line-height: 2em;
-    text-align: center;
     border-radius: @border-radius-small;
 
     &:hover {

package/es/attributeSelector/types.d.ts

@@ -9,6 +9,10 @@ export declare enum PropCategory {
     UserProp = "userProp",
     EnvProp = "envProp"
 }
+export declare enum ShowStatus {
+    show = 0,
+    hidden = 1
+}
 export interface AnalysisEvent {
     id: number;
     name: string;
@@ -17,6 +21,7 @@ export interface AnalysisEvent {
     isDelete?: boolean;
     isStop?: boolean;
     isOverview?: boolean;
+    eventHidden?: ShowStatus;
 }
 export interface EventGroup {
     id: number;
@@ -72,6 +77,8 @@ export declare namespace AttributeSelect {
         optionsHeaderTip?: string;
         onChange?: (value: Value) => void;
         onDelete?: (value?: Value) => void;
+        theme?: string;
+        destroyPopupOnHide?: boolean;
     }
     interface Option {
         groupName: string;

package/es/attributeSelector/types.js

@@ -12,4 +12,11 @@ export var PropCategory;
   PropCategory["EventProp"] = "eventProp";
   PropCategory["UserProp"] = "userProp";
   PropCategory["EnvProp"] = "envProp";
-})(PropCategory || (PropCategory = {}));
+})(PropCategory || (PropCategory = {}));
+
+export var ShowStatus;
+
+(function (ShowStatus) {
+  ShowStatus[ShowStatus["show"] = 0] = "show";
+  ShowStatus[ShowStatus["hidden"] = 1] = "hidden";
+})(ShowStatus || (ShowStatus = {}));