@zgfe/business-lib 1.0.24-alpha.7 → 1.0.24-insight.1

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/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/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/layout/detail/index.d.ts

@@ -4,5 +4,6 @@ declare const BizDetailLayout: React.FC<{
     width?: number;
     onBack?: () => void;
     extra?: React.ReactNode;
+    children?: React.ReactNode;
 }>;
 export default BizDetailLayout;

package/es/select/index.js

@@ -164,7 +164,7 @@ var BizSelect = function BizSelect(props) {
       width: overlayWidth || width
     },
     trigger: ['click'],
-    getPopupContainer: props.popupContainer || props.multiple ? function () {
+    getPopupContainer: props.popupContainer ? function () {
       return document.getElementById(selectId);
     } : undefined,
     visible: visible,

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/package.json

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