@zgfe/modules-page 1.0.17-zhongyuan.14 → 1.0.17-zhongyuan.18

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.
@@ -9,8 +9,7 @@ import emptyImg from "../detail/images/empty.png";
9
9
  var PageContent = function PageContent(props) {
10
10
  var classPrefix = 'page-content';
11
11
  var _useContext = useContext(ModulesPageContext),
12
- pageGroupList = _useContext.pageGroupList,
13
- isAppAnalysis = _useContext.isAppAnalysis;
12
+ pageGroupList = _useContext.pageGroupList;
14
13
  var groupList = useMemo(function () {
15
14
  if (!pageGroupList) return [];
16
15
  var data = _.cloneDeep(pageGroupList);
@@ -46,12 +45,7 @@ var PageContent = function PageContent(props) {
46
45
  }
47
46
  return /*#__PURE__*/React.createElement("div", {
48
47
  className: classPrefix
49
- }, isAppAnalysis && /*#__PURE__*/React.createElement("div", null, [1, 2].map(function (o, index) {
50
- return /*#__PURE__*/React.createElement("div", {
51
- key: index,
52
- className: "anslysis-tip"
53
- }, /*#__PURE__*/React.createElement("span", null, "\u6240\u6709\u7528\u6237 >"), /*#__PURE__*/React.createElement("span", null, "\u6D4F\u89C8\u6B21\u6570\uFF1A159", o), /*#__PURE__*/React.createElement("span", null, "\u6D4F\u89C8\u4EBA\u6570\uFF1A159"), /*#__PURE__*/React.createElement("span", null, "\u70B9\u51FB\u6B21\u6570\uFF1A159"), /*#__PURE__*/React.createElement("span", null, "\u70B9\u51FB\u4EBA\u6570\uFF1A159"));
54
- })), /*#__PURE__*/React.createElement(BizTable, {
48
+ }, /*#__PURE__*/React.createElement(BizTable, {
55
49
  rowKey: "id",
56
50
  dataSource: props.type === 'pageGroup' ? groupList : props.value,
57
51
  columns: columns
@@ -32,6 +32,8 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
32
32
  count = _useState6[0],
33
33
  setCount = _useState6[1];
34
34
  var groupRef = useRef(null);
35
+
36
+ // 是否回显,是否是第一次,
35
37
  useEffect(function () {
36
38
  var _data$filters;
37
39
  var data = formValue(props.value);
@@ -58,15 +60,6 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
58
60
  groupRef.current.add(true);
59
61
  }, 0);
60
62
  };
61
-
62
- // useEffect(() => {
63
- // if (isAppAnalysis) {
64
- // setTimeout(() => {
65
- // groupRef.current.add(true);
66
- // }, 0);
67
- // }
68
- // }, []);
69
-
70
63
  return /*#__PURE__*/React.createElement("div", {
71
64
  className: classPrefix
72
65
  }, /*#__PURE__*/React.createElement(Skeleton, {
@@ -1,4 +1,4 @@
1
- import React, { useEffect, useRef } from 'react';
1
+ import React, { useRef } from 'react';
2
2
  import { ModulesPage } from '@zgfe/modules-page';
3
3
  import { DemoWrapper } from '@zgfe/business-lib';
4
4
  // const defaultValue = {
@@ -62,23 +62,23 @@ export default (function () {
62
62
  console.log('onChange:', data);
63
63
  };
64
64
  var pageDeta = useRef(null);
65
- useEffect(function () {
66
- setTimeout(function () {
67
- console.log(pageDeta.current.searchFn({
68
- appId: 1,
69
- module: 'page',
70
- pageTitle: '数据分析',
71
- pageUrl: 'file:///C:/Users/Administrator/Desktop/index.html',
72
- platform: 3,
73
- time: {
74
- unit: 'day',
75
- end: '2025-09-19',
76
- begin: '2025-09-16'
77
- },
78
- userGroup: [0]
79
- }), 'pageDeta');
80
- }, 1000);
81
- }, []);
65
+ var handleD = function handleD() {
66
+ console.log(pageDeta.current);
67
+ var a = {
68
+ appId: 1,
69
+ pageTitle: 'zhugeiodemo',
70
+ pageUrl: '',
71
+ platform: 3,
72
+ type: 'page',
73
+ time: {
74
+ unit: 'day',
75
+ end: '2025-09-19',
76
+ begin: '2025-09-16'
77
+ },
78
+ userGroup: [0]
79
+ };
80
+ pageDeta.current.searchFn(a);
81
+ };
82
82
  return /*#__PURE__*/React.createElement(DemoWrapper, {
83
83
  needMeta: true,
84
84
  defaultApp: 2
@@ -87,10 +87,11 @@ export default (function () {
87
87
  height: 750,
88
88
  overflow: 'auto'
89
89
  }
90
- }, /*#__PURE__*/React.createElement(ModulesPage, {
90
+ }, /*#__PURE__*/React.createElement("div", {
91
+ onClick: handleD
92
+ }, "\u53D8\u5316"), /*#__PURE__*/React.createElement(ModulesPage, {
91
93
  ref: pageDeta,
92
94
  onClickWarn: onClickWarn,
93
- onChange: onChange,
94
- isAppAnalysis: true
95
+ onChange: onChange
95
96
  })));
96
97
  });
@@ -1,8 +1,5 @@
1
1
  import React from 'react';
2
2
  import './style/index.less';
3
3
  import { ModulesPageTypes } from './types';
4
- export type MyRefType = {
5
- searchFn: Function | null;
6
- };
7
- declare const ModulesPage: React.ForwardRefExoticComponent<ModulesPageTypes.Props & React.RefAttributes<MyRefType>>;
4
+ declare const ModulesPage: React.FC<ModulesPageTypes.Props>;
8
5
  export default ModulesPage;
@@ -10,7 +10,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
10
10
  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; }
11
11
  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; } }
12
12
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
13
- import React, { useContext, useEffect, useMemo, useRef, useState, useImperativeHandle } from 'react';
13
+ import React, { useContext, useEffect, useMemo, useRef, useState } from 'react';
14
14
  import EmptyPanel from "../empty";
15
15
  import { BizGlobalDataContext, BizLayout, BizLoading } from '@zgfe/business-lib';
16
16
  import { Button, Skeleton, Spin } from 'antd';
@@ -24,7 +24,7 @@ import { getPageGroupList, getPageList, getPageResult, onDownload as _onDownload
24
24
  import DetailContent from "../../components/detail";
25
25
  import _ from 'lodash';
26
26
  var classPrefix = 'modules-page';
27
- var ModulesPage = /*#__PURE__*/React.forwardRef(function (props, ref) {
27
+ var ModulesPage = function ModulesPage(props) {
28
28
  // 页面类型
29
29
  var _useState = useState('page'),
30
30
  _useState2 = _slicedToArray(_useState, 2),
@@ -93,11 +93,6 @@ var ModulesPage = /*#__PURE__*/React.forwardRef(function (props, ref) {
93
93
  controller = _React$useState2[0],
94
94
  setController = _React$useState2[1];
95
95
 
96
- // 是否是下级分析页
97
- var _useState27 = useState(props.isAppAnalysis || false),
98
- _useState28 = _slicedToArray(_useState27, 1),
99
- isAppAnalysis = _useState28[0];
100
-
101
96
  // 查询条件ref
102
97
  var selectRef = useRef(null);
103
98
  var _useContext = useContext(BizGlobalDataContext),
@@ -227,13 +222,6 @@ var ModulesPage = /*#__PURE__*/React.forwardRef(function (props, ref) {
227
222
  }
228
223
  });
229
224
  };
230
-
231
- // 定义通过ref暴露给父组件的内容
232
- useImperativeHandle(ref, function () {
233
- return {
234
- searchFn: setSearchValue
235
- };
236
- }, []);
237
225
  var render = /*#__PURE__*/React.createElement("div", {
238
226
  className: "".concat(classPrefix, "-top-render")
239
227
  }, /*#__PURE__*/React.createElement("div", {
@@ -258,8 +246,7 @@ var ModulesPage = /*#__PURE__*/React.forwardRef(function (props, ref) {
258
246
  pageList: pageList,
259
247
  pageGroupList: pageGroupList,
260
248
  currentClickPage: currentClickPage,
261
- setCurrentClickPage: setCurrentClickPage,
262
- isAppAnalysis: isAppAnalysis
249
+ setCurrentClickPage: setCurrentClickPage
263
250
  }
264
251
  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BizLayout, {
265
252
  className: classPrefix
@@ -277,7 +264,7 @@ var ModulesPage = /*#__PURE__*/React.forwardRef(function (props, ref) {
277
264
  value: searchValue,
278
265
  onChange: onChange
279
266
  })),
280
- topRender: props.onClickWarn ? render : props.isAppAnalysis || renderApp,
267
+ topRender: props.onClickWarn ? render : renderApp,
281
268
  collapseRef: selectRef
282
269
  }, /*#__PURE__*/React.createElement(Spin, {
283
270
  spinning: pageLoading
@@ -315,5 +302,5 @@ var ModulesPage = /*#__PURE__*/React.forwardRef(function (props, ref) {
315
302
  },
316
303
  onOk: onOk
317
304
  }) : null))));
318
- });
305
+ };
319
306
  export default ModulesPage;
@@ -6,7 +6,6 @@ export declare namespace ModulesPageTypes {
6
6
  value?: Value;
7
7
  onClickWarn?: () => void;
8
8
  onChange?: (data: Value) => void;
9
- isAppAnalysis?: boolean;
10
9
  }
11
10
  interface Value extends SearchValue {
12
11
  time?: DatePickerTypes.Value;
@@ -44,5 +43,4 @@ export declare const ModulesPageContext: import("react").Context<{
44
43
  pageGroupList: ModulesPageTypes.PageGroup[];
45
44
  currentClickPage?: ModulesPageTypes.Page | ModulesPageTypes.PageGroup | undefined;
46
45
  setCurrentClickPage?: ((data: ModulesPageTypes.Page) => void) | undefined;
47
- isAppAnalysis: boolean;
48
46
  }>;
@@ -2,6 +2,5 @@ import { createContext } from 'react';
2
2
  export var ModulesPageTypes;
3
3
  export var ModulesPageContext = /*#__PURE__*/createContext({
4
4
  pageList: [],
5
- pageGroupList: [],
6
- isAppAnalysis: false
5
+ pageGroupList: []
7
6
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zgfe/modules-page",
3
- "version": "1.0.17-zhongyuan.14",
3
+ "version": "1.0.17-zhongyuan.18",
4
4
  "private": false,
5
5
  "publishConfig": {
6
6
  "access": "public"
@@ -57,5 +57,5 @@
57
57
  "rc-virtual-list": "^3.14.2",
58
58
  "yorkie": "^2.0.0"
59
59
  },
60
- "gitHead": "052c30d1c78ba4f0e47241180e9b26e195a291b4"
60
+ "gitHead": "af2ebef569310123c687c9c3485067974a3f0b73"
61
61
  }