@zgfe/modules-interval 1.0.0-interval.44 → 1.0.0-interval.45

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -26,7 +26,7 @@ var CancelToken = Request.CancelToken;
26
26
  var cancel;
27
27
  var classPrefix = 'interval-content';
28
28
  var EventContent = function EventContent(props) {
29
- console.log(7777777, props);
29
+ console.log(66666, props);
30
30
  // 最后的查询数据(防止图表在还没查询时就改变了类型)
31
31
  var _useState = useState(props.value),
32
32
  _useState2 = _slicedToArray(_useState, 2),
@@ -203,6 +203,7 @@ var EventContent = function EventContent(props) {
203
203
  collapseRef: collapseRef,
204
204
  onChange: onChangeSearch,
205
205
  defaultValue: searchData,
206
+ urlParam: props.urlParam,
206
207
  ajaxFlag: ajaxFlag,
207
208
  loading: loading,
208
209
  finalSearchData: finalSearchData,
@@ -9,7 +9,7 @@ export declare namespace EventContentProps {
9
9
  * 默认值
10
10
  */
11
11
  value: SearchValue;
12
- urlParam: SearchValue;
12
+ urlParam?: SearchValue;
13
13
  /**
14
14
  * 展示列表
15
15
  */
@@ -24,6 +24,10 @@ export default (function () {
24
24
  _useState6 = _slicedToArray(_useState5, 2),
25
25
  searchParams = _useState6[0],
26
26
  setSearchParams = _useState6[1];
27
+ var _useState7 = useState(),
28
+ _useState8 = _slicedToArray(_useState7, 2),
29
+ urlParam = _useState8[0],
30
+ setUrlParam = _useState8[1];
27
31
  useEffect(function () {
28
32
  setGlobalConfig(requestConfig);
29
33
  }, []);
@@ -42,6 +46,7 @@ export default (function () {
42
46
  }
43
47
  }, "\u8FD4\u56DE")) : /*#__PURE__*/React.createElement(ModuleInterval, {
44
48
  defaultValue: searchParams,
49
+ urlParam: urlParam,
45
50
  afterEditTarget: afterEditTarget,
46
51
  onUserDrill: onUserDrill
47
52
  }));
@@ -20,6 +20,7 @@ import EventContent from "../content";
20
20
  import { chartTypes } from "../../constants";
21
21
  var classPrefix = 'interval-module-container';
22
22
  var ModuleInterval = function ModuleInterval(props) {
23
+ console.log(9999999911111, props);
23
24
  // 属性
24
25
  var _useContext = useContext(BizGlobalDataContext),
25
26
  currentApp = _useContext.currentApp,
@@ -131,6 +132,7 @@ var ModuleInterval = function ModuleInterval(props) {
131
132
  defaultValue: props.defaultValue ? props.defaultValue.data : undefined,
132
133
  value: searchData,
133
134
  show: showList,
135
+ urlParam: props.urlParam,
134
136
  onUserDrill: props.onUserDrill,
135
137
  onChange: setSearchData,
136
138
  initSearch: initSearch
@@ -6,6 +6,7 @@ export declare namespace EventProps {
6
6
  * @description 默认查询值
7
7
  */
8
8
  defaultValue?: Value;
9
+ urlParam?: SearchValue;
9
10
  /**
10
11
  * @description 是否包含今天
11
12
  * @default false
@@ -17,7 +17,7 @@ import EventFilter from "../../components/eventFilter";
17
17
  import "./styles/index.less";
18
18
  var classPrefix = 'top-panel-interval';
19
19
  var TopPanel = function TopPanel(props) {
20
- var _defaultValue$associa, _defaultValue$associa2, _finalSearchData$asso, _finalSearchData$asso2, _defaultValue$associa3, _finalSearchData$asso3, _defaultValue$associa4, _finalSearchData$asso4, _defaultValue$associa5, _finalSearchData$asso5, _defaultValue$associa6, _finalSearchData$asso6, _defaultValue$associa7, _finalSearchData$asso7, _defaultValue$associa8, _finalSearchData$asso8, _defaultValue$associa9, _finalSearchData$asso9, _defaultValue$associa10, _finalSearchData$asso10, _defaultValue$dimensi, _finalSearchData$dime, _defaultValue$dimensi2, _finalSearchData$dime2, _defaultValue$dimensi3, _finalSearchData$dime3, _defaultValue$dimensi4, _finalSearchData$dime4;
20
+ var _props$urlParam, _defaultValue$associa, _defaultValue$associa2, _finalSearchData$asso, _finalSearchData$asso2, _defaultValue$associa3, _finalSearchData$asso3, _defaultValue$associa4, _finalSearchData$asso4, _defaultValue$associa5, _finalSearchData$asso5, _defaultValue$associa6, _finalSearchData$asso6, _defaultValue$associa7, _finalSearchData$asso7, _defaultValue$associa8, _finalSearchData$asso8, _defaultValue$associa9, _finalSearchData$asso9, _defaultValue$associa10, _finalSearchData$asso10, _defaultValue$dimensi, _finalSearchData$dime, _defaultValue$dimensi2, _finalSearchData$dime2, _defaultValue$dimensi3, _finalSearchData$dime3, _defaultValue$dimensi4, _finalSearchData$dime4;
21
21
  var defaultValue = props.defaultValue,
22
22
  loading = props.loading,
23
23
  collapseRef = props.collapseRef,
@@ -151,7 +151,7 @@ var TopPanel = function TopPanel(props) {
151
151
  className: "panel-form-interval",
152
152
  layout: "vertical",
153
153
  initialValues: {
154
- userGroup: userGroup ? userGroup : [0],
154
+ userGroup: (_props$urlParam = props.urlParam) !== null && _props$urlParam !== void 0 && _props$urlParam.userGroup || userGroup ? userGroup : [0],
155
155
  start: _objectSpread(_objectSpread({}, defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.start), {}, {
156
156
  relevancy: defaultValue !== null && defaultValue !== void 0 && (_defaultValue$associa = defaultValue.associated_next_attr) !== null && _defaultValue$associa !== void 0 && _defaultValue$associa.event_id && defaultValue !== null && defaultValue !== void 0 && (_defaultValue$associa2 = defaultValue.associated_pre_attr) !== null && _defaultValue$associa2 !== void 0 && _defaultValue$associa2.event_id || finalSearchData !== null && finalSearchData !== void 0 && (_finalSearchData$asso = finalSearchData.associatedNextAttr) !== null && _finalSearchData$asso !== void 0 && _finalSearchData$asso.eventId && finalSearchData !== null && finalSearchData !== void 0 && (_finalSearchData$asso2 = finalSearchData.associatedPreAttr) !== null && _finalSearchData$asso2 !== void 0 && _finalSearchData$asso2.eventId ? true : false
157
157
  }),
@@ -36,6 +36,7 @@ export interface TopPanelProps {
36
36
  * 默认值
37
37
  */
38
38
  defaultValue?: SearchValue;
39
+ urlParam?: SearchValue;
39
40
  loading?: boolean;
40
41
  /**
41
42
  * 数据更新
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zgfe/modules-interval",
3
- "version": "1.0.0-interval.44",
3
+ "version": "1.0.0-interval.45",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",