@zgfe/modules-page 1.0.1-alpha.26 → 1.0.1-alpha.28

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

@@ -73,7 +73,7 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onValuesChange: onChange
   }, /*#__PURE__*/React.createElement(Form.Item, {
     name: "userGroup",
-    label: ""
+    className: "".concat(classPrefix, "-item1")
   }, /*#__PURE__*/React.createElement(BizUserGroupHeader, {
     max: 2,
     enableTags: true

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

@@ -2,7 +2,7 @@
 
 .page-search-panel {
   &-title.ant-form-item {
-    margin-bottom: 12px;
+    margin-bottom: 8px;
     padding-left: 24px;
     color: @text-color-secondary;
     font-weight: 500;
@@ -13,40 +13,14 @@
       }
     }
   }
-  &-item-horizontal {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 16px;
-    padding: 0 24px;
-    &:hover {
-      background: #e8efff;
-    }
-    .page-search-panel-item.ant-form-item {
-      margin-bottom: 0;
-      padding: 4px 0;
-    }
-  }
-  &-add {
-    width: fit-content;
-    height: 20px;
-    margin-top: 8px;
-    margin-left: 24px;
-    color: @primary-color;
-    line-height: 20px;
-    cursor: pointer;
-    span {
-      margin-right: 4px;
-    }
-  }
 
   &-item3.ant-form-item:not(.page-search-panel-hidden) {
     margin-bottom: 20px;
-    padding: 4px 24px;
-    &:hover {
-      background: #e8efff;
-    }
+    padding: 4px 0;
+  }
+  &-item1.ant-form-item {
+    margin-bottom: 20px !important;
   }
-
   &-item2.ant-form-item {
     margin-bottom: 4px !important;
   }

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

@@ -12,7 +12,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 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 { BizGlobalDataContext, BizLayout, BizLoading } from '@zgfe/business-lib';
 import { Button, Skeleton, Spin } from 'antd';
 import "./style/index.less";
 import SearchPanel from "../../components/searchPanel";
@@ -88,6 +88,11 @@ var ModulesPage = function ModulesPage(props) {
     _useState26 = _slicedToArray(_useState25, 2),
     currentClickPage = _useState26[0],
     setCurrentClickPage = _useState26[1];
+  var _React$useState = React.useState(),
+    _React$useState2 = _slicedToArray(_React$useState, 2),
+    controller = _React$useState2[0],
+    setController = _React$useState2[1];
+
   // 查询条件ref
   var selectRef = useRef(null);
   var _useContext = useContext(BizGlobalDataContext),
@@ -161,7 +166,11 @@ var ModulesPage = function ModulesPage(props) {
         return;
       }
       setOriginSearchValue(_.cloneDeep(searchValue));
-      getPageResult(param, setResult, setLoading);
+      var control = new AbortController();
+      var signal = control.signal;
+      controller === null || controller === void 0 ? void 0 : controller.abort();
+      setController(control);
+      getPageResult(param, setResult, setLoading, signal);
     }, 500));
   };
   // 改变查询条件/
@@ -247,9 +256,9 @@ var ModulesPage = function ModulesPage(props) {
     onDownload: function onDownload() {
       return _onDownload(searchValue, currentApp);
     }
-  }), loading ? /*#__PURE__*/React.createElement("div", {
+  }), loading && !pageLoading ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-content")
-  }, /*#__PURE__*/React.createElement(Spin, null)) : pageType === 'list' ? /*#__PURE__*/React.createElement(PageContent, {
+  }, /*#__PURE__*/React.createElement(BizLoading, null)) : pageType === 'list' ? /*#__PURE__*/React.createElement(PageContent, {
     type: currentType,
     value: result,
     groupId: searchValue === null || searchValue === void 0 ? void 0 : searchValue.pageGroup,

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.Value, callback: Function, loadingCallback: Function) => void;
+export declare const getPageResult: (params: ModulesPageTypes.Value, callback: Function, loadingCallback: Function, signal: AbortSignal) => void;
 export declare const getSocketSecret: () => string;
 export declare const onDownload: (params?: ModulesPageTypes.Value, currentApp?: AppInfoProps) => void;

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

@@ -61,21 +61,27 @@ export var getPageGroupList = function getPageGroupList(data, callback, loadingC
 };
 
 // 获取页面查询结果
-export var getPageResult = function getPageResult(params, callback, loadingCallback) {
+export var getPageResult = function getPageResult(params, callback, loadingCallback, signal) {
   loadingCallback(true);
   ajax(api.getPageResult, {
     method: 'post',
-    data: params
+    data: params,
+    signal: signal
   }).then(function (res) {
     var _res$data;
+    loadingCallback(false);
     if (!res || !res.data) return;
     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);
+  }).catch(function (e) {
+    if (e.isCancel) {
+      console.log('请求被取消了');
+    } else {
+      loadingCallback(false);
+    }
   });
 };
 export var getSocketSecret = function getSocketSecret() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-page",
-  "version": "1.0.1-alpha.26",
+  "version": "1.0.1-alpha.28",
   "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.82-user.2",
+    "@zgfe/business-lib": "1.1.84-panel.5",
     "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": "18d2be84424a8fb824b296e6edf306c46bc11ec9"
+  "gitHead": "f74f9ef1ce6ee3f451b50b10d813cd6df4b38808"
 }