@zgfe/modules-interval 1.0.0-interval.17 → 1.0.0-interval.18

package/dist/esm/components/common/styles/index.less

@@ -11,17 +11,21 @@
   }
 
   &-none-text {
-    color: @text-color;
-    font-size: 16px;
+    color: #354354;
+    font-size: 14px;
   }
 
   &-none {
-    width: 348px;
-    height: 132px;
-    background: url('../../../style/image/noData.png') no-repeat;
+    width: 88px;
+    height: 88px;
+    background-image: url('../../../style/image/empty.png');
+    background-repeat: no-repeat;
+    background-size: cover;
   }
 
   &-none-container {
-    text-align: center;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
   }
 }

package/dist/esm/components/eventFilter/index.js

@@ -10,7 +10,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 = 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 { Switch, Tooltip } from 'antd';
+import { Switch, Tooltip, message } from 'antd';
 import React, { useEffect, useRef, useState } from 'react';
 import { BizEventSelector, IconFont, BizAttrConditionGroup } from '@zgfe/business-lib';
 import "./styles/index.less";
@@ -82,11 +82,16 @@ var EventFilter = function EventFilter(props) {
 
   // 添加筛选
   var onAdd = function onAdd() {
+    if (!eventOverview) {
+      message.error('请先选择目标事件');
+      return;
+    }
     if (event.id === -1) {
       return;
     }
     // 最多可添加10条属性筛选
     if (count >= 10) {
+      message.error('最多可添加 10 条属性筛选');
       return;
     }
     setIsAdd(true);
@@ -97,12 +102,7 @@ var EventFilter = function EventFilter(props) {
 
   // 筛选条件改变
   var onChangeFilters = function onChangeFilters(data) {
-    if (data && data.conditions && data.conditions.length > 0) {
-      setFilter(data);
-    } else {
-      setFilter(undefined);
-      setIsAdd(false);
-    }
+    setFilter(data);
   };
   var onChangeEvent = function onChangeEvent(event) {
     if (event && event.event && event.event.id === null) {
@@ -151,25 +151,29 @@ var EventFilter = function EventFilter(props) {
     },
     onChange: onChangeEvent,
     placeholder: "\u8BF7\u9009\u62E9\u4E8B\u4EF6"
-  }), eventOverview && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Tooltip, {
+  }), /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Tooltip, {
     placement: "top",
-    title: '添加属性筛选'
+    title: !eventOverview ? '请先选择目标事件' : count < 10 ? '添加属性筛选' : '最多可添加 10 条属性筛选'
   }, /*#__PURE__*/React.createElement(IconFont, {
-    className: "".concat(count >= 10 || event.id === -1 ? 'disable' : ''),
+    className: "".concat(count >= 10 || event.id === -1 || !eventOverview ? 'disable' : ''),
     type: "shaixuan",
     onClick: function onClick() {
       return onAdd();
     }
-  }))), props !== null && props !== void 0 && props.relevancy && eventOverview ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Switch, {
+  }))), props !== null && props !== void 0 && props.relevancy ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Tooltip, {
+    placement: "top",
+    title: props.relevancyFl ? '请选择开始和结束事件' : ''
+  }, /*#__PURE__*/React.createElement(Switch, {
     size: "default",
     style: {
       marginLeft: 24
     },
     checked: relevancy,
+    disabled: props.relevancyFl,
     onChange: function onChange(checked) {
       return setRelevancy(checked);
     }
-  }), /*#__PURE__*/React.createElement("span", {
+  })), /*#__PURE__*/React.createElement("span", {
     className: "switch-title"
   }, "\u8BBE\u7F6E\u5173\u8054\u5C5E\u6027")) : ''), (filter || isAdd) && /*#__PURE__*/React.createElement("div", {
     className: "".concat(count > 0 ? 'attr-box-show' : '', " top")

package/dist/esm/components/eventFilter/styles/index.less

@@ -1,11 +1,8 @@
 .interval-box {
   > :nth-child(1) {
-    display: flex;
     display: flex;
     gap: 16px;
     align-items: center;
-    margin-bottom: 12px;
-    margin-bottom: 12px;
 
     .biz-event-select,
     .biz-attr-select {

package/dist/esm/components/eventFilter/types.d.ts

@@ -46,6 +46,7 @@ export interface ConditionsnProps {
 export interface EventFilterProps {
     id?: string;
     value?: eventProps;
+    relevancyFl?: boolean;
     relevancy?: boolean;
     onChange?: (event: eventProps) => {};
 }

package/dist/esm/components/renderContent/index.js

@@ -49,7 +49,7 @@ var ContentPanel = function ContentPanel(props) {
   }) : /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-MiNone")
   }, /*#__PURE__*/React.createElement(MiNone, {
-    label: "\u6682\u65E0\u6570\u636E"
+    label: !eventData ? '请选择条件进行查询' : '暂无数据'
   }))));
 };
 export default ContentPanel;

package/dist/esm/components/searchPanel/index.js

@@ -115,6 +115,7 @@ var SearchPanel = function SearchPanel(props) {
     multiple: true,
     disable: displaySetupList.length === 0,
     onChange: onDimensionChange,
+    overlayClassName: "interval-select-overlay",
     className: "".concat(classPrefix, "-select"),
     placeholder: "\u8BF7\u9009\u62E9\u663E\u793A\u8BBE\u7F6E",
     enableSearch: true,

package/dist/esm/components/searchPanel/styles/index.less

@@ -5,6 +5,10 @@
   height: 32px;
   margin-bottom: 24px;
 
+  .biz-date-picker-wrap-list {
+    font-size: 14px;
+  }
+
   &-search-right {
     display: flex;
   }
@@ -21,38 +25,40 @@
   }
 }
 
-.biz-select-option.biz-select-option-multiple:hover:not(.disabled) {
-  color: var(--1, #021429);
-  background: var(--io-i-1, #e8efff);
-}
+.interval-select-overlay {
+  .biz-select-option.biz-select-option-multiple:hover:not(.disabled) {
+    color: var(--1, #021429);
+    background: var(--io-i-1, #e8efff);
+  }
 
-.biz-select-overlay {
-  padding: 0;
-}
+  .biz-select-overlay {
+    padding: 0;
+  }
 
-.biz-select-list-panel {
-  display: grid;
-  gap: 8px;
-}
+  .biz-select-list-panel {
+    display: grid;
+    gap: 8px;
+  }
 
-.biz-select-option {
-  padding: 0 16px;
-  border-radius: 0;
-}
+  .biz-select-option {
+    padding: 0 16px;
+    border-radius: 0;
+  }
 
-.biz-select-option.biz-select-option-multiple.active:not(.disabled) {
-  color: var(--1, #021429);
-}
+  .biz-select-option.biz-select-option-multiple.active:not(.disabled) {
+    color: var(--1, #021429);
+  }
 
-.biz-select-option.biz-select-option-multiple:hover:not(.disabled) .biz-select-checkbox {
-  color: #ccd0d4;
-}
+  .biz-select-option.biz-select-option-multiple:hover:not(.disabled) .biz-select-checkbox {
+    color: #ccd0d4;
+  }
 
-.biz-select-option.biz-select-option-multiple.active:hover:not(.disabled) .biz-select-checkbox {
-  color: #165dff;
-}
+  .biz-select-option.biz-select-option-multiple.active:hover:not(.disabled) .biz-select-checkbox {
+    color: #165dff;
+  }
 
-.biz-select-option.biz-select-option-multiple:active:not(.disabled) {
-  color: #165dff;
-  background: var(--io-i-1, #e8efff);
+  .biz-select-option.biz-select-option-multiple:active:not(.disabled) {
+    color: #165dff;
+    background: var(--io-i-1, #e8efff);
+  }
 }

package/dist/esm/components/topBar/styles/index.less

@@ -21,6 +21,7 @@
     > div {
       position: relative;
       padding: 0 16px;
+      font-size: 14px;
       background: #fff;
       border: 1px solid #ecedf0;
       cursor: pointer;

package/dist/esm/modules/chart/index.js

@@ -88,7 +88,7 @@ var IntervalEventChart = function IntervalEventChart(props) {
   }
   if (!dataSource || !(dataSource !== null && dataSource !== void 0 && (_dataSource$appData2 = dataSource.appData) !== null && _dataSource$appData2 !== void 0 && _dataSource$appData2.series.length)) {
     return /*#__PURE__*/React.createElement(MiNone, {
-      label: "\u6682\u65E0\u6570\u636E"
+      label: !dataSource ? '请选择条件进行查询' : '暂无数据'
     });
   }
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(IntervalChart, {

package/dist/esm/modules/content/index.js

@@ -195,6 +195,7 @@ var EventContent = function EventContent(props) {
   }), /*#__PURE__*/React.createElement(BizLayout, {
     showTitle: false,
     hasCollapse: true,
+    className: "interval-layout",
     collapseRef: collapseRef,
     topPanel: /*#__PURE__*/React.createElement(TopPanel, {
       collapseRef: collapseRef,

package/dist/esm/modules/content/utils.d.ts

@@ -26,11 +26,7 @@ export declare function searchCondition(params: any): {
     condition: any;
 };
 export declare function searchDataParams(params: any): {
-    time: {
-        dimensionDate: any;
-        beginDate: any;
-        endDate: any;
-    };
+    time: any;
     platform: any;
     userGroup: any;
     start: {

package/dist/esm/modules/content/utils.js

@@ -1,3 +1,9 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+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; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 /**
  * 判断当前细分属性是否为”城市“
  * @param name 属性名称
@@ -74,13 +80,9 @@ export function searchCondition(params) {
   };
 }
 export function searchDataParams(params) {
-  var _params$time, _params$time2, _params$time3, _params$dimension, _params$dimension2, _params$dimension3, _params$dimension4, _params$dimension5, _params$dimension6, _params$dimension7, _params$dimension8, _params$dimension9, _params$dimension10, _params$dimension11, _params$dimension12, _params$associatedPre, _params$associatedNex;
+  var _params$dimension, _params$dimension2, _params$dimension3, _params$dimension4, _params$dimension5, _params$dimension6, _params$dimension7, _params$dimension8, _params$dimension9, _params$dimension10, _params$dimension11, _params$dimension12, _params$associatedPre, _params$associatedNex;
   return {
-    time: {
-      dimensionDate: params === null || params === void 0 ? void 0 : (_params$time = params.time) === null || _params$time === void 0 ? void 0 : _params$time.unit,
-      beginDate: params === null || params === void 0 ? void 0 : (_params$time2 = params.time) === null || _params$time2 === void 0 ? void 0 : _params$time2.begin,
-      endDate: params === null || params === void 0 ? void 0 : (_params$time3 = params.time) === null || _params$time3 === void 0 ? void 0 : _params$time3.end
-    },
+    time: _objectSpread({}, params === null || params === void 0 ? void 0 : params.time),
     platform: (params === null || params === void 0 ? void 0 : params.platform) || 0,
     userGroup: params.userGroup,
     start: searchCondition(params === null || params === void 0 ? void 0 : params.start),

package/dist/esm/modules/home/styles/index.less

@@ -8,7 +8,11 @@
   min-width: 1000px;
   height: 100%;
   background: #fafafb;
-
+  .interval-layout {
+    .biz-layout-collapse-handle {
+      height: 24px;
+    }
+  }
   &-header-title {
     height: 48px;
     padding: 0px 24px;

package/dist/esm/modules/topPanel/index.js

@@ -40,7 +40,7 @@ var TopPanel = function TopPanel(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     relevancy = _useState6[0],
     setRelevancy = _useState6[1];
-  var _useState7 = useState(false),
+  var _useState7 = useState(true),
     _useState8 = _slicedToArray(_useState7, 2),
     relevancyFl = _useState8[0],
     setRelevancyFl = _useState8[1];
@@ -69,7 +69,7 @@ var TopPanel = function TopPanel(props) {
       }
     }
     if (startId && endId) {
-      setRelevancyFl(true);
+      setRelevancyFl(false);
     }
     if (allData.userGroup) {
       _data.userGroup = allData.userGroup;
@@ -140,7 +140,7 @@ var TopPanel = function TopPanel(props) {
     form: form,
     component: "div",
     colon: false,
-    className: "panel-form",
+    className: "panel-form-interval",
     layout: "vertical",
     initialValues: {
       userGroup: userGroup ? userGroup : [0],
@@ -170,7 +170,7 @@ var TopPanel = function TopPanel(props) {
   }, /*#__PURE__*/React.createElement(Form.Item, {
     label: "",
     name: "userGroup",
-    className: "space-item",
+    className: "space-item interval-item",
     style: {
       paddingLeft: 0
     }
@@ -179,15 +179,13 @@ var TopPanel = function TopPanel(props) {
     max: 1
   })), /*#__PURE__*/React.createElement("div", {
     ref: collapseRef,
-    style: {
-      paddingLeft: 24
-    },
     className: "collapseRefs"
   }, /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u5F00\u59CB\u4E8B\u4EF6",
     name: "start"
   }, /*#__PURE__*/React.createElement(EventFilter, {
-    relevancy: relevancyFl
+    relevancyFl: relevancyFl,
+    relevancy: true
   })), relevancy ? /*#__PURE__*/React.createElement(Form.Item, {
     style: {
       marginBottom: 0
@@ -248,7 +246,6 @@ var TopPanel = function TopPanel(props) {
       onChangeAttr(undefined, 'associatedPreAttr');
       onChangeAttr(undefined, 'associatedNextAttr');
       setRelevancy(false);
-      setRelevancyFl(false);
     },
     className: "bsicon qingchu"
   })) : '', /*#__PURE__*/React.createElement(Form.Item, {
@@ -256,7 +253,8 @@ var TopPanel = function TopPanel(props) {
     name: "end"
   }, /*#__PURE__*/React.createElement(EventFilter, null)), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u6309\u5C5E\u6027\u7EC6\u5206",
-    name: "dimension"
+    name: "dimension",
+    className: "dimension-interval"
   }, /*#__PURE__*/React.createElement(BizAttributeSelector, {
     enableEventProp: true,
     enableUserProp: true,

package/dist/esm/modules/topPanel/styles/index.less

@@ -17,7 +17,35 @@
   }
 }
 
-.panel-form {
+.panel-form-interval {
+  .interval-item {
+    .ant-space-vertical {
+      gap: 0px !important;
+      width: 100%;
+
+      .ant-space-item:nth-child(1) {
+        padding: 0 12px;
+      }
+
+      .ant-space-item:nth-child(2) {
+        display: flex;
+        align-items: center;
+        height: 42px;
+        margin-top: 4px;
+        padding: 0 12px;
+      }
+
+      .ant-space-item:nth-child(2):hover {
+        background-color: #e8efff;
+      }
+    }
+  }
+
+  .biz-user-group-header {
+    padding: 0;
+    background-color: #fff;
+  }
+
   .space-item {
     .ant-space-item {
       .biz-user-group {
@@ -32,9 +60,65 @@
   }
 
   .collapseRefs {
+    .biz-attr-condition-group-container {
+      margin-top: 12px;
+    }
+
     .ant-form-item {
       margin-bottom: 12px;
     }
+
+    .ant-form-item-control-input {
+      display: flex;
+      align-items: center;
+    }
+
+    .ant-form-item-label {
+      padding-left: 24px;
+    }
+
+    .interval-box {
+      > div:nth-child(1) {
+        padding: 4px 24px;
+      }
+
+      > div:nth-child(1):hover {
+        background-color: #e8efff;
+      }
+
+      .biz-attr-condition-group-handle {
+        margin-right: 0;
+        margin-left: 24px;
+      }
+
+      .biz-attr-condition-group-container {
+        gap: 4px !important;
+      }
+      .ant-space-item {
+        max-width: calc(100% + 24px) !important;
+        margin-left: -24px;
+        padding: 4px 48px;
+
+        .ant-space-item {
+          width: auto;
+          max-width: auto;
+          margin-left: 0px;
+          padding: 0;
+        }
+      }
+
+      .ant-space-item:hover {
+        background-color: #e8efff;
+      }
+    }
+    .dimension-interval {
+      .ant-form-item-control-input {
+        padding: 4px 24px;
+      }
+      .ant-form-item-control-input:hover {
+        background-color: #e8efff;
+      }
+    }
   }
 
   .biz-event-select {
@@ -43,7 +127,6 @@
 
   > .ant-form-item {
     margin-bottom: 12px;
-    padding-left: 24px;
   }
 
   .associated {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-interval",
-  "version": "1.0.0-interval.17",
+  "version": "1.0.0-interval.18",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",