@zgfe/modules-page 1.0.1-alpha.23 → 1.0.1-alpha.25

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.
@@ -14,11 +14,13 @@ export var formValue = function formValue(source) {
14
14
  };
15
15
  };
16
16
  export var formatValue = function formatValue(source) {
17
- var _data$page, _data$page2, _data$page3;
17
+ var _data$userGroup, _data$page, _data$page2, _data$page3;
18
18
  var data = _.cloneDeep(source) || {};
19
19
  var filters = getConditionList(data.filters);
20
20
  return {
21
- userGroup: data.userGroup || [0],
21
+ userGroup: ((_data$userGroup = data.userGroup) === null || _data$userGroup === void 0 ? void 0 : _data$userGroup.filter(function (item) {
22
+ return item || item === 0;
23
+ })) || [0],
22
24
  pageTitle: (_data$page = data.page) === null || _data$page === void 0 ? void 0 : _data$page.pageTitle,
23
25
  pageUrl: (_data$page2 = data.page) === null || _data$page2 === void 0 ? void 0 : _data$page2.pageUrl,
24
26
  pageGroup: (_data$page3 = data.page) === null || _data$page3 === void 0 ? void 0 : _data$page3.pageGroup,
@@ -23,7 +23,7 @@ var TopContent = function TopContent(props) {
23
23
  end: moment().subtract(0, 'days').format('YYYY-MM-DD')
24
24
  };
25
25
  setTime(props.value || initValue);
26
- }, [props.value]);
26
+ }, []);
27
27
  useEffect(function () {
28
28
  if (!time) return;
29
29
  props.onChange && props.onChange(time);
@@ -31,7 +31,7 @@ var ModulesPage = function ModulesPage(props) {
31
31
  currentType = _useState2[0],
32
32
  setCurrentType = _useState2[1];
33
33
  // 最新查询条件
34
- var _useState3 = useState(),
34
+ var _useState3 = useState(props.value),
35
35
  _useState4 = _slicedToArray(_useState3, 2),
36
36
  searchValue = _useState4[0],
37
37
  setSearchValue = _useState4[1];
@@ -112,9 +112,6 @@ var ModulesPage = function ModulesPage(props) {
112
112
  };
113
113
  getPageList(param, setPageList);
114
114
  getPageGroupList(param, setPageGroupList, setPageLoading);
115
- if (props.value) {
116
- setSearchValue(props.value);
117
- }
118
115
  }, []);
119
116
  useEffect(function () {
120
117
  if (!showGroup) {
@@ -41,6 +41,6 @@ export declare namespace ModulesPageTypes {
41
41
  export declare const ModulesPageContext: import("react").Context<{
42
42
  pageList: ModulesPageTypes.Page[];
43
43
  pageGroupList: ModulesPageTypes.PageGroup[];
44
- currentClickPage?: ModulesPageTypes.PageGroup | ModulesPageTypes.Page | undefined;
44
+ currentClickPage?: ModulesPageTypes.Page | ModulesPageTypes.PageGroup | undefined;
45
45
  setCurrentClickPage?: ((data: ModulesPageTypes.Page) => void) | undefined;
46
46
  }>;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zgfe/modules-page",
3
- "version": "1.0.1-alpha.23",
3
+ "version": "1.0.1-alpha.25",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",
@@ -50,5 +50,5 @@
50
50
  "prettier": "^2.2.1",
51
51
  "yorkie": "^2.0.0"
52
52
  },
53
- "gitHead": "130d8c35db4e8636b4074b23313e9f330f2c3d77"
53
+ "gitHead": "6e1d07c901be17de112325f0ca5ebd7d02462c9d"
54
54
  }