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

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

@@ -11,12 +11,10 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { BizDialog, BizGlobalDataContext, IconFont, ajax } from '@zgfe/business-lib';
-import { Button, Form, Input, Spin } from 'antd';
+import { Button, Form, Input, Spin, message } from 'antd';
 import React, { useContext, useEffect, useRef, useState } from 'react';
 import "./index.less";
 import PageItem from "./pageItem";
-import { getPageEsData } from "./utils";
-import mockData from "./mock";
 import api from "../../constants/api";
 export var classPrefix = 'group-modal';
 var GroupModal = function GroupModal(props) {
@@ -28,23 +26,17 @@ var GroupModal = function GroupModal(props) {
     currentApp = _useContext.currentApp,
     isDemo = _useContext.isDemo;
   var refForm = useRef();
-  // 默认的url数组
-  var _useState3 = useState(mockData),
-    _useState4 = _slicedToArray(_useState3, 2),
-    defaultOption = _useState4[0],
-    setDefaultOption = _useState4[1];
   // 是否校验
-  var _useState5 = useState(false),
-    _useState6 = _slicedToArray(_useState5, 2),
-    validate = _useState6[0],
-    setValidate = _useState6[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    validate = _useState4[0],
+    setValidate = _useState4[1];
   // 按钮组
-  var _useState7 = useState([]),
-    _useState8 = _slicedToArray(_useState7, 2),
-    btnList = _useState8[0],
-    setBtnList = _useState8[1];
+  var _useState5 = useState([]),
+    _useState6 = _slicedToArray(_useState5, 2),
+    btnList = _useState6[0],
+    setBtnList = _useState6[1];
   useEffect(function () {
-    getPageEsData('', setDefaultOption, currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId, currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform);
     setBtnList(function () {
       var btnGroup = [/*#__PURE__*/React.createElement(Button, {
         key: "cancel",
@@ -75,11 +67,15 @@ var GroupModal = function GroupModal(props) {
       method: 'post',
       data: {
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-        platform: (currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform) || 0,
+        platform: 3,
         id: props.value.id
       }
     }).then(function (res) {
-      if (!res) return;
+      if (!res) {
+        message.error("\u5220\u9664\u5931\u8D25");
+        return;
+      }
+      message.success("\u5220\u9664\u6210\u529F");
       props.onOk && props.onOk();
     }).finally(function () {
       setLoading(false);
@@ -104,10 +100,18 @@ var GroupModal = function GroupModal(props) {
     ajax(url, {
       method: 'post',
       data: _objectSpread({
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        platform: 3,
         id: (_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.id
       }, data)
     }).then(function (res) {
-      if (!res) return;
+      var _props$value3;
+      if (!res) {
+        var _props$value2;
+        message.error("".concat((_props$value2 = props.value) !== null && _props$value2 !== void 0 && _props$value2.id ? '修改' : '创建', "\u5931\u8D25"));
+        return;
+      }
+      message.success("".concat((_props$value3 = props.value) !== null && _props$value3 !== void 0 && _props$value3.id ? '修改' : '创建', "\u6210\u529F"));
       props.onOk && props.onOk();
     }).finally(function () {
       setLoading(false);
@@ -160,7 +164,6 @@ var GroupModal = function GroupModal(props) {
   }, " \u6DFB\u52A0\u9875\u9762"), /*#__PURE__*/React.createElement(Form.Item, {
     name: "filters"
   }, /*#__PURE__*/React.createElement(PageItem, {
-    defaultOption: defaultOption,
     validate: validate
   }))), /*#__PURE__*/React.createElement(Button, null)));
 };

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

@@ -137,6 +137,23 @@
     }
   }
 
+  &-dropdown {
+    width: 300px;
+    &-handle {
+      width: 300px;
+    }
+  }
+  &-dropdown-panel {
+    .__select-panel();
+  }
+
+  .ant-input {
+    border-color: #fafafb;
+    &:not([disabled]):hover,
+    &:not([disabled]):focus {
+      border-color: @primary-color;
+    }
+  }
   .ant-modal-content {
     .ant-modal-body {
       padding-bottom: 0;

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

@@ -0,0 +1,9 @@
+import React from 'react';
+declare const InputSelect: React.FC<{
+    value?: string;
+    options?: string[];
+    status?: '' | 'warning' | 'error';
+    onChange?: (data: string) => void;
+    onSearch?: (data: string) => void;
+}>;
+export default InputSelect;

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

@@ -0,0 +1,67 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+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; }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import { Dropdown, Input } from 'antd';
+import React, { useEffect, useMemo, useState } from 'react';
+import { classPrefix } from '.';
+import { IconFont } from '@zgfe/business-lib';
+var InputSelect = function InputSelect(props) {
+  var _useState = useState(props.value),
+    _useState2 = _slicedToArray(_useState, 2),
+    searchValue = _useState2[0],
+    setSearchValue = _useState2[1];
+  useEffect(function () {}, []);
+  var options = useMemo(function () {
+    if (!props.options) return [];
+    return props.options.map(function (item) {
+      return {
+        key: item,
+        label: item,
+        title: item
+      };
+    });
+  }, [props.options]);
+  var onChange = function onChange(e) {
+    var val = e.target.value;
+    if (searchValue === val) return;
+    setSearchValue(val);
+    props.onSearch && props.onSearch(val);
+  };
+  var onClick = function onClick(data) {
+    setSearchValue(data.key);
+    props.onChange && props.onChange(data.key);
+  };
+  return /*#__PURE__*/React.createElement(Dropdown, {
+    overlayClassName: "".concat(classPrefix, "-dropdown"),
+    trigger: ['click'],
+    menu: {
+      items: options,
+      selectedKeys: props.value ? [props.value] : undefined,
+      onClick: onClick
+    },
+    dropdownRender: function dropdownRender(menus) {
+      var _props$options;
+      if ((_props$options = props.options) !== null && _props$options !== void 0 && _props$options.length) {
+        return menus;
+      }
+      return /*#__PURE__*/React.createElement("div", {
+        className: "".concat(classPrefix, "-dropdown-panel")
+      }, "\u6682\u65E0\u6570\u636E");
+    }
+  }, /*#__PURE__*/React.createElement(Input, {
+    className: "".concat(classPrefix, "-dropdown-handle"),
+    value: searchValue,
+    allowClear: true,
+    title: searchValue,
+    status: props.status,
+    onChange: onChange,
+    suffix: /*#__PURE__*/React.createElement(IconFont, {
+      className: "".concat(classPrefix, "-item-down-icon"),
+      type: "xiangxia"
+    })
+  }));
+};
+export default InputSelect;

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,4 +1,3 @@
-import { SelectProps } from 'antd';
 import { ModulesPageTypes } from '../../modules/home/types';
 export declare namespace GroupModalType {
     interface Props {
@@ -6,7 +5,6 @@ export declare namespace GroupModalType {
     }
     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/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),

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/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,7 +113,7 @@ 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)) {
@@ -128,7 +132,7 @@ 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
       }, searchValue);
       getPageResult(param, setResult, setLoading);
     }, 500));
@@ -150,11 +154,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 +196,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,

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

@@ -1,7 +1,7 @@
 import { ModulesPageTypes } from './types';
 import { AppInfoProps } from '@zgfe/business-lib/es/context';
 export declare const getPageList: (data: any, callback: Function) => void;
-export declare const getPageGroupList: (data: any, callback: Function) => void;
+export declare const getPageGroupList: (data: any, callback: Function, loadingCallback?: Function) => void;
 export declare const getPageResult: (params: any, 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

@@ -36,7 +36,8 @@ export var getPageList = function getPageList(data, callback) {
 };
 
 // 获取页面分组列表
-export var getPageGroupList = function getPageGroupList(data, callback) {
+export var getPageGroupList = function getPageGroupList(data, callback, loadingCallback) {
+  loadingCallback && loadingCallback(true);
   ajax(api.getPageGroup, {
     method: 'post',
     data: data
@@ -54,6 +55,8 @@ export var getPageGroupList = function getPageGroupList(data, callback) {
       name: '全部页面组'
     });
     callback(list);
+  }).finally(function () {
+    loadingCallback && loadingCallback(false);
   });
 };
 
@@ -84,7 +87,7 @@ export var onDownload = function onDownload(params, currentApp) {
     method: 'post',
     data: _objectSpread({
       appId: currentApp.appId,
-      platform: currentApp.platform
+      platform: 3
     }, params),
     responseType: 'blob',
     fileName: '页面列表',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-page",
-  "version": "1.0.1-alpha.1",
+  "version": "1.0.1-alpha.3",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -50,5 +50,5 @@
     "prettier": "^2.2.1",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "83eb5d8859328ab65d78573352b4bcd5a23d1d31"
+  "gitHead": "d0b4bcb08f0d51b7d891d84c3f0b12fd466f44a5"
 }

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

@@ -1,5 +0,0 @@
-declare const _default: {
-    label: string;
-    value: string;
-}[];
-export default _default;

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

@@ -1,16 +0,0 @@
-export default [{
-  label: 'file:///C:/Program%20Files/Apache%20Software%20Foundation/Tomcat%207.0/webapps/test/test.html',
-  value: 'file:///C:/Program%20Files/Apache%20Software%20Foundation/Tomcat%207.0/webapps/test/test.html'
-}, {
-  label: 'file:///C:/Users/54451/Desktop/sign/signin.html',
-  value: 'file:///C:/Users/54451/Desktop/sign/signin.html'
-}, {
-  label: 'http://localhost:8080/sign/signup.html',
-  value: 'http://localhost:8080/sign/signup.html'
-}, {
-  label: 'http://www.yayibang.com/html/web/article/index.html',
-  value: 'http://www.yayibang.com/html/web/article/index.html'
-}, {
-  label: 'http://localhost:8080/#/login',
-  value: 'http://localhost:8080/#/login'
-}];