@zgfe/modules-page 1.0.1-alpha.1 → 1.0.1-alpha.11

package/dist/esm/components/groupModal/pageItem.js

@@ -21,6 +21,7 @@ import "./index.less";
 import { Input, Select } from 'antd';
 import _ from 'lodash';
 import { getPageEsData } from "./utils";
+import InputSelect from "./inputSelect";
 var PageItem = function PageItem(props) {
   var prefix = "".concat(classPrefix, "-item");
   var operatorStore = [{
@@ -42,20 +43,19 @@ var PageItem = function PageItem(props) {
     _useState2 = _slicedToArray(_useState, 2),
     pageList = _useState2[0],
     setPageList = _useState2[1];
-  // 文本框中输入关键词搜索
-  var _useState3 = useState(''),
+  var _useState3 = useState(0),
     _useState4 = _slicedToArray(_useState3, 2),
-    searchValue = _useState4[0],
-    setSearchValue = _useState4[1];
-  var _useState5 = useState(0),
-    _useState6 = _slicedToArray(_useState5, 2),
-    timer = _useState6[0],
-    setTimer = _useState6[1];
+    timer = _useState4[0],
+    setTimer = _useState4[1];
   // param options
-  var _useState7 = useState(props.defaultOption || []),
+  var _useState5 = useState([]),
+    _useState6 = _slicedToArray(_useState5, 2),
+    paramOption = _useState6[0],
+    setParamOption = _useState6[1];
+  var _useState7 = useState([]),
     _useState8 = _slicedToArray(_useState7, 2),
-    paramOption = _useState8[0],
-    setParamOption = _useState8[1];
+    defaultOption = _useState8[0],
+    setDefaultOption = _useState8[1];
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp;
   useEffect(function () {
@@ -66,7 +66,11 @@ var PageItem = function PageItem(props) {
         }, item);
       });
     });
+    getPageEsData('', setDefaultOption, currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId, currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform);
   }, []);
+  useEffect(function () {
+    setParamOption(new Array((props.value || [newItem]).length).fill(defaultOption));
+  }, [defaultOption]);
   useEffect(function () {
     props.onChange && props.onChange(pageList.map(function (item) {
       var data = _.cloneDeep(item);
@@ -80,6 +84,9 @@ var PageItem = function PageItem(props) {
         id: util.guid()
       }, newItem)]);
     });
+    setParamOption(function (options) {
+      return [].concat(_toConsumableArray(options), [defaultOption]);
+    });
   };
   var onDelete = function onDelete(index) {
     if (pageList.length <= 1) return;
@@ -88,6 +95,11 @@ var PageItem = function PageItem(props) {
       data.splice(index, 1);
       return data;
     });
+    setParamOption(function (options) {
+      var data = _.cloneDeep(options);
+      data.splice(index, 1);
+      return data;
+    });
   };
   // 改变关系
   var onChangeOperator = function onChangeOperator(operator, index) {
@@ -97,44 +109,34 @@ var PageItem = function PageItem(props) {
       return data;
     });
   };
-  // 键盘enter确定时的方法
-  var handleValue = function handleValue(e, index) {
-    //当点击回车键或失去焦点后执行，并且verify为true，保证只有页面和埋点这里需要使用此处逻辑
-    if (e.key === 'Enter') {
-      e.stopPropagation();
-      setPageList(function (list) {
-        var data = _.cloneDeep(list);
-        data[index].param = searchValue;
-        return data;
-      });
-    }
-  };
-  // 失焦
-  var _onBlur = function onBlur(e, index) {
-    e.stopPropagation();
-    setPageList(function (list) {
-      var data = _.cloneDeep(list);
-      data[index].param = searchValue;
-      return data;
-    });
-  };
+
   // 搜索
-  var onSearch = function onSearch(newValue) {
-    newValue && setSearchValue(newValue);
+  var _onSearch = function onSearch(newValue, index) {
     if (timer) {
       clearTimeout(timer);
     }
-    if (!newValue) {
-      setParamOption(_toConsumableArray(props.defaultOption));
-      return;
-    }
+    var handle = function handle(optionData) {
+      setParamOption(function (options) {
+        var data = _.cloneDeep(options);
+        data[index] = optionData;
+        return data;
+      });
+    };
     setTimer(setTimeout(function () {
-      getPageEsData(newValue, setParamOption, currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId, currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform);
+      if (!newValue) {
+        handle(defaultOption);
+      } else {
+        getPageEsData(newValue, handle, currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId, currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform);
+      }
+      setPageList(function (list) {
+        var data = _.cloneDeep(list);
+        data[index].param = newValue;
+        return data;
+      });
     }, 300));
   };
   // 改变值
   var onChangeParam = function onChangeParam(param, index) {
-    setSearchValue(param);
     setPageList(function (list) {
       var data = _.cloneDeep(list);
       data[index].param = param;
@@ -175,26 +177,16 @@ var PageItem = function PageItem(props) {
       onChange: function onChange(e) {
         return onChangeParam(e.target.value, index);
       }
-    }) : /*#__PURE__*/React.createElement(Select, {
-      className: "".concat(prefix, "-content-item-param"),
-      options: paramOption,
+    }) : /*#__PURE__*/React.createElement(InputSelect, {
       value: item.param,
-      suffixIcon: /*#__PURE__*/React.createElement(IconFont, {
-        className: "".concat(prefix, "-down-icon"),
-        type: "xiangxia"
-      }),
+      options: paramOption ? paramOption[index] : [],
       status: !item.param && props.validate ? 'error' : '',
-      showSearch: true,
-      onBlur: function onBlur(e) {
-        return _onBlur(e, index);
-      },
-      onInputKeyDown: function onInputKeyDown(e) {
-        return handleValue(e, index);
+      onSearch: function onSearch(val) {
+        return _onSearch(val, index);
       },
       onChange: function onChange(data) {
         return onChangeParam(data, index);
-      },
-      onSearch: onSearch
+      }
     }), !item.param && props.validate ? /*#__PURE__*/React.createElement("div", {
       className: "".concat(prefix, "-tip")
     }, "\u6761\u4EF6\u4E0D\u80FD\u4E3A\u7A7A") : null), /*#__PURE__*/React.createElement(IconFont, {
@@ -211,7 +203,4 @@ var PageItem = function PageItem(props) {
     type: "tianjia1"
   }), /*#__PURE__*/React.createElement("span", null, "\u6DFB\u52A0\u9875\u9762")) : null);
 };
-PageItem.defaultProps = {
-  defaultOption: []
-};
 export default PageItem;

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

@@ -1,12 +1,12 @@
-import { SelectProps } from 'antd';
 import { ModulesPageTypes } from '../../modules/home/types';
 export declare namespace GroupModalType {
     interface Props {
         value?: ModulesPageTypes.PageGroup;
+        onOk?: () => void;
+        onCancel?: () => void;
     }
     interface ItemProps {
         value?: ModulesPageTypes.ItemValue[];
-        defaultOption?: SelectProps['options'];
         validate?: boolean;
         onChange?: (data: ModulesPageTypes.ItemValue[]) => void;
     }

package/dist/esm/components/groupModal/utils.js

@@ -6,18 +6,12 @@ export var getPageEsData = function getPageEsData(searchValue, callback, appId,
     data: {
       appId: appId,
       platform: platform || 0,
-      limit: 10000,
+      dimensionSub: 'current_url',
       attr: 0,
       v: searchValue
     }
   }).then(function (res) {
     if (!res || !res.data) return;
-    var list = res.data.sources;
-    callback(list.map(function (item) {
-      return {
-        name: item,
-        value: item
-      };
-    }));
+    callback(res.data.sources);
   });
 };

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

@@ -15,6 +15,7 @@ import { pageTypes } from "../../constants";
 import React, { useContext, useEffect, useState } from 'react';
 import "./index.less";
 import { ModulesPageContext } from "../../modules/home/types";
+import { Tooltip } from 'antd';
 var PageSelect = function PageSelect(props) {
   // 根据类型展示的列表
   var _useState = useState([]),
@@ -37,7 +38,27 @@ var PageSelect = function PageSelect(props) {
     pageGroupList = _useContext.pageGroupList,
     currentClickPage = _useContext.currentClickPage;
   useEffect(function () {
-    console.log('currentClickPage;', currentClickPage);
+    var _props$value, _props$value2;
+    if (!props.value) return;
+    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) {
+        var data = props.value;
+        return {
+          id: "".concat(data.pageTitle ? data.pageTitle + '-' : '').concat(data.pageUrl),
+          pageTitle: data.pageTitle,
+          pageUrl: data.pageUrl
+        };
+      }
+      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);
+      })[0];
+    });
+  }, []);
+  useEffect(function () {
+    if (!currentClickPage) return;
     setCurrentValue(function () {
       if (currentClickPage && currentClickPage.pageUrl) {
         var _ref = currentClickPage,
@@ -97,10 +118,12 @@ var PageSelect = function PageSelect(props) {
     enableSearch: options.length > 5,
     onChange: setCurrentValue,
     customLabel: getCustomLabel
-  }), /*#__PURE__*/React.createElement(IconFont, {
+  }), /*#__PURE__*/React.createElement(Tooltip, {
+    title: "\u6DFB\u52A0\u5C5E\u6027\u7B5B\u9009"
+  }, /*#__PURE__*/React.createElement(IconFont, {
     className: "".concat(classPrefix, "-panel-icon").concat(!props.enableAdd ? ' disabled' : ''),
     type: "shaixuan",
     onClick: props.onAdd
-  })));
+  }))));
 };
 export default PageSelect;

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

@@ -1,8 +1,6 @@
 export declare namespace PageSelectTypes {
     interface Props {
         value?: Value;
-        pageList?: any[];
-        pageGroupList?: any[];
         enableAdd?: boolean;
         onAdd?: () => void;
         onChange?: (data: Value) => void;

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

@@ -12,7 +12,7 @@ import { BizAttrConditionGroup, BizGlobalDataContext, BizUserGroup, IconFont } f
 import PageSelect from "../pageSelect";
 import { formValue, formatValue } from "./util";
 var SearchPanel = function SearchPanel(props) {
-  var classPrefix = 'search-panel';
+  var classPrefix = 'page-search-panel';
   // form 值
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
@@ -89,6 +89,7 @@ var SearchPanel = function SearchPanel(props) {
         className: "".concat(classPrefix, "-item"),
         key: field.key
       }), /*#__PURE__*/React.createElement(BizUserGroup, {
+        enableDelete: fields.length > 1,
         onDelete: function onDelete() {
           return remove(index);
         }

package/dist/esm/components/searchPanel/index.less

@@ -1,6 +1,6 @@
 @import '~@zgfe/business-lib/es/assets/styles/inner.less';
 
-.search-panel {
+.page-search-panel {
   &-title.ant-form-item {
     margin-bottom: 12px;
     padding-left: 24px;
@@ -21,7 +21,7 @@
     &:hover {
       background: #e8efff;
     }
-    .search-panel-item.ant-form-item {
+    .page-search-panel-item.ant-form-item {
       margin-bottom: 0;
       padding: 4px 0;
     }
@@ -39,7 +39,7 @@
     }
   }
 
-  &-item3:not(.search-panel-hidden) {
+  &-item3:not(.page-search-panel-hidden) {
     margin-bottom: 20px;
     padding: 4px 24px;
     &:hover {
@@ -49,8 +49,6 @@
 
   &-item2 {
     margin-bottom: 4px;
-    .page-select-panel {
-    }
   }
 
   &-hidden.ant-form-item {

package/dist/esm/components/searchPanel/util.d.ts

@@ -2,17 +2,9 @@ import { BizSelectTypes } from '@zgfe/business-lib';
 import { FormValue, SearchValue } from './types';
 export declare const formValue: (source?: SearchValue, userGroupList?: BizSelectTypes.Option[]) => FormValue;
 export declare const formatValue: (source: FormValue) => {
-    filters: import("@zgfe/business-lib").AttrConditionTypes.GroupValue | undefined;
-    userGroup: number[];
-} | {
-    filters: import("@zgfe/business-lib").AttrConditionTypes.GroupValue | undefined;
-    type?: string | undefined;
-    pageUrl?: string | undefined;
-    pageTitle?: string | undefined;
     userGroup: number[];
-} | {
+    pageTitle: string | undefined;
+    pageUrl: string | undefined;
+    pageGroup: number | undefined;
     filters: import("@zgfe/business-lib").AttrConditionTypes.GroupValue | undefined;
-    type?: string | undefined;
-    pageGroup?: number | undefined;
-    userGroup: number[];
 };

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

@@ -1,9 +1,3 @@
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-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) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import _ from 'lodash';
 export var formValue = function formValue(source, userGroupList) {
   var data = _.cloneDeep(source) || {};
@@ -35,7 +29,7 @@ export var formValue = function formValue(source, userGroupList) {
   };
 };
 export var formatValue = function formatValue(source) {
-  var _data$userGroup2;
+  var _data$userGroup2, _data$page, _data$page2, _data$page3;
   var data = _.cloneDeep(source) || {};
   var group = [];
   (_data$userGroup2 = data.userGroup) === null || _data$userGroup2 === void 0 ? void 0 : _data$userGroup2.forEach(function (item) {
@@ -43,9 +37,11 @@ export var formatValue = function formatValue(source) {
       group.push(item.id);
     }
   });
-  return _objectSpread(_objectSpread({
-    userGroup: group
-  }, data.page), {}, {
+  return {
+    userGroup: group,
+    pageTitle: (_data$page = data.page) === null || _data$page === void 0 ? void 0 : _data$page.pageTitle,
+    pageUrl: (_data$page2 = data.page) === null || _data$page2 === void 0 ? void 0 : _data$page2.pageUrl,
+    pageGroup: (_data$page3 = data.page) === null || _data$page3 === void 0 ? void 0 : _data$page3.pageGroup,
     filters: data.filters
-  });
+  };
 };

package/dist/esm/constants/api.js

@@ -7,5 +7,5 @@ export default {
   getPageResult: '/zg/web/v2/data/pageDataList',
   getPageEsData: '/zg/web/v2/data/queryEsData',
   download: '/zg/web/v2/data/pagedownloadReport',
-  socket: 'wss://rt2.zhugeio.com/eventtracking/ws'
+  socket: '/eventtracking/ws'
 };

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

@@ -0,0 +1,23 @@
+declare const _default: {
+    _keyStr: string;
+    _utf8_encode: (string: string) => string;
+    _utf8_decode: (utftext: string) => string;
+    encode: (input: string, type?: boolean) => string;
+    decode: (input: string) => string;
+    _$: string[];
+    pw: string;
+    gString: (O6b8: {
+        [x: string]: (arg0: number) => {
+            (): any;
+            new (): any;
+            [x: string]: () => any;
+        };
+    }[], O492: {
+        [x: string]: (arg0: number) => {
+            (): any;
+            new (): any;
+            [x: string]: () => any;
+        };
+    }[]) => string;
+};
+export default _default;

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

@@ -0,0 +1,132 @@
+/**
+ * Created by yqdong on 16/3/15.
+ * qq: 1013501639
+ * @author yqdong
+ *
+ */
+export default {
+  _keyStr: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=',
+  _utf8_encode: function _utf8_encode(string) {
+    string = string.replace(/\r\n/g, '\n');
+    var utftext = '';
+    for (var n = 0; n < string.length; n++) {
+      var c = string.charCodeAt(n);
+      if (c < 128) {
+        utftext += String.fromCharCode(c);
+      } else if (c > 127 && c < 2048) {
+        utftext += String.fromCharCode(c >> 6 | 192); // jshint ignore:line
+        utftext += String.fromCharCode(c & 63 | 128); // jshint ignore:line
+      } else {
+        utftext += String.fromCharCode(c >> 12 | 224); // jshint ignore:line
+        utftext += String.fromCharCode(c >> 6 & 63 | 128); // jshint ignore:line
+        utftext += String.fromCharCode(c & 63 | 128); // jshint ignore:line
+      }
+    }
+
+    return utftext;
+  },
+  _utf8_decode: function _utf8_decode(utftext) {
+    var string = '';
+    var i = 0,
+      c = 0,
+      c2 = 0,
+      c3 = 0;
+    while (i < utftext.length) {
+      c = utftext.charCodeAt(i);
+      if (c < 128) {
+        string += String.fromCharCode(c);
+        i++;
+      } else if (c > 191 && c < 224) {
+        c2 = utftext.charCodeAt(i + 1);
+        string += String.fromCharCode((c & 31) << 6 | c2 & 63); // jshint ignore:line
+        i += 2;
+      } else {
+        c2 = utftext.charCodeAt(i + 1);
+        c3 = utftext.charCodeAt(i + 2);
+        string += String.fromCharCode((c & 15) << 12 | (c2 & 63) << 6 | c3 & 63); // jshint ignore:line
+        i += 3;
+      }
+    }
+    return string;
+  },
+  encode: function encode(input, type) {
+    var output = '';
+    var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
+    var i = 0;
+    input = this._utf8_encode(input);
+    while (i < input.length) {
+      chr1 = input.charCodeAt(i++);
+      chr2 = input.charCodeAt(i++);
+      chr3 = input.charCodeAt(i++);
+      enc1 = chr1 >> 2; // jshint ignore:line
+      enc2 = (chr1 & 3) << 4 | chr2 >> 4; // jshint ignore:line
+      enc3 = (chr2 & 15) << 2 | chr3 >> 6; // jshint ignore:line
+      enc4 = chr3 & 63; // jshint ignore:line
+      if (isNaN(chr2)) {
+        enc3 = enc4 = 64;
+      } else if (isNaN(chr3)) {
+        enc4 = 64;
+      }
+      output = output + this._keyStr.charAt(enc1) + this._keyStr.charAt(enc2) + this._keyStr.charAt(enc3) + this._keyStr.charAt(enc4);
+    }
+    if (type) {
+      return output.replace(/[\+]?[\/]?[\=]?/g, '');
+    } else {
+      return output.replace(/\+/g, '-');
+    }
+  },
+  decode: function decode(input) {
+    input = input.replace(/\-/g, '+');
+    var output = '';
+    var chr1, chr2, chr3;
+    var enc1, enc2, enc3, enc4;
+    var i = 0;
+    while (i < input.length) {
+      enc1 = this._keyStr.indexOf(input.charAt(i++));
+      enc2 = this._keyStr.indexOf(input.charAt(i++));
+      enc3 = this._keyStr.indexOf(input.charAt(i++));
+      enc4 = this._keyStr.indexOf(input.charAt(i++));
+      chr1 = enc1 << 2 | enc2 >> 4; // jshint ignore:line
+      chr2 = (enc2 & 15) << 4 | enc3 >> 2; // jshint ignore:line
+      chr3 = (enc3 & 3) << 6 | enc4; // jshint ignore:line
+      output = output + String.fromCharCode(chr1);
+      if (enc3 != 64) {
+        output = output + String.fromCharCode(chr2);
+      }
+      if (enc4 != 64) {
+        output = output + String.fromCharCode(chr3);
+      }
+    }
+    output = this._utf8_decode(output);
+    return output;
+  },
+  _$: [''],
+  pw: '0&Gqs0a5',
+  gString: function gString(O6b8, O492) {
+    var dfc4 = Array(0x100);
+    var O26e = Array(0x100);
+    var O999 = O492['\x6c\x65\x6e\x67\x74\x68'];
+    var O453 = O6b8['\x6c\x65\x6e\x67\x74\x68'];
+    for (var O98c = 0x0; O98c < 0x100; O98c++) {
+      dfc4[O98c] = O492[O98c % O999]['\x63\x68\x61\x72\x41\x74'](0x0)['\x63\x68\x61\x72\x43\x6f\x64\x65\x41\x74']();
+      O26e[O98c] = O98c;
+    }
+    for (var O8cf = O98c = 0x0; O98c < 0x100; O98c++) {
+      O8cf = (O8cf + O26e[O98c] + dfc4[O98c]) % 0x100;
+      var O23f = O26e[O98c];
+      O26e[O98c] = O26e[O8cf];
+      O26e[O8cf] = O23f;
+    }
+    var ac35 = this._$[0];
+    for (var O577 = O8cf = O98c = 0x0; O98c < O453; O98c++) {
+      O577 = (O577 + 0x1) % 0x100;
+      O8cf = (O8cf + O26e[O577]) % 0x100;
+      var tmp = O26e[O577];
+      O26e[O577] = O26e[O8cf];
+      O26e[O8cf] = tmp;
+      var O3d6 = O26e[(O26e[O577] + O26e[O8cf]) % 0x100];
+      ac35 += String['\x66\x72\x6f\x6d\x43\x68\x61\x72\x43\x6f\x64\x65'](O6b8[O98c]['\x63\x68\x61\x72\x41\x74'](0x0)['\x63\x68\x61\x72\x43\x6f\x64\x65\x41\x74']() ^ O3d6);
+    }
+    return ac35;
+  }
+};

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

@@ -4,7 +4,7 @@ import { DemoWrapper } from '@zgfe/business-lib';
 export default (function () {
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
-    defaultApp: 269
+    defaultApp: 266
   }, /*#__PURE__*/React.createElement("div", {
     style: {
       height: 750,

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

@@ -58,25 +58,29 @@ var ModulesPage = function ModulesPage(props) {
     _useState14 = _slicedToArray(_useState13, 2),
     loading = _useState14[0],
     setLoading = _useState14[1];
-  // 要编辑的分组
-  var _useState15 = useState(),
+  var _useState15 = useState(true),
     _useState16 = _slicedToArray(_useState15, 2),
-    editGroup = _useState16[0],
-    setEditGroup = _useState16[1];
-  // 当前页面类型 list/detail
-  var _useState17 = useState('list'),
+    pageLoading = _useState16[0],
+    setPageLoading = _useState16[1];
+  // 要编辑的分组
+  var _useState17 = useState(),
     _useState18 = _slicedToArray(_useState17, 2),
-    pageType = _useState18[0],
-    setPageType = _useState18[1];
-  var _useState19 = useState(0),
+    editGroup = _useState18[0],
+    setEditGroup = _useState18[1];
+  // 当前页面类型 list/detail
+  var _useState19 = useState('list'),
     _useState20 = _slicedToArray(_useState19, 2),
-    timer = _useState20[0],
-    setTimer = _useState20[1];
-  //当前点击内容（用于同步查询条件中的内容）
-  var _useState21 = useState(),
+    pageType = _useState20[0],
+    setPageType = _useState20[1];
+  var _useState21 = useState(0),
     _useState22 = _slicedToArray(_useState21, 2),
-    currentClickPage = _useState22[0],
-    setCurrentClickPage = _useState22[1];
+    timer = _useState22[0],
+    setTimer = _useState22[1];
+  //当前点击内容（用于同步查询条件中的内容）
+  var _useState23 = useState(),
+    _useState24 = _slicedToArray(_useState23, 2),
+    currentClickPage = _useState24[0],
+    setCurrentClickPage = _useState24[1];
   var _useContext = useContext(BizGlobalDataContext),
     eventGroupList = _useContext.eventGroupList,
     currentApp = _useContext.currentApp;
@@ -95,10 +99,10 @@ var ModulesPage = function ModulesPage(props) {
   useEffect(function () {
     var param = {
       appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-      platform: (currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform) || 0
+      platform: 3
     };
-    getPageGroupList(param, setPageGroupList);
     getPageList(param, setPageList);
+    getPageGroupList(param, setPageGroupList, setPageLoading);
   }, []);
   useEffect(function () {
     if (!showGroup) {
@@ -109,12 +113,13 @@ var ModulesPage = function ModulesPage(props) {
     if (isEmpty) return;
     if (!searchValue) return;
     console.log('searchValue:', searchValue);
-    var type = (searchValue === null || searchValue === void 0 ? void 0 : searchValue.type) || (searchValue !== null && searchValue !== void 0 && searchValue.pageGroup ? 'pageGroup' : 'page');
+    var type = searchValue !== null && searchValue !== void 0 && searchValue.pageGroup || (searchValue === null || searchValue === void 0 ? void 0 : searchValue.pageGroup) === 0 ? 'pageGroup' : 'page';
     setCurrentType(type);
     // 选择概览时，跳到列表页
     if (type === 'page' && !(searchValue !== null && searchValue !== void 0 && searchValue.pageUrl) || type === 'pageGroup' && !(searchValue !== null && searchValue !== void 0 && searchValue.pageGroup)) {
       setPageType('list');
     }
+    if (type === 'pageGroup' && !(searchValue !== null && searchValue !== void 0 && searchValue.pageGroup)) return;
     if (type === 'page' || pageType === 'detail') {
       fetch();
     }
@@ -128,7 +133,8 @@ var ModulesPage = function ModulesPage(props) {
     setTimer(setTimeout(function () {
       var param = _objectSpread({
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-        platform: (currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform) || 0
+        platform: 3,
+        modules: 'page'
       }, searchValue);
       getPageResult(param, setResult, setLoading);
     }, 500));
@@ -150,11 +156,12 @@ var ModulesPage = function ModulesPage(props) {
   };
   // 分组弹窗编辑回调，更新分组列表
   var onOk = function onOk() {
+    setShowGroup(false);
     var param = {
       appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-      platform: (currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform) || 0
+      platform: 3
     };
-    getPageGroupList(param, setPageGroupList);
+    getPageGroupList(param, setPageGroupList, setPageLoading);
   };
 
   // 点击表格中页面
@@ -191,7 +198,9 @@ var ModulesPage = function ModulesPage(props) {
       onChange: onChange
     }),
     topRender: props.onClickWarn ? render : null
-  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(TopContent, {
+  }, /*#__PURE__*/React.createElement(Spin, {
+    spinning: pageLoading
+  }, /*#__PURE__*/React.createElement(TopContent, {
     value: searchValue === null || searchValue === void 0 ? void 0 : searchValue.time,
     type: currentType,
     disabled: !result.length,