@zgfe/modules-attribution 1.1.6 → 1.1.13-zhongyuan.1

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

@@ -4,112 +4,113 @@ import { AttributionHome } from '@zgfe/modules-attribution';
 import { requestConfig } from '../../../utils/ajaxConfig';
 var defaultValue = {
   data: {
-    "app_id": 331,
-    "module": "attribution",
-    "targetFilters": [{
-      "eventId": 4024,
-      "eventName": "收入",
-      "filters": {
-        "relation": "and",
-        "conditions": [{
-          "attrId": 31331,
-          "propCategory": "eventProp",
-          "type": 2,
-          "operator": "gt",
-          "values": ["88"],
-          "dimensionSub": "event_attr",
-          "label": "price",
-          "attrName": "price"
+    app_id: 331,
+    module: 'attribution',
+    targetFilters: [{
+      eventId: 4024,
+      eventName: '收入',
+      filters: {
+        relation: 'and',
+        conditions: [{
+          attrId: 31331,
+          propCategory: 'eventProp',
+          type: 2,
+          operator: 'gt',
+          values: ['88'],
+          dimensionSub: 'event_attr',
+          label: 'price',
+          attrName: 'price'
         }, {
-          "attrId": 31328,
-          "propCategory": "eventProp",
-          "type": 2,
-          "operator": "gt",
-          "values": ["99"],
-          "dimensionSub": "event_attr",
-          "label": "total",
-          "attrName": "total"
+          attrId: 31328,
+          propCategory: 'eventProp',
+          type: 2,
+          operator: 'gt',
+          values: ['99'],
+          dimensionSub: 'event_attr',
+          label: 'total',
+          attrName: 'total'
         }]
       }
     }],
-    "sourceFilters": [{
-      "eventId": 4023,
-      "eventName": "查看商品",
-      "filters": {
-        "relation": "and",
-        "conditions": [{
-          "attrId": 31321,
-          "propCategory": "eventProp",
-          "type": 2,
-          "operator": "gt",
-          "values": ["77"],
-          "dimensionSub": "event_attr",
-          "label": "商品价格",
-          "attrName": "商品价格"
+    sourceFilters: [{
+      eventId: 4023,
+      eventName: '查看商品',
+      filters: {
+        relation: 'and',
+        conditions: [{
+          attrId: 31321,
+          propCategory: 'eventProp',
+          type: 2,
+          operator: 'gt',
+          values: ['77'],
+          dimensionSub: 'event_attr',
+          label: '商品价格',
+          attrName: '商品价格'
         }, {
-          "attrId": 31332,
-          "propCategory": "eventProp",
-          "type": 1,
-          "operator": "equal",
-          "values": ["移动电话"],
-          "dimensionSub": "event_attr",
-          "label": "商品类型",
-          "attrName": "商品类型"
+          attrId: 31332,
+          propCategory: 'eventProp',
+          type: 1,
+          operator: 'equal',
+          values: ['移动电话'],
+          dimensionSub: 'event_attr',
+          label: '商品类型',
+          attrName: '商品类型'
         }]
       },
-      "attributionSubdivision": {
-        "relation": "and",
-        "conditions": {
-          "propCategory": "eventProp",
-          "type": 1,
-          "attrId": 31332
+      attributionSubdivision: {
+        relation: 'and',
+        conditions: {
+          propCategory: 'eventProp',
+          type: 1,
+          attrId: 31332
         }
       }
     }, {
-      "eventId": 4026,
-      "eventName": "加购商品",
-      "filters": {
-        "relation": "and",
-        "conditions": [{
-          "attrId": 31334,
-          "propCategory": "eventProp",
-          "type": 2,
-          "operator": "gt",
-          "values": ["66"],
-          "dimensionSub": "event_attr",
-          "label": "商品价格",
-          "attrName": "商品价格"
+      eventId: 4026,
+      eventName: '加购商品',
+      filters: {
+        relation: 'and',
+        conditions: [{
+          attrId: 31334,
+          propCategory: 'eventProp',
+          type: 2,
+          operator: 'gt',
+          values: ['66'],
+          dimensionSub: 'event_attr',
+          label: '商品价格',
+          attrName: '商品价格'
         }, {
-          "attrId": 31336,
-          "propCategory": "eventProp",
-          "type": 1,
-          "operator": "equal",
-          "values": ["移动电话"],
-          "dimensionSub": "event_attr",
-          "label": "商品类型",
-          "attrName": "商品类型"
+          attrId: 31336,
+          propCategory: 'eventProp',
+          type: 1,
+          operator: 'equal',
+          values: ['移动电话'],
+          dimensionSub: 'event_attr',
+          label: '商品类型',
+          attrName: '商品类型'
         }]
       },
-      "attributionSubdivision": {
-        "relation": "and",
-        "conditions": {
-          "propCategory": "eventProp",
-          "type": 1,
-          "attrId": 31329
+      attributionSubdivision: {
+        relation: 'and',
+        conditions: {
+          propCategory: 'eventProp',
+          type: 1,
+          attrId: 31329
         }
       }
     }],
-    "attributionType": 3,
-    "otherEvent": true,
-    "windowCnt": 2,
-    "windowType": "hour",
-    "time": {
-      "unit": "day",
-      "relative": [14, 0],
-      "begin": "2023-05-29",
-      "end": "2023-06-12"
+    attributionType: 3,
+    platform: 0,
+    otherEvent: true,
+    windowCnt: 2,
+    windowType: 'hour',
+    time: {
+      unit: 'day',
+      relative: [14, 0],
+      begin: '2023-05-29',
+      end: '2023-06-12'
     },
-    "chartType": "grid"
+    chartType: 'grid'
   }
 };
 export default (function () {

package/es/modules/home/demo/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import './styles/index.less';
-declare const _default: () => JSX.Element;
+declare const _default: () => React.JSX.Element;
 export default _default;

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

@@ -10,10 +10,14 @@ export default (function () {
   var afterEditTarget = function afterEditTarget(type, data) {
     console.log("".concat(type, "\u56DE\u8C03"), data);
   };
+  var platformChange = function platformChange(platform) {
+    console.log('platform', platform);
+  };
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
     defaultApp: 328
   }, /*#__PURE__*/React.createElement(AttributionHome, {
-    afterEditTarget: afterEditTarget
+    afterEditTarget: afterEditTarget,
+    platformChange: platformChange
   }));
 });

package/es/modules/home/demo/scene.d.ts

@@ -1,2 +1,3 @@
-declare const _default: () => JSX.Element;
+import React from 'react';
+declare const _default: () => React.JSX.Element;
 export default _default;

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

@@ -17,6 +17,7 @@ var defaultValue = {
       }
     }],
     userGroup: [0],
+    platform: 0,
     time: {
       unit: 'month',
       relative: [3, 1],

package/es/modules/home/demo/styles/index.less

@@ -1,33 +1,33 @@
-/*滚动条凹槽的颜色，还可以设置边框属性 */
-::-webkit-scrollbar-track-piece {
-  background-color: #fff;
-  -webkit-border-radius: 10px;
-  -moz-border-radius: 10px;
-  border-radius: 10px;
-}
-
-/*滚动条的宽度*/
-::-webkit-scrollbar {
-  width: 10px;
-  height: 10px;
-}
-
-/*滚动条的设置*/
-::-webkit-scrollbar-thumb {
-  background-color: #cacdd4;
-  background-clip: padding-box;
-  border: 2px solid #fff;
-  -webkit-border-radius: 10px;
-  -moz-border-radius: 10px;
-  border-radius: 10px;
-}
-
-/*滚动条鼠标移上去*/
-::-webkit-scrollbar-thumb:hover {
-  // background-color: #bbb;
-}
-
-::-webkit-scrollbar-track-piece {
-  width: 6px;
-  height: 6px;
-}
+/*滚动条凹槽的颜色，还可以设置边框属性 */
+::-webkit-scrollbar-track-piece {
+  background-color: #fff;
+  -webkit-border-radius: 10px;
+  -moz-border-radius: 10px;
+  border-radius: 10px;
+}
+
+/*滚动条的宽度*/
+::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
+
+/*滚动条的设置*/
+::-webkit-scrollbar-thumb {
+  background-color: #cacdd4;
+  background-clip: padding-box;
+  border: 2px solid #fff;
+  -webkit-border-radius: 10px;
+  -moz-border-radius: 10px;
+  border-radius: 10px;
+}
+
+/*滚动条鼠标移上去*/
+::-webkit-scrollbar-thumb:hover {
+  // background-color: #bbb;
+}
+
+::-webkit-scrollbar-track-piece {
+  width: 6px;
+  height: 6px;
+}

package/es/modules/home/index.js

@@ -1,22 +1,35 @@
-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) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var _excluded = ["includeToday"];
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _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."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-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 = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useEffect, useRef, useState } from 'react';
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var s = Object.getOwnPropertySymbols(e); for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.includes(n)) continue; t[n] = r[n]; } return t; }
+import React, { useEffect, useRef, useState, useContext } from 'react';
 import { Spin } from 'antd';
 import './styles/index.less';
+import { BizGlobalDataContext } from '@zgfe/business-lib';
 import { AttributableContext } from '../../types';
 import EditTitle from '../../components/title';
 import { getInitDate, initTarget } from '../../constants/initData';
 import AttributionContent from '../content';
 var classPrefix = 'attribution-container';
-var AttributionHome = function AttributionHome(props) {
+var AttributionHome = function AttributionHome(_ref) {
   var _props$defaultValue;
+  var _ref$includeToday = _ref.includeToday,
+    includeToday = _ref$includeToday === void 0 ? true : _ref$includeToday,
+    props = _objectWithoutProperties(_ref, _excluded);
+  var _useContext = useContext(BizGlobalDataContext),
+    currentApp = _useContext.currentApp,
+    useBizStoreLoading = _useContext.useBizStoreLoading;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     searchData = _useState2[0],
@@ -25,30 +38,34 @@ var AttributionHome = function AttributionHome(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     loading = _useState4[0],
     setLoading = _useState4[1];
-  var _useState5 = useState(true),
+  var _useState5 = useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    pageLoading = _useState6[0],
-    setPageLoading = _useState6[1];
-  var _useState7 = useState(),
+    refreshLoading = _useState6[0],
+    setRefreshLoading = _useState6[1];
+  var _useState7 = useState(true),
     _useState8 = _slicedToArray(_useState7, 2),
-    title = _useState8[0],
-    setTitle = _useState8[1];
+    pageLoading = _useState8[0],
+    setPageLoading = _useState8[1];
   var _useState9 = useState(),
     _useState10 = _slicedToArray(_useState9, 2),
-    panelId = _useState10[0],
-    setPanelId = _useState10[1];
+    title = _useState10[0],
+    setTitle = _useState10[1];
   var _useState11 = useState(),
     _useState12 = _slicedToArray(_useState11, 2),
-    elementId = _useState12[0],
-    setElementId = _useState12[1];
-  var _useState13 = useState(false),
+    panelId = _useState12[0],
+    setPanelId = _useState12[1];
+  var _useState13 = useState(),
     _useState14 = _slicedToArray(_useState13, 2),
-    searching = _useState14[0],
-    setSearching = _useState14[1];
-  var _useState15 = useState(true),
+    elementId = _useState14[0],
+    setElementId = _useState14[1];
+  var _useState15 = useState(false),
     _useState16 = _slicedToArray(_useState15, 2),
-    buttonDisable = _useState16[0],
-    setButtonDisable = _useState16[1];
+    searching = _useState16[0],
+    setSearching = _useState16[1];
+  var _useState17 = useState(true),
+    _useState18 = _slicedToArray(_useState17, 2),
+    buttonDisable = _useState18[0],
+    setButtonDisable = _useState18[1];
   var attributionRef = useRef(null);
   useEffect(function () {
     setPageLoading(true);
@@ -73,7 +90,8 @@ var AttributionHome = function AttributionHome(props) {
     setSearchData({
       targetFilters: initTarget,
       sourceFilters: initTarget,
-      time: getInitDate(props.includeToday)
+      time: getInitDate(includeToday),
+      platform: 0
     });
   };
   var changeLoading = function changeLoading(flag) {
@@ -91,7 +109,7 @@ var AttributionHome = function AttributionHome(props) {
       attributionRef.current.saveAsPanel();
     }
   };
-  if (pageLoading) {
+  if (pageLoading || useBizStoreLoading) {
     return /*#__PURE__*/React.createElement(Spin, null);
   }
   return /*#__PURE__*/React.createElement(Spin, {
@@ -99,6 +117,9 @@ var AttributionHome = function AttributionHome(props) {
     wrapperClassName: classPrefix
   }, /*#__PURE__*/React.createElement(AttributableContext.Provider, {
     value: {
+      refreshLoading: refreshLoading,
+      setRefreshLoading: setRefreshLoading,
+      currentApp: currentApp,
       panelId: panelId,
       elementId: elementId,
       panelName: title,
@@ -106,29 +127,25 @@ var AttributionHome = function AttributionHome(props) {
       buttonDisable: buttonDisable,
       setButtonDisable: setButtonDisable,
       panelDisabled: props.panelDisabled,
-      includeToday: props.includeToday,
+      includeToday: includeToday,
       changeLoading: changeLoading,
       afterEditTarget: props.afterEditTarget
     }
-  }, panelId && /*#__PURE__*/React.createElement(EditTitle, {
+  }, panelId && (/*#__PURE__*/React.createElement(EditTitle, {
     title: title,
     type: (_props$defaultValue = props.defaultValue) === null || _props$defaultValue === void 0 ? void 0 : _props$defaultValue.panelType,
     onSave: onSave,
     onSaveAs: onSaveAs,
     onEditTitle: setTitle
-  }), !panelId && /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-header-title")
-  }, "\u5F52\u56E0"), /*#__PURE__*/React.createElement("div", {
+  })), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-content ").concat(panelId ? classPrefix + '-content2' : '')
   }, /*#__PURE__*/React.createElement(AttributionContent, {
     ref: attributionRef,
     value: searchData,
+    panelId: panelId,
     onSearching: function onSearching(val) {
       return setSearching(val);
     }
   }))));
 };
-AttributionHome.defaultProps = {
-  includeToday: true
-};
 export default AttributionHome;

package/es/modules/home/styles/index.less

@@ -1,68 +1,68 @@
-.attribution-container {
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-  background: #fff;
-  .ant-spin-container {
-    width: 100%;
-    height: 100%;
-  }
-  &-header-title {
-    height: 48px;
-    padding: 0px 24px;
-    color: #021429;
-    font-weight: 500;
-    font-size: 16px;
-    line-height: 48px;
-  }
-  &-content {
-    width: 100%;
-    height: 100%;
-    // overflow: auto;
-    overflow-x: hidden;
-    background: #fff;
-    border-top: 1px solid #eaeaea;
-    .attribution-content {
-      &-top-content {
-        background: #fafafb;
-        padding: 16px 24px;
-        &-box{
-          padding: 24px;
-          background: #fff;
-          border: 1px solid #ECEDF0;
-          border-radius: 8px;
-        }
-      }
-      &-bottom-content-box {
-        min-height: 382px;
-        padding: 24px;
-        background: #fff;
-        &-times {
-          display: flex;
-          justify-content: space-between;
-        }
-      }
-    }
-  }
-
-  &-content2 {
-    height: calc(100% - 64px);
-  }
-
-  .biz-event-select.border .biz-event-select-handle {
-    padding: 0;
-    border: none;
-  }
-
-  .biz-select-option:not(.biz-select-option-multiple),
-  .biz-attr-select-option {
-    &.active {
-      // background: @primary-color !important;
-    }
-  }
-
-  // 设置下拉框最大高度
-  .biz-select-overlay {
-    max-height: 300px;
-  }
-}
+.attribution-container {
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+  background: #fff;
+  .ant-spin-container {
+    width: 100%;
+    height: 100%;
+  }
+  &-header-title {
+    height: 48px;
+    padding: 0px 24px;
+    color: #021429;
+    font-weight: 500;
+    font-size: 16px;
+    line-height: 48px;
+  }
+  &-content {
+    width: 100%;
+    height: 100%;
+    // overflow: auto;
+    overflow-x: hidden;
+    background: #fff;
+    border-top: 1px solid #eaeaea;
+    .attribution-content {
+      &-top-content {
+        background: #fafafb;
+        padding: 16px;
+        &-box{
+          padding: 24px;
+          background: #fff;
+          border: 1px solid #ECEDF0;
+          border-radius: 8px;
+        }
+      }
+      &-bottom-content-box {
+        min-height: 382px;
+        padding: 24px;
+        background: #fff;
+        &-times {
+          display: flex;
+          justify-content: space-between;
+        }
+      }
+    }
+  }
+
+  &-content2 {
+    height: calc(100% - 64px);
+  }
+
+  .biz-event-select.border .biz-event-select-handle {
+    padding: 0;
+    border: none;
+  }
+
+  .biz-select-option:not(.biz-select-option-multiple),
+  .biz-attr-select-option {
+    &.active {
+      // background: @primary-color !important;
+    }
+  }
+
+  // 设置下拉框最大高度
+  .biz-select-overlay {
+    max-height: 300px;
+  }
+}