@zgfe/modules-page 1.0.1-alpha.19 → 1.0.1-alpha.20

package/dist/esm/components/content/index.js

@@ -46,6 +46,7 @@ var PageContent = function PageContent(props) {
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement(BizTable, {
+    rowKey: "id",
     dataSource: props.type === 'pageGroup' ? groupList : props.value,
     columns: columns
   }));

package/dist/esm/components/content/types.d.ts

@@ -1,4 +1,5 @@
 export interface PageColumnType {
+    id?: string;
     userGroup?: string;
     pageTitle?: string;
     pageUrl?: string;

package/dist/esm/components/pageSelect/index.js

@@ -17,21 +17,21 @@ import "./index.less";
 import { ModulesPageContext } from "../../modules/home/types";
 import { Tooltip } from 'antd';
 var PageSelect = function PageSelect(props) {
-  // 根据类型展示的列表
-  var _useState = useState([]),
-    _useState2 = _slicedToArray(_useState, 2),
-    options = _useState2[0],
-    setOptions = _useState2[1];
   // 当前类型
-  var _useState3 = useState(pageTypes[0]),
-    _useState4 = _slicedToArray(_useState3, 2),
-    currentType = _useState4[0],
-    setCurrentType = _useState4[1];
+  var _useState = useState(pageTypes[0]),
+    _useState2 = _slicedToArray(_useState, 2),
+    currentType = _useState2[0],
+    setCurrentType = _useState2[1];
   // 当前页面/分组
-  var _useState5 = useState(),
+  var _useState3 = useState(),
+    _useState4 = _slicedToArray(_useState3, 2),
+    currentValue = _useState4[0],
+    setCurrentValue = _useState4[1];
+  // 是否第一次
+  var _useState5 = useState(true),
     _useState6 = _slicedToArray(_useState5, 2),
-    currentValue = _useState6[0],
-    setCurrentValue = _useState6[1];
+    isFirst = _useState6[0],
+    setIsFirst = _useState6[1];
   var classPrefix = 'page-select';
   var _useContext = useContext(ModulesPageContext),
     pageList = _useContext.pageList,
@@ -43,7 +43,7 @@ var PageSelect = function PageSelect(props) {
     var type = (_props$value = props.value) !== null && _props$value !== void 0 && _props$value.pageGroup || ((_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2.pageGroup) === 0 ? 1 : 0;
     setCurrentType(pageTypes[type]);
     setCurrentValue(function () {
-      if (type === 1) {
+      if (type === 0) {
         var data = props.value;
         return {
           id: "".concat(data.pageTitle ? data.pageTitle + '-' : '').concat(data.pageUrl),
@@ -53,12 +53,15 @@ var PageSelect = function PageSelect(props) {
       }
       return pageGroupList.filter(function (item) {
         var _props$value3;
-        return item.id === ((_props$value3 = props.value) === null || _props$value3 === void 0 ? void 0 : _props$value3.pageGroup);
+        return item.id == ((_props$value3 = props.value) === null || _props$value3 === void 0 ? void 0 : _props$value3.pageGroup);
       })[0];
     });
+    setTimeout(function () {
+      setIsFirst(false);
+    }, 0);
   }, []);
   useEffect(function () {
-    if (!currentClickPage) return;
+    if (!currentClickPage || isFirst) return;
     setCurrentValue(function () {
       if (currentClickPage && currentClickPage.pageUrl) {
         var _ref = currentClickPage,
@@ -72,10 +75,10 @@ var PageSelect = function PageSelect(props) {
     });
   }, [currentClickPage]);
   useEffect(function () {
+    if (isFirst) return;
     var list = currentType.value === 'page' ? pageList : pageGroupList;
-    setOptions(list);
     setCurrentValue(list[0]);
-  }, [currentType, pageList, pageGroupList]);
+  }, [currentType]);
   useEffect(function () {
     props.onChange && props.onChange(_objectSpread(_objectSpread({}, currentValue || {}), {}, {
       pageGroup: currentType.value === 'pageGroup' ? currentValue === null || currentValue === void 0 ? void 0 : currentValue.id : undefined,
@@ -101,7 +104,7 @@ var PageSelect = function PageSelect(props) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-panel")
   }, /*#__PURE__*/React.createElement(BizSelect, {
-    defaultValue: currentType,
+    value: currentType,
     className: "".concat(classPrefix, "-panel-type"),
     options: pageTypes,
     popupContainer: true,
@@ -112,10 +115,10 @@ var PageSelect = function PageSelect(props) {
   }), /*#__PURE__*/React.createElement(BizSelect, {
     value: currentValue,
     className: "".concat(classPrefix, "-panel-page"),
-    options: options,
+    options: currentType.value === 'page' ? pageList : pageGroupList,
     labelField: currentType.value === 'page' ? 'pageTitle' : 'name',
     popupContainer: true,
-    enableSearch: options.length > 5,
+    enableSearch: true,
     onChange: setCurrentValue,
     customLabel: getCustomLabel
   }), /*#__PURE__*/React.createElement(Tooltip, {

package/dist/esm/components/searchPanel/util.js

@@ -2,8 +2,9 @@ import _ from 'lodash';
 import { OperateTypes } from '@zgfe/business-lib/es/attrConditions/types';
 export var formValue = function formValue(source) {
   var data = _.cloneDeep(source) || {};
+  var type = data !== null && data !== void 0 && data.pageGroup || (data === null || data === void 0 ? void 0 : data.pageGroup) === 0 ? 'pageGroup' : 'page';
   var page = {
-    type: 'page',
+    type: type,
     pageGroup: data === null || data === void 0 ? void 0 : data.pageGroup,
     pageUrl: data === null || data === void 0 ? void 0 : data.pageUrl,
     pageTitle: data === null || data === void 0 ? void 0 : data.pageTitle

package/dist/esm/modules/home/demo/index.js

@@ -1,19 +1,37 @@
 import React from 'react';
 import { ModulesPage } from '@zgfe/modules-page';
 import { DemoWrapper } from '@zgfe/business-lib';
+var defaultValue = {
+  appId: 225,
+  platform: 3,
+  module: 'page',
+  time: {
+    begin: '2023-09-09',
+    end: '2023-09-12',
+    unit: 'day'
+  },
+  userGroup: [0],
+  pageTitle: '进入百度首页780300590145',
+  pageUrl: 'http://baidu.com/query/780300590145'
+};
 export default (function () {
   var onClickWarn = function onClickWarn() {
     console.log('onClickWarn');
   };
+  var onChange = function onChange(data) {
+    console.log('onChange:', data);
+  };
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
-    defaultApp: 266
+    defaultApp: 225
   }, /*#__PURE__*/React.createElement("div", {
     style: {
       height: 750,
       overflow: 'auto'
     }
   }, /*#__PURE__*/React.createElement(ModulesPage, {
-    onClickWarn: onClickWarn
+    value: defaultValue,
+    onClickWarn: onClickWarn,
+    onChange: onChange
   })));
 });

package/dist/esm/modules/home/index.js

@@ -13,7 +13,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useContext, useEffect, useMemo, useRef, useState } from 'react';
 import EmptyPanel from "../empty";
 import { BizGlobalDataContext, BizLayout } from '@zgfe/business-lib';
-import { Button, Spin } from 'antd';
+import { Button, Skeleton, Spin } from 'antd';
 import "./style/index.less";
 import SearchPanel from "../../components/searchPanel";
 import TopContent from "../../components/topContent";
@@ -112,6 +112,9 @@ var ModulesPage = function ModulesPage(props) {
     };
     getPageList(param, setPageList);
     getPageGroupList(param, setPageGroupList, setPageLoading);
+    if (props.value) {
+      setSearchValue(props.value);
+    }
   }, []);
   useEffect(function () {
     if (!showGroup) {
@@ -130,6 +133,12 @@ var ModulesPage = function ModulesPage(props) {
     if (type === 'pageGroup' && !(searchValue !== null && searchValue !== void 0 && searchValue.pageGroup)) return;
     if (type === 'page' || pageType === 'detail') {
       fetch();
+    } else if (type === 'pageGroup') {
+      props.onChange && props.onChange(_objectSpread({
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        platform: 3,
+        module: 'page'
+      }, searchValue));
     }
   }, [searchValue]);
   // 查询结果
@@ -140,6 +149,7 @@ var ModulesPage = function ModulesPage(props) {
     setLoading(true);
     setTimer(setTimeout(function () {
       if (_.isEqual(originSearchValue, searchValue)) {
+        setLoading(false);
         return;
       }
       setOriginSearchValue(_.cloneDeep(searchValue));
@@ -148,10 +158,11 @@ var ModulesPage = function ModulesPage(props) {
         platform: 3,
         module: 'page'
       }, searchValue);
+      props.onChange && props.onChange(param);
       getPageResult(param, setResult, setLoading);
     }, 500));
   };
-  // 改变查询条件
+  // 改变查询条件/
   var onChange = function onChange(data) {
     setSearchValue(function (value) {
       if (!value) return data;
@@ -206,11 +217,17 @@ var ModulesPage = function ModulesPage(props) {
   }, /*#__PURE__*/React.createElement(BizLayout, {
     title: "\u9875\u9762\u5206\u6790",
     hasCollapse: true,
-    topPanel: /*#__PURE__*/React.createElement(SearchPanel, {
+    topPanel: /*#__PURE__*/React.createElement(Skeleton, {
+      loading: pageLoading,
+      active: true,
+      paragraph: {
+        rows: 4
+      }
+    }, /*#__PURE__*/React.createElement(SearchPanel, {
       ref: selectRef,
       value: searchValue,
       onChange: onChange
-    }),
+    })),
     topRender: props.onClickWarn ? render : null,
     collapseRef: selectRef
   }, /*#__PURE__*/React.createElement(Spin, {

package/dist/esm/modules/home/types.d.ts

@@ -5,9 +5,13 @@ export declare namespace ModulesPageTypes {
     interface Props {
         value?: Value;
         onClickWarn?: () => void;
+        onChange?: (data: Value) => void;
     }
     interface Value extends SearchValue {
         time?: DatePickerTypes.Value;
+        appId?: number | string;
+        platform?: number;
+        module?: string;
     }
     interface Page {
         pageTitle?: string;
@@ -37,6 +41,6 @@ export declare namespace ModulesPageTypes {
 export declare const ModulesPageContext: import("react").Context<{
     pageList: ModulesPageTypes.Page[];
     pageGroupList: ModulesPageTypes.PageGroup[];
-    currentClickPage?: ModulesPageTypes.Page | ModulesPageTypes.PageGroup | undefined;
+    currentClickPage?: ModulesPageTypes.PageGroup | ModulesPageTypes.Page | undefined;
     setCurrentClickPage?: ((data: ModulesPageTypes.Page) => void) | undefined;
 }>;

package/dist/esm/modules/home/utils.d.ts

@@ -2,6 +2,6 @@ import { ModulesPageTypes } from './types';
 import { AppInfoProps } from '@zgfe/business-lib/es/context';
 export declare const getPageList: (data: ModulesPageTypes.Params, callback: Function) => void;
 export declare const getPageGroupList: (data: ModulesPageTypes.Params, callback: Function, loadingCallback?: Function) => void;
-export declare const getPageResult: (params: ModulesPageTypes.Params & ModulesPageTypes.Value, callback: Function, loadingCallback: Function) => void;
+export declare const getPageResult: (params: ModulesPageTypes.Value, callback: Function, loadingCallback: Function) => void;
 export declare const getSocketSecret: () => string;
 export declare const onDownload: (params?: ModulesPageTypes.Value, currentApp?: AppInfoProps) => void;

package/dist/esm/modules/home/utils.js

@@ -67,8 +67,13 @@ export var getPageResult = function getPageResult(params, callback, loadingCallb
     method: 'post',
     data: params
   }).then(function (res) {
+    var _res$data;
     if (!res || !res.data) return;
-    callback(res.data);
+    callback((_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.map(function (item) {
+      return _objectSpread(_objectSpread({}, item), {}, {
+        id: "".concat(item.userGroup, "-").concat(item.pageTitle, "-").concat(item.pageUrl)
+      });
+    }));
   }).finally(function () {
     loadingCallback(false);
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-page",
-  "version": "1.0.1-alpha.19",
+  "version": "1.0.1-alpha.20",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -39,7 +39,7 @@
     "@types/lodash": "^4.14.197",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.1.81-page.7",
+    "@zgfe/business-lib": "1.1.81-page.10",
     "antd": "^4.22.6",
     "dumi": "^1.1.0",
     "father": "^4.0.0-rc.2",
@@ -50,5 +50,5 @@
     "prettier": "^2.2.1",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "9b3a155c02d5b57ae51663062fc6a6aa33a571c0"
+  "gitHead": "ec25eecbfc957817643b49e2df5d8f03e14463e4"
 }