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

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

@@ -172,6 +172,8 @@
       border-top: 1px solid #f2f3f4 !important;
 
       .group-modal-footer-del {
+        display: flex;
+        align-items: center;
         float: left;
         background: #f2f3f4 !important;
         .bsicon {

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

@@ -1,4 +1,3 @@
-function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 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); }
@@ -8,7 +7,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Form, Skeleton } from 'antd';
 import React, { useEffect, useRef, useState } from 'react';
 import "./index.less";
-import { BizAttrConditionGroup, BizUserGroup, IconFont } from '@zgfe/business-lib';
+import { BizAttrConditionGroup, BizUserGroupHeader } from '@zgfe/business-lib';
 import PageSelect from "../pageSelect";
 import { formValue, formatValue } from "./util";
 var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
@@ -73,35 +72,12 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     initialValues: formData,
     onValuesChange: onChange
   }, /*#__PURE__*/React.createElement(Form.Item, {
-    className: "".concat(classPrefix, "-title")
-  }, " \u5206\u6790\u7528\u6237\u7FA4 "), /*#__PURE__*/React.createElement(Form.List, {
-    name: "userGroup"
-  }, function (fields, _ref) {
-    var add = _ref.add,
-      remove = _ref.remove;
-    return /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement("div", {
-      className: "".concat(classPrefix, "-item-horizontal")
-    }, fields.map(function (field, index) {
-      return /*#__PURE__*/React.createElement(Form.Item, _extends({}, field, {
-        className: "".concat(classPrefix, "-item"),
-        key: field.key
-      }), /*#__PURE__*/React.createElement(BizUserGroup, {
-        enableTags: true,
-        enableDelete: fields.length > 1,
-        onDelete: function onDelete() {
-          return remove(index);
-        }
-      }));
-    })), fields.length < 2 && /*#__PURE__*/React.createElement("div", {
-      className: "".concat(classPrefix, "-add"),
-      onClick: function onClick() {
-        return add();
-      }
-    }, /*#__PURE__*/React.createElement(IconFont, {
-      className: "biz-icon",
-      type: 'tianjia1'
-    }), "\u6DFB\u52A0\u7528\u6237\u7FA4"));
-  }), /*#__PURE__*/React.createElement("div", {
+    name: "userGroup",
+    className: "".concat(classPrefix, "-item1")
+  }, /*#__PURE__*/React.createElement(BizUserGroupHeader, {
+    max: 2,
+    enableTags: true
+  })), /*#__PURE__*/React.createElement("div", {
     ref: ref
   }, /*#__PURE__*/React.createElement(Form.Item, {
     className: "".concat(classPrefix, "-title")

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/empty/index.less

@@ -18,6 +18,9 @@
   }
   &-content2 {
     width: 400px;
+    p {
+      margin-bottom: 0;
+    }
   }
   &-title {
     margin-bottom: 24px;
@@ -34,10 +37,10 @@
   &-code-container {
     position: relative;
     height: 200px;
+    margin: 8px 0;
     padding: 16px;
     background: #fafafb;
     border-radius: 8px;
-
     &:hover {
       .empty-panel-code-copy {
         display: flex;

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

@@ -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));
   };
   // 改变查询条件/

package/dist/esm/modules/home/style/index.less

@@ -9,6 +9,11 @@
       padding: 4px 16px;
     }
   }
+  .ant-btn-primary[disabled] {
+    color: #fff;
+    background: #d0dfff;
+    border-color: #d0dfff;
+  }
 
   &-spin {
     display: flex;
@@ -30,6 +35,8 @@
     background-color: #fff;
   }
   .ant-btn {
+    display: flex;
+    align-items: center;
     .bsicon {
       font-size: 16px !important;
       line-height: 1;

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.25",
+  "version": "1.0.1-alpha.27",
   "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.17",
+    "@zgfe/business-lib": "1.1.82-user.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": "6e1d07c901be17de112325f0ca5ebd7d02462c9d"
+  "gitHead": "d9f733682c23bcd39bfeef149fd9a0d6c00e344c"
 }