@zgfe/business-lib 1.0.24-alpha.6 → 1.0.24-insight.0

package/es/addToPanel/index.js

@@ -166,7 +166,9 @@ var BizAddToPanel = function BizAddToPanel(props) {
 
               if (router && routes) router.push({
                 name: routes.panel,
-                params: ((_result$panel = result.panel) === null || _result$panel === void 0 ? void 0 : _result$panel.id) || form.panel.id
+                params: {
+                  panelId: ((_result$panel = result.panel) === null || _result$panel === void 0 ? void 0 : _result$panel.id) || form.panel.id
+                }
               });
             }
           }, form.panel.name || ((_result$panel2 = result.panel) === null || _result$panel2 === void 0 ? void 0 : _result$panel2.name)), "\u6210\u529F")

package/es/assets/styles/chunks.less

@@ -7,7 +7,7 @@
 // 通用hover样式，适用于下拉选项等
 .__default-hover {
   color: @primary-color;
-  background: color(~`colorPalette('@{primary-color}', 0.1) `);
+  background: @primary-color-hover;
   border-color: @primary-color;
   cursor: pointer;
 
@@ -20,7 +20,7 @@
 .__default-focused {
   background-color: #fff;
   border-color: @primary-color;
-  box-shadow: 0 0 0 4px color(~`colorPalette('@{primary-color}', 0.1) `);
+  box-shadow: 0 0 0 4px @primary-color-hover;
 }
 
 // 下拉组件操作栏样式

package/es/assets/styles/resetAntd.less

@@ -40,7 +40,7 @@
   &:focus,
   &-focused {
     background-color: #fff !important;
-    box-shadow: 0 0 0 4px color(~`colorPalette('@{primary-color}', 0.1) `) !important;
+    box-shadow: 0 0 0 4px @primary-color-hover !important;
   }
   &.ant-input-status-error {
     border-color: @error-color !important;
@@ -238,7 +238,7 @@
 
   /*日期范围内背景色*/
   .ant-picker-cell-in-range::before {
-    background: color(~`colorPalette('@{primary-color}', 0.1) `) !important;
+    background: @primary-color-hover !important;
   }
 
   /*日期范围内的hover效果-背景不变*/
@@ -253,7 +253,7 @@
   .ant-picker-panel
     > :not(.ant-picker-date-panel)
     .ant-picker-cell-in-view.ant-picker-cell-in-range.ant-picker-cell-range-hover-end::before {
-    background: color(~`colorPalette('@{primary-color}', 0.1) `) !important;
+    background: @primary-color-hover !important;
   }
 
   /*日期范围内的hover效果*/
@@ -395,7 +395,7 @@
 
   .ant-table-tbody > tr.ant-table-row:hover > td,
   .ant-table-tbody > tr > td.ant-table-cell-row-hover {
-    background: color(~`colorPalette('@{primary-color}', 0.1) `) !important;
+    background: @primary-color-hover !important;
   }
   .ant-table-thead {
     .ant-table-cell {

package/es/assets/styles/variable.less

@@ -10,4 +10,5 @@
 
 @shadow-color-light: rgba(0, 0, 0, 0.1);
 @box-shadow-small: 0px 1px 2px @shadow-color-light;
-@box-shadow-form: 0 0 0 4px color(~`colorPalette('@{primary-color}', 0.1) `);
+@primary-color-hover: color(~`colorPalette('@{primary-color}', 0.1) `);
+@box-shadow-form: 0 0 0 4px @primary-color-hover;

package/es/datePicker/index.js

@@ -50,9 +50,21 @@ var BizDatePicker = function BizDatePicker(props) {
 
     if (data) {
       setCurrentType(function () {
-        return dateList.filter(function (item) {
+        var list = dateList.filter(function (item) {
           return item.value === data.unit;
         })[0] || dateList[0];
+
+        if (data.relative) {
+          var valueData = list.children.filter(function (item) {
+            return item.count === data.relative[0];
+          })[0];
+
+          if (valueData) {
+            setCurrentTime(valueData);
+          }
+        }
+
+        return list;
       });
       setDateRange(function () {
         return {

package/es/datePicker/styles/index.less

@@ -45,7 +45,7 @@
 
     &.active {
       color: @primary-color;
-      background: color(~`colorPalette('@{primary-color}', 0.1) `);
+      background: @primary-color-hover;
       border: 1px solid @primary-color;
     }
   }

package/es/eventSelector/listPanel.js

@@ -55,15 +55,10 @@ var EventListPanel = function EventListPanel(props) {
       searchEventList = _useState8[0],
       setSearchEventList = _useState8[1];
 
-  var _useState9 = useState([]),
+  var _useState9 = useState(),
       _useState10 = _slicedToArray(_useState9, 2),
-      showList = _useState10[0],
-      setShowList = _useState10[1];
-
-  var _useState11 = useState(),
-      _useState12 = _slicedToArray(_useState11, 2),
-      currentValue = _useState12[0],
-      setCurrentValue = _useState12[1];
+      currentValue = _useState10[0],
+      setCurrentValue = _useState10[1];
 
   var overviewData = {
     id: -100,
@@ -107,18 +102,8 @@ var EventListPanel = function EventListPanel(props) {
     setSearchEventList(function () {
       return list;
     });
-    setShowList(function () {
-      return list.slice(0, 10);
-    });
   }, [searchValue, currentGroup, showOverview]);
 
-  var loadMoreData = function loadMoreData() {
-    var moreData = searchEventList.slice(showList.length, showList.length + 10);
-    setShowList(function (list) {
-      return [].concat(_toConsumableArray(list), _toConsumableArray(moreData));
-    });
-  };
-
   function onClickEvent(e) {
     var resVal = _.cloneDeep(currentValue) || {};
     resVal.event = e;
@@ -172,7 +157,39 @@ var EventListPanel = function EventListPanel(props) {
   }), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-list"),
     id: "scrollableDiv"
-  }, /*#__PURE__*/React.createElement(InfiniteScroll, {
+  }, /*#__PURE__*/React.createElement(InfiniteScrollList, {
+    searchEventList: searchEventList,
+    searchValue: searchValue,
+    currentGroup: currentGroup,
+    currentValue: currentValue,
+    onClick: onClickEvent
+  }))));
+};
+
+var InfiniteScrollList = function InfiniteScrollList(_ref) {
+  var searchEventList = _ref.searchEventList,
+      searchValue = _ref.searchValue,
+      currentGroup = _ref.currentGroup,
+      currentValue = _ref.currentValue,
+      onClick = _ref.onClick;
+
+  var _useState11 = useState([]),
+      _useState12 = _slicedToArray(_useState11, 2),
+      showList = _useState12[0],
+      setShowList = _useState12[1];
+
+  useEffect(function () {
+    setShowList(searchEventList.slice(0, 10));
+  }, [searchEventList]);
+
+  var loadMoreData = function loadMoreData() {
+    var moreData = searchEventList.slice(showList.length, showList.length + 10);
+    setShowList(function (list) {
+      return [].concat(_toConsumableArray(list), _toConsumableArray(moreData));
+    });
+  };
+
+  return /*#__PURE__*/React.createElement(InfiniteScroll, {
     dataLength: showList.length,
     hasMore: showList.length < searchEventList.length,
     loader: /*#__PURE__*/React.createElement(Skeleton, {
@@ -184,7 +201,7 @@ var EventListPanel = function EventListPanel(props) {
     next: loadMoreData,
     scrollableTarget: "scrollableDiv",
     key: Math.random()
-  }, showList === null || showList === void 0 ? void 0 : showList.map(function (e) {
+  }, showList.map(function (e) {
     var _currentValue$event;
 
     if (e.eventHidden === ShowStatus.hidden) return null;
@@ -197,9 +214,9 @@ var EventListPanel = function EventListPanel(props) {
         text: searchValue
       },
       data: e,
-      onClick: onClickEvent
+      onClick: onClick
     });
-  })))));
+  }));
 };
 
 export default EventListPanel;

package/es/icon/iconFont.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import { IconFontProps } from '@ant-design/icons/lib/components/IconFont';
+import '../assets/iconfont/iconfont.css';
 interface Props extends IconFontProps {
     family?: string;
     size?: number;

package/es/icon/iconFont.js

@@ -11,6 +11,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
 import React, { useMemo } from 'react';
+import '../assets/iconfont/iconfont.css';
 
 var IconFont = function IconFont(props) {
   var className = props.className,

package/es/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference path="../typings.d.ts" />
-import BizAnalysisLayout from './analysisLayout';
+import BizAnalysisLayout from './layout/analysisLayout';
 import BizUserGroup from './userGroup';
 import BizTargetSelector from './targetSelector';
 import BizEventSelector from './eventSelector/index';
@@ -25,7 +25,8 @@ import BizAddToPanel from './addToPanel';
 import setGlobalConfig from './config';
 import BizCycleTime from './cycleTime';
 import BizDnd from './dnd';
-export { BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizUserGroup, IconFont, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetCondition, BizDatePicker, BizConditionItem, BizConditionGroup, BizUserCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, ajax, util, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig, };
+import BizDetailLayout from './layout/detail';
+export { BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizDetailLayout, BizUserGroup, IconFont, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetCondition, BizDatePicker, BizConditionItem, BizConditionGroup, BizUserCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, ajax, util, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig, };
 export type { UserGroupTypes } from './userGroup/types';
 export type { BizSelectTypes } from './select/types';
 export type { AttributeSelect } from './attributeSelector/types';

package/es/index.js

@@ -1,4 +1,4 @@
-import BizAnalysisLayout from './analysisLayout';
+import BizAnalysisLayout from './layout/analysisLayout';
 import BizUserGroup from './userGroup';
 import BizTargetSelector from './targetSelector';
 import BizEventSelector from './eventSelector/index';
@@ -24,4 +24,5 @@ import BizAddToPanel from './addToPanel';
 import setGlobalConfig from './config';
 import BizCycleTime from './cycleTime';
 import BizDnd from './dnd';
-export { BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizUserGroup, IconFont, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetCondition, BizDatePicker, BizConditionItem, BizConditionGroup, BizUserCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, ajax, util, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig };
+import BizDetailLayout from './layout/detail';
+export { BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizDetailLayout, BizUserGroup, IconFont, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetCondition, BizDatePicker, BizConditionItem, BizConditionGroup, BizUserCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, ajax, util, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig };

package/es/{analysisLayout → layout/analysisLayout}/index.js

@@ -11,7 +11,7 @@ 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 IconFont from '../icon/iconFont';
+import IconFont from '../../icon/iconFont';
 import './index.less';
 import { Tooltip } from 'antd';
 

package/es/{analysisLayout → layout/analysisLayout}/index.less

@@ -1,4 +1,4 @@
-@import '../commonStyle/icon.less';
+@import '../../assets/styles/inner.less';
 
 .biz-layout-container {
   position: relative;
@@ -33,7 +33,7 @@
       box-sizing: border-box;
       width: 100%;
       height: calc(100% - 30px);
-      padding: @searchPadding;
+      padding: @padding-lg;
       overflow: auto;
       .biz-left-content {
         min-height: 600px;
@@ -50,10 +50,10 @@
       line-height: 30px;
       text-align: center;
       background-color: #fff;
-      border-top: @boxBorder;
+      border-top: 1px solid @border-color-base;
 
       .biz-layout-expand {
-        color: @fontColor;
+        color: @text-color;
         font-size: 16px;
         cursor: pointer;
 
@@ -66,7 +66,7 @@
 
   .biz-layout-right {
     box-sizing: border-box;
-    padding: @contentPadding;
+    padding: @padding-lg;
     overflow: auto;
     background-color: #fff;
 
@@ -91,22 +91,22 @@
   font-size: 24px;
   text-align: center;
   background: #ffffff;
-  border: @boxBorder;
+  border: 1px solid @border-color-split;
   border-top-right-radius: 20px;
   border-bottom-right-radius: 20px;
   cursor: pointer;
 
   .biz-layout-pickup-icon {
-    color: @layoutIconColor;
+    color: @icon-color;
     font-size: 24px;
   }
 
   &:hover {
-    color: @hoverColor;
-    background-color: @hoverBgColor;
+    color: @primary-color;
+    background-color: @primary-color-hover;
 
     .biz-layout-pickup-icon {
-      color: @hoverColor;
+      color: @primary-color;
     }
   }
 }
@@ -115,10 +115,10 @@
   position: absolute;
   bottom: 20px;
   left: 16px;
-  color: @layoutIconColor;
+  color: @icon-color;
   font-size: 24px;
   cursor: pointer;
   &:hover {
-    color: @hoverColor;
+    color: @primary-color;
   }
 }

package/es/layout/detail/demo/index.d.ts

@@ -0,0 +1,2 @@
+declare const _default: () => JSX.Element;
+export default _default;

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

@@ -0,0 +1,12 @@
+import React from 'react';
+import { BizDetailLayout } from '@zgfe/business-lib';
+export default (function () {
+  return /*#__PURE__*/React.createElement("div", {
+    style: {
+      background: '#FAFAFB',
+      padding: '24px'
+    }
+  }, /*#__PURE__*/React.createElement(BizDetailLayout, {
+    extra: /*#__PURE__*/React.createElement(React.Fragment, null, "\u9875\u9762extra")
+  }, "\u9875\u9762\u5185\u5BB9"));
+});

package/es/layout/detail/index.d.ts

@@ -0,0 +1,9 @@
+import React from 'react';
+import './index.less';
+declare const BizDetailLayout: React.FC<{
+    width?: number;
+    onBack?: () => void;
+    extra?: React.ReactNode;
+    children?: React.ReactNode;
+}>;
+export default BizDetailLayout;

package/es/layout/detail/index.js

@@ -0,0 +1,24 @@
+import React from 'react';
+import { IconFont } from '../..';
+import './index.less';
+
+var BizDetailLayout = function BizDetailLayout(props) {
+  var width = props.width;
+  var classPrefix = 'biz-detail';
+  return /*#__PURE__*/React.createElement("div", {
+    className: classPrefix,
+    style: {
+      width: width ? "".concat(width, "px") : undefined
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-menu")
+  }, /*#__PURE__*/React.createElement("a", {
+    onClick: props.onBack
+  }, /*#__PURE__*/React.createElement(IconFont, {
+    type: "fanhuiicon"
+  }), "\u8FD4\u56DE"), props.extra), /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-content")
+  }, props.children));
+};
+
+export default BizDetailLayout;

package/es/layout/detail/index.less

@@ -0,0 +1,28 @@
+@import '../../assets/styles/inner.less';
+.biz-detail {
+  display: flex;
+  flex-direction: column;
+  width: 1376px;
+  height: 100%;
+  margin: 0 auto;
+  &-menu {
+    flex: none;
+    padding-top: @padding-md;
+    padding-bottom: @padding-md - 2;
+    color: @text-color-secondary;
+    a {
+      margin-right: @margin-md;
+      color: @text-color-secondary;
+      &:hover {
+        color: @primary-color;
+      }
+    }
+  }
+  &-content {
+    flex: 1;
+    padding: @padding-sm @padding-lg @padding-lg @padding-lg;
+    overflow-y: auto;
+    background-color: @white;
+    border-radius: @border-radius-normal;
+  }
+}

package/es/select/styles/index.less

@@ -67,7 +67,7 @@
     &.biz-select-option-multiple {
       &:hover:not(.disabled) {
         color: @primary-color;
-        background-color: color(~`colorPalette('@{primary-color}', 0.1) `);
+        background-color: @primary-color-hover;
       }
 
       &.active:not(.disabled) {

package/es/targetConditionGroup/index.js

@@ -127,21 +127,39 @@ var BizTargetCondition = function BizTargetCondition(props) {
       }
     }
 
-    if (data.eventId || data.eventGroupId) {
+    if (data.eventId) {
       target.value = {
         event: undefined,
         group: undefined
       };
 
+      if (!data.eventGroupId) {
+        target.value.group = {
+          id: 0,
+          name: '所有分组',
+          eventList: []
+        };
+      }
+
+      if (data.eventId === -100) {
+        target.value.event = {
+          id: -100,
+          name: '事件概览',
+          attrList: []
+        };
+      }
+
       for (var i = 0; i < eventGroupList.length; i++) {
         var group = eventGroupList[i];
 
-        for (var j = 0; j < group.eventList.length; j++) {
-          var event = group.eventList[j];
+        if (data.eventId !== -100) {
+          for (var j = 0; j < group.eventList.length; j++) {
+            var event = group.eventList[j];
 
-          if (event.id === data.eventId) {
-            target.value.event = event;
-            break;
+            if (event.id === data.eventId) {
+              target.value.event = event;
+              break;
+            }
           }
         }
 

package/es/userCondition/styles/conditionTypeList.less

@@ -1,5 +1,4 @@
-@import '../../assets//styles//variable.less';
-@import '../../commonStyle//variable.less';
+@import '../../assets/styles/inner.less';
 .biz-user-condition-type-list {
   display: flex;
   align-items: center;
@@ -20,11 +19,11 @@
         margin-left: @margin-md;
       }
       &:hover {
-        color: @themeColor;
-        background-color: @hoverBgColor;
+        color: @primary-color;
+        background-color: @primary-color-hover;
       }
       &:active {
-        border-color: @themeColor;
+        border-color: @primary-color;
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.0.24-alpha.6",
+  "version": "1.0.24-insight.0",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -58,5 +58,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "d99caf4139172b185ba551415e7226615c8215d2"
+  "gitHead": "0d63dcffad7ca36d53427e53dd5743ef8531c1ad"
 }