@zgfe/business-lib 1.0.16 → 1.0.18-esfix.1

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;
@@ -429,15 +456,15 @@
     background-color: #94a6ce !important;
   }
 }
-
-.ant-btn-primary {
-  color: #fff !important;
+.ant-form-item-explain-error {
+  color: @error-color!important;
 }
 
-.ant-btn-ghost {
-  color: @text-color-secondary!important;
+//dropdown
+.ant-dropdown {
+  z-index: 6666 !important;
 }
-
-.ant-form-item-explain-error {
-  color: @error-color!important;
+//message
+.ant-message {
+  z-index: 99999 !important;
 }

package/es/assets/theme.js

@@ -6,7 +6,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
   'use strict';
 
   exports.theme = {
-    'primary-color': 'red',
+    'primary-color': '#165dff',
     'border-color-base': '#ECEDF0',
     'background-color-base': '#fafafb',
     'text-color': '#021429',

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

@@ -43,6 +43,16 @@ var StringList = function StringList(props) {
       isFirst = _useState6[0],
       setIsFirst = _useState6[1];
 
+  var _useState7 = useState(''),
+      _useState8 = _slicedToArray(_useState7, 2),
+      searchValue = _useState8[0],
+      setSearchValue = _useState8[1];
+
+  var _useState9 = useState(0),
+      _useState10 = _slicedToArray(_useState9, 2),
+      timer = _useState10[0],
+      setTimer = _useState10[1];
+
   useEffect(function () {
     if (props.value) {
       var data = props.value.map(function (item) {
@@ -57,7 +67,7 @@ var StringList = function StringList(props) {
     }
   }, [props.value]);
   useEffect(function () {
-    fetchValues(props.attr);
+    fetchValues();
 
     if (isFirst) {
       setIsFirst(false);
@@ -71,55 +81,66 @@ var StringList = function StringList(props) {
       onChange([]);
     }
   }, [props.operate]);
+  useEffect(function () {
+    fetchValues();
+  }, [searchValue]);
 
   var fetchValues = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(attrData) {
-      var requestData, transformRequest, formData;
+    var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+      var fetch;
       return regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              requestData = {
-                app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-                platform: currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform,
-                limit: 10000,
-                attr: (attrData === null || attrData === void 0 ? void 0 : attrData.id) || 0,
-                dimension_sub: attrData === null || attrData === void 0 ? void 0 : attrData.dimensionSub,
-                v: ''
-              };
-
-              transformRequest = function transformRequest(params) {
-                var arr = [];
-
-                for (var key in params) {
-                  arr.push("".concat(key, "=").concat(encodeURIComponent(params[key])));
-                }
-
-                return arr.join('&');
+              fetch = function fetch() {
+                var attrData = props.attr;
+                var requestData = {
+                  app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+                  platform: currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform,
+                  limit: 20,
+                  attr: (attrData === null || attrData === void 0 ? void 0 : attrData.id) || 0,
+                  dimension_sub: attrData === null || attrData === void 0 ? void 0 : attrData.dimensionSub,
+                  v: searchValue || ''
+                };
+
+                var transformRequest = function transformRequest(params) {
+                  var arr = [];
+
+                  for (var key in params) {
+                    arr.push("".concat(key, "=").concat(encodeURIComponent(params[key])));
+                  }
+
+                  return arr.join('&');
+                };
+
+                var formData = transformRequest(requestData);
+                request(Apis.esQuery, {
+                  method: 'post',
+                  data: formData,
+                  headers: {
+                    'Content-Type': 'application/x-www-form-urlencoded'
+                  }
+                }).then(function (result) {
+                  setOptions(function () {
+                    return result && result.sources ? result.sources.map(function (item) {
+                      return {
+                        name: item,
+                        value: item
+                      };
+                    }) : [];
+                  });
+                }).catch(function (e) {
+                  console.error(e);
+                  setOptions([]);
+                });
               };
 
-              formData = transformRequest(requestData);
-              request(Apis.esQuery, {
-                method: 'post',
-                data: formData,
-                headers: {
-                  'Content-Type': 'application/x-www-form-urlencoded'
-                }
-              }).then(function (result) {
-                setOptions(function () {
-                  return result && result.sources ? result.sources.map(function (item) {
-                    return {
-                      name: item,
-                      value: item
-                    };
-                  }) : [];
-                });
-              }).catch(function (e) {
-                console.error(e);
-                setOptions([]);
-              });
+              if (timer) clearTimeout(timer);
+              setTimer(setTimeout(function () {
+                fetch();
+              }, 400));
 
-            case 4:
+            case 3:
             case "end":
               return _context.stop();
           }
@@ -127,7 +148,7 @@ var StringList = function StringList(props) {
       }, _callee);
     }));
 
-    return function fetchValues(_x) {
+    return function fetchValues() {
       return _ref.apply(this, arguments);
     };
   }();
@@ -143,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: [],
@@ -156,13 +177,14 @@ 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",
     keyField: "value",
     options: options,
-    onChange: onChange
+    onChange: onChange,
+    onSearch: setSearchValue
   });
 };
 

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

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

package/es/attrConditions/components/valuesList.js

@@ -27,7 +27,8 @@ var ValuesList = function ValuesList(props) {
   var attr = props.attr,
       defaultValue = props.defaultValue,
       operate = props.operate,
-      includeToday = props.includeToday;
+      includeToday = props.includeToday,
+      theme = props.theme;
   var initValue = [moment().subtract(1, 'weeks').format('YYYY-MM-DD'), moment().subtract(includeToday ? 0 : 1, 'days').format('YYYY-MM-DD')];
 
   var _useState = useState(),
@@ -119,14 +120,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,7 +140,7 @@ var ValuesList = function ValuesList(props) {
       },
       keyField: "value",
       labelField: "label",
-      theme: "secondary",
+      theme: props.theme,
       className: "".concat(classPrefix, "-input-select"),
       onChange: onChangeUnit,
       options: propSubtype

package/es/attrConditions/demo/index.js

@@ -23,14 +23,13 @@ export default (function () {
 
   var _useState = useState({
     condition: {
-      propCategory: 'userProp',
-      type: 2,
-      operator: 'lt',
-      values: ['25200', '1'],
-      subtype: 2,
-      attrName: 'duration',
-      attrId: 0,
-      category: 'fixed'
+      attrId: 30183426,
+      propCategory: 'eventProp',
+      type: 1,
+      operator: 'equal',
+      values: [],
+      dimensionSub: 'event_attr',
+      attrName: '公众号名称'
     }
   }),
       _useState2 = _slicedToArray(_useState, 2),

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),
@@ -132,7 +134,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 +150,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 +164,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%;
@@ -60,15 +61,15 @@
   }
 
   &-input {
+    flex: 1;
     .ant-input-group-addon {
-      background-color: @background-color-gray !important;
+      // background-color: @background-color-gray !important;
       border: none;
     }
 
     &-select {
       width: 60px;
       border: none;
-      border-left: 1px solid @border-color-split;
     }
   }
 

package/es/attrConditions/types.d.ts

@@ -6,6 +6,7 @@ interface BasicAttrTypes {
     enableUserProp?: boolean;
     enableEnvProp?: boolean;
     disableItemList?: (EventProp | UserProp | EnvProp)[];
+    theme?: string;
 }
 export declare namespace AttrConditionTypes {
     interface ItemValue {
@@ -28,6 +29,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 {