@zgfe/modules-event 0.1.5-event.62 → 0.1.5-event.65

package/es/modules/content/index.js

@@ -27,6 +27,7 @@ var CancelToken = Request.CancelToken;
 var cancel;
 var classPrefix = 'event-content';
 var EventContent = function EventContent(props) {
+  var _props$value, _props$value2;
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp;
   var _useContext2 = useContext(EventContext),
@@ -72,7 +73,8 @@ var EventContent = function EventContent(props) {
     subDisplay = _useState14[0],
     setSubDisplay = _useState14[1];
   var _useState15 = useState({
-      analysisIndex: 'number'
+      analysisIndex: ((_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.analysisIndex) || 'number',
+      analysisAttr: (_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2.analysisAttr
     }),
     _useState16 = _slicedToArray(_useState15, 2),
     dimension = _useState16[0],
@@ -152,7 +154,7 @@ var EventContent = function EventContent(props) {
   var onChangeContent = function onChangeContent(data) {
     ajaxFlag = true;
     setSearchData(function (value) {
-      return _objectSpread(_objectSpread({}, value), data);
+      return _objectSpread(_objectSpread({}, data), value);
     });
   };
   var onChangeShow = function onChangeShow(data) {

package/es/modules/home/demo/index.js

@@ -47,18 +47,20 @@ export default (function () {
   }, "\u8FD4\u56DE")) : /*#__PURE__*/React.createElement(ModuleEvent, {
     onChange: onChange,
     defaultValue: {
-      userGroup: [0],
-      time: {
-        begin: '2023-11-06',
-        end: '2023-11-13',
-        relative: [7, 0],
-        unit: 'day'
-      },
-      chartType: 'line',
-      analysisIndex: 'sum',
-      id: 16883,
-      name: 'revenue',
-      analysisAttr: 'price'
+      data: {
+        userGroup: [0],
+        time: {
+          begin: '2023-10-14',
+          end: '2023-11-13',
+          relative: [30, 0],
+          unit: 'day'
+        },
+        chartType: 'line',
+        analysisIndex: 'sum',
+        id: 16883,
+        name: 'revenue',
+        analysisAttr: 'price'
+      }
     },
     afterEditTarget: afterEditTarget,
     onUserDrill: onUserDrill

package/es/modules/home/index.js

@@ -72,13 +72,16 @@ var ModuleEvent = function ModuleEvent(props) {
     showList = _useState18[0],
     setShowList = _useState18[1];
   useEffect(function () {
+    console.log('事件分析初始化：', props.defaultValue);
     setPageLoading(true);
     if (props.defaultValue) {
+      var _props$defaultValue$d;
       setShowList(props.defaultValue.chosen_data);
       setPanelId(props.defaultValue.panelId);
       setTitle(props.defaultValue.name);
-      if (props.defaultValue.id) {
-        setElementId(props.defaultValue.id);
+      if ((_props$defaultValue$d = props.defaultValue.data) === null || _props$defaultValue$d === void 0 ? void 0 : _props$defaultValue$d.id) {
+        var _props$defaultValue$d2;
+        setElementId((_props$defaultValue$d2 = props.defaultValue.data) === null || _props$defaultValue$d2 === void 0 ? void 0 : _props$defaultValue$d2.id);
       }
       if (props.defaultValue.data) {
         setSearchData(props.defaultValue.data);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zgfe/modules-event",
-    "version": "0.1.5-event.62",
+    "version": "0.1.5-event.65",
     "scripts": {
         "start": "dumi dev",
         "docs:build": "dumi build",
@@ -49,7 +49,7 @@
         "react": "^16.12.0 || ^17.0.0",
         "yorkie": "^2.0.0"
     },
-    "gitHead": "2f821f62e8ed1ee59fb851634495e86886a09b45",
+    "gitHead": "9a8fec3345980cc5cda324315a3ac48d4b0520de",
     "dependencies": {
         "react-copy-to-clipboard": "^5.1.0",
         "react-highlight": "^0.15.0"